Merge lp:~dylanmccall/ubiquity-slideshow-ubuntu/quantal-ubuntu-copy into lp:ubiquity-slideshow-ubuntu

Proposed by Dylan McCall
Status: Merged
Merged at revision: 497
Proposed branch: lp:~dylanmccall/ubiquity-slideshow-ubuntu/quantal-ubuntu-copy
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 82 lines (+7/-7)
6 files modified
slideshows/ubuntu/slides/browse.html (+2/-2)
slideshows/ubuntu/slides/gethelp.html (+1/-1)
slideshows/ubuntu/slides/mobilise.html (+1/-1)
slideshows/ubuntu/slides/social.html (+1/-1)
slideshows/ubuntu/slides/usc.html (+1/-1)
slideshows/ubuntu/slides/welcome.html (+1/-1)
To merge this branch: bzr merge lp:~dylanmccall/ubiquity-slideshow-ubuntu/quantal-ubuntu-copy
Reviewer Review Type Date Requested Status
Ubiquity Slideshow Pending
Review via email: mp+126337@code.launchpad.net

Description of the change

New copy for Ubuntu 12.10, ready to merge with a freeze exception request.

To post a comment you must log in.
497. By Dylan McCall

Switch to US English for the word "colour" in Ubuntu accessibility slide. (Proper English can be added in translations).
Generated pot files.

498. By Dylan McCall

Reverted low priority changes to Ubuntu slideshow copy.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slideshows/ubuntu/slides/browse.html'
2--- slideshows/ubuntu/slides/browse.html 2012-04-10 16:47:18 +0000
3+++ slideshows/ubuntu/slides/browse.html 2012-09-28 21:46:22 +0000
4@@ -1,11 +1,11 @@
5-<div class="header"><h1 class="slidetitle">Browse the web</h1></div>
6+<div class="header"><h1 class="slidetitle">Make the most of the web</h1></div>
7
8 <div class="main">
9
10 <div class="text">
11
12 <div>
13-<p>Ubuntu includes Mozilla Firefox for fast and safe web browsing. It’s easy to use and it’s backed by a non-profit foundation that loves the web. If you aren’t a Firefox fan, there are also lots of alternatives in the Ubuntu Software Center.</p>
14+<p>Ubuntu includes Firefox, the web browser used by millions of people around the world. And web applications you use frequently (like Facebook or Gmail, for example) can be pinned to your desktop for faster access, just like apps on your computer.</p>
15 </div>
16
17 <div class="featured">
18
19=== modified file 'slideshows/ubuntu/slides/gethelp.html'
20--- slideshows/ubuntu/slides/gethelp.html 2012-03-07 21:26:50 +0000
21+++ slideshows/ubuntu/slides/gethelp.html 2012-09-28 21:46:22 +0000
22@@ -5,7 +5,7 @@
23 <div class="text">
24
25 <div>
26-<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, you can get commercial support and more at <a href="http://www.ubuntu.com/support">ubuntu.com/support</a>.</p>
27+<p>Check out <a href="http://askubuntu.com/">askubuntu.com</a> for answers to all your Ubuntu questions. There’s a good chance your question will have been answered already and, if not, you’ll find thousands of volunteers eager to help. For more support options, go to <a href="http://www.ubuntu.com/support">ubuntu.com/support</a>.</p>
28 </div>
29
30 </div>
31
32=== modified file 'slideshows/ubuntu/slides/mobilise.html'
33--- slideshows/ubuntu/slides/mobilise.html 2012-04-10 17:11:48 +0000
34+++ slideshows/ubuntu/slides/mobilise.html 2012-09-28 21:46:22 +0000
35@@ -5,7 +5,7 @@
36 <div class="text">
37
38 <div>
39-<p>An <a href="https://one.ubuntu.com/services/">Ubuntu One Free</a> account gives you 5GB of cloud storage, so you can store and sync your files and photos across devices and access them wherever you are in the world. Easily share them with friends, family and colleagues. Take a photo on your mobile phone and immediately see it on your desktop, or add <a href="https://one.ubuntu.com/services/music/">Music Streaming</a> for mobile to enjoy your music on the move.</p>
40+<p><a href="https://one.ubuntu.com/services/free/">Ubuntu One</a> gives you 5GB of free cloud storage to access your files, share your photos and <a href="https://one.ubuntu.com/services/music/">stream your music</a> to your computers, tablets and smartphones. Any photo you take appears on all your devices, the instant you take it. Ubuntu One runs on Ubuntu, Windows, Mac, Android, iOS and the web.</p>
41 </div>
42
43 </div>
44
45=== modified file 'slideshows/ubuntu/slides/social.html'
46--- slideshows/ubuntu/slides/social.html 2012-04-10 16:47:18 +0000
47+++ slideshows/ubuntu/slides/social.html 2012-09-28 21:46:22 +0000
48@@ -5,7 +5,7 @@
49 <div class="text">
50
51 <div>
52-<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>
53+<p>The messaging menu gives you an eagle-eye view of incoming messages from all applications and social networks. So you can see straight away when there’s something new to read, regardless of how it arrived.</p>
54 </div>
55
56 <div class="featured">
57
58=== modified file 'slideshows/ubuntu/slides/usc.html'
59--- slideshows/ubuntu/slides/usc.html 2012-04-10 16:47:18 +0000
60+++ slideshows/ubuntu/slides/usc.html 2012-09-28 21:46:22 +0000
61@@ -5,7 +5,7 @@
62 <div class="text">
63
64 <div>
65-<p>The Ubuntu Software Center has thousands of new applications ready for your computer. Just type what you want or explore the categories like games, science, and education. It is easy to download new stuff and write reviews to share your experiences.</p>
66+<p>Say goodbye to searching the web for new software. With Ubuntu Software Center, you can find and install new apps with ease. Just type in what you’re looking for, or explore categories such as Science, Education and Games, alongside helpful reviews from other users.</p>
67 </div>
68
69 </div>
70
71=== modified file 'slideshows/ubuntu/slides/welcome.html'
72--- slideshows/ubuntu/slides/welcome.html 2012-06-26 22:15:42 +0000
73+++ slideshows/ubuntu/slides/welcome.html 2012-09-28 21:46:22 +0000
74@@ -5,7 +5,7 @@
75 <div class="text">
76
77 <div>
78-<p>Fast and feature-packed, Ubuntu makes your PC a delight to use. And with the latest version of the Unity interface, it's now easier than ever. Here are a few more cool new things to look out for.</p>
79+<p>Fast and full of new features, the latest version of Ubuntu makes computing easier than ever. Here are just a few cool new things to look out for…</p>
80 </div>
81
82 </div>

Subscribers

People subscribed via source and target branches