192 files changed, 7137 insertions, 24611 deletions
diff --git a/.build.yml b/.build.yml
index 6f85e29..eac5ff1 100644
--- a/.build.yml
+++ b/.build.yml
@@ -13,9 +13,9 @@ requires:
     - cmake-extras
     - dbus
     - intltool
-#    - libayatana-common
+    - libayatana-common
     - gobject-introspection
-#    - liblomiri-url-dispatcher
+#    - lomiri-url-dispatcher
     - vala
     - glib2
     - libnotify
@@ -24,10 +24,11 @@ requires:
     - evolution-data-server
     - gsettings-desktop-schemas
     - properties-cpp
-#    - ayatana-indicator-messages
+    - ayatana-indicator-messages
     - gtk-doc-tools
     - libaccountsservice
 #    - lomiri-schemas
+#    - lomiri-sounds
 
   debian:
     # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido
@@ -40,7 +41,8 @@ requires:
     - cmake-extras
     - intltool
     - libaccounts-glib-dev
-#    - libayatana-common-dev
+    - libayatana-common-dev
+    - ayatana-indicator-common
     - gobject-introspection
     - libgirepository1.0-dev
     - liblomiri-url-dispatcher-dev
@@ -52,10 +54,12 @@ requires:
     - libical-dev
     - libedataserver1.2-dev
     - libproperties-cpp-dev
-#    - libmessaging-menu-dev
+    - libmessaging-menu-dev
     - gtk-doc-tools
     - libaccountsservice-dev
     - liblomiri-url-dispatcher-dev
+    - lomiri-schemas
+    - lomiri-sounds
 # for the test harness:
     - libgtest-dev
     - libdbustest1-dev
@@ -69,7 +73,6 @@ requires:
     - systemd
     - lcov
     - gcovr
-#    - lomiri-schemas
 
   ubuntu:
     - clang
@@ -81,10 +84,13 @@ requires:
     - cmake-extras
     - intltool
     - libaccounts-glib-dev
-#    - libayatana-common-dev
+    - libayatana-common-dev
+    - ayatana-indicator-common
     - gobject-introspection
     - libgirepository1.0-dev
     - liblomiri-url-dispatcher-dev
+    - lomiri-schemas
+    - lomiri-sounds
     - valac
     - libglib2.0-dev
     - libnotify-dev
@@ -93,7 +99,7 @@ requires:
     - libical-dev
     - libedataserver1.2-dev
     - libproperties-cpp-dev
-#    - libmessaging-menu-dev
+    - libmessaging-menu-dev
     - gtk-doc-tools
     - libaccountsservice-dev
 # for the test harness:
@@ -109,7 +115,6 @@ requires:
     - systemd
     - lcov
     - gcovr
-#    - lomiri-schemas
 
   ubuntu:focal:
     - clang
@@ -122,9 +127,12 @@ requires:
     - intltool
     - libaccounts-glib-dev
 #    - libayatana-common-dev
+    - ayatana-indicator-common
     - gobject-introspection
     - libgirepository1.0-dev
 #    - liblomiri-url-dispatcher-dev
+#    - lomiri-schemas
+#    - lomiri-sounds
     - valac
     - libglib2.0-dev
     - libnotify-dev
@@ -149,7 +157,6 @@ requires:
     - systemd
     - lcov
     - gcovr
-#    - lomiri-schemas
 
 variables:
   - 'CHECKERS="
@@ -175,7 +182,11 @@ before_scripts:
   -     git clone --depth 1  https://github.com/AyatanaIndicators/libayatana-common.git libayatana-common-build
   - fi
   - cd libayatana-common-build
-  - cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  - if [ ${DISTRO_NAME} == "debian" ]; then
+  -     cmake . -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_LOMIRI_FEATURES=ON
+  - else
+  -     cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  - fi
   - make
   - make install
   - cd -
@@ -194,7 +205,7 @@ before_scripts:
   -
   - cd ${START_DIR}
   - if [ ! -d lomiri-schemas-build ]; then
-  -     git clone --depth 1  https://gitlab.com/ubports/core/lomiri-schemas.git lomiri-schemas-build
+  -      git clone --depth 1  https://gitlab.com/ubports/core/lomiri-schemas.git lomiri-schemas-build
   - fi
   - cd lomiri-schemas-build
   - cmake . -DCMAKE_INSTALL_PREFIX=/usr
@@ -202,18 +213,30 @@ before_scripts:
   - make install
   - cd -
   - rm -Rf lomiri-schemas-build/
+  -
+  - cd ${START_DIR}
+  - if [ ! -d lomiri-sounds-build ]; then
+  -     git clone --depth 1  https://gitlab.com/ubports/core/lomiri-sounds.git lomiri-sounds-build
+  - fi
+  - cd lomiri-sounds-build
+  - cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  - make
+  - make install
+  - cd -
+  - rm -Rf lomiri-sounds-build/
 
 build_scripts:
   - if [ ${DISTRO_NAME} == "debian" ];then
-  -     export CFLAGS+=" -Wsign-compare -Wunused-parameter"
-  -     cppcheck --enable=warning,style,performance,portability,information,missingInclude .
+  -     cppcheck --enable=warning,style,performance,portability,information --suppress=missingInclude .
   - fi
   -
   - if [ -e ./CMakeLists.txt ]; then
-  -     if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then
-  -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON
+  -     if [ ${DISTRO_NAME} == "debian" ]; then
+  -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON -DENABLE_LOMIRI_FEATURES=ON
+  -     elif [ ${DISTRO_NAME} == "ubuntu" ]; then
+  -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON
   -     else
-  -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON
+  -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON
   -     fi
   - else
   -     exit 1
diff --git a/.travis.yml b/.travis.yml
index 9556732..73bc55b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 # vim: set ts=2 sts=2 sw=2 expandtab :
-dist: bionic
+dist: focal
 language: shell
 os: linux
 
diff --git a/AUTHORS b/AUTHORS
index 8465f74..1043c11 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,6 +23,7 @@ CI Train Bot <ci-train-bot@canonical.com>
 Colin Watson <cjwatson@canonical.com>
 Cristian Gherman <c_gherman@yahoo.com>
 Csaba <csab0825@gmail.com>
+이정희 <daemul72@gmail.com>
 Danjela Hoxha <danjelahoxha@gmail.com>
 David Barth <david.barth@canonical.com>
 David Mohammed <fossfreedom@ubuntu.com>
@@ -36,16 +37,20 @@ Eduardo Addad de Oliveira <duduaddad@gmail.com>
 ElectrifiedSpeed <electrifiedsped@gmail.com>
 Elizabeth Sherrock <lizzyd710@gmail.com>
 EminUZUN <eminuzunn@gmail.com>
+Eryk Michalak <gnu.ewm@protonmail.com>
 Espen Wiborg <espenhw@grumblesmurf.org>
 Eugen Wesseloh <auscoder@gmail.com>
 Evgeni Golov <evgeni@debian.org>
 farkasdvd <30418389+farkasdvd@users.noreply.github.com>
 Gabor Kelemen <kelemeng@gnome.hu>
+gallegonovato <fran-carro@hotmail.es>
+Gediminas Murauskas <muziejusinfo@gmail.com>
 geni <me@geni.site>
 giorgio.saragnese <giorgio.saragnese@hotmail.it>
 gökhan barış göbet <barisgobet2002@gmail.com>
 Grace Guo <grace@appest.com>
 György Balló <ballogy@freestart.hu>
+Heimen Stoffels <vistausss@fastmail.com>
 Heimen Stoffels <vistausss@outlook.com>
 Henrik Dankvardt <dankvardt@gmail.com>
 Hosted Weblate <hosted@weblate.org>
@@ -53,7 +58,6 @@ HuNteR GaMinG <rd7128089@gmail.com>
 Iain Lane <iain.lane@canonical.com>
 Iain Lane <iain@orangesquash.org.uk>
 iNetRoos <inetroos@gmail.com>
-Iván Seoane <ivanrsm1997@gmail.com>
 Javier Jardón <javier.jardon@codethink.co.uk>
 Jeannette L <j.lavoie@net-c.ca>
 Jeremy Bicha <jbicha@ubuntu.com>
@@ -69,6 +73,7 @@ Ken VanDine <ken.vandine@canonical.com>
 klausade <klaus@linuxavdelingen.no>
 koffevar <egor.kafisov@gmail.com>
 Kristjan Räts <kristjanrats@gmail.com>
+kugiigi <kugi_eusebio@protonmail.com>
 Kyle Nitzsche <kyle.nitzsche@canonical.com>
 Kyrylo Yanukovych <rhetoranswer@hotmail.com>
 Laércio Cordeiro <efs.laee@gmail.com>
@@ -78,6 +83,7 @@ larsu <Unknown>
 leela <52065244+leela52452@users.noreply.github.com>
 leela <53352@protonmail.com>
 Lejo <Lejo_1@web.de>
+Luigi311 <git@luigi311.com>
 Lukáš Tinkl <lukas.tinkl@canonical.com>
 Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>
 Luke Yelavich <luke.yelavich@canonical.com>
@@ -109,14 +115,17 @@ Naveen Rajan <naveentherocker1234@gmail.com>
 Nicholas Guriev <nicholas@guriev.su>
 nimradium <nimra242001@gmail.com>
 nugullpunch <wldjs102@naver.com>
+Oğuz Ersen <oguz@ersen.moe>
 Oğuz Ersen <oguzersen@protonmail.com>
 Olivier Macchioni <olivier.macchioni@gmail.com>
 Olivier Tilloy <olivier.tilloy@canonical.com>
+OPNA2608 <christoph.neidahl@gmail.com>
 OrionJK - <idorionjk@gmail.com>
 Pavel Borecki <pavel.borecki@gmail.com>
 Phil Clifford <philip.clifford@gmail.com>
 phlostically <phlostically@mailinator.com>
 Quentin PAGÈS <quentinantonin@free.fr>
+Ratchanan Srirattanamet <ratchanan@ubports.com>
 Renato Araujo Oliveira Filho <renato.filho@canonical.com>
 Reza Almanda <rezaalmanda27@gmail.com>
 Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
@@ -127,22 +136,28 @@ Rob Pearson <rob.dunedin@gmail.com>
 Rodney Dawes <dobey.pwns@gmail.com>
 Rodney Dawes <rodney.dawes@canonical.com>
 Rodrigo Moya <rodrigo.moya@canonical.com>
+Rondy Andersson <rondarius@gmail.com>
 Rui Mendes <xz9@protonmail.com>
 Ryan Lortie <desrt@desrt.ca>
 SapuSeven <sapuseven@gmail.com>
 Sebastian Rasmussen <sebras@gmail.com>
 Sebastien Bacher <seb128@ubuntu.com>
 Sergey Shnatsel Davidoff <shnatsel@gmail.com>
+Sergii Horichenko <m@sgg.im>
 Simon Quigley <tsimonq2@ubuntu.com>
 sock-et <inline.py@gmail.com>
+spnux <stephane.petrus@posteo.net>
 ssantos <ssantos@web.de>
 Swann Martinet <swann.ranskassa@laposte.net>
+Sylke Vicious <silkevicious@tuta.io>
+taoky <taoky99@outlook.com>
 Ted Gould <ted@gould.cx>
 THANOS SIOURDAKIS <siourdakisthanos@gmail.com>
 thebylito <thebylito@gmail.com>
 Tiago Silva Miguel <tiagos.miguel@outlook.com>
 Timo Jyrinki <timo.jyrinki@canonical.com>
 Tobias p <sorenautonom667@gmail.com>
+Tomáš Marný <tomik.marny@gmail.com>
 Tommy Cheng <csckcac@gmail.com>
 Uddin Mtm <saifuddinmutammam@gmail.com>
 Veselin Georgiev <vvgeorgievv@gmail.com>
@@ -151,6 +166,7 @@ WaldiS <admin@sto.ugu.pl>
 wdggg <wdggg7@gmail.com>
 Weblate <noreply@weblate.org>
 Wellington Terumi Uemura <wellingtonuemura@gmail.com>
+wigy <wigy@tuta.io>
 Yaron Shahrabani <sh.yaron@gmail.com>
 Zdeněk Klauda <finaltek.com@gmail.com>
 Zhaoyu Gan <ganzhaoyu037@sina.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3370b06..23066ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-project (ayatana-indicator-datetime C CXX)
 cmake_minimum_required (VERSION 3.13)
+project (ayatana-indicator-datetime VERSION 24.2.0 LANGUAGES C CXX)
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
@@ -7,13 +7,13 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE)
 endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
-set (PROJECT_VERSION "0.9.0")
 set (PACKAGE ${CMAKE_PROJECT_NAME})
 
 # Options
 option(ENABLE_TESTS "Enable all tests and checks" OFF)
 option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF)
 option(ENABLE_WERROR "Treat all build warnings as errors" OFF)
+option(ENABLE_LOMIRI_FEATURES "Build with Lomiri-specific libraries, schemas and media" OFF)
 
 if(ENABLE_COVERAGE)
     set(ENABLE_TESTS ON)
@@ -23,17 +23,22 @@ else()
 endif()
 
 if(ENABLE_WERROR)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+    add_definitions("-Werror")
 endif()
 
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    add_definitions("-Weverything")
+else()
+    add_definitions("-Wall")
+endif()
+
+add_definitions("-Wno-sign-compare") # Needed for GTest on Ubuntu
+
 ##
 ##  GNU standard installation directories
 ##
 
 include (GNUInstallDirs)
-set (CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
-set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
 
 ##
 ## Gettext
@@ -43,11 +48,6 @@ set (GETTEXT_PACKAGE "ayatana-indicator-datetime")
 add_definitions (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}"
                  -DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 
-set(ALARM_DEFAULT_SOUND    "/usr/share/sounds/lomiri/ringtones/Alarm clock.ogg")
-set(CALENDAR_DEFAULT_SOUND "/usr/share/sounds/lomiri/ringtones/Marimbach.ogg")
-add_definitions(-DALARM_DEFAULT_SOUND="${ALARM_DEFAULT_SOUND}"
-                -DCALENDAR_DEFAULT_SOUND="${CALENDAR_DEFAULT_SOUND}")
-
 ##
 ##  Check for prerequisites
 ##
@@ -56,33 +56,53 @@ find_package (PkgConfig REQUIRED)
 include (CheckIncludeFile)
 include (FindPkgConfig)
 
-pkg_check_modules (SERVICE_DEPS REQUIRED
-                   libayatana-common>=0.9.3
-                   glib-2.0>=2.36
-                   gio-unix-2.0>=2.36
-                   libical>=0.48
-                   libecal-2.0>=3.16
-                   libedataserver-1.2>=3.5
-                   gstreamer-1.0>=1.2
-                   libnotify>=0.7.6
-                   properties-cpp>=0.0.1
-                   libaccounts-glib>=1.18
-                   messaging-menu>=0.8.2
-                   uuid>=2.25)
+set (
+    SERVICE_DEPS
+    libayatana-common>=0.9.3
+    glib-2.0>=2.36
+    gio-unix-2.0>=2.36
+    libical>=0.48
+    libecal-2.0>=3.16
+    libedataserver-1.2>=3.5
+    gstreamer-1.0>=1.2
+    libnotify>=0.7.6
+    properties-cpp>=0.0.1
+    libaccounts-glib>=1.18
+    messaging-menu>=0.8.2
+    uuid>=2.25
+)
+
+if (ENABLE_LOMIRI_FEATURES)
+    list (
+        APPEND
+        SERVICE_DEPS
+        lomiri-url-dispatcher>=0
+        lomiri-sounds
+        lomiri-schemas
+    )
+
+    pkg_get_variable(ALARM_DEFAULT_SOUND lomiri-sounds alarm_default_sound)
+    pkg_get_variable(CALENDAR_DEFAULT_SOUND lomiri-sounds calendar_default_sound)
+    string(JOIN " " ALARM_DEFAULT_SOUND ${ALARM_DEFAULT_SOUND})
+    string(JOIN " " CALENDAR_DEFAULT_SOUND ${CALENDAR_DEFAULT_SOUND})
+
+    add_definitions (
+        -DLOMIRI_FEATURES_ENABLED
+        -DALARM_DEFAULT_SOUND="${ALARM_DEFAULT_SOUND}"
+        -DCALENDAR_DEFAULT_SOUND="${CALENDAR_DEFAULT_SOUND}"
+    )
+else ()
+    add_definitions (
+        -DALARM_DEFAULT_SOUND="dummy"
+        -DCALENDAR_DEFAULT_SOUND="dummy"
+    )
+
+    set (ALARM_DEFAULT_SOUND "dummy")
+endif ()
+
+pkg_check_modules (SERVICE_DEPS REQUIRED ${SERVICE_DEPS})
 include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
 
-# lomiri-url-dispatcher
-
-pkg_check_modules(URLDISPATCHER lomiri-url-dispatcher>=0)
-include_directories(${URLDISPATCHER_INCLUDE_DIRS})
-
-if(URLDISPATCHER_FOUND)
-    add_definitions( -DHAS_URLDISPATCHER )
-endif()
-
-pkg_check_modules(LOMIRI_SOUNDS lomiri-sounds)
-pkg_check_modules(LOMIRI_SCHEMAS lomiri-schemas)
-
 ##
 ##  custom targets
 ##
@@ -100,19 +120,6 @@ add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
 ##  Actual building
 ##
 
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Weverything")
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-c++98-compat -Wno-padded")
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-documentation")
-
-else()
-
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall")
-
-endif()
-
-
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
 
@@ -148,3 +155,4 @@ endif()
 message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
 message(STATUS "Unit tests: ${ENABLE_TESTS}")
 message(STATUS "Build with -Werror: ${ENABLE_WERROR}")
+message(STATUS "Build with Lomiri features: ${ENABLE_LOMIRI_FEATURES}")
diff --git a/ChangeLog b/ChangeLog
index 1e35b7b..607d13d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,479 @@
+2024-02-12 Mike Gabriel
+
+        * release 24.2.0 (HEAD -> main, tag: 24.2.0)
+
+2024-02-12 Robert Tari
+
+        * Merge branch 'sunweaver-pr/fix-soundtest' (e06f6b10)
+        * src/CMakeLists.txt: suppress Wenum-constexpr-conversion in
+          engine-eds.cpp (ee1824a0)
+
+2024-02-12 Mike Gabriel
+
+        * tests/: Fix test-sound. Drop parameterized test run for now. Needs
+          more investigation. (deb2a444)
+
+2024-02-01 Mike Gabriel
+
+        * Merge branch 'tari01-pr/notification-test-lomiri' (a26eeb15)
+
+2024-02-01 Robert Tari
+
+        * tests/CMakeLists.txt: Run test-notification only when building with
+          Lomiri features (d304a6d1)
+
+2024-02-01 Mike Gabriel
+
+        * Merge branch 'tari01-pr/fix-colour-tests' (6d67f7b4)
+
+2024-02-01 Robert Tari
+
+        * Fix tests relying on the default EDS appointment colour (d77ad890)
+
+2024-01-31 Mike Gabriel
+
+        * Revert "release 24.1.0" (0692cc58)
+        * release 24.1.0 (070fe966)
+        * Merge branch 'luigi311-fix-tests' (ddabb4a6)
+
+2024-01-19 Luigi311
+
+        * Tests: Fix show_alarms tests (54802146)
+
+2023-12-31 OPNA2608
+
+        * tests/test-menus: Fix build (dcfaedfd)
+
+2024-01-31 Mike Gabriel
+
+        * Merge branch 'personal/peat-psuwit/bring-back-lomiri-hints'
+          (2a2db70b)
+
+2023-12-21 Ratchanan Srirattanamet
+
+        * src, tests: enable notification code path without Lomiri deps
+          (30b2de45)
+
+2023-12-26 Mike Gabriel
+
+        * release 23.10.1 (d8debd70) (tag: 23.10.1)
+
+2023-12-19 Mike Gabriel
+
+        * Merge branch 'luigi311-toggle_alarm' (d0ebe529)
+
+2021-03-20 kugiigi
+
+        * Add option to show/hide alarms (63a57fde)
+
+2023-12-19 Mike Gabriel
+
+        * Merge branch 'luigi311-toggle_events' (ecaaccca)
+
+2021-03-18 kugiigi
+
+        * Also apply show-events to Phone profile (4d984d26)
+
+2023-12-07 Ratchanan Srirattanamet
+
+        * Bring back Lomiri-specific notification hints (6f1c3f7f)
+
+2023-10-12 Mike Gabriel
+
+        * release 23.10.0 (2aace153) (tag: 23.10.0)
+        * po/: Update translation files. (3e66ea9a)
+
+2023-10-10 Mike Gabriel
+
+        * update-pot.sh: Adjust to rename .gschema.xml file. (f934dbf4)
+
+2023-10-09 Tomáš Marný
+
+        * Translated using Weblate (Czech) (dfc4f56a)
+
+2023-09-09 Mike Gabriel
+
+        * Merge branch 'tari01-pr/fix-tests' (246c706c)
+
+2023-07-10 Robert Tari
+
+        * CMakeLists.txt: Minor CMake warning fix (7113c51b)
+        * Enable all tests (069175a5)
+        * Fix failing tests (bae39a93)
+
+2023-09-09 Mike Gabriel
+
+        * Merge branch 'tari01-pr/fix-schema-translation' (18e9350d)
+
+2023-09-07 Robert Tari
+
+        * Fix gschema file translation (1536c23e)
+
+2023-09-09 Mike Gabriel
+
+        * Merge branch 'tari01-pr/notification-cleanup' (0d2c8f74)
+
+2023-09-09 Robert Tari
+
+        * Remove osd-notify remnants and use native notification timeout
+          (0a88a8d7)
+
+2023-07-30 Eryk Michalak
+
+        * Translated using Weblate (Polish) (36d648b2)
+
+2023-07-10 Robert Tari
+
+        * Merge branch
+          'ubports-personal/peat-psuwit/for-upstream_eds-ics-test-returncode'
+          (e5be480f)
+
+2023-07-01 spnux
+
+        * Translated using Weblate (French) (4044d282)
+
+2023-06-27 Sylke Vicious
+
+        * Translated using Weblate (Italian) (b5d43ad2)
+
+2023-06-22 Joan CiberSheep
+
+        * Translated using Weblate (Catalan) (765578e9)
+
+2023-06-22 Wellington Terumi Uemura
+
+        * Translated using Weblate (Portuguese (Brazil)) (6ecb125a)
+
+2023-06-09 Mike Gabriel
+
+        * release 23.6.0 (c91b376f)
+
+2023-06-06 Ratchanan Srirattanamet
+
+        * engine-eds: fix retrieving custom alarm sound path (bfc2e365)
+
+2023-07-01 spnux
+
+        * Translated using Weblate (French) (3cd3991f)
+
+2023-06-27 Sylke Vicious
+
+        * Translated using Weblate (Italian) (48f44dcb)
+
+2023-06-22 Joan CiberSheep
+
+        * Translated using Weblate (Catalan) (6c3898cb)
+
+2023-06-22 Wellington Terumi Uemura
+
+        * Translated using Weblate (Portuguese (Brazil)) (c13bf380)
+
+2023-06-09 Mike Gabriel
+
+        * release 23.6.0 (5f8a86ad) (tag: 23.6.0)
+
+2023-06-08 Robert Tari
+
+        * Merge branch
+          'ubports-personal/peat-psuwit/for-upstream_alarm-sound'
+          (ed6a9a21)
+
+2023-06-07 Ratchanan Srirattanamet
+
+        * tests/run-eds-ics-test: don't eat away test's result (3e65062b)
+
+2023-06-06 Ratchanan Srirattanamet
+
+        * engine-eds: fix retrieving custom alarm sound path (e089a84b)
+
+2023-04-06 ssantos
+
+        * Translated using Weblate (Portuguese) (254bd7f7)
+
+2023-03-16 Heimen Stoffels
+
+        * Translated using Weblate (Dutch) (607f0185)
+        * Translated using Weblate (Dutch) (bc64f2d0)
+
+2023-03-03 gallegonovato
+
+        * Translated using Weblate (Spanish) (c18c1c8b)
+        * Translated using Weblate (Spanish) (eddb5c6c)
+
+2023-02-12 Anders Jonsson
+
+        * Translated using Weblate (Swedish) (6074d9ad)
+
+2023-02-10 Luna Jernberg
+
+        * Translated using Weblate (Swedish) (b80f23b5)
+
+2022-12-30 Milo Ivir
+
+        * Translated using Weblate (Croatian) (29608576)
+
+2022-12-09 taoky
+
+        * Translated using Weblate (Chinese (Simplified)) (73944bb1)
+
+2022-11-23 Mike Gabriel
+
+        * release 22.9.1 (25143e60) (tag: 22.9.1)
+        * Merge branch 'tari01-pr/fix-lomiri-schemas-name' (d7c2ce7f)
+
+2022-11-14 Robert Tari
+
+        * debian/control: Correct lomiri-schemas name (985e82a7)
+
+2022-11-23 Mike Gabriel
+
+        * Merge branch 'tari01-pr/fix-haptic-dbus-data' (a1063ca8)
+
+2022-11-13 Robert Tari
+
+        * Fix build failure due to missing #include (de62f549)
+        * src/haptic.cpp: Fix data type sent to hfd-service (8452a9e5)
+
+2022-10-19 Kristjan Räts
+
+        * Translated using Weblate (Estonian) (10505c6b)
+
+2022-10-17 Gediminas Murauskas
+
+        * Translated using Weblate (Lithuanian) (3ce3c636)
+
+2022-09-29 이정희
+
+        * Translated using Weblate (Korean) (3df059ee)
+
+2022-09-25 Oğuz Ersen
+
+        * Translated using Weblate (Turkish) (af10395a)
+
+2022-09-22 Yaron Shahrabani
+
+        * Translated using Weblate (Hebrew) (3df9d34e)
+
+2022-09-14 Sergii Horichenko
+
+        * Translated using Weblate (Ukrainian) (6ab01f49)
+
+2022-09-14 Quentin PAGÈS
+
+        * Translated using Weblate (Occitan) (2041eedf)
+
+2022-09-14 Sergii Horichenko
+
+        * Translated using Weblate (Russian) (f5e72781)
+
+2022-09-14 Wellington Terumi Uemura
+
+        * Translated using Weblate (Portuguese (Brazil)) (e8fe69d3)
+
+2022-09-14 Mike Gabriel
+
+        * release 22.9.0 (d9d1a471) (tag: 22.9.0)
+        * Translated using Weblate (German) (b2312b61)
+
+2022-09-14 Milan Korecky
+
+        * Translated using Weblate (Czech) (8d0f3244)
+
+2022-09-14 Mike Gabriel
+
+        * po/*.po{,t}: Translation strings update (esp. source file
+          references). (df40ea2d)
+        * update-po{,t}.sh: Also catch multi-file source file references.
+          (463e6b96)
+        * po/*.po{,t}: Translation strings update. (f5b71f1f)
+
+2022-09-13 Robert Tari
+
+        * Merge branch 'sunweaver-pr/beautify-paths-in-pot-file' (0bdd75c9)
+
+2022-09-11 Mike Gabriel
+
+        * po/ayatana-indicator-datetime.pot: Update file. (1add999d)
+        * update-po{,t}.sh: Omit ../ at beginning of file names in .pot file.
+          (e70cba40)
+
+2022-09-08 Mike Gabriel
+
+        * po/ayatana-indicator-datetime.pot: Update translation strings.
+          (9f193262)
+        * update-pot.sh: Include org.ayatana.indicator.datetime.gschema.xml
+          strings into .pot file. (0e63c5cb)
+        * update-pot.sh: Implement a hack to successfully catch T_([...])
+          functions, as well. (2e979b47)
+        * Merge branch 'sunweaver-pr/tooltip-support' (bb0f985d)
+
+2022-07-22 Mike Gabriel
+
+        * src/menu.cpp: Add tooltip. (cc458235)
+
+2022-05-07 Rondy Andersson
+
+        * Translated using Weblate (Swedish) (483841ee)
+
+2022-04-23 Sergii Horichenko
+
+        * Translated using Weblate (Ukrainian) (7f50d736)
+        * Translated using Weblate (Ukrainian) (240dec46)
+        * Translated using Weblate (Ukrainian) (a362212b)
+
+2022-03-21 Yaron Shahrabani
+
+        * Translated using Weblate (Hebrew) (7130cee1)
+
+2022-03-16 Yaron Shahrabani
+
+        * Translated using Weblate (Hebrew) (27f905c8)
+
+2022-02-27 이정희
+
+        * Translated using Weblate (Korean) (7b354c64)
+
+2022-02-28 Yaron Shahrabani
+
+        * Translated using Weblate (Hebrew) (ca09e5f6)
+
+2022-02-19 Mike Gabriel
+
+        * release 22.2.0 (132bfd50) (tag: 22.2.0)
+        * Merge branch 'tari01-pr/fix-list-conversion' (5b8f9a2b)
+
+2022-02-19 Robert Tari
+
+        * CMakeLists.txt: Fix list conversion typo (6fe762b2)
+
+2022-02-18 Mike Gabriel
+
+        * Merge branch 'tari01-pr/read-default-sounds-from-lomiri-sounds'
+          (7d478107)
+
+2022-02-18 Robert Tari
+
+        * CMakeLists.txt: Read default sounds from lomiri-sounds pkg-config
+          file (dbdcf14f)
+
+2022-02-16 Mike Gabriel
+
+        * Merge branch 'tari01-pr/drop-cmake-install-full-pkglibexecdir'
+          (3589ed80)
+
+2022-02-11 Robert Tari
+
+        * Drop pkglibexecdir and use native CMake file configuration
+          (aebb056a)
+
+2022-02-16 Mike Gabriel
+
+        * Merge branch 'tari01-pr/build-with-werror' (ba692f8e)
+
+2022-02-11 Robert Tari
+
+        * .build.yml: Build with -Werror (20dbe77b)
+        * Fix build warnings (bfc0251b)
+
+2022-02-16 Mike Gabriel
+
+        * Merge branch 'tari01-pr/cleanup-compile-flags' (adb447d7)
+
+2022-02-11 Robert Tari
+
+        * .build.yml: Drop extra compilation flags (e4b6f9ac)
+        * Clean up compilation flags (0ae2ec89)
+
+2022-02-08 Mike Gabriel
+
+        * Merge branch 'tari01-pr/fix-cppcheck-suppressions' (b439ad04)
+
+2021-12-16 Robert Tari
+
+        * .build.yml: Remove cppcheck suppressions (91af5e28)
+        * Fix cppcheck errors/warnings (7f380782)
+
+2021-12-17 Robert Tari
+
+        * src/menu.cpp: Remove redundant code block: (b7df5a95)
+        * tests/test-menu-appointments.cpp: Remove unused variables
+          (02cc4073)
+        * Remove unused print-to.h (cd920da7)
+
+2021-12-16 Robert Tari
+
+        * Whitespace fix (3aec729d)
+
+2022-02-08 Robert Tari
+
+        * .travis.yml: Run CI builds on Travis CI's Ubuntu focal base system
+          (4e9da1fb)
+
+2022-01-07 wigy
+
+        * Translated using Weblate (Hungarian) (0f867872)
+
+2022-01-02 ssantos
+
+        * Translated using Weblate (Portuguese) (41c5ce08)
+
+2021-12-15 Mike Gabriel
+
+        * Merge branch
+          'tari01-pr/build-libayatana-common-with-enable-lomiri-features'
+          (1d577a01)
+
+2021-12-06 Robert Tari
+
+        * .build.yml: Build libayatana-common with ENABLE_LOMIRI_FEATURES
+          (89f313da)
+
+2021-12-03 Mike Gabriel
+
+        * Merge branch 'tari01-pr/add-lomiri-features-flag' (291efbd3)
+
+2021-11-26 Robert Tari
+
+        * .build.yml: Add ENABLE_LOMIRI_FEATURES flag and adapt build flow
+          (22268331)
+        * Make Lomiri features configurable at build time (5544dd0e)
+
+2021-11-25 Mike Gabriel
+
+        * Merge branch 'tari01-pr/detect-lomiri-schemas' (87bbf6da)
+
+2021-11-24 Robert Tari
+
+        * Check for lomiri-schemas package instead of individual files
+          (8e098813)
+
+2021-11-25 Mike Gabriel
+
+        * Merge branch 'tari01-pr/drop-std-version' (2c843c5b)
+
+2021-11-23 Robert Tari
+
+        * Remove C(++) std version constraint (463ab0d2)
+
+2021-11-23 phlostically
+
+        * Translated using Weblate (Esperanto) (20d3b8ec)
+
+2021-11-21 phlostically
+
+        * Translated using Weblate (Esperanto) (b725cae4)
+
+2021-11-22 Mike Gabriel
+
+        * Merge branch 'tari01-pr/check-for-lomiri-sounds' (bc5c2ac7)
+
+2021-11-22 Robert Tari
+
+        * Check for the lomiri-sounds package (8f2a75a0)
+
 2021-11-20 Mike Gabriel
 
-        * release 0.9.0 (HEAD -> main, tag: 0.9.0)
+        * release 0.9.0 (ffc328ce) (tag: 0.9.0)
 
 2021-11-19 Mike Gabriel
 
diff --git a/NEWS b/NEWS
index 62ede79..dfb68bc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,218 @@
+Overview of changes in ayatana-indicator-datetime 24.2.0
+
+  - src, tests: enable notification code path without Lomiri deps.
+  - tests/test-menus: Fix build.
+  - Tests: Fix show_alarms tests.
+  - Fix tests relying on the default EDS appointment colour.
+  - tests/CMakeLists.txt: Run test-notification only when building with
+    Lomiri features.
+  - tests/: Fix test-sound. Drop parameterized test run for now. Needs
+    more investigation.
+  - src/CMakeLists.txt: suppress Wenum-constexpr-conversion in
+    engine-eds.cpp.
+
+Overview of changes in ayatana-indicator-datetime 24.2.0
+
+  - src, tests: enable notification code path without Lomiri deps.
+  - tests/test-menus: Fix build.
+  - Tests: Fix show_alarms tests.
+  - Fix tests relying on the default EDS appointment colour.
+  - tests/CMakeLists.txt: Run test-notification only when building with
+    Lomiri features.
+  - tests/: Fix test-sound. Drop parameterized test run for now. Needs
+    more investigation.
+  - src/CMakeLists.txt: suppress Wenum-constexpr-conversion in
+    engine-eds.cpp
+  - Translation updates.
+
+Overview of changes in ayatana-indicator-datetime 23.10.1
+
+  - Also apply show-events to Phone profile.
+  - Add option to show/hide alarms.
+
+Overview of changes in ayatana-indicator-datetime 23.10.0
+
+  - tests/run-eds-ics-test: don't eat away test's result.
+  - Remove osd-notify remnants and use native notification timeout.
+  - Fix gschema file translation.
+  - Fix failing tests.
+  - Enable all tests.
+  - CMakeLists.txt: Minor CMake warning fix.
+  - update-pot.sh: Adjust to rename .gschema.xml file.
+  - Update translations.
+
+Overview of changes in ayatana-indicator-datetime 23.6.0
+
+  - engine-eds: fix retrieving custom alarm sound path
+    ECal 2.0 returns the list of attachments as a GSList (a singly linked
+    list). I'm not sure why, but the logic for iterating the list is
+    completely incorrect. Fixing that fixes custom alarm sound.
+    A test is added to catch this case.
+  - Translation updates.
+
+Overview of changes in ayatana-indicator-datetime 22.9.1
+
+  - engine-eds: fix retrieving custom alarm sound path.
+  - Translation updates.
+
+Overview of changes in ayatana-indicator-datetime 22.9.1
+
+  - src/haptic.cpp: Fix data type sent to hfd-service
+  - Fix build failure due to missing #include
+  - Translation updates.
+
+Overview of changes in ayatana-indicator-datetime 22.9.0
+
+  - Add tooltip support.
+  - Translation updates.
+
+Overview of changes in ayatana-indicator-datetime 22.2.0
+
+  - CMakeLists.txt: Read default sounds from lomiri-sounds pkg-config file.
+  - Drop pkglibexecdir and use native CMake file configuration.
+  - Fix build warnings.
+  - Clean up compilation flags.
+  - Fix cppcheck errors/warnings.
+  - Some code removals.
+  - Make Lomiri features configurable at build time.
+  - Check for lomiri-schemas package instead of individual files.
+  - Remove C(++) std version constraint.
+  - Check for the lomiri-sounds package.
+  - Translation updates.
+
+Overview of changes in ayatana-indicator-datetime 0.9.0
+
+  - Re-enable haptic using hfd-service.
+  - Rename Lomiri-specific properties to x-lomiri.
+  - include/datetime/settings-shared.h: Rename com.ubuntu.calendar.
+  - Fix ringtones path + drop unused definition.
+  - Rename HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS to
+    HAS_LOMIRI_ACCTSERVICE_SOUND.
+  - Rename com.ubuntu.touch.AccountsService.Sound to
+    com.lomiri.touch.AccountsService.Sound.
+  - Use lomiri-phablet instead of ubuntu.
+  - Remove com.canonical.usensord and disable haptic.
+  - Remove the activation_url from the Appointment class.
+  - Drop the 'ubuntu' prefix from the alarm types and functions.
+  - Rename com.ubuntu.notifications to com.lomiri.notifications.
+  - Rename x-canonical properties to x-ayatana.
+  - data/CMakeLists.txt: Do not use automatic GSchema compilation.
+  - Use native CMake GSettings module.
+  - Allow autostart for Budgie Desktop.
+  - tests/test-live-actions: Handle case when the test is run on Lomiri.
+  - Link to lomiri-url-dispatcher where needed.
+  - src/snap.cpp: Create Sound object via SoundBuilder.
+  - src/settings-live.cpp: Check for schema instead of Lomiri.
+  - include/notifications/sound.h: Add SoundBuider class.
+  - src/snap.cpp: Add m_sound_builder variable.
+  - src/main.cpp: Fix uin -> ain typo.
+  - CMakeLists.txt: Add uuid dependency.
+  - tests/CMakeLists.txt: Build DBusMock tests with -no-pie.
+  - po/CMakeLists.txt: Don't update .pot file during builds.
+  - Some fixes in UBports patches after a review.
+  - Rename com.canonical.powerd -> com.lomiri.Repowerd.
+  - Add -DENABLE_WERROR CMake option.
+  - Calls 'calendar://eventId=<event-id>' when clicking on an event in the
+    indicator.
+  - Resolve some test timing issues by deferring Snap object creation until
+    it's needed
+  - src/actions-live.cpp: Make open_alarm_app, open_appointment,
+    open_calendar_app and open_settings_app return the uri/command.
+  - tests/test-live-actions.cpp: Drop last_cmd and last_url variables + use
+    return values of actions-live functions for testing + test phone functions
+    on Lomiri only.
+  - tests/test-live-actions.cpp: test phone functions after setting
+    XDG_CURRENT_DESKTOP.
+  - tests/test-settings.cpp: Use SETTINGS_NOTIFY_SCHEMA_ID only if it exists.
+  - tests/run-eds-ics-test.sh: Remove return statement.
+  - tests/CMakeLists.txt: Enable the timezone unit tests.
+  - tests/CMakeLists.txt: Catch race condition while attempting to copy
+    schemas.
+  - tests/CMakeLists.txt: Exclude blocking tests on Travis for now.
+  - tests/tests-timezones.cpp: Use MockTimezone to construct LiveTimezones +
+    drop section expecting changes after /timezone is modified (not monitored)
+  - tests/test-formater: Change warning to plain message otherwise it can crash
+    the test.
+  - tests/CMakeLists.txt: add -no-pie compile flag.
+  - src/settings-live.cpp: initialise m_settings_cal_notification and
+    m_settings_general_notification to NULL if we are not on Lomiri.
+  - Alarm snoozes after timeout.
+  - Snooze starts from the current minute.
+  - Fix the EDS tests that were failing.
+  - Replace ual with url-dispatcher.
+  - Fix clock app URL.
+  - Use cmake-extras intltool module, and keep pot file in vcs.
+  - Use cmake-extras for coverage support and always enable testing.
+  - Switch to using gmock module from cmake-extras.
+  - UpcomingPlanner: don't get events from the day before of the selected one.
+  - Should not use sounds notifications for calendar in silent mode.
+  - If in silent mode should only vibrate if the settings say so.
+  - Only wake device if bubbles notifications are enabled.
+  - Do not fail tests if schema is not installed.
+  - Make sure that calendar settings do not affect alarm notifications.
+  - Set calendar notification settings to true in case GSettings schema is not
+    available. Make sure calendar notification settings are correct during
+    tests.
+  - Detect desktop to launch applications.
+  - Only create messaging menu if calendar app is installed.
+    Update tests.
+  - Update notifications to use the new calendar icon.
+  - Vibrate only once when notification about calendar events.
+  - Fix memory leak on messaging_menu.
+  - Only play sounds for alarms.
+  - Fixed crash when clicking on messaging menu.
+  - Post message on messaging menu if the notification get timeout.
+  - Pull the timezone from timedate1 regardless of whether it appears on
+    the bus before or after we startup
+  - Do not play sound for events without a sound set.
+  - Rebuild events list in case of accounts changed.
+  - Create a constructor for Alarm class.
+  - Only play a sound alert if the event contains a SOUND reminder.
+  - Ignore alarms for events marked as not attending.
+  - Make sure that the ocurrence time is used to build the url to launch
+    external application.
+  - Lauch calendar app using the event start time.
+  - Get event selection up-to-date with the spec, including showing in-progress
+    events. Add unit tests to cover event priority and display order.
+  - Call 'calendar://eventId=<event-id>' when clicking on an event in the
+    indicator.
+  - Resolve some test timing issues by deferring Snap object creation until
+    it's needed.
+  - In test-notifications we do need one wait() wart after all, because the
+    Snap is building its impl proxies asynchronously and hasn't any public
+    way of notifying when they're built.
+  - Update notification tests to wait for the needed bus events instead of
+    waiting for arbitrary time intervals.
+  - Add a DBusMock test Fixture with helper functions to wait for arbitrary bus
+    method calls.
+  - Add notification title, icon checks to test-notification's battery of test
+    combinations.
+  - Adjust title and notification icon according to the event type.
+  - Move notifications tests into a new unit test. Extract notifications test
+    fixture into a reusable header.
+  - Various fixes for test-snap.
+  - tests/CMakeLists.txt: Try to fix build failure on Debian Testing where
+    cp -f is performed.
+  - Add install instructions + update documentation.
+  - If possible, avoid deprecated g_time_zone_new.
+  - src/myself.cpp: Fix libaccounts-glib.h include warning.
+  - src/menu.cpp: Pipe appointment strings through
+    ayatana_common_utils_ellipsize and add GSettings watcher for
+    max-menu-text-length.
+  - CMakeLists.txt: Add libayatana-common (>= 0.9.3) dependency.
+  - tests/test-dbus-fixture.h: Turn TestDBusFixture::TestDBusFixture into an
+    explicitly declared constructor.
+  - tests/test-eds-ics-missing-trigger.cpp: Include engine-eds.h prio to
+    alarm-queue-simple.h.
+  - Various tests fixes. (Thanks to Nicholas Guriev).
+  - CMakeLists.txt: Drop GNUInstallDirs. Use PREFIX initialization hack.
+  - CMakeLists.txt: Rename CMake options 'enable_tests' to 'ENABLE_TESTS' and
+    'enable_lcov' to 'ENABLE_COVERAGE' (both defaulting to 'OFF')
+  - src/clock-live.cpp: Replace 'signed size_t' by 'ssize_t'.
+  - CMakeLists.txt: Add Clang support.
+  - CMakeLists.txt: Fix GTest path
+  - Translation updates.
+
 Overview of changes in ayatana-indicator-datetime 0.8.3
 
   - Rename Lomiri-specific properties to x-lomiri.
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 233bd5f..726bcec 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,15 +3,10 @@
 ##
 
 set (SCHEMA_NAME "org.ayatana.indicator.datetime.gschema.xml")
-set (SCHEMA_FILE_IN_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in.in")
-set (SCHEMA_FILE_IN    "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}.in")
+set (SCHEMA_FILE_IN    "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
 set (SCHEMA_FILE       "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
 # generate the .xml.in file so cmake constants are included
-configure_file(${SCHEMA_FILE_IN_IN} ${SCHEMA_FILE_IN})
-# generate the .xml file using intltool
-find_package(Intltool REQUIRED)
-set (ENV{LC_ALL} "C")
-intltool_merge_translations("${SCHEMA_FILE_IN}" "${SCHEMA_FILE}" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
+configure_file(${SCHEMA_FILE_IN} ${SCHEMA_FILE})
 
 # let GSettings do the rest
 find_package(GSettings REQUIRED)
@@ -32,7 +27,6 @@ if (${SYSTEMD_FOUND})
     set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in")
 
     # build it
-    set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
     configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
 
     # install it
@@ -53,7 +47,6 @@ set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
 set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
 
 # build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
 configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
 
 # install XDG autostart
diff --git a/data/ayatana-indicator-datetime.desktop.in b/data/ayatana-indicator-datetime.desktop.in
index 8d0bca2..e4f4521 100644
--- a/data/ayatana-indicator-datetime.desktop.in
+++ b/data/ayatana-indicator-datetime.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Ayatana Indicator Date & Time
-Exec=@pkglibexecdir@/ayatana-indicator-datetime-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-datetime/ayatana-indicator-datetime-service
 OnlyShowIn=MATE;Unity;XFCE;Pantheon;Budgie
 NoDisplay=true
 StartupNotify=false
diff --git a/data/ayatana-indicator-datetime.service.in b/data/ayatana-indicator-datetime.service.in
index da1cd54..6b7803b 100644
--- a/data/ayatana-indicator-datetime.service.in
+++ b/data/ayatana-indicator-datetime.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
 PartOf=ayatana-indicators.target
 
 [Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-datetime-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-datetime/ayatana-indicator-datetime-service
 Restart=on-failure
 
 [Install]
diff --git a/data/org.ayatana.indicator.datetime.gschema.xml.in.in b/data/org.ayatana.indicator.datetime.gschema.xml.in
index e03db4b..62e86b9 100644
--- a/data/org.ayatana.indicator.datetime.gschema.xml.in.in
+++ b/data/org.ayatana.indicator.datetime.gschema.xml.in
@@ -87,6 +87,13 @@
               Shows events from Evolution in indicator-datetime's menu.
             </description>
         </key>
+        <key name="show-alarms" type="b">
+            <default>true</default>
+            <summary>Show alarms in the indicator</summary>
+            <description>
+              Shows alarms in the events list in indicator-datetime's menu.
+            </description>
+        </key>
         <key name="show-auto-detected-location" type="b">
             <default>false</default>
             <summary>Show the auto-detected location in the indicator</summary>
@@ -126,10 +133,10 @@
         </key>
         <key name="calendar-default-sound" type="s">
             <default>'@CALENDAR_DEFAULT_SOUND@'</default>
-            <_summary>The calendar's default sound file.</_summary>
-            <_description>
+            <summary>The calendar's default sound file.</summary>
+            <description>
               If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound.
-            </_description>
+            </description>
         </key>
         <key name="alarm-default-sound" type="s">
             <default>'@ALARM_DEFAULT_SOUND@'</default>
diff --git a/debian/changelog b/debian/changelog
index 4933213..9ecfb34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,52 @@
+ayatana-indicator-datetime (24.2.0-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-datetime.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 12 Feb 2024 17:45:46 +0100
+
+ayatana-indicator-datetime (23.10.1-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-datetime.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 26 Dec 2023 12:32:08 +0100
+
+ayatana-indicator-datetime (23.10.0-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-datetime.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 12 Oct 2023 23:28:45 +0200
+
+ayatana-indicator-datetime (23.6.0-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-datetime.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 09 Jun 2023 08:39:33 +0200
+
+ayatana-indicator-datetime (22.9.1-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-datetime.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 23 Nov 2022 17:02:04 +0100
+
+ayatana-indicator-datetime (22.9.0-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-datetime.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 14 Sep 2022 14:03:06 +0200
+
+ayatana-indicator-datetime (22.2.0-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-datetime.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sat, 19 Feb 2022 21:33:50 +0100
+
 ayatana-indicator-datetime (0.9.0-0) unstable; urgency=medium
 
   * Upstream-provided Debian package for ayatana-indicator-datetime.
diff --git a/debian/control b/debian/control
index 7368857..f10f155 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cmake,
                libecal2.0-dev (>= 3.16),
                libical-dev (>= 1.0),
                libedataserver1.2-dev (>= 3.5),
-               lomiri-common-schemas | hello,
+               lomiri-schemas | hello,
                libproperties-cpp-dev,
                liblomiri-url-dispatcher-dev | hello,
                libmessaging-menu-dev,
diff --git a/include/datetime/menu.h b/include/datetime/menu.h
index 0074ea5..5673bc1 100644
--- a/include/datetime/menu.h
+++ b/include/datetime/menu.h
@@ -53,7 +53,8 @@ public:
     static std::vector<Appointment> get_display_appointments(
         const std::vector<Appointment>&,
         const DateTime& start,
-        unsigned int max_items=5);
+        unsigned int max_items=5,
+        const bool include_alarms=true);
 
 protected:
     Menu (Profile profile_in, const std::string& name_in);
diff --git a/include/datetime/settings-live.h b/include/datetime/settings-live.h
index 85071ce..6a923f3 100644
--- a/include/datetime/settings-live.h
+++ b/include/datetime/settings-live.h
@@ -52,6 +52,7 @@ private:
     void update_show_day();
     void update_show_detected_locations();
     void update_show_events();
+    void update_show_alarms();
     void update_show_locations();
     void update_show_seconds();
     void update_show_week_numbers();
diff --git a/include/datetime/settings-shared.h b/include/datetime/settings-shared.h
index 7280c16..6e97328 100644
--- a/include/datetime/settings-shared.h
+++ b/include/datetime/settings-shared.h
@@ -40,6 +40,7 @@ TimeFormatMode;
 #define SETTINGS_SHOW_CALENDAR_S        "show-calendar"
 #define SETTINGS_SHOW_WEEK_NUMBERS_S    "show-week-numbers"
 #define SETTINGS_SHOW_EVENTS_S          "show-events"
+#define SETTINGS_SHOW_ALARMS_S          "show-alarms"
 #define SETTINGS_SHOW_LOCATIONS_S       "show-locations"
 #define SETTINGS_SHOW_DETECTED_S        "show-auto-detected-location"
 #define SETTINGS_LOCATIONS_S            "locations"
diff --git a/include/datetime/settings.h b/include/datetime/settings.h
index af9227d..29905fd 100644
--- a/include/datetime/settings.h
+++ b/include/datetime/settings.h
@@ -49,6 +49,7 @@ public:
     core::Property<bool> show_day;
     core::Property<bool> show_detected_location;
     core::Property<bool> show_events;
+    core::Property<bool> show_alarms;
     core::Property<bool> show_locations;
     core::Property<bool> show_seconds;
     core::Property<bool> show_week_numbers;
diff --git a/include/datetime/timezone-geoclue.h b/include/datetime/timezone-geoclue.h
index 18fc159..d25d3e5 100644
--- a/include/datetime/timezone-geoclue.h
+++ b/include/datetime/timezone-geoclue.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Canonical Ltd.
+ * Copyright 2022 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #ifndef INDICATOR_DATETIME_GEOCLUE_TIMEZONE_H
@@ -36,7 +38,7 @@ public:
     ~GeoclueTimezone();
 
 private:
-    struct Impl;
+    class Impl;
     std::unique_ptr<Impl> impl;
 
     // we've got pointers in here, so don't allow copying
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fe5cde1..511daee 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
 data/org.ayatana.indicator.datetime.AlarmProperties.xml
-data/org.ayatana.indicator.datetime.gschema.xml.in.in
+data/org.ayatana.indicator.datetime.gschema.xml.in
 src/actions.cpp
 src/actions-live.cpp
 src/alarm-queue-simple.cpp
diff --git a/po/aa.po b/po/aa.po
index ff86c95..16d7d46 100644
--- a/po/aa.po
+++ b/po/aa.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/af.po b/po/af.po
index 490fc40..5b654a8 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2020-05-10 11:12+0000\n"
 "Last-Translator: iNetRoos <inetroos@gmail.com>\n"
 "Language-Team: Afrikaans <https://hosted.weblate.org/projects/ayatana-"
@@ -19,235 +19,145 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Die kalender se verstek audio lêer."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"As 'n kalender- of herinneringgebeurtenis nie sy eie klanklêer spesifiseer "
-"nie, sal hierdie lêer as die verstekklank gebruik word."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Voeg Gebeurtenis in…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Horlosie"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 #, fuzzy
 msgid "Time and Date Settings…"
 msgstr "Tyd & Datum instellings…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Datum en Tyd"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "Tyd & Datum"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (het alarms)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %H:%M"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Sluimer"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Vandag"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Die kalender se verstek audio lêer."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "As 'n kalender- of herinneringgebeurtenis nie sy eie klanklêer "
+#~ "spesifiseer nie, sal hierdie lêer as die verstekklank gebruik word."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Môre"
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Môre %H:%M"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "Môre %H:%M"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %H:%M"
+#~ msgid "Today"
+#~ msgstr "Vandag"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Môre %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Môre"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Môre %H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "Môre %H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %H:%M"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Môre %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
diff --git a/po/am.po b/po/am.po
index 749ccd9..c2936f9 100644
--- a/po/am.po
+++ b/po/am.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/an.po b/po/an.po
index 309fd45..4a41c4b 100644
--- a/po/an.po
+++ b/po/an.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index a6ac1c7..7ef73dd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/as.po b/po/as.po
index da03ca3..37e2bc5 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 2cd40a4..60fd500 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ayatana-indicator-datetime.pot b/po/ayatana-indicator-datetime.pot
index 44fea44..869623d 100644
--- a/po/ayatana-indicator-datetime.pot
+++ b/po/ayatana-indicator-datetime.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,200 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
+#: data/org.ayatana.indicator.datetime.gschema.xml:1
+msgid "What the time format should be?"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:2
+msgid ""
+"Controls the time format that is displayed in the indicator. For almost all "
+"users this should be the default for their locale. If you think the setting "
+"is wrong for your locale please join or talk to the translation team for "
+"your language. If you just want something different you can adjust this to "
+"be either 12 or 24 time. Or, you can use a custom format string and set the "
+"custom-time-format setting."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:3
+msgid "The format string passed to strftime"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:4
+msgid ""
+"The format of the time and/or date that is visible on the panel when using "
+"the indicator. For most users this will be a set of predefined values as "
+"determined by the configuration utility, but advanced users can change it to "
+"anything strftime can accept. Look at the man page on strftime for more "
+"information."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:5
+msgid "Show the number of seconds in the indicator"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:6
+msgid ""
+"Makes the datetime indicator show the number of seconds in the indicator. "
+"It's important to note that this will cause additional battery drain as the "
+"time will update 60 times as often, so it is not recommended. Also, this "
+"setting will be ignored if the time-format value is set to custom."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:7
+msgid "Show the day of the week in the indicator"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:8
+msgid ""
+"Puts the day of the week on the panel along with the time and/or date "
+"depending on settings. This setting will be ignored if the time-format value "
+"is set to custom."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:9
+msgid "Show the month and date in the indicator"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:10
+msgid ""
+"Puts the month and the date in the panel along with the time and/or day of "
+"the week depending on settings. This setting will be ignored if the time-"
+"format value is set to custom."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:11
+msgid "Show the year in the indicator"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:12
+msgid ""
+"Puts the year in the panel along with the month and the date. This setting "
+"will be ignored if either the time-format value is set to custom or if show-"
+"date is set to false."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:13
+msgid "Show the monthly calendar in the indicator"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:14
+msgid "Puts the monthly calendar in indicator-datetime's menu."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:15
+msgid "Show week numbers in calendar"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:16
+msgid ""
+"Shows the week numbers in the monthly calendar in indicator-datetime's menu."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:17
+msgid "Show events in the indicator"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:18
+msgid "Shows events from Evolution in indicator-datetime's menu."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:19
+msgid "Show the auto-detected location in the indicator"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:20
+msgid ""
+"Shows your current location (determined from geoclue and /etc/timezone) in "
+"indicator-datetime's menu."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:21
+msgid "Show locations in the indicator"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:22
+msgid "Shows custom defined locations in indicator-datetime's menu."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:23
+msgid "A List of locations"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:24
+msgid ""
+"Adds the list of locations the user has configured to display in the "
+"indicator-datetime menu."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:25
+msgid "The name of the current timezone"
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:26
+msgid ""
+"Some timezones can be known by many different cities or names. This setting "
+"describes how the current zone prefers to be named. Format is \"TIMEZONE "
+"NAME\" (e.g. \"America/New_York Boston\" to name the New_York zone Boston)."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:27
+msgid "What kind of haptic feedback, if any, to trigger with an alarm."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:28
+msgid ""
+"What kind of haptic feedback, if any, to trigger with an alarm. Two modes "
+"are currently supported: 'pulse', 'none'."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:29
 msgid "The calendar's default sound file."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
+#: data/org.ayatana.indicator.datetime.gschema.xml:30
 msgid ""
 "If a calendar or reminder event doesn't specify its own sound file, this "
 "file will be used as the fallback sound."
 msgstr ""
 
+#: data/org.ayatana.indicator.datetime.gschema.xml:31
+msgid "The alarm's default sound file."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:32
+msgid ""
+"If an alarm doesn't specify its own sound file, this file will be used as "
+"the fallback sound."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:33
+msgid "The alarm's default volume level."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:34
+msgid "The volume at which alarms will be played."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:35
+msgid "The alarm's duration."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:36
+msgid ""
+"How long the alarm's sound will be looped if its snap decision is not "
+"dismissed by the user."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:37
+msgid "The snooze duration."
+msgstr ""
+
+#: data/org.ayatana.indicator.datetime.gschema.xml:38
+msgid "How long to wait when the user hits the Snooze button."
+msgstr ""
+
 #. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
+#: src/formatter.cpp:234
 msgid "%l:%M:%S %p"
 msgstr ""
 
@@ -36,12 +218,12 @@ msgstr ""
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
 #. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
+#: src/formatter.cpp:237 src/utils.c:304
 msgid "%l:%M %p"
 msgstr ""
 
 #. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
+#: src/formatter.cpp:240
 msgid "%H:%M:%S"
 msgstr ""
 
@@ -49,7 +231,7 @@ msgstr ""
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
 #. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
+#: src/formatter.cpp:243 src/utils.c:344
 msgid "%H:%M"
 msgstr ""
 
@@ -59,7 +241,7 @@ msgstr ""
 #. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
 #. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
 #. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
+#: src/formatter-desktop.cpp:138
 msgid "%a %b %e %Y"
 msgstr ""
 
@@ -69,7 +251,7 @@ msgstr ""
 #. en_US example: "%a %b %e" --> "Sat Oct 31"
 #. en_GB example: "%a %e %b" --> "Sat 31 Oct"
 #. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
+#: src/formatter-desktop.cpp:147
 msgid "%a %b %e"
 msgstr ""
 
@@ -77,7 +259,7 @@ msgstr ""
 #. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
 #. This format string shows the abbreviated weekday.
 #. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
+#: src/formatter-desktop.cpp:154
 #, c-format
 msgid "%a"
 msgstr ""
@@ -88,7 +270,7 @@ msgstr ""
 #. en_US example: "%b %e %Y" --> "Oct 31 2020"
 #. en_GB example: "%e %b %Y" --> "31 Oct 2020"
 #. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
+#: src/formatter-desktop.cpp:163
 msgid "%b %e %Y"
 msgstr ""
 
@@ -98,12 +280,12 @@ msgstr ""
 #. en_US example: "%b %e" --> "Mar 27"
 #. en_GB example: "%e %b" --> "27 Mar"
 #. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
+#: src/formatter-desktop.cpp:172
 msgid "%b %e"
 msgstr ""
 
 #. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
+#: src/formatter-desktop.cpp:176
 msgid "%Y"
 msgstr ""
 
@@ -112,71 +294,80 @@ msgstr ""
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr ""
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr ""
 
-#: ../src/utils.c:274
+#: src/utils.c:274
 msgid "Today"
 msgstr ""
 
-#: ../src/utils.c:278
+#: src/utils.c:278
 msgid "Tomorrow"
 msgstr ""
 
 #. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/utils.c:283
 #, c-format
 msgid "%A"
 msgstr ""
@@ -186,7 +377,7 @@ msgstr ""
 #. en_US example: "%a %b %d" --> "Sat Oct 31"
 #. en_GB example: "%a %d %b" --> "Sat 31 Oct"
 #. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
+#: src/utils.c:292
 msgid "%a %d %b"
 msgstr ""
 
@@ -195,7 +386,7 @@ msgstr ""
 #. (Note: the space between the day and the time is an em space (unicode character 2003), which is
 #. slightly wider than a normal space.)
 #. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
+#: src/utils.c:313
 msgid "Tomorrow %l:%M %p"
 msgstr ""
 
@@ -204,7 +395,7 @@ msgstr ""
 #. (Note: the space between the day and the time is an em space (unicode character 2003), which is
 #. slightly wider than a normal space.)
 #. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
+#: src/utils.c:322
 msgid "%a %l:%M %p"
 msgstr ""
 
@@ -214,7 +405,7 @@ msgstr ""
 #. slightly wider than a normal space.)
 #. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
 #. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
+#: src/utils.c:332
 msgid "%a %d %b %l:%M %p"
 msgstr ""
 
@@ -223,7 +414,7 @@ msgstr ""
 #. (Note: the space between the day and the time is an em space (unicode character 2003), which is
 #. slightly wider than a normal space.)
 #. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
+#: src/utils.c:353
 msgid "Tomorrow %H:%M"
 msgstr ""
 
@@ -232,7 +423,7 @@ msgstr ""
 #. (Note: the space between the day and the time is an em space (unicode character 2003), which is
 #. slightly wider than a normal space.)
 #. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
+#: src/utils.c:362
 msgid "%a %H:%M"
 msgstr ""
 
@@ -242,6 +433,6 @@ msgstr ""
 #. slightly wider than a normal space.)
 #. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
 #. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
+#: src/utils.c:372
 msgid "%a %d %b %H:%M"
 msgstr ""
diff --git a/po/az.po b/po/az.po
index a586465..e6708b1 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/be.po b/po/be.po
index f0b4825..890595f 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,250 +6,160 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2020-09-26 17:41+0000\n"
 "Last-Translator: Viktar Vauchkevich <victorenator@gmail.com>\n"
-"Language-Team: Belarusian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/be/>\n"
+"Language-Team: Belarusian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/be/>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Стандартны гукавы файл каляндара."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Калі ў каляндара няма ўласнага гукавога файлу, гэты файл будзе выкарыстаны "
-"як запасны."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a, %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a, %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Дадаць падзею…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Гадзіннік"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Налады часу і даты…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Дата і час"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Час і дата"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (будзільнік)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Будзільнік %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Добра"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Задрамаць"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Сёння"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Стандартны гукавы файл каляндара."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Калі ў каляндара няма ўласнага гукавога файлу, гэты файл будзе "
+#~ "выкарыстаны як запасны."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Учора"
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a, %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a, %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Заўтра %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a, %b %d %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Сёння"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Заўтра %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Учора"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a, %b %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Заўтра %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a, %b %d %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Заўтра %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a, %b %d %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Паказаць гадзіннік у панэлі"
diff --git a/po/bem.po b/po/bem.po
index b8a5663..069d947 100644
--- a/po/bem.po
+++ b/po/bem.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index dff5bdd..afa85c5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2020-04-14 12:11+0000\n"
 "Last-Translator: geni <me@geni.site>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/ayatana-"
@@ -19,237 +19,85 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Стандартният звуков файл на календара."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-#, fuzzy
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Ако алармата не указва свой собствен звуков файл, ще се използва този звуков "
-"файл."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Стандартният звуков файл на календара."
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Ако алармата не указва свой собствен звуков файл, ще се използва този "
+#~ "звуков файл."
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Покажи часовника на панела"
diff --git a/po/bn.po b/po/bn.po
index 5d99703..db472b8 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/bo.po b/po/bo.po
index a35cc27..d3340f2 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/br.po b/po/br.po
index e88c24a..2bbfea8 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 15dfc74..243b7b8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index f07b6f5..5a33b9f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,246 +6,156 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-11-03 01:26+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
+"PO-Revision-Date: 2023-06-23 22:48+0000\n"
 "Last-Translator: Joan CiberSheep <cibersheep@gmail.com>\n"
-"Language-Team: Catalan <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/ca/>\n"
+"Language-Team: Catalan <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "El fitxer de so per defecte del calendari."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Si un esdeveniment de calendari o recordatori no especifica el seu propi "
-"fitxer de so, s'utilitzarà aquest."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.18.1\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Afegeix un esdeveniment…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Rellotge"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Paràmetres de la data i l'hora…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data i hora"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Paràmetres d'hora i data, accés ràpid al calendari"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Hora i data"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (té alarmes)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarma %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Esdeveniment %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "D'acord"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Ajorna"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Avui"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "El fitxer de so per defecte del calendari."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Si un esdeveniment de calendari o recordatori no especifica el seu propi "
+#~ "fitxer de so, s'utilitzarà aquest."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Demà"
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Demà %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Avui"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Demà %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Demà"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Demà %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Demà %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 663b34d..c2fb0bc 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ce.po b/po/ce.po
index f183027..1498c60 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ckb.po b/po/ckb.po
index 502d9d4..d1d71b4 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/co.po b/po/co.po
index a406821..1863f2d 100644
--- a/po/co.po
+++ b/po/co.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/crh.po b/po/crh.po
index f54abfc..73ea7d6 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 6f7d015..46ef823 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-10-29 23:26+0000\n"
-"Last-Translator: Milan Korecky <milan.korecky@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
+"PO-Revision-Date: 2023-10-10 17:03+0000\n"
+"Last-Translator: Tomáš Marný <tomik.marny@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/ayatana-indicators/"
 "datetime-applet/cs/>\n"
 "Language: cs\n"
@@ -17,238 +17,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.3.2-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Výchozí zvukový soubor pro upozornění."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Pokud událost kalendáře nebo připomenutí neurčí svůj vlastní zvukový soubor, "
-"bude tento soubor použit jako záložní zvuk."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e %Y"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 5.1-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+msgstr "%A, %e. %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Přidat událost…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Hodiny"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Nastavení data a času…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Datum a čas"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Nastavení času a data, rychlý přístup ke kalendáři"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Čas a datum"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (má alarmy)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Budík %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Události %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Odložit"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Dnes"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Výchozí zvukový soubor pro upozornění."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Pokud událost kalendáře nebo připomenutí neurčí svůj vlastní zvukový "
+#~ "soubor, bude tento soubor použit jako záložní zvuk."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Zítra"
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Zítra %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Dnes"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Zítra %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Zítra"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %b %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Zítra %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Zítra %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %b %d %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Zobrazovat hodiny na panelu"
diff --git a/po/csb.po b/po/csb.po
index fe991ac..3fd2e7d 100644
--- a/po/csb.po
+++ b/po/csb.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/cv.po b/po/cv.po
index d06c366..aa2231d 100644
--- a/po/cv.po
+++ b/po/cv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 3ad0aad..4a58cc9 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 2fd4d76..e0ffced 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2020-07-04 23:41+0000\n"
 "Last-Translator: Tobias p <sorenautonom667@gmail.com>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/ayatana-"
@@ -19,236 +19,111 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Kalenderens standard lydfil."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Hvis en kalender- eller påmindelsesbegivenhed ikke specificerer sin egen "
-"lydfil, bruges denne fil som en tilbagevendende lyd."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-#, fuzzy
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%I:%s"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%i"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%D %d %M %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%D %d %M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%d %M %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "tilføj Hændelse…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Ur"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 #, fuzzy
 msgid "Time and Date Settings…"
 msgstr "Tid & Dato indstillinger…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Dato og Tid"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "Tid og  Dato"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (har alarmer)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, fuzzy, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Slumre"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "I dag"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Kalenderens standard lydfil."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "I morgen"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Hvis en kalender- eller påmindelsesbegivenhed ikke specificerer sin egen "
+#~ "lydfil, bruges denne fil som en tilbagevendende lyd."
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
-#, c-format
-msgid "%A"
-msgstr ""
+#, fuzzy
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr ""
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%I:%s"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
+#~ msgid "%H:%M"
+#~ msgstr "%H:%i"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%D %d %M %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
+#~ msgid "%a %b %e"
+#~ msgstr "%D %d %M"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#~ msgid "%b %e %Y"
+#~ msgstr "%d %M %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#~ msgid "Today"
+#~ msgstr "I dag"
+
+#~ msgid "Tomorrow"
+#~ msgstr "I morgen"
diff --git a/po/de.po b/po/de.po
index 1e35fa5..83e70af 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,249 +6,159 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-11-11 17:28+0000\n"
-"Last-Translator: mv87 <mv87@dismail.de>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/de/>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
+"PO-Revision-Date: 2022-09-14 11:45+0000\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Die Standard-Audiodatei des Kalenders."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Wenn ein Kalender- oder Erinnerungsereignis keine eigene Audiodatei angibt, "
-"wird stattdessen diese Datei verwendet."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Ereignis hinzufügen…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Uhr"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Zeit und Datum einstellen …"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Zeit- & Datumseinstellungen, Schnellzugriff auf den Kalender"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Zeit und Datum"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s1 (hat einen Alarm)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Termin %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Schlummertaste"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Heute"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Die Standard-Audiodatei des Kalenders."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Morgen"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Wenn ein Kalender- oder Erinnerungsereignis keine eigene Audiodatei "
+#~ "angibt, wird stattdessen diese Datei verwendet."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "Sat 31 Oct"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Morgen %H:%M"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %b. %d %H:%M"
+#~ msgid "Today"
+#~ msgstr "Heute"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Morgen um %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Morgen"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %b %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "Sat 31 Oct"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Morgen %H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %b. %d %H:%M"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Morgen um %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %b %d %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Die Uhr auf dem Panel anzeigen"
@@ -412,8 +322,8 @@ msgstr "%a %b %d %H:%M"
 #~ "are currently supported: 'pulse', 'none'."
 #~ msgstr ""
 #~ "Welche Art haptischer Rückmeldung, falls vorhanden, soll mit einem Alarm "
-#~ "ausgelöst werden. Derzeit werden zwei Modi unterstützt: \"Puls\", \"keine"
-#~ "\"."
+#~ "ausgelöst werden. Derzeit werden zwei Modi unterstützt: \"Puls\", "
+#~ "\"keine\"."
 
 #~ msgid "The alarm's default volume level."
 #~ msgstr "Die Standard Alarm Lautstärke."
diff --git a/po/dv.po b/po/dv.po
index c7ba8b9..0019949 100644
--- a/po/dv.po
+++ b/po/dv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 2745bb1..ff58eaa 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2021-02-05 22:42+0000\n"
 "Last-Translator: Michalis <michalisntovas@yahoo.gr>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -19,233 +19,73 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.5-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr "Εντάξει"
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
+msgstr "Εντάξει"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Show the clock in the panel"
diff --git a/po/en_AU.po b/po/en_AU.po
index 8aac1e9..789bf7a 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2020-10-11 01:26+0000\n"
 "Last-Translator: Rob Pearson <rob.dunedin@gmail.com>\n"
 "Language-Team: English (Australia) <https://hosted.weblate.org/projects/"
@@ -19,236 +19,146 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "The calendar's default sound file."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Add Event…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Clock"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Time and Date Settings…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Time and Date"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (has alarms)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Snooze"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Today"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "The calendar's default sound file."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Tomorrow"
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Tomorrow %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Today"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Tomorrow %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Tomorrow"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Tomorrow %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Tomorrow %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Show the clock in the panel"
diff --git a/po/en_CA.po b/po/en_CA.po
index c27b6df..591da6a 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2020-12-31 03:29+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
-"Language-Team: English (Canada) <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/en_CA/>\n"
+"Language-Team: English (Canada) <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/en_CA/>\n"
 "Language: en_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,236 +19,146 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.4.1-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "The calendar's default sound file."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Add Event…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Clock"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Time and date settings…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Time and Date"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (has alarms)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Snooze"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Today"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "The calendar's default sound file."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Tomorrow"
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Tomorrow %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Today"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Tomorrow %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Tomorrow"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Tomorrow %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Tomorrow %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Show the clock in the panel"
diff --git a/po/en_GB.po b/po/en_GB.po
index 4dd02b6..23cd3d9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2020-10-11 01:26+0000\n"
 "Last-Translator: Rob Pearson <rob.dunedin@gmail.com>\n"
 "Language-Team: English (United Kingdom) <https://hosted.weblate.org/projects/"
@@ -19,236 +19,146 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "The calendar's default sound file."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Add Event…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Clock"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Time and Date Settings…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Time and Date"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (has alarms)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Snooze"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Today"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "The calendar's default sound file."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Tomorrow"
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Tomorrow %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Today"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Tomorrow %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Tomorrow"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Tomorrow %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Tomorrow %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Show the clock in the panel"
diff --git a/po/eo.po b/po/eo.po
index ce506d8..73c0e93 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2021-11-24 14:50+0000\n"
 "Last-Translator: phlostically <phlostically@mailinator.com>\n"
-"Language-Team: Esperanto <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/eo/>\n"
+"Language-Team: Esperanto <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/eo/>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,233 +19,143 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "La implicita sondosiero de la kalendaro."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Se kalendara aŭ memoriga evento ne specifas sian propran sondosieron, ĉi tiu "
-"dosiero estos implicita."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %P"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %P"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %ea de %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %ea de %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%ea de %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%ea de %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, la %ea de %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Skribi eventon…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Horloĝo"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Agordoj pri horo kaj dato…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Dato kaj horo"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Horo kaj dato"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (havas alarmojn)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %P"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarmo %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Bone"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Dormeti"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Hodiaŭ"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "La implicita sondosiero de la kalendaro."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Se kalendara aŭ memoriga evento ne specifas sian propran sondosieron, ĉi "
+#~ "tiu dosiero estos implicita."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %P"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %P"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Morgaŭ"
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %ea de %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %ea de %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %da de %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%ea de %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Morgaŭ %l:%M %P"
+#~ msgid "%b %e"
+#~ msgstr "%ea de %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %P"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %da de %b %l:%M %P"
+#~ msgid "Today"
+#~ msgstr "Hodiaŭ"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Morgaŭ %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Morgaŭ"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %da de %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %da de %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Morgaŭ %l:%M %P"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %P"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %da de %b %l:%M %P"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Morgaŭ %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %da de %b %H:%M"
diff --git a/po/es.po b/po/es.po
index 93f8e0f..cc58f4f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,249 +6,159 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2021-08-28 05:33+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/es/>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
+"PO-Revision-Date: 2023-03-04 14:40+0000\n"
+"Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.8.1-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Archivo de sonido predeterminado de la alarma."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Si un evento de recordatorio o alarma no especifica su propio archivo de "
-"sonido, este archivo se utilizará como sonido de reserva."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.16.2-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Añadir evento…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Reloj"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Configuración de fecha y hora…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Configuración de hora y fecha, acceso rápido al calendario"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Hora y fecha"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (tiene alarmas)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarma %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Evento %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Repetición"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Hoy"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Archivo de sonido predeterminado de la alarma."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Mañana"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Si un evento de recordatorio o alarma no especifica su propio archivo de "
+#~ "sonido, este archivo se utilizará como sonido de reserva."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Mañana %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %b %d %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Hoy"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Mañana %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Mañana"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %b %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Mañana %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %b %d %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Mañana %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %b %d %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Mostrar el reloj en el panel"
diff --git a/po/et.po b/po/et.po
index 33007d9..8209f65 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,249 +6,159 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2021-01-17 07:32+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
+"PO-Revision-Date: 2022-10-20 10:06+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
-"Language-Team: Estonian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/et/>\n"
+"Language-Team: Estonian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/et/>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Kalendri vaikimisi helifail."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Kui kalendris või alarmis ei ole määratud kohandatud heli, siis kasutatakse "
-"seda faili vaikimisi heliks."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%I:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a, %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a, %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.14.2-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Lisa sündmus…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Kell"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Aja ja kuupäeva seaded…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Kuupäev ja aeg"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Kella ja kuupäeva seaded, kiire juurdepääs kalendrile"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Aeg ja kuupäev"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (alarmidega)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %I:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Sündmus %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "ÕK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Korda"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Täna"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Kalendri vaikimisi helifail."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Homme"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Kui kalendris või alarmis ei ole määratud kohandatud heli, siis "
+#~ "kasutatakse seda faili vaikimisi heliks."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%I:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%I:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a, %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a, %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a, %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Tomorrow %I:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %I:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a, %b %d %I:%M %p"
+#~ msgid "Today"
+#~ msgstr "Täna"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Homme %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Homme"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %b %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a, %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Tomorrow %I:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %I:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a, %b %d %I:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Homme %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %b %d %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Kuva kellaaeg paneelil"
diff --git a/po/eu.po b/po/eu.po
index 2b2d07e..f5a2c7f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:54+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index d3f700e..afd2252 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-08-04 18:32+0000\n"
 "Last-Translator: Abbas Baharforoosh <abahar1996@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/ayatana-"
@@ -19,235 +19,89 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "فایل صدای پیش فرض تقویم."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"در صورتی که برای تقدیم یا یادآور هیچ فایل صدایی مشخص نشده باشد، از این فایل "
-"صدا استفاده خواهد شد."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "افزودن رویداد…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "ساعت"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 #, fuzzy
 msgid "Time and Date Settings…"
 msgstr "تنظیمات زمان و تاریخ…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "تاریخ و زمان"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "زمان و تاریخ"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (هشدار دارد)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "امروز"
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "فردا"
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
+#~ msgid "The calendar's default sound file."
+#~ msgstr "فایل صدای پیش فرض تقویم."
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "در صورتی که برای تقدیم یا یادآور هیچ فایل صدایی مشخص نشده باشد، از این "
+#~ "فایل صدا استفاده خواهد شد."
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#~ msgid "Today"
+#~ msgstr "امروز"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#~ msgid "Tomorrow"
+#~ msgstr "فردا"
diff --git a/po/fi.po b/po/fi.po
index 25464b9..1fa783b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,231 +17,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/fil.po b/po/fil.po
index 00b7ccb..669458b 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/fo.po b/po/fo.po
index 08f3206..da9426b 100644
--- a/po/fo.po
+++ b/po/fo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,231 +17,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index b72b2dc..d7b2517 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-12-31 03:29+0000\n"
-"Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2024-03-25 13:01+0000\n"
+"Last-Translator: Steve <steve.kueffer.ch@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/"
 "ayatana-indicators/datetime-applet/fr/>\n"
 "Language: fr\n"
@@ -17,238 +17,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.4.1-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Fichier sonore par défaut du calendrier."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Si une alarme ne spécifie pas son propre fichier sonore, ce fichier sera "
-"utilisé comme son de secours."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 5.5-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Ajouter un évènement…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Horloge"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Paramètres de date et d'heure…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Réglage de l'heure et de la date, accès rapide au calendrier"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Heure et date"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (a des alarmes)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarme %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Événements %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Répéter"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Aujourd'hui"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Fichier sonore par défaut du calendrier."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Demain"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Si une alarme ne spécifie pas son propre fichier sonore, ce fichier sera "
+#~ "utilisé comme son de secours."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Demain %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %b %d %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Aujourd'hui"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Demain %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Demain"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %b %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Demain %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %b %d %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Demain %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %b %d %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Montrer l'horloge dans les panneau"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 6e8e967..00ad02e 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-12-31 03:29+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
-"Language-Team: French (Canada) <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/fr_CA/>\n"
+"Language-Team: French (Canada) <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/fr_CA/>\n"
 "Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,233 +19,143 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.4.1-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Fichier sonore par défaut du calendrier."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Si une alarme ne spécifie pas son propre fichier sonore, ce fichier sera "
-"utilisé comme son de secours."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Ajouter un évènement…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Horloge"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Paramètres de date et d'heure…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Heure et date"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (a des alarmes)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarme %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Répéter"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Aujourd'hui"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Fichier sonore par défaut du calendrier."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Si une alarme ne spécifie pas son propre fichier sonore, ce fichier sera "
+#~ "utilisé comme son de secours."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Demain"
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Demain %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Aujourd'hui"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Demain %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Demain"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Demain %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Demain %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
diff --git a/po/frp.po b/po/frp.po
index b91617d..e4c3f35 100644
--- a/po/frp.po
+++ b/po/frp.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/fur.po b/po/fur.po
index ba1b912..9c68783 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/fy.po b/po/fy.po
index b768318..68b7d47 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ga.po b/po/ga.po
index 7769e22..909176a 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,231 +17,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/gd.po b/po/gd.po
index 635e1fa..c69a7a0 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2021-11-17 14:52+0000\n"
 "Last-Translator: Phil Clifford <philip.clifford@gmail.com>\n"
-"Language-Team: Gaelic <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/gd/>\n"
+"Language-Team: Gaelic <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/gd/>\n"
 "Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,231 +20,71 @@ msgstr ""
 "(n > 2 && n < 20) ? 2 : 3;\n"
 "X-Generator: Weblate 4.9.1-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Ceann-latha agus àm"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 907be57..63f964c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2018-10-24 16:29+0000\n"
 "Last-Translator: Iván Seoane <ivanrsm1997@gmail.com>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/ayatana-"
@@ -19,240 +19,150 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.3-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-#, fuzzy
-msgid "The calendar's default sound file."
-msgstr "Ficheiro de son predeterminado da alarma."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-#, fuzzy
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Se unha alarma non especifica o seu propio ficheiro de son, este ficheiro "
-"empregarase coma o son da reserva."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Engadir acontecemento…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Reloxo"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 #, fuzzy
 msgid "Time and Date Settings…"
 msgstr "Axustes da data e hora…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "Hora e data"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (ten alarmas)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarma %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Feito"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Repetición"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Hoxe"
+#, fuzzy
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Ficheiro de son predeterminado da alarma."
+
+#, fuzzy
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Se unha alarma non especifica o seu propio ficheiro de son, este ficheiro "
+#~ "empregarase coma o son da reserva."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Mañá"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Mañá %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %b %d %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Hoxe"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Mañá %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Mañá"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %b %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Mañá %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %b %d %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Mañá %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %b %d %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Amosa-lo reloxo no panel"
diff --git a/po/gu.po b/po/gu.po
index 8ae312b..bfbcd89 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/gv.po b/po/gv.po
index 2c1af93..3140b7a 100644
--- a/po/gv.po
+++ b/po/gv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 93701ed..3cadfed 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,247 +6,159 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-10-01 21:41+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-09-23 06:18+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/he/>\n"
+"Language-Team: Hebrew <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.3-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "קובץ השמע של לוח השנה כבררת מחדל."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
+"X-Generator: Weblate 4.14.1\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
-msgstr ""
+msgstr "%A, %e ב%B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
-msgstr ""
+msgstr "הוספת אירוע…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
-msgstr ""
+msgstr "שעון"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
-msgstr ""
+msgstr "הגדרות שעה ותאריך…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
-msgstr ""
+msgstr "תאריך ושעה"
+
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "הגדרות שעה ותאריך, גישה מהירה ללוח השנה"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "שעה ותאריך"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
-msgstr ""
+msgstr "%s (יש התראות)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
-msgstr ""
+msgstr "%a, %H:%M"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
-msgstr ""
+msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
-msgstr ""
+msgstr "התראה %s"
+
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "אירוע %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "אישור"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
-msgstr ""
+msgstr "נודניק"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
+#~ msgid "The calendar's default sound file."
+#~ msgstr "קובץ השמע של לוח השנה כבררת מחדל."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "אם אירוע בלוח השנה או תזכורת לא ציין קובץ שמע משל עצמו, הקובץ הזה יושמע "
+#~ "במקום."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b ב%e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b ב%e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr ""
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr ""
+#~ msgid "%b %e %Y"
+#~ msgstr "%b ב%e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
+#~ msgid "%b %e"
+#~ msgstr "%b ב%e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
+#~ msgid "Today"
+#~ msgstr "היום"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
+#~ msgid "Tomorrow"
+#~ msgstr "מחר"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d ב%b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "מחר ב־%H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a ב־%H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d ב%b ב־%H:%M"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "מחר %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a ב־%H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d ב%b ב־%H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "הצגת השעון בחלונית"
diff --git a/po/hi.po b/po/hi.po
index 7c3c39c..f1aa598 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2010-03-03 10:06-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Hindi\n"
@@ -16,234 +16,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "समय और तिथि सेट करें..."
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Error getting time"
diff --git a/po/hr.po b/po/hr.po
index 2091450..4d328da 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,250 +6,160 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-12-03 02:29+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-12-31 15:49+0000\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
-"Language-Team: Croatian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/hr/>\n"
+"Language-Team: Croatian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/hr/>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.4-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Standardna zvučna datoteka kalendara."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Ako kalendar ili događaj podsjetnika ne određuju vlastitu zvučnu datoteku, "
-"ova će se datoteka koristiti kao rezervni zvuk."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e. %m. %Y."
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e. %m."
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e. %m. %Y."
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e. %m."
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y."
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e. %B. %Y."
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Dodaj događaj …"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Sat"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Postavke za vrijeme i datum …"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Datum i vrijeme"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Postavke za vrijeme i datum. Brz pristup kalendaru"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Vrijeme i datum"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (ima alarme)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %H:%M"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Događaj %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "U redu"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Odgodi alarm"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Danas"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Standardna zvučna datoteka kalendara."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Ako kalendar ili događaj podsjetnika ne određuju vlastitu zvučnu "
+#~ "datoteku, ova će se datoteka koristiti kao rezervni zvuk."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Sutra"
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e. %m. %Y."
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e. %m."
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d. %m."
+#~ msgid "%b %e %Y"
+#~ msgstr "%e. %m. %Y."
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Sutra %H:%M"
+#~ msgid "%b %e"
+#~ msgstr "%e. %m."
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#~ msgid "%Y"
+#~ msgstr "%Y."
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d. %m %H:%M"
+#~ msgid "Today"
+#~ msgstr "Danas"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Sutra %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Sutra"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d. %m. %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d. %m."
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Sutra %H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d. %m %H:%M"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Sutra %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d. %m. %H:%M"
 
 #~ msgid "Error getting time"
 #~ msgstr "Greška pri dohvaćanju vremena"
diff --git a/po/ht.po b/po/ht.po
index 3d01fd0..f415c0b 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 9a9fe69..2511693 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,250 +6,159 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2021-04-24 18:32+0000\n"
-"Last-Translator: Ács Zoltán <acszoltan111@gmail.com>\n"
-"Language-Team: Hungarian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/hu/>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-01-08 13:54+0000\n"
+"Last-Translator: wigy <wigy@tuta.io>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.7-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "A naptár alapértelmezett hangfájlja."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Ha egy naptár vagy eseményemlékeztető nem határoz meg saját hangfájlt, akkor "
-"ez a fájl lesz használva tartalék hangként."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%p %l:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%b %d, %a %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-#, fuzzy
-msgid "%a %b %e"
-msgstr "%b %e, %a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%Y %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.10.1\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Esemény hozzáadása…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Óra"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Idő és dátum beállítások…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Dátum és idő"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Idő és dátum"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (riasztásokkal rendelkezik)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "%s riasztás"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Szundi"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Ma"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "A naptár alapértelmezett hangfájlja."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Ha egy naptár vagy eseményemlékeztető nem határoz meg saját hangfájlt, "
+#~ "akkor ez a fájl lesz használva tartalék hangként."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%p %l:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Holnap"
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%b %e, %a %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%b %e, %a"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%b %d, %a"
+#~ msgid "%b %e %Y"
+#~ msgstr "%Y %b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Holnap %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%b %d, %a %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Ma"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Holnap %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Holnap"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%b %d, %a %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%b %d, %a"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Holnap %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%b %d, %a %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Holnap %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%b %d, %a %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Mutassa az órát a panelen"
diff --git a/po/hy.po b/po/hy.po
index f03c80c..4da24d0 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-04-02 21:09+0000\n"
 "Last-Translator: Davit Mayilyan <davit.mayilyan@protonmail.ch>\n"
 "Language-Team: Armenian <https://hosted.weblate.org/projects/ayatana-"
@@ -19,231 +19,83 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Ժամ"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr "Լավ"
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Այսօր"
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Վաղը"
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Վաղը %l:%M %p"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
+msgstr "Լավ"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
+#~ msgid "Today"
+#~ msgstr "Այսօր"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Վաղը %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Վաղը"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Վաղը %l:%M %p"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Վաղը %H:%M"
diff --git a/po/ia.po b/po/ia.po
index c8af73f..a6bd371 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index e45a59e..d12f4cc 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2021-03-18 17:29+0000\n"
 "Last-Translator: Reza Almanda <rezaalmanda27@gmail.com>\n"
-"Language-Team: Indonesian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/id/>\n"
+"Language-Team: Indonesian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,233 +19,143 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.5.2-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Berkas suara standar kalender."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Jika kalender atau pengingat acara tidak menentukan berkas suaranya sendiri, "
-"berkas ini akan digunakan sebagai pengganti."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Tambah acara…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Jam"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Pengaturan waktu dan tanggal…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Tanggal dan Waktu"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Waktu dan Tanggal"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (memiliki alarm)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Oke"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Senyap"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Hari ini"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Berkas suara standar kalender."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Jika kalender atau pengingat acara tidak menentukan berkas suaranya "
+#~ "sendiri, berkas ini akan digunakan sebagai pengganti."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Besok"
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Besok %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Hari ini"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Besok %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Besok"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Besok %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Besok %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
diff --git a/po/is.po b/po/is.po
index a9de7fa..c9dbded 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 8e742cf..531169f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,249 +6,159 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2021-11-05 20:35+0000\n"
-"Last-Translator: Michele <miguel2000@livecom.it>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/it/>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2023-06-28 10:51+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@tuta.io>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.9-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Il file audio di default del calendario."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Se un calendario o un promemoria non specifica il proprio file audio, questo "
-"file sarà usato come suono."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.18.1\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Aggiungi un evento…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Orologio"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Impostazioni ora e data…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data e ora"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Impostazioni data e ora, accesso rapido al calendario"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Ora e data"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (ha allarmi)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Allarme %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Evento %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Rimanda"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Oggi"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Il file audio di default del calendario."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Domani"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Se un calendario o un promemoria non specifica il proprio file audio, "
+#~ "questo file sarà usato come suono."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Domani %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Oggi"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Domani %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Domani"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Domani %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Domani %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "What the time format should be"
 #~ msgstr "Quale dovrebbe essere il formato orario"
diff --git a/po/it_CARES.po b/po/it_CARES.po
index 2c8bbf3..0000974 100644
--- a/po/it_CARES.po
+++ b/po/it_CARES.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 44f3eec..8221618 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-09-07 10:36+0000\n"
 "Last-Translator: Baka Gaijin <lewdwarrior@waifu.club>\n"
-"Language-Team: Japanese <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/ja/>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,234 +19,146 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "カレンダーのデフォルトのサウンドファイル."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr "カレンダーやリマインダーイベントが独自のサウンドファイルを指定していない場合、このファイルがフォールバックサウンドとして使用されます."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%Y年%m月%d日 (%a)"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%m月%d日 (%a)"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%Y年%m月%d日"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%m月%d日"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%Y年%m月%d日 (%A)"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "イベントを追加…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "時計"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "時間と日付の設定…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "日付と時計"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "時刻と日付"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (アラームあり)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a %H:%M"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "アラーム %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "了解"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "スヌーズ"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "今日"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "カレンダーのデフォルトのサウンドファイル."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "カレンダーやリマインダーイベントが独自のサウンドファイルを指定していない場"
+#~ "合、このファイルがフォールバックサウンドとして使用されます."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "明日"
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%Y年%m月%d日 (%a)"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%m月%d日 (%a)"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%m月%d日 (%a)"
+#~ msgid "%b %e %Y"
+#~ msgstr "%Y年%m月%d日"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "明日 ％H:%M"
+#~ msgid "%b %e"
+#~ msgstr "%m月%d日"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%m月%d日 (%a) %H:%M"
+#~ msgid "Today"
+#~ msgstr "今日"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "明日 ％H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "明日"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%m月%d日 (%a) %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%m月%d日 (%a)"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "明日 ％H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%m月%d日 (%a) %H:%M"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "明日 ％H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%m月%d日 (%a) %H:%M"
 
 #~ msgid "Error getting time"
 #~ msgstr "時刻を取得できません"
diff --git a/po/ka.po b/po/ka.po
index 14c378e..e562474 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/kk.po b/po/kk.po
index 3123f13..6be58be 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/kl.po b/po/kl.po
index 09dc366..b855b5a 100644
--- a/po/kl.po
+++ b/po/kl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index bc2a2d2..b59b793 100644
--- a/po/km.po
+++ b/po/km.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/kmr.po b/po/kmr.po
index 5aaaead..1eb335e 100644
--- a/po/kmr.po
+++ b/po/kmr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 1590dc0..39cec4f 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 3193ae6..60022c2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-06-15 05:41+0000\n"
-"Last-Translator: MarongHappy <daemul72@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-09-30 18:15+0000\n"
+"Last-Translator: 이정희 <daemul72@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/ayatana-"
 "indicators/datetime-applet/ko/>\n"
 "Language: ko\n"
@@ -17,240 +17,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.1-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "일정관리의 기본 사운드 파일입니다."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"일정관리 또는 미리 알림 이벤트가 자체 사운드 파일을 지정하지 않으면 이 파일"
-"이 대체 사운드로 사용됩니다."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.14.1\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "이벤트 추가…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "시계"
 
-#: ../src/menu.cpp:414
-#, fuzzy
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "시간 및 날짜 설정…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
-msgstr "시간 및 날짜"
+msgstr "날짜 및 시간"
 
-#: ../src/menu.cpp:520
-#, fuzzy
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "시간 및 날짜 설정, 빠른 달력 액세스"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "시간 및 날짜"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (알람 있음)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "알람 %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "이벤트 %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "확인"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "졸기"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "오늘"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "일정관리의 기본 사운드 파일입니다."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "일정관리 또는 미리 알림 이벤트가 자체 사운드 파일을 지정하지 않으면 이 파"
+#~ "일이 대체 사운드로 사용됩니다."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "내일"
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "내일 %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "오늘"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "내일 %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "내일"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "내일 %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "내일 %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "Error getting time"
 #~ msgstr "시간 가져오기 오류"
diff --git a/po/ku.po b/po/ku.po
index 02df50c..3bbb02f 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/kw.po b/po/kw.po
index 4476cfa..3633a49 100644
--- a/po/kw.po
+++ b/po/kw.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ky.po b/po/ky.po
index 4faa0b3..f7317ed 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/la.po b/po/la.po
index ce20ac4..e9a55d7 100644
--- a/po/la.po
+++ b/po/la.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/lb.po b/po/lb.po
index 25fdd80..d079cba 100644
--- a/po/lb.po
+++ b/po/lb.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/lo.po b/po/lo.po
index 9c1d5cb..f92bfe8 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 24dfa0d..6321f5c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,250 +6,161 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-10-05 18:26+0000\n"
-"Last-Translator: Moo <hazap@hotmail.com>\n"
-"Language-Team: Lithuanian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/lt/>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-10-18 19:03+0000\n"
+"Last-Translator: Gediminas Murauskas <muziejusinfo@gmail.com>\n"
+"Language-Team: Lithuanian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 4.3-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Kalendoriaus numatytasis garso failas."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Jeigu kalendorius ar priminimo įvykis nenurodo savo asmeninio garso failo, "
-"tuomet šis failas bus naudojamas kaip atsarginis garsas."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%Y %b %e, %a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%b %e, %a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%Y %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > "
+"19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? "
+"1 : 2);\n"
+"X-Generator: Weblate 4.15-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%Y %B %e, %A"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Pridėti įvykį…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Laikrodis"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Laiko ir datos nustatymai…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data ir laikas"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Laiko ir datos nustatymai, greita prieiga prie kalendoriaus"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Laikas ir data"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (yra signalų)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Signalas %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Įvykis %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Gerai"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Snūstelėti"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Šiandien"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Kalendoriaus numatytasis garso failas."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Rytoj"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Jeigu kalendorius ar priminimo įvykis nenurodo savo asmeninio garso "
+#~ "failo, tuomet šis failas bus naudojamas kaip atsarginis garsas."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%Y %b %e, %a"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%b %e, %a"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%b %d, %a"
+#~ msgid "%b %e %Y"
+#~ msgstr "%Y %b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Rytoj %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%b %d, %a %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Šiandien"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Rytoj %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Rytoj"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%b %d, %a %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%b %d, %a"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Rytoj %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%b %d, %a %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Rytoj %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%b %d, %a %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Rodyti skydelyje laikrodį"
@@ -403,9 +314,9 @@ msgstr "%b %d, %a %H:%M"
 #~ msgstr ""
 #~ "Kai kurios laiko juostos gali būti žinomos pagal daugelį įvairių miestų "
 #~ "ar pavadinimų. Šis nustatymas aprašo, kaip dabartinė laiko juosta "
-#~ "pageidauja būti pavadinta. Formatas yra toks: \"LAIKO_JUOSTA PAVADINIMAS"
-#~ "\" (pvz., \"Europe/Vilnius Alytus\" pavadins laiko juosta \"Vilnius\" "
-#~ "kaip \"Alytus\")."
+#~ "pageidauja būti pavadinta. Formatas yra toks: \"LAIKO_JUOSTA "
+#~ "PAVADINIMAS\" (pvz., \"Europe/Vilnius Alytus\" pavadins laiko juosta "
+#~ "\"Vilnius\" kaip \"Alytus\")."
 
 #~ msgid "What kind of haptic feedback, if any, to trigger with an alarm."
 #~ msgstr "Kokį kontaktinį grįžtamąjį ryšį sukelti su signalu."
diff --git a/po/lv.po b/po/lv.po
index 9861796..98f4dbb 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,231 +18,71 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/mg.po b/po/mg.po
index 952423f..84bb31e 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-04-20 22:11+0000\n"
 "Last-Translator: HuNteR GaMinG <rd7128089@gmail.com>\n"
 "Language-Team: Malagasy <https://hosted.weblate.org/projects/ayatana-"
@@ -19,231 +19,74 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.0.2-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Pubg uc"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Pubg uc"
diff --git a/po/mhr.po b/po/mhr.po
index 5a2412d..7b61cab 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/mi.po b/po/mi.po
index 3d87c01..a2670b8 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 402d9bd..5ac58a1 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2021-11-04 17:36+0000\n"
 "Last-Translator: ElectrifiedSpeed <electrifiedsped@gmail.com>\n"
-"Language-Team: Macedonian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/mk/>\n"
+"Language-Team: Macedonian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/mk/>\n"
 "Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,231 +19,74 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
 "X-Generator: Weblate 4.9-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Стандардната звучна датотека на календарот."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Стандардната звучна датотека на календарот."
diff --git a/po/ml.po b/po/ml.po
index 2cd0414..7505324 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 98c07c1..f4d5f20 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index b66d0cf..7849058 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/my.po b/po/my.po
index 285f012..b2b7a5e 100644
--- a/po/my.po
+++ b/po/my.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 4a28892..c0f3612 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-09-01 21:36+0000\n"
 "Last-Translator: klausade <klaus@linuxavdelingen.no>\n"
-"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/nb_NO/>\n"
+"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/nb_NO/>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,243 +19,153 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-#, fuzzy
-msgid "The calendar's default sound file."
-msgstr "Forvalgt lydfil for alarm."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr "Hvis en alarm ikke har egen lyd angitt, vil denne fila bli brukt."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-#, fuzzy
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-#, fuzzy
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e.%b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e. %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Legg til hendelse…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Klokke"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Tids- og dato-innstillinger…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Dato og tid"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Angi dato og klokkeslett"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (har alarmer)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 #, fuzzy
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 #, fuzzy
 msgid "%a, %H:%M"
 msgstr "%a. %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Slumre"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "I dag"
+#, fuzzy
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Forvalgt lydfil for alarm."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr "Hvis en alarm ikke har egen lyd angitt, vil denne fila bli brukt."
+
+#, fuzzy
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#, fuzzy
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "I morgen"
+#, c-format
+#~ msgid "%a"
+#~ msgstr "%a"
+
+#~ msgid "%b %e %Y"
+#~ msgstr "%e.%b %Y"
+
+#~ msgid "%b %e"
+#~ msgstr "%e. %b"
+
+#~ msgid "%Y"
+#~ msgstr "%Y"
+
+#~ msgid "Today"
+#~ msgstr "I dag"
+
+#~ msgid "Tomorrow"
+#~ msgstr "I morgen"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, fuzzy, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
 #, fuzzy
-msgid "%a %d %b"
-msgstr "%a. %d %b."
+#~ msgid "%a %d %b"
+#~ msgstr "%a. %d %b."
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
 #, fuzzy
-msgid "Tomorrow %l:%M %p"
-msgstr "I morgen %l:%M %p"
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "I morgen %l:%M %p"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
 #, fuzzy
-msgid "%a %l:%M %p"
-msgstr "%a. %l:%M %p"
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a. %l:%M %p"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
 #, fuzzy
-msgid "%a %d %b %l:%M %p"
-msgstr "%a. %b %d. %l:%M %p"
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a. %b %d. %l:%M %p"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "I morgen %H:%M"
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "I morgen %H:%M"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a. %H:%M"
+#~ msgid "%a %H:%M"
+#~ msgstr "%a. %H:%M"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a. %d. %b %H:%M"
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a. %d. %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Vis klokken i panelet"
diff --git a/po/ne.po b/po/ne.po
index 356d351..4b33b37 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index bd5bab5..16d7e62 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-01-16 13:21+0000\n"
-"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2023-03-17 11:37+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/ayatana-indicators/"
 "datetime-applet/nl/>\n"
 "Language: nl\n"
@@ -17,240 +17,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.11-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Het standaard geluidsbestand van de agenda."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Als een agenda of herinnering geen eigen geluidsbestand heeft, dan wordt dit "
-"bestand gebruikt om op terug te vallen."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.16.2-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%a %e %b %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
-msgstr "Gebeurtenis toevoegen…"
+msgstr "Afspraak toevoegen…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Klok"
 
-#: ../src/menu.cpp:414
-#, fuzzy
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
-msgstr "Tijd- en datuminstellingen…"
+msgstr "Datum- en tijdinstellingen…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Datum en tijd"
 
-#: ../src/menu.cpp:520
-#, fuzzy
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Datum- en tijdinstellingen, snelle agendatoegang"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
-msgstr "Tijd en datum"
+msgstr "Datum en tijd"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
-msgstr "%s (bevat alarmen)"
+msgstr "%s (bevat wekkers)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
-msgstr "Alarm %s"
+msgstr "Wekker %s"
+
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Afspraak %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Oké"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Uitstellen"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Vandaag"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Het standaard geluidsbestand van de agenda."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Morgen"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Als een agenda of herinnering geen eigen geluidsbestand heeft, dan wordt "
+#~ "dit bestand gebruikt om op terug te vallen."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Morgen %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Vandaag"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Morgen %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Morgen"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Morgen %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Morgen %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Tonen klok in paneel"
diff --git a/po/nn.po b/po/nn.po
index 0eb9a03..979dd60 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,231 +17,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ny.po b/po/ny.po
index 5038017..29ad8ac 100644
--- a/po/ny.po
+++ b/po/ny.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/oc.po b/po/oc.po
index a4844a4..2e96ff6 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -6,246 +6,156 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2021-04-24 18:32+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-09-15 22:17+0000\n"
 "Last-Translator: Quentin PAGÈS <quentinantonin@free.fr>\n"
-"Language-Team: Occitan <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/oc/>\n"
+"Language-Team: Occitan <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/oc/>\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.7-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Fichièr son per defaut del calendièr."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Se un calendièr o un recòrd d’eveniment especifica pas son pròpri fichièr "
-"son, aqueste fichièr serà utilizat a la plaça."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A %e %B de %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Ajustar un eveniment…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Relòtge"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Paramètres de data e ora…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data e ora"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Paramètres d’ora e de data, accès rapid al calendièr"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Data e ora"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (a alarmas)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a %H:%M"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarma %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Eveniment %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "D’acòrdi"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Repetir"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Uèi"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Fichièr son per defaut del calendièr."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Se un calendièr o un recòrd d’eveniment especifica pas son pròpri fichièr "
+#~ "son, aqueste fichièr serà utilizat a la plaça."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Deman"
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Deman %H:%M"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %H:%M"
+#~ msgid "Today"
+#~ msgstr "Uèi"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Deman %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Deman"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Deman %H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %H:%M"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Deman %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
diff --git a/po/os.po b/po/os.po
index e007728..dce817c 100644
--- a/po/os.po
+++ b/po/os.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 02ccd05..d0769e5 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 89973bd..4748841 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2019-10-08 16:58+0000\n"
-"Last-Translator: Mateusz Rumiński <matt.ruminski@protonmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2023-07-31 16:06+0000\n"
+"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/ayatana-"
 "indicators/datetime-applet/pl/>\n"
 "Language: pl\n"
@@ -18,240 +18,148 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.9-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Domyślny plik dźwiękowy powiadomienia kalendarza."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Jeśli  powiadomienie kalendarza lub przypomnienia nie określa własnego pliku "
-"dźwiękowego, plik ten będzie używany jako dźwięk zastępczy."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%G:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%R"
+"X-Generator: Weblate 5.0-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Dodaj wydarzenie…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Zegar"
 
-#: ../src/menu.cpp:414
-#, fuzzy
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Ustawienia czasu i daty…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data i godzina"
 
-#: ../src/menu.cpp:520
-#, fuzzy
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Ustawienia godziny i daty, szybki dostęp do kalendarza"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Data i godzina"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (ma alarmy)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Wydarzenie %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Drzemka"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Dzisiaj"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Domyślny plik dźwiękowy powiadomienia kalendarza."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Jutro"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Jeśli powiadomienie kalendarza lub przypomnienia nie określa własnego "
+#~ "pliku dźwiękowego, plik ten będzie używany jako dźwięk zastępczy."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%G:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Jutro %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%R"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Dzisiaj"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Jutro %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Jutro"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Jutro %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Jutro %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Pokaż zegar w panelu"
diff --git a/po/ps.po b/po/ps.po
index 2f05bdf..10dbc7a 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index a5bb76f..be8f1f2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2019-09-09 18:24+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2023-04-07 16:48+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/ayatana-"
 "indicators/datetime-applet/pt/>\n"
@@ -17,240 +17,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.9-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "O ficheiro de som predefinido do calendário."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Se um evento de calendário ou lembrete não especificar o seu próprio "
-"ficheiro de som, este ficheiro será usado como o som de retorno."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a, %d.%m.%Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a, %d.%m."
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%d. %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e. %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.17-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e. %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Adicionar evento…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Relógio"
 
-#: ../src/menu.cpp:414
-#, fuzzy
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
-msgstr "Definições de hora e data…"
+msgstr "Configurações de data e hora…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data e Hora"
 
-#: ../src/menu.cpp:520
-#, fuzzy
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Configurações de hora e data, acesso rápido ao calendário"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Hora e Data"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (tem alarmes)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarme %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Evento %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Soneca"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Hoje"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "O ficheiro de som predefinido do calendário."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Amanhã"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Se um evento de calendário ou lembrete não especificar o seu próprio "
+#~ "ficheiro de som, este ficheiro será usado como o som de retorno."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a, %d.%m.%Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a, %d.%m."
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a, %d. %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%d. %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Amanhã % l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e. %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a, %b. %d %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Hoje"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Amanhã %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Amanhã"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a, %b. %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a, %d. %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Amanhã % l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a, %b. %d %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Amanhã %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a, %b. %d %H:%M"
 
 #~ msgid "What the time format should be"
 #~ msgstr "Qual deve ser o formato da hora"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index de92629..e5ba650 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-12-31 03:29+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2024-04-11 08:01+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "ayatana-indicators/datetime-applet/pt_BR/>\n"
@@ -17,238 +17,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.4.1-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Arquivo de som padrão do calendário."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Se um evento de calendário ou lembrete não especificar seu próprio arquivo "
-"de som, este arquivo será usado como o som padrão."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 5.5-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Adicionar Evento…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Relógio"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Configuração de data e hora…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
-msgstr "Data e hora"
+msgstr "Dia e hora"
+
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Configurações de hora e data, acesso rápido ao calendário"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Data e Hora"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (há alarme)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
-msgstr "%a, %H:%M"
+msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarme %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Evento %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Soneca"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Hoje"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Arquivo de som padrão do calendário."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Amanhã"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Se um evento de calendário ou lembrete não especificar seu próprio "
+#~ "arquivo de som, este arquivo será usado como o som padrão."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a, %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Amanhã %H:%M"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a, %d %b %I:%M %p"
+#~ msgid "Today"
+#~ msgstr "Hoje"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Amanhã %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Amanhã"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a, %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a, %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Amanhã %H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a, %d %b %I:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Amanhã %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a, %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Mostrar o relógio no painel"
diff --git a/po/ro.po b/po/ro.po
index 2fa4355..b50552f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2018-02-04 09:39+0000\n"
 "Last-Translator: Cristian Gherman <c_gherman@yahoo.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/ayatana-"
@@ -20,234 +20,74 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "Setare oră și dată..."
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Show the clock in the panel"
diff --git a/po/ru.po b/po/ru.po
index 48eac0d..75133e1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,250 +6,160 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
-"PO-Revision-Date: 2020-10-09 11:26+0000\n"
-"Last-Translator: koffevar <egor.kafisov@gmail.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/ru/>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-09-15 22:17+0000\n"
+"Last-Translator: Sergii Horichenko <m@sgg.im>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.3-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Звуковой файл календаря по умолчанию."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Если в календаре или событии напоминания не указан собственный звуковой "
-"файл, этот файл будет использоваться в качестве запасного звука."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Добавить событие…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Часы"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Настройки даты и времени…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Дата и время"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Настройки времени и даты, быстрый доступ к календарю"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Время и дата"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (есть будильник)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Будильник %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Событие %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "О.К."
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Повторять"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Сегодня"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Звуковой файл календаря по умолчанию."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Завтра"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Если в календаре или событии напоминания не указан собственный звуковой "
+#~ "файл, этот файл будет использоваться в качестве запасного звука."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Завтра %H:%M"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %b. %d %H:%M"
+#~ msgid "Today"
+#~ msgstr "Сегодня"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Завтра в %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Завтра"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %b %d %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Завтра %H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %b. %d %H:%M"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Завтра в %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %b %d %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Показывать часы в панели"
@@ -286,9 +196,9 @@ msgstr "%a %b %d %H:%M"
 #~ msgstr ""
 #~ "Некоторые часовые пояса могут называться по разному в зависимости от  "
 #~ "города или каким-либо другим названием. Данная настройка назначает "
-#~ "предпочтительное название часового пояса. Формат \"TIMEZONE NAME"
-#~ "\" (например \"America/New_York Boston\" изменит название часового пояса "
-#~ "на New_York zone Boston)."
+#~ "предпочтительное название часового пояса. Формат \"TIMEZONE "
+#~ "NAME\" (например \"America/New_York Boston\" изменит название часового "
+#~ "пояса на New_York zone Boston)."
 
 #~ msgid "Error getting time"
 #~ msgstr "Ошибка получения времени"
diff --git a/po/sa.po b/po/sa.po
index e15cea9..7041f8e 100644
--- a/po/sa.po
+++ b/po/sa.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/sc.po b/po/sc.po
index a9c6964..af2ba3e 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-10-27 14:36+0000\n"
 "Last-Translator: Adrià Martín <adriamartinmor@gmail.com>\n"
-"Language-Team: Sardinian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/sc/>\n"
+"Language-Team: Sardinian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/sc/>\n"
 "Language: sc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,231 +19,136 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "S'archìviu de sonu predefinidu de su calendàriu."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Agiunghe un'eventu…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Relògiu"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Cunfiguratzione data e ora…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data e ora"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Ora e data"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "AB"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr ""
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Oe"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "S'archìviu de sonu predefinidu de su calendàriu."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Cras"
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Cras %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Oe"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Cras %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Cras"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Cras %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Cras %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
diff --git a/po/sd.po b/po/sd.po
index 56796c7..bb86580 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/sdh.po b/po/sdh.po
index 88a8f19..1b6abff 100644
--- a/po/sdh.po
+++ b/po/sdh.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/se.po b/po/se.po
index 28ead12..59b4f45 100644
--- a/po/se.po
+++ b/po/se.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 1f52ca4..56d3730 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/si.po b/po/si.po
index 5ce6dd1..ee38706 100644
--- a/po/si.po
+++ b/po/si.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index ee17f25..3177304 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-05-31 23:41+0000\n"
 "Last-Translator: Juraj Liso <lisojuraj@gmail.com>\n"
 "Language-Team: Slovak <https://hosted.weblate.org/projects/ayatana-"
@@ -19,234 +19,74 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "Nastaviť čas a dátum..."
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr "OK"
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
+msgstr "OK"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Show the clock in the panel"
diff --git a/po/sl.po b/po/sl.po
index e283064..67ce122 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2010-03-03 10:06-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Slovenian\n"
@@ -15,237 +15,77 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "Nastavi čas in datum ..."
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Error getting time"
diff --git a/po/sq.po b/po/sq.po
index 4bedab0..7f89b99 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2019-10-30 16:03+0000\n"
 "Last-Translator: Danjela Hoxha <danjelahoxha@gmail.com>\n"
 "Language-Team: Albanian <https://hosted.weblate.org/projects/ayatana-"
@@ -19,235 +19,145 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Skedari parazgjedhur i zërit i kalendarit."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Nëse një ngjarje kalendarike ose kujtese nuk specifikon skedarin e vet të "
-"tingullit, ky skedar do të përdoret si tingull pasues."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Shto Event…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Ora"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 #, fuzzy
 msgid "Time and Date Settings…"
 msgstr "Parametrat e Kohës dhe Datës…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Data dhe ora"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "Data & Ora"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (ka alarme)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Dakord"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Dremit"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Sot"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Skedari parazgjedhur i zërit i kalendarit."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Nëse një ngjarje kalendarike ose kujtese nuk specifikon skedarin e vet të "
+#~ "tingullit, ky skedar do të përdoret si tingull pasues."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Nesër"
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Nesër %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "Sot"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Nesër %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Nesër"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Nesër %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Nesër %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
diff --git a/po/sr.po b/po/sr.po
index 9e54634..30c81d2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2010-03-03 10:06-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Serbian\n"
@@ -15,237 +15,77 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "Podesi vreme i datum"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Error getting time"
diff --git a/po/sv.po b/po/sv.po
index 022a2fb..f90fffe 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
-"PO-Revision-Date: 2020-10-23 23:26+0000\n"
-"Last-Translator: Luna Jernberg <droidbittin@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2024-04-11 08:01+0000\n"
+"Last-Translator: bittin1ddc447d824349b2 <bittin@reimu.nl>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/"
 "ayatana-indicators/datetime-applet/sv/>\n"
 "Language: sv\n"
@@ -17,238 +17,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.1\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Standardljudfilen för kalendern."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Om en kalender eller påminnelse inte anger sin egen ljudfil kommer denna fil "
-"att användas som ljudet att falla tillbaka på."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %e %b"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 5.5-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Lägg till händelse…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Klocka"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Tid- & datuminställningar…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Datum och tid"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Tid- & datuminställningar, snabb kalenderåtkomst"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Tid och datum"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (har alarm)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %H:%M"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "Alarm %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Evenemang %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Somna in"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Idag"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Standardljudfilen för kalendern."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Imorgon"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Om en kalender eller påminnelse inte anger sin egen ljudfil kommer denna "
+#~ "fil att användas som ljudet att falla tillbaka på."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Imorgon  %H:%M"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %H:%M"
+#~ msgid "Today"
+#~ msgstr "Idag"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Imorgon  %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Imorgon"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Imorgon  %H:%M"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %H:%M"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Imorgon  %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Visa klockan i panelen"
diff --git a/po/sw.po b/po/sw.po
index 7b95e54..9b6cdf9 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/szl.po b/po/szl.po
index fdf529f..5096758 100644
--- a/po/szl.po
+++ b/po/szl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 669b655..8ceee4d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-12-13 05:51+0000\n"
 "Last-Translator: Naveen Rajan <naveentherocker1234@gmail.com>\n"
 "Language-Team: Tamil <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -19,233 +19,73 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Show the clock in the panel"
diff --git a/po/ta_LK.po b/po/ta_LK.po
index a68e429..a194c89 100644
--- a/po/ta_LK.po
+++ b/po/ta_LK.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 370044e..64656e2 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2019-08-26 04:24+0000\n"
 "Last-Translator: leela <53352@protonmail.com>\n"
 "Language-Team: Telugu <https://hosted.weblate.org/projects/ayatana-"
@@ -19,233 +19,73 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Show the clock in the panel"
diff --git a/po/tg.po b/po/tg.po
index a3edecf..b3c45f3 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 42f26a0..271ce06 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2010-03-03 10:06-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Thai\n"
@@ -16,234 +16,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "ตั้งเวลาและวันที่..."
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
 #~ msgid "Error getting time"
diff --git a/po/ti.po b/po/ti.po
index 53b7f74..eaa990e 100644
--- a/po/ti.po
+++ b/po/ti.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 0028f97..b9a02e6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,249 +6,159 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
-"PO-Revision-Date: 2020-11-29 21:17+0000\n"
-"Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
-"Language-Team: Turkish <https://hosted.weblate.org/projects/"
-"ayatana-indicators/datetime-applet/tr/>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-09-25 13:23+0000\n"
+"Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
+"Language-Team: Turkish <https://hosted.weblate.org/projects/ayatana-"
+"indicators/datetime-applet/tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "Takvimin öntanımlı ses dosyası."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"Bir takvim veya hatırlatma etkinliği kendi ses dosyasını belirtmezse, bu "
-"dosya yedek ses olarak kullanılacaktır."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%e %b %Y %a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%e %b %a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%e %b %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%e %b"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 4.14.1\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Etkinlik Ekle…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Saat"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "Saat ve Tarih Ayarları…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Tarih ve Saat"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Saat ve tarih ayarları, hızlı takvim erişimi"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Saat ve Tarih"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (alarmları var)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "%s alarmı"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "%s etkinliği"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "Tamam"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "Ertele"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Bugün"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Takvimin öntanımlı ses dosyası."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Yarın"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Bir takvim veya hatırlatma etkinliği kendi ses dosyasını belirtmezse, bu "
+#~ "dosya yedek ses olarak kullanılacaktır."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%e %b %Y %a"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%e %b %a"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%d %b %a"
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "Yarın %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%l:%M %b %d %a"
+#~ msgid "Today"
+#~ msgstr "Bugün"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "Yarın %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "Yarın"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%d %b %a %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%d %b %a"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Yarın %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%l:%M %b %d %a"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Yarın %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%d %b %a %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Panelde saati göster"
diff --git a/po/tt.po b/po/tt.po
index 4adfafb..20409dd 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index a63fee1..38ea88d 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-05-09 07:12+0000\n"
 "Last-Translator: Abdusalam <1810010207@s.upc.edu.cn>\n"
 "Language-Team: Uyghur <https://hosted.weblate.org/projects/ayatana-"
@@ -19,235 +19,145 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "كالېندارنىڭ سۈكۈتتىكى ئاۋاز ھۆججىتى."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"ئەگەر بىر كالېندار ياكى ئەسكەرتىش ھادىسىسى ئۆزىنىڭ ئاۋاز ھۆججىتىنى "
-"بەلگىلىمىسە ، بۇ ھۆججەت خاتالىق ئاۋازى سۈپىتىدە ئىشلىتىلىدۇ."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%a %b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%a %b %e"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%b %e %Y"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%b %e"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "پائالىيەت قوشۇش…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "سائەت"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 #, fuzzy
 msgid "Time and Date Settings…"
 msgstr "ۋاقىت ۋە چېسلا تەڭشىكى…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "چېسلا ۋە ۋاقىت"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "ۋاقىت ۋە چېسلا"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (ئاگاھلاندۇرۇش سىگنالى بار)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "ئاگاھلاندۇرۇش %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr ""
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "ماقۇل"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "قايتا جىرىڭلاتما"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "بۈگۈن"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "كالېندارنىڭ سۈكۈتتىكى ئاۋاز ھۆججىتى."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "ئەگەر بىر كالېندار ياكى ئەسكەرتىش ھادىسىسى ئۆزىنىڭ ئاۋاز ھۆججىتىنى "
+#~ "بەلگىلىمىسە ، بۇ ھۆججەت خاتالىق ئاۋازى سۈپىتىدە ئىشلىتىلىدۇ."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "ئەتە"
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a %b %e %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a %b %e"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#~ msgid "%b %e %Y"
+#~ msgstr "%b %e %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "ئەتە %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%b %e"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "بۈگۈن"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "ئەتە %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "ئەتە"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "ئەتە %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "ئەتە %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
diff --git a/po/uk.po b/po/uk.po
index fe1ae46..8fc1b5f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,250 +6,160 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
-"PO-Revision-Date: 2018-10-04 10:38+0000\n"
-"Last-Translator: Володимир Бриняк <bardvv@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2022-09-15 22:17+0000\n"
+"Last-Translator: Sergii Horichenko <m@sgg.im>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/ayatana-"
 "indicators/datetime-applet/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.2-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-#, fuzzy
-msgid "The calendar's default sound file."
-msgstr "Звуковий файл будильника за умовчанням."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
-msgstr ""
+msgstr "%A, %e %B %Y"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "Додати подію…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "Годинник"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
-msgstr ""
+msgstr "Налаштування часу і дати…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "Дата і час"
 
-#: ../src/menu.cpp:520
-#, fuzzy
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "Налаштування часу та дати, швидкий доступ до календаря"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "Час і дата"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
-msgstr ""
+msgstr "%s (будильник)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
-msgstr ""
+msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
-msgstr ""
+msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
-msgstr ""
+msgstr "Будильник %s"
+
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "Подія %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "OK"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
-msgstr ""
+msgstr "Відкласти"
+
+#~ msgid "The calendar's default sound file."
+#~ msgstr "Типовий звуковий файл для календаря."
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "Сьогодні"
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "Якщо подія календаря або нагадування не вказує на власний звуковий файл, "
+#~ "в якості звуку буде використовуватися цей файл."
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "Завтра"
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%a, %e %b %Y"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%a, %e %b"
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr ""
+#~ msgid "%a"
+#~ msgstr "%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr ""
+#~ msgid "%b %e %Y"
+#~ msgstr "%e %b %Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
+#~ msgid "%b %e"
+#~ msgstr "%e %b"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
+#~ msgid "Today"
+#~ msgstr "Сьогодні"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
+#~ msgid "Tomorrow"
+#~ msgstr "Завтра"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#~ msgid "%a %d %b"
+#~ msgstr "%a %d %b"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "Завтра %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a, %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "Завтра %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%,a %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "Показати годинник на панелі"
diff --git a/po/ur.po b/po/ur.po
index 52fe7b6..c17d683 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 66510c2..4856e97 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/vec.po b/po/vec.po
index b888656..10539e5 100644
--- a/po/vec.po
+++ b/po/vec.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index f44e722..835497f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,231 +17,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/wae.po b/po/wae.po
index 6d592e0..3e186bb 100644
--- a/po/wae.po
+++ b/po/wae.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/wo.po b/po/wo.po
index 25e3898..dc2a6a4 100644
--- a/po/wo.po
+++ b/po/wo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eab6e3a..646ec8a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
-"PO-Revision-Date: 2021-04-16 17:26+0000\n"
-"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
+"PO-Revision-Date: 2024-04-01 22:37+0000\n"
+"Last-Translator: 复予 <clonewith@qq.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "ayatana-indicators/datetime-applet/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -17,238 +17,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.6-dev\n"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "此日历的默认音效文件."
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-"如果日历或提醒事项没有被指定使用其他音效文件, 那么此文件将会被调用(作为后备音"
-"效文件)."
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr "%Y年%m月%d日 周%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr "%m月%d日 周%a\""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr "周%a"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr "%Y年%m月%d日"
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr "%m月%d日"
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr "%Y"
+"X-Generator: Weblate 5.5-dev\n"
 
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
-msgstr "%Y年 %B月 %e日 周%A"
+msgstr "%Y年 %m月 %e日 %A"
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr "添加事件…"
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr "时钟"
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr "时间和日期设置…"
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr "日期和时间"
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr "时间与日期设置，快速访问日历"
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr "时间和日期"
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr "%s (已设置闹钟)"
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr "%a, %l:%M %p"
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr "%a, %H:%M"
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr "闹钟 %s"
 
-#: ../src/snap.cpp:140
+#: src/snap.cpp:159
+#, c-format
+msgid "Event %s"
+msgstr "事件 %s"
+
+#: src/snap.cpp:168 src/snap.cpp:172
 msgid "OK"
 msgstr "好的"
 
-#: ../src/snap.cpp:141
+#: src/snap.cpp:169
 msgid "Snooze"
 msgstr "稍后再响"
 
-#: ../src/utils.c:274
-msgid "Today"
-msgstr "今天"
+#~ msgid "The calendar's default sound file."
+#~ msgstr "此日历的默认音效文件."
+
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "如果日历或提醒事项没有被指定使用其他音效文件, 那么此文件将会被调用(作为后"
+#~ "备音效文件)."
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
 
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr "明天"
+#~ msgid "%a %b %e %Y"
+#~ msgstr "%Y年%m月%d日 周%a"
+
+#~ msgid "%a %b %e"
+#~ msgstr "%m月%d日 周%a\""
 
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
 #, c-format
-msgid "%A"
-msgstr "%A"
+#~ msgid "%a"
+#~ msgstr "周%a"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr "%b月 %d日 周%a"
+#~ msgid "%b %e %Y"
+#~ msgstr "%Y年%m月%d日"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr "明天 %l:%M %p"
+#~ msgid "%b %e"
+#~ msgstr "%m月%d日"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#~ msgid "%Y"
+#~ msgstr "%Y"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr "%a %d %b %l:%M %p"
+#~ msgid "Today"
+#~ msgstr "今天"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr "明天 %H:%M"
+#~ msgid "Tomorrow"
+#~ msgstr "明天"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr "%a %H:%M"
+#, c-format
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr "%a %d %b %H:%M"
+#~ msgid "%a %d %b"
+#~ msgstr "%b月 %d日 周%a"
+
+#~ msgid "Tomorrow %l:%M %p"
+#~ msgstr "明天 %l:%M %p"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
+
+#~ msgid "%a %d %b %l:%M %p"
+#~ msgstr "%a %d %b %l:%M %p"
+
+#~ msgid "Tomorrow %H:%M"
+#~ msgstr "明天 %H:%M"
+
+#~ msgid "%a %H:%M"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "%a %d %b %H:%M"
+#~ msgstr "%a %d %b %H:%M"
 
 #~ msgid "Show the clock in the panel"
 #~ msgstr "在面板中显示时钟"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index f497df8..e90ce1a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2017-10-12 07:36+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/zh_LATN@pinyin.po b/po/zh_LATN@pinyin.po
index ed3dca0..4c00a02 100644
--- a/po/zh_LATN@pinyin.po
+++ b/po/zh_LATN@pinyin.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,231 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 msgid "Time and Date"
 msgstr ""
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f70c34d..5420f38 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-datetime\n"
-"Report-Msgid-Bugs-To: ted@canonical.com\n"
-"POT-Creation-Date: 2020-08-22 00:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-10 23:55+0200\n"
 "PO-Revision-Date: 2020-04-20 22:11+0000\n"
 "Last-Translator: Tommy Cheng <csckcac@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -19,235 +19,84 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.0.2-dev\n"
 
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:1
-msgid "The calendar's default sound file."
-msgstr "日曆預設音效檔案。"
-
-#: ../data/org.ayatana.indicator.datetime.gschema.xml.in.in.h:2
-msgid ""
-"If a calendar or reminder event doesn't specify its own sound file, this "
-"file will be used as the fallback sound."
-msgstr "如果日曆和提醒事件沒有設定自己的音效檔案，這個檔案就會用作後備音效。"
-
-#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
-#: ../src/formatter.cpp:234
-msgid "%l:%M:%S %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 12hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
-#. en_US example: "%l:%M %p" --> "1:00 PM"
-#: ../src/formatter.cpp:237 ../src/utils.c:304
-msgid "%l:%M %p"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
-#: ../src/formatter.cpp:240
-msgid "%H:%M:%S"
-msgstr ""
-
-#. TRANSLATORS: a strftime(3) format for 24hr time
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
-#. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:344
-msgid "%H:%M"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
-#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
-#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
-#: ../src/formatter-desktop.cpp:138
-msgid "%a %b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday, day, and abbreviated month.
-#. en_US example: "%a %b %e" --> "Sat Oct 31"
-#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
-#: ../src/formatter-desktop.cpp:147
-msgid "%a %b %e"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated weekday.
-#. zh_CN example(?): "周%a" --> "周六"
-#: ../src/formatter-desktop.cpp:154
-#, c-format
-msgid "%a"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the day, abbreviated month, and year.
-#. en_US example: "%b %e %Y" --> "Oct 31 2020"
-#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
-#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
-#: ../src/formatter-desktop.cpp:163
-msgid "%b %e %Y"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
-#. This format string shows the abbreviated month and day.
-#. en_US example: "%b %e" --> "Mar 27"
-#. en_GB example: "%e %b" --> "27 Mar"
-#. zh_CN example(?): "%m月%d日" --> "03月27日"
-#: ../src/formatter-desktop.cpp:172
-msgid "%b %e"
-msgstr ""
-
-#. This strftime(3) format string shows the year.
-#: ../src/formatter-desktop.cpp:176
-msgid "%Y"
-msgstr ""
-
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. Format string for the day on the first menuitem in the datetime indicator.
 #. This format string gives the full weekday, date, month, and year.
 #. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
 #. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:255
+#: src/menu.cpp:337
 msgid "%A, %e %B %Y"
 msgstr ""
 
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:352
+#: src/menu.cpp:438
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:362
+#: src/menu.cpp:448
 msgid "Clock"
 msgstr ""
 
-#: ../src/menu.cpp:414
+#: src/menu.cpp:500
 msgid "Time and Date Settings…"
 msgstr ""
 
-#: ../src/menu.cpp:469
+#: src/menu.cpp:555
 msgid "Date and Time"
 msgstr ""
 
-#: ../src/menu.cpp:520
+#: src/menu.cpp:564
+msgid "Time & date settings, quick calendar access"
+msgstr ""
+
+#: src/menu.cpp:613
 #, fuzzy
 msgid "Time and Date"
 msgstr "設定時間和日期..."
 
-#: ../src/menu.cpp:525
+#: src/menu.cpp:618
 #, c-format
 msgid "%s (has alarms)"
 msgstr ""
 
 #. * strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:126
+#: src/snap.cpp:147
 msgid "%a, %l:%M %p"
 msgstr ""
 
 #. * A strftime(3) format for abbreviated weekday,
 #. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:130
+#: src/snap.cpp:151
 msgid "%a, %H:%M"
 msgstr ""
 
-#: ../src/snap.cpp:133
+#: src/snap.cpp:157
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#: ../src/snap.cpp:140
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:141
-msgid "Snooze"
-msgstr ""
-
-#: ../src/utils.c:274
-msgid "Today"
-msgstr ""
-
-#: ../src/utils.c:278
-msgid "Tomorrow"
-msgstr ""
-
-#. This is a strftime(3) format string indicating the unabbreviated weekday.
-#: ../src/utils.c:283
+#: src/snap.cpp:159
 #, c-format
-msgid "%A"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing full-day events that are over a week away.
-#. en_US example: "%a %b %d" --> "Sat Oct 31"
-#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
-#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
-#: ../src/utils.c:292
-msgid "%a %d %b"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
-#: ../src/utils.c:313
-msgid "Tomorrow %l:%M %p"
+msgid "Event %s"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
-#: ../src/utils.c:322
-msgid "%a %l:%M %p"
-msgstr ""
-
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
-#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
-#: ../src/utils.c:332
-msgid "%a %d %b %l:%M %p"
+#: src/snap.cpp:168 src/snap.cpp:172
+msgid "OK"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
-#: ../src/utils.c:353
-msgid "Tomorrow %H:%M"
+#: src/snap.cpp:169
+msgid "Snooze"
 msgstr ""
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %H:%M" --> "Fri 13:00"
-#: ../src/utils.c:362
-msgid "%a %H:%M"
-msgstr ""
+#~ msgid "The calendar's default sound file."
+#~ msgstr "日曆預設音效檔案。"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
-#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
-#. slightly wider than a normal space.)
-#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
-#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
-#: ../src/utils.c:372
-msgid "%a %d %b %H:%M"
-msgstr ""
+#~ msgid ""
+#~ "If a calendar or reminder event doesn't specify its own sound file, this "
+#~ "file will be used as the fallback sound."
+#~ msgstr ""
+#~ "如果日曆和提醒事件沒有設定自己的音效檔案，這個檔案就會用作後備音效。"
 
 #~ msgid "Error getting time"
 #~ msgstr "獲得時間發生錯誤"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d6d6844..69a2dfc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,28 +47,21 @@ set(SERVICE_GENERATED_SOURCES)
 add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-alarm-properties
                   org.ayatana.indicator
                   ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.datetime.AlarmProperties.xml)
-if(LOMIRI_SCHEMAS_FOUND)
+
+if (ENABLE_LOMIRI_FEATURES)
         add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound
                           com.lomiri.touch
                           /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml)
-        add_definitions (-DHAS_LOMIRI_SCHEMAS)
 endif()
 
-# add warnings/coverage info on handwritten files
-# but not the autogenerated ones...
-set_source_files_properties(${SERVICE_CXX_SOURCES}
-                            PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
-set_source_files_properties(${SERVICE_C_SOURCES}
-                            PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
-
 # add the bin dir to our include path so our code can find the generated header files
 include_directories (${CMAKE_CURRENT_BINARY_DIR})
 
+set_source_files_properties (engine-eds.cpp PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-enum-constexpr-conversion")
 add_library (${SERVICE_LIB} STATIC ${SERVICE_C_SOURCES} ${SERVICE_CXX_SOURCES} ${SERVICE_GENERATED_SOURCES})
 include_directories (${CMAKE_SOURCE_DIR})
 link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
 
 add_executable (${SERVICE_EXEC} main.cpp)
-set_source_files_properties(${SERVICE_SOURCES} main.cpp PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
-target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${URLDISPATCHER_LIBRARIES})
-install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
+target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES})
+install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
diff --git a/src/actions.cpp b/src/actions.cpp
index 315340a..18b99e8 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Canonical Ltd.
+ * Copyright 2021 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,11 +16,12 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <datetime/actions.h>
 #include <datetime/utils.h> // split_settings_location()
-
+#include <algorithm>
 #include <glib.h>
 #include <gio/gio.h>
 
@@ -50,16 +52,18 @@ DateTime datetime_from_timet_variant(GVariant* v)
 
 bool lookup_appointment_by_uid(const std::shared_ptr<State>& state, const gchar* uid, Appointment& setme)
 {
-    for(const auto& appt : state->calendar_upcoming->appointments().get())
+    bool bRet = false;
+
+    std::for_each(state->calendar_upcoming->appointments().get().begin(), state->calendar_upcoming->appointments().get().end(), [uid, &setme, &bRet](const Appointment& appt)
     {
         if (appt.uid == uid)
         {
             setme = appt;
-            return true;
+            bRet = true;
         }
-    }
+    });
 
-    return false;
+    return bRet;
 }
 
 void on_appointment_activated (GSimpleAction*, GVariant *vdata, gpointer gself)
@@ -138,7 +142,10 @@ GVariant* create_calendar_state(const std::shared_ptr<State>& state)
 {
     gboolean days[32] = { 0 };
     for (const auto& appt : state->calendar_month->appointments().get())
-        days[appt.begin.day_of_month()] = true;
+        if (!appt.is_alarm() || state->settings->show_alarms.get())
+        {
+            days[appt.begin.day_of_month()] = true;
+        }
 
     GVariantBuilder day_builder;
     g_variant_builder_init(&day_builder, G_VARIANT_TYPE("ai"));
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index 4396d45..7a61fc0 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2024 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -19,6 +19,10 @@
  *   Robert Tari <robert@tari.in>
  */
 
+#ifndef ALARM_DEFAULT_SOUND
+#define ALARM_DEFAULT_SOUND "dummy"
+#endif
+
 #include <datetime/engine-eds.h>
 #include <datetime/myself.h>
 #include <libical/ical.h>
@@ -48,7 +52,7 @@ class EdsEngine::Impl
 {
 public:
 
-    Impl(const std::shared_ptr<Myself> &myself)
+    explicit Impl(const std::shared_ptr<Myself> &myself)
         : m_myself(myself)
     {
         auto cancellable_deleter = [](GCancellable * c) {
@@ -473,14 +477,14 @@ private:
         // for each component..
         for (auto l=components; l!=nullptr; l=l->next)
         {
-            bool changed = false;
+            bool bChanged = false;
 
             // for each alarm...
             auto component = E_CAL_COMPONENT(l->data);
             auto auids = e_cal_component_get_alarm_uids(component);
-            for(auto l=auids; l!=nullptr; l=l->next)
+            for(auto lAlarms=auids; lAlarms!=nullptr; lAlarms=lAlarms->next)
             {
-                auto auid = static_cast<const char*>(l->data);
+                auto auid = static_cast<const char*>(lAlarms->data);
                 auto alarm = e_cal_component_get_alarm(component, auid);
                 if (alarm == nullptr)
                     continue;
@@ -490,13 +494,13 @@ private:
                 {
                     e_cal_component_remove_alarm (component, auid);
                     e_cal_component_add_alarm (component, new_alarm);
-                    changed = true;
+                    bChanged = true;
                     g_clear_pointer (&new_alarm, e_cal_component_alarm_free);
                 }
             }
             g_slist_free_full (auids, g_free);
 
-            if (changed)
+            if (bChanged)
             {
                 auto icc = e_cal_component_get_icalcomponent(component); // icc owned by ecc
                 modify_slist = g_slist_prepend(modify_slist, icc);
@@ -631,19 +635,18 @@ private:
         auto action = e_cal_component_alarm_get_action(alarm);
         if (action == E_CAL_COMPONENT_ALARM_AUDIO)
         {
-            ICalAttach *attach = nullptr;
             auto attachments = e_cal_component_alarm_get_attachments(alarm);
 
-            if (attachments != nullptr && attachments->next != nullptr)
-                attach = I_CAL_ATTACH (attachments->data);
+            for (; attachments != nullptr; attachments = attachments->next) {
+                ICalAttach *attach = I_CAL_ATTACH (attachments->data);
 
-            if (attach != nullptr)
-            {
-                if (i_cal_attach_get_is_url (attach))
+                if (attach != nullptr && i_cal_attach_get_is_url (attach))
                 {
                     const char* url = i_cal_attach_get_url(attach);
-                    if (url != nullptr)
+                    if (url != nullptr) {
                         ret = url;
+                        break;
+                    }
                 }
             }
             if (ret.empty())
@@ -1071,6 +1074,34 @@ private:
         }
         g_slist_free_full(categ_list, g_free);
 
+        // Get the colour - we might need this override in the future
+
+        /*if (icc)
+        {
+            ECalComponentPropertyBag *pBag = e_cal_component_property_bag_new_from_component (icc, NULL, NULL);
+
+            if (pBag)
+            {
+                guint nProperties = e_cal_component_property_bag_get_count (pBag);
+
+                for (guint nProperty = 0; nProperty < nProperties; nProperty++)
+                {
+                    ICalProperty *pProperty = e_cal_component_property_bag_get (pBag, nProperty);
+                    gchar *sName = i_cal_property_get_property_name (pProperty);
+                    gboolean bColour = !g_strcmp0 (sName, "COLOR");
+
+                    if (bColour)
+                    {
+                        baseline.color = i_cal_property_get_value_as_string (pProperty);
+
+                        break;
+                    }
+                }
+
+                e_cal_component_property_bag_free (pBag);
+            }
+        }*/
+
         g_debug("%s got appointment from %s to %s: %s", G_STRLOC,
                 baseline.begin.format("%F %T %z").c_str(),
                 baseline.end.format("%F %T %z").c_str(),
@@ -1127,9 +1158,9 @@ private:
                 alarm.text = get_alarm_text(a);
 
             if (alarm.audio_url.empty())
-                alarm.audio_url = get_alarm_sound_url(a,  (baseline.is_alarm() ?
-                                                         "file://" ALARM_DEFAULT_SOUND :
-                                                         "file://" CALENDAR_DEFAULT_SOUND));
+            {
+                alarm.audio_url = get_alarm_sound_url(a,  (baseline.is_alarm() ? "file://" ALARM_DEFAULT_SOUND : "file://" CALENDAR_DEFAULT_SOUND));
+            }
 
             if (!alarm.time.is_set())
                 alarm.time = trigger_time;
diff --git a/src/exporter.cpp b/src/exporter.cpp
index ea514c0..41a1583 100644
--- a/src/exporter.cpp
+++ b/src/exporter.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Canonical Ltd.
+ * Copyright 2021 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <datetime/dbus-shared.h>
@@ -37,7 +39,7 @@ class Exporter::Impl
 {
 public:
 
-    Impl(const std::shared_ptr<Settings>& settings):
+    explicit Impl(const std::shared_ptr<Settings>& settings):
         m_settings(settings),
         m_alarm_props(datetime_alarm_properties_skeleton_new())
     {
@@ -190,10 +192,10 @@ private:
         for(auto& menu : m_menus)
         {
             const auto path = std::string(BUS_DATETIME_PATH) + "/" + menu->name();
-            const auto id = g_dbus_connection_export_menu_model(m_bus, path.c_str(), menu->menu_model(), &error);
-            if (id)
+            const auto nId = g_dbus_connection_export_menu_model(m_bus, path.c_str(), menu->menu_model(), &error);
+            if (nId)
             {
-                m_exported_menu_ids.insert(id);
+                m_exported_menu_ids.insert(nId);
             }
             else
             {
diff --git a/src/haptic.cpp b/src/haptic.cpp
index 7e09c24..2b0af4c 100644
--- a/src/haptic.cpp
+++ b/src/haptic.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2022 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -39,11 +39,11 @@ class Haptic::Impl
 {
 public:
 
-    Impl(bool repeat):
+    explicit Impl(bool repeat):
         m_cancellable(g_cancellable_new()),
         m_repeat(repeat)
     {
-        g_bus_get (G_BUS_TYPE_SESSION, m_cancellable, on_bus_ready, this);
+        g_bus_get (G_BUS_TYPE_SYSTEM, m_cancellable, on_bus_ready, this);
     }
 
     ~Impl()
@@ -105,20 +105,14 @@ private:
 
     void call_vibrate()
     {
-        GVariantBuilder builder;
-        auto duration = g_variant_new_int32 (1000);
-
-        g_variant_builder_init (&builder, G_VARIANT_TYPE_INT32);
-        g_variant_builder_add_value (&builder, duration);
-
-        auto vibrate_arg = g_variant_builder_end (&builder);
+        auto duration = g_variant_new ("(i)", 1000);
 
         g_dbus_connection_call (m_bus,
                                 BUS_HAPTIC_NAME,
                                 BUS_HAPTIC_PATH,
                                 BUS_HAPTIC_INTERFACE,
                                 "vibrate",
-                                vibrate_arg,
+                                duration,
                                 nullptr,
                                 G_DBUS_CALL_FLAGS_NONE,
                                 -1,
diff --git a/src/locations-settings.cpp b/src/locations-settings.cpp
index f1e2b42..2673e66 100644
--- a/src/locations-settings.cpp
+++ b/src/locations-settings.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Canonical Ltd.
+ * Copyright 2021 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <datetime/locations-settings.h>
@@ -59,10 +61,10 @@ SettingsLocations::reload()
     }
 
     // add the other detected timezones
-    for(const auto& zone : m_timezones->timezones.get())
+    for(const auto& sZone : m_timezones->timezones.get())
     {
-        gchar * name = get_beautified_timezone_name(zone.c_str(), timezone_name.c_str());
-        Location l(zone, name);
+        gchar * name = get_beautified_timezone_name(sZone.c_str(), timezone_name.c_str());
+        Location l(sZone, name);
         if (std::find(v.begin(), v.end(), l) == v.end())
             v.push_back(l);
         g_free(name);
@@ -73,14 +75,14 @@ SettingsLocations::reload()
     {
         for(const auto& locstr : m_settings->locations.get())
         {
-            gchar* zone;
+            gchar* sZone;
             gchar* name;
-            split_settings_location(locstr.c_str(), &zone, &name);
-            Location loc(zone, name);
+            split_settings_location(locstr.c_str(), &sZone, &name);
+            Location loc(sZone, name);
             if (std::find(v.begin(), v.end(), loc) == v.end())
                 v.push_back(loc);
             g_free(name);
-            g_free(zone);
+            g_free(sZone);
         }
     }
 
diff --git a/src/main.cpp b/src/main.cpp
index 0dc7198..29e4472 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,9 +32,7 @@
 #include <datetime/planner-snooze.h>
 #include <datetime/planner-range.h>
 #include <datetime/settings-live.h>
-#ifdef HAS_LOMIRI_SCHEMAS
 #include <datetime/snap.h>
-#endif
 #include <datetime/state.h>
 #include <datetime/timezones-live.h>
 #include <datetime/timezone-timedated.h>
@@ -95,7 +93,6 @@ namespace
         return state;
     }
 
-#ifdef HAS_LOMIRI_SCHEMAS
     std::shared_ptr<AlarmQueue> create_simple_alarm_queue(const std::shared_ptr<Clock>& clock,
                                                           const std::shared_ptr<Planner>& snooze_planner,
                                                           const std::shared_ptr<Engine>& engine,
@@ -119,7 +116,6 @@ namespace
         auto wakeup_timer = std::make_shared<PowerdWakeupTimer>(clock);
         return std::make_shared<SimpleAlarmQueue>(clock, planner, wakeup_timer);
     }
-#endif
 }
 
 int
@@ -149,7 +145,6 @@ main(int /*argc*/, char** /*argv*/)
     auto actions = std::make_shared<LiveActions>(state);
     MenuFactory factory(actions, state);
 
-#ifdef HAS_LOMIRI_SCHEMAS
     // set up the snap decisions
     auto snooze_planner = std::make_shared<SnoozePlanner>(state->settings, state->clock);
     auto notification_engine = std::make_shared<ain::Engine>("ayatana-indicator-datetime-service");
@@ -173,7 +168,6 @@ main(int /*argc*/, char** /*argv*/)
         engine->disable_alarm(appointment);
     };
     alarm_queue->alarm_reached().connect(on_alarm_reached);
-#endif
 
     // create the menus
     std::vector<std::shared_ptr<Menu>> menus;
diff --git a/src/menu.cpp b/src/menu.cpp
index ab0bd71..b8ef1b6 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -72,13 +72,14 @@ GMenuModel* Menu::menu_model()
 std::vector<Appointment>
 Menu::get_display_appointments(const std::vector<Appointment>& appointments_in,
                                const DateTime& now,
-                               unsigned int max_items)
+                               unsigned int max_items,
+                               const bool include_alarms)
 {
     std::vector<Appointment> appointments;
     std::copy_if(appointments_in.begin(),
                  appointments_in.end(),
                  std::back_inserter(appointments),
-                 [now](const Appointment& a){return a.end >= now;});
+                 [now, include_alarms](const Appointment& a){return a.end >= now && (!a.is_alarm() || include_alarms);});
 
     if (appointments.size() > max_items)
     {
@@ -107,10 +108,6 @@ Menu::get_display_appointments(const std::vector<Appointment>& appointments_in,
             if (a_full_day_today != b_full_day_today)
                 return a_full_day_today;
 
-            const bool a_after_today = (a.begin > end_of_day) || (a.end > end_of_day);
-            const bool b_after_today = (a.begin > end_of_day) || (a.end > end_of_day);
-            if (a_after_today != b_after_today)
-                return a_after_today;
             if (a.begin != b.begin)
                 return a.begin < b.begin;
             if (b.end != b.end)
@@ -190,6 +187,9 @@ protected:
         m_state->settings->show_events.changed().connect([this](bool){
             update_section(Appointments); // showing events got toggled
         });
+        m_state->settings->show_alarms.changed().connect([this](bool){
+            update_section(Appointments); // showing alarms got toggled
+        });
         m_state->calendar_upcoming->date().changed().connect([this](const DateTime&){
             update_upcoming(); // our m_upcoming is planner->upcoming() filtered by time
         });
@@ -244,7 +244,9 @@ protected:
 
         auto upcoming = get_display_appointments(
             m_state->calendar_upcoming->appointments().get(),
-            begin
+            begin,
+            5,
+            m_state->settings->show_alarms.get()
         );
 
         if (m_upcoming != upcoming)
@@ -272,10 +274,6 @@ protected:
         return m_serialized_alarm_icon;
     }
 
-    std::vector<Appointment> m_upcoming;
-
-private:
-
     GVariant* get_serialized_calendar_icon()
     {
         if (G_UNLIKELY(m_serialized_calendar_icon == nullptr))
@@ -288,6 +286,10 @@ private:
         return m_serialized_calendar_icon;
     }
 
+    std::vector<Appointment> m_upcoming;
+
+private:
+
     void create_gmenu()
     {
         g_assert(m_submenu == nullptr);
@@ -432,29 +434,32 @@ private:
     {
         auto menu = g_menu_new();
 
-        if ((profile==Desktop) && m_state->settings->show_events.get())
+        if (m_state->settings->show_events.get())
         {
-            add_appointments (menu, profile);
-
-            if (m_actions->desktop_has_calendar_app())
+            if (profile==Desktop)
             {
-                // add the 'Add Event…' menuitem
-                auto menu_item = g_menu_item_new(_("Add Event…"), nullptr);
-                const gchar* action_name = "indicator.desktop.open-calendar-app";
-                auto v = g_variant_new_int64(0);
-                g_menu_item_set_action_and_target_value(menu_item, action_name, v);
-                g_menu_append_item(menu, menu_item);
-                g_object_unref(menu_item);
+                add_appointments (menu, profile);
+
+                if (m_actions->desktop_has_calendar_app())
+                {
+                    // add the 'Add Event…' menuitem
+                    auto menu_item = g_menu_item_new(_("Add Event…"), nullptr);
+                    const gchar* action_name = "indicator.desktop.open-calendar-app";
+                    auto v = g_variant_new_int64(0);
+                    g_menu_item_set_action_and_target_value(menu_item, action_name, v);
+                    g_menu_append_item(menu, menu_item);
+                    g_object_unref(menu_item);
+                }
             }
-        }
-        else if (profile==Phone)
-        {
-            auto menu_item = g_menu_item_new (_("Clock"), "indicator.phone.open-alarm-app");
-            g_menu_item_set_attribute_value (menu_item, G_MENU_ATTRIBUTE_ICON, get_serialized_alarm_icon());
-            g_menu_append_item (menu, menu_item);
-            g_object_unref (menu_item);
+            else if (profile==Phone)
+            {
+                auto menu_item = g_menu_item_new (_("Clock"), "indicator.phone.open-alarm-app");
+                g_menu_item_set_attribute_value (menu_item, G_MENU_ATTRIBUTE_ICON, get_serialized_alarm_icon());
+                g_menu_append_item (menu, menu_item);
+                g_object_unref (menu_item);
 
-            add_appointments (menu, profile);
+                add_appointments (menu, profile);
+            }
         }
 
         return G_MENU_MODEL(menu);
@@ -554,7 +559,7 @@ protected:
         update_header();
     }
 
-    GVariant* create_header_state()
+    GVariant* create_header_state() override
     {
         const auto title = _("Date and Time");
         auto label = g_variant_new_string(m_formatter->header.get().c_str());
@@ -565,6 +570,7 @@ protected:
         g_variant_builder_add(&b, "{sv}", "label", label);
         g_variant_builder_add(&b, "{sv}", "title", g_variant_new_string(title));
         g_variant_builder_add(&b, "{sv}", "visible", g_variant_new_boolean(TRUE));
+        g_variant_builder_add(&b, "{sv}", "tooltip", g_variant_new_string (_("Time & date settings, quick calendar access")));
         return g_variant_builder_end(&b);
     }
 };
@@ -597,25 +603,46 @@ protected:
         update_header();
     }
 
-    GVariant* create_header_state()
+    GVariant* create_header_state() override
     {
         // are there alarms?
         bool has_alarms = false;
+        bool has_non_alarm_events = false;
         for(const auto& appointment : m_upcoming)
-            if((has_alarms = appointment.is_alarm()))
+        {
+            has_alarms = appointment.is_alarm();
+
+            if (has_alarms)
+            {
                 break;
+            }
+            else
+            {
+                has_non_alarm_events = true;
+            }
+        }
+
 
         GVariantBuilder b;
         g_variant_builder_init(&b, G_VARIANT_TYPE_VARDICT);
         g_variant_builder_add(&b, "{sv}", "title", g_variant_new_string (_("Time and Date")));
         g_variant_builder_add(&b, "{sv}", "visible", g_variant_new_boolean (TRUE));
-        if (has_alarms)
+        if (has_alarms || has_non_alarm_events)
+
         {
             auto label = m_formatter->header.get();
-            auto a11y = g_strdup_printf(_("%s (has alarms)"), label.c_str());
+            auto a11y = g_strdup_printf(_("%s (has events)"), label.c_str());
             g_variant_builder_add(&b, "{sv}", "label", g_variant_new_string(label.c_str()));
             g_variant_builder_add(&b, "{sv}", "accessible-desc", g_variant_new_take_string(a11y));
-            g_variant_builder_add(&b, "{sv}", "icon", get_serialized_alarm_icon());
+
+            if (has_alarms && m_state->settings->show_alarms.get())
+            {
+                g_variant_builder_add(&b, "{sv}", "icon", get_serialized_alarm_icon());
+            }
+            else
+            {
+                g_variant_builder_add(&b, "{sv}", "icon", get_serialized_calendar_icon());
+            }
         }
         else
         {
diff --git a/src/notifications.cpp b/src/notifications.cpp
index f21b5e8..4049851 100644
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Canonical Ltd.
+ * Copyright 2021-2023 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <notifications/notifications.h>
@@ -24,7 +26,7 @@
 #include <messaging-menu/messaging-menu-app.h>
 #include <messaging-menu/messaging-menu-message.h>
 
-#ifdef HAS_URLDISPATCHER
+#ifdef LOMIRI_FEATURES_ENABLED
 #include <lomiri-url-dispatcher.h>
 #endif
 
@@ -163,7 +165,7 @@ class Engine::Impl
 
 public:
 
-    Impl(const std::string& app_name):
+    explicit Impl(const std::string& app_name):
         m_app_name(app_name)
     {
         if (!notify_init(app_name.c_str()))
@@ -197,6 +199,13 @@ public:
         return server_caps().count("actions") != 0;
     }
 
+#ifdef LOMIRI_FEATURES_ENABLED
+    bool requires_hint_lomiri_timeout() const
+    {
+        return server_caps().count(HINT_LOMIRI_TIMEOUT) != 0;
+    }
+#endif
+
     void close_all ()
     {
         // call close() on all our keys
@@ -246,10 +255,15 @@ public:
         {
             const auto& d= info.m_duration;
             auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(d);
-
-            notify_notification_set_hint (nn.get(),
-                                          HINT_TIMEOUT,
-                                          g_variant_new_int32(ms.count()));
+            notify_notification_set_timeout (nn.get (), ms.count ());
+#ifdef LOMIRI_FEATURES_ENABLED
+            if (requires_hint_lomiri_timeout()) {
+                // Lomiri has its own logic regarding timeout.
+                notify_notification_set_hint (nn.get(),
+                                              HINT_LOMIRI_TIMEOUT,
+                                              g_variant_new_int32(ms.count()));
+            }
+#endif
         }
 
         for (const auto& hint : info.m_string_hints)
@@ -462,7 +476,7 @@ private:
 
     static std::string calendar_app_id()
     {
-#ifdef HAS_URLDISPATCHER
+#ifdef LOMIRI_FEATURES_ENABLED
         auto urls = g_strsplit("calendar://", ",", 0);
         auto appids = lomiri_url_dispatch_url_appid(const_cast<const gchar**>(urls));
         g_strfreev(urls);
@@ -511,7 +525,9 @@ private:
     // as the name indicates, don't use this directly: use server_caps() instead
     mutable std::set<std::string> m_lazy_caps;
 
-    static constexpr char const * HINT_TIMEOUT {"x-lomiri-snap-decisions-timeout"};
+#ifdef LOMIRI_FEATURES_ENABLED
+    static constexpr char const * HINT_LOMIRI_TIMEOUT {"x-lomiri-snap-decisions-timeout"};
+#endif
 };
 
 /***
diff --git a/src/planner-aggregate.cpp b/src/planner-aggregate.cpp
index 23a1230..3b05ea1 100644
--- a/src/planner-aggregate.cpp
+++ b/src/planner-aggregate.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Canonical Ltd.
+ * Copyright 2021 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <datetime/planner-aggregate.h>
@@ -30,7 +32,7 @@ namespace datetime {
 class AggregatePlanner::Impl
 {
 public:
-    Impl(AggregatePlanner* owner):
+    explicit Impl(AggregatePlanner* owner):
         m_owner(owner)
     {
     }
diff --git a/src/settings-live.cpp b/src/settings-live.cpp
index cf18739..9cbc23c 100644
--- a/src/settings-live.cpp
+++ b/src/settings-live.cpp
@@ -47,6 +47,7 @@ LiveSettings::LiveSettings():
     update_show_day();
     update_show_detected_locations();
     update_show_events();
+    update_show_alarms();
     update_show_locations();
     update_show_seconds();
     update_show_week_numbers();
@@ -117,6 +118,10 @@ LiveSettings::LiveSettings():
         g_settings_set_boolean(m_settings, SETTINGS_SHOW_EVENTS_S, value);
     });
 
+    show_alarms.changed().connect([this](bool value){
+        g_settings_set_boolean(m_settings, SETTINGS_SHOW_ALARMS_S, value);
+    });
+
     show_locations.changed().connect([this](bool value){
         g_settings_set_boolean(m_settings, SETTINGS_SHOW_LOCATIONS_S, value);
     });
@@ -239,6 +244,12 @@ void LiveSettings::update_show_events()
     show_events.set(val);
 }
 
+void LiveSettings::update_show_alarms()
+{
+    const auto val = g_settings_get_boolean(m_settings, SETTINGS_SHOW_ALARMS_S);
+    show_alarms.set(val);
+}
+
 void LiveSettings::update_show_locations()
 {
     const auto val = g_settings_get_boolean(m_settings, SETTINGS_SHOW_LOCATIONS_S);
@@ -415,6 +426,8 @@ void LiveSettings::update_key_ccid(const std::string& key)
         update_show_week_numbers();
     else if (key == SETTINGS_SHOW_EVENTS_S)
         update_show_events();
+    else if (key == SETTINGS_SHOW_ALARMS_S)
+        update_show_alarms();
     else if (key == SETTINGS_SHOW_LOCATIONS_S)
         update_show_locations();
     else if (key == SETTINGS_SHOW_DETECTED_S)
diff --git a/src/snap.cpp b/src/snap.cpp
index e306dea..c18f955 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -19,8 +19,9 @@
  *   Robert Tari <robert@tari.in>
  */
 
-#ifdef HAS_LOMIRI_SCHEMAS
+#ifdef LOMIRI_FEATURES_ENABLED
 #include "dbus-accounts-sound.h"
+#endif
 
 #include <datetime/snap.h>
 #include <datetime/utils.h> // is_locale_12h()
@@ -64,6 +65,7 @@ public:
       m_cancellable(g_cancellable_new()),
       m_system_bus{G_DBUS_CONNECTION(g_object_ref(system_bus))}
     {
+    #ifdef LOMIRI_FEATURES_ENABLED
         auto object_path = g_strdup_printf("/org/freedesktop/Accounts/User%lu", (gulong)getuid());
 
 
@@ -75,13 +77,16 @@ public:
                                          on_sound_proxy_ready,
                                          this);
         g_free(object_path);
+    #endif
     }
 
     ~Impl()
     {
         g_cancellable_cancel(m_cancellable);
         g_clear_object(&m_cancellable);
+    #ifdef LOMIRI_FEATURES_ENABLED
         g_clear_object(&m_accounts_service_sound_proxy);
+    #endif
         g_clear_object(&m_system_bus);
 
         for (const auto& key : m_notifications)
@@ -235,6 +240,7 @@ private:
         return m_settings->vibrate_silent_mode.get();
     }
 
+#ifdef LOMIRI_FEATURES_ENABLED
     static void on_sound_proxy_ready(GObject* /*source_object*/, GAsyncResult* res, gpointer gself)
     {
         GError * error;
@@ -253,17 +259,26 @@ private:
             static_cast<Impl*>(gself)->m_accounts_service_sound_proxy = proxy;
         }
     }
+#endif
 
     bool silent_mode() const
     {
+#ifdef LOMIRI_FEATURES_ENABLED
         return (m_accounts_service_sound_proxy != nullptr)
             && (accounts_service_sound_get_silent_mode(m_accounts_service_sound_proxy));
+#else
+        return false;
+#endif
     }
 
     bool should_vibrate() const
     {
+#ifdef LOMIRI_FEATURES_ENABLED
         return (m_accounts_service_sound_proxy != nullptr)
             && (accounts_service_sound_get_other_vibrate(m_accounts_service_sound_proxy));
+#else
+        return true;
+#endif
     }
 
     std::string get_alarm_uri(const Appointment& appointment,
@@ -306,7 +321,9 @@ private:
     const std::shared_ptr<const Settings> m_settings;
     std::set<int> m_notifications;
     GCancellable * m_cancellable {nullptr};
+#ifdef LOMIRI_FEATURES_ENABLED
     AccountsServiceSound * m_accounts_service_sound_proxy {nullptr};
+#endif
     GDBusConnection * m_system_bus {nullptr};
 
     static constexpr char const * ACTION_NONE {"none"};
@@ -345,5 +362,3 @@ Snap::operator()(const Appointment& appointment,
 } // namespace datetime
 } // namespace indicator
 } // namespace ayatana
-
-#endif
diff --git a/src/wakeup-timer-mainloop.cpp b/src/wakeup-timer-mainloop.cpp
index 56961f2..738306c 100644
--- a/src/wakeup-timer-mainloop.cpp
+++ b/src/wakeup-timer-mainloop.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Canonical Ltd.
+ * Copyright 2021 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <datetime/wakeup-timer-mainloop.h>
@@ -36,7 +38,7 @@ class MainloopWakeupTimer::Impl
 
 public:
 
-    Impl(const std::shared_ptr<Clock>& clock):
+    explicit Impl(const std::shared_ptr<Clock>& clock):
         m_clock(clock)
     {
     }
diff --git a/src/wakeup-timer-powerd.cpp b/src/wakeup-timer-powerd.cpp
index e66c94c..77893c8 100644
--- a/src/wakeup-timer-powerd.cpp
+++ b/src/wakeup-timer-powerd.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Canonical Ltd.
+ * Copyright 2021-2022 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <datetime/clock.h>
@@ -38,8 +40,7 @@ class PowerdWakeupTimer::Impl
 {
 public:
 
-    Impl(const std::shared_ptr<Clock>& clock):
-        m_clock(clock),
+    explicit Impl(const std::shared_ptr<Clock>& clock):
         m_cancellable(g_cancellable_new())
     {
         g_bus_get(G_BUS_TYPE_SYSTEM, m_cancellable, on_bus_ready, this);
@@ -269,7 +270,6 @@ private:
     ***/
 
     core::Signal<> m_timeout;
-    const std::shared_ptr<Clock>& m_clock;
     DateTime m_wakeup_time;
 
     std::shared_ptr<GDBusConnection> m_bus;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7a6a301..13dd0d8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,5 @@
 find_package(GMock REQUIRED)
 
-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS}")
-
 # dbustest
 pkg_check_modules(DBUSTEST REQUIRED
                   dbustest-1>=14.04.0)
@@ -41,46 +39,37 @@ function(add_test_by_name name)
   add_executable (${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
   target_link_options(${TEST_NAME} PRIVATE -no-pie)
   add_test (${TEST_NAME} ${TEST_NAME})
-  target_link_libraries (${TEST_NAME} indicatordatetimeservice ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} ${URLDISPATCHER_LIBRARIES})
+  target_link_libraries (${TEST_NAME} indicatordatetimeservice ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
 endfunction()
+
 add_test_by_name(test-datetime)
-if(LOMIRI_SCHEMAS_FOUND)
-    if(LOMIRI_SOUNDS_FOUND)
-        add_test_by_name(test-sound)
-        add_test_by_name(test-notification)
-    endif()
-    add_test_by_name(test-notification-response)
-endif()
+add_test_by_name(test-sound)
+
+if (ENABLE_LOMIRI_FEATURES)
+    add_test_by_name(test-notification)
+endif ()
+
+add_test_by_name(test-notification-response)
 add_test_by_name(test-actions)
 add_test_by_name(test-alarm-queue)
 add_test(NAME dear-reader-the-next-test-takes-60-seconds COMMAND true)
 add_test_by_name(test-clock)
-
-if (NOT DEFINED ENV{CI})
-    #add_test_by_name(test-exporter)
-endif()
-
+add_test_by_name(test-exporter)
 add_test_by_name(test-formatter)
 add_test_by_name(test-live-actions)
 add_test_by_name(test-locations)
 add_test_by_name(test-menu-appointments)
-
-if (NOT DEFINED ENV{CI})
-    #add_test_by_name(test-menus)
-endif()
-
+add_test_by_name(test-menus)
 add_test_by_name(test-planner)
 add_test_by_name(test-settings)
 add_test_by_name(test-timezone-timedated)
 add_test_by_name(test-utils)
 
-if(LOMIRI_SCHEMAS_FOUND)
-  set (TEST_NAME manual-test-snap)
-  set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME})
-  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
-  target_link_options(${TEST_NAME} PRIVATE -no-pie)
-  target_link_libraries (${TEST_NAME} indicatordatetimeservice ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} ${URLDISPATCHER_LIBRARIES})
-endif()
+set (TEST_NAME manual-test-snap)
+set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME})
+add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
+target_link_options(${TEST_NAME} PRIVATE -no-pie)
+target_link_libraries (${TEST_NAME} indicatordatetimeservice ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
 
 ##
 ## EDS Tests
@@ -115,6 +104,7 @@ add_eds_ics_test_by_name(test-eds-ics-tzids-2)
 add_eds_ics_test_by_name(test-eds-ics-tzids-utc)
 add_eds_ics_test_by_name(test-eds-ics-non-attending-alarms)
 add_eds_ics_test_by_name(test-eds-ics-repeating-events-with-individual-change)
+add_eds_ics_test_by_name(test-eds-ics-alarm-custom-sound)
 
 function(add_dbusmock_test_by_name name)
   set (TEST_NAME ${name})
diff --git a/tests/notification-fixture.h b/tests/notification-fixture.h
index 2349bab..5aedadc 100644
--- a/tests/notification-fixture.h
+++ b/tests/notification-fixture.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2014-2016 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2023 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -77,7 +77,9 @@ protected:
 
   static constexpr char const * SIGNAL_CLOSED {"NotificationClosed"};
 
-  static constexpr char const * HINT_TIMEOUT {"x-lomiri-snap-decisions-timeout"};
+#ifdef LOMIRI_FEATURES_ENABLED
+  static constexpr char const * HINT_LOMIRI_TIMEOUT {"x-lomiri-snap-decisions-timeout"};
+#endif
 
   static constexpr char const * AS_BUSNAME            {"org.freedesktop.Accounts"};
   static constexpr char const * AS_INTERFACE          {"com.lomiri.touch.AccountsService.Sound"};
@@ -312,20 +314,31 @@ protected:
     super::TearDown();
   }
 
-  void make_interactive()
+  void mock_capabilities(bool mock_lomiri_caps = false)
   {
     // GetCapabilities returns an array containing 'actions',
-    // so our snap decision will be interactive.
-    // For this test, it means we should get a timeout Notify Hint
-    // that matches duration_minutes
+    // so our notifications will be interactive.
+
+  #ifndef LOMIRI_FEATURES_ENABLED
+    g_assert_false(mock_lomiri_caps);
+  #endif
+
+    std::string python_code =
+      std::string("ret = ['actions', 'body'") +
+  #ifdef LOMIRI_FEATURES_ENABLED
+      (mock_lomiri_caps ? std::string(", '") + HINT_LOMIRI_TIMEOUT + "'" : "") +
+  #endif
+      "]";
+
     GError * error = nullptr;
     dbus_test_dbus_mock_object_add_method(notify_mock,
                                           notify_obj,
                                           METHOD_GET_CAPS,
                                           nullptr,
                                           G_VARIANT_TYPE_STRING_ARRAY,
-                                          "ret = ['actions', 'body']",
+                                          python_code.c_str(),
                                           &error);
+
     g_assert_no_error (error);
   }
 
diff --git a/tests/print-to.h b/tests/print-to.h
deleted file mode 100644
index 7cd6c2a..0000000
--- a/tests/print-to.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- * Copyright 2021 Robert Tari
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
- *   Robert Tari <robert@tari.in>
- */
-
-#ifndef INDICATOR_DATETIME_TESTS_PRINT_TO
-#define INDICATOR_DATETIME_TESTS_PRINT_TO
-
-#include <algorithm>
-#include <vector>
-
-#include <datetime/appointment.h>
-
-namespace ayatana {
-namespace indicator {
-namespace datetime {
-
-/***
-**** PrintTo() functions for GTest to represent objects as strings
-***/
-
-void
-PrintTo(const DateTime& datetime, std::ostream* os)
-{
-    *os << "{time:'" << datetime.format("%F %T %z") << '}';
-}
-
-void
-PrintTo(const Alarm& alarm, std::ostream* os)
-{
-    *os << '{';
-    *os << "{text:" << alarm.text << '}';
-    PrintTo(alarm.time, os);
-    *os << '}';
-}
-
-void
-PrintTo(const Appointment& appointment, std::ostream* os)
-{
-    *os << '{';
-
-    *os << "{uid:'" << appointment.uid << "'}"
-        << "{color:'" << appointment.color << "'}"
-        << "{summary:'" << appointment.summary << "'}";
-
-    *os << "{begin:";
-    PrintTo(appointment.begin, os);
-    *os << '}';
-
-    *os << "{end:";
-    PrintTo(appointment.end, os);
-    *os << '}';
-
-    for(const auto& alarm : appointment.alarms)
-        PrintTo(alarm, os);
-
-    *os << '}';
-}
-
-void
-PrintTo(const std::vector<Appointment>& appointments, std::ostream* os)
-{
-    *os << '{';
-    for (const auto& appointment : appointments)
-        PrintTo(appointment, os);
-    *os << '}';
-}
-
-} // namespace datetime
-} // namespace indicator
-} // namespace ayatana
-
-#endif
diff --git a/tests/run-eds-ics-test.sh b/tests/run-eds-ics-test.sh
index 5654034..4cbc0d3 100755
--- a/tests/run-eds-ics-test.sh
+++ b/tests/run-eds-ics-test.sh
@@ -72,3 +72,6 @@ if [ $rv -eq 0 ]; then
     sleep 5
     rm -rf $TEST_TMP_DIR
 fi
+
+# pass the test's return code to the caller.
+exit "$rv"
diff --git a/tests/test-actions.cpp b/tests/test-actions.cpp
index 09f3a5d..8316357 100644
--- a/tests/test-actions.cpp
+++ b/tests/test-actions.cpp
@@ -36,7 +36,6 @@ class ActionsFixture: public StateFixture
 
         Appointment a1; // an alarm clock appointment
         a1.color = "red";
-        a1.summary = "Alarm";
         a1.summary = "http://www.example.com/";
         a1.uid = "example";
         a1.type = Appointment::ALARM;
@@ -44,10 +43,9 @@ class ActionsFixture: public StateFixture
 
         Appointment a2; // a non-alarm appointment
         a2.color = "green";
-        a2.summary = "Other Text";
         a2.summary = "http://www.monkey.com/";
         a2.uid = "monkey";
-        a1.type = Appointment::EVENT;
+        a2.type = Appointment::EVENT;
         a2.begin = a2.end = tomorrow;
 
         return std::vector<Appointment>({a1, a2});
diff --git a/tests/test-alarm-queue.cpp b/tests/test-alarm-queue.cpp
index aad93e9..b2aeb49 100644
--- a/tests/test-alarm-queue.cpp
+++ b/tests/test-alarm-queue.cpp
@@ -42,7 +42,7 @@ protected:
     std::shared_ptr<RangePlanner> m_range_planner;
     std::shared_ptr<UpcomingPlanner> m_upcoming;
 
-    void SetUp()
+    void SetUp() override
     {
         super::SetUp();
 
@@ -57,7 +57,7 @@ protected:
         EXPECT_TRUE(m_triggered.empty());
     }
 
-    void TearDown()
+    void TearDown() override
     {
         m_triggered.clear();
         m_watcher.reset();
@@ -75,7 +75,6 @@ protected:
 
         Appointment a1; // an alarm
         a1.color = "red";
-        a1.summary = "Alarm";
         a1.summary = "http://www.example.com/";
         a1.uid = "example";
         a1.type = Appointment::ALARM;
@@ -88,7 +87,6 @@ protected:
 
         Appointment a2; // something else
         a2.color = "green";
-        a2.summary = "Other Text";
         a2.summary = "http://www.monkey.com/";
         a2.uid = "monkey";
         a2.type = Appointment::EVENT;
diff --git a/tests/test-dbus-fixture.h b/tests/test-dbus-fixture.h
index 0f19b50..7525e06 100644
--- a/tests/test-dbus-fixture.h
+++ b/tests/test-dbus-fixture.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Canonical Ltd.
+ * Copyright 2021 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #ifndef INDICATOR_DATETIME_TESTS_DBUS_FIXTURE_H
@@ -65,8 +67,8 @@ class TestDBusFixture: public GlibFixture
 
   protected:
 
-    GTestDBus * test_dbus;
-    GDBusConnection * system_bus;
+    GTestDBus * test_dbus = NULL;
+    GDBusConnection * system_bus = NULL;
     const std::vector<std::string> service_dirs;
 
     virtual void SetUp() override
diff --git a/tests/test-eds-ics-alarm-custom-sound.cpp b/tests/test-eds-ics-alarm-custom-sound.cpp
new file mode 100644
index 0000000..9f63c29
--- /dev/null
+++ b/tests/test-eds-ics-alarm-custom-sound.cpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ * Copyright 2021 Robert Tari
+ * Copyright 2023 UBports Foundation.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
+ *   Ratchanan Srirattanamet <ratchanan@ubports.com>
+ */
+
+#include <algorithm>
+
+#include <datetime/alarm-queue-simple.h>
+#include <datetime/clock-mock.h>
+#include <datetime/engine-eds.h>
+#include <datetime/myself.h>
+#include <datetime/planner-range.h>
+
+#include <gtest/gtest.h>
+
+#include "glib-fixture.h"
+#include "timezone-mock.h"
+#include "wakeup-timer-mock.h"
+
+using namespace ayatana::indicator::datetime;
+using VAlarmFixture = GlibFixture;
+
+/***
+****
+***/
+
+TEST_F(VAlarmFixture, AlarmCustomSound)
+{
+    // start the EDS engine
+    auto engine = std::make_shared<EdsEngine>(std::make_shared<Myself>());
+
+    // we need a consistent timezone for the planner and our local DateTimes
+    constexpr char const * zone_str {"America/Recife"};
+    auto tz = std::make_shared<MockTimezone>(zone_str);
+
+    #if GLIB_CHECK_VERSION(2, 68, 0)
+    auto gtz = g_time_zone_new_identifier(zone_str);
+
+    if (gtz == NULL)
+    {
+        gtz = g_time_zone_new_utc();
+    }
+    #else
+    auto gtz = g_time_zone_new(zone_str);
+    #endif
+
+    // make a planner that looks at the first half of 2023 in EDS
+    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
+    const DateTime range_begin {gtz, 2023,1, 1, 0, 0, 0.0};
+    const DateTime range_end   {gtz, 2023,6,30,23,59,59.5};
+    planner->range().set(std::make_pair(range_begin, range_end));
+
+    // give EDS a moment to load
+    if (planner->appointments().get().empty()) {
+        g_message("waiting a moment for EDS to load...");
+        auto on_appointments_changed = [this](const std::vector<Appointment>& appointments){
+            g_message("ah, they loaded");
+            if (!appointments.empty())
+                g_main_loop_quit(loop);
+        };
+        core::ScopedConnection conn(planner->appointments().changed().connect(on_appointments_changed));
+        constexpr int max_wait_sec = 10;
+        wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND);
+    }
+
+    // the planner should match what we've got in the calendar.ics file
+    const auto appts = planner->appointments().get();
+    EXPECT_EQ(1, appts.size());
+    EXPECT_EQ(1, appts[0].alarms.size());
+    EXPECT_EQ(appts[0].alarms[0].audio_url, "file:///usr/share/sounds/lomiri/ringtones/Entropy.ogg");
+
+    // cleanup
+    g_time_zone_unref(gtz);
+}
diff --git a/tests/test-eds-ics-alarm-custom-sound.ics.in b/tests/test-eds-ics-alarm-custom-sound.ics.in
new file mode 100644
index 0000000..5354a71
--- /dev/null
+++ b/tests/test-eds-ics-alarm-custom-sound.ics.in
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+X-EVOLUTION-DATA-REVISION:2023-06-06T17:25:48.265942Z(42)
+BEGIN:VTODO
+UID:882a6a702f87a3afde203e5609d2626ba144a3c2
+DTSTAMP:20230606T172548Z
+DTSTART:20230607T165701
+PRIORITY:0
+SUMMARY:Alarm
+CATEGORIES:x-lomiri-alarm
+SEQUENCE:1
+LAST-MODIFIED:20230606T172548Z
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:eceda45c7493b76e41cdb2369ce8160b75e53f98
+ACTION:AUDIO
+TRIGGER;RELATED=START:PT0S
+REPEAT:0
+DURATION:PT0S
+ATTACH:file:///usr/share/sounds/lomiri/ringtones/Entropy.ogg
+END:VALARM
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:8eec04befc2876fb13a6726181fed33b9f7810c8
+ACTION:DISPLAY
+DESCRIPTION:Alarm
+TRIGGER;RELATED=START:PT0S
+REPEAT:0
+DURATION:PT0S
+END:VALARM
+END:VTODO
+END:VCALENDAR
diff --git a/tests/test-eds-ics-all-day-events.cpp b/tests/test-eds-ics-all-day-events.cpp
index 5d7cdc6..0fa40fd 100644
--- a/tests/test-eds-ics-all-day-events.cpp
+++ b/tests/test-eds-ics-all-day-events.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2024 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -30,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
@@ -82,7 +81,6 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     // what we expect to get...
     Appointment expected_appt;
     expected_appt.uid = "20150521T111538Z-7449-1000-3572-0@ghidorah";
-    expected_appt.color = "#becedd";
     expected_appt.summary = "Memorial Day";
     expected_appt.begin = DateTime{gtz,2015,5,25,0,0,0};
     expected_appt.end = DateTime{gtz,2015,5,26,0,0,0};
@@ -94,10 +92,14 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     EXPECT_EQ(expected_appt.begin, appt.begin);
     EXPECT_EQ(expected_appt.end, appt.end);
     EXPECT_EQ(expected_appt.uid, appt.uid);
-    EXPECT_EQ(expected_appt.color, appt.color);
     EXPECT_EQ(expected_appt.summary, appt.summary);
     EXPECT_EQ(0, appt.alarms.size());
 
+    EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2)
+    {
+        return sColourIn == sColourExpected1 || sColourIn == sColourExpected2;
+    }, appt.color, "#becedd", "#62a0ea");
+
     // cleanup
     g_time_zone_unref(gtz);
 }
diff --git a/tests/test-eds-ics-missing-trigger.cpp b/tests/test-eds-ics-missing-trigger.cpp
index 3eeb919..4030999 100644
--- a/tests/test-eds-ics-missing-trigger.cpp
+++ b/tests/test-eds-ics-missing-trigger.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2024 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -20,7 +20,7 @@
  */
 
 #include <algorithm>
-
+#include <array>
 #include <datetime/alarm-queue-simple.h>
 #include <datetime/clock-mock.h>
 #include <datetime/engine-eds.h>
@@ -30,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
@@ -63,7 +62,7 @@ TEST_F(VAlarmFixture, MissingTriggers)
     // make a planner that looks at the first half of 2015 in EDS
     auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
     const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
-    const DateTime range_end   {gtz, 2015,7,1,23,59,59.5};
+    const DateTime range_end   {gtz, 2015,6,30,23,59,59.5};
     planner->range().set(std::make_pair(range_begin, range_end));
 
     // give EDS a moment to load
@@ -79,25 +78,25 @@ TEST_F(VAlarmFixture, MissingTriggers)
         wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND);
     }
 
-    // build expected: one-time alarm
-    std::vector<Appointment> expected;
-    Appointment a;
-    a.type = Appointment::ALARM;
-    a.uid = "20150617T211838Z-6217-32011-2036-1@lomiri-phablet";
-    a.color = "#becedd";
-    a.summary = "One Time Alarm";
-    a.begin = DateTime { gtz, 2015, 6, 18, 10, 0, 0};
-    a.end = a.begin;
-    a.alarms.resize(1);
-    a.alarms[0].audio_url = "file://" ALARM_DEFAULT_SOUND;
-    a.alarms[0].time = a.begin;
-    a.alarms[0].text = a.summary;
-    expected.push_back(a);
-
-    // build expected: recurring alarm
-    a.uid = "20150617T211913Z-6217-32011-2036-5@lomiri-phablet";
-    a.summary = "Recurring Alarm";
-    a.alarms[0].text = a.summary;
+    // build expected: one-time alarm 1
+    std::vector<Appointment> expected1;
+    Appointment a1;
+    a1.type = Appointment::ALARM;
+    a1.uid = "20150617T211838Z-6217-32011-2036-1@lomiri-phablet";
+    a1.color = "#becedd";
+    a1.summary = "One Time Alarm";
+    a1.begin = DateTime { gtz, 2015, 6, 18, 10, 0, 0};
+    a1.end = a1.begin;
+    a1.alarms.resize(1);
+    a1.alarms[0].audio_url = "file://" ALARM_DEFAULT_SOUND;
+    a1.alarms[0].time = a1.begin;
+    a1.alarms[0].text = a1.summary;
+    expected1.push_back(a1);
+
+    // build expected: recurring alarm 1
+    a1.uid = "20150617T211913Z-6217-32011-2036-5@lomiri-phablet";
+    a1.summary = "Recurring Alarm";
+    a1.alarms[0].text = a1.summary;
     std::array<DateTime,13> recurrences {
         DateTime{ gtz, 2015, 6, 18, 10, 1, 0 },
         DateTime{ gtz, 2015, 6, 19, 10, 1, 0 },
@@ -114,13 +113,41 @@ TEST_F(VAlarmFixture, MissingTriggers)
         DateTime{ gtz, 2015, 6, 30, 10, 1, 0 },
     };
     for (const auto& time : recurrences) {
-        a.begin = a.end = a.alarms[0].time = time;
-        expected.push_back(a);
+        a1.begin = a1.end = a1.alarms[0].time = time;
+        expected1.push_back(a1);
+    }
+
+    // build expected: one-time alarm 2
+    std::vector<Appointment> expected2;
+    Appointment a2;
+    a2.type = Appointment::ALARM;
+    a2.uid = "20150617T211838Z-6217-32011-2036-1@lomiri-phablet";
+    a2.color = "#62a0ea";
+    a2.summary = "One Time Alarm";
+    a2.begin = DateTime { gtz, 2015, 6, 18, 10, 0, 0};
+    a2.end = a2.begin;
+    a2.alarms.resize(1);
+    a2.alarms[0].audio_url = "file://" ALARM_DEFAULT_SOUND;
+    a2.alarms[0].time = a2.begin;
+    a2.alarms[0].text = a2.summary;
+    expected2.push_back(a2);
+
+    // build expected: recurring alarm 2
+    a2.uid = "20150617T211913Z-6217-32011-2036-5@lomiri-phablet";
+    a2.summary = "Recurring Alarm";
+    a2.alarms[0].text = a2.summary;
+    for (const auto& time : recurrences) {
+        a2.begin = a2.end = a2.alarms[0].time = time;
+        expected2.push_back(a2);
     }
 
     // the planner should match what we've got in the calendar.ics file
     const auto appts = planner->appointments().get();
-    EXPECT_EQ(expected, appts);
+
+    EXPECT_PRED3([](auto lAppointmentsIn, auto lAppointmentsExpected1, auto lAppointmentsExpected2)
+    {
+        return lAppointmentsIn == lAppointmentsExpected1 || lAppointmentsIn == lAppointmentsExpected2;
+    }, appts, expected1, expected2);
 
     // cleanup
     g_time_zone_unref(gtz);
diff --git a/tests/test-eds-ics-non-attending-alarms.cpp b/tests/test-eds-ics-non-attending-alarms.cpp
index bfa3ac3..629c1fc 100644
--- a/tests/test-eds-ics-non-attending-alarms.cpp
+++ b/tests/test-eds-ics-non-attending-alarms.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
+ * Copyright 2021-2023 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <algorithm>
@@ -28,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
@@ -80,9 +81,10 @@ TEST_F(VAlarmFixture, NonAttendingEvent)
 
     // the planner should match what we've got in the calendar.ics file
     const auto appts = planner->appointments().get();
-    EXPECT_EQ(2, appts.size());
+    EXPECT_EQ(3, appts.size());
     EXPECT_EQ(appts[0].begin, DateTime(gtz, 2016, 4, 4, 16, 0, 0));
-    EXPECT_EQ(appts[1].begin, DateTime(gtz, 2016, 4, 6, 16, 0, 0));
+    EXPECT_EQ(appts[1].begin, DateTime(gtz, 2016, 4, 5, 16, 0, 0));
+    EXPECT_EQ(appts[2].begin, DateTime(gtz, 2016, 4, 6, 16, 0, 0));
 
     // cleanup
     g_time_zone_unref(gtz);
diff --git a/tests/test-eds-ics-nonrepeating-events.cpp b/tests/test-eds-ics-nonrepeating-events.cpp
index 8aa2b82..49fc9be 100644
--- a/tests/test-eds-ics-nonrepeating-events.cpp
+++ b/tests/test-eds-ics-nonrepeating-events.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2024 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -20,7 +20,7 @@
  */
 
 #include <algorithm>
-
+#include <array>
 #include <datetime/alarm-queue-simple.h>
 #include <datetime/clock-mock.h>
 #include <datetime/engine-eds.h>
@@ -30,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
@@ -82,7 +81,6 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     // what we expect to get...
     Appointment expected_appt;
     expected_appt.uid = "20150520T000726Z-3878-32011-1770-81@lomiri-phablet";
-    expected_appt.color = "#becedd";
     expected_appt.summary = "Alarm";
     std::array<Alarm,1> expected_alarms = {
         Alarm({"Alarm", "file://" ALARM_DEFAULT_SOUND, DateTime(gtz,2015,5,20,20,00,0)})
@@ -94,10 +92,14 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     for (size_t i=0, n=expected_alarms.size(); i<n; i++) {
         const auto& appt = appts[i];
         EXPECT_EQ(expected_appt.uid, appt.uid);
-        EXPECT_EQ(expected_appt.color, appt.color);
         EXPECT_EQ(expected_appt.summary, appt.summary);
         EXPECT_EQ(1, appt.alarms.size());
         EXPECT_EQ(expected_alarms[i], appt.alarms[0]);
+
+        EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2)
+        {
+            return sColourIn == sColourExpected1 || sColourIn == sColourExpected2;
+        }, appt.color, "#becedd", "#62a0ea");
     }
 
     // cleanup
diff --git a/tests/test-eds-ics-repeating-events-with-individual-change.cpp b/tests/test-eds-ics-repeating-events-with-individual-change.cpp
index a4a85c0..c83c8d2 100644
--- a/tests/test-eds-ics-repeating-events-with-individual-change.cpp
+++ b/tests/test-eds-ics-repeating-events-with-individual-change.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 Canonical Ltd.
+ * Copyright 2021-2022 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,10 +16,11 @@
  *
  * Authors:
  *   Renato Araujo Oliveira Filho <renato.filho@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <algorithm>
-
+#include <array>
 #include <datetime/alarm-queue-simple.h>
 #include <datetime/clock-mock.h>
 #include <datetime/engine-eds.h>
@@ -28,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
diff --git a/tests/test-eds-ics-repeating-events.cpp b/tests/test-eds-ics-repeating-events.cpp
index 4125623..a570d0f 100644
--- a/tests/test-eds-ics-repeating-events.cpp
+++ b/tests/test-eds-ics-repeating-events.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2024 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -20,7 +20,7 @@
  */
 
 #include <algorithm>
-
+#include <array>
 #include <datetime/alarm-queue-simple.h>
 #include <datetime/clock-mock.h>
 #include <datetime/engine-eds.h>
@@ -30,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
@@ -82,7 +81,6 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     // what we expect to get...
     Appointment expected_appt;
     expected_appt.uid = "20150507T211449Z-4262-32011-1418-1@lomiri-phablet";
-    expected_appt.color = "#becedd";
     expected_appt.summary = "Alarm";
     std::array<Alarm,8> expected_alarms = {
         Alarm({"Alarm", "file://" ALARM_DEFAULT_SOUND, DateTime(gtz,2015,5, 8,16,40,0)}),
@@ -101,10 +99,14 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     for (size_t i=0, n=expected_alarms.size(); i<n; i++) {
         const auto& appt = appts[i];
         EXPECT_EQ(expected_appt.uid, appt.uid);
-        EXPECT_EQ(expected_appt.color, appt.color);
         EXPECT_EQ(expected_appt.summary, appt.summary);
         EXPECT_EQ(1, appt.alarms.size());
         EXPECT_EQ(expected_alarms[i], appt.alarms[0]);
+
+        EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2)
+        {
+            return sColourIn == sColourExpected1 || sColourIn == sColourExpected2;
+        }, appt.color, "#becedd", "#62a0ea");
     }
 
     // cleanup
diff --git a/tests/test-eds-ics-repeating-valarms.cpp b/tests/test-eds-ics-repeating-valarms.cpp
index 1584983..ba44662 100644
--- a/tests/test-eds-ics-repeating-valarms.cpp
+++ b/tests/test-eds-ics-repeating-valarms.cpp
@@ -30,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
diff --git a/tests/test-eds-ics-tzids-2.cpp b/tests/test-eds-ics-tzids-2.cpp
index a1d2f5a..1bef68b 100644
--- a/tests/test-eds-ics-tzids-2.cpp
+++ b/tests/test-eds-ics-tzids-2.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2024 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -20,7 +20,7 @@
  */
 
 #include <algorithm>
-
+#include <array>
 #include <datetime/alarm-queue-simple.h>
 #include <datetime/clock-mock.h>
 #include <datetime/engine-eds.h>
@@ -30,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
@@ -80,20 +79,35 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     }
 
     // what we expect to get...
-    std::array<Appointment,1> expected_appts;
-    auto appt = &expected_appts[0];
-    appt->uid = "109264742";
-    appt->color = "#becedd";
-    appt->summary = "National Incubator Initiative for Clean Energy (NIICE) FOA: Pre-Concept Paper Informational Webinar";
-    appt->begin = DateTime{gtz,2014,1,21,11,0,0};
-    appt->end = DateTime{gtz,2014,1,21,13,0,0};
-    appt->alarms = std::vector<Alarm>{ Alarm({"Reminder", "", DateTime(gtz,2014,1,21,10,45,0)}) };
+    std::array<Appointment,1> expected_appts1;
+    auto appt1 = &expected_appts1[0];
+    appt1->uid = "109264742";
+    appt1->color = "#becedd";
+    appt1->summary = "National Incubator Initiative for Clean Energy (NIICE) FOA: Pre-Concept Paper Informational Webinar";
+    appt1->begin = DateTime{gtz,2014,1,21,11,0,0};
+    appt1->end = DateTime{gtz,2014,1,21,13,0,0};
+    appt1->alarms = std::vector<Alarm>{ Alarm({"Reminder", "", DateTime(gtz,2014,1,21,10,45,0)}) };
+
+    std::array<Appointment,1> expected_appts2;
+    auto appt2 = &expected_appts2[0];
+    appt2->uid = "109264742";
+    appt2->color = "#62a0ea";
+    appt2->summary = "National Incubator Initiative for Clean Energy (NIICE) FOA: Pre-Concept Paper Informational Webinar";
+    appt2->begin = DateTime{gtz,2014,1,21,11,0,0};
+    appt2->end = DateTime{gtz,2014,1,21,13,0,0};
+    appt2->alarms = std::vector<Alarm>{ Alarm({"Reminder", "", DateTime(gtz,2014,1,21,10,45,0)}) };
 
     // compare it to what we actually loaded...
     const auto appts = planner->appointments().get();
-    EXPECT_EQ(expected_appts.size(), appts.size());
-    for (size_t i=0, n=std::min(appts.size(),expected_appts.size()); i<n; i++)
-        EXPECT_EQ(expected_appts[i], appts[i]);
+    EXPECT_EQ(expected_appts1.size(), appts.size());
+    EXPECT_EQ(expected_appts2.size(), appts.size());
+    for (size_t i=0, n=std::min(appts.size(),expected_appts1.size()); i<n; i++)
+    {
+        EXPECT_PRED3([](auto pAppointmentIn, auto pAppointmentExpected1, auto pAppointmentExpected2)
+        {
+            return pAppointmentIn == pAppointmentExpected1 || pAppointmentIn == pAppointmentExpected2;
+        }, appts[i], expected_appts1[i], expected_appts2[i]);
+    }
 
     // cleanup
     g_time_zone_unref(gtz);
diff --git a/tests/test-eds-ics-tzids-utc.cpp b/tests/test-eds-ics-tzids-utc.cpp
index f79bf3e..d88e95d 100644
--- a/tests/test-eds-ics-tzids-utc.cpp
+++ b/tests/test-eds-ics-tzids-utc.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
+ * Copyright 2021-2024 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,10 +16,11 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <algorithm>
-
+#include <array>
 #include <datetime/alarm-queue-simple.h>
 #include <datetime/clock-mock.h>
 #include <datetime/engine-eds.h>
@@ -28,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
@@ -79,19 +80,33 @@ TEST_F(VAlarmFixture, UTCAppointments)
     }
 
     // what we expect to get...
-    std::array<Appointment,1> expected_appts;
-    auto appt = &expected_appts[0];
-    appt->uid = "20160322T132738Z";
-    appt->color = "#becedd";
-    appt->summary = "UTC event";
-    appt->begin = DateTime{gtz,2016,3,22,15,0,0};
-    appt->end = DateTime{gtz,2016,3,22,16,0,0};
+    std::array<Appointment,1> expected_appts1;
+    auto appt1 = &expected_appts1[0];
+    appt1->uid = "20160322T132738Z";
+    appt1->color = "#becedd";
+    appt1->summary = "UTC event";
+    appt1->begin = DateTime{gtz,2016,3,22,15,0,0};
+    appt1->end = DateTime{gtz,2016,3,22,16,0,0};
+
+    std::array<Appointment,1> expected_appts2;
+    auto appt2 = &expected_appts2[0];
+    appt2->uid = "20160322T132738Z";
+    appt2->color = "#62a0ea";
+    appt2->summary = "UTC event";
+    appt2->begin = DateTime{gtz,2016,3,22,15,0,0};
+    appt2->end = DateTime{gtz,2016,3,22,16,0,0};
 
     // compare it to what we actually loaded...
     const auto appts = planner->appointments().get();
-    EXPECT_EQ(expected_appts.size(), appts.size());
-    for (size_t i=0, n=std::min(appts.size(),expected_appts.size()); i<n; i++)
-        EXPECT_EQ(expected_appts[i], appts[i]);
+    EXPECT_EQ(expected_appts1.size(), appts.size());
+    EXPECT_EQ(expected_appts2.size(), appts.size());
+    for (size_t i=0, n=std::min(appts.size(),expected_appts1.size()); i<n; i++)
+    {
+        EXPECT_PRED3([](auto pAppointmentIn, auto pAppointmentExpected1, auto pAppointmentExpected2)
+        {
+            return pAppointmentIn == pAppointmentExpected1 || pAppointmentIn == pAppointmentExpected2;
+        }, appts[i], expected_appts1[i], expected_appts2[i]);
+    }
 
     // cleanup
     g_time_zone_unref(gtz);
diff --git a/tests/test-eds-ics-tzids.cpp b/tests/test-eds-ics-tzids.cpp
index 11d44b7..4999e66 100644
--- a/tests/test-eds-ics-tzids.cpp
+++ b/tests/test-eds-ics-tzids.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2024 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -20,7 +20,7 @@
  */
 
 #include <algorithm>
-
+#include <array>
 #include <datetime/alarm-queue-simple.h>
 #include <datetime/clock-mock.h>
 #include <datetime/engine-eds.h>
@@ -30,7 +30,6 @@
 #include <gtest/gtest.h>
 
 #include "glib-fixture.h"
-#include "print-to.h"
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
@@ -80,19 +79,34 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     }
 
     // what we expect to get...
-    std::array<Appointment,1> expected_appts;
-    auto appt = &expected_appts[0];
-    appt->uid = "8ggc30kh89qql8vjumgtug7l14@google.com";
-    appt->color = "#becedd";
-    appt->summary = "Hello";
-    appt->begin = DateTime{gtz,2015,7,1,20,0,0};
-    appt->end = DateTime{gtz,2015,7,1,22,0,0};
+    std::array<Appointment,1> expected_appts1;
+    auto appt1 = &expected_appts1[0];
+    appt1->uid = "8ggc30kh89qql8vjumgtug7l14@google.com";
+    appt1->color = "#becedd";
+    appt1->summary = "Hello";
+    appt1->begin = DateTime{gtz,2015,7,1,20,0,0};
+    appt1->end = DateTime{gtz,2015,7,1,22,0,0};
+
+    std::array<Appointment,1> expected_appts2;
+    auto appt2 = &expected_appts2[0];
+    appt2->uid = "8ggc30kh89qql8vjumgtug7l14@google.com";
+    appt2->color = "#62a0ea";
+    appt2->summary = "Hello";
+    appt2->begin = DateTime{gtz,2015,7,1,20,0,0};
+    appt2->end = DateTime{gtz,2015,7,1,22,0,0};
 
     // compare it to what we actually loaded...
     const auto appts = planner->appointments().get();
-    EXPECT_EQ(expected_appts.size(), appts.size());
-    for (size_t i=0, n=std::min(appts.size(),expected_appts.size()); i<n; i++)
-        EXPECT_EQ(expected_appts[i], appts[i]);
+    EXPECT_EQ(expected_appts1.size(), appts.size());
+    EXPECT_EQ(expected_appts2.size(), appts.size());
+
+    for (size_t i=0, n=std::min(appts.size(),expected_appts1.size()); i<n; i++)
+    {
+        EXPECT_PRED3([](auto pAppointmentIn, auto pAppointmentExpected1, auto pAppointmentExpected2)
+        {
+            return pAppointmentIn == pAppointmentExpected1 || pAppointmentIn == pAppointmentExpected2;
+        }, appts[i], expected_appts1[i], expected_appts2[i]);
+    }
 
     // cleanup
     g_time_zone_unref(gtz);
diff --git a/tests/test-formatter.cpp b/tests/test-formatter.cpp
index a8d798b..d8c0afb 100644
--- a/tests/test-formatter.cpp
+++ b/tests/test-formatter.cpp
@@ -1,9 +1,10 @@
-
 /*
  * Copyright 2013 Canonical Ltd.
+ * Copyright 2021 Robert Tari
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -143,10 +144,9 @@ TEST_F(FormatterFixture, DISABLED_TestDesktopHeader)
   auto now = DateTime::Local(2020, 10, 31, 18, 30, 59);
   auto clock = std::make_shared<MockClock>(now);
 
-  bool locale_set = false;
   for(const auto& test_case : test_cases)
     {
-      test_case.is_12h ? locale_set = Set12hLocale() : locale_set = Set24hLocale();
+      bool locale_set = test_case.is_12h ? Set12hLocale() : Set24hLocale();
       DesktopFormatter f(clock, m_settings);
 
       m_settings->show_day.set(test_case.show_day);
diff --git a/tests/test-menu-appointments.cpp b/tests/test-menu-appointments.cpp
index 4d15b9f..ed02395 100644
--- a/tests/test-menu-appointments.cpp
+++ b/tests/test-menu-appointments.cpp
@@ -20,11 +20,10 @@
  */
 
 #include "glib-fixture.h"
-#include "print-to.h"
 
 #include <datetime/appointment.h>
 #include <datetime/menu.h>
-
+#include <algorithm>
 #include <vector>
 
 using MenuAppointmentFixture = GlibFixture;
@@ -117,70 +116,6 @@ TEST_F(MenuAppointmentFixture, DisplayEvents)
         DateTime::Local(2017,1,1,0,0,0)
     );
 
-    const auto nye_party = create_appointment(
-        Appointment::EVENT,
-        "uid-new-years-party",
-        "New Year Party at Ted's",
-        DateTime::Local(2016,12,31,19,0,0),
-        DateTime::Local(2017, 1, 1, 2,0,0)
-    );
-
-    const auto new_years_day = create_appointment(
-        Appointment::EVENT,
-        "uid-new-years-day",
-        "New Years' Day",
-        DateTime::Local(2017,1,1,0,0,0),
-        DateTime::Local(2017,1,2,0,0,0)
-    );
-
-    const auto weekday_wakeup_alarm = create_appointment(
-        Appointment::ALARM,
-        "wakeup-alarm",
-        "Wake Up",
-        DateTime::Local(2017,1,3,6,0,0),
-        DateTime::Local(2017,1,3,6,0,0)
-    );
-
-    const auto dentist_appointment = create_appointment(
-        Appointment::EVENT,
-        "dentist",
-        "Dentist",
-        DateTime::Local(2017,1,5,14,0,0),
-        DateTime::Local(2017,1,5,15,0,0)
-    );
-
-    const auto marcus_birthday = create_appointment(
-        Appointment::EVENT,
-        "uid-mlk",
-        "Marcus' Birthday",
-        DateTime::Local(2017,1,8,0,0,0),
-        DateTime::Local(2017,1,9,0,0,0)
-    );
-
-    const auto mlk_day = create_appointment(
-        Appointment::EVENT,
-        "uid-mlk",
-        "Martin Luther King Day",
-        DateTime::Local(2017,1,16,0,0,0),
-        DateTime::Local(2017,1,17,0,0,0)
-    );
-
-    const auto rodney_party = create_appointment(
-        Appointment::EVENT,
-        "uid-rodney",
-        "Rodney's Party",
-        DateTime::Local(2017,1,30,19,0,0),
-        DateTime::Local(2017,1,30,23,0,0)
-    );
-
-    const auto pub_with_pawel = create_appointment(
-        Appointment::ALARM,
-        "uid-pawel",
-        "Meet Pawel at the Pub",
-        DateTime::Local(2017,2,4,19,0,0),
-        DateTime::Local(2017,2,4,19,0,0)
-    );
-
     const struct
     {
         const char* const description;
diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp
index de323d3..ea8cb30 100644
--- a/tests/test-menus.cpp
+++ b/tests/test-menus.cpp
@@ -186,7 +186,6 @@ private:
 
         Appointment a1; // an alarm clock appointment
         a1.color = "red";
-        a1.summary = "Alarm";
         a1.summary = "http://www.example.com/";
         a1.uid = "example";
         a1.type = Appointment::ALARM;
@@ -194,10 +193,9 @@ private:
 
         Appointment a2; // a non-alarm appointment
         a2.color = "green";
-        a2.summary = "Other Text";
         a2.summary = "http://www.monkey.com/";
         a2.uid = "monkey";
-        a1.type = Appointment::EVENT;
+        a2.type = Appointment::EVENT;
         a2.begin = a2.end = tomorrow;
 
         return std::vector<Appointment>({a1, a2});
@@ -274,12 +272,35 @@ private:
         for (int i=0, n=appointments.size(); i<n; i++)
             InspectAppointmentMenuItem(section, first_appt_index+i, appointments[i]);
 
+        // there shouldn't be any alarms when "show alarms" is false
+        bool has_alarms = false;
+        m_state->settings->show_alarms.set(false);
+        wait_msec();
+
+        std::vector<Appointment> display_appointments = Menu::get_display_appointments(appointments, m_state->clock->localtime(), 5, m_state->settings->show_alarms.get());
+        for (int i=0, n=display_appointments.size(); i<n; i++)
+            if ((has_alarms = display_appointments[i].is_alarm()))
+               break;
+
+        EXPECT_FALSE(has_alarms);
+
+        m_state->settings->show_alarms.set(true);
+        wait_msec();
+
+        display_appointments = Menu::get_display_appointments(appointments, m_state->clock->localtime(), 5, m_state->settings->show_alarms.get());
+        for (int i=0, n=display_appointments.size(); i<n; i++)
+            if ((has_alarms = display_appointments[i].is_alarm()))
+                break;
+
+        EXPECT_TRUE(has_alarms);
+
         //g_clear_object(&section);
         //g_clear_object(&submenu);
     }
 
     void InspectDesktopAppointments(GMenuModel* menu_model, bool can_open_planner)
     {
+        m_state->settings->show_alarms.set(true);
         const int n_add_event_buttons = can_open_planner ? 1 : 0;
 
         // get the Appointments section
@@ -326,15 +347,24 @@ private:
 
     void InspectPhoneAppointments(GMenuModel* menu_model, bool can_open_planner)
     {
+        m_state->settings->show_alarms.set(true);
         auto submenu = g_menu_model_get_item_link(menu_model, 0, G_MENU_LINK_SUBMENU);
+        
+        // there shouldn't be any menuitems when "show events" is false
+        m_state->settings->show_events.set(false);
+        wait_msec();
+        auto section = g_menu_model_get_item_link(submenu, Menu::Appointments, G_MENU_LINK_SECTION);
+        EXPECT_EQ(0, g_menu_model_get_n_items(section));
+        g_clear_object(&section);
 
         // clear all the appointments
         std::vector<Appointment> appointments;
+        m_state->settings->show_events.set(true);
         m_state->calendar_upcoming->appointments().set(appointments);
         wait_msec(); // wait a moment for the menu to update
 
         // check that there's a "clock app" menuitem even when there are no appointments
-        auto section = g_menu_model_get_item_link(submenu, Menu::Appointments, G_MENU_LINK_SECTION);
+        section = g_menu_model_get_item_link(submenu, Menu::Appointments, G_MENU_LINK_SECTION);
         const char* expected_action = "phone.open-alarm-app";
         EXPECT_EQ(1, g_menu_model_get_n_items(section));
         gchar* action = nullptr;
diff --git a/tests/test-notification-response.cpp b/tests/test-notification-response.cpp
index fd40ed8..d3e9c00 100644
--- a/tests/test-notification-response.cpp
+++ b/tests/test-notification-response.cpp
@@ -47,7 +47,7 @@ namespace
 TEST_F(NotificationFixture,Response)
 {
   // create the world
-  make_interactive();
+  mock_capabilities();
   auto ne = std::make_shared<ayatana::indicator::notifications::Engine>(APP_NAME);
   auto sb = std::make_shared<ayatana::indicator::notifications::DefaultSoundBuilder>();
   auto settings = std::make_shared<Settings>();
diff --git a/tests/test-sound.cpp b/tests/test-sound.cpp
index f808db6..90c18eb 100644
--- a/tests/test-sound.cpp
+++ b/tests/test-sound.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014-2016 Canonical Ltd.
+ * Copyright 2023 Robert Tari
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <datetime/appointment.h>
@@ -44,13 +46,17 @@ namespace
     g_main_loop_quit(static_cast<GMainLoop*>(gloop));
     return G_SOURCE_REMOVE;
   };
+
+  class SoundNotificationFixture : public NotificationFixture
+  {
+  };
 }
 
 /***
 ****
 ***/
 
-TEST_F(NotificationFixture, InteractiveDuration)
+TEST_F(SoundNotificationFixture, InteractiveDuration)
 {
   static constexpr int duration_minutes = 120;
   auto settings = std::make_shared<Settings>();
@@ -65,7 +71,12 @@ TEST_F(NotificationFixture, InteractiveDuration)
   settings->cal_notification_bubbles.set(true);
   settings->cal_notification_list.set(true);
 
-  make_interactive();
+#ifdef LOMIRI_FEATURES_ENABLED
+  /* Here both values true|false should succeed. */
+  mock_capabilities(true);
+#else
+  mock_capabilities(false);
+#endif
 
   // call the Snap Decision
   auto func = [this](const Appointment&, const Alarm&, const Snap::Response&){g_idle_add(quit_idle, loop);};
@@ -89,19 +100,30 @@ TEST_F(NotificationFixture, InteractiveDuration)
   g_variant_get_child (params, 0, "&s", &str);
   ASSERT_STREQ(APP_NAME, str);
 
-  // confirm that the icon passed to Notify was "alarm-clock"
+  // confirm that the icon passed to Notify was "calendar-app"
   g_variant_get_child (params, 2, "&s", &str);
   ASSERT_STREQ("calendar-app", str);
 
-  // confirm that the hints passed to Notify included a timeout matching duration_minutes
+  // confirm that the timeout passed to Notify matches duration_minutes
   int32_t i32;
-  bool b;
-  auto hints = g_variant_get_child_value (params, 6);
-  b = g_variant_lookup (hints, HINT_TIMEOUT, "i", &i32);
-  EXPECT_TRUE(b);
+  g_variant_get_child (params, 7, "i", &i32);
   const auto duration = std::chrono::minutes(duration_minutes);
   EXPECT_EQ(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(), i32);
-  g_variant_unref(hints);
+
+#ifdef LOMIRI_FEATURES_ENABLED
+  /* If setting mock_capabilities to false, set the below to false, as well. */
+  if (true) {
+    // Due to custom logic in Lomiri, also make sure custom timeout hint is set.
+    bool b;
+    auto hints = g_variant_get_child_value (params, 6);
+    i32 = 0;
+    b = g_variant_lookup (hints, HINT_LOMIRI_TIMEOUT, "i", &i32);
+    EXPECT_TRUE(b);
+    EXPECT_EQ(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(), i32);
+    g_variant_unref(hints);
+  }
+#endif
+
   ne.reset();
 }
 
@@ -139,12 +161,17 @@ private:
     uin::DefaultSoundBuilder m_impl;
 };
 
-std::string path_to_uri(const std::string& path)
+std::string path_to_uri_if_exists(const std::string& path)
 {
+  std::string uri;
   auto file = g_file_new_for_path(path.c_str());
-  auto uri_cstr = g_file_get_uri(file);
-  std::string uri = uri_cstr;
-  g_free(uri_cstr);
+
+  if (g_file_query_exists(file, /* cancellable */ nullptr)) {
+    auto uri_cstr = g_file_get_uri(file);
+    uri = std::string(uri_cstr);
+    g_free(uri_cstr);
+  }
+
   g_clear_pointer(&file, g_object_unref);
   return uri;
 }
@@ -167,9 +194,9 @@ TEST_F(NotificationFixture,DefaultSounds)
       std::string expected_role;
       std::string expected_uri;
   } test_cases[] = {
-      { ualarm, "alarm", path_to_uri(ALARM_DEFAULT_SOUND) }
+      { ualarm, "alarm", path_to_uri_if_exists(ALARM_DEFAULT_SOUND) }
     // No sound for appointments
-    //  { appt, "alert", path_to_uri(CALENDAR_DEFAULT_SOUND) }
+    //  { appt, "alert", path_to_uri_if_exists(CALENDAR_DEFAULT_SOUND) }
   };
 
   auto snap = create_snap(ne, sb, settings);
diff --git a/update-po.sh b/update-po.sh
index dff6f3a..b00f000 100755
--- a/update-po.sh
+++ b/update-po.sh
@@ -28,10 +28,13 @@ cat LINGUAS | while read lingua; do
 		intltool-update --gettext-package ${GETTEXT_DOMAIN} $(basename ${lingua})
 	fi
 
-	sed -e 's/\.xml\.in\.h:/.xml.in:/g'	\
+	sed -E					\
+	    -e 's/\.xml\.in\.h:/.xml.in:/g'	\
 	    -e 's/\.ini\.in\.h:/.ini.in:/g'	\
 	    -e 's/\.xml\.h:/.xml:/g'		\
 	    -e 's/\.ini\.h:/.ini:/g'		\
+	    -e 's@^#: \.\./@#: @g'		\
+	    -e 's@(:[0-9]+) \.\./@\1 @g'	\
 	    -i ${lingua}.po
 
 done
diff --git a/update-pot.sh b/update-pot.sh
index 43a8d06..01e9da0 100755
--- a/update-pot.sh
+++ b/update-pot.sh
@@ -16,10 +16,30 @@
 
 GETTEXT_DOMAIN=$(cat CMakeLists.txt | grep 'set.*(.*GETTEXT_PACKAGE' | sed -r -e 's/.*\"([^"]+)\"\)/\1/')
 
+# Rename function calls 'T_([...])' to 'T _([...])'
+# This hack is needed to also process T_() function calls correctly with intltool-update
+# (in time formatter code).
+cd src/ && for file in *.cpp *.c; do sed -e "s/ T_/ T _/g" -i $file; done && cd - 1>/dev/null
+
+# Yet another hack to include .gschema.xml translations
+sed -i po/POTFILES.in -e 's/org.ayatana.indicator.datetime.gschema.xml.in$/org.ayatana.indicator.datetime.gschema.xml/g'
+cp data/org.ayatana.indicator.datetime.gschema.xml.in data/org.ayatana.indicator.datetime.gschema.xml
+
+# Run the intltool-update...
 cd po/ && intltool-update --gettext-package ${GETTEXT_DOMAIN} --pot && cd - 1>/dev/null
 
-sed -e 's/\.xml\.in\.h:/.xml.in:/g'	\
+# And revert...
+sed -i po/POTFILES.in -e 's/org.ayatana.indicator.datetime.gschema.xml$/org.ayatana.indicator.datetime.gschema.xml.in/g'
+rm data/org.ayatana.indicator.datetime.gschema.xml
+
+# And undo the renamings again.
+cd src/ && for file in *.cpp *.c; do sed -e "s/ T _/ T_/g" -i $file; done && cd - 1>/dev/null
+
+sed -E					\
+    -e 's/\.xml\.in\.h:/.xml.in:/g'	\
     -e 's/\.ini\.in\.h:/.ini.in:/g'	\
     -e 's/\.xml\.h:/.xml:/g'		\
     -e 's/\.ini\.h:/.ini:/g'		\
+    -e 's@^#: \.\./@#: @g'		\
+    -e 's@(:[0-9]+) \.\./@\1 @g'	\
     -i po/${GETTEXT_DOMAIN}.pot