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
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 mvo@ubuntu.com
6 </creator>
7 <title>
8- Software Store
9+ Software Center
10 </title>
11 <date>
12 2009-09-07
13@@ -20,7 +20,7 @@
14 user's guide
15 </type>
16 <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
17- <identifier url="file:/usr/share/gnome/help/software-store/C/software-store.xml"/>
18+ <identifier url="file:/usr/share/gnome/help/software-center/C/software-center.xml"/>
19 <language code="C"/>
20 <relation seriesid="09f8bcc4-9246-f537-be7d-a823fbbcfc78c0"/>
21 <rights type="GNU FDL" license.version="1.1"
22
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 <!-- please do not change the id; for translations, change lang to -->
28 <!-- appropriate code -->
29 <bookinfo>
30- <title>Ubuntu Software Store</title>
31+ <title>Ubuntu Software Center</title>
32 <!-- translators: uncomment this:
33
34 <copyright>
35@@ -57,16 +57,16 @@
36 </author>
37 </authorgroup>
38 <abstract>
39- <para>This manual explains how to use <application>Software Store</application>.</para>
40+ <para>This manual explains how to use <application>Software Center</application>.</para>
41 </abstract>
42 </bookinfo>
43 <!-- ============= Document Body ============================= -->
44
45 <!-- ============= Introduction ============================== -->
46 <chapter id="introduction">
47- <title>What is the Ubuntu Software Store?</title>
48+ <title>What is the Ubuntu Software Center?</title>
49 <para>
50- The Ubuntu Software Store is a virtual catalog of thousands of free
51+ The Ubuntu Software Center is a virtual catalog of thousands of free
52 applications available for Ubuntu &#8212;
53 software to make your computer more useful.
54 </para>
55@@ -75,7 +75,7 @@
56 and you can install an application with the click of a button.
57 </para>
58 <para>
59- The Store also lets you examine the applications installed on the
60+ The Software Center also lets you examine the applications installed on the
61 computer already,
62 and remove those you no longer need.
63 </para>
64@@ -83,7 +83,7 @@
65 <chapter id="installing">
66 <title>Installing a program</title>
67 <para>
68- To install a program from the Store,
69+ To install a program from the Software Center,
70 you need administrator access and a working Internet connection.
71 (If you set up Ubuntu on this computer yourself,
72 you have administrator access automatically.)
73@@ -96,7 +96,7 @@
74 If you already know its name, try typing the name in the search field.
75 Or try searching for the type of program you want
76 (like &#8220;spreadsheet&#8221;).
77- Otherwise, browse the Store departments to find the program.
78+ Otherwise, browse the Software Center departments to find the program.
79 </para>
80 </listitem>
81 <listitem>
82@@ -119,7 +119,7 @@
83 </para>
84 <para>
85 While a program is being installed,
86- it appears in the Store&#8217;s <guilabel>In Progress</guilabel> section.
87+ it appears in the Software Center&#8217;s <guilabel>In Progress</guilabel> section.
88 As soon as it disappears, the program is installed.
89 </para>
90 <itemizedlist>
91@@ -133,7 +133,7 @@
92 <para>
93 Most installed applications appear
94 in the <guimenu>Applications</guimenu> menu in the corner of the screen,
95- in the same category as they came from in the Store.
96+ in the same category as they came from in the Software Center.
97 </para>
98 <para>
99 For example, if you installed a program from the
100@@ -201,7 +201,7 @@
101 >Why is it asking me to remove several programs together?</title>
102 <para>
103 Sometimes if you try to remove one program,
104- the Store will warn you that other programs will be removed too.
105+ the Software Center will warn you that other programs will be removed too.
106 There are two main reasons this happens.
107 </para>
108 <itemizedlist>
109@@ -216,7 +216,7 @@
110 Multiple applications are sometimes provided as a single package.
111 If any of them are installed, all of them are installed.
112 And if any of them are removed, all of them are removed.
113- The Store cannot remove them individually,
114+ The Software Center cannot remove them individually,
115 because it has no instructions on how to separate them.
116 </para>
117 </listitem>
118@@ -238,7 +238,7 @@
119 <chapter id="canonical-maintained">
120 <title>What does &#8220;Canonical-maintained&#8221; mean?</title>
121 <para>
122- Some of the software available in the Ubuntu Software Store is
123+ Some of the software available in the Ubuntu Software Center is
124 maintained by Canonical.
125 Canonical engineers ensure that security fixes and other critical updates
126 are provided for these programs.
127@@ -251,31 +251,31 @@
128 <chapter id="why-free">
129 <title id="why-free-title">Why are all the programs free?</title>
130 <para>
131- Currently, all software in the Ubuntu Software Store is free of charge.
132+ Currently, all software in the Ubuntu Software Center is free of charge.
133 </para>
134 <para>
135 Most of this software is developed as <firstterm>open source</firstterm>,
136 which means anyone is allowed to alter it and redistribute it for any
137 price.
138 Ubuntu developers, Debian developers, and others
139- package the software available in the Store,
140+ package the software available in the Software Center,
141 and make it available to you for free.
142 </para>
143 <para>
144- In a future version of Ubuntu, the Store will also allow software
145+ In a future version of Ubuntu, the Software Center will also allow software
146 purchases.
147 </para>
148 </chapter>
149 <chapter id="missing">
150 <title id="missing-title"
151- >What if a program I want isn&#8217;t in the Store?</title>
152+ >What if a program I want isn&#8217;t in the Software Center?</title>
153 <para>
154 First, check that <menuchoice><guimenu>View</guimenu>
155 <guimenuitem>All Applications</guimenuitem></menuchoice> is selected.
156- That ensures you can see all the software available in the Store.
157+ That ensures you can see all the software available in the Software Center.
158 </para>
159 <para>
160- If a program isn&#8217;t in the Store,
161+ If a program isn&#8217;t in the Software Center,
162 but you know that it runs on Ubuntu,
163 try contacting the original developers of the program
164 to ask if they can help make it available.
165@@ -290,7 +290,7 @@
166 <title id="bugs-title"
167 >What if a program doesn&#8217;t work?</title>
168 <para>
169- With thousands of applications in the Store,
170+ With thousands of applications in the Software Center,
171 there&#8217;s always the chance that a few of them won&#8217;t work
172 properly on your computer.
173 </para>
174@@ -301,7 +301,7 @@
175 their <guimenu>Help</guimenu> menu.
176 </para>
177 <para>
178- Otherwise, look through the Store for another program to do what you want.
179+ Otherwise, look through the Software Center for another program to do what you want.
180 </para>
181 <itemizedlist>
182 <listitem><para><xref linkend="removing" endterm="removing-title"/></para></listitem>