Merge lp:~matthew.revell/launchpad/translations-help-10.1 into lp:launchpad

Proposed by Matthew Revell on 2010-01-08
Status: Merged
Approved by: Henning Eggers on 2010-01-14
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~matthew.revell/launchpad/translations-help-10.1
Merge into: lp:launchpad
Diff against target: 808 lines (+466/-94)
25 files modified
lib/lp/bugs/help/tag-search.html (+5/-5)
lib/lp/code/help/register-branch.html (+5/-5)
lib/lp/registry/help/home-page-staging-help.html (+5/-5)
lib/lp/registry/help/import-pgp-key.html (+5/-5)
lib/lp/registry/help/openid.html (+5/-5)
lib/lp/registry/help/openpgp-keys.html (+5/-5)
lib/lp/registry/help/pgp-key-clearsign.html (+5/-5)
lib/lp/registry/help/verify-downloads.html (+5/-5)
lib/lp/services/inlinehelp/javascript/inlinehelp.js (+1/-1)
lib/lp/soyuz/help/ppa-sources-list.html (+5/-5)
lib/lp/translations/help/directory-example.html (+53/-0)
lib/lp/translations/help/getting-started-for-your-project.html (+5/-5)
lib/lp/translations/help/imported-upload.html (+61/-0)
lib/lp/translations/help/importing-from-bzr.html (+37/-0)
lib/lp/translations/help/new-to-translating.html (+44/-0)
lib/lp/translations/help/reviewing.html (+52/-0)
lib/lp/translations/help/successful-imports.html (+46/-0)
lib/lp/translations/help/translation-groups.html (+5/-5)
lib/lp/translations/help/updated-upload.html (+40/-0)
lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt (+1/-1)
lib/lp/translations/templates/person-translations.pt (+3/-5)
lib/lp/translations/templates/pofile-upload.pt (+3/-3)
lib/lp/translations/templates/productseries-translations-settings.pt (+32/-7)
lib/lp/translations/templates/productseries-translations-upload.pt (+29/-20)
lib/lp/translations/templates/translationimportqueue-index.pt (+9/-2)
To merge this branch: bzr merge lp:~matthew.revell/launchpad/translations-help-10.1
Reviewer Review Type Date Requested Status
Henning Eggers (community) code 2010-01-08 Approve on 2010-01-12
Eleanor Berger (community) 2010-01-08 Approve on 2010-01-11
Review via email: mp+17032@code.launchpad.net
To post a comment you must log in.
Matthew Revell (matthew.revell) wrote :

This is the first of two branches that fix a number of bugs in the Translations UI text and help, as identified by Matthew R and Danilo at UDS-L.

review: Approve
Henning Eggers (henninge) wrote :
Download full text (6.6 KiB)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 08.01.2010 18:36, Matthew Revell schrieb:
>
> This is the first of two branches that fix a number of bugs in the Translations UI text and help, as identified by Matthew R and Danilo at UDS-L.
>

Thanks for doing these. They will certainly help translators and
reviewers in doing a better job.

> === added file 'lib/lp/translations/help/directory-example.html'
> --- lib/lp/translations/help/directory-example.html 1970-01-01 00:00:00 +0000
> +++ lib/lp/translations/help/directory-example.html 2010-01-11 15:03:15 +0000
> @@ -0,0 +1,42 @@
> +<html>
> + <head>
> + <title>Example directory layout for translation files</title>
> + <link rel="stylesheet" type="text/css"
> + href="/+icing/yui/current/build/cssreset/reset.css" />
> + <link rel="stylesheet" type="text/css"
> + href="/+icing/yui/current/build/cssfonts/fonts.css" />
> + <link rel="stylesheet" type="text/css"
> + href="/+icing/yui/current/build/cssbase/base.css" />

OK, these seem to be a problem, as we found out. Please see that you can
fix it and file a bug for the affected existing help pages.

> + </head>
> + <body>
> + <h1>Example directory layout for translation files</h1>

Good, clear explanation.
[...]

> === added file 'lib/lp/translations/help/imported-upload.html'
> --- lib/lp/translations/help/imported-upload.html 1970-01-01 00:00:00 +0000
> +++ lib/lp/translations/help/imported-upload.html 2010-01-11 15:03:15 +0000
> @@ -0,0 +1,59 @@
> +<html>
> + <head>
> + <title>Importing a .po file from upstream</title>
> + <link rel="stylesheet" type="text/css"
> + href="/+icing/yui/current/build/cssreset/reset.css" />
> + <link rel="stylesheet" type="text/css"
> + href="/+icing/yui/current/build/cssfonts/fonts.css" />
> + <link rel="stylesheet" type="text/css"
> + href="/+icing/yui/current/build/cssbase/base.css" />
> + </head>
> + <body>
> + <h1>Importing a .po file from upstream</h1>
> +
> + <p>
> + Many projects have translation efforts outside of Launchpad. If
> + you help translate that project for Ubuntu, you should import the
> + upstream translations from time to time.
> + </p>

This is also true for any other project that is not hosted on Launchpad
completely and for any other distribution hosted in LP. Can you find a
way to put it that broadens the meaning while still mentioning Ubuntu
(where this is particularly important)?

> +
> + <h2>How Launchpad prioritises imported translation strings</h2>
> +
> + <p>To help ensure the best quality translations end-up in Ubuntu,

just "end up", AFAIK.
Again, not just Ubuntu.

> + Launchpad prioritises translation strings differently depending
> + on where they were made.
> + </p>
> +
> + <p>
> + In general, a translation made in Launchpad will take precedence
[...]
Good explanation of a difficult matter. Well done. ;)

> === added file 'lib/lp/translations/help/importing-from-bzr.html'

OK.

> === added file 'lib/lp/translations/help/reviewing.html'
> --- lib/lp/translations/help/reviewing.html 1970-01-01 00:00:00 +0000
> +++ lib/lp/translations...

Read more...

review: Needs Fixing
Matthew Revell (matthew.revell) wrote :

Henning, I've addressed your concerns and have also:

 * fixed the help pop-up CSS problems
 * changed the 'continue' button to be 'Close'
 * Addressed 48435 "+imports UI text and help"

I'd be grateful if you'd take another look, please.

Henning Eggers (henninge) wrote :

Hi Matt,
thanks for the improvements and good job on fixing those other issues!

Just one correction:
+ Following a delay, Launchpad will make an initial import, then check regularly
+ for updates.

This should read something like this:
                Launchpad will make an initial import and then update its data every time you push
                a new revision to the branch. There is a short delay between a push and the files
                appearing in the import queue.

The important thing is that the updates are push-driven, not a cron-job. The delay is 15 to 30 minutes, no longer.

After that the branch is good to land!

Henning

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/help/tag-search.html'
2--- lib/lp/bugs/help/tag-search.html 2009-07-02 16:31:11 +0000
3+++ lib/lp/bugs/help/tag-search.html 2010-01-21 15:33:14 +0000
4@@ -2,11 +2,11 @@
5 <head>
6 <title>Bug tag search</title>
7 <link rel="stylesheet" type="text/css"
8- href="/+icing/yui/current/build/cssreset/reset.css" />
9- <link rel="stylesheet" type="text/css"
10- href="/+icing/yui/current/build/cssfonts/fonts.css" />
11- <link rel="stylesheet" type="text/css"
12- href="/+icing/yui/current/build/cssbase/base.css" />
13+ href="/+icing/yui/cssreset/reset.css" />
14+ <link rel="stylesheet" type="text/css"
15+ href="/+icing/yui/cssfonts/fonts.css" />
16+ <link rel="stylesheet" type="text/css"
17+ href="/+icing/yui/cssbase/base.css" />
18 </head>
19 <body>
20 <h1>Bug tag search</h1>
21
22=== modified file 'lib/lp/code/help/register-branch.html'
23--- lib/lp/code/help/register-branch.html 2009-10-02 15:43:47 +0000
24+++ lib/lp/code/help/register-branch.html 2010-01-21 15:33:14 +0000
25@@ -2,11 +2,11 @@
26 <head>
27 <title>Uploading a branch without registering</title>
28 <link rel="stylesheet" type="text/css"
29- href="/+icing/yui/current/build/cssreset/reset.css" />
30- <link rel="stylesheet" type="text/css"
31- href="/+icing/yui/current/build/cssfonts/fonts.css" />
32- <link rel="stylesheet" type="text/css"
33- href="/+icing/yui/current/build/cssbase/base.css" />
34+ href="/+icing/yui/cssreset/reset.css" />
35+ <link rel="stylesheet" type="text/css"
36+ href="/+icing/yui/cssfonts/fonts.css" />
37+ <link rel="stylesheet" type="text/css"
38+ href="/+icing/yui/cssbase/base.css" />
39 </head>
40 <body>
41 <h1>Uploading a branch without registering</h1>
42
43=== modified file 'lib/lp/registry/help/home-page-staging-help.html'
44--- lib/lp/registry/help/home-page-staging-help.html 2009-09-23 09:28:25 +0000
45+++ lib/lp/registry/help/home-page-staging-help.html 2010-01-21 15:33:14 +0000
46@@ -2,11 +2,11 @@
47 <head>
48 <title>Staging &mdash; Launchpad's sandbox</title>
49 <link rel="stylesheet" type="text/css"
50- href="/+icing/yui/current/build/cssreset/reset.css" />
51- <link rel="stylesheet" type="text/css"
52- href="/+icing/yui/current/build/cssfonts/fonts.css" />
53- <link rel="stylesheet" type="text/css"
54- href="/+icing/yui/current/build/cssbase/base.css" />
55+ href="/+icing/yui/cssreset/reset.css" />
56+ <link rel="stylesheet" type="text/css"
57+ href="/+icing/yui/cssfonts/fonts.css" />
58+ <link rel="stylesheet" type="text/css"
59+ href="/+icing/yui/cssbase/base.css" />
60 </head>
61 <body>
62 <h1>Staging &mdash; Launchpad's sandbox</h1>
63
64=== modified file 'lib/lp/registry/help/import-pgp-key.html'
65--- lib/lp/registry/help/import-pgp-key.html 2009-06-09 11:18:47 +0000
66+++ lib/lp/registry/help/import-pgp-key.html 2010-01-21 15:33:14 +0000
67@@ -2,11 +2,11 @@
68 <head>
69 <title>Importing an OpenPGP key</title>
70 <link rel="stylesheet" type="text/css"
71- href="/+icing/yui/current/build/cssreset/reset.css" />
72- <link rel="stylesheet" type="text/css"
73- href="/+icing/yui/current/build/cssfonts/fonts.css" />
74- <link rel="stylesheet" type="text/css"
75- href="/+icing/yui/current/build/cssbase/base.css" />
76+ href="/+icing/yui/cssreset/reset.css" />
77+ <link rel="stylesheet" type="text/css"
78+ href="/+icing/yui/cssfonts/fonts.css" />
79+ <link rel="stylesheet" type="text/css"
80+ href="/+icing/yui/cssbase/base.css" />
81 </head>
82 <body>
83 <h1>Importing an OpenPGP key</h1>
84
85=== modified file 'lib/lp/registry/help/openid.html'
86--- lib/lp/registry/help/openid.html 2009-04-27 21:11:44 +0000
87+++ lib/lp/registry/help/openid.html 2010-01-21 15:33:14 +0000
88@@ -2,11 +2,11 @@
89 <head>
90 <title>What is OpenID?</title>
91 <link rel="stylesheet" type="text/css"
92- href="/+icing/yui/current/build/cssreset/reset.css" />
93- <link rel="stylesheet" type="text/css"
94- href="/+icing/yui/current/build/cssfonts/fonts.css" />
95- <link rel="stylesheet" type="text/css"
96- href="/+icing/yui/current/build/cssbase/base.css" />
97+ href="/+icing/yui/cssreset/reset.css" />
98+ <link rel="stylesheet" type="text/css"
99+ href="/+icing/yui/cssfonts/fonts.css" />
100+ <link rel="stylesheet" type="text/css"
101+ href="/+icing/yui/cssbase/base.css" />
102 </head>
103 <body>
104 <h1>What is OpenID?</h1>
105
106=== modified file 'lib/lp/registry/help/openpgp-keys.html'
107--- lib/lp/registry/help/openpgp-keys.html 2009-10-14 10:00:46 +0000
108+++ lib/lp/registry/help/openpgp-keys.html 2010-01-21 15:33:14 +0000
109@@ -2,11 +2,11 @@
110 <head>
111 <title>Introducing OpenPGP keys</title>
112 <link rel="stylesheet" type="text/css"
113- href="/+icing/yui/current/build/cssreset/reset.css" />
114- <link rel="stylesheet" type="text/css"
115- href="/+icing/yui/current/build/cssfonts/fonts.css" />
116- <link rel="stylesheet" type="text/css"
117- href="/+icing/yui/current/build/cssbase/base.css" />
118+ href="/+icing/yui/cssreset/reset.css" />
119+ <link rel="stylesheet" type="text/css"
120+ href="/+icing/yui/cssfonts/fonts.css" />
121+ <link rel="stylesheet" type="text/css"
122+ href="/+icing/yui/cssbase/base.css" />
123 </head>
124 <body>
125 <h1>Introducing OpenPGP keys</h1>
126
127=== modified file 'lib/lp/registry/help/pgp-key-clearsign.html'
128--- lib/lp/registry/help/pgp-key-clearsign.html 2009-06-09 15:08:38 +0000
129+++ lib/lp/registry/help/pgp-key-clearsign.html 2010-01-21 15:33:14 +0000
130@@ -2,11 +2,11 @@
131 <head>
132 <title>Importing an OpenPGP key</title>
133 <link rel="stylesheet" type="text/css"
134- href="/+icing/yui/current/build/cssreset/reset.css" />
135- <link rel="stylesheet" type="text/css"
136- href="/+icing/yui/current/build/cssfonts/fonts.css" />
137- <link rel="stylesheet" type="text/css"
138- href="/+icing/yui/current/build/cssbase/base.css" />
139+ href="/+icing/yui/cssreset/reset.css" />
140+ <link rel="stylesheet" type="text/css"
141+ href="/+icing/yui/cssfonts/fonts.css" />
142+ <link rel="stylesheet" type="text/css"
143+ href="/+icing/yui/cssbase/base.css" />
144 </head>
145 <body>
146 <h1>Confirming your OpenPGP key</h1>
147
148=== modified file 'lib/lp/registry/help/verify-downloads.html'
149--- lib/lp/registry/help/verify-downloads.html 2009-06-30 15:19:14 +0000
150+++ lib/lp/registry/help/verify-downloads.html 2010-01-21 15:33:14 +0000
151@@ -2,11 +2,11 @@
152 <head>
153 <title>Verifying a download</title>
154 <link rel="stylesheet" type="text/css"
155- href="/+icing/yui/current/build/cssreset/reset.css" />
156- <link rel="stylesheet" type="text/css"
157- href="/+icing/yui/current/build/cssfonts/fonts.css" />
158- <link rel="stylesheet" type="text/css"
159- href="/+icing/yui/current/build/cssbase/base.css" />
160+ href="/+icing/yui/cssreset/reset.css" />
161+ <link rel="stylesheet" type="text/css"
162+ href="/+icing/yui/cssfonts/fonts.css" />
163+ <link rel="stylesheet" type="text/css"
164+ href="/+icing/yui/cssbase/base.css" />
165 </head>
166 <body>
167 <h1>Verifying a download</h1>
168
169=== modified file 'lib/lp/services/inlinehelp/javascript/inlinehelp.js'
170--- lib/lp/services/inlinehelp/javascript/inlinehelp.js 2009-10-09 10:38:00 +0000
171+++ lib/lp/services/inlinehelp/javascript/inlinehelp.js 2010-01-21 15:33:14 +0000
172@@ -27,7 +27,7 @@
173 // Changed from an <input type=button> to a <button> since
174 // IE8 doesn't handle style.css's input{visibility:inherit} correctly.
175 $('help-close').innerHTML =
176- '<button id="help-close-btn">Continue</button>';
177+ '<button id="help-close-btn">Close</button>';
178 forEach(findHelpLinks(), setupHelpTrigger);
179 initHelpPane();
180 }
181
182=== modified file 'lib/lp/soyuz/help/ppa-sources-list.html'
183--- lib/lp/soyuz/help/ppa-sources-list.html 2009-07-10 10:00:30 +0000
184+++ lib/lp/soyuz/help/ppa-sources-list.html 2010-01-21 15:33:14 +0000
185@@ -2,11 +2,11 @@
186 <head>
187 <title>How do I use software from a PPA?</title>
188 <link rel="stylesheet" type="text/css"
189- href="/+icing/yui/current/build/cssreset/reset.css" />
190- <link rel="stylesheet" type="text/css"
191- href="/+icing/yui/current/build/cssfonts/fonts.css" />
192- <link rel="stylesheet" type="text/css"
193- href="/+icing/yui/current/build/cssbase/base.css" />
194+ href="/+icing/yui/cssreset/reset.css" />
195+ <link rel="stylesheet" type="text/css"
196+ href="/+icing/yui/cssfonts/fonts.css" />
197+ <link rel="stylesheet" type="text/css"
198+ href="/+icing/yui/cssbase/base.css" />
199 </head>
200 <body>
201 <h1>How do I use software from a PPA?</h1>
202
203=== added file 'lib/lp/translations/help/directory-example.html'
204--- lib/lp/translations/help/directory-example.html 1970-01-01 00:00:00 +0000
205+++ lib/lp/translations/help/directory-example.html 2010-01-21 15:33:14 +0000
206@@ -0,0 +1,53 @@
207+<html>
208+ <head>
209+ <title>Example directory layout for translation files</title>
210+ <link rel="stylesheet" type="text/css"
211+ href="/+icing/yui/cssreset/reset.css" />
212+ <link rel="stylesheet" type="text/css"
213+ href="/+icing/yui/cssfonts/fonts.css" />
214+ <link rel="stylesheet" type="text/css"
215+ href="/+icing/yui/cssbase/base.css" />
216+ </head>
217+ <body>
218+ <h1>Example directory layout for translation files</h1>
219+
220+ <p>
221+ Each template (<code>.pot</code>) file must be in its own
222+ directory. For example:
223+ </p>
224+
225+ <ul>
226+ <li>template1/template1.pot
227+ <ul>
228+ <li>template1/de.po</li>
229+ <li>template1/fr.po</li>
230+ </ul>
231+ </li>
232+ <li>template2/template2.pot
233+ <ul>
234+ <li>template2/de.po</li>
235+ <li>template2/fr.po</li>
236+ </ul>
237+ </li>
238+ </ul>
239+
240+ <p>
241+ You should follow Launchpad <a target="_blank"
242+ href="https://help.launchpad.net/Translations/ImportPolicy">
243+ translation import guidelines</a> to ensure your translation
244+ files are imported successfully.
245+ </p>
246+
247+ <h2>.mo-style layouts</h2>
248+
249+ <p>
250+ Launchpad will not import your files if they use a <code>.mo</code>-style
251+ directory layout, such as:
252+ </p>
253+
254+ <p>
255+ <strong>NOT SUPPORTED:</strong> <code>template1/LC_MESSAGES/de/template1.po</code>
256+ </p>
257+
258+ </body>
259+</html>
260
261=== modified file 'lib/lp/translations/help/getting-started-for-your-project.html'
262--- lib/lp/translations/help/getting-started-for-your-project.html 2009-07-01 20:18:32 +0000
263+++ lib/lp/translations/help/getting-started-for-your-project.html 2010-01-21 15:33:14 +0000
264@@ -2,11 +2,11 @@
265 <head>
266 <title>Getting started with Launchpad Translations for your project</title>
267 <link rel="stylesheet" type="text/css"
268- href="/+icing/yui/current/build/cssreset/reset.css" />
269- <link rel="stylesheet" type="text/css"
270- href="/+icing/yui/current/build/cssfonts/fonts.css" />
271- <link rel="stylesheet" type="text/css"
272- href="/+icing/yui/current/build/cssbase/base.css" />
273+ href="/+icing/yui/cssreset/reset.css" />
274+ <link rel="stylesheet" type="text/css"
275+ href="/+icing/yui/cssfonts/fonts.css" />
276+ <link rel="stylesheet" type="text/css"
277+ href="/+icing/yui/cssbase/base.css" />
278 </head>
279 <body>
280 <h1>Getting started with Launchpad Translations for your project</h1>
281
282=== added file 'lib/lp/translations/help/imported-upload.html'
283--- lib/lp/translations/help/imported-upload.html 1970-01-01 00:00:00 +0000
284+++ lib/lp/translations/help/imported-upload.html 2010-01-21 15:33:14 +0000
285@@ -0,0 +1,61 @@
286+<html>
287+ <head>
288+ <title>Importing a .po file from upstream</title>
289+ <link rel="stylesheet" type="text/css"
290+ href="/+icing/yui/current/build/cssreset/reset.css" />
291+ <link rel="stylesheet" type="text/css"
292+ href="/+icing/yui/current/build/cssfonts/fonts.css" />
293+ <link rel="stylesheet" type="text/css"
294+ href="/+icing/yui/current/build/cssbase/base.css" />
295+ </head>
296+ <body>
297+ <h1>Importing a .po file from upstream</h1>
298+
299+ <p>
300+ Many projects have either full or partial translation efforts
301+ outside of Launchpad. If you work on translations for such a
302+ project, either its partial translation in Launchpad or its
303+ translation for a distribution such as Ubuntu, you should import
304+ the externally generated translations from time to time.
305+ </p>
306+
307+ <h2>How Launchpad prioritises imported translation strings</h2>
308+
309+ <p>To help ensure the best quality translations, Launchpad
310+ prioritises translation strings differently depending on where
311+ they were made.
312+ </p>
313+
314+ <p>
315+ In general, a translation made in Launchpad will take precedence
316+ over a translation imported from upstream, meaning that most
317+ imports will only overwrite a string if it also was an import.
318+ </p>
319+
320+ <p>
321+ There are, though, two important exceptions:
322+ </p>
323+
324+ <ul>
325+ <li>
326+ The first time that the translation of a string, in a
327+ particular language, is imported into Launchpad, it will take
328+ precedence over any existing translation made in that language
329+ in Launchpad.
330+ </li>
331+
332+ <li>
333+ If an imported string matches the translation already made in
334+ Launchpad. This means that the translation will now be
335+ overwritten by any subsequent imports, if they differ. However,
336+ making a change to the translation in Launchpad would reset it
337+ to take precedence over imported strings.
338+ </li>
339+ </ul>
340+
341+ <p>You should also take a look at Launchpad's <a href="https://help.launchpad.net/Translations/YourProject/ImportPolicy" target="_blank">
342+ translation import guidelines</a>.
343+ </p>
344+
345+ </body>
346+</html>
347
348=== added file 'lib/lp/translations/help/importing-from-bzr.html'
349--- lib/lp/translations/help/importing-from-bzr.html 1970-01-01 00:00:00 +0000
350+++ lib/lp/translations/help/importing-from-bzr.html 2010-01-21 15:33:14 +0000
351@@ -0,0 +1,37 @@
352+<html>
353+ <head>
354+ <title>Importing translation files from a Bazaar branch</title>
355+ <link rel="stylesheet" type="text/css"
356+ href="/+icing/yui/cssreset/reset.css" />
357+ <link rel="stylesheet" type="text/css"
358+ href="/+icing/yui/cssfonts/fonts.css" />
359+ <link rel="stylesheet" type="text/css"
360+ href="/+icing/yui/cssbase/base.css" />
361+ </head>
362+ <body>
363+ <h1>Importing translation files from a Bazaar branch</h1>
364+
365+ <p>
366+ You can make either one-off or continuous imports of translation
367+ files in a Bazaar branch. Which you choose will most likely depend
368+ on whether you expect to make frequent updates to either types of
369+ file.
370+ </p>
371+
372+ <p>Read more about:</p>
373+
374+ <ul>
375+ <li>
376+ <a href="https://help.launchpad.net/Translations/YourProject/ImportingTemplates"
377+ target="_blank">importing templates</a> (<code>.pot</code> files)
378+ </li>
379+
380+ <li>
381+ <a href="https://help.launchpad.net/Translations/YourProject/ImportingTranslations"
382+ target="_blank">importing translations</a> (<code>.po</code> files)
383+ </li>
384+ </ul>
385+
386+
387+ </body>
388+</html>
389
390=== added file 'lib/lp/translations/help/new-to-translating.html'
391--- lib/lp/translations/help/new-to-translating.html 1970-01-01 00:00:00 +0000
392+++ lib/lp/translations/help/new-to-translating.html 2010-01-21 15:33:14 +0000
393@@ -0,0 +1,44 @@
394+<html>
395+ <head>
396+ <title>Tips for new translators</title>
397+ <link rel="stylesheet" type="text/css"
398+ href="/+icing/yui/cssreset/reset.css" />
399+ <link rel="stylesheet" type="text/css"
400+ href="/+icing/yui/cssfonts/fonts.css" />
401+ <link rel="stylesheet" type="text/css"
402+ href="/+icing/yui/cssbase/base.css" />
403+ </head>
404+ <body>
405+ <h1>Tips for new translators</h1>
406+
407+ <p>
408+ If you're new to translating using Launchpad, there are a few things you
409+ might find it useful to know.
410+ </p>
411+
412+ <ul>
413+ <li>
414+ You can <a href="/people/+me/+editlanguages" target="_blank">tell
415+ Launchpad which languages you prefer to work in</a>.
416+ </li>
417+ <li>
418+ You can help any of hundreds of projects that use Launchpad to
419+ translate their software. Also, you can help translate distributions,
420+ such as Ubuntu.
421+ </li>
422+ <li>
423+ Each project/distribution decides how to balance openness with the
424+ need for review of translations by selecting a <a
425+ href="/+help/permissions-policies.html">permissions policy</a>. For
426+ most projects, you'll be able to suggest translations that will then
427+ be reviewed by someone else.
428+ </li>
429+ </ul>
430+
431+ <p>
432+ <a href="https://help.launchpad.net/Translations/StartingToTranslate"
433+ target="_blank">read more about translating in Launchpad &gt;</a>
434+ </p>
435+
436+ </body>
437+</html>
438
439=== added file 'lib/lp/translations/help/reviewing.html'
440--- lib/lp/translations/help/reviewing.html 1970-01-01 00:00:00 +0000
441+++ lib/lp/translations/help/reviewing.html 2010-01-21 15:33:14 +0000
442@@ -0,0 +1,52 @@
443+<html>
444+ <head>
445+ <title>Reviewing translations</title>
446+ <link rel="stylesheet" type="text/css"
447+ href="/+icing/yui/cssreset/reset.css" />
448+ <link rel="stylesheet" type="text/css"
449+ href="/+icing/yui/cssfonts/fonts.css" />
450+ <link rel="stylesheet" type="text/css"
451+ href="/+icing/yui/cssbase/base.css" />
452+ </head>
453+ <body>
454+ <h1>Reviewing translations</h1>
455+
456+ <p>
457+ <strong>Important:</strong> You can find the translation guidelines
458+ you must follow as a reviewer by visiting the appropriate
459+ translation group from the <a href="/+groups/" target="_blank">
460+ translation group overview page</a>.
461+ </p>
462+
463+ <p>
464+ As a member of one or more translation teams, you can help make
465+ sure that that the work of other translators makes it into
466+ published software.
467+ </p>
468+
469+ <p>
470+ One of the quickest ways is to review translated strings in the
471+ languages with which you're familiar. The more reviews you do, the
472+ more software will be available in the languages you care about.
473+ </p>
474+
475+ <p>
476+ To get started, simply follow the review links on your
477+ <a href="https://translations.launchpad.net/people/+me/" target="_blank">
478+ translation dashboard</a>.
479+ </p>
480+
481+ <p>
482+ <strong>Note:</strong> there's a lot more to being a member of
483+ a translation team than just reviewing strings. Most translation
484+ teams have an active community that works to set standards and
485+ divide up work among its members.
486+ </p>
487+
488+ <p>
489+ <a href="https://help.launchpad.net/Translations/JoiningATranslationGroup"
490+ target="_blank">Learn more about translation groups &gt;</a>
491+ </p>
492+
493+ </body>
494+</html>
495
496=== added file 'lib/lp/translations/help/successful-imports.html'
497--- lib/lp/translations/help/successful-imports.html 1970-01-01 00:00:00 +0000
498+++ lib/lp/translations/help/successful-imports.html 2010-01-21 15:33:14 +0000
499@@ -0,0 +1,46 @@
500+<html>
501+ <head>
502+ <title>Importing translation files from a Bazaar branch</title>
503+ <link rel="stylesheet" type="text/css"
504+ href="/+icing/yui/cssreset/reset.css" />
505+ <link rel="stylesheet" type="text/css"
506+ href="/+icing/yui/cssfonts/fonts.css" />
507+ <link rel="stylesheet" type="text/css"
508+ href="/+icing/yui/cssbase/base.css" />
509+ </head>
510+ <body>
511+ <h1>Importing translation files from a Bazaar branch</h1>
512+
513+ <p>
514+ When importing translation files into Launchpad from a tarball or
515+ a Bazaar branch, you must follow our <a
516+ href="https://help.launchpad.net/Translations/YourProject/ImportPolicy"
517+ target="_blank">translations import policy</a>. At a minimum, your
518+ tarball or branch must:
519+ </p>
520+
521+ <ul class="bulleted">
522+ <li>Contain at least one <code>.pot</code> file with English strings,
523+ rather than message IDs or another language. You cannot upload a
524+ <code>.po</code> file on its own.</li>
525+ <li>Give each template its own directory (<a href="/+help/directory-example.html"
526+ >see an example directory layout</a>).</li>
527+ </ul>
528+
529+ <p>The first time you upload a template, it'll usually take a few days
530+ before it is approved. However, imports from Bazaar branches are
531+ usually approved sooner than imports from tarballs.
532+ </p>
533+
534+ <p>
535+ Subsequent updates to templates, and <code>.po</code> files will be
536+ approved automatically.
537+ </p>
538+
539+ <p>
540+ Following approval, the English strings, and any translations, will be
541+ available in Launchpad within one day and usually much sooner.
542+ </p>
543+
544+ </body>
545+</html>
546
547=== modified file 'lib/lp/translations/help/translation-groups.html'
548--- lib/lp/translations/help/translation-groups.html 2009-07-01 11:16:45 +0000
549+++ lib/lp/translations/help/translation-groups.html 2010-01-21 15:33:14 +0000
550@@ -2,11 +2,11 @@
551 <head>
552 <title>Translation groups</title>
553 <link rel="stylesheet" type="text/css"
554- href="/+icing/yui/current/build/cssreset/reset.css" />
555- <link rel="stylesheet" type="text/css"
556- href="/+icing/yui/current/build/cssfonts/fonts.css" />
557- <link rel="stylesheet" type="text/css"
558- href="/+icing/yui/current/build/cssbase/base.css" />
559+ href="/+icing/yui/cssreset/reset.css" />
560+ <link rel="stylesheet" type="text/css"
561+ href="/+icing/yui/cssfonts/fonts.css" />
562+ <link rel="stylesheet" type="text/css"
563+ href="/+icing/yui/cssbase/base.css" />
564 </head>
565 <body>
566 <h1>Translation groups</h1>
567
568=== added file 'lib/lp/translations/help/updated-upload.html'
569--- lib/lp/translations/help/updated-upload.html 1970-01-01 00:00:00 +0000
570+++ lib/lp/translations/help/updated-upload.html 2010-01-21 15:33:14 +0000
571@@ -0,0 +1,40 @@
572+<html>
573+ <head>
574+ <title>Uploading an updated .po file</title>
575+ <link rel="stylesheet" type="text/css"
576+ href="/+icing/yui/cssreset/reset.css" />
577+ <link rel="stylesheet" type="text/css"
578+ href="/+icing/yui/cssfonts/fonts.css" />
579+ <link rel="stylesheet" type="text/css"
580+ href="/+icing/yui/cssbase/base.css" />
581+ </head>
582+ <body>
583+ <h1>Uploading an updated .po file</h1>
584+
585+ <p>
586+ When you download a .po file from Launchpad, update it, and then
587+ upload your edited .po file back to Launchpad, you need to select
588+ "Updated translation" on the upload page.
589+ </p>
590+
591+ <p>
592+ Launchpad treats the strings in that .po file just the same as if
593+ the translations had been made using Launchpad's web interface.
594+ </p>
595+
596+ <h2>Structuring the .po file</h2>
597+
598+ <p>
599+ Launchpad will only accept the .po file if it has the
600+ <code>X-Exported-From-Launchpad</code> header. That header is
601+ automatically added when you export a .po file from Launchpad.
602+ </p>
603+
604+ <p>
605+ The easiest way to ensure Launchpad accepts your .po file as an
606+ update is to export a .po file from Launchpad, edit only the
607+ strings and then upload it back to Launchpad.
608+ </p>
609+
610+ </body>
611+</html>
612
613=== modified file 'lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt'
614--- lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt 2009-11-20 14:15:34 +0000
615+++ lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt 2010-01-21 15:33:14 +0000
616@@ -8,7 +8,7 @@
617 >>> ff_owner_browser.open(
618 ... 'http://translations.launchpad.dev/firefox/1.0/'
619 ... '+translations-upload')
620- >>> 'Upload either a single file' in ff_owner_browser.contents
621+ >>> 'Here you can upload translation files' in ff_owner_browser.contents
622 True
623
624 The upload consists of a tarball containing templates and/or
625
626=== modified file 'lib/lp/translations/templates/person-translations.pt'
627--- lib/lp/translations/templates/person-translations.pt 2009-09-11 10:52:39 +0000
628+++ lib/lp/translations/templates/person-translations.pt 2010-01-21 15:33:14 +0000
629@@ -45,11 +45,9 @@
630 <tal:reviewer condition="view/person_is_reviewer">
631 <div id="translations-to-review-section" class="portlet">
632 <h2>Translations you need to review</h2>
633- <div class="see-all">
634- <a href="http://help.launchpad.net/Translations/Reviewing">
635- Why is this important?
636- </a>
637- </div>
638+ <p>
639+ By reviewing the following translations, you can help ensure other translators' work is published to software users. (<a href="/+help/reviewing.html" target="help">More about reviewing</a>)
640+ </p>
641 <metal:translations-to-review
642 tal:replace="structure context/@@+translations-to-review-table" />
643 <div class="see-all"
644
645=== modified file 'lib/lp/translations/templates/pofile-upload.pt'
646--- lib/lp/translations/templates/pofile-upload.pt 2009-09-17 13:24:05 +0000
647+++ lib/lp/translations/templates/pofile-upload.pt 2010-01-21 15:33:14 +0000
648@@ -14,7 +14,7 @@
649 <h2>Choose a file to upload</h2>
650 <div class="fields">
651 <input id="file_input" name="file" type="file" />
652- <div class="discreet">This should be a <code>.po</code> file.</div>
653+ <div class="discreet">This should be a <code>.po</code> file and follow the <a href="https://help.launchpad.net/Translations/YourProject/ImportPolicy">translation import guidelines</a>.</div>
654 </div>
655
656 <h2>What kind of upload is this?</h2>
657@@ -29,7 +29,7 @@
658 </label>
659 <p class="discreet">
660 You have exported a PO file from Launchpad, worked on it
661- off-line, and now you want to contribute your updates back.
662+ off-line, and now you want to contribute your updates back. (<a href="/+help/updated-upload.html" target="help">More about updated translations</a>)
663 </p>
664 </span>
665
666@@ -41,7 +41,7 @@
667 </label>
668 <p class="discreet">
669 You want to upload a more recent translation from upstream
670- release or from a source package.
671+ release or from a source package. (<a href="/+help/imported-upload.html" target="help">More about imported translations</a>)
672 </p>
673 </span>
674 </div>
675
676=== modified file 'lib/lp/translations/templates/productseries-translations-settings.pt'
677--- lib/lp/translations/templates/productseries-translations-settings.pt 2009-10-31 12:03:43 +0000
678+++ lib/lp/translations/templates/productseries-translations-settings.pt 2010-01-21 15:33:14 +0000
679@@ -32,13 +32,38 @@
680 <tal:rosetta>
681 <h2>Import translations from branch</h2>
682 <p>
683- You can ask Launchpad to continuously import any translation
684- files (templates and translations) that it finds in
685- <strong><tal:series replace="structure view/series_title">
686- Evolution Series:trunk</tal:series>'s</strong> official Bazaar branch.
687- After the initial import, Launchpad will continue to scan your Bazaar
688- branch for updates to template and translation files.
689- </p>
690+ Launchpad can continuously import translation files (templates and
691+ translations) from <strong><tal:series replace="structure view/series_title">
692+ Evolution Series:trunk</tal:series>'s</strong> official Bazaar branch.
693+ </p>
694+
695+ <p>
696+ Launchpad will make an initial import and then update its data
697+ every time you push a new revision to the branch. There is a
698+ short delay between a push and the files appearing in the import
699+ queue.
700+ (<a tal:attributes="href context/menu:navigation/imports/url">See
701+ the import queue</a>)
702+ </p>
703+
704+ <p>
705+ When preparing the translation files in your Bazaar branch, you must
706+ follow our <a href="https://help.launchpad.net/Translations/YourProject/ImportPolicy"
707+ >translations import policy</a>. At a minimum, your branch must:
708+ </p>
709+
710+ <ul class="bulleted">
711+ <li>
712+ contain at least one <code>.pot</code> file with English strings,
713+ rather than message IDs or another language
714+ </li>
715+ <li>
716+ give each template its own directory (<a
717+ href="/+help/directory-example.html" target="help">see
718+ an example directory layout</a>).
719+ </li>
720+ </ul>
721+
722 <p id="bzr-request-display" class="info sprite">
723 If you only need a one-time import, please request it
724 <a tal:attributes="href view/request_bzr_import_url">here</a>.
725
726=== modified file 'lib/lp/translations/templates/productseries-translations-upload.pt'
727--- lib/lp/translations/templates/productseries-translations-upload.pt 2009-10-31 12:03:43 +0000
728+++ lib/lp/translations/templates/productseries-translations-upload.pt 2010-01-21 15:33:14 +0000
729@@ -16,28 +16,37 @@
730 context/product/@@+portlet-not-using-launchpad"/>
731 </div>
732
733- <p>Before uploading any translations, please read the
734- <a href="https://help.launchpad.net/Translations/ImportPolicy"
735- >translations import policy</a>.
736- </p>
737 <p>
738- Upload either a single file (<code>.pot</code> /
739- <code>.po</code>) or a tar file containing a PO template and a set of PO
740- files (<code>.tar</code>, <code>.tar.gz</code>, <code>.tgz</code> or
741+ Here you can upload translation files for your project, either
742+ individually or as part of a tarball (<code>.tar</code>, <code>.tar.gz</code>, <code>.tgz</code> or
743 <code>.tar.bz2</code>).
744- The files you upload will be reviewed by an admin before they appear in
745- Launchpad.
746- </p>
747- <p>
748- If you want to avoid manual review of your templates and translations,
749- we suggest you set up an
750- <a tal:attributes="
751- href string:${context/fmt:url}/+translations-settings"
752- >automatic</a> import from a bazaar branch instead
753- (<a href="
754- https://help.launchpad.net/Translations/ImportingFromBazaarBranches"
755- >read more</a>).
756- </p>
757+ </p>
758+
759+ <p>
760+ <strong>Note:</strong> it's quicker and easier to <a tal:attributes="
761+ href string:${context/fmt:url}/+translations-settings">import from a
762+ Bazaar branch</a> instead (<a href="/+help/importing-from-bzr.html"
763+ target="help">More about importing from Bazaar</a>)
764+ </p>
765+
766+ <p>
767+ When uploading a tarball or importing from a Bazaar branch, you must
768+ follow our <a href="https://help.launchpad.net/Translations/YourProject/ImportPolicy"
769+ >translations import policy</a>. At a minimum, your tarball or branch must:
770+ </p>
771+
772+ <ul class="bulleted">
773+ <li>contain at least one <code>.pot</code> file with English strings,
774+ rather than message IDs or another language</li>
775+ <li>give each template its own directory (<a href="/+help/directory-example.html"
776+ target="help">see an example directory layout</a>).</li>
777+ </ul>
778+
779+ <p>
780+ Any templates you upload may be reviewed by an admin before they appear
781+ in Launchpad.
782+ </p>
783+
784
785 <form action="+translations-upload" method="post"
786 enctype="multipart/form-data" class="translations">
787
788=== modified file 'lib/lp/translations/templates/translationimportqueue-index.pt'
789--- lib/lp/translations/templates/translationimportqueue-index.pt 2009-09-14 10:35:23 +0000
790+++ lib/lp/translations/templates/translationimportqueue-index.pt 2010-01-21 15:33:14 +0000
791@@ -20,8 +20,15 @@
792
793 <div metal:fill-slot="main">
794 <p id="description">
795- These translation related entries are imported, blocked, deleted or
796- waiting to be imported in Launchpad.
797+ These are translation files that have been imported, blocked, deleted or
798+ are waiting to be imported in Launchpad.
799+ </p>
800+ <p>
801+ If your import is taking longer than you'd expect, <a href="
802+ https://answers.edge.launchpad.net/rosetta/+addquestion"
803+ >contact us</a>.
804+ (<a href="/+help/successful-imports.html" target="help">Learn
805+ more about getting a successful import</a>)
806 <tal:login condition="not:request/lp:person">
807 <a href="+login">Log in</a> to change items in this list.
808 </tal:login>