Merge lp:~mdke/software-center/help-fixes into lp:software-center

Proposed by Matthew East
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mdke/software-center/help-fixes
Merge into: lp:software-center
Diff against target: 182 lines
2 files modified
help/C/software-center-C.omf (+2/-2)
help/C/software-center.xml (+20/-20)
To merge this branch: bzr merge lp:~mdke/software-center/help-fixes
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+12450@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matthew East (mdke) wrote :

Fixes bug 436648 in the help

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'help/C/software-center-C.omf'
--- help/C/software-center-C.omf 2009-09-25 15:30:34 +0000
+++ help/C/software-center-C.omf 2009-09-26 09:00:29 +0000
@@ -5,7 +5,7 @@
5 mvo@ubuntu.com5 mvo@ubuntu.com
6 </creator>6 </creator>
7 <title>7 <title>
8 Software Store8 Software Center
9 </title>9 </title>
10 <date>10 <date>
11 2009-09-0711 2009-09-07
@@ -20,7 +20,7 @@
20 user's guide20 user's guide
21 </type>21 </type>
22 <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>22 <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
23 <identifier url="file:/usr/share/gnome/help/software-store/C/software-store.xml"/>23 <identifier url="file:/usr/share/gnome/help/software-center/C/software-center.xml"/>
24 <language code="C"/>24 <language code="C"/>
25 <relation seriesid="09f8bcc4-9246-f537-be7d-a823fbbcfc78c0"/>25 <relation seriesid="09f8bcc4-9246-f537-be7d-a823fbbcfc78c0"/>
26 <rights type="GNU FDL" license.version="1.1"26 <rights type="GNU FDL" license.version="1.1"
2727
=== modified file 'help/C/software-center.xml'
--- help/C/software-center.xml 2009-09-25 15:30:34 +0000
+++ help/C/software-center.xml 2009-09-26 09:00:29 +0000
@@ -19,7 +19,7 @@
19 <!-- please do not change the id; for translations, change lang to -->19 <!-- please do not change the id; for translations, change lang to -->
20 <!-- appropriate code -->20 <!-- appropriate code -->
21 <bookinfo>21 <bookinfo>
22 <title>Ubuntu Software Store</title>22 <title>Ubuntu Software Center</title>
23 <!-- translators: uncomment this:23 <!-- translators: uncomment this:
2424
25 <copyright>25 <copyright>
@@ -57,16 +57,16 @@
57 </author>57 </author>
58 </authorgroup>58 </authorgroup>
59 <abstract>59 <abstract>
60 <para>This manual explains how to use <application>Software Store</application>.</para>60 <para>This manual explains how to use <application>Software Center</application>.</para>
61 </abstract> 61 </abstract>
62 </bookinfo> 62 </bookinfo>
63 <!-- ============= Document Body ============================= -->63 <!-- ============= Document Body ============================= -->
6464
65 <!-- ============= Introduction ============================== -->65 <!-- ============= Introduction ============================== -->
66 <chapter id="introduction">66 <chapter id="introduction">
67 <title>What is the Ubuntu Software Store?</title>67 <title>What is the Ubuntu Software Center?</title>
68 <para>68 <para>
69 The Ubuntu Software Store is a virtual catalog of thousands of free69 The Ubuntu Software Center is a virtual catalog of thousands of free
70 applications available for Ubuntu &#8212;70 applications available for Ubuntu &#8212;
71 software to make your computer more useful.71 software to make your computer more useful.
72 </para>72 </para>
@@ -75,7 +75,7 @@
75 and you can install an application with the click of a button.75 and you can install an application with the click of a button.
76 </para>76 </para>
77 <para>77 <para>
78 The Store also lets you examine the applications installed on the78 The Software Center also lets you examine the applications installed on the
79 computer already,79 computer already,
80 and remove those you no longer need.80 and remove those you no longer need.
81 </para>81 </para>
@@ -83,7 +83,7 @@
83 <chapter id="installing">83 <chapter id="installing">
84 <title>Installing a program</title>84 <title>Installing a program</title>
85 <para>85 <para>
86 To install a program from the Store,86 To install a program from the Software Center,
87 you need administrator access and a working Internet connection.87 you need administrator access and a working Internet connection.
88 (If you set up Ubuntu on this computer yourself,88 (If you set up Ubuntu on this computer yourself,
89 you have administrator access automatically.)89 you have administrator access automatically.)
@@ -96,7 +96,7 @@
96 If you already know its name, try typing the name in the search field.96 If you already know its name, try typing the name in the search field.
97 Or try searching for the type of program you want97 Or try searching for the type of program you want
98 (like &#8220;spreadsheet&#8221;).98 (like &#8220;spreadsheet&#8221;).
99 Otherwise, browse the Store departments to find the program.99 Otherwise, browse the Software Center departments to find the program.
100 </para>100 </para>
101 </listitem>101 </listitem>
102 <listitem>102 <listitem>
@@ -119,7 +119,7 @@
119 </para>119 </para>
120 <para>120 <para>
121 While a program is being installed,121 While a program is being installed,
122 it appears in the Store&#8217;s <guilabel>In Progress</guilabel> section.122 it appears in the Software Center&#8217;s <guilabel>In Progress</guilabel> section.
123 As soon as it disappears, the program is installed.123 As soon as it disappears, the program is installed.
124 </para>124 </para>
125 <itemizedlist>125 <itemizedlist>
@@ -133,7 +133,7 @@
133 <para>133 <para>
134 Most installed applications appear134 Most installed applications appear
135 in the <guimenu>Applications</guimenu> menu in the corner of the screen,135 in the <guimenu>Applications</guimenu> menu in the corner of the screen,
136 in the same category as they came from in the Store.136 in the same category as they came from in the Software Center.
137 </para>137 </para>
138 <para>138 <para>
139 For example, if you installed a program from the139 For example, if you installed a program from the
@@ -201,7 +201,7 @@
201 >Why is it asking me to remove several programs together?</title>201 >Why is it asking me to remove several programs together?</title>
202 <para>202 <para>
203 Sometimes if you try to remove one program,203 Sometimes if you try to remove one program,
204 the Store will warn you that other programs will be removed too.204 the Software Center will warn you that other programs will be removed too.
205 There are two main reasons this happens.205 There are two main reasons this happens.
206 </para>206 </para>
207 <itemizedlist>207 <itemizedlist>
@@ -216,7 +216,7 @@
216 Multiple applications are sometimes provided as a single package.216 Multiple applications are sometimes provided as a single package.
217 If any of them are installed, all of them are installed.217 If any of them are installed, all of them are installed.
218 And if any of them are removed, all of them are removed.218 And if any of them are removed, all of them are removed.
219 The Store cannot remove them individually,219 The Software Center cannot remove them individually,
220 because it has no instructions on how to separate them.220 because it has no instructions on how to separate them.
221 </para>221 </para>
222 </listitem>222 </listitem>
@@ -238,7 +238,7 @@
238 <chapter id="canonical-maintained">238 <chapter id="canonical-maintained">
239 <title>What does &#8220;Canonical-maintained&#8221; mean?</title>239 <title>What does &#8220;Canonical-maintained&#8221; mean?</title>
240 <para>240 <para>
241 Some of the software available in the Ubuntu Software Store is241 Some of the software available in the Ubuntu Software Center is
242 maintained by Canonical.242 maintained by Canonical.
243 Canonical engineers ensure that security fixes and other critical updates243 Canonical engineers ensure that security fixes and other critical updates
244 are provided for these programs.244 are provided for these programs.
@@ -251,31 +251,31 @@
251 <chapter id="why-free">251 <chapter id="why-free">
252 <title id="why-free-title">Why are all the programs free?</title>252 <title id="why-free-title">Why are all the programs free?</title>
253 <para>253 <para>
254 Currently, all software in the Ubuntu Software Store is free of charge.254 Currently, all software in the Ubuntu Software Center is free of charge.
255 </para>255 </para>
256 <para>256 <para>
257 Most of this software is developed as <firstterm>open source</firstterm>,257 Most of this software is developed as <firstterm>open source</firstterm>,
258 which means anyone is allowed to alter it and redistribute it for any258 which means anyone is allowed to alter it and redistribute it for any
259 price.259 price.
260 Ubuntu developers, Debian developers, and others260 Ubuntu developers, Debian developers, and others
261 package the software available in the Store,261 package the software available in the Software Center,
262 and make it available to you for free.262 and make it available to you for free.
263 </para>263 </para>
264 <para>264 <para>
265 In a future version of Ubuntu, the Store will also allow software265 In a future version of Ubuntu, the Software Center will also allow software
266 purchases.266 purchases.
267 </para>267 </para>
268 </chapter>268 </chapter>
269 <chapter id="missing">269 <chapter id="missing">
270 <title id="missing-title"270 <title id="missing-title"
271 >What if a program I want isn&#8217;t in the Store?</title>271 >What if a program I want isn&#8217;t in the Software Center?</title>
272 <para>272 <para>
273 First, check that <menuchoice><guimenu>View</guimenu>273 First, check that <menuchoice><guimenu>View</guimenu>
274 <guimenuitem>All Applications</guimenuitem></menuchoice> is selected.274 <guimenuitem>All Applications</guimenuitem></menuchoice> is selected.
275 That ensures you can see all the software available in the Store.275 That ensures you can see all the software available in the Software Center.
276 </para>276 </para>
277 <para>277 <para>
278 If a program isn&#8217;t in the Store,278 If a program isn&#8217;t in the Software Center,
279 but you know that it runs on Ubuntu,279 but you know that it runs on Ubuntu,
280 try contacting the original developers of the program280 try contacting the original developers of the program
281 to ask if they can help make it available.281 to ask if they can help make it available.
@@ -290,7 +290,7 @@
290 <title id="bugs-title"290 <title id="bugs-title"
291 >What if a program doesn&#8217;t work?</title>291 >What if a program doesn&#8217;t work?</title>
292 <para>292 <para>
293 With thousands of applications in the Store,293 With thousands of applications in the Software Center,
294 there&#8217;s always the chance that a few of them won&#8217;t work294 there&#8217;s always the chance that a few of them won&#8217;t work
295 properly on your computer.295 properly on your computer.
296 </para>296 </para>
@@ -301,7 +301,7 @@
301 their <guimenu>Help</guimenu> menu.301 their <guimenu>Help</guimenu> menu.
302 </para>302 </para>
303 <para>303 <para>
304 Otherwise, look through the Store for another program to do what you want.304 Otherwise, look through the Software Center for another program to do what you want.
305 </para>305 </para>
306 <itemizedlist>306 <itemizedlist>
307 <listitem><para><xref linkend="removing" endterm="removing-title"/></para></listitem>307 <listitem><para><xref linkend="removing" endterm="removing-title"/></para></listitem>