[gnome-break-timer] Update po files



commit ef6126d9434f6a693a36fcb751284ae7bc4aa404
Author: Dylan McCall <dylan dylanmccall ca>
Date:   Thu Nov 19 17:42:55 2020 -0800

    Update po files

 po/POTFILES.in               |  42 ++--
 po/POTFILES.skip             |  13 --
 po/bs.po                     | 424 +++++++++++++++++++++-------------------
 po/cs.po                     | 414 ++++++++++++++++++++-------------------
 po/da.po                     | 414 ++++++++++++++++++++-------------------
 po/de.po                     | 428 ++++++++++++++++++++++-------------------
 po/el.po                     | 433 ++++++++++++++++++++++-------------------
 po/es.po                     | 418 +++++++++++++++++++++-------------------
 po/fr.po                     | 446 +++++++++++++++++++++++--------------------
 po/gl.po                     | 413 +++++++++++++++++++++------------------
 po/hu.po                     | 422 +++++++++++++++++++++-------------------
 po/id.po                     | 424 +++++++++++++++++++++-------------------
 po/lt.po                     | 421 +++++++++++++++++++++-------------------
 po/oc.po                     | 432 +++++++++++++++++++++--------------------
 po/pl.po                     | 415 +++++++++++++++++++++-------------------
 po/pt.po                     | 423 +++++++++++++++++++++-------------------
 po/pt_BR.po                  | 425 ++++++++++++++++++++++-------------------
 po/sl.po                     | 412 ++++++++++++++++++++-------------------
 po/sr.po                     | 418 +++++++++++++++++++++-------------------
 po/sr latin po               | 421 +++++++++++++++++++++-------------------
 po/sv.po                     | 402 +++++++++++++++++++++-----------------
 po/tr.po                     | 412 ++++++++++++++++++++-------------------
 po/zh_CN.po                  | 406 +++++++++++++++++++++------------------
 src/settings/MainWindow.vala |   1 +
 24 files changed, 4749 insertions(+), 4130 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index adafa64..7dafbf1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,19 +1,23 @@
-data/gnome-break-timer.appdata.xml.in
-data/gnome-break-timer-autostart.desktop.in
-data/gnome-break-timer.desktop.in
-data/gnome-break-timer-service.desktop.in
-data/org.gnome.BreakTimer.gschema.xml.in
-[type: gettext/glade]data/settings-panels.ui
-common/NaturalTime.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
-settings/RestBreakType.vala
-settings/SettingsApplication.vala
-settings/TimeChooser.vala
-settings/TimerBreakType.vala
+data/applications/org.gnome.BreakTimer.desktop.in
+data/applications/org.gnome.BreakTimer.Settings.desktop.in
+data/autostart/org.gnome.BreakTimer.desktop.in
+data/gschema/org.gnome.BreakTimer.gschema.xml.in
+data/metainfo/org.gnome.BreakTimer.metainfo.xml.in
+src/common/NaturalTime.vala
+src/daemon/Application.vala
+src/daemon/break/BreakView.vala
+src/daemon/microbreak/MicroBreakView.vala
+src/daemon/microbreak/MicroBreakView.vala
+src/daemon/restbreak/RestBreakView.vala
+src/settings/BreakSettingsDialog.vala
+src/settings/MainWindow.vala
+src/settings/microbreak/MicroBreakInfoWidget.vala
+src/settings/microbreak/MicroBreakInfoWidget.vala
+src/settings/microbreak/MicroBreakSettingsWidget.vala
+src/settings/microbreak/MicroBreakStatusWidget.vala
+src/settings/panels/WelcomePanel.vala
+src/settings/restbreak/RestBreakInfoWidget.vala
+src/settings/restbreak/RestBreakInfoWidget.vala
+src/settings/restbreak/RestBreakStatusWidget.vala
+src/settings/timerbreak/TimerBreakSettingsWidget.vala
+ui/settings-panels.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 6e70eb4..2b29f27 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,14 +1 @@
-common/NaturalTime.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
-settings/RestBreakType.c
-settings/TimeChooser.c
-settings/TimerBreakType.c
-settings/SettingsApplication.c
 tests
diff --git a/po/bs.po b/po/bs.po
index 9623a4b..336d098 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-02-27 07:04+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2015-01-30 08:32+0100\n"
 "Last-Translator: Samir Ribic <samir ribic etf unsa ba>\n"
 "Language-Team: Bosnian <bs li org>\n"
@@ -16,163 +15,113 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Launchpad (build 17341)\n"
 "X-Launchpad-Export-Date: 2015-02-15 06:20+0000\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Mjerač pauze"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Zapamtite da uzimate redovne pauze od korištenja kompjutera"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Mjerač pauze prati koliko često koristite kompjuter ,i podsjeća vas da "
-"uzimate redovne pauze. Dizajniran je da podstakne zdrave navike,sa raznim "
-"kratkim pauzama za vaše oči,zglobove kao i duže pauze kako bi održali vaše "
-"tijelo u pokretu i svjež um.</p> <p>Mjerač pauze se jednostavno podesi,tako "
-"da možete izabrati pauze kako vam odgovara a on će nastaviti sa radom u "
-"pozadini.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Pruža blagi podsjetnik za uzimanje redovnih pauza"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Odaberite postavke za male pauze i pauze za odmor"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Kompjterski podsjetnik pauza za aktivne misli"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "pauza;malo;odmor;mjerač;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Tačno za omogućeno GNOME Mjerač pauze"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Lista pauza koje su trenutno aktivne"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Tačno za uključenje tihog moda"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Sakrij pauze dok ne istekne tihi mod."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Vrijeme završetka tihog moda."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Vrijeme automatskog završenja tihog moda,u unix vremenu."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Vrijeme između pauza"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Vrijeme između pauza za odmor,u sekundama."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Trajanje svake pauze"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Trajanje između svake pauze za odmor,u sekundama."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Preferirano vrijeme između malih pauza,u sekundama."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Preferirano vrijeme između svake male pauze,u sekundama."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Mjerač pauze ne odgovara"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Ako se ovo nastavi sljedeći put kad se prijavite molimo <a href=\"https://";
-"bugs.launchpad.net/brainbreak\">open a bug report</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Mjerač pauze uzima pauzu"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Upali me kako bi se nastavile pauze"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Možete promijeniti tip pauza i njihovo vrijeme u postavkama"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Mjerač pauza vam dopušta da uzmete male pauze kao i veće pauze."
-
-#: ../data/settings-panels.ui.h:7
-msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
-msgstr "Male pauze su šansa da skrente pogled sa ekrana i odmorite ruke."
-
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Pune pauze su kad možete otići od kompjutera i malo prohodati."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pauze i male pauze"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Možeš mi to ostaviti"
+"<p>Mjerač pauze prati koliko često koristite kompjuter ,i podsjeća vas da "
+"uzimate redovne pauze. Dizajniran je da podstakne zdrave navike,sa raznim "
+"kratkim pauzama za vaše oči,zglobove kao i duže pauze kako bi održali vaše "
+"tijelo u pokretu i svjež um.</p> <p>Mjerač pauze se jednostavno podesi,tako "
+"da možete izabrati pauze kako vam odgovara a on će nastaviti sa radom u "
+"pozadini.</p>"
 
-#: ../data/settings-panels.ui.h:11
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Break Timer will carry on working in the background, even if you close it."
-msgstr "Mjerač pauza će nastaviti sa radom u pozadini čak iako ga zatvorite."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Dobro došli u Mjerač pauza!"
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
+msgstr ""
 
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Pauze su dobre za vas. Mi ćemo vam pomoći da ih uzimate."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
+msgstr ""
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Samo me upali kako bi počeli"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -180,7 +129,7 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekunde"
 msgstr[2] "%d sekundi"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -188,7 +137,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minute"
 msgstr[2] "%d minuta"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -196,35 +145,34 @@ msgstr[0] "%d sat"
 msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME Mjerač pauze"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Šta bih trebao uraditi?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Hvala"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Preskoči ovaj"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Vrijeme je za malu pauzu"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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 +180,36 @@ 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Zakašnjela mala pauza"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Pauza je gotova"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Vaša mala pauza je gotova"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Podsjeti me kasnije"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Vrijeme je za pauzu"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, c-format
 msgid "There is %s remaining in your break"
 msgid_plural "There are %s remaining in your break"
@@ -273,12 +217,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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, c-format
 msgid "You were due to take a break %s ago"
 msgid_plural "You were due to take a break %s ago"
@@ -286,66 +230,74 @@ msgstr[0] "Trebali ste uzeti pauzu prije %s"
 msgstr[1] "Trebali ste uzeti pauzu prije %s"
 msgstr[2] "Trebali ste uzeti pauzu prije %s"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Zakašnjela pauza"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Vrijeme za vašu pauzu je završilo"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Izaberite vaš raspored pauza"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Miješanje dugih i kratih pauza"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Povremene duge pauze"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Česte kratke pauze"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "O programu"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Izlaz"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Dobro došli obilazak"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Kompjterski podsjetnik pauza za aktivne misli"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Internet stranica GNOME Mjerača pauza"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "   Dijelila Halać https://launchpad.net/~delila94\n";
 "  Samir Ribić https://launchpad.net/~megaribi";
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "OK,shvatio sam!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Spreman za polazak"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Mala pauza"
 
-#. %s will bje replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or 
"1 hour"
-#: ../settings/MicroBreakType.vala:65
+#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -353,33 +305,41 @@ msgstr[0] "Uzmite pauzu od kucanja i skrenite pogled sa ekrana za %s."
 msgstr[1] "Uzmite pauzu od kucanja i skrenite pogled sa ekrana za %s."
 msgstr[2] "Uzmite pauzu od kucanja i skrenite pogled sa ekrana za %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Vrijeme je za malu pauzu"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Ja ću zazvoniti kada je vrijeme da se opet koristi kompjuter."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Pauziraj često kako bi odmorili oči"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Vaša sljedeća mala pauza je za"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Vrijeme je za malu pauzu"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Pauziraj često kako bi odmorili oči"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "OK,shvatio sam!"
+
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Spreman za polazak"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Pauza"
 
-#. %s will bje replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or 
"1 hour"
-#: ../settings/RestBreakType.vala:66
+#. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -387,45 +347,113 @@ msgstr[0] "Vaša pauza ima još %s. Podsjetit ću vas kad je gotova."
 msgstr[1] "Vaša pauza ima još %s. Podsjetit ću vas kad je gotova."
 msgstr[2] "Vaša pauza ima još %s. Podsjetit ću vas kad je gotova."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Vrijeme je za pauzu"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Uzmite malo vremena bez kompjutera.Protegnite se i malo prohodajte."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Vaša sljedeća puna pauza je za"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Vrijeme je pauze"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Puna pauza"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "I uzmite nešto duže pauze kako bi protegnuli noge"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "O programu"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Izlaz"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Svaki"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Za"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Mjerač pauze ne odgovara"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Ako se ovo nastavi sljedeći put kad se prijavite molimo <a href=\"https://";
+"bugs.launchpad.net/brainbreak\">open a bug report</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Mjerač pauze uzima pauzu"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Upali me kako bi se nastavile pauze"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Možete promijeniti tip pauza i njihovo vrijeme u postavkama"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Mjerač pauza vam dopušta da uzmete male pauze kao i veće pauze."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr "Male pauze su šansa da skrente pogled sa ekrana i odmorite ruke."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Pune pauze su kad možete otići od kompjutera i malo prohodati."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pauze i male pauze"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Možeš mi to ostaviti"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr "Mjerač pauza će nastaviti sa radom u pozadini čak iako ga zatvorite."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Dobro došli u Mjerač pauza!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Pauze su dobre za vas. Mi ćemo vam pomoći da ih uzimate."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Samo me upali kako bi počeli"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Zapamtite da uzimate redovne pauze od korištenja kompjutera"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Pruža blagi podsjetnik za uzimanje redovnih pauza"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Odaberite postavke za male pauze i pauze za odmor"
+
+#~ msgid "Thank you"
+#~ msgstr "Hvala"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Uzmite trenutak kako bi odmorili svoje oči"
+
+#~ msgid "Full break"
+#~ msgstr "Puna pauza"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "I uzmite nešto duže pauze kako bi protegnuli noge"
diff --git a/po/cs.po b/po/cs.po
index b99a330..12c7df2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-09-09 21:23+0200\n"
 "Last-Translator: Marek Černocký <marek manet cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
@@ -19,160 +18,108 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Hlídání přestávek"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Pamatujte na pravidelné přestávky při práci na počítači"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Hlídání přestávek sleduje, jak moc pracujete na počítači a vyzývá vás, "
-"abyste si dělali pravidelné přestávky. Jeho cílem je přimět vás ke zdravému "
-"chování kombinací krátkých přestávek pro vaše oči a zápěstí a dlouhých "
-"přestávek pro pohyb těla i odpočinutí mysli od úkolu.</p> <p>Hlídání "
-"přestávek se dá snadno nastavit, takže si můžete zvolit plán přestávek, "
-"který vám bude vyhovovat a na pozadí se starat za vás.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Poskytuje nevtíravé upomínky na pravidelné přestávky"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Nastavte si mikropřestávky a odpočinkové přestávky podle svých potřeb"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Upomínání na počítačové přestávky pro zachování svěží mysli"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "přestávka;pauza;mikro;krátká;přerušení;odpočinek;hlídání;plánování;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Zapnutím povolíte Hlídání přestávek GNOME"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Seznam přestávek, které jsou aktuálně povoleny"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Zapnutím povolíte tichý režim"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Skryje přestávky na dobu quiet-mode-expire-time."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Doba do konce tichého režimu."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Doba do automatického vypnutí tichého režimu, jako unixový čas."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Doba mezi přestávkami"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Doba mezi odpočinkovými přestávkami, v sekundách."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Délka každé přestávky"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Délka trvání každé odpočinkové přestávky, v sekundách."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Požadovaná doba mezi mikropřestávkami, v sekundách."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Požadovaná délka trvání každé mikropřestávky, v sekundách."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Hlídání přestávek nereaguje"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Jestli se stejná situace bude opakovat i po příštím přihlášení, <a href="
-"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>nahlaste chybu</a> prosím."
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Hlídání přestávek si dělá přestávku"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Zapněte jej prosím, aby přestávky zase běžely"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "V nastavení můžete změnit typ přestávek a jejich načasování"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Hlídání přestávek vás přiměje dávat si krátké i delší přestávky."
+"<p>Hlídání přestávek sleduje, jak moc pracujete na počítači a vyzývá vás, "
+"abyste si dělali pravidelné přestávky. Jeho cílem je přimět vás ke zdravému "
+"chování kombinací krátkých přestávek pro vaše oči a zápěstí a dlouhých "
+"přestávek pro pohyb těla i odpočinutí mysli od úkolu.</p> <p>Hlídání "
+"přestávek se dá snadno nastavit, takže si můžete zvolit plán přestávek, "
+"který vám bude vyhovovat a na pozadí se starat za vás.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Mikropřestávky jsou příležitostí podívat se jinam než na obrazovku a dát "
-"odpočinout svým rukám."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Plné přestávky jsou časem na to, abyste opustili počítače a prošli se."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Přestávky a mikropřestávky"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Aplikaci můžete opustit"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
-msgstr "Hlídání přestávek zůstane pracovat na pozadí, i když jej zavřete."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Vítejte v Hlídání přestávek!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Přestávky jsou pro vaše dobro. Pomůžeme vám je dodržovat."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
+msgstr ""
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Abyste začali, stačí zde zapnout"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -180,7 +127,7 @@ msgstr[0] "%d sekundu"
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -188,7 +135,7 @@ msgstr[0] "%d minutu"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -196,35 +143,34 @@ msgstr[0] "%d hodinu"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Hlídání přestávek GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Co bych měl dělat?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Díky"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Tuto přeskočit"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Je čas na mikropřestávku"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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 +178,36 @@ 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Odložená mikropřestávka"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Přestávka skončila"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Vaše mikropřestávka skončila"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Upozornit mě později"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Čas na přestávku"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, c-format
 msgid "There is %s remaining in your break"
 msgid_plural "There are %s remaining in your break"
@@ -273,12 +215,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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, c-format
 msgid "You were due to take a break %s ago"
 msgid_plural "You were due to take a break %s ago"
@@ -286,64 +228,72 @@ 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Odložená přestávka"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Čas vaší přestávky skončil"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Zvolte plán svých přestávek"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Střídat krátké a dlouhé přestávky"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Občasné dlouhé přestávky"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Časté krátké přestávky"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "O aplikaci"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Ukončit"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Úvodní průvodce"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Upomínání na počítačové přestávky pro zachování svěží mysli"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Webové stránky Hlídání přestávek GNOME"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr "Marek Černocký <marek manet cz>"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "Dobrá, mám to!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Jsem připraven jít na to"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Mikropřestávka"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -351,33 +301,41 @@ msgstr[0] "Udělejte si přestávku v psaní a dívejte se mimo obrazovku na %s.
 msgstr[1] "Udělejte si přestávku v psaní a dívejte se mimo obrazovku na %s."
 msgstr[2] "Udělejte si přestávku v psaní a dívejte se mimo obrazovku na %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Je čas mikropřestávky"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Zvukové znamení vás upozorní, až bude zase čas používat počítač."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Dělejte si často pauzy, aby si odpočinuly oči"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Vaše další mikropřestávka je za"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Je čas na mikropřestávku"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Dělejte si často pauzy, aby si odpočinuly oči"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Dobrá, mám to!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Jsem připraven jít na to"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Přestávka"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -385,45 +343,117 @@ msgstr[0] "Do konce přestávky máte %s. Na její konec budete upozorněni."
 msgstr[1] "Do konce přestávky máte %s. Na její konec budete upozorněni."
 msgstr[2] "Do konce přestávky máte %s. Na její konec budete upozorněni."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Je čas přestávky"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Sem tam odejděte od počítače. Protáhněte se a projděte se."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Vaše další plná přestávka je za"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Je čas přestávky"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Plná přestávka"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "A dělejte si nějaké delší přestávky, abyste si protáhli nohy"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "O aplikaci"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Ukončit"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Opakovat za"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Na "
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Hlídání přestávek nereaguje"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Jestli se stejná situace bude opakovat i po příštím přihlášení, <a href="
+"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>nahlaste chybu</"
+"a> prosím."
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Hlídání přestávek si dělá přestávku"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Zapněte jej prosím, aby přestávky zase běžely"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "V nastavení můžete změnit typ přestávek a jejich načasování"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Hlídání přestávek vás přiměje dávat si krátké i delší přestávky."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Mikropřestávky jsou příležitostí podívat se jinam než na obrazovku a dát "
+"odpočinout svým rukám."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Plné přestávky jsou časem na to, abyste opustili počítače a prošli se."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Přestávky a mikropřestávky"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Aplikaci můžete opustit"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr "Hlídání přestávek zůstane pracovat na pozadí, i když jej zavřete."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Vítejte v Hlídání přestávek!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Přestávky jsou pro vaše dobro. Pomůžeme vám je dodržovat."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Abyste začali, stačí zde zapnout"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Pamatujte na pravidelné přestávky při práci na počítači"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Poskytuje nevtíravé upomínky na pravidelné přestávky"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr ""
+#~ "Nastavte si mikropřestávky a odpočinkové přestávky podle svých potřeb"
+
+#~ msgid "Thank you"
+#~ msgstr "Díky"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Věnujte chvíli odpočinku svých očí"
+
+#~ msgid "Full break"
+#~ msgstr "Plná přestávka"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "A dělejte si nějaké delší přestávky, abyste si protáhli nohy"
diff --git a/po/da.po b/po/da.po
index c5f6551..4dc0f7c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2016-11-22 20:24+0100\n"
 "Last-Translator: Alan Mortensen <alanmortensen am gmail com>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -20,311 +19,267 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Pausetimer"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Husk at holde regelmæssige pauser fra computeren"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Pausetimer holder styr på hvor meget du bruger computeren og den minder "
-"dig om at holde regelmæssige pauser. Den er designet til at opfordre til "
-"sund opførsel, med en blanding af korte pauser til dine øjne og håndled, "
-"samt længere pauser til at holde din krop i gang og dine tanker fokuseret på "
-"opgaven.</p> <p>Pausetimer er nemt at sætte op, så du kan vælge en "
-"pauseplan, som fungerer for dig og den vil derefter fortsætte med at arbejde "
-"i baggrunden.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Giver en blid påmindelse om at tage regelmæssige pauser"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Vælg dine præferencer for mikropauser og afslapningspauser"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Computer pausepåminder for aktive hjerner"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "pause;mikro;afslapning;timer;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Sand for at aktivere GNOME Pausetimer"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Listen over pauser, som i øjeblikket er aktiveret"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Sand for at aktivere stilletilstand"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Skjuler pauser indtil quiet-mode-expire-time."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Tid til at forlade stilletilstand."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Tiden, i unix-tid, til at deaktivere stilletilstand automatisk."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Tid mellem pauser"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Tiden mellem afslapningspauser i sekunder."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Længde af hver pause"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Længden af hver afslapningspause i sekunder."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Den foretrukne tid mellem mikropauser i sekunder."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Den foretrukne længde af hver mikropause i sekunder."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Pausetimer svarer ikke"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Hvis dette fortsætter næste gang du logger ind, så <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">opret venligst en fejlrapport</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Pausetimer tager en pause"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Tænd mig for at få pauserne i gang"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Du kan ændre pausetyperne og deres tider i indstillingerne"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Pausetimer lader dig både tage små mikropauser og længere pauser."
+"<p>Pausetimer holder styr på hvor meget du bruger computeren og den minder "
+"dig om at holde regelmæssige pauser. Den er designet til at opfordre til "
+"sund opførsel, med en blanding af korte pauser til dine øjne og håndled, "
+"samt længere pauser til at holde din krop i gang og dine tanker fokuseret på "
+"opgaven.</p> <p>Pausetimer er nemt at sætte op, så du kan vælge en "
+"pauseplan, som fungerer for dig og den vil derefter fortsætte med at arbejde "
+"i baggrunden.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Mikropauser er en mulighed for at kigge væk fra skærmen og slappe af i dine "
-"hænder."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Hele pauser er tid til at komme væk fra computeren og bevæge dig rundt."
 
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pauser og mikropauser"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Du kan lade mig gøre det"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
 msgstr ""
-"Pausetimer vil fortsætte med at arbejde i baggrunden selvom du lukker den."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Velkommen til Pausetimer!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Pauser er gode for dig. Vi vil hjælpe dig med at holde dem."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Bare tænd mig for at komme i gang"
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutter"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME Pausetimer"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Hvad skal jeg gøre?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Tak"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Spring denne over"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Det er tid til en mikropause"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Forsinket mikropause"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Pausen er slut"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Din mikropause er slut"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Påmind mig senere"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Tid til en pause"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Forsinket pause"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Din pausetid er slut"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Vælg din pauseplan"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Luk"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "En blanding af korte pauser og lange pauser"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Lange pauser en gang i mellem"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Hyppige korte pauser"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Om"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Afslut"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Velkommenrundvisning"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Computer pausepåminder for aktive hjerner"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "GNOME Pausetimers webside"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Kris Thomsen, 2013.\n"
@@ -333,53 +288,54 @@ msgstr ""
 "Dansk-gruppen <dansk dansk-gruppen dk>\n"
 "Mere info: http://www.dansk-gruppen.dk";
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "O.K., forstået!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Klar til start"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Mikropause"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "Tag en pause fra at skrive og kig væk fra skærmen i %s."
 msgstr[1] "Tag en pause fra at skrive og kig væk fra skærmen i %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Det mikropausetid"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Jeg ringer, når det er tid til at bruge computeren igen."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Hold pause ofte for at slappe af i øjnene"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Din næste mikropause er om"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Det er tid til en mikropause"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Hold pause ofte for at slappe af i øjnene"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "O.K., forstået!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Klar til start"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Pause"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -388,49 +344,121 @@ msgstr[0] ""
 msgstr[1] ""
 "Der er %s tilbage af din pause. Jeg minder dig om det, når tiden er gået."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Der er pausetid"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Tag noget tid væk fra computeren. Stræk ud og bevæg dig rundt."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Din næste hele pause er om"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Det er pausetid"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Hel pause"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Og tag nogen længere pauser for at strække dine ben"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "Om"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Afslut"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Hver"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "For"
 
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Pausetimer svarer ikke"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Hvis dette fortsætter næste gang du logger ind, så <a href=\"https://bugs.";
+"launchpad.net/brainbreak\">opret venligst en fejlrapport</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Pausetimer tager en pause"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Tænd mig for at få pauserne i gang"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Du kan ændre pausetyperne og deres tider i indstillingerne"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Pausetimer lader dig både tage små mikropauser og længere pauser."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Mikropauser er en mulighed for at kigge væk fra skærmen og slappe af i dine "
+"hænder."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"Hele pauser er tid til at komme væk fra computeren og bevæge dig rundt."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pauser og mikropauser"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Du kan lade mig gøre det"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Pausetimer vil fortsætte med at arbejde i baggrunden selvom du lukker den."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Velkommen til Pausetimer!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Pauser er gode for dig. Vi vil hjælpe dig med at holde dem."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Bare tænd mig for at komme i gang"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Husk at holde regelmæssige pauser fra computeren"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Giver en blid påmindelse om at tage regelmæssige pauser"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Vælg dine præferencer for mikropauser og afslapningspauser"
+
+#~ msgid "Thank you"
+#~ msgstr "Tak"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Tag et øjeblik til at slappe af i dine øjne"
+
+#~ msgid "Full break"
+#~ msgstr "Hel pause"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "Og tag nogen længere pauser for at strække dine ben"
+
 #~ msgid "Copyright © Dylan McCall"
 #~ msgstr "Ophavsret © Dylan McCall"
 
diff --git a/po/de.po b/po/de.po
index 2f248f7..5440f6b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2016-03-21 21:53+0100\n"
 "Last-Translator: Mario Blättermann <mario blaettermann gmail com>\n"
 "Language-Team: German <gnome-de gnome org>\n"
@@ -21,254 +20,189 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Pausenerinnerung"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Erinnerung an regelmäßige Pausen beim Arbeiten mit Rechnern"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Die Pausenerinnerung überwacht, wie intensiv Sie Ihren Rechner nutzen und "
-"erinnert Sie daran, regelmäßig Pausen einzulegen. Das Programm ist darauf "
-"ausgelegt, gesundheitsbewusstes Verhalten zu fördern, mit einer Mischung aus "
-"Kurzpausen für Augen und Handgelenke sowie längeren Pausen, in denen Sie "
-"sich körperlich bewegen und Ihren Geist auf die Aufgaben konzentrieren "
-"können.</p> <p>Die Pausenerinnerungen lassen sich einfach einrichten, so "
-"dass Sie eine Pausenplanung auswählen können, die zu Ihnen passt und alles "
-"Weitere im Hintergund abläuft.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Bietet eine angenehme Erinnerung an regelmäßige Pausen"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Richten Sie die Einstellungen für Ihre Kurz- und Ruhepausen ein"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Erinnerung für Arbeitspausen für aktive Köpfe"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "Pause;Kurzpause;Rast;Ruhen;Unterbrechung;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Legt fest, ob Pausenerinnerungen aktiviert werden sollen"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Liste der Pausen, welche zur Zeit aktiviert sind"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Legt fest, ob der Stumm-Modus aktiviert werden soll"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Unterbricht Pausen, bis quiet-mode-expire-time erreicht ist."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Ende des Stumm-Modus."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr ""
 "Die Zeit zur automatischen Dekativierung des Stumm-Modus als Unix-Zeitangabe."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Zeit zwischen den Pausen"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Die Zeit zwischen den Ruhepausen in Sekunden."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Dauer jeder Pause"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Die Dauer jeder Ruhepause in Sekunden."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Bevorzugte Zeit zwischen Kurzpausen, in Sekunden."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Bevorzugte Dauer der Kurzpausen, in Sekunden."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Pausenerinnerung reagiert nicht"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Falls dies nach der nächsten Anmeldung immer noch der Fall ist, <a href="
-"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>erstellen Sie bitte einen "
-"Fehlerbericht</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Pausenerinnerung macht Pause"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Einschalten, um diese Pausen einzuhalten"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr ""
-"Sie können die Pausenart und die Zeiten in den Einstellungen bearbeiten"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Pausenerinnerung gibt Ihnen die Möglichkeit, Kurzpausen und längere Pausen "
-"einzulegen."
+"<p>Die Pausenerinnerung überwacht, wie intensiv Sie Ihren Rechner nutzen und "
+"erinnert Sie daran, regelmäßig Pausen einzulegen. Das Programm ist darauf "
+"ausgelegt, gesundheitsbewusstes Verhalten zu fördern, mit einer Mischung aus "
+"Kurzpausen für Augen und Handgelenke sowie längeren Pausen, in denen Sie "
+"sich körperlich bewegen und Ihren Geist auf die Aufgaben konzentrieren "
+"können.</p> <p>Die Pausenerinnerungen lassen sich einfach einrichten, so "
+"dass Sie eine Pausenplanung auswählen können, die zu Ihnen passt und alles "
+"Weitere im Hintergund abläuft.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Kurzpausen sind eine Möglichkeit, vom Bildschirm wegzuschauen und Ihre Hände "
-"auszuruhen."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Pausen bieten Ihnen die Zeit, sich vom Rechner zu entfernen und "
-"herumzubewegen."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pausen und Kurzpausen"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Sie können sich auf mich verlassen"
 
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
 msgstr ""
-"Die Pausenerinnerung läuft auch dann im Hintergrund weiter, wenn Sie sie "
-"schließen."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Willkommen zur Pausenerinnerung!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Pausen sind gut für Sie. Wir wollen Ihnen helfen, diese wahrzunehmen."
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Schalten sie mich einfach ein, um zu beginnen"
-
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME Pausenerinnerung"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Was sollen Sie machen?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Vielen Dank"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Überspringen"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Es ist Zeit für eine Kurzpause"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Kurzpause überfällig"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Pause ist vorbei"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Ihre Kurzpause ist zu Ende"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Später erinnern"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Es ist Zeit für eine Pause"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 msgid ""
 "It’s time to take a break. Get away from the computer for a little while!"
 msgstr ""
@@ -276,166 +210,260 @@ msgstr ""
 "weg!"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Überfällige Pause"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Ihre Pausenzeit ist zu Ende"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Wählen Sie Ihren Pausenplan"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Eine Mischung aus kurzen und langen Pausen"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Gelegentliche lange Pausen"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Häufige kurze Pausen"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Info"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Willkommen-Tour"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Erinnerung für Arbeitspausen für aktive Köpfe"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Webseite der GNOME Pausenerinnerung"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Christian Kirbach <Christian Kirbach gmail com>\n"
 "Benjamin Steinwender <b stbe at>\n"
 "Mario Blättermann <mario blaettermann gmail com>"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "OK, verstanden!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Los geht's"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Kurzpause"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "Legen Sie eine Pause ein und schauen Sie für %s vom Bildschirm weg."
 msgstr[1] "Legen Sie eine Pause ein und schauen Sie für %s vom Bildschirm weg."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Zeit für eine Kurzpause"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Ich werde läuten, wenn es Zeit ist, den Computer wieder zu verwenden."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Machen Sie häufig Pausen, um Ihre Augen zu entspannen"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Ihre nächste Kurzpause ist in"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Es ist Zeit für eine Kurzpause"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Machen Sie häufig Pausen, um Ihre Augen zu entspannen"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "OK, verstanden!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Los geht's"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Pause"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "Ihre Pause dauert noch %s. Ich erinnere Sie, wenn sie vorbei ist."
 msgstr[1] "Ihre Pause dauert noch %s. Ich erinnere Sie, wenn sie vorbei ist."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Es ist Zeit für eine Pause"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Gehen Sie einige Zeit von Ihrem Rechner weg. Dehnen Sie sich und bewegen Sie "
 "sich herum."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Ihre nächste Pause ist in"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Es ist Zeit für eine Pause"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Volle Pause"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Und machen Sie einige längere Pausen, um Ihre Beine zu strecken"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "Info"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Beenden"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Jede"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Für"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Pausenerinnerung reagiert nicht"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Falls dies nach der nächsten Anmeldung immer noch der Fall ist, <a href="
+"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>erstellen Sie "
+"bitte einen Fehlerbericht</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Pausenerinnerung macht Pause"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Einschalten, um diese Pausen einzuhalten"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr ""
+"Sie können die Pausenart und die Zeiten in den Einstellungen bearbeiten"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"Pausenerinnerung gibt Ihnen die Möglichkeit, Kurzpausen und längere Pausen "
+"einzulegen."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Kurzpausen sind eine Möglichkeit, vom Bildschirm wegzuschauen und Ihre Hände "
+"auszuruhen."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"Pausen bieten Ihnen die Zeit, sich vom Rechner zu entfernen und "
+"herumzubewegen."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pausen und Kurzpausen"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Sie können sich auf mich verlassen"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Die Pausenerinnerung läuft auch dann im Hintergrund weiter, wenn Sie sie "
+"schließen."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Willkommen zur Pausenerinnerung!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Pausen sind gut für Sie. Wir wollen Ihnen helfen, diese wahrzunehmen."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Schalten sie mich einfach ein, um zu beginnen"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Erinnerung an regelmäßige Pausen beim Arbeiten mit Rechnern"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Bietet eine angenehme Erinnerung an regelmäßige Pausen"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Richten Sie die Einstellungen für Ihre Kurz- und Ruhepausen ein"
+
+#~ msgid "Thank you"
+#~ msgstr "Vielen Dank"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Nehmen Sie sich einige Zeit, um Ihre Augen auszuruhen"
+
+#~ msgid "Full break"
+#~ msgstr "Volle Pause"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "Und machen Sie einige längere Pausen, um Ihre Beine zu strecken"
diff --git a/po/el.po b/po/el.po
index 30f7b84..fd30e1d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2016-03-16 17:30+0200\n"
 "Last-Translator: Yannis Koutsoukos <giankoyt gmail com>\n"
 "Language-Team: www.gnome.gr\n"
@@ -19,343 +18,285 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Χρονομετρητής διαλείμματος"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Υπενθύμιση λήψης τακτικών διαλειμμάτων από τη χρήση του υπολογιστή"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Ο χρονομετρητής διαλειμμάτων παρακολουθεί πόσο χρησιμοποιείτε τον "
-"υπολογιστή και σας υπενθυμίζει να κάνετε τακτικά διαλείμματα. Σχεδιάστηκε "
-"για να ενθαρρύνει την υγιή συμπεριφορά, με μια ανάμειξη σύντομων "
-"διαλειμμάτων για τα μάτια και τους καρπούς σας, καθώς και για μεγαλύτερα "
-"διαλείμματα για να κρατάτε το σώμα σας σε κίνηση και το μυαλό σας στην "
-"εργασία.</p> <p>Ο χρονομετρητής διαλειμμάτων είναι απλός στη ρύθμιση κι έτσι "
-"μπορείτε να επιλέξετε ένα προγραμματισμό διαλειμμάτων που ταιριάζει για σας "
-"και θα δουλεύει στο παρασκήνιο.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Παρέχει μια ευγενική υπενθύμιση για να κάνετε τακτικά διαλείμματα"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr ""
-"Επιλέξτε τις προτιμήσεις σας για μικρά διαλείμματα και διαλείμματα ξεκούρασης"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Υπενθυμίσεις διακοπής υπολογιστή για ενεργά μυαλά"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "διάλειμμα;μικρό;ανάπαυση;χρονομετρητής;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Αληθές για ενεργοποίηση του χρονομετρητή διαλείμματος GNOME"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Ο κατάλογος διαλειμμάτων που είναι ενεργοποιημένοι τώρα"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Αληθές για ενεργοποίηση σιωπηρής λειτουργίας"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Κρύβει τα διαλείμματα μέχρι τη λήξη-χρόνου-σιωπηρής-λειτουργίας."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Υπολειπόμενος χρόνος σιωπηρής λειτουργίας."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr ""
 "Ο υπολειπόμενος χρόνος για αυτόματη απενεργοποίηση σιωπηρής λειτουργίας, σε "
 "χρόνο Γιούνιξ."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Χρόνος μεταξύ των διαλειμμάτων"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Ο χρόνος μεταξύ των διαλειμμάτων ανάπαυσης, σε δευτερόλεπτα."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Διάρκεια κάθε διαλείμματος"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Η διάρκεια της κάθε διαλείμματος ανάπαυσης, σε δευτερόλεπτα."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Ο προτιμώμενος χρόνος μεταξύ μικρών διαλειμμάτων, σε δευτερόλεπτα."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Η προτιμώμενη διάρκεια κάθε μικρού διαλείμματος, σε δευτερόλεπτα."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Ο χρονομετρητής διαλείμματος δεν αποκρίνεται"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Αν αυτό συνεχίζεται την επόμενη φορά που θα συνδεθείτε, παρακαλούμε <a href="
-"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>ανοίξτε μια αναφορά σφάλματος</a>."
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Ο χρονομετρητής διαλείμματος κάνει διάλειμμα"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Ενεργοποιήστε με για να συνεχίσετε"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr ""
-"Μπορείτε να αλλάξετε τους τύπους των διαλειμμάτων και τους χρονισμούς τους "
-"από τις ρυθμίσεις"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Ο χρονομετρητής διαλειμμάτων σας επιτρέπει να κάνετε μικροδιαλείμματα καθώς "
-"και μεγαλύτερα διαλείμματα."
+"<p>Ο χρονομετρητής διαλειμμάτων παρακολουθεί πόσο χρησιμοποιείτε τον "
+"υπολογιστή και σας υπενθυμίζει να κάνετε τακτικά διαλείμματα. Σχεδιάστηκε "
+"για να ενθαρρύνει την υγιή συμπεριφορά, με μια ανάμειξη σύντομων "
+"διαλειμμάτων για τα μάτια και τους καρπούς σας, καθώς και για μεγαλύτερα "
+"διαλείμματα για να κρατάτε το σώμα σας σε κίνηση και το μυαλό σας στην "
+"εργασία.</p> <p>Ο χρονομετρητής διαλειμμάτων είναι απλός στη ρύθμιση κι έτσι "
+"μπορείτε να επιλέξετε ένα προγραμματισμό διαλειμμάτων που ταιριάζει για σας "
+"και θα δουλεύει στο παρασκήνιο.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Τα μικροδιαλείμματα είναι μια ευκαιρία να κοιτάξετε έξω από την οθόνη και να "
-"ξεκουράσετε τα χέρια σας."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Τα πλήρη διαλείμματα είναι χρόνος να φύγετε από τον υπολογιστή και να "
-"μετακινηθείτε."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Διαλείμματα και μικροδιαλείμματα"
 
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Μπορείτε να με αφήσετε"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
 msgstr ""
-"Ο χρονομετρητής διαλειμμάτων θα συνεχίσει να δουλεύει στο παρασκήνιο, ακόμα "
-"κι αν τον κλείσετε."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Καλώς ήρθατε στον χρονομετρητή διαλειμμάτων!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Τα διαλείμματα είναι καλά για σας. Θα σας βοηθήσουμε να τα κάνετε."
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Απλά ενεργοποιήστε με για να ξεκινήσετε"
-
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d δευτερόλεπτo"
 msgstr[1] "%d δευτερόλεπτα"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d λεπτό"
 msgstr[1] "%d λεπτά"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ώρα"
 msgstr[1] "%d ώρες"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Χρονομετρητής διαλειμμάτων GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Τι πρέπει να κάνω;"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Σας ευχαριστούμε"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Παράλειψη αυτού του διαλείμματος"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Είναι ώρα για ένα μικρό διάλειμμα"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Καθυστερημένο μικρό διάλειμμα"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Το διάλειμμα τελείωσε"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Το μικρο διάλειμμα σας τελείωσε"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Υπενθύμιση αργότερα"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Ώρα για διάλειμμα"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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 στο διάλειμμά σας"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Καθυστερημένο διάλειμμα"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Ο χρόνος διαλείμματός σας τελείωσε"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Επιλέξτε τον προγραμματισμό διαλείμματος"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Ένα μείγμα από σύντομα και μεγάλα διαλείμματα"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Ευκαιριακά μεγάλα διαλείμματα"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Συχνά σύντομα διαλείμματα"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Περί"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Έξοδος"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Περιήγηση καλωσορίσματος"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Υπενθυμίσεις διακοπής υπολογιστή για ενεργά μυαλά"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Ιστότοπος χρονομετρητή διαλειμμάτων GNOME"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Ελληνική μεταφραστική ομάδα του GNOME\n"
 " Δημήτρης Σπίγγος <dmtrs32 gmail com>\n"
 "Για περισσότερα δείτε: http://gnome.gr";
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "Εντάξει, ξεκινήστε!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Έτοιμοι να ξεκινήσετε"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Μικροδιάλειμμα"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -366,33 +307,41 @@ msgstr[1] ""
 "Κάντε ένα διάλειμμα από την πληκτρολόγηση και κοιτάξτε μακριά από την οθόνη "
 "για %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Είναι ώρα για μικροδιάλειμμα"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Θα κτυπήσω όταν είναι ώρα να ξαναχρησιμοποιήσετε τον υπολογιστή."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Συχνές διακοπές για να ξεκουράσετε τα μάτια σας"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Το επόμενο μικροδιάλειμμά σας είναι σε"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Είναι ώρα για ένα μικροδιάλειμμα"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Συχνές διακοπές για να ξεκουράσετε τα μάτια σας"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Εντάξει, ξεκινήστε!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Έτοιμοι να ξεκινήσετε"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Διάλειμμα"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -401,46 +350,128 @@ msgstr[0] ""
 msgstr[1] ""
 "Υπολείπονται %s για το διάλειμμά σας. Θα σας το θυμίσω όταν τελειώσει."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Είναι ώρα για διάλειμμα"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Πάρτε λίγο χρόνο μακριά από τον υπολογιστή. Τεντωθείτε και μετακινηθείτε."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Το επόμενο πήρες διάλειμμά σας είναι σε"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Είναι ώρα για διάλειμμα"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Πλήρες διάλειμμα"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Και πάρτε κάποια μεγαλύτερα διαλείμματα για να τεντώσετε τα πόδια σας"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "Περί"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Έξοδος"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Κάθε"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Για"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Ο χρονομετρητής διαλείμματος δεν αποκρίνεται"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Αν αυτό συνεχίζεται την επόμενη φορά που θα συνδεθείτε, παρακαλούμε <a href="
+"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>ανοίξτε μια "
+"αναφορά σφάλματος</a>."
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Ο χρονομετρητής διαλείμματος κάνει διάλειμμα"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Ενεργοποιήστε με για να συνεχίσετε"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr ""
+"Μπορείτε να αλλάξετε τους τύπους των διαλειμμάτων και τους χρονισμούς τους "
+"από τις ρυθμίσεις"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"Ο χρονομετρητής διαλειμμάτων σας επιτρέπει να κάνετε μικροδιαλείμματα καθώς "
+"και μεγαλύτερα διαλείμματα."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Τα μικροδιαλείμματα είναι μια ευκαιρία να κοιτάξετε έξω από την οθόνη και να "
+"ξεκουράσετε τα χέρια σας."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"Τα πλήρη διαλείμματα είναι χρόνος να φύγετε από τον υπολογιστή και να "
+"μετακινηθείτε."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Διαλείμματα και μικροδιαλείμματα"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Μπορείτε να με αφήσετε"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Ο χρονομετρητής διαλειμμάτων θα συνεχίσει να δουλεύει στο παρασκήνιο, ακόμα "
+"κι αν τον κλείσετε."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Καλώς ήρθατε στον χρονομετρητή διαλειμμάτων!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Τα διαλείμματα είναι καλά για σας. Θα σας βοηθήσουμε να τα κάνετε."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Απλά ενεργοποιήστε με για να ξεκινήσετε"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Υπενθύμιση λήψης τακτικών διαλειμμάτων από τη χρήση του υπολογιστή"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Παρέχει μια ευγενική υπενθύμιση για να κάνετε τακτικά διαλείμματα"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr ""
+#~ "Επιλέξτε τις προτιμήσεις σας για μικρά διαλείμματα και διαλείμματα "
+#~ "ξεκούρασης"
+
+#~ msgid "Thank you"
+#~ msgstr "Σας ευχαριστούμε"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Ξεκουράστε λίγο τα μάτια σας"
+
+#~ msgid "Full break"
+#~ msgstr "Πλήρες διάλειμμα"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr ""
+#~ "Και πάρτε κάποια μεγαλύτερα διαλείμματα για να τεντώσετε τα πόδια σας"
diff --git a/po/es.po b/po/es.po
index 853d279..e08c7b6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-09-01 18:11+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: Español; Castellano <gnome-es-list gnome org>\n"
@@ -20,416 +19,445 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Descansos"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Recuerde descansar regularmente cuando usa el equipo"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Descansos mantiene el registro de cuánto usa el equipo, y le recuerda "
-"tomar descansos regulares. Está diseñado para incentivar el comportamiento "
-"saludable, con un conjunto de pequeños descansos para sus ojos y muñecas, "
-"así como largos descansos para mantener su cuerpo en movimiento y su mente "
-"concentrada.</p> <p>Descansos es fácil de instalar, así que puede escoger un "
-"horario de descansos que funcione para usted y siga funcionando en segundo "
-"plano.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Proporciona un recordatorio amable para hacer descansos regulares"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Elija sus preferencias para descansos y pausas"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Recordatorios de descansos del equipo para mentes activas"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "micro;descanso;pausa;temporizador;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Cierto para activar GNOME Descansos"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "La lista de descansos activados actualmente"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Cierto para activar el modo silencioso"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Esconder descansos hasta la hora de caducidad del modo silencioso."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Tiempo para finalizar el modo silencioso."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr ""
 "El tiempo para desactivar automáticamente el modo silencioso, en tiempo UNIX."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Tiempo entre descansos"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "El tiempo entre descansos, en segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Duración de cada descanso"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "La duración de cada descanso, en segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "El tiempo preferido entre microdescansos, en segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "La duración preferida de cada microdescanso, en segundos."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Descansos no responde"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Si le vuelve a pasar la próxima vez que inicie la sesión, <a href=\"https://";
-"bugs.launchpad.net/brainbreak\">abra un informe de error</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Descansos se está tomando un descanso"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Activar para empezar los descansos"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Puede cambiar los tipos de descansos y su duración en la configuración"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Descansos le permite hacer microdescansos, así como descansos más largos."
+"<p>Descansos mantiene el registro de cuánto usa el equipo, y le recuerda "
+"tomar descansos regulares. Está diseñado para incentivar el comportamiento "
+"saludable, con un conjunto de pequeños descansos para sus ojos y muñecas, "
+"así como largos descansos para mantener su cuerpo en movimiento y su mente "
+"concentrada.</p> <p>Descansos es fácil de instalar, así que puede escoger un "
+"horario de descansos que funcione para usted y siga funcionando en segundo "
+"plano.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Los microdescansos son una oportunidad para mirar fuera de la pantalla y "
-"descansar las manos"
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Los descansos completos son el momento de alejarse del equipo y moverse un "
-"poco."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Descansos y microdescansos"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Puede dejarme a él"
 
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
-msgstr "Descansos seguirá ejecutándose en segundo plano, aunque lo cierre."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Bienvenido a Descansos"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Los descansos son buenos. Vamos a ayudarle a hacerlos."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Simplemente active la aplicación para empezar"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME Descansos"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "¿Qué debo hacer?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Gracias"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Omitir este"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Es hora de un microdescanso"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Micro descanso atrasado"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "El descanso ha terminado"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Su microdescanso ha terminado"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Recordármelo más tarde"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Tiempo para un descanso"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Descanso atrasado"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Su descanso ha terminado"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Elegir su planificación de descansos"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Una mezcla de descansos cortos y largos"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Descansos largos ocasionales"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Descansos cortos frecuentes"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Acerca de"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Salir"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Tour de bienvenida"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Recordatorios de descansos del equipo para mentes activas"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Página web de GNOME Descansos"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Milagros Alessandra Infante Montero <maim92 gmail com>, 2013\n"
 "Daniel Mustieles <daniel mustieles gmail com>, 2013"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "Aceptar"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Listo para empezar"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Microdescanso"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "Tome un descanso de escribir y aléjese de la pantalla por %s."
 msgstr[1] "Tome un descanso de escribir y aléjese de la pantalla por %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Es hora de un microdescanso"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr ""
 "Se reproducirá un sonido cuando sea el momento de volver a usar el equipo"
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Descanse con frecuencia para relajar sus ojos"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Su siguiente microdescanso es dentro de"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Es hora de un microdescanso"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Descanse con frecuencia para relajar sus ojos"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Aceptar"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Listo para empezar"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Descanso"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "Su descanso tiene %s restantes. Se lo recordaré cuando acabe."
 msgstr[1] "Su descanso tiene %s restantes. Se lo recordaré cuando acabe."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Es hora de un descanso"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Descanse un momento del equipo. Estírese y muévase."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Su siguiente descanso completo es dentro de"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Es hora de un descanso"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Descanso completo"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Y haga descansos más largos para estirar las piernas"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "Acerca de"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Salir"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Cada"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Duración"
 
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Descansos no responde"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Si le vuelve a pasar la próxima vez que inicie la sesión, <a href=\"https://";
+"bugs.launchpad.net/brainbreak\">abra un informe de error</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Descansos se está tomando un descanso"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Activar para empezar los descansos"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Puede cambiar los tipos de descansos y su duración en la configuración"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"Descansos le permite hacer microdescansos, así como descansos más largos."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Los microdescansos son una oportunidad para mirar fuera de la pantalla y "
+"descansar las manos"
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"Los descansos completos son el momento de alejarse del equipo y moverse un "
+"poco."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Descansos y microdescansos"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Puede dejarme a él"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr "Descansos seguirá ejecutándose en segundo plano, aunque lo cierre."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Bienvenido a Descansos"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Los descansos son buenos. Vamos a ayudarle a hacerlos."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Simplemente active la aplicación para empezar"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Recuerde descansar regularmente cuando usa el equipo"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Proporciona un recordatorio amable para hacer descansos regulares"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Elija sus preferencias para descansos y pausas"
+
+#~ msgid "Thank you"
+#~ msgstr "Gracias"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Descanse los ojos un momento"
+
+#~ msgid "Full break"
+#~ msgstr "Descanso completo"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "Y haga descansos más largos para estirar las piernas"
+
 #~ msgid "Copyright © Dylan McCall"
 #~ msgstr "Copyright © Dylan McCall"
 
diff --git a/po/fr.po b/po/fr.po
index af9e6c8..2c333d6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-09-20 06:23+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2015-09-20 20:20+0200\n"
 "Last-Translator: Julien Hardelin <jhardlin orange fr>\n"
 "Language-Team: French <kde-i18n-doc kde org>\n"
@@ -19,340 +18,281 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Minuteur de pauses"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr ""
-"Rappelez-vous de faire des pauses régulières lors de l'utilisation d'un "
-"ordinateur"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Le Minuteur de pauses garde la trace du temps passé sur l'ordinateur et vous rappelle de "
-"faire des pauses régulières. Il est conçu pour encourager un comportement "
-"sain, avec un mélange de courtes pauses pour vos yeux et vos poignets et de "
-"pauses plus longues pour vous dégourdir les jambes et concentrer votre "
-"esprit sur votre tâche.</p> <p>Le Minuteur de pauses est simple à paramétrer et vous pouvez "
-"établir un programme de pauses qui vous convienne. Il continuera à "
-"fonctionner en arrière-plan.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr ""
-"Fournit un rappel discret de faire des pauses régulières"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr ""
-"Choisissez vos préférences pour les pauses courtes et les pauses longues"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Rappels de pauses d'ordinateur pour les cerveaux actifs"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "pause;courte;longue;repos;minuteur;programmateur;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "True (vrai) pour activer le Minuteur de pauses GNOME"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Liste des pauses actuellement activées"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "True (vrai) pour activer le mode silencieux"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
-msgstr "Masque les pauses jusqu'à l'expiration du temps passé en mode silencieux (valeur de la clé 
quiet-mode-expire-time)."
+msgstr ""
+"Masque les pauses jusqu'à l'expiration du temps passé en mode silencieux "
+"(valeur de la clé quiet-mode-expire-time)."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Temps d'expiration du mode silencieux."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Temps d'expiration du mode silencieux, en temps unix."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Temps entre les pauses"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Temps entre les pauses, en secondes."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Durée des pauses"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Durée de chaque pause longue, en secondes."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Temps souhaité entre les courtes pauses, en secondes"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Durée préférée des pauses courtes, en secondes."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Le Minuteur de pauses ne répond pas"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Si cela se reproduit lors de la prochaine connexion, <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">établissez un rapport de bogue</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Le Minuteur de pauses fait une pause"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Autorisez-moi à lancer ces pauses"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr ""
-"Vous pouvez modifier le type de pauses et leur programmation dans la "
-"configuration"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Le Minuteur de pauses vous permet de faire aussi bien des pauses courtes que des pauses "
-"longues."
-
-#: ../data/settings-panels.ui.h:7
+"<p>Le Minuteur de pauses garde la trace du temps passé sur l'ordinateur et "
+"vous rappelle de faire des pauses régulières. Il est conçu pour encourager "
+"un comportement sain, avec un mélange de courtes pauses pour vos yeux et vos "
+"poignets et de pauses plus longues pour vous dégourdir les jambes et "
+"concentrer votre esprit sur votre tâche.</p> <p>Le Minuteur de pauses est "
+"simple à paramétrer et vous pouvez établir un programme de pauses qui vous "
+"convienne. Il continuera à fonctionner en arrière-plan.</p>"
+
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Les pauses courtes sont l'occasion de quitter l'écran et de reposer vos "
-"mains."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Les pauses longues sont l'occasion de quitter l'ordinateur et d'aller faire "
-"un tour."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pauses longues et courtes"
 
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Vous pouvez me laisser"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
 msgstr ""
-"Le Minuteur de pauses continuera à fonctionner en arrière-plan même si vous le fermez."
 
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Bienvenue dans le Minuteur de pauses !"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr ""
-"Faire une pause est bon pour vous. Nous allons vous aider à en prendre."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Activez-moi pour démarrer"
-
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Minuteur de pauses GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Que dois-je faire ?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Merci"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Passer celle-ci"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "C'est le moment de faire une courte pause"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Pause courte dépassée"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "La pause est terminée"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Votre pause courte est terminée"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Rappeler-le moi plus tard"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Temps pour une pause"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Pause dépassée"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Votre temps de pause est terminé"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Choisissez le programme de pause"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Un mélange de pauses courtes et de pauses longues"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Pauses longues occasionnelles"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Pauses courtes fréquentes"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "À propos"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Quitter"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Visite guidée"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Rappels de pauses d'ordinateur pour les cerveaux actifs"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Site Web du Minuteur de pauses GNOME"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr "Julien Hardelin <jhardlin orange fr>, 2015"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "D'accord, c'est fait !"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Prêt"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Pause courte"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -363,80 +303,168 @@ msgstr[1] ""
 "Faites une pause dans la saisie au clavier et regardez ailleurs que l'écran "
 "pendant %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "C'est le moment d'une pause courte"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Je carillonnerai quand il sera temps de se remettre à l'ordinateur."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Faites de nombreuses pauses pour vous reposer les yeux"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "La prochaine pause courte est dans"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "C'est le moment de faire une pause courte"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Faites de nombreuses pauses pour vous reposer les yeux"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "D'accord, c'est fait !"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Prêt"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Pause"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
-msgstr[0] ""
-"Il reste %s de pause. Je vous préviendrai quand elle sera finie."
-msgstr[1] ""
-"Il reste %s de pause. Je vous préviendrai quand elle sera finie."
+msgstr[0] "Il reste %s de pause. Je vous préviendrai quand elle sera finie."
+msgstr[1] "Il reste %s de pause. Je vous préviendrai quand elle sera finie."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "C'est le temps d'une pause"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Passez un moment loin de l'ordinateur. Étirez-vous et faites un tour."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "La prochaine pause longue est dans"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "C'est le temps d'une pause"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Pause longue"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Et prenez un moment pour vous dégourdir les jambes"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "À propos"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Quitter"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Chaque"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Pendant"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Le Minuteur de pauses ne répond pas"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Si cela se reproduit lors de la prochaine connexion, <a href=\"https://bugs.";
+"launchpad.net/brainbreak\">établissez un rapport de bogue</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Le Minuteur de pauses fait une pause"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Autorisez-moi à lancer ces pauses"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr ""
+"Vous pouvez modifier le type de pauses et leur programmation dans la "
+"configuration"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"Le Minuteur de pauses vous permet de faire aussi bien des pauses courtes que "
+"des pauses longues."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Les pauses courtes sont l'occasion de quitter l'écran et de reposer vos "
+"mains."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"Les pauses longues sont l'occasion de quitter l'ordinateur et d'aller faire "
+"un tour."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pauses longues et courtes"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Vous pouvez me laisser"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Le Minuteur de pauses continuera à fonctionner en arrière-plan même si vous "
+"le fermez."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Bienvenue dans le Minuteur de pauses !"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr ""
+"Faire une pause est bon pour vous. Nous allons vous aider à en prendre."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Activez-moi pour démarrer"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr ""
+#~ "Rappelez-vous de faire des pauses régulières lors de l'utilisation d'un "
+#~ "ordinateur"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Fournit un rappel discret de faire des pauses régulières"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr ""
+#~ "Choisissez vos préférences pour les pauses courtes et les pauses longues"
+
+#~ msgid "Thank you"
+#~ msgstr "Merci"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Prenez un moment pour vous reposer les yeux"
+
+#~ msgid "Full break"
+#~ msgstr "Pause longue"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "Et prenez un moment pour vous dégourdir les jambes"
diff --git a/po/gl.po b/po/gl.po
index be2e4df..32fb0f8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-11 19:08+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-03-11 21:47+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
@@ -19,403 +18,435 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:42
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Temporizador de pausas"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Lembre facer pausas ao usar o seu computador"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+msgid "Computer break reminders for GNOME"
 msgstr ""
 
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Fornece un recordatorio agradábel para tomar pausas regulares"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr ""
-"Seleccione as súas preferencias para as micropausas e pausas para descansar"
-
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "pausa;micro;descanso;temporizador;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr ""
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "A lista de pausas está actualmente activada"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Verdadeiro para activar o modo silencioso"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Oculta as pausas ate quiet-mode-expire-time."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Tempo para rematar o modo silencioso."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr ""
 "O tempo para desactivar automaticamente o modo silencioso, en hora unix."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Tempo entre pausas"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "O tempo entre as pausas para descansar, en segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Duración de cada pausa"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "A duración de cada pausa para descansar, en segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "O tempo preferido entre as micropausas, en segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "A duración preferida para cada micropausa, en segundos."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Temporizador de pausas non está respondendo"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Se isto segue a seguinte vez que inicia sesión, <a "
-"href=\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>reporte un erro</a>."
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Temporizador de pausas está tomándose unha pausa"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Actíveme para poñer esas pausas a andar"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr ""
-"Pode cambiar os tipos de pausas e as súas temporalidades desde as "
-"preferencias"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"O Temporizador de pausas permítelle facer pequenas micropausas así como "
-"pausas máis longas."
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"As micropausas son unha oportunidade para afastarse da pantalla e descansar "
-"as mans."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"As pausas completas son tempo no que pode afastarse do seu computador e "
-"moverse."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pausas e micropausas"
 
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Pode deixarme facelo"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
 msgstr ""
-"O Temporizador de pausas encargarase de traballar en segundo plano, incluso "
-"cando o peche."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Benvido ao Temporizador de pausas!"
 
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "As pausas son boas para vostede. Axudarémolo a facelas."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Simplemente actíveme para comezar"
-
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Temporizador de pausas de GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Que debería facer?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Grazas"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Saltar esta"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "É hora de facer unha micropausa"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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] ""
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr ""
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "A pausa rematou"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "A súa micropausa rematou"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Recordarmo máis tarde"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Hora dun descanso"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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] ""
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr ""
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "O tempo da pausa rematou"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Seleccione a súa planificación de pausas"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:43
+msgid "_Close"
+msgstr ""
+
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Unha mistura de pausas curtas e longas"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Pausas longas ocasionais"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Pausas curtas frecuentes"
 
-#: ../settings/MainWindow.vala:140
-msgid "Welcome Tour"
-msgstr "Tour de benvida"
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
 
-#: ../settings/MainWindow.vala:161
-msgid "Computer break reminders for active minds"
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
 msgstr ""
 
-#: ../settings/MainWindow.vala:163
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Sobre"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Saír"
+
+#: src/settings/MainWindow.vala:255
+msgid "Welcome Tour"
+msgstr "Tour de benvida"
+
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Sitio web do Temporizador de pausas de GNOME"
 
-#: ../settings/MainWindow.vala:167
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr "Fran Dieguez <frandieguez gnome org>, 2014."
 
-#: ../settings/MainWindow.vala:220
-msgid "OK, got it!"
-msgstr "Ok, entendido!"
-
-#: ../settings/MainWindow.vala:225
-msgid "Ready to go"
-msgstr "Listo para comezar"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Micropausa"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "Tome unha pausa e non mire fóra da pantalla por %s."
 msgstr[1] "Tome unha pausa e non mire fóra da pantalla por %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "É hora dunha micropausa"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr ""
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr ""
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "A súa seguinte micropausa é en"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "É hora para unha micropausa"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr ""
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Ok, entendido!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Listo para comezar"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Descanso"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "Fáltalle %s ao seu descanso. Recordareille cando remate."
 msgstr[1] "Fáltanlle %s ao seu descanso. Recordareille cando remate."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "É hora dun descanso"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Tome un respiro e afástese do seu computador. Estírese e móvase."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr ""
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "É hora dun descanso"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Descanso completo"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "E tomar pausas máis longas para estirar as súas pernas"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "Sobre"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Saír"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Cada"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Por"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Temporizador de pausas non está respondendo"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Se isto segue a seguinte vez que inicia sesión, <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">reporte un erro</a>."
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Temporizador de pausas está tomándose unha pausa"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Actíveme para poñer esas pausas a andar"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr ""
+"Pode cambiar os tipos de pausas e as súas temporalidades desde as "
+"preferencias"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"O Temporizador de pausas permítelle facer pequenas micropausas así como "
+"pausas máis longas."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"As micropausas son unha oportunidade para afastarse da pantalla e descansar "
+"as mans."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"As pausas completas son tempo no que pode afastarse do seu computador e "
+"moverse."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pausas e micropausas"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Pode deixarme facelo"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"O Temporizador de pausas encargarase de traballar en segundo plano, incluso "
+"cando o peche."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Benvido ao Temporizador de pausas!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "As pausas son boas para vostede. Axudarémolo a facelas."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Simplemente actíveme para comezar"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Lembre facer pausas ao usar o seu computador"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Fornece un recordatorio agradábel para tomar pausas regulares"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr ""
+#~ "Seleccione as súas preferencias para as micropausas e pausas para "
+#~ "descansar"
+
+#~ msgid "Thank you"
+#~ msgstr "Grazas"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Tómese un momento para descansar os ollos"
+
+#~ msgid "Full break"
+#~ msgstr "Descanso completo"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "E tomar pausas máis longas para estirar as súas pernas"
diff --git a/po/hu.po b/po/hu.po
index bc77949..8723b28 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-12-21 07:01+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-12-22 08:56+0100\n"
 "Last-Translator: Balázs Úr <urbalazs gmail com>\n"
 "Language-Team: Hungarian <gnome-hu-list gnome org>\n"
@@ -19,334 +18,278 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.2\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Szünet ellenőrző"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr ""
-"Emlékeztető a számítógép használata közbeni rendszeres szünet megtartására"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>A Szünet ellenőrző nyilvántartja, hogy mennyit használja a számítógépét, "
-"és emlékezteti a rendszeres szünetek megtartására. Úgy tervezték, hogy "
-"egészséges viselkedésre ösztönözze rövid szünetek megtartásával a szemei és "
-"csuklója megóvása érdekében, valamint hosszabb szünetek megtartásával "
-"átmozgassa az egész testét és végiggondolja a feladatait.</p> <p>A Szünet "
-"ellenőrzőt könnyű beállítani, így felveheti az önnek megfelelő "
-"szünet időbeosztását, és folytatni fogja a munkát a háttérben.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Udvarias emlékeztetőt biztosít a rendszeres szünetek megtartásához"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Válasszon beállításokat a kis szünetekhez és a pihenőkhöz"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Számítógépes szünet emlékeztető az aktív gondolkodáshoz"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "szünet;kicsi;pihenés;időzítő;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Igaz érték a GNOME Szünet ellenőrző engedélyezéséhez"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "A jelenleg engedélyezett szünetek listája"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Igaz érték a csendes mód engedélyezéséhez"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Elrejti a szüneteket, amíg a csendes mód ideje le nem jár."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "A csendes mód befejezésének ideje."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "A csendes mód automatikus letiltásának ideje unix időben."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "A szünetek közti idő"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "A pihenők közötti idő másodpercben."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Az egyes szünetek időtartama"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Az egyes pihenők időtartama másodpercben."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "A kis szünetek közötti előnyben részesített idő másodpercben."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Az egyes kis szünetek előnyben részesített időtartama másodpercben."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "A Szünet ellenőrző nem válaszol"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Ha ez így folytatódik a következő bejelentkezéskor is, akkor <a "
-"href=\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>nyisson egy hibajelentést</a>."
-"\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "A Szünet ellenőrző szünetet tart"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Kapcsoljon be, hogy azok a szünetek elinduljanak"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr ""
-"A beállításokban megváltoztathatja a szünetek típusait és azok időzítéseit"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"A Szünet ellenőrző lehetővé tesz kisebb, illetve hosszabb szünetek "
-"megtartását is."
+"<p>A Szünet ellenőrző nyilvántartja, hogy mennyit használja a számítógépét, "
+"és emlékezteti a rendszeres szünetek megtartására. Úgy tervezték, hogy "
+"egészséges viselkedésre ösztönözze rövid szünetek megtartásával a szemei és "
+"csuklója megóvása érdekében, valamint hosszabb szünetek megtartásával "
+"átmozgassa az egész testét és végiggondolja a feladatait.</p> <p>A Szünet "
+"ellenőrzőt könnyű beállítani, így felveheti az önnek megfelelő szünet "
+"időbeosztását, és folytatni fogja a munkát a háttérben.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"A kis szünetek esélyt adnak arra, hogy máshova nézzen a képernyőtől és "
-"pihentesse a kezeit."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"A teljes szünetek ideje alatt elszakadhat a számítógéptől és sétálhat egyet."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Szünetek és kis szünetek"
 
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Itt hagyhat ennél"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
 msgstr ""
-"A Szünet ellenőrző folytatja a munkát a háttérben akkor is, ha bezárja azt."
 
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Üdvözli a Szünet ellenőrző!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "A szünetek jók önnek. Segítünk megtartani azokat."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Csak kapcsoljon be az indításhoz"
-
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d másodperc"
 msgstr[1] "%d másodperc"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME Szünet ellenőrző"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Mit tegyek?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Köszönöm"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Ennek kihagyása"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Itt az idő egy kis szünetre"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "A kis szünet lejárt"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "A szünetnek vége"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "A kis szünet befejeződött"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Emlékeztessen később"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Ideje szünetet tartani"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "A szünet lejárt"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "A szünet ideje befejeződött"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Válassza ki a szünet időbeosztását"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Rövid és hosszú szünetek keveréke"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Alkalmi hosszú szünetek"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Ismétlődő rövid szünetek"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Névjegy"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Kilépés"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Üdvözöljük az utazáson"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Számítógépes szünet emlékeztető az aktív gondolkodáshoz"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "GNOME Szünet ellenőrző weboldala"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr "Úr Balázs <urbalazs gmail com>, 2014."
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "OK, megvan!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Indulásra kész"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Kis szünet"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -355,81 +298,164 @@ msgstr[0] ""
 msgstr[1] ""
 "Tartson gépelési szünetet és nézzen máshova a képernyőtől %s időtartamra."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Itt a kis szünet ideje"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Csipogni fogok, ha ismét eljött a számítógép használatának ideje."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Tartson gyakran szünetet, hogy pihentesse a szemét"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "A következő kis szünet:"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Itt az idő egy kis szünetre"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Tartson gyakran szünetet, hogy pihentesse a szemét"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "OK, megvan!"
+
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Indulásra kész"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Szünet"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "A szünetből %s van hátra. Emlékeztetni fogom, ha letelt."
 msgstr[1] "A szünetből %s van hátra. Emlékeztetni fogom, ha letelt."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Itt a szünet ideje"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Töltsön egy kis időt a számítógéptől távol. Nyújtózzon és sétáljon egyet."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "A következő teljes szünet:"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Itt a szünet ideje"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Teljes szünet"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "És tartson néhány hosszabb szünetet, hogy kinyújtsa a lábait"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "Névjegy"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Kilépés"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Minden"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Ennyi időre:"
 
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "A Szünet ellenőrző nem válaszol"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Ha ez így folytatódik a következő bejelentkezéskor is, akkor <a href="
+"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>nyisson egy "
+"hibajelentést</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "A Szünet ellenőrző szünetet tart"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Kapcsoljon be, hogy azok a szünetek elinduljanak"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr ""
+"A beállításokban megváltoztathatja a szünetek típusait és azok időzítéseit"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"A Szünet ellenőrző lehetővé tesz kisebb, illetve hosszabb szünetek "
+"megtartását is."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"A kis szünetek esélyt adnak arra, hogy máshova nézzen a képernyőtől és "
+"pihentesse a kezeit."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"A teljes szünetek ideje alatt elszakadhat a számítógéptől és sétálhat egyet."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Szünetek és kis szünetek"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Itt hagyhat ennél"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"A Szünet ellenőrző folytatja a munkát a háttérben akkor is, ha bezárja azt."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Üdvözli a Szünet ellenőrző!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "A szünetek jók önnek. Segítünk megtartani azokat."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Csak kapcsoljon be az indításhoz"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr ""
+#~ "Emlékeztető a számítógép használata közbeni rendszeres szünet megtartására"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Udvarias emlékeztetőt biztosít a rendszeres szünetek megtartásához"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Válasszon beállításokat a kis szünetekhez és a pihenőkhöz"
+
+#~ msgid "Thank you"
+#~ msgstr "Köszönöm"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Álljon meg egy pillanatra, hogy pihentesse a szemét"
+
+#~ msgid "Full break"
+#~ msgstr "Teljes szünet"
 
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "És tartson néhány hosszabb szünetet, hogy kinyújtsa a lábait"
diff --git a/po/id.po b/po/id.po
index 57fa6c8..650bad1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-06 18:11+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-10-17 13:34+0700\n"
 "Last-Translator: Andika Triwidada <andika gmail com>\n"
 "Language-Team: Indonesian <gnome-l10n-id googlegroups com>\n"
@@ -19,406 +18,437 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.6.9\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Pewaktu Istirahat"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Ingatlah untuk istirahat berkala dari memakai komputer"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Pewaktu Istirahat mencatat seberapa lama Anda memakai komputer, dan "
-"mengingatkan Anda untuk beristirahat secara teratur. Ini dirancang untuk "
-"menganjurkan perilaku yang sehat, dengan campuran dari istirahat pendek bagi "
-"mata dan pergelangan tangan Anda, maupun istirahat panjang agar tubuh Anda "
-"tetap bergerak dan otak Anda tetap pada tugas.</p><p>Pewaktu Istirahat "
-"sederhana penyiapannya, sehingga Anda dapat memilih jadwal istirahat yang "
-"cocok bagi Anda dan ini akan terus bekerja di latar belakang.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr ""
-"Menyediakan suatu pengingat yang lunak untuk beristirahat secara berkala"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Pilih preferensi Anda untuk istirahat mikro dan istirahat singkat"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Pengingat istirahat dari komputer bagi otak yang aktif"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "istirahat;mikro;pewaktu;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Isi true untuk memfungsikan GNOME Pewaktu Istirahat"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Daftar istirahat yang sedang diaktifkan"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Isi true untuk memfungsikan mode senyap"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Sembunyikan istirahat sampai quiet-mode-expire-time."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Saatnya mengakhiri mode senyap."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Waktu untuk secara otomatis mematikan mode senyap, dalam waktu unix."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Waktu antar istirahat"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Waktu antar istirahat, dalam detik."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Durasi setiap istirahat"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Durasi setiap istirahat, dalam detik."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Selang waktu yang disukai antar istirahat mikro, dalam detik."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Durasi dari setiap istirahat mikro, dalam detik."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Pewaktu Istirahat tak merespon"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Bila ini terus terjadi saat berikutnya Anda log masuk, harap <a href="
-"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>buka sebuah laporan bug</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Pewaktu Istirahat sedang beristirahat"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Nyalakan saya agar waktu-waktu istirahat tersebut terlaksana"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Anda dapat mengubah tipe istirahat dan waktunya dari pengaturan"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Pewaktu Istirahat memungkinkan Anda mengambil istirahat mikro maupun "
-"istirahat yang lebih lama."
+"<p>Pewaktu Istirahat mencatat seberapa lama Anda memakai komputer, dan "
+"mengingatkan Anda untuk beristirahat secara teratur. Ini dirancang untuk "
+"menganjurkan perilaku yang sehat, dengan campuran dari istirahat pendek bagi "
+"mata dan pergelangan tangan Anda, maupun istirahat panjang agar tubuh Anda "
+"tetap bergerak dan otak Anda tetap pada tugas.</p><p>Pewaktu Istirahat "
+"sederhana penyiapannya, sehingga Anda dapat memilih jadwal istirahat yang "
+"cocok bagi Anda dan ini akan terus bekerja di latar belakang.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Istirahat mikro adalah kesempatan untuk mengalihkan pandangan dari layar dan "
-"mengistirahatkan jari-jari Anda."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Istirahat penuh adalah saat untuk menjauh dari komputer dan berkeliling."
 
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Istirahat dan Istirahat Mikro"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Anda dapat mempercayakan itu padaku"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
 msgstr ""
-"Pewaktu Istirahat akan terus bekerja di latar belakang, bahkan bila Anda "
-"menutupnya."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Selamat Datang ke Pewaktu Istirahat!"
 
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Istirahat itu baik untuk Anda. Kami akan membantu Anda memperolehnya."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Nyalakan saja saya untuk memulai"
-
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d detik"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d menit"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d jam"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME Pewaktu Istirahat"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Apa yang mesti saya lakukan?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Terima kasih"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Lewati yang satu ini"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Saatnya untuk istirahat mikro"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Istirahat mikro yang terlambat"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Waktu istirahat telah usai"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Istirahat mikro Anda telah berakhir"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Ingatkan lagi saya nanti"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Saatnya untuk istirahat"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Istirahat yang terlambat"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Waktu istirahat Anda telah berakhir"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Pilih Jadwal Istirahat Anda"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Campuran dari istirahat pendek dan panjang"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Istirahat lama yang jarang"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Istirahat pendek yang sering"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Tentang"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Keluar"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Tur Selamat Datang"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Pengingat istirahat dari komputer bagi otak yang aktif"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Situs Web GNOME Pewaktu Istirahat"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr "Andika Triwidada <andika gmail com>, 2014"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "OK, dapat!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Siap pergi"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Istirahat mikro"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] ""
 "Beristirahatlah dari mengetik dan alihkan pandangan dari layar selama %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Saatnya istirahat mikro"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr ""
 "Saya akan membunyikan bel bila sudah saatnya untuk memakai komputer lagi."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Seringlah beristirahat untuk melemaskan mata Anda"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Istirahat mikro selanjutnya dalam"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Saatnya untuk sebuah istirahat mikro"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Seringlah beristirahat untuk melemaskan mata Anda"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "OK, dapat!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Siap pergi"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Istirahat"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] ""
 "Istirahat Anda tersisa %s. Saya akan mengingatkan Anda saat itu selesai."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Saatnya untuk istirahat"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Sementara menjauhlah dari komputer. Meregang dan bergeraklah."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Istirahat penuh selanjutnya dalam"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Saatnya untuk istirahat"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Istirahat penuh"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Dan ambil istirahat yang lebih panjang untuk meregang kaki-kaki Anda"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "Tentang"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Keluar"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Setiap"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Selama"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Pewaktu Istirahat tak merespon"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Bila ini terus terjadi saat berikutnya Anda log masuk, harap <a href="
+"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>buka sebuah "
+"laporan bug</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Pewaktu Istirahat sedang beristirahat"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Nyalakan saya agar waktu-waktu istirahat tersebut terlaksana"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Anda dapat mengubah tipe istirahat dan waktunya dari pengaturan"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"Pewaktu Istirahat memungkinkan Anda mengambil istirahat mikro maupun "
+"istirahat yang lebih lama."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Istirahat mikro adalah kesempatan untuk mengalihkan pandangan dari layar dan "
+"mengistirahatkan jari-jari Anda."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"Istirahat penuh adalah saat untuk menjauh dari komputer dan berkeliling."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Istirahat dan Istirahat Mikro"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Anda dapat mempercayakan itu padaku"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Pewaktu Istirahat akan terus bekerja di latar belakang, bahkan bila Anda "
+"menutupnya."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Selamat Datang ke Pewaktu Istirahat!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Istirahat itu baik untuk Anda. Kami akan membantu Anda memperolehnya."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Nyalakan saja saya untuk memulai"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Ingatlah untuk istirahat berkala dari memakai komputer"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr ""
+#~ "Menyediakan suatu pengingat yang lunak untuk beristirahat secara berkala"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Pilih preferensi Anda untuk istirahat mikro dan istirahat singkat"
+
+#~ msgid "Thank you"
+#~ msgstr "Terima kasih"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Sejenak mengistirahatkan mata Anda"
+
+#~ msgid "Full break"
+#~ msgstr "Istirahat penuh"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr ""
+#~ "Dan ambil istirahat yang lebih panjang untuk meregang kaki-kaki Anda"
diff --git a/po/lt.po b/po/lt.po
index 1a2092d..481cab7 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-10-03 18:39+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2015-10-05 22:02+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4 gmail com>\n"
 "Language-Team: Lietuvių <gnome-lt lists akl lt>\n"
@@ -21,165 +20,109 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Pertraukų laikmatis"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Prisiminkite darytis reguliarias naudojimosi kompiuteriu pertraukas"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Pertraukų laikmatis seka kiek laiko jūs naudojatės kompiuteriu ir primena "
-"jums daryti reguliarias pertraukas. Jis yra sukurtas, kad skatintų sveiką "
-"elgseną trumpų pertraukų mišiniu, skirtu jūsų akims ir riešams, o taip pat "
-"ir ilgomis pertraukomis, išlaikančiomis jūsų kūną judėjime, o protą - "
-"susikaupusį.</p> <p>Pertraukų laikmatis yra lengvai nustatomas, taigi, "
-"galite pasirinkti jums tinkantį pertraukų tvarkaraštį, kuris tęs savo darbą "
-"fone.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Pateikia švelnius priminimus apie reguliarių pertraukų darymą"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Pasirinkite savo nuostatas mikropertraukoms ir poilsio pertraukoms"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Kompiuterinių pertraukų priminimai aktyviems protams"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "pertrauka;mikro;poilsis;laikmatis;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Teigiama, kad įjungtumėte GNOME pertraukų laikmatį"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Šiuo metu įjungtų pertraukų sąrašas"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Teigiama, kad įjungtumėte tyliąją veikseną"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Slepia pertraukas, kol quiet-mode-expire-time."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Laikas, skirtas užbaigti tyliąją veikseną."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Laikas, skirtas automatiškai išjungti tyliąją veikseną, unix laiku."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Laikas tarp pertraukų"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Laikas tarp poilsio pertraukų, sekundėmis."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Kiekvienos pertraukos trukmė"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Kiekvienos poilsio pertraukos trukmė, sekundėmis."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Pageidaujamas laikas tarp mikropertraukų, sekundėmis."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Pageidaujama kiekvienos mikropertraukos trukmė, sekundėmis."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Pertraukų laikmatis neatsako"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Jeigu kitą kartą jums prisijungus, tai vis dar tęsiasi, prašome <a href="
-"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>pranešti apie klaidą</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Pertraukų laikmatis daro pertrauką"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Įjunkite mane, kad tos pertraukos vyktų"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Nustatymuose jūs galite keisti pertraukų tipus ir jų laikus"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Pertraukų laikmatis leidžia jums darytis mažas mikropertraukas, o taip pat "
-"ilgesnes pertraukas."
+"<p>Pertraukų laikmatis seka kiek laiko jūs naudojatės kompiuteriu ir primena "
+"jums daryti reguliarias pertraukas. Jis yra sukurtas, kad skatintų sveiką "
+"elgseną trumpų pertraukų mišiniu, skirtu jūsų akims ir riešams, o taip pat "
+"ir ilgomis pertraukomis, išlaikančiomis jūsų kūną judėjime, o protą - "
+"susikaupusį.</p> <p>Pertraukų laikmatis yra lengvai nustatomas, taigi, "
+"galite pasirinkti jums tinkantį pertraukų tvarkaraštį, kuris tęs savo darbą "
+"fone.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Mikropertraukos suteikia jums galimybę atsigręžti nuo ekrano ir leidžia "
-"pailsėti jūsų rankoms."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Pilnos pertraukos yra laikas, skirtas atsitraukti nuo kompiuterio ir "
-"pajudėti."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pertraukos ir Mikropertraukos"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Galite tam reikalui palikti mane"
 
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
-msgstr "Pertraukų laikmatis, net jeigu jį užversite, tęs savo darbą fone."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Sveiki atvykę į Pertraukų laikmatį!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Pertraukos yra jums naudingos. Mes jums padėsime jas daryti."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Tiesiog įjunkite mane, kad pradėtumėte"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -187,7 +130,7 @@ msgstr[0] "%d sekundė"
 msgstr[1] "%d sekundės"
 msgstr[2] "%d sekundžių"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -195,7 +138,7 @@ msgstr[0] "%d minutė"
 msgstr[1] "%d minutės"
 msgstr[2] "%d minučių"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -203,35 +146,34 @@ msgstr[0] "%d valanda"
 msgstr[1] "%d valandos"
 msgstr[2] "%d valandų"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME pertraukų laikmatis"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Ką turėčiau daryti?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Ačiū"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Praleisti"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Laikas mikropertraukai"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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 +181,36 @@ 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Pavėluota mikropertrauka"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Pertrauka baigta"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Jūsų mikropertrauka pasibaigė"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Priminti vėliau"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Laikas pertraukai"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, c-format
 msgid "There is %s remaining in your break"
 msgid_plural "There are %s remaining in your break"
@@ -280,12 +218,12 @@ msgstr[0] "Jūsų pertraukai liko %s"
 msgstr[1] "Jūsų pertraukai liko %s"
 msgstr[2] "Jūsų pertraukai liko %s"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, c-format
 msgid "You were due to take a break %s ago"
 msgid_plural "You were due to take a break %s ago"
@@ -293,66 +231,74 @@ 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Pavėluota pertrauka"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Jūsų pertraukos laikas pasibaigė"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Pasirinkite pertraukų tvarkaraštį"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Užverti"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Trumpų ir ilgų pertraukų mišinys"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Retos ilgos pertraukos"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Dažnos trumpos pertraukos"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Apie"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Išeiti"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Pristatymo Turas"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Kompiuterinių pertraukų priminimai aktyviems protams"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "GNOME pertraukų laikmačio svetainė"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Išvertė:\n"
 "Moo"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "Gerai, supratau!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Galime pradėti"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Mikropertrauka"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -366,33 +312,41 @@ msgstr[2] ""
 "Pailsėkite nuo teksto rinkimo ir nusigręžkite nuo kompiuterio, kol nepraeis "
 "%s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Mikropertraukos laikas"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Aš suskambėsiu, kai ateis laikas vėl naudotis kompiuteriu."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Dažnai stabtelėkite, kad leistumėte akims atsipalaiduoti"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Iki jūsų kitos mikropertraukos liko"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Laikas mikropertraukai"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Dažnai stabtelėkite, kad leistumėte akims atsipalaiduoti"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Gerai, supratau!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Galime pradėti"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Pertrauka"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -400,45 +354,120 @@ msgstr[0] "Jūsų pertraukai liko %s. Aš priminsiu, kai ji pasibaigs."
 msgstr[1] "Jūsų pertraukai liko %s. Aš priminsiu, kai ji pasibaigs."
 msgstr[2] "Jūsų pertraukai liko %s. Aš priminsiu, kai ji pasibaigs."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Pertraukos laikas"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Skirkite laiko poilsiui nuo kompiuterio. Išsitieskite ir pajudėkite."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Iki jūsų kitos pilnos pertraukos liko"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Pertraukos laikas"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Pilna pertrauka"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Ir darykite kelias ilgesnes pertraukas, kad ištemptumėte kojas"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "Apie"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Išeiti"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Kas"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Trukmė"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Pertraukų laikmatis neatsako"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Jeigu kitą kartą jums prisijungus, tai vis dar tęsiasi, prašome <a href="
+"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>pranešti apie "
+"klaidą</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Pertraukų laikmatis daro pertrauką"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Įjunkite mane, kad tos pertraukos vyktų"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Nustatymuose jūs galite keisti pertraukų tipus ir jų laikus"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"Pertraukų laikmatis leidžia jums darytis mažas mikropertraukas, o taip pat "
+"ilgesnes pertraukas."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Mikropertraukos suteikia jums galimybę atsigręžti nuo ekrano ir leidžia "
+"pailsėti jūsų rankoms."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"Pilnos pertraukos yra laikas, skirtas atsitraukti nuo kompiuterio ir "
+"pajudėti."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pertraukos ir Mikropertraukos"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Galite tam reikalui palikti mane"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr "Pertraukų laikmatis, net jeigu jį užversite, tęs savo darbą fone."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Sveiki atvykę į Pertraukų laikmatį!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Pertraukos yra jums naudingos. Mes jums padėsime jas daryti."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Tiesiog įjunkite mane, kad pradėtumėte"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Prisiminkite darytis reguliarias naudojimosi kompiuteriu pertraukas"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Pateikia švelnius priminimus apie reguliarių pertraukų darymą"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Pasirinkite savo nuostatas mikropertraukoms ir poilsio pertraukoms"
+
+#~ msgid "Thank you"
+#~ msgstr "Ačiū"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Skirkite minutėlę pailsėti savo akims"
+
+#~ msgid "Full break"
+#~ msgstr "Pilna pertrauka"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "Ir darykite kelias ilgesnes pertraukas, kad ištemptumėte kojas"
diff --git a/po/oc.po b/po/oc.po
index ca37142..9793fe2 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-09-20 20:01+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2016-09-30 12:08+0200\n"
 "Last-Translator: Cédric VALMARY <cvalmary yahoo fr>\n"
 "Language-Team: Tot en òc (totenoc.eu)\n"
@@ -19,339 +18,281 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Minutador de pausas"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr ""
-"Remembratz-vos de far de pausas regularas al moment de l'utilizacion d'un "
-"ordenador"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Lo Minutador de pausas garda la traça del temps passat sus l'ordenador e "
-"vos rapèla de far de pausas regularas. Es concebut per encoratjar un "
-"compòrtament sanitós, amb una mescla de cortas pausas per vòstres uèlhs e "
-"vòstres ponhats e de pausas mai longas per vos desgordir las cambas e "
-"concentrar vòstre esperit sus vòstre prètzfait.</p> <p>Lo Minutador de "
-"pausas es de bon parametrar e podètz establir un programa de pausas que vos "
-"convenga. Contunharà de foncionar en rèireplan.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Provesís un rapèl discret de far de pausas regularas"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr ""
-"Causissètz vòstras preferéncias per las pausas cortas e las pausas longas"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Rapèls de pausas d'ordenador pels cervèlhs actius"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "pausa;corta;longa;repaus;minutador;programator;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "True (verai) per activar lo Minutador de pausas GNOME"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Lista de las pausas actualament activadas"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "True (verai) per activar lo mòde silenciós"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr ""
-"Amagar las pausas fins a l'expiracion del temps passat en mòde silenciós ("
-"valor de la clau quiet-mode-expire-time)."
+"Amagar las pausas fins a l'expiracion del temps passat en mòde silenciós "
+"(valor de la clau quiet-mode-expire-time)."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Temps d'expiracion del mòde silenciós."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Temps d'expiracion del mòde silenciós, en temps unix."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Temps entre las pausas"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Temps entre las pausas, en segondas."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Durada de las pausas"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Durada de cada pausa longa, en segondas."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Durada preferida entre las cortas pausas, en segondas"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Durada preferida de las pausas cortas, en segondas."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Lo Minutador de pausas respond pas"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Se aquò se reprodutz al moment de la connexion que ven, <a href=\""
-"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>establissètz un rapòrt de bogue</a>."
-"\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Lo Minutador de pausas fa una pausa"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Autorisatz-me a lançar aquelas pausas"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr ""
-"Podètz modificar lo tipe de pausas e lor programacion dins la configuracion"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Lo Minutador de pausas vos permet de far tan plan de pausas cortas coma de "
-"pausas longas."
+"<p>Lo Minutador de pausas garda la traça del temps passat sus l'ordenador e "
+"vos rapèla de far de pausas regularas. Es concebut per encoratjar un "
+"compòrtament sanitós, amb una mescla de cortas pausas per vòstres uèlhs e "
+"vòstres ponhats e de pausas mai longas per vos desgordir las cambas e "
+"concentrar vòstre esperit sus vòstre prètzfait.</p> <p>Lo Minutador de "
+"pausas es de bon parametrar e podètz establir un programa de pausas que vos "
+"convenga. Contunharà de foncionar en rèireplan.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Las pausas cortas son l'ocasion de quitar l'ecran e de repausar vòstras mans."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Las pausas longas son l'ocasion de quitar l'ordenador e d'anar far un torn."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pausas longas e cortas"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Me podètz daissar"
 
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
 msgstr ""
-"Lo Minutador de pausas contunharà de foncionar en arrèirplan quitament se lo "
-"tampatz."
 
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Benvenguda dins lo Minutador de pausas !"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Far una pausa es bon per vos. Vos anam ajudar a ne prene."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Activatz-me per aviar"
-
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segonda"
 msgstr[1] "%d segondas"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuta"
 msgstr[1] "%d minutas"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d oras"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Minutador de pausas GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "De qué me cal far ?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Mercé"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Passar aquela"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Es ora de far una corta pausa"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Pausa corta depassada"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "La pausa es acabada"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Vòstra pausa corta es acabada"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Remembratz-me-lo pus tard"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Temps per una pausa"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Pausa depassada"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Vòstre temps de pausa es acabat"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Causissètz lo programa de pausa"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Tampar"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Una mescla de pausas cortas e de pausas longas"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Pausas longas ocasionalas"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Pausas cortas frequentas"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "A prepaus"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Quitar"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Visita guidada"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Rapèls de pausas d'ordenador pels cervèlhs actius"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Site Web del Minutador de pausas GNOME"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr "Cédric Valmary (totenoc.eu) <cvalmary yahoo fr>, 2016"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "D'acòrdi, es fait !"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Prèst"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Pausa corta"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -362,78 +303,165 @@ msgstr[1] ""
 "Fasètz una pausa dins la sasida amb lo clavièr e gaitatz quicòm mai que "
 "l'ecran pendant %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Es ora d'una pausa corta"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Tindarai quand serà ora de se remetre a l'ordenador."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Fasètz fòrça pausas per vos repausar los uèlhs"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "La pausa corta que ven es dins"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Es ora de far una pausa corta"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Fasètz fòrça pausas per vos repausar los uèlhs"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "D'acòrdi, es fait !"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Prèst"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Pausa"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "Demòra %s de pausa. Vos avisararai quand serà acabada."
 msgstr[1] "Demòran %s de pausa. Vos avisararai quand serà acabada."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Es ora d'una pausa"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Passatz un moment luènh de l'ordenador. Estiratz-vos e fasètz un torn."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "La pausa longa que ven es dins"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Es ora d'una pausa"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Pausa longa"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "E prenètz un moment per vos desgordir las cambas"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "A prepaus"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Quitar"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Cada"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Pendent"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Lo Minutador de pausas respond pas"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Se aquò se reprodutz al moment de la connexion que ven, <a href=\"https://";
+"gitlab.gnome.org/GNOME/gnome-break-timer/issues\">establissètz un rapòrt de "
+"bogue</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Lo Minutador de pausas fa una pausa"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Autorisatz-me a lançar aquelas pausas"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr ""
+"Podètz modificar lo tipe de pausas e lor programacion dins la configuracion"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"Lo Minutador de pausas vos permet de far tan plan de pausas cortas coma de "
+"pausas longas."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Las pausas cortas son l'ocasion de quitar l'ecran e de repausar vòstras mans."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr ""
+"Las pausas longas son l'ocasion de quitar l'ordenador e d'anar far un torn."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pausas longas e cortas"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Me podètz daissar"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Lo Minutador de pausas contunharà de foncionar en arrèirplan quitament se lo "
+"tampatz."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Benvenguda dins lo Minutador de pausas !"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Far una pausa es bon per vos. Vos anam ajudar a ne prene."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Activatz-me per aviar"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr ""
+#~ "Remembratz-vos de far de pausas regularas al moment de l'utilizacion d'un "
+#~ "ordenador"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Provesís un rapèl discret de far de pausas regularas"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr ""
+#~ "Causissètz vòstras preferéncias per las pausas cortas e las pausas longas"
+
+#~ msgid "Thank you"
+#~ msgstr "Mercé"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Prenètz un moment per vos repausar los uèlhs"
+
+#~ msgid "Full break"
+#~ msgstr "Pausa longa"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "E prenètz un moment per vos desgordir las cambas"
diff --git a/po/pl.po b/po/pl.po
index e826a67..c3f5233 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,12 +4,12 @@
 # Paweł Żołnowski <pawel zolnowski gmail com>, 2014.
 # Piotr Drąg <piotrdrag gmail com>, 2014-2016.
 # Aviary.pl <community-poland mozilla org>, 2014-2016.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-20 13:50+0200\n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2016-08-20 13:51+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <community-poland mozilla org>\n"
@@ -20,162 +20,110 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Menedżer przerw"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Należy pamiętać o regularnych przerwach podczas pracy przy komputerze"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Menedżer przerw rejestruje czas, jaki użytkownik spędza przed komputerem "
-"i przypomina o regularnych przerwach. Został stworzony, aby promować zdrowe "
-"nawyki, takie jak krótkie przerwy dla oczu i nadgarstków oraz dłuższe "
-"przerwy, które zapewnią ciału trochę ruchu, a umysłowi dalsze skupienie na "
-"zadaniu.</p> <p>Menedżer przerw jest prosty w obsłudze, więc wystarczy tylko "
-"określić plan przerw wedle własnego uznania, a program sam będzie dalej "
-"działał w tle.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Nienachalne przypomnienia o regularnych przerwach"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr ""
-"Określenie preferencji odnośnie miniprzerw i dłuższych przerw na odpoczynek"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Przypomnienia o przerwach od komputera dla aktywnych umysłowo"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr ""
 "break;micro;rest;timer;przerwa;odpoczynek;licznik;przypomnienia;zdrowie;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Włączenie Menedżera przerw GNOME"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Lista aktywnych przerw"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Włączenie trybu cichego"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Pomijanie przerw aż do „quiet-mode-expire-time”."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Czas zakończenia trybu cichego."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Czas automatycznego wyłączenia trybu cichego (w czasie uniksowym)."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Czas między przerwami"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Czas między długimi przerwami (w sekundach)."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Długość każdej z przerw"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Długość każdej z długich przerw (w sekundach)."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Preferowany czas między miniprzerwami (w sekundach)."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Preferowana długość każdej z miniprzerw (w sekundach)."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Menedżer przerw nie odpowiada"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Jeśli się to powtórzy po następnym zalogowaniu, prosimy <a href=\"https://";
-"bugs.launchpad.net/brainbreak\">zgłosić błąd</a> (w języku angielskim).\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Menedżer przerw ma teraz przerwę"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Włącz program, aby uaktywnić przerwy"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Można zmienić rodzaje przerw oraz ich czas w oknie ustawień"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Menedżer przerw umożliwia ustawienie krótkich oraz dłuższych przerw."
+"<p>Menedżer przerw rejestruje czas, jaki użytkownik spędza przed komputerem "
+"i przypomina o regularnych przerwach. Został stworzony, aby promować zdrowe "
+"nawyki, takie jak krótkie przerwy dla oczu i nadgarstków oraz dłuższe "
+"przerwy, które zapewnią ciału trochę ruchu, a umysłowi dalsze skupienie na "
+"zadaniu.</p> <p>Menedżer przerw jest prosty w obsłudze, więc wystarczy tylko "
+"określić plan przerw wedle własnego uznania, a program sam będzie dalej "
+"działał w tle.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Miniprzerwy to okazja na odwrócenie wzroku od monitora i rozluźnienie dłoni."
-
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Pełne przerwy to czas na odejście od komputera i poruszanie się."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Przerwy i miniprzerwy"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Resztę można pozostawić programowi"
 
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
-msgstr "Menedżer przerw będzie działał dalej w tle, nawet po zamknięciu."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Witamy w Menedżerze przerw!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Przerwy są niezwykle potrzebne. Program pomoże o nich pamiętać."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
+msgstr ""
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Wystarczy go włączyć"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -183,7 +131,7 @@ msgstr[0] "%d sekundę"
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -191,7 +139,7 @@ msgstr[0] "%d minutę"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -199,35 +147,34 @@ msgstr[0] "%d godzinę"
 msgstr[1] "%d godziny"
 msgstr[2] "%d godzin"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Menedżer przerw GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Co teraz?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Dziękujemy"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Pomiń tę przerwę"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Czas na miniprzerwę"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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 +182,36 @@ 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Zaległa miniprzerwa"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Koniec przerwy"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Miniprzerwa dobiegła końca"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Przypomnij później"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Czas na przerwę"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, c-format
 msgid "There is %s remaining in your break"
 msgid_plural "There are %s remaining in your break"
@@ -276,12 +219,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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, c-format
 msgid "You were due to take a break %s ago"
 msgid_plural "You were due to take a break %s ago"
@@ -289,67 +232,75 @@ 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Zaległa przerwa"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Przerwa dobiegła końca"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Określenie własnego planu przerw"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "Za_mknij"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Połączenie krótkich i długich przerw"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Sporadyczne długie przerwy"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Częste krótkie przerwy"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "O programie"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Zakończ"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Wprowadzenie"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Przypomnienia o przerwach od komputera dla aktywnych umysłowo"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Witryna Menedżera przerw GNOME"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Paweł Żołnowski <pawel zolnowski gmail com>, 2014\n"
 "Piotr Drąg <piotrdrag gmail com>, 2014-2016\n"
 "Aviary.pl <community-poland mozilla org>, 2014-2016"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "Zrozumiano!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Gotowy"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Miniprzerwa"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -360,33 +311,41 @@ msgstr[1] ""
 msgstr[2] ""
 "Należy teraz oderwać dłonie od klawiatury i odwrócić wzrok od monitora na %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Czas na miniprzerwę"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Czas powrotu do komputera zostanie zasygnalizowany dźwiękiem."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Należy często pozwalać swoim oczom na odpoczynek"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Następna miniprzerwa odbędzie się za"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Czas na miniprzerwę"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Należy często pozwalać swoim oczom na odpoczynek"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Zrozumiano!"
+
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Gotowy"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Przerwa"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -394,47 +353,119 @@ msgstr[0] "Przerwa skończy się za %s. Program przypomni o jej końcu."
 msgstr[1] "Przerwa skończy się za %s. Program przypomni o jej końcu."
 msgstr[2] "Przerwa skończy się za %s. Program przypomni o jej końcu."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Czas na przerwę"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Należy spędzić chwilę z dala od komputera, porozciągać mięśnie i poruszać "
 "się trochę."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Następna pełna przerwa odbędzie się za"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Czas na przerwę"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Pełna przerwa"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Potrzebne są również dłuższe przerwy, aby rozprostować nogi"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "O programie"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Zakończ"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Co"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Przez"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Menedżer przerw nie odpowiada"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Jeśli się to powtórzy po następnym zalogowaniu, prosimy <a href=\"https://";
+"bugs.launchpad.net/brainbreak\">zgłosić błąd</a> (w języku angielskim).\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Menedżer przerw ma teraz przerwę"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Włącz program, aby uaktywnić przerwy"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Można zmienić rodzaje przerw oraz ich czas w oknie ustawień"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Menedżer przerw umożliwia ustawienie krótkich oraz dłuższych przerw."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Miniprzerwy to okazja na odwrócenie wzroku od monitora i rozluźnienie dłoni."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Pełne przerwy to czas na odejście od komputera i poruszanie się."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Przerwy i miniprzerwy"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Resztę można pozostawić programowi"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr "Menedżer przerw będzie działał dalej w tle, nawet po zamknięciu."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Witamy w Menedżerze przerw!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Przerwy są niezwykle potrzebne. Program pomoże o nich pamiętać."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Wystarczy go włączyć"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr ""
+#~ "Należy pamiętać o regularnych przerwach podczas pracy przy komputerze"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Nienachalne przypomnienia o regularnych przerwach"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr ""
+#~ "Określenie preferencji odnośnie miniprzerw i dłuższych przerw na "
+#~ "odpoczynek"
+
+#~ msgid "Thank you"
+#~ msgstr "Dziękujemy"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Czas na chwilę odpoczynku dla oczu"
+
+#~ msgid "Full break"
+#~ msgstr "Pełna przerwa"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "Potrzebne są również dłuższe przerwy, aby rozprostować nogi"
diff --git a/po/pt.po b/po/pt.po
index f35c8a5..2e0c43c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2015-09-19 08:55+0100\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73 gmail com>\n"
 "Language-Team: Português <palbuquerque73 gmail com>\n"
@@ -20,416 +19,446 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Temporizador de pausas"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Lembre-se de fazer pausas regulares quando utilizar o computador"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>O Temporizador de pausas mantém registo do quanto utiliza o computador, e "
-"recorda-o de fazer pausas regulares. É projetado para encorajar um "
-"comportamento saudável, com uma mistura de pausas curtas para seus olhos e "
-"pulsos, bem como pausas mais longas para manter seu corpo em movimento e a "
-"sua mente na tarefa.</p> <p>O Temporizador de pausas é simples de "
-"configurar, assim pode selecionar um cronograma de pausas que funcione para "
-"si e a aplicação cuidará disso em segundo plano.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Oferece um lembrete suave para fazer pausas regulares"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Selecione as suas preferências para pausas curtas e pausas de descanso"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Lembrete para mentes ativas descansarem afastando-se do computador"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "pausa;pausas;micro;descanso;temporizador;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Verdadeiro para ativar o temporizador de pausas do GNOME"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "A lista de pausas que estão ativadas atualmente"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Verdadeiro para habilitar o modo silencioso"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Oculta as pausas até o tempo de expiração do modo silencioso."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Tempo para terminar o modo silencioso."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr ""
 "O tempo para desativar automaticamente o modo silencioso, em formato unix."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Tempo entre pausas"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "O tempo entre intervalos de descanso, em segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Duração de cada pausa longa"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "A duração de cada intervalo de descanso, em segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "O tempo preferido entre as pausas curtas, em segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "A duração preferida de cada pausa curta, em segundos."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "O Temporizador de pausas não está a responder"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Caso o problema continue na próxima vez que iniciar sessão, por favor <a "
-"href=\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>abra um relatório de erro</a>."
-"\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "O Temporizador de pausas está a fazer uma pausa"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Ligue-me para continuar a execução de intervalos de pausas"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Pode mudar os tipos de pausas e os seus horários nas definições"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"O Temporizador de pausas permite que faça pausas curtas bem como pausas "
-"longas."
+"<p>O Temporizador de pausas mantém registo do quanto utiliza o computador, e "
+"recorda-o de fazer pausas regulares. É projetado para encorajar um "
+"comportamento saudável, com uma mistura de pausas curtas para seus olhos e "
+"pulsos, bem como pausas mais longas para manter seu corpo em movimento e a "
+"sua mente na tarefa.</p> <p>O Temporizador de pausas é simples de "
+"configurar, assim pode selecionar um cronograma de pausas que funcione para "
+"si e a aplicação cuidará disso em segundo plano.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Pausas curtas são uma hipótese de desviar os olhos do ecrã e descansar as "
-"mãos."
-
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Pausas longas são momentos para sair do computador e andar um pouco."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pausas longas e Pausas curtas"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Pode deixar isto para mim"
 
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"O Temporizador de pausas continuará a trabalhar em segundo plano, mesmo que "
-"o feche."
 
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Boas vindas ao Temporizador de pausas!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Pausas são boas para si. Esta aplicação ajuda-o a fazê-las."
-
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Para começar, basta iniciá-la"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Temporizador de pausas do GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "O que devo fazer?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Obrigado"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Ignorar esta"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "É hora de uma pausa curta"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Pausa curta atrasada"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "A pausa terminou"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "A sua pausa curta terminou"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Lembre-me mais tarde"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Hora de um descanso"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Pausa atrasada"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "O seu tempo de descanso acabou"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Escolha o seu horário de pausas"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Uma mistura de pausas curtas e longas"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Pausas longas ocasionais"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Pausas curtas frequentes"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Sobre"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Sair"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Roteiro de boas-vindas"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Lembrete para mentes ativas descansarem afastando-se do computador"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Página web do Temporizador de pausas do GNOME"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Tiago Santos, 2014.\n"
 "Pedro Albuquerque <palbuquerque73 gmail com, 2015."
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "Já percebi!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Pronto para começar"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Pausa curta"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "Pare de escrever e desvie o olhar do ecrã por %s."
 msgstr[1] "Pare de escrever e desvie o olhar do ecrã por %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "É hora de uma pausa curta"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Avisá-lo-ei quando for a hora de usar o computador novamente."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Pause frequentemente para relaxar os seus olhos"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "A sua próxima pausa curta é em"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "É hora de uma pausa curta"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Pause frequentemente para relaxar os seus olhos"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Já percebi!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Pronto para começar"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Pausa"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "Resta-lhe %s de pausa. Vou lembrar-lhe quando terminar."
 msgstr[1] "Restam-lhe %s de pausa. Vou lembrar-lhe quando terminar."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "É tempo de uma pausa"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Afaste-se do computador por algum tempo. Espreguice-se e ande um pouco."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "A sua próxima pausa completa é em"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "É hora de uma pausa"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Pausa completa"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "E faça algumas pausas mais longas para esticar as suas pernas"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "Sobre"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Sair"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "A cada"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Por"
 
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "O Temporizador de pausas não está a responder"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Caso o problema continue na próxima vez que iniciar sessão, por favor <a "
+"href=\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>abra um "
+"relatório de erro</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "O Temporizador de pausas está a fazer uma pausa"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Ligue-me para continuar a execução de intervalos de pausas"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Pode mudar os tipos de pausas e os seus horários nas definições"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"O Temporizador de pausas permite que faça pausas curtas bem como pausas "
+"longas."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Pausas curtas são uma hipótese de desviar os olhos do ecrã e descansar as "
+"mãos."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Pausas longas são momentos para sair do computador e andar um pouco."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pausas longas e Pausas curtas"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Pode deixar isto para mim"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"O Temporizador de pausas continuará a trabalhar em segundo plano, mesmo que "
+"o feche."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Boas vindas ao Temporizador de pausas!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Pausas são boas para si. Esta aplicação ajuda-o a fazê-las."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Para começar, basta iniciá-la"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Lembre-se de fazer pausas regulares quando utilizar o computador"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Oferece um lembrete suave para fazer pausas regulares"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr ""
+#~ "Selecione as suas preferências para pausas curtas e pausas de descanso"
+
+#~ msgid "Thank you"
+#~ msgstr "Obrigado"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Tire um momento para descansar os seus olhos"
+
+#~ msgid "Full break"
+#~ msgstr "Pausa completa"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "E faça algumas pausas mais longas para esticar as suas pernas"
+
 #~ msgid "Copyright © Dylan McCall"
 #~ msgstr "Copyright © Dylan McCall"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4012d23..b4f41ac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-11-07 04:31-0300\n"
 "Last-Translator: Rafael Ferreira <rafael f f1 gmail com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
@@ -21,418 +20,448 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Temporizador de pausas"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Lembre-se de fazer pausas regulares quando usar o computador"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>O temporizador de pausas mantém registro do quanto você está usado o "
-"computador, e te lembra de fazer pausas regulares. É projetado para "
-"encorajar um comportamento saudável, com uma mistura de pausas curtas para "
-"seus olhos e pulsos, bem como pausas mais longas para manter seu corpo em "
-"movimento e sua mente na tarefa.</p> <p>O temporizador de pausas é simples "
-"de configurar, assim você pode selecionar um cronograma de pausas que "
-"funcione para você e o aplicativo irá cuidar disso em segundo plano.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Oferece um leve lembrete para fazer pausas regulares"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Selecione suas preferências para pausas curtas e pausas de descanso"
+# É sempre recomendável deixar a frase com uma escrita que não gere sombras de dúvida, mesmo que esta fique 
maior. Dizer "pausa do computador" não implica diretamente em um humano parando de usar a máquina por um 
tempo, pode dar sentido de o computador pausar suas atividades automaticamente --Enrico
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Lembretes para mentes ativas descansarem afastando-se do computador"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "pausa;pausas;micro;descanso;temporizador;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Verdadeiro para ativar o temporizador de pausas do GNOME"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "A lista de pausas que estão ativadas atualmente"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Verdadeiro para habilitar o modo silencioso"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Esconde as pausas até o tempo de expiração do modo silencioso."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Tempo para terminar o modo silencioso."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr ""
 "O tempo para desabilitar automaticamente o modo silencioso, em formato unix."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Tempo entre pausas"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "O tempo entre intervalos de descanso, em segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Duração de cada pausa longa"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "A duração de cada intervalo de descanso, em segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "O tempo preferido entre as pausas curtas, em segundos."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "A duração preferida de cada pausa curta, em segundos."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "O temporizador de pausas não está respondendo"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
-msgstr ""
-"Caso isso continue na próxima vez que você iniciar sessão, por favor <a href="
-"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>abra um relatório de erro</a>.\t"
-
-# Paralizado no sentido de inerte, sem ação. Suprimido a tradução de "fazendo uma pausa" para não confundir 
o usuário, pois o aplicativo é destinado a realizar pausas, o que não faz agora. --Enrico
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "O temporizador de pausas está paralizado"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Ligue-me para continuar a execução de intervalos de pausas"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Você pode mudar os tipos de pausas e seus horários nas preferências"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"O temporizador de pausas permite que você faça pausas curtas bem como pausas "
-"longas."
+"<p>O temporizador de pausas mantém registro do quanto você está usado o "
+"computador, e te lembra de fazer pausas regulares. É projetado para "
+"encorajar um comportamento saudável, com uma mistura de pausas curtas para "
+"seus olhos e pulsos, bem como pausas mais longas para manter seu corpo em "
+"movimento e sua mente na tarefa.</p> <p>O temporizador de pausas é simples "
+"de configurar, assim você pode selecionar um cronograma de pausas que "
+"funcione para você e o aplicativo irá cuidar disso em segundo plano.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Pausas curtas são uma chance de desviar os olhos da tela e descansar suas "
-"mãos."
-
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Pausas longas são momentos para sair do computador e andar um pouco."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Pausas longas e pausas curtas"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Você pode deixar isso para mim"
 
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"O temporizador de pausas continuará trabalhando em segundo plano, mesmo que "
-"você o feche."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Bem vindo ao temporizador de pausas!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Pausas são boas para você. Vamos ajudá-lo a fazê-las."
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Para começar, basta me ligar"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Temporizador de pausas do GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "O que devo fazer?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Obrigado"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Pular esta"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "É hora de uma pausa curta"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Pausa curta atrasada"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "A pausa terminou"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Sua pausa curta terminou"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Lembre-me depois"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Hora de um descanso"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Pausa atrasada"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Seu tempo de descanso acabou"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Selecione seu cronograma de pausas"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "Fec_har"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Uma mistura de pausas curtas e longas"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Pausas longas ocasionais"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Pausas curtas frequentes"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Sobre"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Sair"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Passeio de boas-vindas"
 
-# É sempre recomendável deixar a frase com uma escrita que não gere sombras de dúvida, mesmo que esta fique 
maior. Dizer "pausa do computador" não implica diretamente em um humano parando de usar a máquina por um 
tempo, pode dar sentido de o computador pausar suas atividades automaticamente --Enrico
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Lembretes para mentes ativas descansarem afastando-se do computador"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Site do temporizador de pausas do GNOME"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Georges Basile Stavracas Neto <georges stavracas gmail com>, 2013.\n"
 "Enrico Nicoletto <liverig gmail com>, 2013.\n"
 "Antonio Fernandes C. Neto <fernandesn gnome org>, 2013."
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "Ok, entendi!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Pronto para ir"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Pausa curta"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "Pare de digitar e desvie o olhar da tela por %s."
 msgstr[1] "Pare de digitar e desvie o olhar da tela por %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "É hora de uma pausa curta"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Irei avisar quando for a hora de usar o computador novamente."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Pause frequentemente para relaxar seus olhos"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Sua próxima pausa curta é em"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "É hora de uma pausa curta"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Pause frequentemente para relaxar seus olhos"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Ok, entendi!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Pronto para ir"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Pausa"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "A sua pausa tem %s restante. Vou lembrá-lo quando terminar."
 msgstr[1] "A sua pausa tem %s restantes. Vou lembrá-lo quando terminar."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "É hora de uma pausa"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Fique longe do computador por um tempo. Alongue-se e dê uma volta por aí."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Sua próxima pausa completa é em"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "É hora de uma pausa"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Pausa completa"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "E faça algumas pausas mais longas para esticar suas pernas"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "Sobre"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Sair"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "A cada"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Por"
 
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "O temporizador de pausas não está respondendo"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Caso isso continue na próxima vez que você iniciar sessão, por favor <a href="
+"\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>abra um "
+"relatório de erro</a>.\t"
+
+# Paralizado no sentido de inerte, sem ação. Suprimido a tradução de "fazendo uma pausa" para não confundir 
o usuário, pois o aplicativo é destinado a realizar pausas, o que não faz agora. --Enrico
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "O temporizador de pausas está paralizado"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Ligue-me para continuar a execução de intervalos de pausas"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Você pode mudar os tipos de pausas e seus horários nas preferências"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr ""
+"O temporizador de pausas permite que você faça pausas curtas bem como pausas "
+"longas."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Pausas curtas são uma chance de desviar os olhos da tela e descansar suas "
+"mãos."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Pausas longas são momentos para sair do computador e andar um pouco."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Pausas longas e pausas curtas"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Você pode deixar isso para mim"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"O temporizador de pausas continuará trabalhando em segundo plano, mesmo que "
+"você o feche."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Bem vindo ao temporizador de pausas!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Pausas são boas para você. Vamos ajudá-lo a fazê-las."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Para começar, basta me ligar"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Lembre-se de fazer pausas regulares quando usar o computador"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Oferece um leve lembrete para fazer pausas regulares"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Selecione suas preferências para pausas curtas e pausas de descanso"
+
+#~ msgid "Thank you"
+#~ msgstr "Obrigado"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Tire um momento para descansar seus olhos"
+
+#~ msgid "Full break"
+#~ msgstr "Pausa completa"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "E faça algumas pausas mais longas para esticar suas pernas"
+
 #~ msgid "Copyright © Dylan McCall"
 #~ msgstr "Copyright © Dylan McCall"
diff --git a/po/sl.po b/po/sl.po
index 7e0730b..8248f7c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-16 06:08+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-09-16 17:36+0100\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
@@ -22,161 +21,109 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Časomer odmorov"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Ne pozabite na redne odmore med uporabo računalnika"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Časomer odmorov spremlja, koliko časa uporabljate računalnik, in vas "
-"opominja, da si privoščite redne odmore. Načrtovan je tako, da vzpodbuja "
-"zdravo vedenje na delovnem mestu z mešanico kratkih odmorov za vaše oči in "
-"zapestja kot tudi daljših odmorov, ki ohranjajo vaše telo v gibanju in vaše "
-"misli pri delu.</p> <p>Časomer odmorov je enostavno nastaviti, saj lahko "
-"izberete razpored odmorov, ki je primeren za vas, ta pa deluje v ozadju.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Ponuja nežen opomnik za redne odmore"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Izberite svoje nastavitve za kratke in daljše odmore"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Opomniki za odmor pri računalniku za dejavne glave"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "odmor;kratek odmor;časomer;počitek;delo;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Izbrana možnost omogoči Časomer odmorov GNOME."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Seznam odmorov, ki so trenutno omogočeni"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Izbrana možnost omogoči tihi način"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Skrije opozorila za odmore do končanja tihega načina."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Čas za končanje tihega načina."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr ""
 "Čas, kolikor naj bo samodejno onemogočen tihi način, v času sistema unix."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Čas med odmori"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Čas v sekundah med odmori za počitek, v sekundah."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Trajanje vsakega odmora"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Trajanje vsakega odmora s počitkom, v sekundah."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Zaželeni čas med kratkimi odmori, v sekundah."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Zaželeno trajanje vsakega kratkega odmora, v sekundah."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Časomer odmorov se ne odziva"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Če se to nadaljuje ob vaši naslednji prijavi, pošljite <a href=\"https://";
-"bugs.launchpad.net/brainbreak\">poročilo o hrošču</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Časomer odmorov trenutno počiva"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Omogočite program, da vam odmori ne bodo uhajali"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Vrsto odmorov in njihovo trajanje lahko spreminjate v nastavitvah."
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Časomer odmorov vam odmerja kratke in daljše odmore."
+"<p>Časomer odmorov spremlja, koliko časa uporabljate računalnik, in vas "
+"opominja, da si privoščite redne odmore. Načrtovan je tako, da vzpodbuja "
+"zdravo vedenje na delovnem mestu z mešanico kratkih odmorov za vaše oči in "
+"zapestja kot tudi daljših odmorov, ki ohranjajo vaše telo v gibanju in vaše "
+"misli pri delu.</p> <p>Časomer odmorov je enostavno nastaviti, saj lahko "
+"izberete razpored odmorov, ki je primeren za vas, ta pa deluje v ozadju.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Kratki odmori so priložnost za pogled stran od zaslona in za počitek vaših "
-"rok."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Daljši odmori so priložnost za oddih stran od računalnika."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Odmori in kratki odmori"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Zaenkrat preskoči"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
-msgstr "Časomer odmorov bo deloval v ozadju, četudi ga zaprete."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Dobrodošli v Časomeru odmorov!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Odmori so dobra stvar. Pomagali vam jih bomo izkoristiti."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
+msgstr ""
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Kar začnimo"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -185,7 +132,7 @@ msgstr[1] "%d sekunda"
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunde"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -195,7 +142,7 @@ msgstr[2] "%d minuti"
 msgstr[3] "%d minute"
 
 # multiple plural ?
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -204,35 +151,34 @@ msgstr[1] "%d ura"
 msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Časomer odmorov GNOME"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Kaj storiti?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Hvala!"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Tega preskoči"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Čas je za kratek odmor"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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 +187,36 @@ 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Zapozneli kratek odmor"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Odmor je končan"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Vaš kratek odmor je končan"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Spomni me kasneje"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Čas je za odmor"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, c-format
 msgid "There is %s remaining in your break"
 msgid_plural "There are %s remaining in your break"
@@ -283,12 +225,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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, c-format
 msgid "You were due to take a break %s ago"
 msgid_plural "You were due to take a break %s ago"
@@ -297,64 +239,72 @@ 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Zapozneli odmor"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Vaš odmor je končan"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Izberite svoj razpored odmorov"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Zapri"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Mešanica kratkih in daljših odmorov"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Občasni kratki odmori"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Pogosti kratki odmori"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "O programu"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Končaj"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Voden ogled"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Opomniki za odmor pri računalniku za dejavne glave"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Spletna stran Časomer odmorov GNOME"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr "Martin Srebotnjak"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "Prav, razumem!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Pripravljen na delo"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Kratek odmor"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -363,33 +313,41 @@ msgstr[1] "Privoščite si odmor med tipkanjem in za %s glejte stran od zaslona.
 msgstr[2] "Privoščite si odmor med tipkanjem in za %s glejte stran od zaslona."
 msgstr[3] "Privoščite si odmor med tipkanjem in za %s glejte stran od zaslona."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Čas je za kratek odmor"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Ko bo čas za ponovno rabo računalnika, boste obveščeni."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Priporočeni so pogosti premori za sproščanje oči"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Naslednji kratek odmor bo čez"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Čas je za kratek odmor"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Priporočeni so pogosti premori za sproščanje oči"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "Prav, razumem!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Pripravljen na delo"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Odmor"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -398,46 +356,116 @@ msgstr[1] "Vašemu odmoru preostaja %s. Opomnili vas bomo, ko bo pri koncu."
 msgstr[2] "Vašemu odmoru preostaja %s. Opomnili vas bomo, ko bo pri koncu."
 msgstr[3] "Vašemu odmoru preostaja %s. Opomnili vas bomo, ko bo pri koncu."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Čas je za odmor"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Za kratek čas pojdite stran od računalnika. Pretegnite se in se gibajte."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Naslednji daljši odmor je čez"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Čas je za odmor"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Daljši odmor"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Privoščite si nekaj daljših odmorov, da si pretegnete noge"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "O programu"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Končaj"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Vsakih"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Traja"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Časomer odmorov se ne odziva"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Če se to nadaljuje ob vaši naslednji prijavi, pošljite <a href=\"https://";
+"bugs.launchpad.net/brainbreak\">poročilo o hrošču</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Časomer odmorov trenutno počiva"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Omogočite program, da vam odmori ne bodo uhajali"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Vrsto odmorov in njihovo trajanje lahko spreminjate v nastavitvah."
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Časomer odmorov vam odmerja kratke in daljše odmore."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Kratki odmori so priložnost za pogled stran od zaslona in za počitek vaših "
+"rok."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Daljši odmori so priložnost za oddih stran od računalnika."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Odmori in kratki odmori"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Zaenkrat preskoči"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr "Časomer odmorov bo deloval v ozadju, četudi ga zaprete."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Dobrodošli v Časomeru odmorov!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Odmori so dobra stvar. Pomagali vam jih bomo izkoristiti."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Kar začnimo"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Ne pozabite na redne odmore med uporabo računalnika"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Ponuja nežen opomnik za redne odmore"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Izberite svoje nastavitve za kratke in daljše odmore"
+
+#~ msgid "Thank you"
+#~ msgstr "Hvala!"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Vzemite si trenutek, da si odpočijete oči"
+
+#~ msgid "Full break"
+#~ msgstr "Daljši odmor"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "Privoščite si nekaj daljših odmorov, da si pretegnete noge"
diff --git a/po/sr.po b/po/sr.po
index 3adc0e8..133ab44 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-10-25 10:56+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
@@ -16,165 +15,113 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Надзорник одмора"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Не заборавите да се с времена на време одморите од рада на рачунару"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Надзорник одмора прати време које проводите за рачунаром, и подсећа вас "
-"када је време за редовне одморе. Осмишљен је да охрабри здраво понашање, са "
-"мешавином краћих одмора за ваше очи и зглобове, као и дужих одмора како "
-"бисте се малко размрдали и промислили о томе што радите.</p> <p>Надзорник "
-"одмора је једноставан за подешавање, тако да можете да направите план "
-"одмарања који вам одговара, а он ће се бринути о свему осталом радећи у "
-"позадини.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Обезбеђује пријатни подсетник за редовне одморе"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Изаберите ваше поставке за предахе и за одморе"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Подсетник на одмор од рачунара за активне умове"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "прекид;микро;одмор;одбројавач;тајмер;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Изабрано за укључивање Гномовог надзорника одмора"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Списак одмора који су тренутно укључени"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Изабрано за укључивање тихог режима"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Скрива одморе све док не-истекне-време-тихог-режима."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Време за завршавање тихог режима."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Време за самостално искључивање тихог режима, у времену јуникса."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Време између одмора"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Време између одмора, у секундама."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Трајање сваког одмора"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Трајање сваког одмора, у секундама."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Жељено време између предаха, у секундама."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Жељено трајање сваког предаха, у секундама."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Надзорник одмора не одговара"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Ако се ово настави када се следећи пут пријавите, <a href=\""
-"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>направите извештај о грешци</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Надзорник одмора се одмара"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Укључите ме да наставите са тим одморима"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Можете да измените врсте одмора и њихово трајање у подешавањима"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Надзорник одмора вам даје могућност и да предахнете и да се одморите."
-
-#: ../data/settings-panels.ui.h:7
-msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
-msgstr "Предаси су прилика да скренете поглед са екрана и да одморите руке."
-
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Дуги одмори су прилике да се удаљите од рачунара и да се прошетате."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Одмори и предаси"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Можете да ме оставите њему"
+"<p>Надзорник одмора прати време које проводите за рачунаром, и подсећа вас "
+"када је време за редовне одморе. Осмишљен је да охрабри здраво понашање, са "
+"мешавином краћих одмора за ваше очи и зглобове, као и дужих одмора како "
+"бисте се малко размрдали и промислили о томе што радите.</p> <p>Надзорник "
+"одмора је једноставан за подешавање, тако да можете да направите план "
+"одмарања који вам одговара, а он ће се бринути о свему осталом радећи у "
+"позадини.</p>"
 
-#: ../data/settings-panels.ui.h:11
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Надзорник одмора ће се бринути о томе радећи у позадини, чак и када га "
-"затворите."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Добро дошли код Надзорника одмора!"
 
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Одмори су добри за ваше здравље. Ми ћемо вам помоћи да их остварите."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
+msgstr ""
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Једноставно ме укључи да бих почео"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -183,7 +130,7 @@ msgstr[1] "%d секунде"
 msgstr[2] "%d секунди"
 msgstr[3] "једна секунда"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -192,7 +139,7 @@ msgstr[1] "%d минута"
 msgstr[2] "%d минута"
 msgstr[3] "један минут"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -201,35 +148,34 @@ msgstr[1] "%d сата"
 msgstr[2] "%d сати"
 msgstr[3] "један сат"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Гномов надзорник одмора"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Шта треба да урадим?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Хвала вам"
-
-#: ../daemon/DaemonApplication.vala:20 ../settings/MainWindow.vala:148
-msgid "GNOME Break Timer"
-msgstr "Гномов надзорник одмора"
-
 #. Label for a notification action that will skip the current microbreak
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Овај прескочи"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Време је за предах"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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 +184,37 @@ msgstr[1] "Требали сте да предахнете пре %s"
 msgstr[2] "Требали сте да предахнете пре %s"
 msgstr[3] "Требали сте да предахнете пре %s"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Прескочи предах"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Одмор је завршен"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Ваш предах се завршио"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Подсети ме касније"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Време је за одмор"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, c-format
 msgid "There is %s remaining in your break"
 msgid_plural "There are %s remaining in your break"
@@ -281,12 +223,12 @@ msgstr[1] "Остала су вам још %s одмора"
 msgstr[2] "Остало вам је још %s одмора"
 msgstr[3] "Остало вам је још %s одмора "
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, c-format
 msgid "You were due to take a break %s ago"
 msgid_plural "You were due to take a break %s ago"
@@ -295,67 +237,75 @@ msgstr[1] "Требали сте да се одморите пре %s"
 msgstr[2] "Требали сте да се одморите пре %s"
 msgstr[3] "Требали сте да се одморите пре %s"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Прескочи одмор"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Време вашег одмора је истекло"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Изаберите ваш план одмора"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Мешавина кратких и дугих одмора"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Повремени дуги одмори"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Чести кратки одмори"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "О програму"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Изађи"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Добродошлица"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Подсетник на одмор од рачунара за активне умове"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Веб страница Гномовог надзорника одмора"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "  Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "\n"
 "http://prevod.org — превод на српски језик"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "У реду, мој је!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Спремни за полазак"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Предах"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -364,33 +314,41 @@ msgstr[1] "Одморите се од куцања и гледајте ван е
 msgstr[2] "Одморите се од куцања и гледајте ван екрана %s."
 msgstr[3] "Одморите се од куцања и гледљјте ван екрана %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Време је за предах"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Ја ћу да зврцнем када буде било време да поново користите рачунар."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Застаните често да одморите ваше очи"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Ваш следећи предах је за"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Време је за предах"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Застаните често да одморите ваше очи"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "У реду, мој је!"
+
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Спремни за полазак"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Одмор"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -399,46 +357,116 @@ msgstr[1] "Остала су вам %s одмора. Ја ћу вас подсе
 msgstr[2] "Остаоло вам је %s одмора. Ја ћу вас подсетити када буде завршен."
 msgstr[3] "Остао вам је %s одмора. Ја ћу вас подсетити када буде завршен."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Време је за одмор"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Удаљите се неко време од рачунара. Протеглите се и прошетајте се около."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Ваш следећи велики одмор је за"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Време је за одмор"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Велики одмор"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "И направите неке подуже одморе да протеглите ноге"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "О програму"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Изађи"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Сваких"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "За"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Надзорник одмора не одговара"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Ако се ово настави када се следећи пут пријавите, <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">направите извештај о грешци</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Надзорник одмора се одмара"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Укључите ме да наставите са тим одморима"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Можете да измените врсте одмора и њихово трајање у подешавањима"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Надзорник одмора вам даје могућност и да предахнете и да се одморите."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr "Предаси су прилика да скренете поглед са екрана и да одморите руке."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Дуги одмори су прилике да се удаљите од рачунара и да се прошетате."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Одмори и предаси"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Можете да ме оставите њему"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Надзорник одмора ће се бринути о томе радећи у позадини, чак и када га "
+"затворите."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Добро дошли код Надзорника одмора!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Одмори су добри за ваше здравље. Ми ћемо вам помоћи да их остварите."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Једноставно ме укључи да бих почео"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Не заборавите да се с времена на време одморите од рада на рачунару"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Обезбеђује пријатни подсетник за редовне одморе"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Изаберите ваше поставке за предахе и за одморе"
+
+#~ msgid "Thank you"
+#~ msgstr "Хвала вам"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Одморите ваше очи на тренутак"
+
+#~ msgid "Full break"
+#~ msgstr "Велики одмор"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "И направите неке подуже одморе да протеглите ноге"
diff --git a/po/sr latin po b/po/sr latin po
index b6d7394..5171c66 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-31 01:27+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2014-10-25 10:56+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
@@ -16,165 +15,113 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Nadzornik odmora"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Ne zaboravite da se s vremena na vreme odmorite od rada na računaru"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Nadzornik odmora prati vreme koje provodite za računarom, i podseća vas "
-"kada je vreme za redovne odmore. Osmišljen je da ohrabri zdravo ponašanje, sa "
-"mešavinom kraćih odmora za vaše oči i zglobove, kao i dužih odmora kako "
-"biste se malko razmrdali i promislili o tome što radite.</p> <p>Nadzornik "
-"odmora je jednostavan za podešavanje, tako da možete da napravite plan "
-"odmaranja koji vam odgovara, a on će se brinuti o svemu ostalom radeći u "
-"pozadini.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Obezbeđuje prijatni podsetnik za redovne odmore"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Izaberite vaše postavke za predahe i za odmore"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Podsetnik na odmor od računara za aktivne umove"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "prekid;mikro;odmor;odbrojavač;tajmer;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "Izabrano za uključivanje Gnomovog nadzornika odmora"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Spisak odmora koji su trenutno uključeni"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Izabrano za uključivanje tihog režima"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Skriva odmore sve dok ne-istekne-vreme-tihog-režima."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Vreme za završavanje tihog režima."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Vreme za samostalno isključivanje tihog režima, u vremenu juniksa."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Vreme između odmora"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Vreme između odmora, u sekundama."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Trajanje svakog odmora"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Trajanje svakog odmora, u sekundama."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Željeno vreme između predaha, u sekundama."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Željeno trajanje svakog predaha, u sekundama."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Nadzornik odmora ne odgovara"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Ako se ovo nastavi kada se sledeći put prijavite, <a href=\""
-"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>napravite izveštaj o grešci</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Nadzornik odmora se odmara"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Uključite me da nastavite sa tim odmorima"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Možete da izmenite vrste odmora i njihovo trajanje u podešavanjima"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Nadzornik odmora vam daje mogućnost i da predahnete i da se odmorite."
-
-#: ../data/settings-panels.ui.h:7
-msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
-msgstr "Predasi su prilika da skrenete pogled sa ekrana i da odmorite ruke."
-
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Dugi odmori su prilike da se udaljite od računara i da se prošetate."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Odmori i predasi"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Možete da me ostavite njemu"
+"<p>Nadzornik odmora prati vreme koje provodite za računarom, i podseća vas "
+"kada je vreme za redovne odmore. Osmišljen je da ohrabri zdravo ponašanje, "
+"sa mešavinom kraćih odmora za vaše oči i zglobove, kao i dužih odmora kako "
+"biste se malko razmrdali i promislili o tome što radite.</p> <p>Nadzornik "
+"odmora je jednostavan za podešavanje, tako da možete da napravite plan "
+"odmaranja koji vam odgovara, a on će se brinuti o svemu ostalom radeći u "
+"pozadini.</p>"
 
-#: ../data/settings-panels.ui.h:11
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Nadzornik odmora će se brinuti o tome radeći u pozadini, čak i kada ga "
-"zatvorite."
 
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Dobro došli kod Nadzornika odmora!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Odmori su dobri za vaše zdravlje. Mi ćemo vam pomoći da ih ostvarite."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
+msgstr ""
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Jednostavno me uključi da bih počeo"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -183,7 +130,7 @@ msgstr[1] "%d sekunde"
 msgstr[2] "%d sekundi"
 msgstr[3] "jedna sekunda"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -192,7 +139,7 @@ msgstr[1] "%d minuta"
 msgstr[2] "%d minuta"
 msgstr[3] "jedan minut"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -201,35 +148,34 @@ msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 msgstr[3] "jedan sat"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "Gnomov nadzornik odmora"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Šta treba da uradim?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Hvala vam"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Ovaj preskoči"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Vreme je za predah"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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 +184,38 @@ msgstr[1] "Trebali ste da predahnete pre %s"
 msgstr[2] "Trebali ste da predahnete pre %s"
 msgstr[3] "Trebali ste da predahnete pre %s"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Preskoči predah"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Odmor je završen"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Vaš predah se završio"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Podseti me kasnije"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Vreme je za odmor"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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!"
+"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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, c-format
 msgid "There is %s remaining in your break"
 msgid_plural "There are %s remaining in your break"
@@ -281,12 +224,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 "
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, c-format
 msgid "You were due to take a break %s ago"
 msgid_plural "You were due to take a break %s ago"
@@ -295,67 +238,75 @@ 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Preskoči odmor"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Vreme vašeg odmora je isteklo"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Izaberite vaš plan odmora"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Mešavina kratkih i dugih odmora"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Povremeni dugi odmori"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Česti kratki odmori"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "O programu"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Izađi"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Dobrodošlica"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Podsetnik na odmor od računara za aktivne umove"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "Veb stranica Gnomovog nadzornika odmora"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "  Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "\n"
 "http://prevod.org — prevod na srpski jezik"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "U redu, moj je!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Spremni za polazak"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Predah"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
@@ -364,33 +315,41 @@ msgstr[1] "Odmorite se od kucanja i gledajte van ekrana %s."
 msgstr[2] "Odmorite se od kucanja i gledajte van ekrana %s."
 msgstr[3] "Odmorite se od kucanja i gledljjte van ekrana %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Vreme je za predah"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Ja ću da zvrcnem kada bude bilo vreme da ponovo koristite računar."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Zastanite često da odmorite vaše oči"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Vaš sledeći predah je za"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Vreme je za predah"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Zastanite često da odmorite vaše oči"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "U redu, moj je!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Spremni za polazak"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Odmor"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
@@ -399,46 +358,116 @@ msgstr[1] "Ostala su vam %s odmora. Ja ću vas podsetiti kada bude završen."
 msgstr[2] "Ostaolo vam je %s odmora. Ja ću vas podsetiti kada bude završen."
 msgstr[3] "Ostao vam je %s odmora. Ja ću vas podsetiti kada bude završen."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Vreme je za odmor"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr ""
 "Udaljite se neko vreme od računara. Proteglite se i prošetajte se okolo."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Vaš sledeći veliki odmor je za"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Vreme je za odmor"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Veliki odmor"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "I napravite neke poduže odmore da proteglite noge"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "O programu"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "Izađi"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Svakih"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Za"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Nadzornik odmora ne odgovara"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Ako se ovo nastavi kada se sledeći put prijavite, <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">napravite izveštaj o grešci</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Nadzornik odmora se odmara"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Uključite me da nastavite sa tim odmorima"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Možete da izmenite vrste odmora i njihovo trajanje u podešavanjima"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Nadzornik odmora vam daje mogućnost i da predahnete i da se odmorite."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr "Predasi su prilika da skrenete pogled sa ekrana i da odmorite ruke."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Dugi odmori su prilike da se udaljite od računara i da se prošetate."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Odmori i predasi"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Možete da me ostavite njemu"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Nadzornik odmora će se brinuti o tome radeći u pozadini, čak i kada ga "
+"zatvorite."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Dobro došli kod Nadzornika odmora!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Odmori su dobri za vaše zdravlje. Mi ćemo vam pomoći da ih ostvarite."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Jednostavno me uključi da bih počeo"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Ne zaboravite da se s vremena na vreme odmorite od rada na računaru"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Obezbeđuje prijatni podsetnik za redovne odmore"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Izaberite vaše postavke za predahe i za odmore"
+
+#~ msgid "Thank you"
+#~ msgstr "Hvala vam"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Odmorite vaše oči na trenutak"
+
+#~ msgid "Full break"
+#~ msgstr "Veliki odmor"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "I napravite neke poduže odmore da proteglite noge"
diff --git a/po/sv.po b/po/sv.po
index ca8c665..ff2ef31 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-break-timer&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2016-04-24 07:18+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2016-04-25 11:42+0100\n"
 "Last-Translator: Isak Östlund <translate catnip nu>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -18,386 +18,434 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Break Timer"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Tänk på att ta regelbundna raster från datorn"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid "<p>Break Timer keeps track of how much you are using the computer, and it reminds you to take regular 
breaks. It is designed to encourage healthy behaviour, with a mix of short breaks for your eyes and wrists, 
as well as longer breaks to keep your body moving and your mind on task.</p> <p>Break Timer is simple to set 
up, so you can pick a break schedule that works for you and it will carry on working in the background.</p>"
-msgstr "<p>Break Timer håller reda på hur länge du använder datorn och påminner dig om att ta regelbundna 
raster. Den är utformad för att uppmuntra sunt beteende med en blandning av korta raster för ögon och 
handleder och dessutom längre raster för att hålla kroppen igång och sinnet fokuserat.</p> <p>Break Timer är 
lätt att ställa in så du kan välja ett rastschema som passar dig - programmet kommer att fortsätta arbeta i 
bakgrunden.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Ger diskreta påminnelser för regelbundna raster"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Välj inställningar för pauser och raster"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Rast från datorn för aktiva sinnen"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "rast;paus;vila;timer;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "True (sant) för att aktivera GNOME Break Timer"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Lista med aktiva raster"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "True (sant) för att aktivera tyst läge"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "Döljer raster fram till quiet-mode-expire-time."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Tid att avsluta tyst läge."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Tid till att automatiskt inaktivera tyst läge, i UNIX-tid."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Tid mellan raster"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Tid mellan raster, i sekunder."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Längd på varje rast"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Längd på varje rast, i sekunder."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Föredragen tid mellan pauser, i sekunder."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Föredragen tid för varje paus, i sekunder."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Break Timer svarar ej"
-
-#: ../data/settings-panels.ui.h:2
-msgid "If this continues the next time you log in, please <a 
href=\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>open a bug report</a>.\t"
-msgstr "Om det här fortsätter nästa gång du loggar in, <a 
href=\"https://gitlab.gnome.org/GNOME/gnome-break-timer/issues\";>rapportera då ett programfel</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Break Timer tar en rast"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Aktivera mig för att påbörja rasterna"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Du kan ändra raster och deras längd bland inställningar"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Break Timer låter dig ta kortare pauser så väl som längre raster."
-
-#: ../data/settings-panels.ui.h:7
-msgid "Microbreaks are a chance to look away from the screen and rest your hands."
-msgstr "Pauser ger tillfälle att kolla bort från skärmen och vila dina händer."
-
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Långa raster är tillfällen att komma bort från datorn"
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Raster och pauser"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Överlåt det åt mig"
-
-#: ../data/settings-panels.ui.h:11
-msgid "Break Timer will carry on working in the background, even if you close it."
-msgstr "Break Timer fortsätter i bakgrunden, även om du stänger ned programmet."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Välkommen till Break Timer!"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
+msgid ""
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
+msgstr ""
+"<p>Break Timer håller reda på hur länge du använder datorn och påminner dig "
+"om att ta regelbundna raster. Den är utformad för att uppmuntra sunt "
+"beteende med en blandning av korta raster för ögon och handleder och "
+"dessutom längre raster för att hålla kroppen igång och sinnet fokuserat.</p> "
+"<p>Break Timer är lätt att ställa in så du kan välja ett rastschema som "
+"passar dig - programmet kommer att fortsätta arbeta i bakgrunden.</p>"
+
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
+msgid ""
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
+msgstr ""
 
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Raster är bra för dig. Vi hjälper dig ta dem."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
+msgstr ""
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Aktivera mig för att börja"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME Break Timer"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Vad ska jag göra?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Tack"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Hoppa över den här pausen"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Det är dags för en paus"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Försenad paus"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Rasten är över"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Din paus är slut"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Påminn mig senare"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Dags för rast"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
-msgid "It’s time to take a break. Get away from the computer for a little while!"
+#: src/daemon/restbreak/RestBreakView.vala:63
+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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Försenad rast"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Din rast har upphört"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Välj ditt rastschema"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Stäng"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "En blandning av korta och långa raster"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Enstaka långa raster"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Regelbundna korta raster"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Om"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Avsluta"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Introduktionstur"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Rast från datorn för aktiva sinnen"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "GNOME Break Timers webbplats"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "Isak Östlund <translate catnip nu>\n"
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv listor tp-sv se>."
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "OK!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Redo"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Paus"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "Ta en paus från skrivandet och titta bort i %s."
 msgstr[1] "Ta en paus från skrivandet och titta bort i %s."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Dags för paus"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Jag plingar till när det är dags att använda datorn igen."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Pausa regelbundet för att vila ögonen"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Nästa paus är om"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Det är dags för en paus"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Pausa regelbundet för att vila ögonen"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "OK!"
+
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Redo"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Rast"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "Det är %s kvar av din rast. Du blir påmind när den är slut."
 msgstr[1] "Det är %s kvar av din rast. Du blir påmind när den är slut."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Det är rast"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Ta lite tid från datorn. Sträck på dig."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Tid kvar till nästa långa rast"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Det är rast"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Lång rast"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "och ta en bensträckare"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "Om"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Avsluta"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Var"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "I"
 
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Break Timer svarar ej"
+
+#: ui/settings-panels.ui:54
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Om det här fortsätter nästa gång du loggar in, <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">rapportera då ett programfel</a>."
+"\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Break Timer tar en rast"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Aktivera mig för att påbörja rasterna"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Du kan ändra raster och deras längd bland inställningar"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Break Timer låter dig ta kortare pauser så väl som längre raster."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr "Pauser ger tillfälle att kolla bort från skärmen och vila dina händer."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Långa raster är tillfällen att komma bort från datorn"
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Raster och pauser"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Överlåt det åt mig"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Break Timer fortsätter i bakgrunden, även om du stänger ned programmet."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Välkommen till Break Timer!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Raster är bra för dig. Vi hjälper dig ta dem."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Aktivera mig för att börja"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Tänk på att ta regelbundna raster från datorn"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Ger diskreta påminnelser för regelbundna raster"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Välj inställningar för pauser och raster"
+
+#~ msgid "Thank you"
+#~ msgstr "Tack"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Ta en stund att vila ögonen"
+
+#~ msgid "Full break"
+#~ msgstr "Lång rast"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "och ta en bensträckare"
diff --git a/po/tr.po b/po/tr.po
index 3f92f85..71fb0a9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,9 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-05 19:04+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2016-03-19 13:49+0200\n"
 "Last-Translator: Gökhan Gurbetoğlu <ggurbet gmail com>\n"
 "Language-Team: Türkçe <gnome-turk gnome org>\n"
@@ -18,396 +17,425 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.6\n"
 "X-POOTLE-MTIME: 1425027831.000000\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:36 ../settings/MainWindow.vala:136
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "Mola Zamanlayıcı"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "Bilgisayar kullanırken düzenli molalar aldığınızdan emin olun"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>Mola Zamanlayıcı bilgisayarı ne kadar kullandığınızı takip eder, ve "
-"düzenli molalar almanızı hatırlatır. Göz ve dirsekleriniz için kısa mola "
-"karışımları ve vücudunuzu hareket halinde, zihninizi işte tutacak uzun "
-"molalar ile sağlıklı davranışı teşvik etmek için tasarlanmıştır.</p><p>Mola "
-"Zamanlayıcıyı ayarlaması kolaydır, kendinize uygun bir mola zamanlaması "
-"seçtiğinizde arka planda çalışmaya devam eder.</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "Düzenli molalar almanız için nazik uyarılar sağlar"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "Küçük ve dinlenme molaları için tercihlerinizi seçin"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "Etkin zihinler için bilgisayar mola hatırlatıcısı"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "mola;küçük;dinlenme;zamanlayıcı;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "GNOME Mola Zamanlayıcıyı etkinleştirmek için doğru olarak ayarlayın"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "Şu an etkin olan molaların listesi"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "Sessiz kipi etkinleştirmek için doğru olarak ayarlayın"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "sessiz-kip-sonlanma-zamanına kadar molaları gizler."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "Sessiz kipten çıkma zamanı."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "Otomatik olarak sessiz kipin kapanacağı zaman, unix zamanı olarak."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "Molalar arası zaman"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "Dinlenme molaları arasındaki zaman, saniye olarak."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "Her molanın uzunluğu"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "Dinlenme molası uzunluğu, saniye olarak."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "Küçük molalar arasında tercih edilen süre, saniye olarak."
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "Her küçük molanın tercih edilen uzunluğu, saniye olarak."
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "Mola Zamanlayıcı yanıt vermiyor"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"Tekrar giriş yaptığınızda bu devam ederse, lütfen <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">bir hata kaydı açın</a>.\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "Mola Zamanlayıcı biraz ara veriyor"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "Molaları devam ettirmek için beni aç"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "Ayarlardan mola türlerini ve zamanlamalarını değiştirebilirsiniz"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "Mola Zamanlayıcı hem küçük hem uzun molalar almanızı sağlar."
+"<p>Mola Zamanlayıcı bilgisayarı ne kadar kullandığınızı takip eder, ve "
+"düzenli molalar almanızı hatırlatır. Göz ve dirsekleriniz için kısa mola "
+"karışımları ve vücudunuzu hareket halinde, zihninizi işte tutacak uzun "
+"molalar ile sağlıklı davranışı teşvik etmek için tasarlanmıştır.</p><p>Mola "
+"Zamanlayıcıyı ayarlaması kolaydır, kendinize uygun bir mola zamanlaması "
+"seçtiğinizde arka planda çalışmaya devam eder.</p>"
 
-#: ../data/settings-panels.ui.h:7
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
 msgstr ""
-"Küçük molalar ekrandan başka bir yere bakmanız ve ellerinizi dinlendirmeniz "
-"için fırsattır."
 
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "Tam molalar bilgisayar başından kalkma ve etrafta dolaşma zamanıdır."
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "Molalar ve Küçük molalar"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "Beni bu iş için bırakabilirsin"
-
-#: ../data/settings-panels.ui.h:11
-msgid ""
-"Break Timer will carry on working in the background, even if you close it."
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
 msgstr ""
-"Mola Zamanlayıcı, kapatsanız bile arka planda çalışmaya devam edecektir."
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "Mola Zamanlayıcıya Hoşgeldiniz!"
-
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "Molalar sizin için iyidir. Mola almanıza yardımcı olacağız."
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "Başlamak için beni aç yeter"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d saniye"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME Mola Zamanlayıcı"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "Ne yapmalıyım?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "Teşekkürler"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "Bunu atla"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "Küçük bir mola zamanı"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "Vakti geçmiş küçük mola"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "Mola bitti"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "Küçük molanız bitti"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "Daha sonra hatırlat"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "Mola zamanı"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, 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ı"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "Süresi geçmiş mola"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "Mola vaktin bitti"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "Mola Programını Seç"
 
-#: ../settings/BreakSettingsDialog.vala:37
+#: src/settings/BreakSettingsDialog.vala:43
 msgid "_Close"
 msgstr "_Kapat"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "Karışık kısa ve uzun molalar"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "Ara sıra olan uzun molalar"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "Sık kısa molalar"
 
-#: ../settings/MainWindow.vala:130
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "Hakkında"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "Çık"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "Hoşgeldin Turu"
 
-#: ../settings/MainWindow.vala:151
-msgid "Computer break reminders for active minds"
-msgstr "Etkin zihinler için bilgisayar mola hatırlatıcısı"
-
-#: ../settings/MainWindow.vala:153
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "GNOME Mola Zamanlayıcı Web Sayfası"
 
-#: ../settings/MainWindow.vala:157
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr "İşbaran Akçayır <isbaran gmail com>"
 
-#: ../settings/MainWindow.vala:210
-msgid "OK, got it!"
-msgstr "OK, anladım!"
-
-#: ../settings/MainWindow.vala:215
-msgid "Ready to go"
-msgstr "Devam etmeye hazır"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "Küçük mola"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "%s boyunca yazmayı bırak ve ekrandan başka yere bak."
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "Küçük bir mola zamanı"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "Tekrar bilgisayarı kullanma vakti geldiğinde zil çalacağım."
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "Sık sık durdurarak gözlerinizi rahatlatın"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "Sonraki küçük mola zamanınız"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "Kısa bir mola zamanı"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "Sık sık durdurarak gözlerinizi rahatlatın"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "OK, anladım!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "Devam etmeye hazır"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "Mola"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "Molanızın %s kalanı var. Bittiğinde hatırlatacağım."
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "Mola vakti"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "Biraz bilgisayardan uzaklaş. Esne ve etrafta dolaş."
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "Sonraki tam mola vaktin"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "Mola vakti"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "Tam mola"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "Ve bacaklarını esnetmek için biraz daha uzun ara ver"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "About"
-msgstr "Hakkında"
-
-#: ../settings/SettingsApplication.vala:103
-msgid "Quit"
-msgstr "Çık"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "Her"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr "Süre"
+
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "Mola Zamanlayıcı yanıt vermiyor"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"Tekrar giriş yaptığınızda bu devam ederse, lütfen <a href=\"https://bugs.";
+"launchpad.net/brainbreak\">bir hata kaydı açın</a>.\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "Mola Zamanlayıcı biraz ara veriyor"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "Molaları devam ettirmek için beni aç"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "Ayarlardan mola türlerini ve zamanlamalarını değiştirebilirsiniz"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "Mola Zamanlayıcı hem küçük hem uzun molalar almanızı sağlar."
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr ""
+"Küçük molalar ekrandan başka bir yere bakmanız ve ellerinizi dinlendirmeniz "
+"için fırsattır."
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "Tam molalar bilgisayar başından kalkma ve etrafta dolaşma zamanıdır."
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "Molalar ve Küçük molalar"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "Beni bu iş için bırakabilirsin"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr ""
+"Mola Zamanlayıcı, kapatsanız bile arka planda çalışmaya devam edecektir."
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "Mola Zamanlayıcıya Hoşgeldiniz!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "Molalar sizin için iyidir. Mola almanıza yardımcı olacağız."
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "Başlamak için beni aç yeter"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "Bilgisayar kullanırken düzenli molalar aldığınızdan emin olun"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "Düzenli molalar almanız için nazik uyarılar sağlar"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "Küçük ve dinlenme molaları için tercihlerinizi seçin"
+
+#~ msgid "Thank you"
+#~ msgstr "Teşekkürler"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "Gözlerinizi dinlendirmek için biraz zaman ayırın"
+
+#~ msgid "Full break"
+#~ msgstr "Tam mola"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "Ve bacaklarını esnetmek için biraz daha uzun ara ver"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6bf0532..5e366b9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-break-timer master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"break-timer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-10 16:13+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 18:18-0800\n"
 "PO-Revision-Date: 2013-10-11 23:32+0800\n"
 "Last-Translator: tuhaihe <1132321739qq gmail com>\n"
 "Language-Team: Chinese (China)\n"
@@ -19,392 +18,425 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:1
-#: ../data/gnome-break-timer-autostart.desktop.in.h:1
-#: ../data/gnome-break-timer.desktop.in.h:1
-#: ../data/gnome-break-timer-service.desktop.in.h:1
-#: ../settings/MainWindow.vala:42
+#: data/applications/org.gnome.BreakTimer.desktop.in:4
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:4
+#: data/autostart/org.gnome.BreakTimer.desktop.in:4
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:5
+#: src/settings/MainWindow.vala:107 src/settings/MainWindow.vala:261
+#: src/settings/MainWindow.vala:273
 msgid "Break Timer"
 msgstr "休息定时器"
 
-#: ../data/gnome-break-timer.appdata.xml.in.h:2
-msgid "Remember to take regular breaks from using the computer"
-msgstr "记住使用电脑时要定期休息"
-
-#: ../data/gnome-break-timer.appdata.xml.in.h:3
-msgid ""
-"<p>Break Timer keeps track of how much you are using the computer, and it "
-"reminds you to take regular breaks. It is designed to encourage healthy "
-"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
-"longer breaks to keep your body moving and your mind on task.</p> <p>Break "
-"Timer is simple to set up, so you can pick a break schedule that works for "
-"you and it will carry on working in the background.</p>"
-msgstr ""
-"<p>休息定时器追踪您使用电脑的时间,并提醒您定期休息。本软件设计目的在于鼓励健"
-"康行为,即短休时放松双眼和双手,长休时放松身体及头脑。</p> <p>休息定时器设置"
-"简单,您只需选择某个适合您的休息计划,它将在后台默默工作。</p>"
-
-#: ../data/gnome-break-timer-autostart.desktop.in.h:2
-#: ../data/gnome-break-timer-service.desktop.in.h:2
-msgid "Provides a gentle reminder to take regular breaks"
-msgstr "提供温柔的定期休息提醒"
-
-#: ../data/gnome-break-timer.desktop.in.h:2
-msgid "Choose your preferences for micro breaks and rest breaks"
-msgstr "设置微休和全休首选项"
+#: data/applications/org.gnome.BreakTimer.desktop.in:5
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:5
+#: data/autostart/org.gnome.BreakTimer.desktop.in:5
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:6
+#: src/settings/MainWindow.vala:276
+#, fuzzy
+msgid "Computer break reminders for GNOME"
+msgstr "为活跃思维而做的电脑休息提醒器"
 
-#: ../data/gnome-break-timer.desktop.in.h:3
+#: data/applications/org.gnome.BreakTimer.Settings.desktop.in:6
 msgid "break;micro;rest;timer;"
 msgstr "break;micro;rest;timer;微休;休息;定时器;"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:1
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:4
 msgid "True to enable GNOME Break Timer"
 msgstr "设为 Ture,则启用 GNOME 休息定时器"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:2
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:9
 msgid "The list of breaks that are currently enabled"
 msgstr "当前启用的休息列表"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:3
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:14
 msgid "True to enable quiet mode"
 msgstr "设为 True,则启用静默模式"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:4
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:15
 msgid "Hides breaks until quiet-mode-expire-time."
 msgstr "隐藏休息直到 quiet-mode-expire-time"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:5
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:20
 msgid "Time to end quiet mode."
 msgstr "结束静默模式的时间。"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:6
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:21
 msgid "The time to automatically disable quiet mode, in unix time."
 msgstr "自动禁用静默模式的时间(UNIX 时间)。"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:7
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:31
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:45
 msgid "Time between breaks"
 msgstr "休息间隔时间"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:8
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:32
 msgid "The time between rest breaks, in seconds."
 msgstr "休息间隔时间(秒)。"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:9
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:37
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:52
 msgid "Duration of each break"
 msgstr "每次休息持续时间"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:10
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:38
 msgid "The duration of each rest break, in seconds."
 msgstr "每次休息持续时间(秒)。"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:11
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:46
 msgid "The preferred time between micro breaks, in seconds."
 msgstr "微休间隔时间(秒)。"
 
-#: ../data/org.gnome.BreakTimer.gschema.xml.in.h:12
+#: data/gschema/org.gnome.BreakTimer.gschema.xml.in:53
 msgid "The preferred duration of each micro break, in seconds."
 msgstr "微休持续时间(秒)。"
 
-#: ../data/settings-panels.ui.h:1
-msgid "Break Timer isn’t responding"
-msgstr "休息定时器没有反应"
-
-#: ../data/settings-panels.ui.h:2
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:12
+#, fuzzy
 msgid ""
-"If this continues the next time you log in, please <a href=\"https://bugs.";
-"launchpad.net/brainbreak\">open a bug report</a>.\t"
+"Break Timer keeps track of how much you are using the computer, and it "
+"reminds you to take regular breaks. It is designed to encourage healthy "
+"behaviour, with a mix of short breaks for your eyes and wrists, as well as "
+"longer breaks to keep your body moving and your mind on task."
 msgstr ""
-"如果您下次登录时仍是如此,请<a href=\"https://bugzilla.gnome.org/buglist.cgi?";
-"product=gnome-break-timer\">提交错误报告</a>。\t"
-
-#: ../data/settings-panels.ui.h:3
-msgid "Break Timer is taking a break"
-msgstr "休息定时器提请您休息"
-
-#: ../data/settings-panels.ui.h:4
-msgid "Turn me on to get those breaks going"
-msgstr "打开我即可开始休息计划"
-
-#: ../data/settings-panels.ui.h:5
-msgid "You can change the types of breaks and their timings from the settings"
-msgstr "您可以从设置中改变休息类型和时间安排"
-
-#: ../data/settings-panels.ui.h:6
-msgid "Break Timer lets you take small microbreaks as well as longer breaks."
-msgstr "休息定时器既可以让您微休也可以长休。"
-
-#: ../data/settings-panels.ui.h:7
-msgid ""
-"Microbreaks are a chance to look away from the screen and rest your hands."
-msgstr "微休是您可以把眼睛从屏幕移开并放松下您的双手。"
-
-#: ../data/settings-panels.ui.h:8
-msgid "Full breaks are time to get away from the computer and move around."
-msgstr "全休是您离开电脑并四处逛逛的时候。"
-
-#: ../data/settings-panels.ui.h:9
-msgid "Breaks and Microbreaks"
-msgstr "小休和微休"
-
-#: ../data/settings-panels.ui.h:10
-msgid "You can leave me to it"
-msgstr "就让我如此吧"
+"<p>休息定时器追踪您使用电脑的时间,并提醒您定期休息。本软件设计目的在于鼓励健"
+"康行为,即短休时放松双眼和双手,长休时放松身体及头脑。</p> <p>休息定时器设置"
+"简单,您只需选择某个适合您的休息计划,它将在后台默默工作。</p>"
 
-#: ../data/settings-panels.ui.h:11
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:15
 msgid ""
-"Break Timer will carry on working in the background, even if you close it."
-msgstr "即使关闭了窗口,休息定时器也将继续在后台工作。"
-
-#: ../data/settings-panels.ui.h:12
-msgid "Welcome to Break Timer!"
-msgstr "欢迎使用休息定时器!"
+"Break Timer is easy to set up, so you can pick a break schedule that works "
+"for you and it will carry on working in the background."
+msgstr ""
 
-#: ../data/settings-panels.ui.h:13
-msgid "Breaks are good for you. We'll help you to take them."
-msgstr "休息有益健康。我们将帮您定时休息。"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:25
+msgid "Easily turn on break timers"
+msgstr ""
 
-#: ../data/settings-panels.ui.h:14
-msgid "Just switch me on to get started"
-msgstr "启动我即可开始"
+#: data/metainfo/org.gnome.BreakTimer.metainfo.xml.in:29
+msgid "Check on their status at any time"
+msgstr ""
 
-#: ../common/NaturalTime.vala:41
+#: src/common/NaturalTime.vala:43
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: ../common/NaturalTime.vala:44
+#: src/common/NaturalTime.vala:46
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分钟"
 
-#: ../common/NaturalTime.vala:47
+#: src/common/NaturalTime.vala:49
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
+#: src/daemon/Application.vala:24
+msgid "GNOME Break Timer"
+msgstr "GNOME 休息定时器"
+
+#: src/daemon/Application.vala:122
+msgid "Saving state"
+msgstr ""
+
 #. Label for a notification action that shows information about the current break
-#: ../daemon/break/BreakView.vala:74
+#: src/daemon/break/BreakView.vala:76
 msgid "What should I do?"
 msgstr "我该做些什么?"
 
-#. Break overlay label when a break has been finished
-#: ../daemon/break/TimerBreakStatusWidget.vala:56
-msgid "Thank you"
-msgstr "谢谢"
-
-#: ../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
-#: ../daemon/microbreak/MicroBreakView.vala:40
+#: src/daemon/microbreak/MicroBreakView.vala:47
 msgid "Skip this one"
 msgstr "跳过当前微休"
 
-#: ../daemon/microbreak/MicroBreakView.vala:47
+#: src/daemon/microbreak/MicroBreakView.vala:54
 msgid "It’s time for a micro break"
 msgstr "微休时间到"
 
-#: ../daemon/microbreak/MicroBreakView.vala:48
+#: src/daemon/microbreak/MicroBreakView.vala:55
 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"
-#: ../daemon/microbreak/MicroBreakView.vala:64
+#: src/daemon/microbreak/MicroBreakView.vala:71
 #, 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 之前您就应该微休一下了"
 
-#: ../daemon/microbreak/MicroBreakView.vala:70
+#: src/daemon/microbreak/MicroBreakView.vala:77
 msgid "Overdue micro break"
 msgstr "已逾期的微休时间"
 
-#: ../daemon/microbreak/MicroBreakView.vala:80
-#: ../daemon/restbreak/RestBreakView.vala:125
+#: src/daemon/microbreak/MicroBreakView.vala:87
+#: src/daemon/restbreak/RestBreakView.vala:119
 msgid "Break is over"
 msgstr "休息结束"
 
-#: ../daemon/microbreak/MicroBreakView.vala:81
+#: src/daemon/microbreak/MicroBreakView.vala:88
 msgid "Your micro break has ended"
 msgstr "您的微休时间已结束"
 
-#: ../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
-#: ../daemon/restbreak/RestBreakView.vala:54
+#: src/daemon/restbreak/RestBreakView.vala:48
 msgid "Remind me later"
 msgstr "稍后提醒"
 
 #. FIXME: Should say how long the break is?
-#: ../daemon/restbreak/RestBreakView.vala:68
+#: src/daemon/restbreak/RestBreakView.vala:62
 msgid "Time for a break"
 msgstr "休息时长"
 
-#: ../daemon/restbreak/RestBreakView.vala:69
+#: src/daemon/restbreak/RestBreakView.vala:63
 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"
-#: ../daemon/restbreak/RestBreakView.vala:86
+#: src/daemon/restbreak/RestBreakView.vala:80
 #, c-format
 msgid "There is %s remaining in your break"
 msgid_plural "There are %s remaining in your break"
 msgstr[0] "离休息时间还有 %s"
 
-#: ../daemon/restbreak/RestBreakView.vala:92
+#: src/daemon/restbreak/RestBreakView.vala:86
 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"
-#: ../daemon/restbreak/RestBreakView.vala:109
+#: src/daemon/restbreak/RestBreakView.vala:103
 #, 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 之前您就应该休息一下了"
 
-#: ../daemon/restbreak/RestBreakView.vala:115
+#: src/daemon/restbreak/RestBreakView.vala:109
 msgid "Overdue break"
 msgstr "已逾期的休息"
 
-#: ../daemon/restbreak/RestBreakView.vala:126
+#: src/daemon/restbreak/RestBreakView.vala:120
 msgid "Your break time has ended"
 msgstr "您的休息时间已结束"
 
-#: ../settings/BreakSettingsDialog.vala:32
+#: src/settings/BreakSettingsDialog.vala:38
 msgid "Choose Your Break Schedule"
 msgstr "选择您的休息计划"
 
-#: ../settings/BreakSettingsDialog.vala:52
+#: src/settings/BreakSettingsDialog.vala:43
+msgid "_Close"
+msgstr ""
+
+#: src/settings/BreakSettingsDialog.vala:60
 msgid "A mix of short breaks and long breaks"
 msgstr "长休和短休混合"
 
-#: ../settings/BreakSettingsDialog.vala:56
+#: src/settings/BreakSettingsDialog.vala:64
 msgid "Occasional long breaks"
 msgstr "偶尔长休"
 
-#: ../settings/BreakSettingsDialog.vala:60
+#: src/settings/BreakSettingsDialog.vala:68
 msgid "Frequent short breaks"
 msgstr "经常短休"
 
-#: ../settings/MainWindow.vala:140
+#. Label for a button that opens GNOME Settings to change permissions
+#: src/settings/MainWindow.vala:69
+msgid "Open Settings"
+msgstr ""
+
+#: src/settings/MainWindow.vala:72
+msgid ""
+"Break Timer needs permission to start automatically and run in the background"
+msgstr ""
+
+#: src/settings/MainWindow.vala:118
+msgid "About"
+msgstr "关于"
+
+#: src/settings/MainWindow.vala:119
+msgid "Quit"
+msgstr "退出"
+
+#: src/settings/MainWindow.vala:255
 msgid "Welcome Tour"
 msgstr "欢迎之旅"
 
-#: ../settings/MainWindow.vala:161
-msgid "Computer break reminders for active minds"
-msgstr "为活跃思维而做的电脑休息提醒器"
-
-#: ../settings/MainWindow.vala:163
-msgid "GNOME Break Timer Website"
+#: src/settings/MainWindow.vala:278
+#, fuzzy
+msgid "Break Timer Website"
 msgstr "GNOME 休息定时器网站"
 
-#: ../settings/MainWindow.vala:167
+#: src/settings/MainWindow.vala:282
 msgid "translator-credits"
 msgstr ""
 "甘露 <rhythm gan gmail com>, 2013\n"
 "tuhaihe <1132321739qq gmail com>, 2013"
 
-#: ../settings/MainWindow.vala:220
-msgid "OK, got it!"
-msgstr "好的,明白了!"
-
-#: ../settings/MainWindow.vala:225
-msgid "Ready to go"
-msgstr "准备开始"
-
-#: ../settings/MicroBreakType.vala:46 ../settings/MicroBreakType.vala:91
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:29
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:26
 msgid "Microbreak"
 msgstr "微休"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/MicroBreakType.vala:65
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:48
 #, c-format
 msgid "Take a break from typing and look away from the screen for %s."
 msgid_plural "Take a break from typing and look away from the screen for %s."
 msgstr[0] "别打字也别盯着屏幕了,休息时间:%s。"
 
-#: ../settings/MicroBreakType.vala:70
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:53
 msgid "It’s microbreak time"
 msgstr "微休时间到"
 
-#: ../settings/MicroBreakType.vala:72
+#: src/settings/microbreak/MicroBreakInfoWidget.vala:55
 msgid "I'll chime when it’s time to use the computer again."
 msgstr "到再次使用电脑的时候我会报时。"
 
+#: src/settings/microbreak/MicroBreakSettingsWidget.vala:27
+msgid "Pause frequently to relax your eyes"
+msgstr "经常暂停,放松眼睛"
+
 #. Label that explains a countdown timer, which shows a string such as "5 minutes"
-#: ../settings/MicroBreakType.vala:81
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:27
 msgid "Your next microbreak is in"
 msgstr "离下一次微休还有"
 
-#: ../settings/MicroBreakType.vala:82
+#: src/settings/microbreak/MicroBreakStatusWidget.vala:28
 msgid "It's time for a microbreak"
 msgstr "微休时间到"
 
-#: ../settings/MicroBreakType.vala:92
-msgid "Pause frequently to relax your eyes"
-msgstr "经常暂停,放松眼睛"
+#: src/settings/panels/WelcomePanel.vala:68
+msgid "OK, got it!"
+msgstr "好的,明白了!"
 
-#: ../settings/RestBreakType.vala:46
+#: src/settings/panels/WelcomePanel.vala:74
+msgid "Ready to go"
+msgstr "准备开始"
+
+#: src/settings/restbreak/RestBreakInfoWidget.vala:29
 msgid "Break"
 msgstr "休息"
 
 #. %s will be replaced with a string that describes a time interval, such as "2 minutes", "40 seconds" or "1 
hour"
-#: ../settings/RestBreakType.vala:66
+#: src/settings/restbreak/RestBreakInfoWidget.vala:49
 #, c-format
 msgid "Your break has %s remaining. I’ll remind you when it’s over."
 msgid_plural "Your break has %s remaining. I’ll remind you when it’s over."
 msgstr[0] "休息时间还剩 %s。休息结束时会提示您的。"
 
-#: ../settings/RestBreakType.vala:71
+#: src/settings/restbreak/RestBreakInfoWidget.vala:54
 msgid "It’s break time"
 msgstr "休息时间到"
 
-#: ../settings/RestBreakType.vala:72
+#: src/settings/restbreak/RestBreakInfoWidget.vala:55
 msgid "Take some time away from the computer. Stretch and move around."
 msgstr "离开电脑。伸伸懒腰,走动走动。"
 
 #. Label that explains a countdown timer, which shows a string such as "30 minutes"
-#: ../settings/RestBreakType.vala:82
+#: src/settings/restbreak/RestBreakStatusWidget.vala:27
 msgid "Your next full break is in"
 msgstr "离下一个全休还有"
 
-#: ../settings/RestBreakType.vala:83
+#: src/settings/restbreak/RestBreakStatusWidget.vala:28
 msgid "It's break time"
 msgstr "休息时间到"
 
-#: ../settings/RestBreakType.vala:92
-msgid "Full break"
-msgstr "全休"
-
-#: ../settings/RestBreakType.vala:93
-msgid "And take some longer breaks to stretch your legs"
-msgstr "休息稍长时间来伸伸腿脚"
-
-#: ../settings/SettingsApplication.vala:101
-msgid "About"
-msgstr "关于"
-
-#: ../settings/SettingsApplication.vala:102
-msgid "Quit"
-msgstr "退出"
-
 #. Label for the widget to choose how frequently a break occurs. (Choices such as "6 minutes" or "45 
minutes")
-#: ../settings/TimerBreakType.vala:175
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:34
 msgid "Every"
 msgstr "每隔"
 
 #. Label for the widget to choose how long a break lasts when it occurs. (Choices such as "30 seconds" or "5 
minutes")
-#: ../settings/TimerBreakType.vala:184
+#: src/settings/timerbreak/TimerBreakSettingsWidget.vala:43
 msgid "For"
 msgstr ":"
 
+#: ui/settings-panels.ui:37
+msgid "Break Timer isn’t responding"
+msgstr "休息定时器没有反应"
+
+#: ui/settings-panels.ui:54
+#, fuzzy
+msgid ""
+"If this continues the next time you log in, please <a href=\"https://gitlab.";
+"gnome.org/GNOME/gnome-break-timer/issues\">open a bug report</a>.\t"
+msgstr ""
+"如果您下次登录时仍是如此,请<a href=\"https://bugzilla.gnome.org/buglist.cgi?";
+"product=gnome-break-timer\">提交错误报告</a>。\t"
+
+#: ui/settings-panels.ui:101
+msgid "Break Timer is taking a break"
+msgstr "休息定时器提请您休息"
+
+#: ui/settings-panels.ui:118
+msgid "Turn me on to get those breaks going"
+msgstr "打开我即可开始休息计划"
+
+#: ui/settings-panels.ui:149
+msgid "You can change the types of breaks and their timings from the settings"
+msgstr "您可以从设置中改变休息类型和时间安排"
+
+#: ui/settings-panels.ui:175
+msgid "Break Timer lets you take small microbreaks as well as longer breaks."
+msgstr "休息定时器既可以让您微休也可以长休。"
+
+#: ui/settings-panels.ui:193
+msgid ""
+"Microbreaks are a chance to look away from the screen and rest your hands."
+msgstr "微休是您可以把眼睛从屏幕移开并放松下您的双手。"
+
+#: ui/settings-panels.ui:211
+msgid "Full breaks are time to get away from the computer and move around."
+msgstr "全休是您离开电脑并四处逛逛的时候。"
+
+#: ui/settings-panels.ui:228
+msgid "Breaks and Microbreaks"
+msgstr "小休和微休"
+
+#: ui/settings-panels.ui:274
+msgid "You can leave me to it"
+msgstr "就让我如此吧"
+
+#: ui/settings-panels.ui:292
+msgid ""
+"Break Timer will carry on working in the background, even if you close it."
+msgstr "即使关闭了窗口,休息定时器也将继续在后台工作。"
+
+#: ui/settings-panels.ui:340
+msgid "Welcome to Break Timer!"
+msgstr "欢迎使用休息定时器!"
+
+#: ui/settings-panels.ui:357
+msgid "Breaks are good for you. We'll help you to take them."
+msgstr "休息有益健康。我们将帮您定时休息。"
+
+#: ui/settings-panels.ui:378
+msgid "Just switch me on to get started"
+msgstr "启动我即可开始"
+
+#~ msgid "Remember to take regular breaks from using the computer"
+#~ msgstr "记住使用电脑时要定期休息"
+
+#~ msgid "Provides a gentle reminder to take regular breaks"
+#~ msgstr "提供温柔的定期休息提醒"
+
+#~ msgid "Choose your preferences for micro breaks and rest breaks"
+#~ msgstr "设置微休和全休首选项"
+
+#~ msgid "Thank you"
+#~ msgstr "谢谢"
+
+#~ msgid "Take a moment to rest your eyes"
+#~ msgstr "花点时间放松下眼睛"
+
+#~ msgid "Full break"
+#~ msgstr "全休"
+
+#~ msgid "And take some longer breaks to stretch your legs"
+#~ msgstr "休息稍长时间来伸伸腿脚"
+
 #~ msgid "The quieter you become, the more you can hear."
 #~ msgstr "心越静聆听越广"
 
diff --git a/src/settings/MainWindow.vala b/src/settings/MainWindow.vala
index ef35e35..c4911fe 100644
--- a/src/settings/MainWindow.vala
+++ b/src/settings/MainWindow.vala
@@ -65,6 +65,7 @@ public class MainWindow : Gtk.ApplicationWindow, GLib.Initable {
 
             this.error_type = error_type;
 
+            /* Label for a button that opens GNOME Settings to change permissions */
             this.add_button (_("Open Settings"), RESPONSE_OPEN_SETTINGS);
 
             Gtk.Container content_area = this.get_content_area ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]