[gnome-break-timer/dylanmccall/meson-build: 3/3] Rename Helper to Daemon
- From: Dylan McCall <dylanmccall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-break-timer/dylanmccall/meson-build: 3/3] Rename Helper to Daemon
- Date: Fri, 13 Nov 2020 23:37:19 +0000 (UTC)
commit 0aa577c8b8eddf96ef7aff6a6ee4e12200136393
Author: Dylan McCall <dylan dylanmccall ca>
Date: Fri Nov 13 15:32:58 2020 -0800
Rename Helper to Daemon
This naming is more conventional, and easier to follow.
data/applications/meson.build | 16 ++++----
...g.gnome.BreakTimer.Daemon-autostart.desktop.in} | 0
...p.in => org.gnome.BreakTimer.Daemon.desktop.in} | 0
data/dbus/meson.build | 4 +-
...e.in => org.gnome.BreakTimer.Daemon.service.in} | 2 +-
meson.build | 18 ++++-----
org.gnome.BreakTimer.appdata.xml | 1 -
org.gnome.BreakTimer.json | 4 +-
po/POTFILES.in | 10 ++---
po/POTFILES.skip | 10 ++---
po/bs.po | 40 +++++++++----------
po/cs.po | 40 +++++++++----------
po/da.po | 40 +++++++++----------
po/de.po | 40 +++++++++----------
po/el.po | 40 +++++++++----------
po/es.po | 40 +++++++++----------
po/fr.po | 40 +++++++++----------
po/gl.po | 40 +++++++++----------
po/hu.po | 40 +++++++++----------
po/id.po | 40 +++++++++----------
po/lt.po | 40 +++++++++----------
po/oc.po | 40 +++++++++----------
po/pl.po | 40 +++++++++----------
po/pt.po | 40 +++++++++----------
po/pt_BR.po | 40 +++++++++----------
po/sl.po | 40 +++++++++----------
po/sr.po | 40 +++++++++----------
po/sr latin po | 40 +++++++++----------
po/sv.po | 40 +++++++++----------
po/tr.po | 40 +++++++++----------
po/zh_CN.po | 40 +++++++++----------
.../{IBreakHelper.vala => IBreakDaemon.vala} | 8 ++--
src/common/meson.build | 2 +-
src/config.vapi | 14 +++----
src/{helper => daemon}/BreakManager.vala | 16 ++++----
.../DaemonApplication.vala} | 10 ++---
src/{helper => daemon}/SessionStatus.vala | 2 +-
src/{helper => daemon}/UIFragment.vala | 2 +-
src/{helper => daemon}/UIManager.vala | 6 +--
.../activity-monitor/ActivityMonitor.vala | 2 +-
.../MutterActivityMonitorBackend.vala | 2 +-
.../activity-monitor/UserActivity.vala | 2 +-
src/{helper => daemon}/break/BreakController.vala | 2 +-
src/{helper => daemon}/break/BreakType.vala | 2 +-
src/{helper => daemon}/break/BreakView.vala | 2 +-
.../break/TimerBreakController.vala | 2 +-
src/{helper => daemon}/break/TimerBreakType.vala | 12 +++---
src/{helper => daemon}/break/TimerBreakView.vala | 2 +-
src/{helper => daemon}/main.vala | 6 +--
src/{helper => daemon}/meson.build | 6 +--
.../microbreak/MicroBreakController.vala | 2 +-
.../microbreak/MicroBreakType.vala | 2 +-
.../microbreak/MicroBreakView.vala | 2 +-
.../restbreak/RestBreakController.vala | 2 +-
.../restbreak/RestBreakType.vala | 2 +-
.../restbreak/RestBreakView.vala | 2 +-
src/{helper => daemon}/util/Countdown.vala | 2 +-
src/{helper => daemon}/util/PausableTimeout.vala | 2 +-
.../util/SimpleFocusManager.vala | 2 +-
src/{helper => daemon}/util/StatefulTimer.vala | 2 +-
src/{helper => daemon}/util/Util.vala | 2 +-
src/meson.build | 4 +-
src/settings/BreakManager.vala | 46 +++++++++++-----------
src/settings/SettingsApplication.vala | 2 +-
src/settings/TimerBreakType.vala | 24 ++++++-----
.../daemon_util_runner.vala} | 0
.../test_Countdown.vala | 0
.../test_StatefulTimer.vala | 0
68 files changed, 553 insertions(+), 550 deletions(-)
---
diff --git a/data/applications/meson.build b/data/applications/meson.build
index 87c44ad..d0ce506 100644
--- a/data/applications/meson.build
+++ b/data/applications/meson.build
@@ -19,9 +19,9 @@ if desktop_file_validate.found()
)
endif
-helper_desktop_file = i18n.merge_file(
- input: 'org.gnome.BreakTimer.Helper.desktop.in',
- output: 'org.gnome.BreakTimer.Helper.desktop',
+daemon_desktop_file = i18n.merge_file(
+ input: 'org.gnome.BreakTimer.Daemon.desktop.in',
+ output: 'org.gnome.BreakTimer.Daemon.desktop',
type: 'desktop',
po_dir: po_dir,
install: true,
@@ -32,14 +32,14 @@ if desktop_file_validate.found()
test(
'Validate desktop file',
desktop_file_validate,
- args: [helper_desktop_file]
+ args: [daemon_desktop_file]
)
endif
-helper_autostart_desktop_file = i18n.merge_file(
- input: 'org.gnome.BreakTimer.Helper-autostart.desktop.in',
- output: 'org.gnome.BreakTimer.Helper-autostart.desktop',
+daemon_autostart_desktop_file = i18n.merge_file(
+ input: 'org.gnome.BreakTimer.Daemon-autostart.desktop.in',
+ output: 'org.gnome.BreakTimer.Daemon-autostart.desktop',
type: 'desktop',
po_dir: po_dir,
install: true,
@@ -50,6 +50,6 @@ if desktop_file_validate.found()
test(
'Validate desktop file',
desktop_file_validate,
- args: [helper_autostart_desktop_file]
+ args: [daemon_autostart_desktop_file]
)
endif
diff --git a/data/applications/org.gnome.BreakTimer.Helper-autostart.desktop.in
b/data/applications/org.gnome.BreakTimer.Daemon-autostart.desktop.in
similarity index 100%
rename from data/applications/org.gnome.BreakTimer.Helper-autostart.desktop.in
rename to data/applications/org.gnome.BreakTimer.Daemon-autostart.desktop.in
diff --git a/data/applications/org.gnome.BreakTimer.Helper.desktop.in
b/data/applications/org.gnome.BreakTimer.Daemon.desktop.in
similarity index 100%
rename from data/applications/org.gnome.BreakTimer.Helper.desktop.in
rename to data/applications/org.gnome.BreakTimer.Daemon.desktop.in
diff --git a/data/dbus/meson.build b/data/dbus/meson.build
index 4c7e24b..687e2db 100644
--- a/data/dbus/meson.build
+++ b/data/dbus/meson.build
@@ -8,8 +8,8 @@ configure_file(
)
configure_file(
- input: 'org.gnome.BreakTimer.Helper.service.in',
- output: 'org.gnome.BreakTimer.Helper.service',
+ input: 'org.gnome.BreakTimer.Daemon.service.in',
+ output: 'org.gnome.BreakTimer.Daemon.service',
configuration: build_conf,
install_dir: dbus_session_bus_services_dir
)
diff --git a/data/dbus/org.gnome.BreakTimer.Helper.service.in
b/data/dbus/org.gnome.BreakTimer.Daemon.service.in
similarity index 58%
rename from data/dbus/org.gnome.BreakTimer.Helper.service.in
rename to data/dbus/org.gnome.BreakTimer.Daemon.service.in
index 1f6796f..d7421c0 100644
--- a/data/dbus/org.gnome.BreakTimer.Helper.service.in
+++ b/data/dbus/org.gnome.BreakTimer.Daemon.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.BreakTimer.Helper
+Name=org.gnome.BreakTimer.Daemon
Exec=gnome-break-timer-service
diff --git a/meson.build b/meson.build
index a34b68a..7d1f012 100644
--- a/meson.build
+++ b/meson.build
@@ -37,10 +37,10 @@ locale_dir = join_paths(prefix, get_option('localedir'))
application_icon = 'org.gnome.BreakTimer'
application_url = 'https://wiki.gnome.org/Apps/BreakTimer'
settings_application_id = 'org.gnome.BreakTimer.Settings'
-helper_application_id = 'org.gnome.BreakTimer.Helper'
-helper_bus_name = 'org.gnome.BreakTimer.Helper'
-helper_object_path = '/org/gnome/BreakTimer'
-helper_break_object_base_path = '/org/gnome/BreakTimer/'
+daemon_application_id = 'org.gnome.BreakTimer.Daemon'
+daemon_bus_name = 'org.gnome.BreakTimer.Daemon'
+daemon_object_path = '/org/gnome/BreakTimer'
+daemon_break_object_base_path = '/org/gnome/BreakTimer/'
build_conf = configuration_data()
build_conf.set_quoted('GETTEXT_PACKAGE', gettext_package)
@@ -51,11 +51,11 @@ build_conf.set_quoted('APPLICATION_ICON', application_icon)
build_conf.set_quoted('APPLICATION_URL', application_url)
build_conf.set_quoted('SETTINGS_APPLICATION_ID', settings_application_id)
build_conf.set_quoted('SETTINGS_DESKTOP_FILE_ID', settings_application_id + '.desktop')
-build_conf.set_quoted('HELPER_APPLICATION_ID', helper_application_id)
-build_conf.set_quoted('HELPER_DESKTOP_FILE_ID', helper_application_id + '.desktop')
-build_conf.set_quoted('HELPER_BUS_NAME', helper_bus_name)
-build_conf.set_quoted('HELPER_OBJECT_PATH', helper_object_path)
-build_conf.set_quoted('HELPER_BREAK_OBJECT_BASE_PATH', helper_break_object_base_path)
+build_conf.set_quoted('DAEMON_APPLICATION_ID', daemon_application_id)
+build_conf.set_quoted('DAEMON_DESKTOP_FILE_ID', daemon_application_id + '.desktop')
+build_conf.set_quoted('DAEMON_BUS_NAME', daemon_bus_name)
+build_conf.set_quoted('DAEMON_OBJECT_PATH', daemon_object_path)
+build_conf.set_quoted('DAEMON_BREAK_OBJECT_BASE_PATH', daemon_break_object_base_path)
add_project_arguments(['-DGETTEXT_PACKAGE="' + gettext_package + '"'], language: 'c')
add_project_arguments(['--vapidir', src_dir], language: 'vala')
diff --git a/org.gnome.BreakTimer.json b/org.gnome.BreakTimer.json
index 69872ab..91e9da6 100644
--- a/org.gnome.BreakTimer.json
+++ b/org.gnome.BreakTimer.json
@@ -37,8 +37,8 @@
"builddir" : true,
"sources" : [
{
- "type" : "dir",
- "path": "."
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/dylanmccall/gnome-break-timer.git";
}
]
}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index df03334..adafa64 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,11 +5,11 @@ data/gnome-break-timer-service.desktop.in
data/org.gnome.BreakTimer.gschema.xml.in
[type: gettext/glade]data/settings-panels.ui
common/NaturalTime.vala
-helper/break/BreakView.vala
-helper/break/TimerBreakStatusWidget.vala
-helper/HelperApplication.vala
-helper/microbreak/MicroBreakView.vala
-helper/restbreak/RestBreakView.vala
+daemon/break/BreakView.vala
+daemon/break/TimerBreakStatusWidget.vala
+daemon/DaemonApplication.vala
+daemon/microbreak/MicroBreakView.vala
+daemon/restbreak/RestBreakView.vala
settings/BreakSettingsDialog.vala
settings/MainWindow.vala
settings/MicroBreakType.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8068063..6e70eb4 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,9 +1,9 @@
common/NaturalTime.c
-helper/break/BreakView.c
-helper/break/TimerBreakStatusWidget.c
-helper/microbreak/MicroBreakView.c
-helper/restbreak/RestBreakView.c
-helper/HelperApplication.c
+daemon/break/BreakView.c
+daemon/break/TimerBreakStatusWidget.c
+daemon/microbreak/MicroBreakView.c
+daemon/restbreak/RestBreakView.c
+daemon/DaemonApplication.c
settings/BreakSettingsDialog.c
settings/MainWindow.c
settings/MicroBreakType.c
diff --git a/po/bs.po b/po/bs.po
index a7952ca..9623a4b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -197,34 +197,34 @@ msgstr[1] "%d sata"
msgstr[2] "%d sati"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Å ta bih trebao uraditi?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Hvala"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME MjeraÄ pauze"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "PreskoÄi ovaj"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Vrijeme je za malu pauzu"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Uzmi pauzu od kucnja i skreni pogled sa ekrana"
#. %s will bje replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or
"1 hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
@@ -232,40 +232,40 @@ msgstr[0] "Trebali ste uzeti malu pauzu prije %s"
msgstr[1] "Trebali ste uzeti malu pauzu prije %s"
msgstr[2] "Trebali ste uzeti malu pauzu prije %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Zakašnjela mala pauza"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Pauza je gotova"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Vaša mala pauza je gotova"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Uzmite trenutak kako bi odmorili svoje oÄi"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Podsjeti me kasnije"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Vrijeme je za pauzu"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "Vrijeme je da uzmete pauzu. Otiđite malo od kompjutera!"
#. %s will bje replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or
"1 hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
@@ -273,12 +273,12 @@ msgstr[0] "Još %s je ostalo od vaše pauze"
msgstr[1] "Još %s je ostalo od vaše pauze"
msgstr[2] "Još %s je ostalo od vaše pauze"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pauza prekinuta"
#. %s will bje replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or
"1 hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
@@ -286,11 +286,11 @@ msgstr[0] "Trebali ste uzeti pauzu prije %s"
msgstr[1] "Trebali ste uzeti pauzu prije %s"
msgstr[2] "Trebali ste uzeti pauzu prije %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Zakašnjela pauza"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Vrijeme za vašu pauzu je završilo"
diff --git a/po/cs.po b/po/cs.po
index b62852f..b99a330 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -197,34 +197,34 @@ msgstr[1] "%d hodiny"
msgstr[2] "%d hodin"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Co bych měl dělat?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "DÃky"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "HlÃdánà pÅ™estávek GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Tuto pÅ™eskoÄit"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Je Äas na mikropÅ™estávku"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "UdÄ›lejte si pÅ™estávku od psanà a dÃvejte se mimo monitor"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
@@ -232,40 +232,40 @@ msgstr[0] "Je to %s, co jste mÄ›li mÃt mikropÅ™estávku"
msgstr[1] "Jsou to %s, co jste mÄ›li mÃt mikropÅ™estávku"
msgstr[2] "Je to %s, co jste mÄ›li mÃt mikropÅ™estávku"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Odložená mikropřestávka"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "PÅ™estávka skonÄila"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "VaÅ¡e mikropÅ™estávka skonÄila"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "VÄ›nujte chvÃli odpoÄinku svých oÄÃ"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Upozornit mě později"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Čas na přestávku"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "Je Äas udÄ›lat si pÅ™estávku. JdÄ›te na chvÃli pryÄ od poÄÃtaÄe!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
@@ -273,12 +273,12 @@ msgstr[0] "Do konce přestávky máte %s"
msgstr[1] "Do konce přestávky máte %s"
msgstr[2] "Do konce přestávky máte %s"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Přestávka přerušena"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
@@ -286,11 +286,11 @@ msgstr[0] "Je to %s, co jste mÄ›li mÃt pÅ™estávku"
msgstr[1] "Jsou to %s, co jste mÄ›li mÃt pÅ™estávku"
msgstr[2] "Je to %s, co jste mÄ›li mÃt pÅ™estávku"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Odložená přestávka"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "ÄŒas vaÅ¡Ã pÅ™estávky skonÄil"
diff --git a/po/da.po b/po/da.po
index 27074ae..c5f6551 100644
--- a/po/da.po
+++ b/po/da.po
@@ -198,97 +198,97 @@ msgstr[0] "%d time"
msgstr[1] "%d timer"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Hvad skal jeg gøre?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Tak"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME Pausetimer"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Spring denne over"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Det er tid til en mikropause"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Tag en pause fra at skrive og kig væk fra skærmen"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Du skulle have taget en mikropause for %s siden"
msgstr[1] "Du skulle have taget en mikropause for %s siden"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Forsinket mikropause"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Pausen er slut"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Din mikropause er slut"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Tag et øjeblik til at slappe af i dine øjne"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "PÃ¥mind mig senere"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Tid til en pause"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "Det er tid til at holde en pause. Kom væk fra computeren for en stund!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Der er %s tilbage af din pause"
msgstr[1] "Der er %s tilbage af din pause"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pause blev forstyrret"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Du skulle have taget en pause for %s siden"
msgstr[1] "Du skulle have taget en pause for %s siden"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Forsinket pause"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Din pausetid er slut"
diff --git a/po/de.po b/po/de.po
index 63e4dd6..2f248f7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -207,68 +207,68 @@ msgstr[0] "%d Stunde"
msgstr[1] "%d Stunden"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Was sollen Sie machen?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Vielen Dank"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME Pausenerinnerung"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Ãœberspringen"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Es ist Zeit für eine Kurzpause"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Legen Sie eine Pause ein und schauen Sie vom Bildschirm weg"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Ihre Kurzpause war vor %s fällig"
msgstr[1] "Ihre Kurzpause war vor %s fällig"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Kurzpause überfällig"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Pause ist vorbei"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Ihre Kurzpause ist zu Ende"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Nehmen Sie sich einige Zeit, um Ihre Augen auszuruhen"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Später erinnern"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Es ist Zeit für eine Pause"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr ""
@@ -276,30 +276,30 @@ msgstr ""
"weg!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Es ist noch %s verbleibend in Ihrer Pause"
msgstr[1] "Es sind noch %s verbleibend in Ihrer Pause"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pause unterbrochen"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Ihre Pause war vor %s fällig"
msgstr[1] "Ihre Pause war vor %s fällig"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Überfällige Pause"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Ihre Pausenzeit ist zu Ende"
diff --git a/po/el.po b/po/el.po
index 818fc59..30f7b84 100644
--- a/po/el.po
+++ b/po/el.po
@@ -207,99 +207,99 @@ msgstr[0] "%d ÏŽÏα"
msgstr[1] "%d ÏŽÏες"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Τι Ï€ÏÎπει να κάνω;"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Σας ευχαÏιστοÏμε"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "ΧÏονομετÏητής διαλειμμάτων GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "ΠαÏάλειψη Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… διαλείμματος"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Είναι ÏŽÏα για Îνα μικÏÏŒ διάλειμμα"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr ""
"Κάντε Îνα διάλειμμα από την πληκτÏολόγηση και κοιτάξτε μακÏιά από την οθόνη"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Θα ÎÏ€Ïεπε να κάνετε Îνα μικÏÏŒ διάλειμμα Ï€Ïιν %s"
msgstr[1] "Θα ÎÏ€Ïεπε να κάνετε Îνα μικÏÏŒ διάλειμμα Ï€Ïιν %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "ΚαθυστεÏημÎνο μικÏÏŒ διάλειμμα"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Το διάλειμμα τελείωσε"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Το μικÏο διάλειμμα σας τελείωσε"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "ΞεκουÏάστε λίγο τα μάτια σας"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "ΥπενθÏμιση αÏγότεÏα"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "ÎÏα για διάλειμμα"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr ""
"Είναι ÏŽÏα να κάνετε διάλειμμα. ΑπομακÏυνθείτε από τον υπολογιστή για λίγο!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "ΑπομÎνει %s στο διάλειμμά σας"
msgstr[1] "ΑπομÎνουν %s στο διάλειμμά σας"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Το διάλειμμα διακόπηκε"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Θα ÎÏ€Ïεπε να κάνετε Îνα διάλειμμα Ï€Ïιν %s"
msgstr[1] "Θα ÎÏ€Ïεπε να κάνετε Îνα διάλειμμα Ï€Ïιν %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "ΚαθυστεÏημÎνο διάλειμμα"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Ο χÏόνος διαλείμματός σας τελείωσε"
diff --git a/po/es.po b/po/es.po
index b8ea2f8..853d279 100644
--- a/po/es.po
+++ b/po/es.po
@@ -200,98 +200,98 @@ msgstr[0] "%d hora"
msgstr[1] "%d horas"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "¿Qué debo hacer?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Gracias"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME Descansos"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Omitir este"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Es hora de un microdescanso"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Descansar un momento del teclado y mirar fuera de la pantalla"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "TenÃa que haber hecho un micro descanso hace %s minuto"
msgstr[1] "TenÃa que haber hecho un micro descanso hace %s minutos"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Micro descanso atrasado"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "El descanso ha terminado"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Su microdescanso ha terminado"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Descanse los ojos un momento"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Recordármelo más tarde"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Tiempo para un descanso"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr ""
"Es el momento de hacer un descanso. OlvÃdese del ordenador por un momento."
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Le queda %s de descanso"
msgstr[1] "Le quedan %s de descanso"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Descanso interrumpido"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "TenÃa que haber hecho un descanso hace %s minuto"
msgstr[1] "TenÃa que haber hecho un descanso hace %s minutos"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Descanso atrasado"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Su descanso ha terminado"
diff --git a/po/fr.po b/po/fr.po
index a629f34..af9e6c8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -207,99 +207,99 @@ msgstr[0] "%d heure"
msgstr[1] "%d heures"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Que dois-je faire ?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Merci"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "Minuteur de pauses GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Passer celle-ci"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "C'est le moment de faire une courte pause"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr ""
"Faites une pause dans la saisie au clavier et regardez ailleurs que l'écran."
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Vous deviez faire une pause courte il y a %s"
msgstr[1] "Vous deviez faire une pause courte il y a %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Pause courte dépassée"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "La pause est terminée"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Votre pause courte est terminée"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Prenez un moment pour vous reposer les yeux"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Rappeler-le moi plus tard"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Temps pour une pause"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr ""
"Il est temps de faire une pause. Quitter l'ordinateur pour un petit moment !"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Il reste %s de pause"
msgstr[1] "Il reste %s de pause"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pause interrompue"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Vous deviez faire une pause il y a %s"
msgstr[1] "Vous deviez faire une pause il y a %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Pause dépassée"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Votre temps de pause est terminé"
diff --git a/po/gl.po b/po/gl.po
index c359b6e..be2e4df 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -198,97 +198,97 @@ msgstr[0] "%d hora"
msgstr[1] "%d horas"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Que deberÃa facer?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Grazas"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:158
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:158
msgid "GNOME Break Timer"
msgstr "Temporizador de pausas de GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Saltar esta"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "É hora de facer unha micropausa"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Tome un respiro e olle fóra da pantalla"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] ""
msgstr[1] ""
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr ""
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "A pausa rematou"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "A súa micropausa rematou"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Tómese un momento para descansar os ollos"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Recordarmo máis tarde"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Hora dun descanso"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "É hora de facer un descanso. Afástese do seu computador por una anaco!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "AÃnda lle queda %s á súa pausa"
msgstr[1] "AÃnda lle quedan %s á súa pausa"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pausa interrompida"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] ""
msgstr[1] ""
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr ""
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "O tempo da pausa rematou"
diff --git a/po/hu.po b/po/hu.po
index a50f2d0..bc77949 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -202,98 +202,98 @@ msgstr[0] "%d óra"
msgstr[1] "%d óra"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Mit tegyek?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Köszönöm"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME Szünet ellenőrző"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Ennek kihagyása"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Itt az idő egy kis szünetre"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Tartson gépelési szünetet és nézzen máshova a képernyőtől"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Egy kis szünet tartott ennyi ideje: %s"
msgstr[1] "Egy kis szünet tartott ennyi ideje: %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "A kis szünet lejárt"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "A szünetnek vége"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "A kis szünet befejeződött"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Ãlljon meg egy pillanatra, hogy pihentesse a szemét"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Emlékeztessen később"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Ideje szünetet tartani"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr ""
"Itt az idÅ‘, hogy szünetet tartson. Hagyja el a számÃtógépét egy kis idÅ‘re!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Még %s van hátra a szünetből"
msgstr[1] "Még %s van hátra a szünetből"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Szünet megszakÃtva"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Szünet tartott ennyi ideje: %s"
msgstr[1] "Szünet tartott ennyi ideje: %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "A szünet lejárt"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "A szünet ideje befejeződött"
diff --git a/po/id.po b/po/id.po
index 9096cd5..57fa6c8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -198,95 +198,95 @@ msgid_plural "%d hours"
msgstr[0] "%d jam"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Apa yang mesti saya lakukan?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Terima kasih"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME Pewaktu Istirahat"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Lewati yang satu ini"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Saatnya untuk istirahat mikro"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Beristirahat dari mengetik dan mengalihkan pandangan dari layar"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Anda terlambat mengambil istirahat mikro %s yang lalu"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Istirahat mikro yang terlambat"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Waktu istirahat telah usai"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Istirahat mikro Anda telah berakhir"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Sejenak mengistirahatkan mata Anda"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Ingatkan lagi saya nanti"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Saatnya untuk istirahat"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr ""
"Ini saatnya beristirahat. Pergilah dari komputer untuk sementara waktu!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Tersisa %s dalam istirahat Anda"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Istirahat terinterupsi"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Anda terlambat beristirahat %s yang lalu"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Istirahat yang terlambat"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Waktu istirahat Anda telah berakhir"
diff --git a/po/lt.po b/po/lt.po
index a20e3cc..1a2092d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -204,34 +204,34 @@ msgstr[1] "%d valandos"
msgstr[2] "%d valandų"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "KÄ… turÄ—Äiau daryti?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "AÄiÅ«"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME pertraukų laikmatis"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Praleisti"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Laikas mikropertraukai"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Pailsėkite nuo rašymo klaviatūra ir nusigręžkite nuo ekrano"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
@@ -239,40 +239,40 @@ msgstr[0] "Nuo to laiko, kai turÄ—jote padaryti mikropertraukÄ…, praÄ—jo %s"
msgstr[1] "Nuo to laiko, kai turÄ—jote padaryti mikropertraukÄ…, praÄ—jo %s"
msgstr[2] "Nuo to laiko, kai turÄ—jote padaryti mikropertraukÄ…, praÄ—jo %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "PavÄ—luota mikropertrauka"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Pertrauka baigta"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Jūsų mikropertrauka pasibaigė"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Skirkite minutÄ—lÄ™ pailsÄ—ti savo akims"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Priminti vÄ—liau"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Laikas pertraukai"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "Laikas padaryti pertraukÄ…. Trumpam atsitraukite nuo kompiuterio!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
@@ -280,12 +280,12 @@ msgstr[0] "Jūsų pertraukai liko %s"
msgstr[1] "Jūsų pertraukai liko %s"
msgstr[2] "Jūsų pertraukai liko %s"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pertrauka nutraukta"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
@@ -293,11 +293,11 @@ msgstr[0] "Nuo to laiko, kai turÄ—jote padaryti pertraukÄ…, praÄ—jo %s"
msgstr[1] "Nuo to laiko, kai turÄ—jote padaryti pertraukÄ…, praÄ—jo %s"
msgstr[2] "Nuo to laiko, kai turÄ—jote padaryti pertraukÄ…, praÄ—jo %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "PavÄ—luota pertrauka"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Jūsų pertraukos laikas pasibaigė"
diff --git a/po/oc.po b/po/oc.po
index 6377d72..ca37142 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -206,99 +206,99 @@ msgstr[0] "%d ora"
msgstr[1] "%d oras"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "De qué me cal far ?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Mercé"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "Minutador de pausas GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Passar aquela"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Es ora de far una corta pausa"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr ""
"Fasètz una pausa dins la sasida amb lo clavièr e gaitatz quicòm mai que "
"l'ecran."
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Deviatz far una pausa corta i a %s"
msgstr[1] "Deviatz far una pausa corta i a %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Pausa corta depassada"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "La pausa es acabada"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Vòstra pausa corta es acabada"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Prenètz un moment per vos repausar los uèlhs"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Remembratz-me-lo pus tard"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Temps per una pausa"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "Es ora de far una pausa. Quitar l'ordenador per un momenton !"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Demòra %s de pausa"
msgstr[1] "Demòran %s de pausa"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pausa interrompuda"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Deviás far una pausa i a %s"
msgstr[1] "Deviás far una pausa i a %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Pausa depassada"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Vòstre temps de pausa es acabat"
diff --git a/po/pl.po b/po/pl.po
index 5069200..e826a67 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -200,34 +200,34 @@ msgstr[1] "%d godziny"
msgstr[2] "%d godzin"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Co teraz?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Dziękujemy"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "Menedżer przerw GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Pomiń tę przerwę"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Czas na miniprzerwÄ™"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Należy teraz oderwać dłonie od klawiatury i odwrócić wzrok od monitora"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
@@ -235,40 +235,40 @@ msgstr[0] "Miniprzerwa miała odbyć się %s temu"
msgstr[1] "Miniprzerwa miała odbyć się %s temu"
msgstr[2] "Miniprzerwa miała odbyć się %s temu"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Zaległa miniprzerwa"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Koniec przerwy"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Miniprzerwa dobiegła końca"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Czas na chwilÄ™ odpoczynku dla oczu"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Przypomnij później"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Czas na przerwÄ™"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "Należy teraz zrobić przerwę i odejść na chwilę od komputera."
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
@@ -276,12 +276,12 @@ msgstr[0] "Przerwa skończy się za %s"
msgstr[1] "Przerwa skończy się za %s"
msgstr[2] "Przerwa skończy się za %s"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Przerwano przerwÄ™"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
@@ -289,11 +289,11 @@ msgstr[0] "Przerwa miała odbyć się %s temu"
msgstr[1] "Przerwa miała odbyć się %s temu"
msgstr[2] "Przerwa miała odbyć się %s temu"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Zaległa przerwa"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Przerwa dobiegła końca"
diff --git a/po/pt.po b/po/pt.po
index a12209b..f35c8a5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -202,97 +202,97 @@ msgstr[0] "%d hora"
msgstr[1] "%d horas"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "O que devo fazer?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Obrigado"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "Temporizador de pausas do GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Ignorar esta"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "É hora de uma pausa curta"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Faça uma pausa: pare de escrever e desvie o olhar do ecrã"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Deveria ter feito uma pausa curta há %s atrás"
msgstr[1] "Deveria ter feito uma pausa curta há %s atrás"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Pausa curta atrasada"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "A pausa terminou"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "A sua pausa curta terminou"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Tire um momento para descansar os seus olhos"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Lembre-me mais tarde"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Hora de um descanso"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "É hora de fazer uma pausa. Saia do computador por algum tempo!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Resta-lhe %s de pausa"
msgstr[1] "Restam-lhe %s de pausa"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pausa interrompida"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Deveria ter feito uma pausa há %s atrás"
msgstr[1] "Deveria ter feito uma pausa há %s atrás"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Pausa atrasada"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "O seu tempo de descanso acabou"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 22865ae..4012d23 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -203,97 +203,97 @@ msgstr[0] "%d hora"
msgstr[1] "%d horas"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "O que devo fazer?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Obrigado"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "Temporizador de pausas do GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Pular esta"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "É hora de uma pausa curta"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Faça uma pausa: pare de digitar e desvie o olhar da tela"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Você deveria ter feito uma pausa curta %s atrás"
msgstr[1] "Você deveria ter feito uma pausa curta %s atrás"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Pausa curta atrasada"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "A pausa terminou"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Sua pausa curta terminou"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Tire um momento para descansar seus olhos"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Lembre-me depois"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Hora de um descanso"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "É hora de fazer uma pausa. Saia do computador por um tempo!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "%s restante de sua pausa"
msgstr[1] "%s restantes de sua pausa"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Pausa interrompida"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Você deveria ter feito uma pausa %s atrás"
msgstr[1] "Você deveria ter feito uma pausa %s atrás"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Pausa atrasada"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Seu tempo de descanso acabou"
diff --git a/po/sl.po b/po/sl.po
index 2e97aea..7e0730b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -205,34 +205,34 @@ msgstr[2] "%d uri"
msgstr[3] "%d ure"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Kaj storiti?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Hvala!"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "ÄŒasomer odmorov GNOME"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Tega preskoÄi"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "ÄŒas je za kratek odmor"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "PrivoÅ¡Äite si odmor med tipkanjem in glejte stran od zaslona."
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
@@ -241,40 +241,40 @@ msgstr[1] "Kratek odmor bi si morali privoÅ¡Äiti pred %s"
msgstr[2] "Kratek odmor bi si morali privoÅ¡Äiti pred %s"
msgstr[3] "Kratek odmor bi si morali privoÅ¡Äiti pred %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Zapozneli kratek odmor"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Odmor je konÄan"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "VaÅ¡ kratek odmor je konÄan"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Vzemite si trenutek, da si odpoÄijete oÄi"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Spomni me kasneje"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "ÄŒas je za odmor"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "ÄŒas je za odmor. Za kratek Äas pojdite stran od raÄunalnika!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
@@ -283,12 +283,12 @@ msgstr[1] "Na voljo je Å¡e %s za odmor"
msgstr[2] "Na voljo sta Å¡e %s za odmor"
msgstr[3] "Na voljo so Å¡e %s za odmor"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Odmor prekinjen"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
@@ -297,11 +297,11 @@ msgstr[1] "Odmor bi si morali privoÅ¡Äiti pred %s"
msgstr[2] "Odmor bi si morali privoÅ¡Äiti pred %s"
msgstr[3] "Odmor bi si morali privoÅ¡Äiti pred %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Zapozneli odmor"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "VaÅ¡ odmor je konÄan"
diff --git a/po/sr.po b/po/sr.po
index f09951a..3adc0e8 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -202,34 +202,34 @@ msgstr[2] "%d Ñати"
msgstr[3] "један Ñат"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Шта треба да урадим?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Хвала вам"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "Гномов надзорник одмора"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Овај преÑкочи"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Време је за предах"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Одморите Ñе од куцања и гледајте ван екрана"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
@@ -238,41 +238,41 @@ msgstr[1] "Требали Ñте да предахнете пре %s"
msgstr[2] "Требали Ñте да предахнете пре %s"
msgstr[3] "Требали Ñте да предахнете пре %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "ПреÑкочи предах"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Одмор је завршен"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Ваш предах Ñе завршио"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Одморите ваше очи на тренутак"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "ПодÑети ме каÑније"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Време је за одмор"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr ""
"Време је да Ñе одморите. Удаљите Ñе мало од рачунара, погледајте кроз прозор!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
@@ -281,12 +281,12 @@ msgstr[1] "ОÑтала Ñу вам још %s одмора"
msgstr[2] "ОÑтало вам је још %s одмора"
msgstr[3] "ОÑтало вам је још %s одмора "
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Одмор је прекинут"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
@@ -295,11 +295,11 @@ msgstr[1] "Требали Ñте да Ñе одморите пре %s"
msgstr[2] "Требали Ñте да Ñе одморите пре %s"
msgstr[3] "Требали Ñте да Ñе одморите пре %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "ПреÑкочи одмор"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Време вашег одмора је иÑтекло"
diff --git a/po/sr latin po b/po/sr latin po
index a0fd2aa..b6d7394 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -202,34 +202,34 @@ msgstr[2] "%d sati"
msgstr[3] "jedan sat"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Å ta treba da uradim?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Hvala vam"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "Gnomov nadzornik odmora"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Ovaj preskoÄi"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Vreme je za predah"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Odmorite se od kucanja i gledajte van ekrana"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
@@ -238,41 +238,41 @@ msgstr[1] "Trebali ste da predahnete pre %s"
msgstr[2] "Trebali ste da predahnete pre %s"
msgstr[3] "Trebali ste da predahnete pre %s"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "PreskoÄi predah"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Odmor je završen"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Vaš predah se završio"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Odmorite vaÅ¡e oÄi na trenutak"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Podseti me kasnije"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Vreme je za odmor"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr ""
"Vreme je da se odmorite. Udaljite se malo od raÄunara, pogledajte kroz prozor!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
@@ -281,12 +281,12 @@ msgstr[1] "Ostala su vam još %s odmora"
msgstr[2] "Ostalo vam je još %s odmora"
msgstr[3] "Ostalo vam je još %s odmora "
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Odmor je prekinut"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
@@ -295,11 +295,11 @@ msgstr[1] "Trebali ste da se odmorite pre %s"
msgstr[2] "Trebali ste da se odmorite pre %s"
msgstr[3] "Trebali ste da se odmorite pre %s"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "PreskoÄi odmor"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Vreme vašeg odmora je isteklo"
diff --git a/po/sv.po b/po/sv.po
index db690f2..ca8c665 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -173,96 +173,96 @@ msgstr[0] "%d timme"
msgstr[1] "%d timmar"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Vad ska jag göra?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Tack"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME Break Timer"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Hoppa över den här pausen"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Det är dags för en paus"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Ta en paus från skrivandet och kolla bort från skärmen"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "Du skulle tagit en paus för %s sedan"
msgstr[1] "Du skulle tagit en paus för %s sedan"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Försenad paus"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Rasten är över"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Din paus är slut"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Ta en stund att vila ögonen"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "PÃ¥minn mig senare"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Dags för rast"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid "It’s time to take a break. Get away from the computer for a little while!"
msgstr "Det är dags för en rast. Gå ifrån datorn en stund!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Det är %s kvar av din rast"
msgstr[1] "Det är %s kvar av din rast"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Rast avbruten"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "Du skulle ta en rast för %s sedan"
msgstr[1] "Du skulle ta en rast för %s sedan"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Försenad rast"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Din rast har upphört"
diff --git a/po/tr.po b/po/tr.po
index 6d9d8ab..3f92f85 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -191,94 +191,94 @@ msgid_plural "%d hours"
msgstr[0] "%d saat"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "Ne yapmalıyım?"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "Teşekkürler"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:148
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
msgid "GNOME Break Timer"
msgstr "GNOME Mola Zamanlayıcı"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "Bunu atla"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "Küçük bir mola zamanı"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "Yazmaya ara ver ekrandan baÅŸka bir yere bak"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "%s önce küçük bir mola almış olmalıydınız"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "Vakti geçmiş küçük mola"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "Mola bitti"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "Küçük molanız bitti"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "Gözlerinizi dinlendirmek için biraz zaman ayırın"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "Daha sonra hatırlat"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "Mola zamanı"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "Şimdi mola zamanı. Bir süre bilgisayardan uzaklaşın!"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "Molanızın bitmesine %s kaldı"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "Mola yarıda kesildi"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "%s önce mola almalıydın"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "Süresi geçmiş mola"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "Mola vaktin bitti"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ef2b6f3..6bf0532 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -186,94 +186,94 @@ msgid_plural "%d hours"
msgstr[0] "%d å°æ—¶"
#. Label for a notification action that shows information about the current break
-#: ../helper/break/BreakView.vala:74
+#: ../daemon/break/BreakView.vala:74
msgid "What should I do?"
msgstr "我该åšäº›ä»€ä¹ˆï¼Ÿ"
#. Break overlay label when a break has been finished
-#: ../helper/break/TimerBreakStatusWidget.vala:56
+#: ../daemon/break/TimerBreakStatusWidget.vala:56
msgid "Thank you"
msgstr "谢谢"
-#: ../helper/HelperApplication.vala:20 ../settings/MainWindow.vala:158
+#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:158
msgid "GNOME Break Timer"
msgstr "GNOME 休æ¯å®šæ—¶å™¨"
#. Label for a notification action that will skip the current microbreak
-#: ../helper/microbreak/MicroBreakView.vala:40
+#: ../daemon/microbreak/MicroBreakView.vala:40
msgid "Skip this one"
msgstr "跳过当å‰å¾®ä¼‘"
-#: ../helper/microbreak/MicroBreakView.vala:47
+#: ../daemon/microbreak/MicroBreakView.vala:47
msgid "It’s time for a micro break"
msgstr "微休时间到"
-#: ../helper/microbreak/MicroBreakView.vala:48
+#: ../daemon/microbreak/MicroBreakView.vala:48
msgid "Take a break from typing and look away from the screen"
msgstr "ä¸è¦æ‰“å—了,也别看å±å¹•äº†"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/microbreak/MicroBreakView.vala:64
+#: ../daemon/microbreak/MicroBreakView.vala:64
#, c-format
msgid "You were due to take a micro break %s ago"
msgid_plural "You were due to take a micro break %s ago"
msgstr[0] "%s 之å‰æ‚¨å°±åº”该微休一下了"
-#: ../helper/microbreak/MicroBreakView.vala:70
+#: ../daemon/microbreak/MicroBreakView.vala:70
msgid "Overdue micro break"
msgstr "已逾期的微休时间"
-#: ../helper/microbreak/MicroBreakView.vala:80
-#: ../helper/restbreak/RestBreakView.vala:125
+#: ../daemon/microbreak/MicroBreakView.vala:80
+#: ../daemon/restbreak/RestBreakView.vala:125
msgid "Break is over"
msgstr "休æ¯ç»“æŸ"
-#: ../helper/microbreak/MicroBreakView.vala:81
+#: ../daemon/microbreak/MicroBreakView.vala:81
msgid "Your micro break has ended"
msgstr "您的微休时间已结æŸ"
-#: ../helper/microbreak/MicroBreakView.vala:94
+#: ../daemon/microbreak/MicroBreakView.vala:94
msgid "Take a moment to rest your eyes"
msgstr "花点时间放æ¾ä¸‹çœ¼ç›"
#. Label for a notification action that will delay the current break for a few minutes
-#: ../helper/restbreak/RestBreakView.vala:54
+#: ../daemon/restbreak/RestBreakView.vala:54
msgid "Remind me later"
msgstr "ç¨åŽæ醒"
#. FIXME: Should say how long the break is?
-#: ../helper/restbreak/RestBreakView.vala:68
+#: ../daemon/restbreak/RestBreakView.vala:68
msgid "Time for a break"
msgstr "休æ¯æ—¶é•¿"
-#: ../helper/restbreak/RestBreakView.vala:69
+#: ../daemon/restbreak/RestBreakView.vala:69
msgid ""
"It’s time to take a break. Get away from the computer for a little while!"
msgstr "休æ¯æ—¶é—´åˆ°ã€‚从电脑å‰ç¦»å¼€ä¸€ä¼šå„¿å§ï¼"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:86
+#: ../daemon/restbreak/RestBreakView.vala:86
#, c-format
msgid "There is %s remaining in your break"
msgid_plural "There are %s remaining in your break"
msgstr[0] "离休æ¯æ—¶é—´è¿˜æœ‰ %s"
-#: ../helper/restbreak/RestBreakView.vala:92
+#: ../daemon/restbreak/RestBreakView.vala:92
msgid "Break interrupted"
msgstr "休æ¯ä¸æ–"
#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1
hour"
-#: ../helper/restbreak/RestBreakView.vala:109
+#: ../daemon/restbreak/RestBreakView.vala:109
#, c-format
msgid "You were due to take a break %s ago"
msgid_plural "You were due to take a break %s ago"
msgstr[0] "%s 之å‰æ‚¨å°±åº”该休æ¯ä¸€ä¸‹äº†"
-#: ../helper/restbreak/RestBreakView.vala:115
+#: ../daemon/restbreak/RestBreakView.vala:115
msgid "Overdue break"
msgstr "已逾期的休æ¯"
-#: ../helper/restbreak/RestBreakView.vala:126
+#: ../daemon/restbreak/RestBreakView.vala:126
msgid "Your break time has ended"
msgstr "您的休æ¯æ—¶é—´å·²ç»“æŸ"
diff --git a/src/common/IBreakHelper.vala b/src/common/IBreakDaemon.vala
similarity index 92%
rename from src/common/IBreakHelper.vala
rename to src/common/IBreakDaemon.vala
index b007dbf..2413ec7 100644
--- a/src/common/IBreakHelper.vala
+++ b/src/common/IBreakDaemon.vala
@@ -18,11 +18,11 @@
namespace BreakTimer {
[DBus (name = "org.gnome.BreakTimer")]
-public interface IBreakHelper : Object {
+public interface IBreakDaemon : Object {
/** Returns the ID of the break that is currently focused and activated, if any. */
public abstract string? get_current_active_break () throws DBusError, IOError;
- /** Returns a list of breaks that are currently known to the break helper. */
+ /** Returns a list of breaks that are currently known to the break daemon. */
public abstract string[] get_break_ids () throws DBusError, IOError;
/** Returns a list of helpful status messages for each break, for debugging. */
@@ -33,12 +33,12 @@ public interface IBreakHelper : Object {
// TODO: It might make sense to communicate when the active break changes,
// using a signal. The only reason we don't at the moment is it adds
- // complexity in the break helper, and the settings app already polls the
+ // complexity in the break daemon, and the settings app already polls the
// dbus service regularly for updates.
}
[DBus (name = "org.gnome.BreakTimer.TimerBreak")]
-public interface IBreakHelper_TimerBreak : Object {
+public interface IBreakDaemon_TimerBreak : Object {
/** Get the break's current status, such as time remaining, or time until the break starts */
public abstract TimerBreakStatus get_status () throws DBusError, IOError;
diff --git a/src/common/meson.build b/src/common/meson.build
index 9dbed12..2dc2124 100644
--- a/src/common/meson.build
+++ b/src/common/meson.build
@@ -1,5 +1,5 @@
common_sources = files(
- 'IBreakHelper.vala',
+ 'IBreakDaemon.vala',
'ISessionStatus.vala',
'NaturalTime.vala'
)
diff --git a/src/config.vapi b/src/config.vapi
index bec98a5..904d8cb 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -1,17 +1,17 @@
[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
namespace Config {
+ public const string APPLICATION_ICON;
+ public const string APPLICATION_URL;
+ public const string DAEMON_APPLICATION_ID;
+ public const string DAEMON_BREAK_OBJECT_BASE_PATH;
+ public const string DAEMON_BUS_NAME;
+ public const string DAEMON_DESKTOP_FILE_ID;
+ public const string DAEMON_OBJECT_PATH;
public const string GETTEXT_PACKAGE;
public const string LOCALE_DIR;
public const string PROJECT_NAME;
public const string PROJECT_VERSION;
- public const string APPLICATION_ICON;
- public const string APPLICATION_URL;
- public const string HELPER_APPLICATION_ID;
- public const string HELPER_DESKTOP_FILE_ID;
public const string SETTINGS_APPLICATION_ID;
public const string SETTINGS_DESKTOP_FILE_ID;
- public const string HELPER_BUS_NAME;
- public const string HELPER_OBJECT_PATH;
- public const string HELPER_BREAK_OBJECT_BASE_PATH;
}
diff --git a/src/helper/BreakManager.vala b/src/daemon/BreakManager.vala
similarity index 92%
rename from src/helper/BreakManager.vala
rename to src/daemon/BreakManager.vala
index 738d637..58e1f6c 100644
--- a/src/helper/BreakManager.vala
+++ b/src/daemon/BreakManager.vala
@@ -15,13 +15,13 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public class BreakManager : Object {
private UIManager ui_manager;
private Gee.Map<string, BreakType> breaks;
- private BreakHelperServer break_helper_server;
+ private BreakDaemonServer break_daemon_server;
private GLib.Settings settings;
public bool master_enabled { get; set; }
@@ -38,15 +38,15 @@ public class BreakManager : Object {
this.notify["master-enabled"].connect (this.update_enabled_breaks);
this.notify["selected-break-ids"].connect (this.update_enabled_breaks);
- this.break_helper_server = new BreakHelperServer (this);
+ this.break_daemon_server = new BreakDaemonServer (this);
try {
DBusConnection connection = Bus.get_sync (BusType.SESSION, null);
connection.register_object (
- Config.HELPER_OBJECT_PATH,
- this.break_helper_server
+ Config.DAEMON_OBJECT_PATH,
+ this.break_daemon_server
);
} catch (IOError error) {
- GLib.error ("Error registering helper on the session bus: %s", error.message);
+ GLib.error ("Error registering daemon on the session bus: %s", error.message);
}
}
@@ -101,10 +101,10 @@ public class BreakManager : Object {
}
[DBus (name = "org.gnome.BreakTimer")]
-public class BreakHelperServer : Object, IBreakHelper {
+public class BreakDaemonServer : Object, IBreakDaemon {
private weak BreakManager break_manager;
- public BreakHelperServer (BreakManager break_manager) {
+ public BreakDaemonServer (BreakManager break_manager) {
this.break_manager = break_manager;
}
diff --git a/src/helper/HelperApplication.vala b/src/daemon/DaemonApplication.vala
similarity index 94%
rename from src/helper/HelperApplication.vala
rename to src/daemon/DaemonApplication.vala
index 0c3314d..7dd7fc9 100644
--- a/src/helper/HelperApplication.vala
+++ b/src/daemon/DaemonApplication.vala
@@ -15,9 +15,9 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
-public class HelperApplication : Gtk.Application {
+public class DaemonApplication : Gtk.Application {
const string app_name = _("GNOME Break Timer");
const int DATA_VERSION = 0;
@@ -29,9 +29,9 @@ public class HelperApplication : Gtk.Application {
private string cache_path;
- public HelperApplication () {
+ public DaemonApplication () {
Object (
- application_id: Config.HELPER_APPLICATION_ID,
+ application_id: Config.DAEMON_APPLICATION_ID,
register_session: true,
flags: ApplicationFlags.FLAGS_NONE
);
@@ -78,7 +78,7 @@ public class HelperApplication : Gtk.Application {
var connection = this.get_dbus_connection ();
if (connection != null) {
- Bus.own_name_on_connection (connection, Config.HELPER_BUS_NAME, BusNameOwnerFlags.REPLACE, null,
null);
+ Bus.own_name_on_connection (connection, Config.DAEMON_BUS_NAME, BusNameOwnerFlags.REPLACE, null,
null);
}
}
diff --git a/src/helper/SessionStatus.vala b/src/daemon/SessionStatus.vala
similarity index 99%
rename from src/helper/SessionStatus.vala
rename to src/daemon/SessionStatus.vala
index c37ce72..d6a8dd5 100644
--- a/src/helper/SessionStatus.vala
+++ b/src/daemon/SessionStatus.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
[DBus (name = "org.gnome.ScreenSaver")]
public interface IScreenSaver : Object {
diff --git a/src/helper/UIFragment.vala b/src/daemon/UIFragment.vala
similarity index 98%
rename from src/helper/UIFragment.vala
rename to src/daemon/UIFragment.vala
index 49dd7b9..b81e092 100644
--- a/src/helper/UIFragment.vala
+++ b/src/daemon/UIFragment.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* Provides a simple interface for UIManager to create notifications and
diff --git a/src/helper/UIManager.vala b/src/daemon/UIManager.vala
similarity index 97%
rename from src/helper/UIManager.vala
rename to src/daemon/UIManager.vala
index 035a3f6..578bda2 100644
--- a/src/helper/UIManager.vala
+++ b/src/daemon/UIManager.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* Central place to manage UI throughout the application. We need this to
@@ -43,7 +43,7 @@ public class UIManager : SimpleFocusManager {
}
if (this.canberra != null) {
- this.canberra.change_props(Canberra.PROP_APPLICATION_ID, Config.HELPER_APPLICATION_ID);
+ this.canberra.change_props(Canberra.PROP_APPLICATION_ID, Config.DAEMON_APPLICATION_ID);
this.canberra.change_props(Canberra.PROP_APPLICATION_NAME, _("GNOME Break Timer"));
this.canberra.change_props(Canberra.PROP_APPLICATION_ICON_NAME, Config.APPLICATION_ICON);
this.canberra.open();
@@ -72,7 +72,7 @@ public class UIManager : SimpleFocusManager {
this.hide_notification (this.notification);
}
- notification.set_hint ("desktop-entry", Config.HELPER_APPLICATION_ID);
+ notification.set_hint ("desktop-entry", Config.DAEMON_APPLICATION_ID);
try {
notification.show ();
diff --git a/src/helper/activity-monitor/ActivityMonitor.vala
b/src/daemon/activity-monitor/ActivityMonitor.vala
similarity index 99%
rename from src/helper/activity-monitor/ActivityMonitor.vala
rename to src/daemon/activity-monitor/ActivityMonitor.vala
index 88afb2f..9e57d08 100644
--- a/src/helper/activity-monitor/ActivityMonitor.vala
+++ b/src/daemon/activity-monitor/ActivityMonitor.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public class ActivityMonitor : Object {
public signal void detected_idle (UserActivity activity);
diff --git a/src/helper/activity-monitor/MutterActivityMonitorBackend.vala
b/src/daemon/activity-monitor/MutterActivityMonitorBackend.vala
similarity index 99%
rename from src/helper/activity-monitor/MutterActivityMonitorBackend.vala
rename to src/daemon/activity-monitor/MutterActivityMonitorBackend.vala
index 99a8a70..7134d89 100644
--- a/src/helper/activity-monitor/MutterActivityMonitorBackend.vala
+++ b/src/daemon/activity-monitor/MutterActivityMonitorBackend.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
[DBus (name = "org.gnome.Mutter.IdleMonitor")]
public interface IMutterIdleMonitor : Object {
diff --git a/src/helper/activity-monitor/UserActivity.vala b/src/daemon/activity-monitor/UserActivity.vala
similarity index 98%
rename from src/helper/activity-monitor/UserActivity.vala
rename to src/daemon/activity-monitor/UserActivity.vala
index a5eeeeb..ccd455c 100644
--- a/src/helper/activity-monitor/UserActivity.vala
+++ b/src/daemon/activity-monitor/UserActivity.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public enum ActivityType {
SLEEP,
diff --git a/src/helper/break/BreakController.vala b/src/daemon/break/BreakController.vala
similarity index 99%
rename from src/helper/break/BreakController.vala
rename to src/daemon/break/BreakController.vala
index c616912..a47debc 100644
--- a/src/helper/break/BreakController.vala
+++ b/src/daemon/break/BreakController.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* Base class for a break's activity tracking functionality.
diff --git a/src/helper/break/BreakType.vala b/src/daemon/break/BreakType.vala
similarity index 97%
rename from src/helper/break/BreakType.vala
rename to src/daemon/break/BreakType.vala
index 9fc5af2..0d10948 100644
--- a/src/helper/break/BreakType.vala
+++ b/src/daemon/break/BreakType.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public abstract class BreakType : Object {
public string id;
diff --git a/src/helper/break/BreakView.vala b/src/daemon/break/BreakView.vala
similarity index 99%
rename from src/helper/break/BreakView.vala
rename to src/daemon/break/BreakView.vala
index ba094a6..e30f69d 100644
--- a/src/helper/break/BreakView.vala
+++ b/src/daemon/break/BreakView.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public abstract class BreakView : UIFragment {
protected weak BreakController break_controller;
diff --git a/src/helper/break/TimerBreakController.vala b/src/daemon/break/TimerBreakController.vala
similarity index 99%
rename from src/helper/break/TimerBreakController.vala
rename to src/daemon/break/TimerBreakController.vala
index 0486445..82dee4b 100644
--- a/src/helper/break/TimerBreakController.vala
+++ b/src/daemon/break/TimerBreakController.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* A type of break that times user activity. It activates after a particular
diff --git a/src/helper/break/TimerBreakType.vala b/src/daemon/break/TimerBreakType.vala
similarity index 88%
rename from src/helper/break/TimerBreakType.vala
rename to src/daemon/break/TimerBreakType.vala
index f708aec..6eb2861 100644
--- a/src/helper/break/TimerBreakType.vala
+++ b/src/daemon/break/TimerBreakType.vala
@@ -15,10 +15,10 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public abstract class TimerBreakType : BreakType {
- private BreakHelper_TimerBreakServer break_type_server;
+ private BreakDaemon_TimerBreakServer break_type_server;
protected TimerBreakType (string id, GLib.Settings settings) {
base (id, settings);
@@ -33,14 +33,14 @@ public abstract class TimerBreakType : BreakType {
this.settings.bind ("interval-seconds", timer_break_controller, "interval",
GLib.SettingsBindFlags.GET);
this.settings.bind ("duration-seconds", timer_break_controller, "duration",
GLib.SettingsBindFlags.GET);
- this.break_type_server = new BreakHelper_TimerBreakServer (
+ this.break_type_server = new BreakDaemon_TimerBreakServer (
timer_break_controller,
timer_break_view
);
try {
DBusConnection connection = Bus.get_sync (BusType.SESSION, null);
connection.register_object (
- Config.HELPER_BREAK_OBJECT_BASE_PATH+this.id,
+ Config.DAEMON_BREAK_OBJECT_BASE_PATH+this.id,
this.break_type_server
);
} catch (IOError error) {
@@ -50,11 +50,11 @@ public abstract class TimerBreakType : BreakType {
}
[DBus (name = "org.gnome.BreakTimer.TimerBreak")]
-private class BreakHelper_TimerBreakServer : Object, IBreakHelper_TimerBreak {
+private class BreakDaemon_TimerBreakServer : Object, IBreakDaemon_TimerBreak {
private weak TimerBreakController break_controller;
private weak TimerBreakView break_view;
- public BreakHelper_TimerBreakServer (TimerBreakController break_controller, TimerBreakView break_view) {
+ public BreakDaemon_TimerBreakServer (TimerBreakController break_controller, TimerBreakView break_view) {
this.break_controller = break_controller;
this.break_view = break_view;
}
diff --git a/src/helper/break/TimerBreakView.vala b/src/daemon/break/TimerBreakView.vala
similarity index 98%
rename from src/helper/break/TimerBreakView.vala
rename to src/daemon/break/TimerBreakView.vala
index 1d15ea2..f8422d2 100644
--- a/src/helper/break/TimerBreakView.vala
+++ b/src/daemon/break/TimerBreakView.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public abstract class TimerBreakView : BreakView {
protected TimerBreakController timer_break {
diff --git a/src/helper/main.vala b/src/daemon/main.vala
similarity index 90%
rename from src/helper/main.vala
rename to src/daemon/main.vala
index 2b50eae..b652851 100644
--- a/src/helper/main.vala
+++ b/src/daemon/main.vala
@@ -15,12 +15,12 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
-static HelperApplication application;
+static DaemonApplication application;
public int main (string[] args) {
- application = new HelperApplication ();
+ application = new DaemonApplication ();
Posix.signal (Posix.Signal.INT, sigint_cb);
Posix.signal (Posix.Signal.TERM, sigint_cb);
Posix.signal (Posix.Signal.HUP, sigint_cb);
diff --git a/src/helper/meson.build b/src/daemon/meson.build
similarity index 93%
rename from src/helper/meson.build
rename to src/daemon/meson.build
index b798386..1dc614a 100644
--- a/src/helper/meson.build
+++ b/src/daemon/meson.build
@@ -1,15 +1,15 @@
-helper_sources = files(
+daemon_sources = files(
'activity-monitor/ActivityMonitor.vala',
'activity-monitor/MutterActivityMonitorBackend.vala',
'activity-monitor/UserActivity.vala',
'break/BreakController.vala',
'break/BreakType.vala',
'break/BreakView.vala',
- 'BreakManager.vala',
'break/TimerBreakController.vala',
'break/TimerBreakType.vala',
'break/TimerBreakView.vala',
- 'HelperApplication.vala',
+ 'BreakManager.vala',
+ 'DaemonApplication.vala',
'main.vala',
'microbreak/MicroBreakController.vala',
'microbreak/MicroBreakType.vala',
diff --git a/src/helper/microbreak/MicroBreakController.vala b/src/daemon/microbreak/MicroBreakController.vala
similarity index 97%
rename from src/helper/microbreak/MicroBreakController.vala
rename to src/daemon/microbreak/MicroBreakController.vala
index 2beeeae..b24ff36 100644
--- a/src/helper/microbreak/MicroBreakController.vala
+++ b/src/daemon/microbreak/MicroBreakController.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* A type of timer break that should activate frequently and for short
diff --git a/src/helper/microbreak/MicroBreakType.vala b/src/daemon/microbreak/MicroBreakType.vala
similarity index 97%
rename from src/helper/microbreak/MicroBreakType.vala
rename to src/daemon/microbreak/MicroBreakType.vala
index 7aef0e6..5c5c220 100644
--- a/src/helper/microbreak/MicroBreakType.vala
+++ b/src/daemon/microbreak/MicroBreakType.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public class MicroBreakType : TimerBreakType {
private ActivityMonitor activity_monitor;
diff --git a/src/helper/microbreak/MicroBreakView.vala b/src/daemon/microbreak/MicroBreakView.vala
similarity index 99%
rename from src/helper/microbreak/MicroBreakView.vala
rename to src/daemon/microbreak/MicroBreakView.vala
index ae4b81d..dffb463 100644
--- a/src/helper/microbreak/MicroBreakView.vala
+++ b/src/daemon/microbreak/MicroBreakView.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/* TODO: notification when user is away for rest duration */
/* TODO: replace pause break if appropriate */
diff --git a/src/helper/restbreak/RestBreakController.vala b/src/daemon/restbreak/RestBreakController.vala
similarity index 99%
rename from src/helper/restbreak/RestBreakController.vala
rename to src/daemon/restbreak/RestBreakController.vala
index ff02176..1fd6c58 100644
--- a/src/helper/restbreak/RestBreakController.vala
+++ b/src/daemon/restbreak/RestBreakController.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* A type of timer break designed for longer durations. Satisfied when the user
diff --git a/src/helper/restbreak/RestBreakType.vala b/src/daemon/restbreak/RestBreakType.vala
similarity index 97%
rename from src/helper/restbreak/RestBreakType.vala
rename to src/daemon/restbreak/RestBreakType.vala
index 09332f5..ff96789 100644
--- a/src/helper/restbreak/RestBreakType.vala
+++ b/src/daemon/restbreak/RestBreakType.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public class RestBreakType : TimerBreakType {
private ActivityMonitor activity_monitor;
diff --git a/src/helper/restbreak/RestBreakView.vala b/src/daemon/restbreak/RestBreakView.vala
similarity index 99%
rename from src/helper/restbreak/RestBreakView.vala
rename to src/daemon/restbreak/RestBreakView.vala
index 70465ab..e3de1c6 100644
--- a/src/helper/restbreak/RestBreakView.vala
+++ b/src/daemon/restbreak/RestBreakView.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/* TODO: Use a single persistent notification throughout a given break */
diff --git a/src/helper/util/Countdown.vala b/src/daemon/util/Countdown.vala
similarity index 99%
rename from src/helper/util/Countdown.vala
rename to src/daemon/util/Countdown.vala
index 3772bf3..6e3bcaa 100644
--- a/src/helper/util/Countdown.vala
+++ b/src/daemon/util/Countdown.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* A countdown timer that counts seconds from a start time down to 0. Uses
diff --git a/src/helper/util/PausableTimeout.vala b/src/daemon/util/PausableTimeout.vala
similarity index 98%
rename from src/helper/util/PausableTimeout.vala
rename to src/daemon/util/PausableTimeout.vala
index 52b73c9..aeeea61 100644
--- a/src/helper/util/PausableTimeout.vala
+++ b/src/daemon/util/PausableTimeout.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* Calls a function continuously with a particular interval, in seconds. An
diff --git a/src/helper/util/SimpleFocusManager.vala b/src/daemon/util/SimpleFocusManager.vala
similarity index 99%
rename from src/helper/util/SimpleFocusManager.vala
rename to src/daemon/util/SimpleFocusManager.vala
index 4d74201..3da256e 100644
--- a/src/helper/util/SimpleFocusManager.vala
+++ b/src/daemon/util/SimpleFocusManager.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
public interface IFocusable : Object {
public abstract void focus_started ();
diff --git a/src/helper/util/StatefulTimer.vala b/src/daemon/util/StatefulTimer.vala
similarity index 99%
rename from src/helper/util/StatefulTimer.vala
rename to src/daemon/util/StatefulTimer.vala
index c443241..f041a41 100644
--- a/src/helper/util/StatefulTimer.vala
+++ b/src/daemon/util/StatefulTimer.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* A simple GTimer lookalike that keeps track of its own state.
diff --git a/src/helper/util/Util.vala b/src/daemon/util/Util.vala
similarity index 98%
rename from src/helper/util/Util.vala
rename to src/daemon/util/Util.vala
index cec24cf..2804525 100644
--- a/src/helper/util/Util.vala
+++ b/src/daemon/util/Util.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace BreakTimer.Helper {
+namespace BreakTimer.Daemon {
/**
* A collection of handy little functions that can't really be categorized,
diff --git a/src/meson.build b/src/meson.build
index 864fdf1..9940263 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,7 +16,7 @@ config_lib_dep = declare_dependency(
subdir('common')
subdir('settings')
-subdir('helper')
+subdir('daemon')
main_dependencies = [
cairo_dep,
@@ -47,7 +47,7 @@ executable(
executable(
'gnome-break-timer-service',
sources : [
- helper_sources
+ daemon_sources
],
dependencies : main_dependencies,
install: true,
diff --git a/src/settings/BreakManager.vala b/src/settings/BreakManager.vala
index 8cd7dcb..9f0c808 100644
--- a/src/settings/BreakManager.vala
+++ b/src/settings/BreakManager.vala
@@ -15,7 +15,7 @@
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
-// TODO: This intentionally resembles BreakManager from the helper
+// TODO: This intentionally resembles BreakManager from the daemon
// application. Ideally, it should be common code in the future.
namespace BreakTimer.Settings {
@@ -23,7 +23,7 @@ namespace BreakTimer.Settings {
public class BreakManager : Object {
private SettingsApplication application;
- private IBreakHelper break_helper;
+ private IBreakDaemon break_daemon;
private Gee.Map<string, BreakType> breaks;
private GLib.List<BreakType> breaks_ordered;
@@ -43,7 +43,7 @@ public class BreakManager : Object {
this.settings.bind ("selected-breaks", this, "selected-break-ids", SettingsBindFlags.DEFAULT);
// We choose not too send a signal when master_enabled changes because
- // we might be starting the break helper at the same time, so the
+ // we might be starting the break daemon at the same time, so the
// value of is_working () could fluctuate unpleasantly.
//this.notify["master-enabled"].connect ( () => { this.status_changed (); });
this.notify["master-enabled"].connect ( () => {
@@ -64,8 +64,8 @@ public class BreakManager : Object {
this.status_changed ();
- Bus.watch_name (BusType.SESSION, Config.HELPER_BUS_NAME, BusNameWatcherFlags.NONE,
- this.break_helper_appeared, this.break_helper_disappeared);
+ Bus.watch_name (BusType.SESSION, Config.DAEMON_BUS_NAME, BusNameWatcherFlags.NONE,
+ this.break_daemon_appeared, this.break_daemon_disappeared);
}
public Gee.Set<string> all_break_ids () {
@@ -77,10 +77,10 @@ public class BreakManager : Object {
}
/**
- * @returns true if the break helper is working correctly.
+ * @returns true if the break daemon is working correctly.
*/
public bool is_working () {
- return (this.master_enabled == false || this.breaks.size == 0 || this.break_helper != null);
+ return (this.master_enabled == false || this.breaks.size == 0 || this.break_daemon != null);
}
public BreakType? get_break_type_for_name (string name) {
@@ -111,43 +111,43 @@ public class BreakManager : Object {
this.status_changed ();
}
- private void break_helper_appeared () {
+ private void break_daemon_appeared () {
try {
- this.break_helper = Bus.get_proxy_sync (
+ this.break_daemon = Bus.get_proxy_sync (
BusType.SESSION,
- Config.HELPER_BUS_NAME,
- Config.HELPER_OBJECT_PATH,
+ Config.DAEMON_BUS_NAME,
+ Config.DAEMON_OBJECT_PATH,
DBusProxyFlags.DO_NOT_AUTO_START
);
this.break_status_available ();
} catch (IOError error) {
- this.break_helper = null;
- GLib.warning ("Error connecting to break helper service: %s", error.message);
+ this.break_daemon = null;
+ GLib.warning ("Error connecting to break daemon service: %s", error.message);
}
}
- private void break_helper_disappeared () {
- if (this.break_helper == null && this.master_enabled) {
- // Try to start break_helper automatically if it should be
+ private void break_daemon_disappeared () {
+ if (this.break_daemon == null && this.master_enabled) {
+ // Try to start break_daemon automatically if it should be
// running. Only do this once, if it was not running previously.
this.launch_break_timer_service ();
}
- this.break_helper = null;
+ this.break_daemon = null;
this.status_changed ();
}
private void launch_break_timer_service () {
- stdout.printf ("Trying to launch: %s\n", Config.HELPER_DESKTOP_FILE_ID);
- AppInfo helper_app_info = new DesktopAppInfo (Config.HELPER_DESKTOP_FILE_ID);
- stdout.printf ("helper_app_info: %s\n", helper_app_info.get_name());
- stdout.printf ("helper_app_info: %s\n", helper_app_info.get_commandline());
+ stdout.printf ("Trying to launch: %s\n", Config.DAEMON_DESKTOP_FILE_ID);
+ AppInfo daemon_app_info = new DesktopAppInfo (Config.DAEMON_DESKTOP_FILE_ID);
+ stdout.printf ("daemon_app_info: %s\n", daemon_app_info.get_name());
+ stdout.printf ("daemon_app_info: %s\n", daemon_app_info.get_commandline());
AppLaunchContext app_launch_context = new AppLaunchContext ();
try {
- helper_app_info.launch (null, app_launch_context);
+ daemon_app_info.launch (null, app_launch_context);
} catch (Error error) {
- GLib.warning ("Error launching helper application: %s", error.message);
+ GLib.warning ("Error launching daemon application: %s", error.message);
}
}
}
diff --git a/src/settings/SettingsApplication.vala b/src/settings/SettingsApplication.vala
index 4d42851..b7be9b4 100644
--- a/src/settings/SettingsApplication.vala
+++ b/src/settings/SettingsApplication.vala
@@ -70,7 +70,7 @@ public class SettingsApplication : Gtk.Application {
this.main_window.present ();
} else {
// Something may be wrong, but it could just be a delay before the
- // break helper starts. We'll wait before showing the main window.
+ // break daemon starts. We'll wait before showing the main window.
this.delayed_start ();
}
}
diff --git a/src/settings/TimerBreakType.vala b/src/settings/TimerBreakType.vala
index 742443d..1f00638 100644
--- a/src/settings/TimerBreakType.vala
+++ b/src/settings/TimerBreakType.vala
@@ -24,7 +24,7 @@ public abstract class TimerBreakType : BreakType {
public int[] interval_options;
public int[] duration_options;
- public IBreakHelper_TimerBreak? break_server;
+ public IBreakDaemon_TimerBreak? break_server;
protected TimerBreakType (string name, GLib.Settings settings) {
base (name, settings);
@@ -36,8 +36,8 @@ public abstract class TimerBreakType : BreakType {
public override void initialize () {
base.initialize ();
- Bus.watch_name (BusType.SESSION, Config.HELPER_BUS_NAME, BusNameWatcherFlags.NONE,
- this.breakhelper_appeared, this.breakhelper_disappeared);
+ Bus.watch_name (BusType.SESSION, Config.DAEMON_BUS_NAME, BusNameWatcherFlags.NONE,
+ this.breakdaemon_appeared, this.breakdaemon_disappeared);
}
protected new void update_status (TimerBreakStatus? status) {
@@ -65,9 +65,13 @@ public abstract class TimerBreakType : BreakType {
try {
return this.break_server.get_status ();
} catch (IOError error) {
- GLib.warning ("Error connecting to break helper service: %s", error.message);
+ GLib.warning ("Error connecting to break daemon service: %s", error.message);
return null;
} catch (GLib.DBusError error) {
+ // FIXME: This fails if we call this before the helper has
+ // initialized. We should either add a dbus service
+ // definition or look closer before printing a scary
+ // error message.
GLib.warning ("Error getting break status: %s", error.message);
return null;
}
@@ -76,25 +80,25 @@ public abstract class TimerBreakType : BreakType {
}
}
- private void breakhelper_appeared () {
+ private void breakdaemon_appeared () {
try {
this.break_server = Bus.get_proxy_sync (
BusType.SESSION,
- Config.HELPER_BUS_NAME,
- Config.HELPER_BREAK_OBJECT_BASE_PATH+this.id,
+ Config.DAEMON_BUS_NAME,
+ Config.DAEMON_BREAK_OBJECT_BASE_PATH+this.id,
DBusProxyFlags.DO_NOT_AUTO_START
);
- // We can only poll the break helper application for updates, so
+ // We can only poll the break daemon application for updates, so
// for responsiveness we update at a faster than normal rate.
this.update_timeout_id = Timeout.add (500, this.update_status_cb);
this.update_status_cb ();
} catch (IOError error) {
this.break_server = null;
- GLib.warning ("Error connecting to break helper service: %s", error.message);
+ GLib.warning ("Error connecting to break daemon service: %s", error.message);
}
}
- private void breakhelper_disappeared () {
+ private void breakdaemon_disappeared () {
if (this.update_timeout_id > 0) {
Source.remove (this.update_timeout_id);
this.update_timeout_id = 0;
diff --git a/tests/helper-util/helper_util_runner.vala b/tests/daemon-util/daemon_util_runner.vala
similarity index 100%
rename from tests/helper-util/helper_util_runner.vala
rename to tests/daemon-util/daemon_util_runner.vala
diff --git a/tests/helper-util/test_Countdown.vala b/tests/daemon-util/test_Countdown.vala
similarity index 100%
rename from tests/helper-util/test_Countdown.vala
rename to tests/daemon-util/test_Countdown.vala
diff --git a/tests/helper-util/test_StatefulTimer.vala b/tests/daemon-util/test_StatefulTimer.vala
similarity index 100%
rename from tests/helper-util/test_StatefulTimer.vala
rename to tests/daemon-util/test_StatefulTimer.vala
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]