Merge lp:~timo-jyrinki/ubiquity/kubuntu_slideshow_i18n_lp1512834 into lp:ubiquity

Proposed by Timo Jyrinki
Status: Merged
Merged at revision: 6412
Proposed branch: lp:~timo-jyrinki/ubiquity/kubuntu_slideshow_i18n_lp1512834
Merge into: lp:ubiquity
Diff against target: 45 lines (+14/-2)
3 files modified
d-i/manifest (+1/-1)
debian/changelog (+12/-0)
ubiquity/frontend/kde_ui.py (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/ubiquity/kubuntu_slideshow_i18n_lp1512834
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+291581@code.launchpad.net

Description of the change

* Fix Kubuntu slideshow not translated, thanks to Lasse Liehu for the
  patch (LP: #1512834)
* Automatic update of included source packages: netcfg 1.135ubuntu3.

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
1=== modified file 'd-i/manifest'
2--- d-i/manifest 2016-04-06 03:12:02 +0000
3+++ d-i/manifest 2016-04-12 06:41:00 +0000
4@@ -9,7 +9,7 @@
5 grub-installer 1.128ubuntu5
6 hw-detect 1.117ubuntu1
7 localechooser 2.65ubuntu3
8-netcfg 1.135ubuntu2
9+netcfg 1.135ubuntu3
10 partconf 1.49
11 partman-auto 134ubuntu1
12 partman-auto-crypto 22ubuntu1
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2016-04-06 04:07:37 +0000
16+++ debian/changelog 2016-04-12 06:41:00 +0000
17@@ -1,3 +1,15 @@
18+ubiquity (2.21.55) xenial; urgency=medium
19+
20+ [ Jean-Baptiste Lallement ]
21+ * autopilot: Merged autopilot tests fixes from Chris Lee. Thanks
22+
23+ [ Timo Jyrinki ]
24+ * Fix Kubuntu slideshow not translated, thanks to Lasse Liehu for the
25+ patch (LP: #1512834)
26+ * Automatic update of included source packages: netcfg 1.135ubuntu3.
27+
28+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Tue, 12 Apr 2016 09:36:38 +0300
29+
30 ubiquity (2.21.54) xenial; urgency=medium
31
32 * ubiquity/frontends/gtk_ui.py:
33
34=== modified file 'ubiquity/frontend/kde_ui.py'
35--- ubiquity/frontend/kde_ui.py 2016-02-25 11:47:58 +0000
36+++ ubiquity/frontend/kde_ui.py 2016-04-12 06:41:00 +0000
37@@ -633,7 +633,7 @@
38 parameters.append('rtl')
39 parameters_encoded = '&'.join(parameters)
40
41- slides = 'file://%s# %s' % (slideshow_main, parameters_encoded)
42+ slides = 'file://%s#%s' % (slideshow_main, parameters_encoded)
43
44 def openLink(qUrl):
45 QtGui.QDesktopServices.openUrl(qUrl)

Subscribers

People subscribed via source and target branches

to status/vote changes: