[gnome-break-timer: 2/2] Merge branch 'dylanmccall/lock-screen-option' into 'master'
- From: Dylan McCall <dylanmccall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-break-timer: 2/2] Merge branch 'dylanmccall/lock-screen-option' into 'master'
- Date: Sun, 14 Nov 2021 01:11:20 +0000 (UTC)
commit 075b1fbb2e8a009447e931888c49336b608bf07d
Merge: 92c4fc2 3f32751
Author: Dylan McCall <dylan dylanmccall ca>
Date: Sun Nov 14 01:11:17 2021 +0000
Merge branch 'dylanmccall/lock-screen-option' into 'master'
Add an option to disable screen locking
Closes #15
See merge request GNOME/gnome-break-timer!4
.../gschema/org.gnome.BreakTimer.gschema.xml.in.in | 6 +++
po/POTFILES.in | 1 +
po/bs.po | 56 +++++++++++++--------
po/cs.po | 56 +++++++++++++--------
po/da.po | 56 +++++++++++++--------
po/de.po | 56 +++++++++++++--------
po/el.po | 57 +++++++++++++---------
po/es.po | 56 +++++++++++++--------
po/fr.po | 56 +++++++++++++--------
po/gl.po | 56 +++++++++++++--------
po/hu.po | 56 +++++++++++++--------
po/id.po | 57 +++++++++++++---------
po/lt.po | 56 +++++++++++++--------
po/oc.po | 56 +++++++++++++--------
po/pl.po | 56 +++++++++++++--------
po/pt.po | 56 +++++++++++++--------
po/pt_BR.po | 56 +++++++++++++--------
po/sl.po | 56 +++++++++++++--------
po/sr.po | 56 +++++++++++++--------
po/sr latin po | 56 +++++++++++++--------
po/sv.po | 56 +++++++++++++--------
po/tr.po | 56 +++++++++++++--------
po/zh_CN.po | 56 +++++++++++++--------
src/daemon/restbreak/RestBreakController.vala | 2 +
src/daemon/restbreak/RestBreakType.vala | 1 +
src/daemon/restbreak/RestBreakView.vala | 8 ++-
src/settings/BreakSettingsDialog.vala | 4 ++
src/settings/break/BreakSettingsWidget.vala | 29 +++--------
.../restbreak/RestBreakSettingsWidget.vala | 8 +++
.../timerbreak/TimerBreakSettingsWidget.vala | 3 +-
30 files changed, 774 insertions(+), 466 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
