Launchpad itself

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

  1. translations-help-10.1
  2. Merge into devel
Proposed by Matthew Revell
Status: Merged
Approved by: Henning Eggers
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 Approve
Eleanor Berger (community) Approve
Review via email: mp+17032@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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.

Revision history for this message
Matthew Revell (matthew.revell) wrote :

To view the changes, visit:

https://translations.launchpad.dev/evolution/trunk/+translations-upload
https://translations.launchpad.dev/evolution/trunk/+pots/evolution-2.2/pt_BR/+upload
https://translations.launchpad.dev/~name16

Revision history for this message
Eleanor Berger (intellectronica) :
review: Approve
Revision history for this message
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
Revision history for this message
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.

Revision history for this message
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
=== modified file 'lib/lp/bugs/help/tag-search.html'
--- lib/lp/bugs/help/tag-search.html 2009-07-02 16:31:11 +0000
+++ lib/lp/bugs/help/tag-search.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Bug tag search</title>3 <title>Bug tag search</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Bug tag search</h1>12 <h1>Bug tag search</h1>
1313
=== modified file 'lib/lp/code/help/register-branch.html'
--- lib/lp/code/help/register-branch.html 2009-10-02 15:43:47 +0000
+++ lib/lp/code/help/register-branch.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Uploading a branch without registering</title>3 <title>Uploading a branch without registering</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Uploading a branch without registering</h1>12 <h1>Uploading a branch without registering</h1>
1313
=== modified file 'lib/lp/registry/help/home-page-staging-help.html'
--- lib/lp/registry/help/home-page-staging-help.html 2009-09-23 09:28:25 +0000
+++ lib/lp/registry/help/home-page-staging-help.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Staging &mdash; Launchpad's sandbox</title>3 <title>Staging &mdash; Launchpad's sandbox</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Staging &mdash; Launchpad's sandbox</h1>12 <h1>Staging &mdash; Launchpad's sandbox</h1>
1313
=== modified file 'lib/lp/registry/help/import-pgp-key.html'
--- lib/lp/registry/help/import-pgp-key.html 2009-06-09 11:18:47 +0000
+++ lib/lp/registry/help/import-pgp-key.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Importing an OpenPGP key</title>3 <title>Importing an OpenPGP key</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Importing an OpenPGP key</h1>12 <h1>Importing an OpenPGP key</h1>
1313
=== modified file 'lib/lp/registry/help/openid.html'
--- lib/lp/registry/help/openid.html 2009-04-27 21:11:44 +0000
+++ lib/lp/registry/help/openid.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>What is OpenID?</title>3 <title>What is OpenID?</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>What is OpenID?</h1>12 <h1>What is OpenID?</h1>
1313
=== modified file 'lib/lp/registry/help/openpgp-keys.html'
--- lib/lp/registry/help/openpgp-keys.html 2009-10-14 10:00:46 +0000
+++ lib/lp/registry/help/openpgp-keys.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Introducing OpenPGP keys</title>3 <title>Introducing OpenPGP keys</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Introducing OpenPGP keys</h1>12 <h1>Introducing OpenPGP keys</h1>
1313
=== modified file 'lib/lp/registry/help/pgp-key-clearsign.html'
--- lib/lp/registry/help/pgp-key-clearsign.html 2009-06-09 15:08:38 +0000
+++ lib/lp/registry/help/pgp-key-clearsign.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Importing an OpenPGP key</title>3 <title>Importing an OpenPGP key</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Confirming your OpenPGP key</h1>12 <h1>Confirming your OpenPGP key</h1>
1313
=== modified file 'lib/lp/registry/help/verify-downloads.html'
--- lib/lp/registry/help/verify-downloads.html 2009-06-30 15:19:14 +0000
+++ lib/lp/registry/help/verify-downloads.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Verifying a download</title>3 <title>Verifying a download</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Verifying a download</h1>12 <h1>Verifying a download</h1>
1313
=== modified file 'lib/lp/services/inlinehelp/javascript/inlinehelp.js'
--- lib/lp/services/inlinehelp/javascript/inlinehelp.js 2009-10-09 10:38:00 +0000
+++ lib/lp/services/inlinehelp/javascript/inlinehelp.js 2010-01-21 15:33:14 +0000
@@ -27,7 +27,7 @@
27 // Changed from an <input type=button> to a <button> since27 // Changed from an <input type=button> to a <button> since
28 // IE8 doesn't handle style.css's input{visibility:inherit} correctly.28 // IE8 doesn't handle style.css's input{visibility:inherit} correctly.
29 $('help-close').innerHTML =29 $('help-close').innerHTML =
30 '<button id="help-close-btn">Continue</button>';30 '<button id="help-close-btn">Close</button>';
31 forEach(findHelpLinks(), setupHelpTrigger);31 forEach(findHelpLinks(), setupHelpTrigger);
32 initHelpPane();32 initHelpPane();
33}33}
3434
=== modified file 'lib/lp/soyuz/help/ppa-sources-list.html'
--- lib/lp/soyuz/help/ppa-sources-list.html 2009-07-10 10:00:30 +0000
+++ lib/lp/soyuz/help/ppa-sources-list.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>How do I use software from a PPA?</title>3 <title>How do I use software from a PPA?</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>How do I use software from a PPA?</h1>12 <h1>How do I use software from a PPA?</h1>
1313
=== 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-21 15:33:14 +0000
@@ -0,0 +1,53 @@
1<html>
2 <head>
3 <title>Example directory layout for translation files</title>
4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/cssbase/base.css" />
10 </head>
11 <body>
12 <h1>Example directory layout for translation files</h1>
13
14 <p>
15 Each template (<code>.pot</code>) file must be in its own
16 directory. For example:
17 </p>
18
19 <ul>
20 <li>template1/template1.pot
21 <ul>
22 <li>template1/de.po</li>
23 <li>template1/fr.po</li>
24 </ul>
25 </li>
26 <li>template2/template2.pot
27 <ul>
28 <li>template2/de.po</li>
29 <li>template2/fr.po</li>
30 </ul>
31 </li>
32 </ul>
33
34 <p>
35 You should follow Launchpad <a target="_blank"
36 href="https://help.launchpad.net/Translations/ImportPolicy">
37 translation import guidelines</a> to ensure your translation
38 files are imported successfully.
39 </p>
40
41 <h2>.mo-style layouts</h2>
42
43 <p>
44 Launchpad will not import your files if they use a <code>.mo</code>-style
45 directory layout, such as:
46 </p>
47
48 <p>
49 <strong>NOT SUPPORTED:</strong> <code>template1/LC_MESSAGES/de/template1.po</code>
50 </p>
51
52 </body>
53</html>
054
=== modified file 'lib/lp/translations/help/getting-started-for-your-project.html'
--- lib/lp/translations/help/getting-started-for-your-project.html 2009-07-01 20:18:32 +0000
+++ lib/lp/translations/help/getting-started-for-your-project.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Getting started with Launchpad Translations for your project</title>3 <title>Getting started with Launchpad Translations for your project</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Getting started with Launchpad Translations for your project</h1>12 <h1>Getting started with Launchpad Translations for your project</h1>
1313
=== 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-21 15:33:14 +0000
@@ -0,0 +1,61 @@
1<html>
2 <head>
3 <title>Importing a .po file from upstream</title>
4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />
10 </head>
11 <body>
12 <h1>Importing a .po file from upstream</h1>
13
14 <p>
15 Many projects have either full or partial translation efforts
16 outside of Launchpad. If you work on translations for such a
17 project, either its partial translation in Launchpad or its
18 translation for a distribution such as Ubuntu, you should import
19 the externally generated translations from time to time.
20 </p>
21
22 <h2>How Launchpad prioritises imported translation strings</h2>
23
24 <p>To help ensure the best quality translations, Launchpad
25 prioritises translation strings differently depending on where
26 they were made.
27 </p>
28
29 <p>
30 In general, a translation made in Launchpad will take precedence
31 over a translation imported from upstream, meaning that most
32 imports will only overwrite a string if it also was an import.
33 </p>
34
35 <p>
36 There are, though, two important exceptions:
37 </p>
38
39 <ul>
40 <li>
41 The first time that the translation of a string, in a
42 particular language, is imported into Launchpad, it will take
43 precedence over any existing translation made in that language
44 in Launchpad.
45 </li>
46
47 <li>
48 If an imported string matches the translation already made in
49 Launchpad. This means that the translation will now be
50 overwritten by any subsequent imports, if they differ. However,
51 making a change to the translation in Launchpad would reset it
52 to take precedence over imported strings.
53 </li>
54 </ul>
55
56 <p>You should also take a look at Launchpad's <a href="https://help.launchpad.net/Translations/YourProject/ImportPolicy" target="_blank">
57 translation import guidelines</a>.
58 </p>
59
60 </body>
61</html>
062
=== added file 'lib/lp/translations/help/importing-from-bzr.html'
--- lib/lp/translations/help/importing-from-bzr.html 1970-01-01 00:00:00 +0000
+++ lib/lp/translations/help/importing-from-bzr.html 2010-01-21 15:33:14 +0000
@@ -0,0 +1,37 @@
1<html>
2 <head>
3 <title>Importing translation files from a Bazaar branch</title>
4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/cssbase/base.css" />
10 </head>
11 <body>
12 <h1>Importing translation files from a Bazaar branch</h1>
13
14 <p>
15 You can make either one-off or continuous imports of translation
16 files in a Bazaar branch. Which you choose will most likely depend
17 on whether you expect to make frequent updates to either types of
18 file.
19 </p>
20
21 <p>Read more about:</p>
22
23 <ul>
24 <li>
25 <a href="https://help.launchpad.net/Translations/YourProject/ImportingTemplates"
26 target="_blank">importing templates</a> (<code>.pot</code> files)
27 </li>
28
29 <li>
30 <a href="https://help.launchpad.net/Translations/YourProject/ImportingTranslations"
31 target="_blank">importing translations</a> (<code>.po</code> files)
32 </li>
33 </ul>
34
35
36 </body>
37</html>
038
=== added file 'lib/lp/translations/help/new-to-translating.html'
--- lib/lp/translations/help/new-to-translating.html 1970-01-01 00:00:00 +0000
+++ lib/lp/translations/help/new-to-translating.html 2010-01-21 15:33:14 +0000
@@ -0,0 +1,44 @@
1<html>
2 <head>
3 <title>Tips for new translators</title>
4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/cssbase/base.css" />
10 </head>
11 <body>
12 <h1>Tips for new translators</h1>
13
14 <p>
15 If you're new to translating using Launchpad, there are a few things you
16 might find it useful to know.
17 </p>
18
19 <ul>
20 <li>
21 You can <a href="/people/+me/+editlanguages" target="_blank">tell
22 Launchpad which languages you prefer to work in</a>.
23 </li>
24 <li>
25 You can help any of hundreds of projects that use Launchpad to
26 translate their software. Also, you can help translate distributions,
27 such as Ubuntu.
28 </li>
29 <li>
30 Each project/distribution decides how to balance openness with the
31 need for review of translations by selecting a <a
32 href="/+help/permissions-policies.html">permissions policy</a>. For
33 most projects, you'll be able to suggest translations that will then
34 be reviewed by someone else.
35 </li>
36 </ul>
37
38 <p>
39 <a href="https://help.launchpad.net/Translations/StartingToTranslate"
40 target="_blank">read more about translating in Launchpad &gt;</a>
41 </p>
42
43 </body>
44</html>
045
=== added file 'lib/lp/translations/help/reviewing.html'
--- lib/lp/translations/help/reviewing.html 1970-01-01 00:00:00 +0000
+++ lib/lp/translations/help/reviewing.html 2010-01-21 15:33:14 +0000
@@ -0,0 +1,52 @@
1<html>
2 <head>
3 <title>Reviewing translations</title>
4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/cssbase/base.css" />
10 </head>
11 <body>
12 <h1>Reviewing translations</h1>
13
14 <p>
15 <strong>Important:</strong> You can find the translation guidelines
16 you must follow as a reviewer by visiting the appropriate
17 translation group from the <a href="/+groups/" target="_blank">
18 translation group overview page</a>.
19 </p>
20
21 <p>
22 As a member of one or more translation teams, you can help make
23 sure that that the work of other translators makes it into
24 published software.
25 </p>
26
27 <p>
28 One of the quickest ways is to review translated strings in the
29 languages with which you're familiar. The more reviews you do, the
30 more software will be available in the languages you care about.
31 </p>
32
33 <p>
34 To get started, simply follow the review links on your
35 <a href="https://translations.launchpad.net/people/+me/" target="_blank">
36 translation dashboard</a>.
37 </p>
38
39 <p>
40 <strong>Note:</strong> there's a lot more to being a member of
41 a translation team than just reviewing strings. Most translation
42 teams have an active community that works to set standards and
43 divide up work among its members.
44 </p>
45
46 <p>
47 <a href="https://help.launchpad.net/Translations/JoiningATranslationGroup"
48 target="_blank">Learn more about translation groups &gt;</a>
49 </p>
50
51 </body>
52</html>
053
=== added file 'lib/lp/translations/help/successful-imports.html'
--- lib/lp/translations/help/successful-imports.html 1970-01-01 00:00:00 +0000
+++ lib/lp/translations/help/successful-imports.html 2010-01-21 15:33:14 +0000
@@ -0,0 +1,46 @@
1<html>
2 <head>
3 <title>Importing translation files from a Bazaar branch</title>
4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/cssbase/base.css" />
10 </head>
11 <body>
12 <h1>Importing translation files from a Bazaar branch</h1>
13
14 <p>
15 When importing translation files into Launchpad from a tarball or
16 a Bazaar branch, you must follow our <a
17 href="https://help.launchpad.net/Translations/YourProject/ImportPolicy"
18 target="_blank">translations import policy</a>. At a minimum, your
19 tarball or branch must:
20 </p>
21
22 <ul class="bulleted">
23 <li>Contain at least one <code>.pot</code> file with English strings,
24 rather than message IDs or another language. You cannot upload a
25 <code>.po</code> file on its own.</li>
26 <li>Give each template its own directory (<a href="/+help/directory-example.html"
27 >see an example directory layout</a>).</li>
28 </ul>
29
30 <p>The first time you upload a template, it'll usually take a few days
31 before it is approved. However, imports from Bazaar branches are
32 usually approved sooner than imports from tarballs.
33 </p>
34
35 <p>
36 Subsequent updates to templates, and <code>.po</code> files will be
37 approved automatically.
38 </p>
39
40 <p>
41 Following approval, the English strings, and any translations, will be
42 available in Launchpad within one day and usually much sooner.
43 </p>
44
45 </body>
46</html>
047
=== modified file 'lib/lp/translations/help/translation-groups.html'
--- lib/lp/translations/help/translation-groups.html 2009-07-01 11:16:45 +0000
+++ lib/lp/translations/help/translation-groups.html 2010-01-21 15:33:14 +0000
@@ -2,11 +2,11 @@
2 <head>2 <head>
3 <title>Translation groups</title>3 <title>Translation groups</title>
4 <link rel="stylesheet" type="text/css"4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/current/build/cssreset/reset.css" />5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/current/build/cssfonts/fonts.css" />7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/current/build/cssbase/base.css" />9 href="/+icing/yui/cssbase/base.css" />
10 </head>10 </head>
11 <body>11 <body>
12 <h1>Translation groups</h1>12 <h1>Translation groups</h1>
1313
=== added file 'lib/lp/translations/help/updated-upload.html'
--- lib/lp/translations/help/updated-upload.html 1970-01-01 00:00:00 +0000
+++ lib/lp/translations/help/updated-upload.html 2010-01-21 15:33:14 +0000
@@ -0,0 +1,40 @@
1<html>
2 <head>
3 <title>Uploading an updated .po file</title>
4 <link rel="stylesheet" type="text/css"
5 href="/+icing/yui/cssreset/reset.css" />
6 <link rel="stylesheet" type="text/css"
7 href="/+icing/yui/cssfonts/fonts.css" />
8 <link rel="stylesheet" type="text/css"
9 href="/+icing/yui/cssbase/base.css" />
10 </head>
11 <body>
12 <h1>Uploading an updated .po file</h1>
13
14 <p>
15 When you download a .po file from Launchpad, update it, and then
16 upload your edited .po file back to Launchpad, you need to select
17 "Updated translation" on the upload page.
18 </p>
19
20 <p>
21 Launchpad treats the strings in that .po file just the same as if
22 the translations had been made using Launchpad's web interface.
23 </p>
24
25 <h2>Structuring the .po file</h2>
26
27 <p>
28 Launchpad will only accept the .po file if it has the
29 <code>X-Exported-From-Launchpad</code> header. That header is
30 automatically added when you export a .po file from Launchpad.
31 </p>
32
33 <p>
34 The easiest way to ensure Launchpad accepts your .po file as an
35 update is to export a .po file from Launchpad, edit only the
36 strings and then upload it back to Launchpad.
37 </p>
38
39 </body>
40</html>
041
=== modified file 'lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt'
--- lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt 2009-11-20 14:15:34 +0000
+++ lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt 2010-01-21 15:33:14 +0000
@@ -8,7 +8,7 @@
8 >>> ff_owner_browser.open(8 >>> ff_owner_browser.open(
9 ... 'http://translations.launchpad.dev/firefox/1.0/'9 ... 'http://translations.launchpad.dev/firefox/1.0/'
10 ... '+translations-upload')10 ... '+translations-upload')
11 >>> 'Upload either a single file' in ff_owner_browser.contents11 >>> 'Here you can upload translation files' in ff_owner_browser.contents
12 True12 True
1313
14The upload consists of a tarball containing templates and/or14The upload consists of a tarball containing templates and/or
1515
=== modified file 'lib/lp/translations/templates/person-translations.pt'
--- lib/lp/translations/templates/person-translations.pt 2009-09-11 10:52:39 +0000
+++ lib/lp/translations/templates/person-translations.pt 2010-01-21 15:33:14 +0000
@@ -45,11 +45,9 @@
45 <tal:reviewer condition="view/person_is_reviewer">45 <tal:reviewer condition="view/person_is_reviewer">
46 <div id="translations-to-review-section" class="portlet">46 <div id="translations-to-review-section" class="portlet">
47 <h2>Translations you need to review</h2>47 <h2>Translations you need to review</h2>
48 <div class="see-all">48 <p>
49 <a href="http://help.launchpad.net/Translations/Reviewing">49 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>)
50 Why is this important?50 </p>
51 </a>
52 </div>
53 <metal:translations-to-review51 <metal:translations-to-review
54 tal:replace="structure context/@@+translations-to-review-table" />52 tal:replace="structure context/@@+translations-to-review-table" />
55 <div class="see-all"53 <div class="see-all"
5654
=== modified file 'lib/lp/translations/templates/pofile-upload.pt'
--- lib/lp/translations/templates/pofile-upload.pt 2009-09-17 13:24:05 +0000
+++ lib/lp/translations/templates/pofile-upload.pt 2010-01-21 15:33:14 +0000
@@ -14,7 +14,7 @@
14 <h2>Choose a file to upload</h2>14 <h2>Choose a file to upload</h2>
15 <div class="fields">15 <div class="fields">
16 <input id="file_input" name="file" type="file" />16 <input id="file_input" name="file" type="file" />
17 <div class="discreet">This should be a <code>.po</code> file.</div>17 <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>
18 </div>18 </div>
1919
20 <h2>What kind of upload is this?</h2>20 <h2>What kind of upload is this?</h2>
@@ -29,7 +29,7 @@
29 </label>29 </label>
30 <p class="discreet">30 <p class="discreet">
31 You have exported a PO file from Launchpad, worked on it31 You have exported a PO file from Launchpad, worked on it
32 off-line, and now you want to contribute your updates back.32 off-line, and now you want to contribute your updates back. (<a href="/+help/updated-upload.html" target="help">More about updated translations</a>)
33 </p>33 </p>
34 </span>34 </span>
3535
@@ -41,7 +41,7 @@
41 </label>41 </label>
42 <p class="discreet">42 <p class="discreet">
43 You want to upload a more recent translation from upstream43 You want to upload a more recent translation from upstream
44 release or from a source package.44 release or from a source package. (<a href="/+help/imported-upload.html" target="help">More about imported translations</a>)
45 </p>45 </p>
46 </span>46 </span>
47 </div>47 </div>
4848
=== modified file 'lib/lp/translations/templates/productseries-translations-settings.pt'
--- lib/lp/translations/templates/productseries-translations-settings.pt 2009-10-31 12:03:43 +0000
+++ lib/lp/translations/templates/productseries-translations-settings.pt 2010-01-21 15:33:14 +0000
@@ -32,13 +32,38 @@
32 <tal:rosetta>32 <tal:rosetta>
33 <h2>Import translations from branch</h2>33 <h2>Import translations from branch</h2>
34 <p>34 <p>
35 You can ask Launchpad to continuously import any translation35 Launchpad can continuously import translation files (templates and
36 files (templates and translations) that it finds in36 translations) from <strong><tal:series replace="structure view/series_title">
37 <strong><tal:series replace="structure view/series_title">37 Evolution Series:trunk</tal:series>'s</strong> official Bazaar branch.
38 Evolution Series:trunk</tal:series>'s</strong> official Bazaar branch.38 </p>
39 After the initial import, Launchpad will continue to scan your Bazaar39
40 branch for updates to template and translation files.40 <p>
41 </p>41 Launchpad will make an initial import and then update its data
42 every time you push a new revision to the branch. There is a
43 short delay between a push and the files appearing in the import
44 queue.
45 (<a tal:attributes="href context/menu:navigation/imports/url">See
46 the import queue</a>)
47 </p>
48
49 <p>
50 When preparing the translation files in your Bazaar branch, you must
51 follow our <a href="https://help.launchpad.net/Translations/YourProject/ImportPolicy"
52 >translations import policy</a>. At a minimum, your branch must:
53 </p>
54
55 <ul class="bulleted">
56 <li>
57 contain at least one <code>.pot</code> file with English strings,
58 rather than message IDs or another language
59 </li>
60 <li>
61 give each template its own directory (<a
62 href="/+help/directory-example.html" target="help">see
63 an example directory layout</a>).
64 </li>
65 </ul>
66
42 <p id="bzr-request-display" class="info sprite">67 <p id="bzr-request-display" class="info sprite">
43 If you only need a one-time import, please request it68 If you only need a one-time import, please request it
44 <a tal:attributes="href view/request_bzr_import_url">here</a>.69 <a tal:attributes="href view/request_bzr_import_url">here</a>.
4570
=== modified file 'lib/lp/translations/templates/productseries-translations-upload.pt'
--- lib/lp/translations/templates/productseries-translations-upload.pt 2009-10-31 12:03:43 +0000
+++ lib/lp/translations/templates/productseries-translations-upload.pt 2010-01-21 15:33:14 +0000
@@ -16,28 +16,37 @@
16 context/product/@@+portlet-not-using-launchpad"/>16 context/product/@@+portlet-not-using-launchpad"/>
17 </div>17 </div>
1818
19 <p>Before uploading any translations, please read the
20 <a href="https://help.launchpad.net/Translations/ImportPolicy"
21 >translations import policy</a>.
22 </p>
23 <p>19 <p>
24 Upload either a single file (<code>.pot</code> /20 Here you can upload translation files for your project, either
25 <code>.po</code>) or a tar file containing a PO template and a set of PO21 individually or as part of a tarball (<code>.tar</code>, <code>.tar.gz</code>, <code>.tgz</code> or
26 files (<code>.tar</code>, <code>.tar.gz</code>, <code>.tgz</code> or
27 <code>.tar.bz2</code>).22 <code>.tar.bz2</code>).
28 The files you upload will be reviewed by an admin before they appear in23 </p>
29 Launchpad.24
30 </p>25 <p>
31 <p>26 <strong>Note:</strong> it's quicker and easier to <a tal:attributes="
32 If you want to avoid manual review of your templates and translations,27 href string:${context/fmt:url}/+translations-settings">import from a
33 we suggest you set up an28 Bazaar branch</a> instead (<a href="/+help/importing-from-bzr.html"
34 <a tal:attributes="29 target="help">More about importing from Bazaar</a>)
35 href string:${context/fmt:url}/+translations-settings"30 </p>
36 >automatic</a> import from a bazaar branch instead31
37 (<a href="32 <p>
38 https://help.launchpad.net/Translations/ImportingFromBazaarBranches"33 When uploading a tarball or importing from a Bazaar branch, you must
39 >read more</a>).34 follow our <a href="https://help.launchpad.net/Translations/YourProject/ImportPolicy"
40 </p>35 >translations import policy</a>. At a minimum, your tarball or branch must:
36 </p>
37
38 <ul class="bulleted">
39 <li>contain at least one <code>.pot</code> file with English strings,
40 rather than message IDs or another language</li>
41 <li>give each template its own directory (<a href="/+help/directory-example.html"
42 target="help">see an example directory layout</a>).</li>
43 </ul>
44
45 <p>
46 Any templates you upload may be reviewed by an admin before they appear
47 in Launchpad.
48 </p>
49
4150
42 <form action="+translations-upload" method="post"51 <form action="+translations-upload" method="post"
43 enctype="multipart/form-data" class="translations">52 enctype="multipart/form-data" class="translations">
4453
=== modified file 'lib/lp/translations/templates/translationimportqueue-index.pt'
--- lib/lp/translations/templates/translationimportqueue-index.pt 2009-09-14 10:35:23 +0000
+++ lib/lp/translations/templates/translationimportqueue-index.pt 2010-01-21 15:33:14 +0000
@@ -20,8 +20,15 @@
2020
21 <div metal:fill-slot="main">21 <div metal:fill-slot="main">
22 <p id="description">22 <p id="description">
23 These translation related entries are imported, blocked, deleted or23 These are translation files that have been imported, blocked, deleted or
24 waiting to be imported in Launchpad.24 are waiting to be imported in Launchpad.
25 </p>
26 <p>
27 If your import is taking longer than you'd expect, <a href="
28 https://answers.edge.launchpad.net/rosetta/+addquestion"
29 >contact us</a>.
30 (<a href="/+help/successful-imports.html" target="help">Learn
31 more about getting a successful import</a>)
25 <tal:login condition="not:request/lp:person">32 <tal:login condition="not:request/lp:person">
26 <a href="+login">Log in</a> to change items in this list.33 <a href="+login">Log in</a> to change items in this list.
27 </tal:login>34 </tal:login>