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

Subscribers

People subscribed via source and target branches