Build system: Replace Make by Meson

.gitlab-ci.yml

@@ -69,12 +69,16 @@ extension:
     - reuse
   image: registry.gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension:latest
   script:
-    - make build
+    - meson builddir
+    - DESTDIR=${CI_PROJECT_DIR}/buildroot meson install -C builddir
+    - cd buildroot/usr/local/share/gnome-shell/extensions/nightthemeswitcher@romainvigier.fr
+    - zip -r nightthemeswitcher@romainvigier.fr.zip *
+    - mv nightthemeswitcher@romainvigier.fr.zip $CI_PROJECT_DIR
   artifacts:
     name: $CI_COMMIT_REF_NAME
     expose_as: Extension
     paths:
-      - build/nightthemeswitcher@romainvigier.fr.shell-extension.zip
+      - nightthemeswitcher@romainvigier.fr.zip
     expire_in: 1 day
 
 package:
@@ -89,7 +93,7 @@ package:
     - |
       curl \
         --header "JOB-TOKEN: $CI_JOB_TOKEN" \
-        --upload-file build/nightthemeswitcher@romainvigier.fr.shell-extension.zip \
+        --upload-file nightthemeswitcher@romainvigier.fr.zip \
         "${PACKAGE_REGISTRY_URL}/${CI_COMMIT_TAG}/${PACKAGE_NAME}"
 
 release-notes:

CONTRIBUTING.md

@@ -55,12 +55,21 @@ Run [`reuse`](https://reuse.software/) to check that all the needed information
 reuse lint
 ```
 
+### Creating new files
+
+If you add new source files, you have to add their paths in different files:
+
+- `./src/meson.build` for Javascript files
+- `./src/po/POTFILES` for Javascript and UI files
+
+Add them in the correct place alphabetically.
+
 ### Localized strings
 
-If you modify localized strings, make your changes available for translation:
+If you create or modify localized strings, make your changes available for translation:
 
 ```bash
-make pot
+meson compile -C builddir nightthemeswitcher@romainvigier.fr-pot
 ```
 
 ## Contributing to the translations

Makefile

@@ -1,53 +0,0 @@
-# SPDX-FileCopyrightText: 2019-2021 Romain Vigier <contact AT romainvigier.fr>
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-NAME = $(shell grep '"name"' ./src/metadata.json | sed 's/\s"name":\s"\(.\+\)",\?/\1/')
-UUID = $(shell grep '"uuid"' ./src/metadata.json | sed 's/\s"uuid":\s"\(.\+\)",\?/\1/')
-DOMAIN = $(shell grep '"gettext-domain"' ./src/metadata.json | sed 's/\s"gettext-domain":\s"\(.\+\)",\?/\1/')
-
-
-.PHONY: build
-build:
-	mkdir -p ./build
-	gnome-extensions pack \
-		--force \
-		--extra-source=./utils.js \
-		--extra-source=./enums/ \
-		--extra-source=./icons/ \
-		--extra-source=./modules/ \
-		--extra-source=./preferences/ \
-		--out-dir=./build \
-		./src
-
-.PHONY: clean
-build-clean:
-	-rm -rf ./build
-
-.PHONY: install
-install: uninstall
-	gnome-extensions install --force ./build/$(UUID).shell-extension.zip
-
-.PHONY: uninstall
-uninstall:
-	-gnome-extensions uninstall $(UUID)
-
-.PHONY: test
-test:
-	reuse lint
-	npm run test
-
-.PHONY: pot
-pot:
-	mkdir -p ./src/po
-	xgettext \
-		--from-code=UTF-8 \
-		--package-name="$(NAME)" \
-		--output=./src/po/$(DOMAIN).pot \
-		./src/*.js ./src/**/*.js ./src/schemas/*.xml ./src/preferences/ui/*.ui
-
-.PHONY: update-po
-update-po:
-	for po_file in $(wildcard ./src/po/*.po); do \
-		msgmerge --update $$po_file src/po/$(DOMAIN).pot; \
-	done

README.md

@@ -29,9 +29,9 @@ Visit [the extension page on extensions.gnome.org](https://extensions.gnome.org/
 
 You will need these tools:
 
-- `make`
+- `meson`
 - `gettext`
-- `gnome-extensions` (comes with GNOME Shell >= 3.34)
+- `glib-compile-schemas`
 
 Clone the repository and enter the directory:
 
@@ -39,10 +39,10 @@ Clone the repository and enter the directory:
 git clone https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension.git && cd nightthemeswitcher-gnome-shell-extension
 ```
 
-Build and install using `make`:
+Build and install using `meson`:
 
 ```bash
-make build && make install
+meson builddir && meson install -C builddir
 ```
 
 Restart your GNOME session and enable the extension:

build-aux/Dockerfile

@@ -1,19 +1,7 @@
 # SPDX-FileCopyrightText: 2020, 2021 Romain Vigier <contact AT romainvigier.fr>
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-FROM fedora:35
+FROM debian:stable-slim
 
-# Build gnome-extensions
+RUN apt update \
-RUN dnf install --setopt=install_weak_deps=False --nodocs -y gcc git glib2-devel gnome-autoar-devel json-glib-devel meson \
+	&& apt install --no-install-recommends -y gettext libglib2.0-bin meson zip gzip brotli
-	&& dnf clean all \
-	&& git clone --depth 1 --branch 41.0 https://gitlab.gnome.org/GNOME/gnome-shell.git /src/gnome-shell \
-	&& cd /src/gnome-shell/subprojects/extensions-tool \
-	&& ./generate-translations.sh \
-	&& meson builddir --prefix=/usr --buildtype=release -Dman=false -Dbash_completion=disabled \
-	&& meson install -C builddir \
-	&& rm -r /src/gnome-shell \
-	&& dnf remove -y gcc git glib2-devel gnome-autoar-devel json-glib-devel meson
-
-# Install runtime dependencies
-RUN dnf install --setopt=install_weak_deps=False --nodocs -y findutils gettext gnome-autoar json-glib make gzip brotli \
-	&& dnf clean all

meson.build

@@ -0,0 +1,44 @@
+# SPDX-FileCopyrightText: 2022 Romain Vigier <contact AT romainvigier.fr>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+project(
+  'nightthemeswitcher',
+  version: '60',
+  license: ['GPL-3.0-or-later', 'CC-BY-SA-4.0'],
+  meson_version: '>= 0.56.0'
+)
+
+UUID = 'nightthemeswitcher@romainvigier.fr'
+DNS = 'org.gnome.shell.extensions.nightthemeswitcher'
+
+INSTALL_DIR = get_option('datadir') / 'gnome-shell' / 'extensions' / UUID
+
+gnome = import('gnome')
+i18n = import('i18n')
+
+subdir('src')
+
+
+reuse_exe = find_program('reuse', required: false)
+if reuse_exe.found()
+	test(
+		'Comply with REUSE spec',
+		reuse_exe,
+		args: [
+			'--root',
+			meson.project_source_root(),
+			'lint'
+		],
+		suite: 'licenses',
+	)
+endif
+
+eslint_exe = find_program('eslint', required: false)
+if eslint_exe.found()
+	test(
+		'Check JavaScript format',
+		eslint_exe,
+		args: [ meson.project_source_root() / 'src' ],
+		suite: 'code',
+	)
+endif

src/data/meson.build

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2022 Romain Vigier <contact AT romainvigier.fr>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+glib_compile_schemas_exe = find_program('glib-compile-schemas')
+custom_target(
+	'gschemas',
+	build_by_default: true,
+	output: 'gschemas.compiled',
+	command: [
+		glib_compile_schemas_exe,
+		'--targetdir=@OUTDIR@',
+		'@CURRENT_SOURCE_DIR@'
+	],
+	install: true,
+	install_dir: INSTALL_DIR / 'schemas'
+)
+
+install_subdir('icons', install_dir: INSTALL_DIR)
+install_subdir('ui', install_dir: INSTALL_DIR / 'preferences')

src/meson.build

@@ -0,0 +1,52 @@
+# SPDX-FileCopyrightText: 2022 Romain Vigier <contact AT romainvigier.fr>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+configure_file(
+	input: 'metadata.json.in',
+	output: 'metadata.json',
+	configuration: {
+		'DNS': DNS,
+		'UUID': UUID,
+		'VERSION': meson.project_version()
+	},
+	install_dir: INSTALL_DIR
+)
+
+main = [
+	'extension.js',
+	'prefs.js',
+	'utils.js',
+]
+enums = [
+	'enums/Time.js',
+]
+modules = [
+	'modules/Switcher.js',
+	'modules/SwitcherCommands.js',
+	'modules/SwitcherTheme.js',
+	'modules/Timer.js',
+	'modules/TimerLocation.js',
+	'modules/TimerNightlight.js',
+	'modules/TimerOndemand.js',
+	'modules/TimerSchedule.js',
+]
+preferences = [
+	'preferences/BackgroundButton.js',
+	'preferences/BackgroundsPage.js',
+	'preferences/ClearableEntry.js',
+	'preferences/CommandsPage.js',
+	'preferences/ContributePage.js',
+	'preferences/DropDownChoice.js',
+	'preferences/SchedulePage.js',
+	'preferences/ShortcutButton.js',
+	'preferences/ThemesPage.js',
+	'preferences/TimeChooser.js',
+]
+
+install_data(main, install_dir: INSTALL_DIR)
+install_data(enums, install_dir: INSTALL_DIR / 'enums')
+install_data(modules, install_dir: INSTALL_DIR / 'modules')
+install_data(preferences, install_dir: INSTALL_DIR / 'preferences')
+
+subdir('data')
+subdir('po')

src/metadata.json.in

@@ -1,11 +1,11 @@
 {
 	"name": "Night Theme Switcher",
 	"description": "Make your desktop easy on the eye, day and night.",
-	"uuid": "nightthemeswitcher@romainvigier.fr",
+	"uuid": "@UUID@",
-	"gettext-domain": "nightthemeswitcher@romainvigier.fr",
+	"gettext-domain": "@UUID@",
-	"settings-schema": "org.gnome.shell.extensions.nightthemeswitcher",
+	"settings-schema": "@DNS@",
 	"url": "https://nightthemeswitcher.romainvigier.fr",
 	"session-modes": ["unlock-dialog", "user"],
 	"shell-version": ["42"],
-	"version": 60
+	"version": @VERSION@
 }

src/metadata.json.in.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021, 2022 Romain Vigier <contact AT romainvigier.fr>
+SPDX-License-Identifier: GPL-3.0-or-later

src/metadata.json.license

@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2021 Romain Vigier <contact AT romainvigier.fr>
-SPDX-License-Identifier: GPL-3.0-or-later

src/po/LINGUAS

@@ -0,0 +1,16 @@
+ar
+de_DE
+es
+eu
+fr
+gl
+hu
+nb_NO
+nl
+oc
+pl
+pt_BR
+ro
+ru
+tr
+zh_Hans

src/po/LINGUAS.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2022 Romain Vigier <contact AT romainvigier.fr>
+SPDX-License-Identifier: GPL-3.0-or-later

src/po/POTFILES

@@ -0,0 +1,40 @@
+# SPDX-FileCopyrightText: 2022 Romain Vigier <contact AT romainvigier.fr>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src/extension.js
+src/prefs.js
+src/utils.js
+
+src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml
+
+src/data/ui/BackgroundButton.ui
+src/data/ui/BackgroundsPage.ui
+src/data/ui/ClearableEntry.ui
+src/data/ui/CommandsPage.ui
+src/data/ui/ContributePage.ui
+src/data/ui/SchedulePage.ui
+src/data/ui/ShortcutButton.ui
+src/data/ui/ThemesPage.ui
+src/data/ui/TimeChooser.ui
+
+src/enums/Time.js
+
+src/modules/Switcher.js
+src/modules/SwitcherCommands.js
+src/modules/SwitcherTheme.js
+src/modules/Timer.js
+src/modules/TimerLocation.js
+src/modules/TimerNightlight.js
+src/modules/TimerOndemand.js
+src/modules/TimerSchedule.js
+
+src/preferences/BackgroundButton.js
+src/preferences/BackgroundsPage.js
+src/preferences/ClearableEntry.js
+src/preferences/CommandsPage.js
+src/preferences/ContributePage.js
+src/preferences/DropDownChoice.js
+src/preferences/SchedulePage.js
+src/preferences/ShortcutButton.js
+src/preferences/ThemesPage.js
+src/preferences/TimeChooser.js

src/po/meson.build

@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2022 Romain Vigier <contact AT romainvigier.fr>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+i18n.gettext(
+	UUID,
+	args: [
+		'--sort-by-file',
+		'--from-code=UTF-8'
+	],
+	install_dir: INSTALL_DIR / 'locale'
+)

src/po/nightthemeswitcher@romainvigier.fr.pot

@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Night Theme Switcher package.
+# This file is distributed under the same license as the nightthemeswitcher@romainvigier.fr package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Night Theme Switcher\n"
+"Project-Id-Version: nightthemeswitcher@romainvigier.fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-23 23:40+0100\n"
+"POT-Creation-Date: 2022-04-04 13:15+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,14 +17,421 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/modules/TimerOndemand.js:213
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:10
-msgid "Turn Night Mode On"
+msgid "Settings version"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:11
+msgid "The current extension settings version"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:17
+msgid "Switch GTK variants"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:18
+msgid "Enable GTK variants switching"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:22
+msgid "Day GTK theme"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:23
+msgid "The GTK theme to use during daytime"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:27
+msgid "Night GTK theme"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:28
+msgid "The GTK theme to use during nighttime"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:34
+msgid "Switch shell variants"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:35
+msgid "Enable shell variants switching"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:39
+msgid "Day shell theme"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:40
+msgid "The shell theme to use during daytime"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:44
+msgid "Night shell theme"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:45
+msgid "The shell theme to use during nighttime"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:51
+msgid "Switch icon variants"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:52
+msgid "Enable icon variants switching"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:56
+msgid "Day icon theme"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:57
+msgid "The icon theme to use during daytime"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:61
+msgid "Night icon theme"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:62
+msgid "The icon theme to use during nighttime"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:68
+msgid "Switch cursor variants"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:69
+msgid "Enable cursor variants switching"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:73
+msgid "Day cursor theme"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:74
+msgid "The cursor theme to use during daytime"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:78
+msgid "Night cursor theme"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:79
+msgid "The cursor theme to use during nighttime"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:85
+msgid "Enable commands"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:86
+msgid "Commands will be spawned on time change"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:90
+msgid "Sunrise command"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:91
+msgid "The command to spawn at sunrise"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:95
+msgid "Sunset command"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:96
+msgid "The command to spawn at sunset"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:102
+#: src/data/ui/BackgroundsPage.ui:15
+msgid "Day background"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:103
+msgid "Path to the day background"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:107
+#: src/data/ui/BackgroundsPage.ui:28
+msgid "Night background"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:108
+msgid "Path to the night background"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:120
+#: src/data/ui/SchedulePage.ui:27
+msgid "Time source"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:121
+msgid "The source used to check current time"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:125
+msgid "Follow Night Light \"Disable until tomorrow\""
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:126
+msgid "Switch back to day time when Night Light is temporarily disabled"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:130
+msgid "Always enable the on-demand timer"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:131
+msgid "The on-demand timer will always be enabled alongside other timers"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:139
+msgid "On-demand time"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:140
+msgid "The current time used in on-demand mode"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:144
+msgid "Key combination to toggle time"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:145
+msgid "The key combination that will toggle time in on-demand mode"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:154
+msgid "On-demand button placement"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:155
+msgid "Where the on-demand button will be placed"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:159
+msgid "Use manual time source"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:160
+msgid "Disable automatic time source detection"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:164
+msgid "Sunrise time"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:165
+msgid "When the day starts"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:169
+msgid "Sunset time"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:170
+msgid "When the day ends"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:174
+#: src/data/ui/SchedulePage.ui:50
+msgid "Transition"
+msgstr ""
+
+#: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:175
+msgid "Use a transition when changing the color scheme"
+msgstr ""
+
+#: src/data/ui/BackgroundButton.ui:8
+msgid "Change background"
+msgstr ""
+
+#: src/data/ui/BackgroundButton.ui:31
+msgid "Select your background image"
+msgstr ""
+
+#: src/data/ui/BackgroundsPage.ui:9
+msgid "Backgrounds"
+msgstr ""
+
+#: src/data/ui/ClearableEntry.ui:10 src/data/ui/ShortcutButton.ui:43
+#: src/data/ui/ShortcutButton.ui:45
+msgid "Clear"
+msgstr ""
+
+#: src/data/ui/CommandsPage.ui:9
+msgid "Commands"
+msgstr ""
+
+#: src/data/ui/CommandsPage.ui:13
+msgid "Run commands"
+msgstr ""
+
+#: src/data/ui/CommandsPage.ui:21 src/data/ui/SchedulePage.ui:82
+msgid "Sunrise"
+msgstr ""
+
+#. Don't translate the `notify-send` command.
+#: src/data/ui/CommandsPage.ui:25
+msgid "notify-send \"Hello sunshine!\""
+msgstr ""
+
+#: src/data/ui/CommandsPage.ui:35 src/data/ui/SchedulePage.ui:94
+msgid "Sunset"
+msgstr ""
+
+#. Don't translate the `notify-send` command.
+#: src/data/ui/CommandsPage.ui:39
+msgid "notify-send \"Hello moonshine!\""
+msgstr ""
+
+#: src/data/ui/ContributePage.ui:9
+msgid "Contribute"
+msgstr ""
+
+#: src/data/ui/ContributePage.ui:42
+msgid "View the code and report issues"
+msgstr ""
+
+#: src/data/ui/ContributePage.ui:55
+msgid "Contribute to the translation"
+msgstr ""
+
+#: src/data/ui/ContributePage.ui:68
+msgid "Support me with a donation"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:9
+msgid "Schedule"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:15
+msgid "Manual time source"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:16
+msgid ""
+"The extension will try to use Night Light or Location Services to "
+"automatically set your current sunrise and sunset times if they are enabled. "
+"If you prefer, you can manually choose a time source."
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:33
+msgid "Always show on-demand controls"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:34
+msgid "Allows you to override the current time when using a schedule."
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:47
+msgid "Advanced"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:51
+msgid "Smooth transition between day and night appearance."
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:62 src/preferences/SchedulePage.js:43
+msgid "Night Light"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:65
+msgid "Follow <i>Disable until tomorrow</i>"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:66
+msgid ""
+"When Night Light is temporarily disabled, the extension will switch to day "
+"variants."
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:79 src/preferences/SchedulePage.js:56
+msgid "Manual schedule"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:108 src/preferences/SchedulePage.js:57
+msgid "On-demand"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:111
+msgid "Keyboard shortcut"
+msgstr ""
+
+#: src/data/ui/SchedulePage.ui:122
+msgid "Button location"
+msgstr ""
+
+#: src/data/ui/ShortcutButton.ui:15
+msgid "Choose…"
+msgstr ""
+
+#: src/data/ui/ShortcutButton.ui:32
+msgid "Change keyboard shortcut"
+msgstr ""
+
+#: src/data/ui/ShortcutButton.ui:80
+msgid "Press your keyboard shortcut…"
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:9
+msgid "Themes"
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:15
+msgid ""
+"GNOME has a built-in dark mode that the extension uses. Manually switching "
+"themes is discouraged and is only here for legacy reasons."
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:28
+msgid "GTK theme"
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:29
+msgid ""
+"Forcing a dark theme on applications not designed to support it can have "
+"undesirable side-effects such as unreadable text or invisible icons."
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:37 src/data/ui/ThemesPage.ui:57
+#: src/data/ui/ThemesPage.ui:77 src/data/ui/ThemesPage.ui:97
+msgid "Day variant"
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:42 src/data/ui/ThemesPage.ui:62
+#: src/data/ui/ThemesPage.ui:82 src/data/ui/ThemesPage.ui:102
+msgid "Night variant"
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:49
+msgid "Shell theme"
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:69
+msgid "Icon theme"
+msgstr ""
+
+#: src/data/ui/ThemesPage.ui:89
+msgid "Cursor theme"
+msgstr ""
+
+#. Time separator (eg. 08:27)
+#: src/data/ui/TimeChooser.ui:23
+msgid ":"
 msgstr ""
 
 #: src/modules/TimerOndemand.js:213
 msgid "Turn Night Mode Off"
 msgstr ""
 
+#: src/modules/TimerOndemand.js:213
+msgid "Turn Night Mode On"
+msgstr ""
+
 #: src/modules/TimerOndemand.js:228
 msgid "Extension Settings"
 msgstr ""
@@ -38,33 +445,21 @@ msgid "Night Mode On"
 msgstr ""
 
 #: src/modules/TimerOndemand.js:238
-msgid "Turn On"
+msgid "Turn Off"
 msgstr ""
 
 #: src/modules/TimerOndemand.js:238
-msgid "Turn Off"
+msgid "Turn On"
 msgstr ""
 
 #: src/preferences/BackgroundButton.js:71
 msgid "Only JPEG, PNG, TIFF and XML files can be set as background image."
 msgstr ""
 
-#: src/preferences/SchedulePage.js:43 src/preferences/ui/SchedulePage.ui:62
-msgid "Night Light"
-msgstr ""
-
 #: src/preferences/SchedulePage.js:48
 msgid "Location Services"
 msgstr ""
 
-#: src/preferences/SchedulePage.js:56 src/preferences/ui/SchedulePage.ui:79
-msgid "Manual schedule"
-msgstr ""
-
-#: src/preferences/SchedulePage.js:57 src/preferences/ui/SchedulePage.ui:108
-msgid "On-demand"
-msgstr ""
-
 #: src/preferences/SchedulePage.js:90
 msgid "None"
 msgstr ""
@@ -80,399 +475,3 @@ msgstr ""
 #: src/preferences/ThemesPage.js:50
 msgid "Default"
 msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:10
-msgid "Settings version"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:11
-msgid "The current extension settings version"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:17
-msgid "Switch GTK variants"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:18
-msgid "Enable GTK variants switching"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:22
-msgid "Day GTK theme"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:23
-msgid "The GTK theme to use during daytime"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:27
-msgid "Night GTK theme"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:28
-msgid "The GTK theme to use during nighttime"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:34
-msgid "Switch shell variants"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:35
-msgid "Enable shell variants switching"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:39
-msgid "Day shell theme"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:40
-msgid "The shell theme to use during daytime"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:44
-msgid "Night shell theme"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:45
-msgid "The shell theme to use during nighttime"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:51
-msgid "Switch icon variants"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:52
-msgid "Enable icon variants switching"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:56
-msgid "Day icon theme"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:57
-msgid "The icon theme to use during daytime"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:61
-msgid "Night icon theme"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:62
-msgid "The icon theme to use during nighttime"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:68
-msgid "Switch cursor variants"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:69
-msgid "Enable cursor variants switching"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:73
-msgid "Day cursor theme"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:74
-msgid "The cursor theme to use during daytime"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:78
-msgid "Night cursor theme"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:79
-msgid "The cursor theme to use during nighttime"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:85
-msgid "Enable commands"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:86
-msgid "Commands will be spawned on time change"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:90
-msgid "Sunrise command"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:91
-msgid "The command to spawn at sunrise"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:95
-msgid "Sunset command"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:96
-msgid "The command to spawn at sunset"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:102
-#: src/preferences/ui/BackgroundsPage.ui:15
-msgid "Day background"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:103
-msgid "Path to the day background"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:107
-#: src/preferences/ui/BackgroundsPage.ui:28
-msgid "Night background"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:108
-msgid "Path to the night background"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:120
-#: src/preferences/ui/SchedulePage.ui:27
-msgid "Time source"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:121
-msgid "The source used to check current time"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:125
-msgid "Follow Night Light \"Disable until tomorrow\""
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:126
-msgid "Switch back to day time when Night Light is temporarily disabled"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:130
-msgid "Always enable the on-demand timer"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:131
-msgid "The on-demand timer will always be enabled alongside other timers"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:139
-msgid "On-demand time"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:140
-msgid "The current time used in on-demand mode"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:144
-msgid "Key combination to toggle time"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:145
-msgid "The key combination that will toggle time in on-demand mode"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:154
-msgid "On-demand button placement"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:155
-msgid "Where the on-demand button will be placed"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:159
-msgid "Use manual time source"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:160
-msgid "Disable automatic time source detection"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:164
-msgid "Sunrise time"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:165
-msgid "When the day starts"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:169
-msgid "Sunset time"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:170
-msgid "When the day ends"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:174
-#: src/preferences/ui/SchedulePage.ui:50
-msgid "Transition"
-msgstr ""
-
-#: src/schemas/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:175
-msgid "Use a transition when changing the color scheme"
-msgstr ""
-
-#: src/preferences/ui/BackgroundButton.ui:8
-msgid "Change background"
-msgstr ""
-
-#: src/preferences/ui/BackgroundButton.ui:31
-msgid "Select your background image"
-msgstr ""
-
-#: src/preferences/ui/BackgroundsPage.ui:9
-msgid "Backgrounds"
-msgstr ""
-
-#: src/preferences/ui/ClearableEntry.ui:10
-#: src/preferences/ui/ShortcutButton.ui:43
-#: src/preferences/ui/ShortcutButton.ui:45
-msgid "Clear"
-msgstr ""
-
-#: src/preferences/ui/CommandsPage.ui:9
-msgid "Commands"
-msgstr ""
-
-#: src/preferences/ui/CommandsPage.ui:13
-msgid "Run commands"
-msgstr ""
-
-#: src/preferences/ui/CommandsPage.ui:21 src/preferences/ui/SchedulePage.ui:82
-msgid "Sunrise"
-msgstr ""
-
-#. Don't translate the `notify-send` command.
-#: src/preferences/ui/CommandsPage.ui:25
-msgid "notify-send \"Hello sunshine!\""
-msgstr ""
-
-#: src/preferences/ui/CommandsPage.ui:35 src/preferences/ui/SchedulePage.ui:94
-msgid "Sunset"
-msgstr ""
-
-#. Don't translate the `notify-send` command.
-#: src/preferences/ui/CommandsPage.ui:39
-msgid "notify-send \"Hello moonshine!\""
-msgstr ""
-
-#: src/preferences/ui/ContributePage.ui:9
-msgid "Contribute"
-msgstr ""
-
-#: src/preferences/ui/ContributePage.ui:42
-msgid "View the code and report issues"
-msgstr ""
-
-#: src/preferences/ui/ContributePage.ui:55
-msgid "Contribute to the translation"
-msgstr ""
-
-#: src/preferences/ui/ContributePage.ui:68
-msgid "Support me with a donation"
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:9
-msgid "Schedule"
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:15
-msgid "Manual time source"
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:16
-msgid ""
-"The extension will try to use Night Light or Location Services to "
-"automatically set your current sunrise and sunset times if they are enabled. "
-"If you prefer, you can manually choose a time source."
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:33
-msgid "Always show on-demand controls"
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:34
-msgid "Allows you to override the current time when using a schedule."
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:47
-msgid "Advanced"
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:51
-msgid "Smooth transition between day and night appearance."
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:65
-msgid "Follow <i>Disable until tomorrow</i>"
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:66
-msgid ""
-"When Night Light is temporarily disabled, the extension will switch to day "
-"variants."
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:111
-msgid "Keyboard shortcut"
-msgstr ""
-
-#: src/preferences/ui/SchedulePage.ui:122
-msgid "Button location"
-msgstr ""
-
-#: src/preferences/ui/ShortcutButton.ui:15
-msgid "Choose…"
-msgstr ""
-
-#: src/preferences/ui/ShortcutButton.ui:32
-msgid "Change keyboard shortcut"
-msgstr ""
-
-#: src/preferences/ui/ShortcutButton.ui:80
-msgid "Press your keyboard shortcut…"
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:9
-msgid "Themes"
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:15
-msgid ""
-"GNOME has a built-in dark mode that the extension uses. Manually switching "
-"themes is discouraged and is only here for legacy reasons."
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:28
-msgid "GTK theme"
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:29
-msgid ""
-"Forcing a dark theme on applications not designed to support it can have "
-"undesirable side-effects such as unreadable text or invisible icons."
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:37 src/preferences/ui/ThemesPage.ui:57
-#: src/preferences/ui/ThemesPage.ui:77 src/preferences/ui/ThemesPage.ui:97
-msgid "Day variant"
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:42 src/preferences/ui/ThemesPage.ui:62
-#: src/preferences/ui/ThemesPage.ui:82 src/preferences/ui/ThemesPage.ui:102
-msgid "Night variant"
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:49
-msgid "Shell theme"
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:69
-msgid "Icon theme"
-msgstr ""
-
-#: src/preferences/ui/ThemesPage.ui:89
-msgid "Cursor theme"
-msgstr ""
-
-#. Time separator (eg. 08:27)
-#: src/preferences/ui/TimeChooser.ui:23
-msgid ":"
-msgstr ""