From 460ea779017037bc4cf25b289eca0c04adb6cf34 Mon Sep 17 00:00:00 2001 From: Paolo Borelli Date: Sun, 28 Oct 2018 20:21:35 +0000 Subject: [PATCH 1/8] Merge branch 'timer-tick' into 'master' timer: Decouple timer logic from the widget tick See merge request GNOME/gnome-clocks!8 (cherry picked from commit 354d14943f10a2cede2c39d67ce9783c32aafd7d) 14005c78 timer: Decouple timer logic from the widget tick 00ea80dc timer: remove timeout on widget disposal --- src/timer.vala | 59 +++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/src/timer.vala b/src/timer.vala index 7121b548..5846479d 100644 --- a/src/timer.vala +++ b/src/timer.vala @@ -78,9 +78,9 @@ public class Face : Gtk.Stack, Clocks.Clock { public State state { get; private set; default = State.STOPPED; } private GLib.Settings settings; - private uint tick_id; private double span; private GLib.Timer timer; + private uint timeout_id; private Utils.Bell bell; private GLib.Notification notification; [GtkChild] @@ -119,10 +119,17 @@ public class Face : Gtk.Stack, Clocks.Clock { settings = new GLib.Settings ("org.gnome.clocks"); - tick_id = 0; span = 0; timer = new GLib.Timer (); + timeout_id = 0; + destroy.connect(() => { + if (timeout_id != 0) { + GLib.Source.remove(timeout_id); + timeout_id = 0; + } + }); + bell = new Utils.Bell ("complete"); notification = new GLib.Notification (_("Time is up!")); notification.set_body (_("Timer countdown finished")); @@ -227,7 +234,6 @@ public class Face : Gtk.Stack, Clocks.Clock { private void reset () { state = State.STOPPED; timer.reset (); - stop_ticking (); span = settings.get_uint ("timer"); h_spinbutton.value = (int) span / 3600; m_spinbutton.value = (int) span % 3600 / 60; @@ -242,7 +248,7 @@ public class Face : Gtk.Stack, Clocks.Clock { private void start () { countdown_frame.get_style_context ().remove_class ("clocks-paused"); - if (state == State.STOPPED && tick_id == 0) { + if (state == State.STOPPED) { var h = h_spinbutton.get_value_as_int (); var m = m_spinbutton.get_value_as_int (); var s = s_spinbutton.get_value_as_int (); @@ -257,46 +263,31 @@ public class Face : Gtk.Stack, Clocks.Clock { state = State.RUNNING; timer.start (); - start_ticking (); + timeout_id = GLib.Timeout.add(40, () => { + if (state != State.RUNNING) { + timeout_id = 0; + return false; + } + var e = timer.elapsed (); + if (e >= span) { + reset (); + ring (); + timeout_id = 0; + return false; + } + update_countdown (e); + return true; + }); } private void pause () { state = State.PAUSED; timer.stop (); - stop_ticking (); span -= timer.elapsed (); countdown_frame.get_style_context ().add_class ("clocks-paused"); countdown_frame.pause (); } - private void start_ticking () { - if (tick_id == 0) { - tick_id = add_tick_callback ((c) => { - return count (); - }); - } - } - - private void stop_ticking () { - if (tick_id != 0) { - remove_tick_callback (tick_id); - tick_id = 0; - } - } - - private bool count () { - var e = timer.elapsed (); - if (e >= span) { - update_countdown_label (0, 0, 0); - ring (); - reset (); - return false; - } - - update_countdown (e); - return true; - } - private void update_countdown (double elapsed) { if (h_label.get_mapped ()) { // Math.ceil() because we count backwards: From c21626e76cbd3090bec98fa93c53e678c8e801e9 Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Sat, 10 Nov 2018 10:01:49 +0000 Subject: [PATCH 2/8] Update Esperanto translation --- po/eo.po | 461 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 285 insertions(+), 176 deletions(-) diff --git a/po/eo.po b/po/eo.po index 992c75da..a3d6f4cd 100644 --- a/po/eo.po +++ b/po/eo.po @@ -3,17 +3,17 @@ # This file is distributed under the same license as the gnome-clocks package. # Ryan LORTIE , 2013. # Baptiste DARTHENAY , 2014. -# Kristjan SCHMIDT , 2012, 2014, 2015. +# Kristjan SCHMIDT , 2012, 2014, 2015, 2018. # Daniel PUENTES , 2015. +# Carmen Bianca BAKKER , 2018. msgid "" msgstr "" "Project-Id-Version: gnome-clocks master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clocks" -"&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-02-11 07:10+0000\n" -"PO-Revision-Date: 2015-02-12 21:11+0200\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-clocks/issues\n" +"POT-Creation-Date: 2018-10-28 09:15+0000\n" +"PO-Revision-Date: 2018-11-10 11:01+0200\n" "Last-Translator: Kristjan SCHMIDT \n" -"Language-Team: Esperanto \n" +"Language-Team: Esperanto \n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,109 @@ msgstr "" "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: ../data/appdata/org.gnome.clocks.appdata.xml.in.h:1 +#: data/gtk/help-overlay.ui:14 +msgctxt "shortcut window" +msgid "General" +msgstr "Ĝenerala" + +#: data/gtk/help-overlay.ui:19 +msgctxt "shortcut window" +msgid "Go to the next section" +msgstr "Iri al sekva sekcio" + +#: data/gtk/help-overlay.ui:26 +msgctxt "shortcut window" +msgid "Go to the previous section" +msgstr "Iri al antaŭa sekvoi" + +#: data/gtk/help-overlay.ui:33 +msgctxt "shortcut window" +msgid "Quit" +msgstr "Ĉesi" + +#: data/gtk/help-overlay.ui:42 +msgctxt "shortcut window" +msgid "World Clocks" +msgstr "Mondaj horloĝoj" + +#: data/gtk/help-overlay.ui:47 +msgctxt "shortcut window" +msgid "Add a world clock" +msgstr "Aldoni mondan horloĝon" + +#: data/gtk/help-overlay.ui:54 +msgctxt "shortcut window" +msgid "Select all world clocks" +msgstr "Elekti ĉiujn mondajn horloĝojn" + +#: data/gtk/help-overlay.ui:63 +msgctxt "shortcut window" +msgid "Alarm" +msgstr "Alarmo" + +#: data/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Add an alarm" +msgstr "Aldoni alarmon" + +#: data/gtk/help-overlay.ui:75 +msgctxt "shortcut window" +msgid "Select all alarms" +msgstr "Elekti ĉiujn alarmojn" + +#: data/gtk/help-overlay.ui:84 +msgctxt "shortcut window" +msgid "Stopwatch" +msgstr "Kronometro" + +#: data/gtk/help-overlay.ui:89 +msgctxt "shortcut window" +msgid "Stop / Reset" +msgstr "Haltigi / Rekomencigi" + +#: data/gtk/help-overlay.ui:98 +msgctxt "shortcut window" +msgid "Timer" +msgstr "Tempmezurilo" + +#: data/gtk/help-overlay.ui:103 +msgctxt "shortcut window" +msgid "Reset" +msgstr "Rekomencigi" + +#: data/gtk/menus.ui:7 +msgid "_Keyboard Shortcuts" +msgstr "_Klavkombinoj" + +#: data/gtk/menus.ui:12 +msgid "_Help" +msgstr "_Helpo" + +#: data/gtk/menus.ui:17 +msgid "_About" +msgstr "_Pri" + +#: data/gtk/menus.ui:21 +msgid "_Quit" +msgstr "Ĉ_esi" + +#: data/gtk/menus.ui:31 +msgid "Select All" +msgstr "Elekti ĉiujn" + +#: data/gtk/menus.ui:36 +msgid "Select None" +msgstr "Elekti neniun" + +#: data/org.gnome.clocks.appdata.xml.in:6 +msgid "GNOME Clocks" +msgstr "GNOME Horloĝoj" + +#: data/org.gnome.clocks.appdata.xml.in:7 data/org.gnome.clocks.desktop.in:6 +msgid "Clocks for world times, plus alarms, stopwatch and a timer" +msgstr "Horloĝoj por mondaj horoj, plus alarmoj, kronometro kaj tempmezurilo" + +#: data/org.gnome.clocks.appdata.xml.in:9 msgid "" "A simple and elegant clock application. It includes world clocks, alarms, a " "stopwatch and a timer." @@ -30,327 +132,334 @@ msgstr "" "Simpla kaj eleganta horloĝa aplikaĵo. Enhavas mondajn horloĝojn, alarmojn, " "kronometron kaj minutatoron." -#: ../data/appdata/org.gnome.clocks.appdata.xml.in.h:2 +#: data/org.gnome.clocks.appdata.xml.in:13 msgid "Goals:" msgstr "Celoj:" -#: ../data/appdata/org.gnome.clocks.appdata.xml.in.h:3 +#: data/org.gnome.clocks.appdata.xml.in:15 msgid "Show the time in different cities around the world" -msgstr "Montras la tempon en malsamaj urboj ĉirkaŭ la mondo" +msgstr "Montri la tempon en malsamaj urboj ĉirkaŭ la mondo" -#: ../data/appdata/org.gnome.clocks.appdata.xml.in.h:4 +#: data/org.gnome.clocks.appdata.xml.in:16 msgid "Set alarms to wake you up" msgstr "Agordi alarmojn por veki vin" -#: ../data/appdata/org.gnome.clocks.appdata.xml.in.h:5 +#: data/org.gnome.clocks.appdata.xml.in:17 msgid "Measure elapsed time with an accurate stopwatch" msgstr "Mezuras pasitan tempon kun preciza kronometro" -#: ../data/appdata/org.gnome.clocks.appdata.xml.in.h:6 +#: data/org.gnome.clocks.appdata.xml.in:18 msgid "Set timers to properly cook your food" -msgstr "Agordi minutatorojn por ĝuste kuiri vian manĝaĵon" +msgstr "Agordi tempmezurilojn por ĝuste kuiri vian manĝaĵon" + +#: data/org.gnome.clocks.appdata.xml.in:33 +msgid "Initial screen" +msgstr "Komenca ekrano" + +#: data/org.gnome.clocks.appdata.xml.in:37 +msgid "Alarms screen" +msgstr "Alarma ekrano" + +#: data/org.gnome.clocks.appdata.xml.in:41 +msgid "Alarms setup" +msgstr "Alarma agordado" + +#: data/org.gnome.clocks.appdata.xml.in:45 +msgid "Stopwatch screen" +msgstr "Kronometra ekrano" -#: ../data/org.gnome.clocks.desktop.in.h:1 ../src/window.vala:197 -#: ../data/ui/window.ui.h:1 +#: data/org.gnome.clocks.appdata.xml.in:49 +msgid "Timer screen" +msgstr "Tempmezurila ekrano" + +#: data/org.gnome.clocks.desktop.in:3 data/org.gnome.clocks.desktop.in:4 +#: data/ui/window.ui:5 src/window.vala:64 src/window.vala:251 +#: src/world.vala:513 msgid "Clocks" msgstr "Horloĝoj" -#: ../data/org.gnome.clocks.desktop.in.h:2 -msgid "GNOME Clocks" -msgstr "GNOME-horloĝoj" +#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: data/org.gnome.clocks.desktop.in:8 +msgid "time;timer;alarm;world clock;stopwatch;time zone;" +msgstr "horo;tempmezurilo;alarmo;monda horloĝo;kronometro;horzono;" -#: ../data/org.gnome.clocks.desktop.in.h:3 -msgid "Clocks for world times, plus alarms, stopwatch and a timer" -msgstr "Horloĝoj por mondaj horoj, plus alarmoj, kronometro kaj minutatoro" +#. Translators: Do NOT translate or transliterate this text (this is an icon file name)! +#: data/org.gnome.clocks.desktop.in:11 +msgid "org.gnome.clocks" +msgstr "org.gnome.clocks" -#: ../data/org.gnome.clocks.desktop.in.h:4 -msgid "time;timer;alarm;world clock;stopwatch;time zone;" -msgstr "horo;minutatoro;alarmo;monda horloĝo;kronometro;horzono;" +#: data/org.gnome.clocks.desktop.in:18 +msgid "Allows world clocks to be displayed for your time zone." +msgstr "Permesas, ke mondaj horloĝoj estu montritaj por via horzono." -#: ../data/org.gnome.clocks.gschema.xml.in.h:1 +#: data/org.gnome.clocks.gschema.xml.in:5 msgid "Configured world clocks" msgstr "Agorditaj mondaj horloĝoj" -#: ../data/org.gnome.clocks.gschema.xml.in.h:2 +#: data/org.gnome.clocks.gschema.xml.in:6 msgid "List of world clocks to show." msgstr "Listo de mondaj horloĝoj por montri." -#: ../data/org.gnome.clocks.gschema.xml.in.h:3 +#: data/org.gnome.clocks.gschema.xml.in:12 msgid "Configured alarms" msgstr "Agorditaj alarmoj" -#: ../data/org.gnome.clocks.gschema.xml.in.h:4 +#: data/org.gnome.clocks.gschema.xml.in:13 msgid "List of alarms set." msgstr "Listo de alarmoj agorditaj." -#: ../data/org.gnome.clocks.gschema.xml.in.h:5 ../src/timer.vala:114 +#: data/org.gnome.clocks.gschema.xml.in:19 src/timer.vala:115 msgid "Timer" msgstr "Minutatoro" -#: ../data/org.gnome.clocks.gschema.xml.in.h:6 +#: data/org.gnome.clocks.gschema.xml.in:20 msgid "Configured timer duration in seconds." msgstr "Agordita minutatora daŭro, en sekundoj." -#: ../data/org.gnome.clocks.gschema.xml.in.h:7 +#: data/org.gnome.clocks.gschema.xml.in:26 msgid "Geolocation support" msgstr "Geo-pozicitrova subteno" -#: ../data/org.gnome.clocks.gschema.xml.in.h:8 +#: data/org.gnome.clocks.gschema.xml.in:27 msgid "Turn geolocation support on and off." msgstr "Aktivigi aŭ malaktivigi geo-pozicitrovan subtenon." -#: ../data/org.gnome.clocks.gschema.xml.in.h:9 +#: data/org.gnome.clocks.gschema.xml.in:44 msgid "Window state" msgstr "Fenestra stato" -#: ../data/org.gnome.clocks.gschema.xml.in.h:10 +#: data/org.gnome.clocks.gschema.xml.in:45 msgid "State of the window, e.g. maximized." msgstr "Stato de la fenestro; ekz. maksimumigita." -#: ../data/org.gnome.clocks.gschema.xml.in.h:11 +#: data/org.gnome.clocks.gschema.xml.in:51 msgid "Window width and height" msgstr "Fenestra larĝo kaj alto" -#: ../data/org.gnome.clocks.gschema.xml.in.h:12 +#: data/org.gnome.clocks.gschema.xml.in:52 msgid "Width and height of the window." msgstr "Larĝo kaj alto de la fenestro." -#: ../data/org.gnome.clocks.gschema.xml.in.h:13 +#: data/org.gnome.clocks.gschema.xml.in:58 msgid "Panel state" -msgstr "Reĝima stato" +msgstr "Panela stato" -#: ../data/org.gnome.clocks.gschema.xml.in.h:14 +#: data/org.gnome.clocks.gschema.xml.in:59 msgid "Current clock panel." msgstr "Aktuala horloĝa reĝimo." -#: ../src/alarm.vala:115 ../src/alarm.vala:366 ../src/alarm.vala:534 -msgid "Alarm" -msgstr "Alarmoj" - -#: ../src/alarm.vala:117 ../src/stopwatch.vala:190 -#: ../data/ui/alarmringing.ui.h:1 +#: data/ui/alarmringing.ui:39 src/alarm.vala:118 src/stopwatch.vala:199 msgid "Stop" -msgstr "Halti" +msgstr "Haltigi" -#: ../src/alarm.vala:118 ../data/ui/alarmringing.ui.h:2 +#: data/ui/alarmringing.ui:59 src/alarm.vala:119 msgid "Snooze" msgstr "Dormeti" -#: ../src/alarm.vala:308 +#: data/ui/alarmsetupdialog.ui:27 data/ui/worldlocationdialog.ui:17 +msgid "Add a New World Clock" +msgstr "Aldoni novan mondhorloĝon" + +#: data/ui/alarmsetupdialog.ui:31 data/ui/worldlocationdialog.ui:21 +msgid "_Cancel" +msgstr "_Nuligi" + +#: data/ui/alarmsetupdialog.ui:47 +msgid "_Done" +msgstr "_Farita" + +#: data/ui/alarmsetupdialog.ui:199 +msgid "You already have an alarm for this time." +msgstr "Vi jam havas alarmon por ĉi tiu tempo." + +#: data/ui/alarmsetupdialog.ui:227 +msgid "Name" +msgstr "Nomo" + +#: data/ui/alarmsetupdialog.ui:241 +msgid "Repeat Every" +msgstr "Ripeti ĉiun" + +#: data/ui/alarmsetupdialog.ui:295 +msgid "Active" +msgstr "Aktiva" + +#: data/ui/alarm.ui:32 +msgid "Select New to add an alarm" +msgstr "Elektu na Nova por aldoni alarmon" + +#: data/ui/stopwatch.ui:54 data/ui/timer.ui:197 src/stopwatch.vala:221 +msgid "Start" +msgstr "Startigi" + +#: data/ui/stopwatch.ui:72 data/ui/timer.ui:421 src/stopwatch.vala:213 +msgid "Reset" +msgstr "Rekomencigi" + +#: data/ui/timer.ui:403 src/timer.vala:213 src/timer.vala:224 +msgid "Pause" +msgstr "Paŭzigi" + +#: data/ui/worldlocationdialog.ui:37 +msgid "_Add" +msgstr "_Aldoni" + +#: data/ui/worldlocationdialog.ui:76 +msgid "Search for a city:" +msgstr "Serĉi urbon:" + +#: data/ui/world.ui:32 +msgid "Select New to add a world clock" +msgstr "Elektu na Nova por aldoni novan mondhorloĝon" + +#: data/ui/world.ui:123 +msgid "Sunrise" +msgstr "Sunleviĝo" + +#: data/ui/world.ui:137 +msgid "Sunset" +msgstr "Sunsubiro" + +#: src/alarm.vala:116 src/alarm.vala:416 src/alarm.vala:595 +msgid "Alarm" +msgstr "Alarmoj" + +#: src/alarm.vala:350 msgid "Edit Alarm" msgstr "Redakti alarmon" -#: ../src/alarm.vala:308 +#: src/alarm.vala:350 msgid "New Alarm" msgstr "Nova alarmo" #. Translators: "New" refers to an alarm -#. Translators: "New" refers to a world clock -#: ../src/alarm.vala:559 ../src/world.vala:262 +#: src/alarm.vala:624 +msgctxt "Alarm" msgid "New" msgstr "Nova" -#: ../src/application.vala:23 +#: src/application.vala:23 msgid "Print version information and exit" msgstr "Eligi versian informon kaj ĉesi" -#: ../src/stopwatch.vala:130 +#: src/stopwatch.vala:139 msgid "Stopwatch" msgstr "Kronometro" -#: ../src/stopwatch.vala:193 +#: src/stopwatch.vala:202 msgid "Lap" msgstr "Rondiro" -#: ../src/stopwatch.vala:200 ../src/timer.vala:172 +#: src/stopwatch.vala:209 src/timer.vala:208 msgid "Continue" msgstr "Daŭrigi" -#: ../src/stopwatch.vala:204 ../data/ui/stopwatch.ui.h:2 -#: ../data/ui/timer.ui.h:3 -msgid "Reset" -msgstr "Reagordi" - -#: ../src/stopwatch.vala:212 ../data/ui/stopwatch.ui.h:1 -#: ../data/ui/timer.ui.h:1 -msgid "Start" -msgstr "Startigi" - -#: ../src/timer.vala:126 +#: src/timer.vala:127 msgid "Time is up!" msgstr "Tempo estas pasinta!" -#: ../src/timer.vala:127 +#: src/timer.vala:128 msgid "Timer countdown finished" msgstr "Minutatora ĝisnombrado finita" -#: ../src/timer.vala:177 ../src/timer.vala:188 ../data/ui/timer.ui.h:2 -msgid "Pause" -msgstr "Paŭzigi" - -#: ../src/utils.vala:153 +#: src/utils.vala:168 msgid "Mondays" msgstr "Lunde" -#: ../src/utils.vala:154 +#: src/utils.vala:169 msgid "Tuesdays" msgstr "Marde" -#: ../src/utils.vala:155 +#: src/utils.vala:170 msgid "Wednesdays" msgstr "Merkrede" -#: ../src/utils.vala:156 +#: src/utils.vala:171 msgid "Thursdays" msgstr "Ĵaŭde" -#: ../src/utils.vala:157 +#: src/utils.vala:172 msgid "Fridays" msgstr "Vendrede" -#: ../src/utils.vala:158 +#: src/utils.vala:173 msgid "Saturdays" msgstr "Sabate" -#: ../src/utils.vala:159 +#: src/utils.vala:174 msgid "Sundays" msgstr "Dimanĉe" -#: ../src/utils.vala:239 +#: src/utils.vala:254 msgid "Every Day" msgstr "Ĉiutage" -#: ../src/utils.vala:241 +#: src/utils.vala:256 msgid "Weekdays" msgstr "Semajntage" -#: ../src/utils.vala:243 +#: src/utils.vala:258 msgid "Weekends" msgstr "Semajnfine" -#: ../src/widgets.vala:483 -msgid "Delete" -msgstr "Forigi" - -#: ../src/widgets.vala:509 ../src/widgets.vala:664 +#: src/widgets.vala:232 src/widgets.vala:247 msgid "Click on items to select them" msgstr "Klaki sur elementoj por elekti ilin" -#: ../src/widgets.vala:511 +#: src/widgets.vala:234 #, c-format -msgid "%d selected" -msgid_plural "%d selected" -msgstr[0] "%d elektita" -msgstr[1] "%d elektitaj" +msgid "%u selected" +msgid_plural "%u selected" +msgstr[0] "%u elektita" +msgstr[1] "%u elektitaj" + +#: src/widgets.vala:333 +msgid "Delete" +msgstr "Forigi" -#: ../src/widgets.vala:653 +#: src/widgets.vala:477 msgid "Cancel" msgstr "Nuligi" -#: ../src/window.vala:170 +#: src/window.vala:224 #, c-format msgid "Failed to show help: %s" msgstr "Malsukcesis montri helpon: %s" -#: ../src/window.vala:200 +#: src/window.vala:254 msgid "Utilities to help you with the time." msgstr "Utilaĵoj por helpi vin pri la horo." -#: ../src/window.vala:205 +#: src/window.vala:259 msgid "translator-credits" msgstr "" -"Kristjan SCHMIDT \n" +"Kristjan SCHMIDT\n" "Ryan LORTIE \n" "Baptiste DARTHENAY \n" -"Daniel PUENTES " +"Daniel PUENTES \n" +"Carmen Bianca BAKKER " -#. If it is Dec 31st here and Jan 1st there (d = 1), then "tomorrow" -#: ../src/world.vala:106 ../src/world.vala:109 +#. If it is Jan 1st there, and not Jan 2nd here, then it must be +#. Dec 31st here, so return "tomorrow" +#: src/world.vala:138 src/world.vala:142 msgid "Tomorrow" msgstr "Morgaŭ" -#. If it is Jan 1st here and Dec 31st there (t = 1), then "yesterday" -#: ../src/world.vala:106 ../src/world.vala:109 +#. If it is Jan 1st here, and not Jan 2nd there, then it must be +#. Dec 31st there, so return "yesterday" +#: src/world.vala:138 src/world.vala:142 msgid "Yesterday" msgstr "Hieraŭ" -#: ../src/world.vala:250 +#: src/world.vala:318 msgid "World" msgstr "Mondo" -#. namespace World -#. namespace Clocks -#: ../data/gtk/menus.ui.h:1 -msgid "_Help" -msgstr "_Helpo" - -#: ../data/gtk/menus.ui.h:2 -msgid "_About" -msgstr "_Pri" - -#: ../data/gtk/menus.ui.h:3 -msgid "_Quit" -msgstr "Ĉ_esi" - -#: ../data/gtk/menus.ui.h:4 -msgid "Select All" -msgstr "Elekti ĉiujn" - -#: ../data/gtk/menus.ui.h:5 -msgid "Select None" -msgstr "Elekti neniun" - -#: ../data/ui/alarmsetupdialog.ui.h:1 ../data/ui/worldlocationdialog.ui.h:1 -msgid "Add a New World Clock" -msgstr "Aldoni novan mondhorloĝon" - -#: ../data/ui/alarmsetupdialog.ui.h:2 ../data/ui/worldlocationdialog.ui.h:2 -msgid "_Cancel" -msgstr "_Nuligi" - -#: ../data/ui/alarmsetupdialog.ui.h:3 -msgid "_Done" -msgstr "_Finita" - -#: ../data/ui/alarmsetupdialog.ui.h:4 -msgid "You already have an alarm for this time." -msgstr "Vi jam havas alarmon por ĉi tiu tempo." - -#: ../data/ui/alarmsetupdialog.ui.h:5 -msgid "Name" -msgstr "Nomo" - -#: ../data/ui/alarmsetupdialog.ui.h:6 -msgid "Repeat Every" -msgstr "Ripetu enigon" - -#: ../data/ui/alarmsetupdialog.ui.h:7 -msgid "Active" -msgstr "Aktiva" - -#: ../data/ui/alarm.ui.h:1 -msgid "Select New to add an alarm" -msgstr "Elektu na Nova por aldoni alarmon" - -#: ../data/ui/worldlocationdialog.ui.h:3 -msgid "_Add" -msgstr "_Aldoni" - -#: ../data/ui/worldlocationdialog.ui.h:4 -msgid "Search for a city:" -msgstr "Serĉi urbon:" - -#: ../data/ui/world.ui.h:1 -msgid "Select New to add a world clock" -msgstr "Elektu na Nova por aldoni novan mondhorloĝon" - -#: ../data/ui/world.ui.h:2 -msgid "Sunrise" -msgstr "Sunleviĝo" - -#: ../data/ui/world.ui.h:3 -msgid "Sunset" -msgstr "Sunsubiro" +#. Translators: "New" refers to a world clock +#: src/world.vala:337 +msgctxt "World clock" +msgid "New" +msgstr "Nova" #~ msgid "_New" #~ msgstr "_Nova" From dd7d12c57963afc1a1130fd941c03a1cc9984ab1 Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Fri, 23 Nov 2018 08:57:01 +0000 Subject: [PATCH 3/8] Update Esperanto translation --- po/eo.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/eo.po b/po/eo.po index a3d6f4cd..4a1fb8ab 100644 --- a/po/eo.po +++ b/po/eo.po @@ -10,16 +10,16 @@ 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: 2018-10-28 09:15+0000\n" -"PO-Revision-Date: 2018-11-10 11:01+0200\n" -"Last-Translator: Kristjan SCHMIDT \n" +"POT-Creation-Date: 2018-11-10 10:02+0000\n" +"PO-Revision-Date: 2018-11-22 20:56+0100\n" +"Last-Translator: Carmen Bianca Bakker \n" "Language-Team: Esperanto \n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Poedit 2.2\n" "X-Project-Style: gnome\n" #: data/gtk/help-overlay.ui:14 @@ -286,17 +286,17 @@ msgstr "Aktiva" #: data/ui/alarm.ui:32 msgid "Select New to add an alarm" -msgstr "Elektu na Nova por aldoni alarmon" +msgstr "Elektu Nova por aldoni alarmon" #: data/ui/stopwatch.ui:54 data/ui/timer.ui:197 src/stopwatch.vala:221 msgid "Start" -msgstr "Startigi" +msgstr "Komenci" #: data/ui/stopwatch.ui:72 data/ui/timer.ui:421 src/stopwatch.vala:213 msgid "Reset" msgstr "Rekomencigi" -#: data/ui/timer.ui:403 src/timer.vala:213 src/timer.vala:224 +#: data/ui/timer.ui:403 src/timer.vala:220 src/timer.vala:231 msgid "Pause" msgstr "Paŭzigi" @@ -310,7 +310,7 @@ msgstr "Serĉi urbon:" #: data/ui/world.ui:32 msgid "Select New to add a world clock" -msgstr "Elektu na Nova por aldoni novan mondhorloĝon" +msgstr "Elektu Nova por aldoni novan mondhorloĝon" #: data/ui/world.ui:123 msgid "Sunrise" @@ -350,15 +350,15 @@ msgstr "Kronometro" msgid "Lap" msgstr "Rondiro" -#: src/stopwatch.vala:209 src/timer.vala:208 +#: src/stopwatch.vala:209 src/timer.vala:215 msgid "Continue" msgstr "Daŭrigi" -#: src/timer.vala:127 +#: src/timer.vala:134 msgid "Time is up!" msgstr "Tempo estas pasinta!" -#: src/timer.vala:128 +#: src/timer.vala:135 msgid "Timer countdown finished" msgstr "Minutatora ĝisnombrado finita" From d90bf8a67836ccc827bab087aa72e1d1058c0445 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Thu, 13 Dec 2018 20:45:40 +0000 Subject: [PATCH 4/8] Update Swedish translation --- po/sv.po | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/po/sv.po b/po/sv.po index 5d448aba..c25390fa 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10,10 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: gnome-clocks master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"clocks&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-07-29 16:24+0000\n" -"PO-Revision-Date: 2017-08-06 12:30+0200\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-clocks/issues\n" +"POT-Creation-Date: 2018-10-28 09:15+0000\n" +"PO-Revision-Date: 2018-12-13 21:44+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -21,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Poedit 2.2\n" #: data/gtk/help-overlay.ui:14 msgctxt "shortcut window" @@ -117,7 +116,7 @@ msgstr "Markera allt" msgid "Select None" msgstr "Markera inget" -#: data/org.gnome.clocks.appdata.xml.in:6 data/org.gnome.clocks.desktop.in:5 +#: data/org.gnome.clocks.appdata.xml.in:6 msgid "GNOME Clocks" msgstr "GNOME Klockor" @@ -175,7 +174,7 @@ msgstr "Timerskärm" #: data/org.gnome.clocks.desktop.in:3 data/org.gnome.clocks.desktop.in:4 #: data/ui/window.ui:5 src/window.vala:64 src/window.vala:251 -#: src/world.vala:495 +#: src/world.vala:513 msgid "Clocks" msgstr "Klockor" @@ -289,15 +288,15 @@ msgstr "Aktiv" msgid "Select New to add an alarm" msgstr "Välj Nytt för att lägga till ett alarm" -#: data/ui/stopwatch.ui:54 data/ui/timer.ui:194 src/stopwatch.vala:221 +#: data/ui/stopwatch.ui:54 data/ui/timer.ui:197 src/stopwatch.vala:221 msgid "Start" msgstr "Starta" -#: data/ui/stopwatch.ui:72 data/ui/timer.ui:415 src/stopwatch.vala:213 +#: data/ui/stopwatch.ui:72 data/ui/timer.ui:421 src/stopwatch.vala:213 msgid "Reset" msgstr "Återställ" -#: data/ui/timer.ui:397 src/timer.vala:213 src/timer.vala:224 +#: data/ui/timer.ui:403 src/timer.vala:213 src/timer.vala:224 msgid "Pause" msgstr "Paus" @@ -309,10 +308,9 @@ msgstr "_Lägg till" msgid "Search for a city:" msgstr "Sök efter en stad:" -# https://bugzilla.gnome.org/show_bug.cgi?id=746474 #: data/ui/world.ui:32 msgid "Select New to add a world clock" -msgstr "Välj Nytt för att lägga till en världsklocka" +msgstr "Välj Ny för att lägga till en världsklocka" #: data/ui/world.ui:123 msgid "Sunrise" @@ -445,22 +443,22 @@ msgstr "" #. If it is Jan 1st there, and not Jan 2nd here, then it must be #. Dec 31st here, so return "tomorrow" -#: src/world.vala:122 src/world.vala:126 +#: src/world.vala:138 src/world.vala:142 msgid "Tomorrow" msgstr "I morgon" #. If it is Jan 1st here, and not Jan 2nd there, then it must be #. Dec 31st there, so return "yesterday" -#: src/world.vala:122 src/world.vala:126 +#: src/world.vala:138 src/world.vala:142 msgid "Yesterday" msgstr "Igår" -#: src/world.vala:300 +#: src/world.vala:318 msgid "World" msgstr "Världen" #. Translators: "New" refers to a world clock -#: src/world.vala:319 +#: src/world.vala:337 msgctxt "World clock" msgid "New" msgstr "Ny" From 8bca6fff53ea40a481178f5570dd339cc5fb5e14 Mon Sep 17 00:00:00 2001 From: Charles Monzat Date: Thu, 24 Jan 2019 09:54:49 +0000 Subject: [PATCH 5/8] Update French translation --- po/fr.po | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/po/fr.po b/po/fr.po index c75a43fd..bdde1b70 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,23 +6,22 @@ # Alexandre Franke , 2012. # Alain Lojewski , 2013. # Bruno Cauet , 2014. -# Charles Monzat , 2016, 2017. +# Charles Monzat , 2016-2018. # msgid "" msgstr "" "Project-Id-Version: gnome-clocks master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"clocks&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-08-22 14:17+0000\n" -"PO-Revision-Date: 2017-09-07 16:16+0200\n" -"Last-Translator: Charles Monzat \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-clocks/issues\n" +"POT-Creation-Date: 2018-10-28 09:15+0000\n" +"PO-Revision-Date: 2018-11-20 16:20+0100\n" +"Last-Translator: Charles Monzat \n" "Language-Team: français \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Gtranslator 2.91.7\n" +"X-Generator: Gtranslator 3.30.0\n" #: data/gtk/help-overlay.ui:14 msgctxt "shortcut window" @@ -118,7 +117,7 @@ msgstr "Tout sélectionner" msgid "Select None" msgstr "Ne rien sélectionner" -#: data/org.gnome.clocks.appdata.xml.in:6 data/org.gnome.clocks.desktop.in:5 +#: data/org.gnome.clocks.appdata.xml.in:6 msgid "GNOME Clocks" msgstr "Horloges de GNOME" @@ -150,7 +149,7 @@ msgstr "Régler des alarmes pour le réveil" #: data/org.gnome.clocks.appdata.xml.in:17 msgid "Measure elapsed time with an accurate stopwatch" -msgstr "Mesurer le temps écoulé avec un chonomètre précis" +msgstr "Mesurer le temps écoulé avec un chronomètre précis" #: data/org.gnome.clocks.appdata.xml.in:18 msgid "Set timers to properly cook your food" @@ -178,7 +177,7 @@ msgstr "Écran du minuteur" #: data/org.gnome.clocks.desktop.in:3 data/org.gnome.clocks.desktop.in:4 #: data/ui/window.ui:5 src/window.vala:64 src/window.vala:251 -#: src/world.vala:495 +#: src/world.vala:513 msgid "Clocks" msgstr "Horloges" @@ -291,17 +290,17 @@ msgstr "Activer" #: data/ui/alarm.ui:32 msgid "Select New to add an alarm" -msgstr "Selectionner Nouvelle pour ajouter une alarme" +msgstr "Sélectionner Nouvelle pour ajouter une alarme" -#: data/ui/stopwatch.ui:54 data/ui/timer.ui:194 src/stopwatch.vala:221 +#: data/ui/stopwatch.ui:54 data/ui/timer.ui:197 src/stopwatch.vala:221 msgid "Start" msgstr "Démarrer" -#: data/ui/stopwatch.ui:72 data/ui/timer.ui:415 src/stopwatch.vala:213 +#: data/ui/stopwatch.ui:72 data/ui/timer.ui:421 src/stopwatch.vala:213 msgid "Reset" msgstr "Recommencer" -#: data/ui/timer.ui:397 src/timer.vala:213 src/timer.vala:224 +#: data/ui/timer.ui:403 src/timer.vala:213 src/timer.vala:224 msgid "Pause" msgstr "Pause" @@ -315,7 +314,7 @@ msgstr "Rechercher une ville :" #: data/ui/world.ui:32 msgid "Select New to add a world clock" -msgstr "Selectionner Nouvelle pour ajouter une horloge mondiale" +msgstr "Sélectionner Nouvelle pour ajouter une horloge mondiale" #: data/ui/world.ui:123 msgid "Sunrise" @@ -445,22 +444,22 @@ msgstr "" #. If it is Jan 1st there, and not Jan 2nd here, then it must be #. Dec 31st here, so return "tomorrow" -#: src/world.vala:122 src/world.vala:126 +#: src/world.vala:138 src/world.vala:142 msgid "Tomorrow" msgstr "Demain" #. If it is Jan 1st here, and not Jan 2nd there, then it must be #. Dec 31st there, so return "yesterday" -#: src/world.vala:122 src/world.vala:126 +#: src/world.vala:138 src/world.vala:142 msgid "Yesterday" msgstr "Hier" -#: src/world.vala:300 +#: src/world.vala:318 msgid "World" msgstr "Monde" #. Translators: "New" refers to a world clock -#: src/world.vala:319 +#: src/world.vala:337 msgctxt "World clock" msgid "New" msgstr "Nouvelle" From 7740885cde39e69d5718db67df234099be97f9de Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Thu, 31 Jan 2019 17:55:32 -0500 Subject: [PATCH 6/8] snap: switch to core18 and other cleanup --- snap/snapcraft.yaml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d44449cd..6430939c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -5,11 +5,17 @@ description: | GNOME Clocks is a simple application to show the time and date in multiple locations and set alarms or timers. A stopwatch is also included. -grade: devel # must be 'stable' to release into candidate/stable channels +grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict +base: core18 + +# Launchpad doesn't recognize these fields yet +passthrough: + license: GPL-2.0+ + title: GNOME Clocks plugs: - gnome-3-26-1604: + gnome-3-28-1804: interface: content target: $SNAP/gnome-platform default-provider: gnome-3-26-1604 @@ -50,6 +56,18 @@ apps: LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/gnome-clocks parts: + desktop-gnome-platform: + source: https://github.com/ubuntu/snapcraft-desktop-helpers.git + source-subdir: gtk + plugin: make + make-parameters: ["FLAVOR=gtk3"] + build-packages: + - build-essential + - libgtk-3-dev + override-build: | + snapcraftctl build + mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform + libgweather: source: https://git.gnome.org/browse/libgweather source-type: git @@ -59,16 +77,11 @@ parts: - --datadir=../snap/gnome-clocks/current/usr/share organize: snap/gnome-clocks/current/usr: usr - build-attributes: ['no-system-libraries'] build-packages: - - gnome-common - - gnome-pkg-tools - libxml2-dev - libglib2.0-dev - libgtk-3-dev - libsoup2.4-dev - - intltool - - pkg-config - libxml2-utils - gtk-doc-tools - libglib2.0-doc @@ -79,6 +92,7 @@ parts: - valac - libgeocode-glib-dev - libgladeui-dev + gnome-clocks: after: [libgweather, desktop-gnome-platform] source: . @@ -93,15 +107,10 @@ parts: mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/ cp ../src/data/icons/hicolor/256x256/apps/org.gnome.clocks.png $SNAPCRAFT_PART_INSTALL/meta/gui/ cp snapbuild/data/org.gnome.clocks.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/ - build-attributes: ['no-system-libraries'] build-packages: - - meson - - desktop-file-utils - gettext - - gnome-common - gsettings-desktop-schemas-dev - - appstream-util - - gnome-pkg-tools + - itstool - libgeoclue-2-dev - libgeocode-glib-dev - libgirepository1.0-dev @@ -109,9 +118,7 @@ parts: - libgnome-desktop-3-dev - libgsound-dev - libgtk-3-dev - - pkg-config - valac - - yelp-tools libraries: plugin: nil From 0129f92a853814c95766be80344adfa997b3d940 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Thu, 31 Jan 2019 18:57:02 -0500 Subject: [PATCH 7/8] snap: stop using core18 sound isn't working org.gnome.Clocks-WARNING **: utils.vala:335: Error playing sound: No such driver (cherry picked from commit ea16a0a3c1b4f145235c6de18595de983d7cb9c3) --- snap/snapcraft.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6430939c..1c8daf3c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -7,7 +7,6 @@ description: | grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict -base: core18 # Launchpad doesn't recognize these fields yet passthrough: @@ -15,7 +14,7 @@ passthrough: title: GNOME Clocks plugs: - gnome-3-28-1804: + gnome-3-26-1604: interface: content target: $SNAP/gnome-platform default-provider: gnome-3-26-1604 @@ -56,18 +55,6 @@ apps: LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/gnome-clocks parts: - desktop-gnome-platform: - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git - source-subdir: gtk - plugin: make - make-parameters: ["FLAVOR=gtk3"] - build-packages: - - build-essential - - libgtk-3-dev - override-build: | - snapcraftctl build - mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform - libgweather: source: https://git.gnome.org/browse/libgweather source-type: git From 85f54c705d2773e5524e158ec462e5ae6c3d6c65 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Thu, 31 Jan 2019 23:02:49 -0500 Subject: [PATCH 8/8] snap: switch to core18 This reverts commit ea16a0a3c1b4f145235c6de18595de983d7cb9c3. Build gsound and libcanberra as a way to get sound working in the snap --- snap/plugins/x-meson.py | 68 ----------------------------------------- snap/snapcraft.yaml | 61 ++++++++++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 74 deletions(-) delete mode 100644 snap/plugins/x-meson.py diff --git a/snap/plugins/x-meson.py b/snap/plugins/x-meson.py deleted file mode 100644 index 4bfb1cd7..00000000 --- a/snap/plugins/x-meson.py +++ /dev/null @@ -1,68 +0,0 @@ -# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- -# - -import os -import snapcraft - - -class MesonPlugin(snapcraft.BasePlugin): - - @classmethod - def schema(cls): - schema = super().schema() - schema['properties']['meson-parameters'] = { - 'type': 'array', - 'minitems': 1, - 'uniqueItems': True, - 'items': { - 'type': 'string', - }, - 'default': [], - } - - return schema - - @classmethod - def get_build_properties(cls): - return ['meson-parameters'] - - def __init__(self, name, options, project): - super().__init__(name, options, project) - self.snapbuildname = 'snapbuild' - self.mesonbuilddir = os.path.join(self.builddir, self.snapbuildname) - self.build_packages.append('meson') - self.build_packages.append('ninja-build') - - def build(self): - super().build() - self._run_meson() - self._run_ninja_build_default() - self._run_ninja_install() - - def _run_meson(self): - os.makedirs(self.mesonbuilddir, exist_ok=True) - meson_command = ['meson'] - if self.options.meson_parameters: - meson_command.extend(self.options.meson_parameters) - meson_command.append(self.snapbuildname) - env = os.environ.copy() - env['PKG_CONFIG_PATH'] = self.project.stage_dir + '/usr/lib/pkgconfig:/usr/lib/' + self.project.arch_triplet + '/pkgconfig:/usr/lib/pkgconfig' - env['VAPIDIR'] = self.project.stage_dir + '/usr/share/vala/vapi' - env['GI_TYPELIB_PATH'] = self.project.stage_dir + '/usr/lib/' + self.project.arch_triplet + '/girepository-1.0:/usr/lib/' + self.project.arch_triplet + '/girepository-1.0' - env['XDG_DATA_DIRS'] = self.project.stage_dir + '/usr/share:/usr/share' - self.run(meson_command, env=env) - - def _run_ninja_build_default(self): - ninja_command = ['ninja'] - env = os.environ.copy() - env['PKG_CONFIG_PATH'] = self.project.stage_dir + '/usr/lib/pkgconfig:/usr/lib/' + self.project.arch_triplet + '/pkgconfig:/usr/lib/pkgconfig' - env['VAPIDIR'] = self.project.stage_dir + '/usr/share/vala/vapi' - env['GI_TYPELIB_PATH'] = self.project.stage_dir + '/usr/lib/' + self.project.arch_triplet + '/girepository-1.0:/usr/lib/' + self.project.arch_triplet + '/girepository-1.0' - env['XDG_DATA_DIRS'] = self.project.stage_dir + '/usr/share:/usr/share' - self.run(ninja_command, env=env, cwd=self.mesonbuilddir) - - def _run_ninja_install(self): - env = os.environ.copy() - env['DESTDIR'] = self.installdir - ninja_install_command = ['ninja', 'install'] - self.run(ninja_install_command, env=env, cwd=self.mesonbuilddir) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 1c8daf3c..ecc297a9 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -7,6 +7,7 @@ description: | grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict +base: core18 # Launchpad doesn't recognize these fields yet passthrough: @@ -14,10 +15,10 @@ passthrough: title: GNOME Clocks plugs: - gnome-3-26-1604: + gnome-3-28-1804: interface: content target: $SNAP/gnome-platform - default-provider: gnome-3-26-1604 + default-provider: gnome-3-28-1804 gtk-3-themes: interface: content target: $SNAP/data-dir/themes @@ -55,15 +56,62 @@ apps: LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/gnome-clocks parts: + desktop-gnome-platform: + source: https://github.com/ubuntu/snapcraft-desktop-helpers.git + source-subdir: gtk + plugin: make + make-parameters: ["FLAVOR=gtk3"] + build-packages: + - build-essential + - libgtk-3-dev + override-build: | + snapcraftctl build + mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform + + libcanberra: + source: git://git.0pointer.de/libcanberra + source-type: git + plugin: autotools + configflags: + - --prefix=/snap/gnome-clocks/current/usr + - --enable-pulse + - --enable-gstreamer + - --enable-gtk3 + - --enable-alsa + - --disable-oss + organize: + snap/gnome-clocks/current/usr: usr + build-packages: + - libltdl-dev + - libasound2-dev + - libvorbis-dev + - libgtk-3-dev + - libtdb-dev + - libpulse-dev + - libgstreamer1.0-dev + - gtk-doc-tools + + gsound: + after: [libcanberra] + source: https://gitlab.gnome.org/GNOME/gsound.git + source-type: git + plugin: autotools + configflags: [--prefix=/snap/gnome-clocks/current/usr, --disable-Werror] + organize: + snap/gnome-clocks/current/usr: usr + build-packages: + - autoconf-archive + - intltool + - libgirepository1.0-dev + - libglib2.0-dev + - valac + libgweather: source: https://git.gnome.org/browse/libgweather source-type: git plugin: meson meson-parameters: - --prefix=/usr - - --datadir=../snap/gnome-clocks/current/usr/share - organize: - snap/gnome-clocks/current/usr: usr build-packages: - libxml2-dev - libglib2.0-dev @@ -81,7 +129,7 @@ parts: - libgladeui-dev gnome-clocks: - after: [libgweather, desktop-gnome-platform] + after: [gsound, libgweather, desktop-gnome-platform] source: . source-type: git plugin: meson @@ -89,6 +137,7 @@ parts: organize: snap/gnome-clocks/current/usr: usr override-build: | + sed -i.bak -e "s|'--vapidir'|'--vapidir', '$SNAPCRAFT_STAGE/usr/share/vala/vapi', '--vapidir'|g" src/meson.build sed -i.bak -e 's|=org.gnome.clocks$|=${SNAP}/meta/gui/org.gnome.clocks.png|g' data/org.gnome.clocks.desktop.in snapcraftctl build mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/