Merge lp:~dylanmccall/ubiquity-slideshow-ubuntu/bug-750367 into lp:ubiquity-slideshow-ubuntu

Proposed by Dylan McCall
Status: Merged
Merged at revision: 375
Proposed branch: lp:~dylanmccall/ubiquity-slideshow-ubuntu/bug-750367
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 89 lines (+7/-7)
7 files modified
slideshows/ubuntu/slides/accessibility.html (+1/-1)
slideshows/ubuntu/slides/gethelp.html (+1/-1)
slideshows/ubuntu/slides/music.html (+1/-1)
slideshows/ubuntu/slides/office.html (+1/-1)
slideshows/ubuntu/slides/photos.html (+1/-1)
slideshows/ubuntu/slides/social.html (+1/-1)
slideshows/ubuntu/slides/welcome.html (+1/-1)
To merge this branch: bzr merge lp:~dylanmccall/ubiquity-slideshow-ubuntu/bug-750367
Reviewer Review Type Date Requested Status
Ubiquity Slideshow Pending
Review via email: mp+75460@code.launchpad.net

Description of the change

I'm sorry, I kind of lost track of this until just before the documentation string freeze. Still, if we have any time before strings are frozen, this change will probably help the translators a little. It converts HTML entities to their unescaped forms.

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 'slideshows/ubuntu/slides/accessibility.html'
2--- slideshows/ubuntu/slides/accessibility.html 2011-09-09 19:36:36 +0000
3+++ slideshows/ubuntu/slides/accessibility.html 2011-09-15 03:14:26 +0000
4@@ -5,7 +5,7 @@
5 <div class="text">
6
7 <div>
8-<p>At the heart of Ubuntu&#8217;s philosophy is a belief that computing is for everyone. With advanced accessibility tools and options like your preferred color scheme, text size, and language, Ubuntu is all about working for real people.</p>
9+<p>At the heart of Ubuntu’s philosophy is a belief that computing is for everyone. With advanced accessibility tools and options like your preferred color scheme, text size, and language, Ubuntu is all about working for real people.</p>
10 </div>
11
12 <div class="featured">
13
14=== modified file 'slideshows/ubuntu/slides/gethelp.html'
15--- slideshows/ubuntu/slides/gethelp.html 2011-09-14 10:35:25 +0000
16+++ slideshows/ubuntu/slides/gethelp.html 2011-09-15 03:14:26 +0000
17@@ -5,7 +5,7 @@
18 <div class="text">
19
20 <div>
21-<p>Check out <a href="http://askubuntu.com/">Ask Ubuntu</a>, the best place to get an answer about Ubuntu. With most questions already answered, and thousands of people ready to help, you&#8217;ll be sorted in no time at all. And if you need an answer on a deadline, Canonical offers <a href="http://www.ubuntu.com/support">commercial support</a> to business users. Browse to <a href="http://www.ubuntu.com/support">ubuntu.com/support</a> to explore your other options.</p>
22+<p>Check out <a href="http://askubuntu.com/">Ask Ubuntu</a>, the best place to get an answer about Ubuntu. With most questions already answered, and thousands of people ready to help, you’ll be sorted in no time at all. And if you need an answer on a deadline, Canonical offers <a href="http://www.ubuntu.com/support">commercial support</a> to business users. Browse to <a href="http://www.ubuntu.com/support">ubuntu.com/support</a> to explore your other options.</p>
23 </div>
24
25 </div>
26
27=== modified file 'slideshows/ubuntu/slides/music.html'
28--- slideshows/ubuntu/slides/music.html 2011-09-07 20:23:51 +0000
29+++ slideshows/ubuntu/slides/music.html 2011-09-15 03:14:26 +0000
30@@ -5,7 +5,7 @@
31 <div class="text">
32
33 <div>
34-<p>Ubuntu comes with the amazing Banshee music player. With advanced playback options and the Ubuntu One music store built in, it&#8217;s simple to queue up the perfect songs. And it works great with CDs and portable music players, so you can enjoy all your music wherever you go.</p>
35+<p>Ubuntu comes with the amazing Banshee music player. With advanced playback options and the Ubuntu One music store built in, it’s simple to queue up the perfect songs. And it works great with CDs and portable music players, so you can enjoy all your music wherever you go.</p>
36 </div>
37
38 <div class="featured">
39
40=== modified file 'slideshows/ubuntu/slides/office.html'
41--- slideshows/ubuntu/slides/office.html 2011-09-09 19:36:36 +0000
42+++ slideshows/ubuntu/slides/office.html 2011-09-15 03:14:26 +0000
43@@ -5,7 +5,7 @@
44 <div class="text">
45
46 <div>
47-<p>LibreOffice is a free office suite packed with everything you&#8217;ll need to create impressive documents, spreadsheets, and presentations. LibreOffice tries its best to work with other office software, and it uses the OpenDocument standards for far-reaching compatibility.</p>
48+<p>LibreOffice is a free office suite packed with everything you’ll need to create impressive documents, spreadsheets, and presentations. LibreOffice tries its best to work with other office software, and it uses the OpenDocument standards for far-reaching compatibility.</p>
49 </div>
50
51 <div class="featured">
52
53=== modified file 'slideshows/ubuntu/slides/photos.html'
54--- slideshows/ubuntu/slides/photos.html 2011-09-14 10:35:25 +0000
55+++ slideshows/ubuntu/slides/photos.html 2011-09-15 03:14:26 +0000
56@@ -5,7 +5,7 @@
57 <div class="text">
58
59 <div>
60-<p>Shotwell is a handy photo manager that is ready for your gadgets. Connect a camera or a phone to transfer your photos, then it&#8217;s easy to share them and keep them safe. If you&#8217;re feeling creative, you can try lots of photo apps from the Ubuntu Software Center.</p>
61+<p>Shotwell is a handy photo manager that is ready for your gadgets. Connect a camera or a phone to transfer your photos, then it’s easy to share them and keep them safe. If you’re feeling creative, you can try lots of photo apps from the Ubuntu Software Center.</p>
62 </div>
63
64 <div class="featured">
65
66=== modified file 'slideshows/ubuntu/slides/social.html'
67--- slideshows/ubuntu/slides/social.html 2011-09-09 19:36:36 +0000
68+++ slideshows/ubuntu/slides/social.html 2011-09-15 03:14:26 +0000
69@@ -5,7 +5,7 @@
70 <div class="text">
71
72 <div>
73-<p>The Ubuntu Message Indicator gives you an eagle-eye view of incoming messages from all applications and social networks. See at a glance when there&#8217;s something new to read, regardless how it arrived.</p>
74+<p>The Ubuntu Message Indicator gives you an eagle-eye view of incoming messages from all applications and social networks. See at a glance when there’s something new to read, regardless how it arrived.</p>
75 </div>
76
77 <div class="featured">
78
79=== modified file 'slideshows/ubuntu/slides/welcome.html'
80--- slideshows/ubuntu/slides/welcome.html 2011-09-07 20:23:51 +0000
81+++ slideshows/ubuntu/slides/welcome.html 2011-09-15 03:14:26 +0000
82@@ -5,7 +5,7 @@
83 <div class="text">
84
85 <div>
86-<p>Ubuntu is packed with features to make your computer delightful to use. This version consolidates the Unity desktop interface; a brand new way to find and manage your applications. Now with more features and faster. We&#8217;d like to show some cool things to look for in your new operating system.
87+<p>Ubuntu is packed with features to make your computer delightful to use. This version consolidates the Unity desktop interface; a brand new way to find and manage your applications. Now with more features and faster. We’d like to show some cool things to look for in your new operating system.
88 </p>
89 </div>
90

Subscribers

People subscribed via source and target branches