Commit 15ce5690 authored by Julian Sparber's avatar Julian Sparber
Browse files

debian: add upstream changes as patches

parent a348f140
This diff is collapsed.
From bcd2ec3a08df77de27a5d6fb798f8229c0b7764c Mon Sep 17 00:00:00 2001
From: Julian Sparber <julian@sparber.net>
Date: Wed, 2 Dec 2020 18:14:10 +0100
Subject: [PATCH 1/2] stopwatch: only update labels when text changes
---
src/stopwatch-face.vala | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/stopwatch-face.vala b/src/stopwatch-face.vala
index fd73d69..69199d9 100644
--- a/src/stopwatch-face.vala
+++ b/src/stopwatch-face.vala
@@ -47,6 +47,10 @@ public class Face : Gtk.Box, Clocks.Clock {
private GLib.Timer timer;
private uint tick_id;
+ private int stored_hour;
+ private int stored_minute;
+ private int stored_second;
+ double stored_milisecond;
private int current_lap;
[GtkChild]
@@ -251,10 +255,22 @@ public class Face : Gtk.Box, Clocks.Clock {
// Note that the format uses unicode RATIO character
// We also prepend the LTR mark to make sure text is always in this direction
- hours_label.set_text ("%02i\u200E".printf (h));
- minutes_label.set_text ("%02i\u200E".printf (m));
- seconds_label.set_text ("%02i".printf (s));
- miliseconds_label.set_text ("%i".printf (ds));
+ if (stored_hour != h) {
+ hours_label.label = "%02i\u200E".printf (h);
+ stored_hour = h;
+ }
+ if (stored_minute != m) {
+ minutes_label.label = "%02i\u200E".printf (m);
+ stored_minute = m;
+ }
+ if (stored_second != s) {
+ seconds_label.label = "%02i".printf (s);
+ stored_second = s;
+ }
+ if (stored_milisecond != ds) {
+ miliseconds_label.label = "%i".printf (ds);
+ stored_milisecond = ds;
+ }
return true;
}
--
2.29.2
From d4a52b618d478f885b13aa6c3cd544da7d400e32 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 30 Sep 2020 22:07:48 +0200
Subject: [PATCH 02/18] snap, the pulseaudio plug has been replaced by the
audio playback one
---
build-aux/snap/snapcraft.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml
index 9836ad7..763aa56 100644
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -30,7 +30,7 @@ apps:
command: usr/bin/gnome-clocks
extensions: [ gnome-3-34 ]
plugs:
- - pulseaudio
+ - audio-playback
- location-observe
desktop: usr/share/applications/org.gnome.clocks.desktop
environment:
--
2.29.2
From 261158c676cef3c63b426023fc6aafb220d1d42a Mon Sep 17 00:00:00 2001
From: Julian Sparber <julian@sparber.net>
Date: Thu, 3 Dec 2020 11:47:44 +0100
Subject: [PATCH 2/2] timer-item: only emit countdown_updated event the text
changes
---
src/timer-item.vala | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/timer-item.vala b/src/timer-item.vala
index eaea6a1..b226d83 100644
--- a/src/timer-item.vala
+++ b/src/timer-item.vala
@@ -37,6 +37,10 @@ public class Item : Object, ContentItem {
private double span;
private GLib.Timer timer;
private uint timeout_id;
+ private int stored_hour;
+ private int stored_minute;
+ private int stored_second;
+
public signal void ring ();
public signal void countdown_updated (int hours, int minutes, int seconds);
@@ -100,7 +104,7 @@ public class Item : Object, ContentItem {
public virtual signal void start () {
state = State.RUNNING;
- timeout_id = GLib.Timeout.add (40, () => {
+ timeout_id = GLib.Timeout.add (100, () => {
var e = timer.elapsed ();
if (state != State.RUNNING) {
return false;
@@ -118,7 +122,12 @@ public class Item : Object, ContentItem {
double r;
Utils.time_to_hms (elapsed, out h, out m, out s, out r);
- countdown_updated (h, m, s);
+ if (stored_hour != h || stored_minute != m || stored_second != s) {
+ stored_hour = h;
+ stored_minute = m;
+ stored_second = s;
+ countdown_updated (h, m, s);
+ }
return true;
});
timer.start ();
--
2.29.2
From 674a68eaa863f85cedb6af268b3eded3895c5e47 Mon Sep 17 00:00:00 2001
From: Andika Triwidada <atriwidada@gnome.org>
Date: Sun, 4 Oct 2020 16:02:01 +0000
Subject: [PATCH 03/18] Update Indonesian translation
---
help/id/id.po | 123 ++++++++++++++++++++++++++------------------------
1 file changed, 63 insertions(+), 60 deletions(-)
diff --git a/help/id/id.po b/help/id/id.po
index 365d6e0..ba30d42 100644
--- a/help/id/id.po
+++ b/help/id/id.po
@@ -6,20 +6,20 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-clocks gnome-3-20\n"
-"POT-Creation-Date: 2019-09-28 12:51+0000\n"
-"PO-Revision-Date: 2019-11-15 12:03+0700\n"
+"POT-Creation-Date: 2020-06-30 10:45+0000\n"
+"PO-Revision-Date: 2020-10-04 23:01+0700\n"
"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
"Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.4.1\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
msgid "translator-credits"
-msgstr "Andika Triwidada <andika@gmail.com>, 2013, 2016, 2019."
+msgstr "Andika Triwidada <andika@gmail.com>, 2013, 2016, 2019, 2020."
#. (itstool) path: credit/name
#: C/alarm-add.page:14 C/alarm-edit.page:14 C/alarm-remove.page:15
@@ -69,13 +69,13 @@ msgstr ""
#. (itstool) path: item/p
#: C/alarm-add.page:34
-msgid "Press <gui style=\"button\">Alarm</gui>."
+msgid "Press <gui style=\"button\">Alarms</gui>."
msgstr "Tekan <gui style=\"button\">Alarm</gui>."
#. (itstool) path: item/p
#: C/alarm-add.page:37
-msgid "Press <gui style=\"button\">New</gui>."
-msgstr "Tekan <gui style=\"button\">Baru</gui>."
+msgid "Press <gui style=\"button\">+</gui>."
+msgstr "Tekan <gui style=\"button\">+</gui>."
#. (itstool) path: item/p
#: C/alarm-add.page:40
@@ -84,22 +84,25 @@ msgstr "Atur waktu yang Anda inginkan untuk membunyikan alarm."
#. (itstool) path: item/p
#: C/alarm-add.page:43
-msgid "You can give your new alarm a name so that it is easier to identify."
+msgid ""
+"Select the days on which you want the alarm to be repeated at the set time, "
+"or none if you only want the alarm to go off once."
msgstr ""
-"Anda dapat memberi alarm baru Anda suatu nama sehingga lebih mudah "
-"diidentifikasi."
+"Pilih hari-hari kapan Anda ingin alarm diulang pada waktu yang ditata, atau "
+"nihil jika Anda ingin alarm hanya berbunyi sekali."
#. (itstool) path: item/p
#: C/alarm-add.page:47
-msgid ""
-"Select the days on which you want the alarm to be repeated at the set time."
-msgstr "Pilih hari-hari kapan Anda ingin alarm diulang pada waktu yang ditata."
+msgid "You can give your new alarm a name so that it is easier to identify."
+msgstr ""
+"Anda dapat memberi alarm baru Anda suatu nama sehingga lebih mudah "
+"diidentifikasi."
#. (itstool) path: item/p
#: C/alarm-add.page:51
-msgid "Press <gui style=\"button\">Done</gui> to finish adding the alarm."
+msgid "Press <gui style=\"button\">Add</gui> to finish adding the alarm."
msgstr ""
-"Tekan <gui style=\"button\">Selesai</gui> untuk mengakhiri menambah alarm."
+"Tekan <gui style=\"button\">Tambah</gui> untuk mengakhiri menambah alarm."
#. (itstool) path: page/p
#: C/alarm-add.page:55
@@ -127,24 +130,25 @@ msgstr "Sunting alarm"
#. (itstool) path: page/p
#: C/alarm-edit.page:29
-msgid ""
-"Edit your alarm to change when it goes off, rename it or to deactivate it."
+msgid "Edit your alarm to change when it goes off or to rename it."
msgstr ""
-"Sunting alarm Anda untuk mengubah kapan mati, mengubah namanya, atau "
-"menonaktifkannya."
+"Sunting alarm Anda untuk mengubah kapan berbunyi atau untuk mengubah namanya."
#. (itstool) path: item/p
-#: C/alarm-edit.page:34 C/alarm-remove.page:34
-msgid "Press the <gui style=\"button\">Alarm</gui> button."
+#: C/alarm-edit.page:33 C/alarm-edit.page:48 C/alarm-remove.page:34
+msgid "Press the <gui style=\"button\">Alarms</gui> button."
msgstr "Tekan tombol <gui style=\"button\">Alarm</gui>."
#. (itstool) path: item/p
-#: C/alarm-edit.page:37
-msgid "Press the alarm which you want to edit."
-msgstr "Tekan alarm mana yang ingin Anda sunting."
+#: C/alarm-edit.page:36
+msgid ""
+"Find the alarm you want to change and press <gui style=\"button\">Edit</gui>."
+msgstr ""
+"Temukan alarm yang ingin Anda ubah dan tekan <gui style=\"button\">Sunting</"
+"gui>."
#. (itstool) path: item/p
-#: C/alarm-edit.page:40
+#: C/alarm-edit.page:39
msgid ""
"Update the alarm and press <gui style=\"button\">Done</gui> to finish "
"editing it."
@@ -152,6 +156,26 @@ msgstr ""
"Mutakhirkan alarm dan tekan <gui style=\"button\">Selesai</gui> untuk "
"mengakhiri menyunting."
+#. (itstool) path: page/p
+#: C/alarm-edit.page:44
+msgid "You can also temporarily disable an alarm."
+msgstr "Anda juga dapat menonaktifkan alarm untuk sementara."
+
+#. (itstool) path: item/p
+#: C/alarm-edit.page:51
+msgid "Find the alarm you want to disable or enable and toggle the switch."
+msgstr ""
+"Temukan alarm yang ingin Anda nonaktifkan atau aktifkan dan alihkan tombol."
+
+#. (itstool) path: item/p
+#: C/alarm-edit.page:54
+msgid ""
+"When the alarm is disabled, it will not go off, but it can be enabled again "
+"later."
+msgstr ""
+"Ketika alarm dinonaktifkan, alarm tidak akan berbunyi, tetapi dapat "
+"diaktifkan lagi nanti."
+
#. (itstool) path: info/desc
#: C/alarm-remove.page:25
msgid "Delete an alarm which you no longer need."
@@ -169,22 +193,8 @@ msgstr "Anda dapat menghapus alarm yang tak Anda perlukan lagi."
#. (itstool) path: item/p
#: C/alarm-remove.page:37
-msgid ""
-"Right click on the alarm. You can press the button with the tick mark in the "
-"top right corner and select the alarm which you want to delete."
-msgstr ""
-"Klik kanan pada alarm. Anda dapat menekan tombol dengan tanda contreng pada "
-"pojok kanan atas dan memilih alarm yang ingin Anda hapus."
-
-#. (itstool) path: item/p
-#: C/alarm-remove.page:42 C/world-remove.page:41
-msgid "Press the <gui style=\"button\">Delete</gui> button."
-msgstr "Tekan tombol <gui style=\"button\">Hapus</gui>."
-
-#. (itstool) path: page/p
-#: C/alarm-remove.page:46
-msgid "You can select more than one alarm at a time for deletion."
-msgstr "Anda dapat memilih lebih dari satu alarm setiap saat untuk dihapus."
+msgid "Press the <gui style=\"button\">Delete</gui> button to remove an alarm."
+msgstr "Tekan tombol <gui style=\"button\">Hapus</gui> untuk menghapus alarm."
#. (itstool) path: info/desc
#: C/alarm-snooze-stop.page:24
@@ -272,21 +282,21 @@ msgstr ""
#. (itstool) path: item/p
#: C/stopwatch.page:51
msgid ""
-"Press <gui style=\"button\">Stop</gui> to pause the stopwatch and <gui style="
-"\"button\">Continue</gui> when you are ready to resume timing the task."
+"Press <gui style=\"button\">Pause</gui> to pause the stopwatch and <gui "
+"style=\"button\">Resume</gui> when you are ready to resume timing the task."
msgstr ""
-"Tekan <gui style=\"button\">Berhenti</gui> untuk mengistirahatkan stopwatch "
-"dan <gui style=\"button\">Lanjutkan</gui> ketika Anda siap untuk meneruskan "
+"Tekan <gui style=\"button\">Jeda</gui> untuk mengistirahatkan stopwatch dan "
+"<gui style=\"button\">Lanjutkan</gui> ketika Anda siap untuk meneruskan "
"mengukur waktu pelaksanaan tugas."
#. (itstool) path: page/p
#: C/stopwatch.page:59
msgid ""
-"You can use the <gui style=\"button\">Reset</gui> button to reset the "
-"stopwatch when it is stopped."
+"You can use the <gui style=\"button\">Clear</gui> button to reset the "
+"stopwatch when it is paused."
msgstr ""
-"Anda dapat memakai tombol <gui style=\"button\">Reset</gui> untuk mereset "
-"stopwatch ketika sedang dihentikan."
+"Anda dapat memakai tombol <gui style=\"button\">Bersihkan</gui> untuk "
+"mereset stopwatch ketika sedang dijeda."
#. (itstool) path: note/p
#: C/stopwatch.page:63
@@ -384,10 +394,10 @@ msgstr "Tekan tombol <gui style=\"button\">Dunia</gui>."
#. (itstool) path: item/p
#: C/world-add.page:42
msgid ""
-"Press the <gui style=\"button\">New</gui> button or <keyseq><key>Ctrl</"
+"Press the <gui style=\"button\">+</gui> button or <keyseq><key>Ctrl</"
"key><key>N</key></keyseq> to add a new city."
msgstr ""
-"Tekan tombol <gui style=\"button\">Baru</gui> atau <keyseq><key>Ctrl</"
+"Tekan tombol <gui style=\"button\">+</gui> atau <keyseq><key>Ctrl</"
"key><key>N</key></keyseq> untuk menambah kota baru."
#. (itstool) path: item/p
@@ -473,16 +483,9 @@ msgstr "Anda bisa menghapus jam yang tak Anda perlukan lagi."
#. (itstool) path: item/p
#: C/world-remove.page:36
msgid ""
-"Right click on the world clock. You can press the button with the tick mark "
-"in the top right corner and select the clock which you want to delete."
+"Press the <gui style=\"button\">Delete</gui> button to remove a world clock."
msgstr ""
-"Klik kanan pada jam dunia. Anda dapat menekan tombol dengan tanda contreng "
-"di pojok kanan atas dan memilih jam yang ingin Anda hapus."
-
-#. (itstool) path: page/p
-#: C/world-remove.page:45
-msgid "You can select more than one clock at a time for deletion."
-msgstr "Anda dapat memilih lebih dari satu jam sekaligus untuk dihapus."
+"Tekan tombol <gui style=\"button\">Hapus</gui> untuk menghapus jam dunia."
#. (itstool) path: info/title
#: C/index.page:22
--
2.29.2
From ab00ab9a1267faeb7fef3c99d480b24309c7487f Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
Date: Mon, 5 Oct 2020 21:15:02 +0200
Subject: [PATCH 04/18] meson: use files instead of lists
this forces the existence of the files.
---
src/meson.build | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 47f1d4c..4673332 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,8 +1,8 @@
-vapi_sources = [
+vapi_sources = files(
'config.vapi',
-]
+)
-clocks_vala_sources = [
+clocks_vala_sources = files(
'alarm-day-picker-row.vala',
'alarm-face.vala',
'alarm-item.vala',
@@ -33,12 +33,12 @@ clocks_vala_sources = [
'world-row.vala',
'world-shell-world-clocks.vala',
'world-standalone.vala',
-]
+)
-clocks_c_sources = [
+clocks_c_sources = files(
'cutils.c',
'twilight.c',
-]
+)
clocks_sources = [
vapi_sources,
--
2.29.2
From f3f7955261046f3fca78e6e094c5b466ad9c0af9 Mon Sep 17 00:00:00 2001
From: Cheng-Chia Tseng <pswo10680@gmail.com>
Date: Mon, 12 Oct 2020 14:27:26 +0000
Subject: [PATCH 06/18] Update Chinese (Taiwan) translation
---
po/zh_TW.po | 519 ++++++++++++++++++++++++++++------------------------
1 file changed, 277 insertions(+), 242 deletions(-)
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3297001..5c9ea64 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-clocks master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-clocks/issues\n"
-"POT-Creation-Date: 2020-04-04 10:18+0000\n"
-"PO-Revision-Date: 2020-05-02 00:32+0800\n"
+"POT-Creation-Date: 2020-08-17 00:35+0000\n"
+"PO-Revision-Date: 2020-10-12 22:19+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
"Language: zh_TW\n"
@@ -16,87 +16,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.3\n"
-
-#: data/gtk/help-overlay.ui:14
-msgctxt "shortcut window"
-msgid "General"
-msgstr "一般"
-
-#: data/gtk/help-overlay.ui:19
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "顯示求助"
-
-#: data/gtk/help-overlay.ui:26
-msgctxt "shortcut window"
-msgid "Open menu"
-msgstr "開啟選單"
-
-#: data/gtk/help-overlay.ui:33
-msgctxt "shortcut window"
-msgid "Keyboard shortcuts"
-msgstr "鍵盤快捷鍵"
-
-#: data/gtk/help-overlay.ui:40
-msgctxt "shortcut window"
-msgid "Quit"
-msgstr "結束"
-
-#: data/gtk/help-overlay.ui:47
-msgctxt "shortcut window"
-msgid "Go to the next section"
-msgstr "移至下一節"
-
-#: data/gtk/help-overlay.ui:54
-msgctxt "shortcut window"
-msgid "Go to the previous section"
-msgstr "移至上一節"
-
-#: data/gtk/help-overlay.ui:63
-msgctxt "shortcut window"
-msgid "World Clocks"
-msgstr "世界時鐘"
-
-#: data/gtk/help-overlay.ui:68
-msgctxt "shortcut window"
-msgid "Add a world clock"
-msgstr "加入世界時鐘"
-
-#: data/gtk/help-overlay.ui:77
-msgctxt "shortcut window"
-msgid "Alarm"
-msgstr "鬧鐘"
-
-#: data/gtk/help-overlay.ui:82
-msgctxt "shortcut window"
-msgid "Add an alarm"
-msgstr "加入鬧鐘"
-
-#: data/gtk/help-overlay.ui:91
-msgctxt "shortcut window"
-msgid "Stopwatch"
-msgstr "碼表"
-
-#: data/gtk/help-overlay.ui:96
-msgctxt "shortcut window"
-msgid "Stop / Reset"
-msgstr "停止/重設"
-
-#: data/gtk/help-overlay.ui:105
-msgctxt "shortcut window"
-msgid "Timer"
-msgstr "計時器"
-
-#: data/gtk/help-overlay.ui:110
-msgctxt "shortcut window"
-msgid "Reset"
-msgstr "重新設定"
+"X-Generator: Poedit 2.4.1\n"
#: data/org.gnome.clocks.desktop.in.in:3 data/org.gnome.clocks.desktop.in.in:4
-#: data/ui/headerbar.ui:24 src/alarm.vala:788 src/alarm.vala:868
-#: src/main.vala:25 src/stopwatch.vala:122 src/timer.vala:385
-#: src/window.vala:273 src/world.vala:513 src/world.vala:602
+#: data/ui/header-bar.ui:29 src/main.vala:25 src/window.vala:297
+#: src/window.vala:352 src/world-standalone.vala:24
msgid "Clocks"
msgstr "時鐘"
@@ -222,220 +146,328 @@ msgstr "碼表畫面"
msgid "Timer screen"
msgstr "計時器畫面"
-#: data/org.gnome.clocks.metainfo.xml.in.in:74
+#: data/org.gnome.clocks.metainfo.xml.in.in:84
msgid "The GNOME Project"
msgstr "GNOME 專案"
-#: data/ui/alarmdaypickerrow.ui:5
+#: data/gtk/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "General"
+msgstr "一般"
+
+#: data/gtk/help-overlay.ui:19
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "顯示求助"
+
+#: data/gtk/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Open menu"
+msgstr "開啟選單"
+
+#: data/gtk/help-overlay.ui:33
+msgctxt "shortcut window"
+msgid "Keyboard shortcuts"
+msgstr "鍵盤快捷鍵"
+
+#: data/gtk/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "結束"
+
+#: data/gtk/help-overlay.ui:47
+msgctxt "shortcut window"
+msgid "Go to the next section"
+msgstr "移至下一節"
+
+#: data/gtk/help-overlay.ui:54
+msgctxt "shortcut window"
+msgid "Go to the previous section"
+msgstr "移至上一節"
+
+#: data/gtk/help-overlay.ui:63
+msgctxt "shortcut window"
+msgid "World Clocks"
+msgstr "世界時鐘"
+
+#: data/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Add a world clock"
+msgstr "加入世界時鐘"
+
+#: data/gtk/help-overlay.ui:77
+msgctxt "shortcut window"
+msgid "Alarm"
+msgstr "鬧鐘"
+
+#: data/gtk/help-overlay.ui:82
+msgctxt "shortcut window"
+msgid "Add an alarm"
+msgstr "加入鬧鐘"
+
+#: data/gtk/help-overlay.ui:91
+msgctxt "shortcut window"
+msgid "Stopwatch"
+msgstr "碼表"
+
+#: data/gtk/help-overlay.ui:96