Merge lp:~mdke/software-center/help-fixes into lp:software-center
- help-fixes
- Merge into trunk
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
software-store-developers | Pending | ||
Review via email: mp+12450@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Matthew East (mdke) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'help/C/software-center-C.omf' | |||
2 | --- help/C/software-center-C.omf 2009-09-25 15:30:34 +0000 | |||
3 | +++ help/C/software-center-C.omf 2009-09-26 09:00:29 +0000 | |||
4 | @@ -5,7 +5,7 @@ | |||
5 | 5 | mvo@ubuntu.com | 5 | mvo@ubuntu.com |
6 | 6 | </creator> | 6 | </creator> |
7 | 7 | <title> | 7 | <title> |
9 | 8 | Software Store | 8 | Software Center |
10 | 9 | </title> | 9 | </title> |
11 | 10 | <date> | 10 | <date> |
12 | 11 | 2009-09-07 | 11 | 2009-09-07 |
13 | @@ -20,7 +20,7 @@ | |||
14 | 20 | user's guide | 20 | user's guide |
15 | 21 | </type> | 21 | </type> |
16 | 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"/> |
18 | 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"/> |
19 | 24 | <language code="C"/> | 24 | <language code="C"/> |
20 | 25 | <relation seriesid="09f8bcc4-9246-f537-be7d-a823fbbcfc78c0"/> | 25 | <relation seriesid="09f8bcc4-9246-f537-be7d-a823fbbcfc78c0"/> |
21 | 26 | <rights type="GNU FDL" license.version="1.1" | 26 | <rights type="GNU FDL" license.version="1.1" |
22 | 27 | 27 | ||
23 | === modified file 'help/C/software-center.xml' | |||
24 | --- help/C/software-center.xml 2009-09-25 15:30:34 +0000 | |||
25 | +++ help/C/software-center.xml 2009-09-26 09:00:29 +0000 | |||
26 | @@ -19,7 +19,7 @@ | |||
27 | 19 | <!-- please do not change the id; for translations, change lang to --> | 19 | <!-- please do not change the id; for translations, change lang to --> |
28 | 20 | <!-- appropriate code --> | 20 | <!-- appropriate code --> |
29 | 21 | <bookinfo> | 21 | <bookinfo> |
31 | 22 | <title>Ubuntu Software Store</title> | 22 | <title>Ubuntu Software Center</title> |
32 | 23 | <!-- translators: uncomment this: | 23 | <!-- translators: uncomment this: |
33 | 24 | 24 | ||
34 | 25 | <copyright> | 25 | <copyright> |
35 | @@ -57,16 +57,16 @@ | |||
36 | 57 | </author> | 57 | </author> |
37 | 58 | </authorgroup> | 58 | </authorgroup> |
38 | 59 | <abstract> | 59 | <abstract> |
40 | 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> |
41 | 61 | </abstract> | 61 | </abstract> |
42 | 62 | </bookinfo> | 62 | </bookinfo> |
43 | 63 | <!-- ============= Document Body ============================= --> | 63 | <!-- ============= Document Body ============================= --> |
44 | 64 | 64 | ||
45 | 65 | <!-- ============= Introduction ============================== --> | 65 | <!-- ============= Introduction ============================== --> |
46 | 66 | <chapter id="introduction"> | 66 | <chapter id="introduction"> |
48 | 67 | <title>What is the Ubuntu Software Store?</title> | 67 | <title>What is the Ubuntu Software Center?</title> |
49 | 68 | <para> | 68 | <para> |
51 | 69 | The Ubuntu Software Store is a virtual catalog of thousands of free | 69 | The Ubuntu Software Center is a virtual catalog of thousands of free |
52 | 70 | applications available for Ubuntu — | 70 | applications available for Ubuntu — |
53 | 71 | software to make your computer more useful. | 71 | software to make your computer more useful. |
54 | 72 | </para> | 72 | </para> |
55 | @@ -75,7 +75,7 @@ | |||
56 | 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. |
57 | 76 | </para> | 76 | </para> |
58 | 77 | <para> | 77 | <para> |
60 | 78 | The Store also lets you examine the applications installed on the | 78 | The Software Center also lets you examine the applications installed on the |
61 | 79 | computer already, | 79 | computer already, |
62 | 80 | and remove those you no longer need. | 80 | and remove those you no longer need. |
63 | 81 | </para> | 81 | </para> |
64 | @@ -83,7 +83,7 @@ | |||
65 | 83 | <chapter id="installing"> | 83 | <chapter id="installing"> |
66 | 84 | <title>Installing a program</title> | 84 | <title>Installing a program</title> |
67 | 85 | <para> | 85 | <para> |
69 | 86 | To install a program from the Store, | 86 | To install a program from the Software Center, |
70 | 87 | you need administrator access and a working Internet connection. | 87 | you need administrator access and a working Internet connection. |
71 | 88 | (If you set up Ubuntu on this computer yourself, | 88 | (If you set up Ubuntu on this computer yourself, |
72 | 89 | you have administrator access automatically.) | 89 | you have administrator access automatically.) |
73 | @@ -96,7 +96,7 @@ | |||
74 | 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. |
75 | 97 | Or try searching for the type of program you want | 97 | Or try searching for the type of program you want |
76 | 98 | (like “spreadsheet”). | 98 | (like “spreadsheet”). |
78 | 99 | Otherwise, browse the Store departments to find the program. | 99 | Otherwise, browse the Software Center departments to find the program. |
79 | 100 | </para> | 100 | </para> |
80 | 101 | </listitem> | 101 | </listitem> |
81 | 102 | <listitem> | 102 | <listitem> |
82 | @@ -119,7 +119,7 @@ | |||
83 | 119 | </para> | 119 | </para> |
84 | 120 | <para> | 120 | <para> |
85 | 121 | While a program is being installed, | 121 | While a program is being installed, |
87 | 122 | it appears in the Store’s <guilabel>In Progress</guilabel> section. | 122 | it appears in the Software Center’s <guilabel>In Progress</guilabel> section. |
88 | 123 | As soon as it disappears, the program is installed. | 123 | As soon as it disappears, the program is installed. |
89 | 124 | </para> | 124 | </para> |
90 | 125 | <itemizedlist> | 125 | <itemizedlist> |
91 | @@ -133,7 +133,7 @@ | |||
92 | 133 | <para> | 133 | <para> |
93 | 134 | Most installed applications appear | 134 | Most installed applications appear |
94 | 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, |
96 | 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. |
97 | 137 | </para> | 137 | </para> |
98 | 138 | <para> | 138 | <para> |
99 | 139 | For example, if you installed a program from the | 139 | For example, if you installed a program from the |
100 | @@ -201,7 +201,7 @@ | |||
101 | 201 | >Why is it asking me to remove several programs together?</title> | 201 | >Why is it asking me to remove several programs together?</title> |
102 | 202 | <para> | 202 | <para> |
103 | 203 | Sometimes if you try to remove one program, | 203 | Sometimes if you try to remove one program, |
105 | 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. |
106 | 205 | There are two main reasons this happens. | 205 | There are two main reasons this happens. |
107 | 206 | </para> | 206 | </para> |
108 | 207 | <itemizedlist> | 207 | <itemizedlist> |
109 | @@ -216,7 +216,7 @@ | |||
110 | 216 | Multiple applications are sometimes provided as a single package. | 216 | Multiple applications are sometimes provided as a single package. |
111 | 217 | If any of them are installed, all of them are installed. | 217 | If any of them are installed, all of them are installed. |
112 | 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. |
114 | 219 | The Store cannot remove them individually, | 219 | The Software Center cannot remove them individually, |
115 | 220 | because it has no instructions on how to separate them. | 220 | because it has no instructions on how to separate them. |
116 | 221 | </para> | 221 | </para> |
117 | 222 | </listitem> | 222 | </listitem> |
118 | @@ -238,7 +238,7 @@ | |||
119 | 238 | <chapter id="canonical-maintained"> | 238 | <chapter id="canonical-maintained"> |
120 | 239 | <title>What does “Canonical-maintained” mean?</title> | 239 | <title>What does “Canonical-maintained” mean?</title> |
121 | 240 | <para> | 240 | <para> |
123 | 241 | Some of the software available in the Ubuntu Software Store is | 241 | Some of the software available in the Ubuntu Software Center is |
124 | 242 | maintained by Canonical. | 242 | maintained by Canonical. |
125 | 243 | Canonical engineers ensure that security fixes and other critical updates | 243 | Canonical engineers ensure that security fixes and other critical updates |
126 | 244 | are provided for these programs. | 244 | are provided for these programs. |
127 | @@ -251,31 +251,31 @@ | |||
128 | 251 | <chapter id="why-free"> | 251 | <chapter id="why-free"> |
129 | 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> |
130 | 253 | <para> | 253 | <para> |
132 | 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. |
133 | 255 | </para> | 255 | </para> |
134 | 256 | <para> | 256 | <para> |
135 | 257 | Most of this software is developed as <firstterm>open source</firstterm>, | 257 | Most of this software is developed as <firstterm>open source</firstterm>, |
136 | 258 | which means anyone is allowed to alter it and redistribute it for any | 258 | which means anyone is allowed to alter it and redistribute it for any |
137 | 259 | price. | 259 | price. |
138 | 260 | Ubuntu developers, Debian developers, and others | 260 | Ubuntu developers, Debian developers, and others |
140 | 261 | package the software available in the Store, | 261 | package the software available in the Software Center, |
141 | 262 | and make it available to you for free. | 262 | and make it available to you for free. |
142 | 263 | </para> | 263 | </para> |
143 | 264 | <para> | 264 | <para> |
145 | 265 | In a future version of Ubuntu, the Store will also allow software | 265 | In a future version of Ubuntu, the Software Center will also allow software |
146 | 266 | purchases. | 266 | purchases. |
147 | 267 | </para> | 267 | </para> |
148 | 268 | </chapter> | 268 | </chapter> |
149 | 269 | <chapter id="missing"> | 269 | <chapter id="missing"> |
150 | 270 | <title id="missing-title" | 270 | <title id="missing-title" |
152 | 271 | >What if a program I want isn’t in the Store?</title> | 271 | >What if a program I want isn’t in the Software Center?</title> |
153 | 272 | <para> | 272 | <para> |
154 | 273 | First, check that <menuchoice><guimenu>View</guimenu> | 273 | First, check that <menuchoice><guimenu>View</guimenu> |
155 | 274 | <guimenuitem>All Applications</guimenuitem></menuchoice> is selected. | 274 | <guimenuitem>All Applications</guimenuitem></menuchoice> is selected. |
157 | 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. |
158 | 276 | </para> | 276 | </para> |
159 | 277 | <para> | 277 | <para> |
161 | 278 | If a program isn’t in the Store, | 278 | If a program isn’t in the Software Center, |
162 | 279 | but you know that it runs on Ubuntu, | 279 | but you know that it runs on Ubuntu, |
163 | 280 | try contacting the original developers of the program | 280 | try contacting the original developers of the program |
164 | 281 | to ask if they can help make it available. | 281 | to ask if they can help make it available. |
165 | @@ -290,7 +290,7 @@ | |||
166 | 290 | <title id="bugs-title" | 290 | <title id="bugs-title" |
167 | 291 | >What if a program doesn’t work?</title> | 291 | >What if a program doesn’t work?</title> |
168 | 292 | <para> | 292 | <para> |
170 | 293 | With thousands of applications in the Store, | 293 | With thousands of applications in the Software Center, |
171 | 294 | there’s always the chance that a few of them won’t work | 294 | there’s always the chance that a few of them won’t work |
172 | 295 | properly on your computer. | 295 | properly on your computer. |
173 | 296 | </para> | 296 | </para> |
174 | @@ -301,7 +301,7 @@ | |||
175 | 301 | their <guimenu>Help</guimenu> menu. | 301 | their <guimenu>Help</guimenu> menu. |
176 | 302 | </para> | 302 | </para> |
177 | 303 | <para> | 303 | <para> |
179 | 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. |
180 | 305 | </para> | 305 | </para> |
181 | 306 | <itemizedlist> | 306 | <itemizedlist> |
182 | 307 | <listitem><para><xref linkend="removing" endterm="removing-title"/></para></listitem> | 307 | <listitem><para><xref linkend="removing" endterm="removing-title"/></para></listitem> |
Fixes bug 436648 in the help