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

Proposed by Dylan McCall
Status: Merged
Merged at revision: 369
Proposed branch: lp:~dylanmccall/ubiquity-slideshow-ubuntu/general-copy-edits
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 96 lines (+17/-6)
7 files modified
README (+11/-0)
slideshows/ubuntu/slides/accessibility.html (+1/-1)
slideshows/ubuntu/slides/browse.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/usc.html (+1/-1)
To merge this branch: bzr merge lp:~dylanmccall/ubiquity-slideshow-ubuntu/general-copy-edits
Reviewer Review Type Date Requested Status
Evan (community) Approve
Review via email: mp+74867@code.launchpad.net

Description of the change

Just some little bits of copy editing with Christian's changes.

I'm also switching old stuff back to en locale from en_GB, to accommodate the new copy. (And because Ubiquity can tell us the correct locale nowadays).

To post a comment you must log in.
Revision history for this message
Evan (ev) wrote :

Looks good; thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2011-09-07 20:23:51 +0000
+++ README 2011-09-09 19:48:26 +0000
@@ -85,6 +85,17 @@
85a photo manager has images all taken on a single day! Where you can, try85a photo manager has images all taken on a single day! Where you can, try
86to make things look lived in.86to make things look lived in.
8787
88* Do not depend on text in screenshots. Remember that the slideshow's copy
89is translated, so that text will be unreadable for a lot of users. Try to
90find a way to communicate things visually and avoid emphasizing any text
91on the screen.
92
93* Avoid showing the mouse pointer.
94
95* Editing your screenshots with an image editor is fine if you need to
96remove some cut off text, for example, but do not deviate from what is
97actually possible with an application.
98
88So, I just made screenshots a little trickier, but I hope that helps.99So, I just made screenshots a little trickier, but I hope that helps.
89Good luck!100Good luck!
90101
91102
=== modified file 'slideshows/ubuntu/slides/accessibility.html'
--- slideshows/ubuntu/slides/accessibility.html 2011-09-07 20:23:51 +0000
+++ slideshows/ubuntu/slides/accessibility.html 2011-09-09 19:48:26 +0000
@@ -5,7 +5,7 @@
5<div class="text">5<div class="text">
66
7<div>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 many options like your preferred fonts, colour schemes, and languages, Ubuntu is all about working for real people.</p>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</div>9</div>
1010
11<div class="featured">11<div class="featured">
1212
=== modified file 'slideshows/ubuntu/slides/browse.html'
--- slideshows/ubuntu/slides/browse.html 2011-09-07 20:23:51 +0000
+++ slideshows/ubuntu/slides/browse.html 2011-09-09 19:48:26 +0000
@@ -5,7 +5,7 @@
5<div class="text">5<div class="text">
66
7<div>7<div>
8<p>Ubuntu includes Mozilla Firefox for fast, safe web browsing. You can also choose alternative browsers from Ubuntu Software Center.</p>8<p>Ubuntu includes Mozilla Firefox for fast, safe web browsing. You can also choose alternative browsers from the Ubuntu Software Center.</p>
9</div>9</div>
1010
11<div class="featured">11<div class="featured">
1212
=== modified file 'slideshows/ubuntu/slides/office.html'
--- slideshows/ubuntu/slides/office.html 2011-09-07 20:23:51 +0000
+++ slideshows/ubuntu/slides/office.html 2011-09-09 19:48:26 +0000
@@ -1,4 +1,4 @@
1<div class="header"><h1 class="slidetitle">Write and present with ease</h1></div>1<div class="header"><h1 class="slidetitle">Write and present for free</h1></div>
22
3<div class="main">3<div class="main">
44
55
=== modified file 'slideshows/ubuntu/slides/photos.html'
--- slideshows/ubuntu/slides/photos.html 2011-09-07 20:23:51 +0000
+++ slideshows/ubuntu/slides/photos.html 2011-09-09 19:48:26 +0000
@@ -5,7 +5,7 @@
5<div class="text">5<div class="text">
66
7<div>7<div>
8<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 Centre.</p>8<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>
9</div>9</div>
1010
11<div class="featured">11<div class="featured">
1212
=== modified file 'slideshows/ubuntu/slides/social.html'
--- slideshows/ubuntu/slides/social.html 2011-09-07 20:23:51 +0000
+++ slideshows/ubuntu/slides/social.html 2011-09-09 19:48:26 +0000
@@ -5,7 +5,7 @@
5<div class="text">5<div class="text">
66
7<div>7<div>
8<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>8<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>
9</div>9</div>
1010
11<div class="featured">11<div class="featured">
1212
=== modified file 'slideshows/ubuntu/slides/usc.html'
--- slideshows/ubuntu/slides/usc.html 2011-09-07 20:23:51 +0000
+++ slideshows/ubuntu/slides/usc.html 2011-09-09 19:48:26 +0000
@@ -5,7 +5,7 @@
5<div class="text">5<div class="text">
66
7<div>7<div>
8<p>The Ubuntu Software Centre 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 simple to download new stuff, rate and write reviews to share your experiences.</p>8<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>
9</div>9</div>
1010
11</div>11</div>

Subscribers

People subscribed via source and target branches