Merge ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic

Proposed by Marco Trevisan (Treviño) on 2019-01-25
Status: Merged
Merged at revision: 96ad4b4d603e2833a5609bac107e8fb20ee01851
Proposed branch: ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic
Diff against target: 309 lines (+279/-0)
4 files modified
debian/changelog (+14/-0)
debian/patches/70_allow_sound_above_100.patch (+8/-0)
debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch (+256/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2019-01-25 Pending
Review via email: mp+362226@code.launchpad.net

Description of the change

Synced also vcs with ubuntu, so please pull tags

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3c0e09e..3a24f3a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,17 @@
6+gnome-control-center (1:3.28.2-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
7+
8+ * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch:
9+ - Label the PENDING_CHARGING state as "Not Charging" (LP: #1745032)
10+
11+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 25 Jan 2019 01:17:15 +0000
12+
13+gnome-control-center (1:3.28.2-0ubuntu0.18.04.2) bionic; urgency=medium
14+
15+ * debian/patches/70_allow_sound_above_100.patch:
16+ - Fix crash when settings changed after panel closed (LP: #1779051)
17+
18+ -- Robert Ancell <robert.ancell@canonical.com> Wed, 08 Aug 2018 11:48:27 +1200
19+
20 gnome-control-center (1:3.28.2-0ubuntu0.18.04.1) bionic; urgency=medium
21
22 * New bugfix version (lp: #1780280)
23diff --git a/debian/patches/70_allow_sound_above_100.patch b/debian/patches/70_allow_sound_above_100.patch
24index 041cdc2..39a0cef 100644
25--- a/debian/patches/70_allow_sound_above_100.patch
26+++ b/debian/patches/70_allow_sound_above_100.patch
27@@ -215,3 +215,11 @@ Index: gnome-control-center-3.27.90/panels/sound/gvc-mixer-dialog.c
28 dialog->settings = g_settings_new (KEY_SOUNDS_SCHEMA);
29 g_signal_connect (dialog->settings, "changed::allow-volume-above-100-percent",
30 G_CALLBACK (allow_volume_above_100_percent_cb), dialog);
31+@@ -1939,6 +2064,7 @@ gvc_mixer_dialog_finalize (GObject *object)
32+ mixer_dialog = GVC_MIXER_DIALOG (object);
33+
34+ g_return_if_fail (mixer_dialog != NULL);
35++ g_clear_object (&mixer_dialog->ubuntu_sound_settings);
36+ g_clear_object (&mixer_dialog->settings);
37+ G_OBJECT_CLASS (gvc_mixer_dialog_parent_class)->finalize (object);
38+ }
39diff --git a/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
40new file mode 100644
41index 0000000..5df4f40
42--- /dev/null
43+++ b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
44@@ -0,0 +1,256 @@
45+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?= <jprvita@endlessm.com>
46+Date: Sat, 20 Oct 2018 00:34:56 +0200
47+Subject: power: Label the PENDING_CHARGING state as "Not Charging"
48+
49+The pending-charge state means AC power is on but the battery is not
50+being charged. This can happen because its charge is above a certain
51+threshold, to avoid short charging cycles and prolong the battery's
52+life, or because the PSU is not powerful enough to charge the batteries.
53+
54+Instead of lying to the user about something being estimated, we should
55+simply tell the truth and set the label to "Not Charging".
56+
57+Closes: #249.
58+
59+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
60+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/249
61+Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/commit/6efaf85e
62+Applied-Upstream: yes, 3.31.2
63+---
64+ panels/power/cc-power-panel.c | 10 ++++++++--
65+ po/de.po | 7 ++++++-
66+ po/el.po | 8 +++++++-
67+ po/eo.po | 7 ++++++-
68+ po/es.po | 7 ++++++-
69+ po/fur.po | 7 ++++++-
70+ po/it.po | 7 ++++++-
71+ po/ja.po | 7 ++++++-
72+ po/sl.po | 7 ++++++-
73+ po/sv.po | 7 ++++++-
74+ po/tr.po | 8 +++++++-
75+ 11 files changed, 70 insertions(+), 12 deletions(-)
76+
77+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
78+index f9b67a4..d8c87c7 100644
79+--- a/panels/power/cc-power-panel.c
80++++ b/panels/power/cc-power-panel.c
81+@@ -295,7 +295,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
82+ switch (state)
83+ {
84+ case UP_DEVICE_STATE_CHARGING:
85+- case UP_DEVICE_STATE_PENDING_CHARGE:
86+ /* TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" */
87+ details = g_strdup_printf (_("%s until fully charged"), time_string);
88+ break;
89+@@ -316,6 +315,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
90+ /* TRANSLATORS: primary battery */
91+ details = g_strdup (_("Fully charged"));
92+ break;
93++ case UP_DEVICE_STATE_PENDING_CHARGE:
94++ /* TRANSLATORS: primary battery */
95++ details = g_strdup (_("Not charging"));
96++ break;
97+ case UP_DEVICE_STATE_EMPTY:
98+ /* TRANSLATORS: primary battery */
99+ details = g_strdup (_("Empty"));
100+@@ -331,7 +334,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
101+ switch (state)
102+ {
103+ case UP_DEVICE_STATE_CHARGING:
104+- case UP_DEVICE_STATE_PENDING_CHARGE:
105+ /* TRANSLATORS: primary battery */
106+ details = g_strdup (_("Charging"));
107+ break;
108+@@ -344,6 +346,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
109+ /* TRANSLATORS: primary battery */
110+ details = g_strdup (_("Fully charged"));
111+ break;
112++ case UP_DEVICE_STATE_PENDING_CHARGE:
113++ /* TRANSLATORS: primary battery */
114++ details = g_strdup (_("Not charging"));
115++ break;
116+ case UP_DEVICE_STATE_EMPTY:
117+ /* TRANSLATORS: primary battery */
118+ details = g_strdup (_("Empty"));
119+diff --git a/po/de.po b/po/de.po
120+index 78325a2..3954b1e 100644
121+--- a/po/de.po
122++++ b/po/de.po
123+@@ -3930,7 +3930,12 @@ msgid "Fully charged"
124+ msgstr "Vollständig geladen"
125+
126+ #. TRANSLATORS: primary battery
127+-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
128++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
129++msgid "Not charging"
130++msgstr "Lädt nicht"
131++
132++#. TRANSLATORS: primary battery
133++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
134+ msgid "Empty"
135+ msgstr "Leer"
136+
137+diff --git a/po/el.po b/po/el.po
138+index a4a1374..c168970 100644
139+--- a/po/el.po
140++++ b/po/el.po
141+@@ -3959,7 +3959,13 @@ msgid "Fully charged"
142+ msgstr "Πλήρης φόρτιση"
143+
144+ #. TRANSLATORS: primary battery
145+-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
146++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
147++#| msgid "Charging"
148++msgid "Not charging"
149++msgstr "Δεν φορτίζεται"
150++
151++#. TRANSLATORS: primary battery
152++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
153+ msgid "Empty"
154+ msgstr "Κενό"
155+
156+diff --git a/po/eo.po b/po/eo.po
157+index a13393b..23e6d14 100644
158+--- a/po/eo.po
159++++ b/po/eo.po
160+@@ -4052,7 +4052,12 @@ msgstr "%s restanta"
161+ #. TRANSLATORS: primary battery
162+ #: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
163+ msgid "Fully charged"
164+-msgstr "Plene ŝargita"
165++msgstr "Tute ŝargita"
166++
167++#. TRANSLATORS: primary battery
168++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
169++msgid "Not charging"
170++msgstr "Ne ŝargante"
171+
172+ #. TRANSLATORS: primary battery
173+ #: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
174+diff --git a/po/es.po b/po/es.po
175+index b59dcd8..72dc0c3 100644
176+--- a/po/es.po
177++++ b/po/es.po
178+@@ -3902,7 +3902,12 @@ msgid "Fully charged"
179+ msgstr "Cargada completamente"
180+
181+ #. TRANSLATORS: primary battery
182+-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
183++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
184++msgid "Not charging"
185++msgstr "No está cargando"
186++
187++#. TRANSLATORS: primary battery
188++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
189+ msgid "Empty"
190+ msgstr "Vacía"
191+
192+diff --git a/po/fur.po b/po/fur.po
193+index e483976..72d0e6c 100644
194+--- a/po/fur.po
195++++ b/po/fur.po
196+@@ -3901,7 +3901,12 @@ msgid "Fully charged"
197+ msgstr "Cjarie"
198+
199+ #. TRANSLATORS: primary battery
200+-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
201++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
202++msgid "Not charging"
203++msgstr "Nol sta cjariant"
204++
205++#. TRANSLATORS: primary battery
206++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
207+ msgid "Empty"
208+ msgstr "Scjarie"
209+
210+diff --git a/po/it.po b/po/it.po
211+index cdbc7b0..abefd0b 100644
212+--- a/po/it.po
213++++ b/po/it.po
214+@@ -3936,7 +3936,12 @@ msgstr "In carica"
215+ msgid "Discharging"
216+ msgstr "In scarica"
217+
218+-#: panels/power/cc-power-panel.c:464
219++#. TRANSLATORS: primary battery
220++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
221++msgid "Not charging"
222++msgstr "Non in carica"
223++
224++#: panels/power/cc-power-panel.c:465
225+ msgctxt "Battery name"
226+ msgid "Main"
227+ msgstr "Principale"
228+diff --git a/po/ja.po b/po/ja.po
229+index 5f4767f..8858273 100644
230+--- a/po/ja.po
231++++ b/po/ja.po
232+@@ -3904,7 +3904,12 @@ msgid "Fully charged"
233+ msgstr "フル充電"
234+
235+ #. TRANSLATORS: primary battery
236+-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
237++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
238++msgid "Not charging"
239++msgstr "放電中"
240++
241++#. TRANSLATORS: primary battery
242++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
243+ msgid "Empty"
244+ msgstr "空"
245+
246+diff --git a/po/sl.po b/po/sl.po
247+index ba5f934..3b37d9c 100644
248+--- a/po/sl.po
249++++ b/po/sl.po
250+@@ -3922,7 +3922,12 @@ msgid "Fully charged"
251+ msgstr "Polna napolnjenost"
252+
253+ #. TRANSLATORS: primary battery
254+-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
255++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
256++msgid "Not charging"
257++msgstr "Naprava se ne polni"
258++
259++#. TRANSLATORS: primary battery
260++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
261+ msgid "Empty"
262+ msgstr "Prazno"
263+
264+diff --git a/po/sv.po b/po/sv.po
265+index d8f4138..5951a70 100644
266+--- a/po/sv.po
267++++ b/po/sv.po
268+@@ -3891,7 +3891,12 @@ msgid "Fully charged"
269+ msgstr "Fullt uppladdad"
270+
271+ #. TRANSLATORS: primary battery
272+-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
273++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
274++msgid "Not charging"
275++msgstr "Laddar inte"
276++
277++#. TRANSLATORS: primary battery
278++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
279+ msgid "Empty"
280+ msgstr "Tom"
281+
282+diff --git a/po/tr.po b/po/tr.po
283+index 7ac1573..58d02dd 100644
284+--- a/po/tr.po
285++++ b/po/tr.po
286+@@ -3896,7 +3896,13 @@ msgid "Fully charged"
287+ msgstr "Tamamen dolu"
288+
289+ #. TRANSLATORS: primary battery
290+-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
291++#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
292++#| msgid "Charging"
293++msgid "Not charging"
294++msgstr "Şarj olmuyor"
295++
296++#. TRANSLATORS: primary battery
297++#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
298+ msgid "Empty"
299+ msgstr "Boş"
300+
301diff --git a/debian/patches/series b/debian/patches/series
302index 0bc5fb9..6357c3a 100644
303--- a/debian/patches/series
304+++ b/debian/patches/series
305@@ -24,3 +24,4 @@ auto_quit_after_goa_add.patch
306 0002-shell-Icon-name-helper-returns-symbolic-name.patch
307 0003-thunderbolt-new-panel-for-device-management.patch
308 0004-thunderbolt-move-to-the-Devices-page.patch
309+power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch

Subscribers

People subscribed via source and target branches