← Back to branch summary

~nskaggs/+junk/ubuntu-community-accomplishments

« back to all changes in this revision

Viewing changes to generated/po/en_GB.po

 * Updating translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
generated/po/en_GB.po
7
7
msgstr ""
8
8
"Project-Id-Version: ubuntu-community-accomplishments\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
 
"POT-Creation-Date: 2012-04-26 18:06-0700\n"
 
10
"POT-Creation-Date: 2012-04-26 22:23-0700\n"
11
11
"PO-Revision-Date: 2012-04-10 09:04+0000\n"
12
12
"Last-Translator: hanynowsky <Unknown>\n"
13
13
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
 
"X-Launchpad-Export-Date: 2012-04-28 05:20+0000\n"
 
17
"X-Launchpad-Export-Date: 2012-04-29 05:23+0000\n"
18
18
"X-Generator: Launchpad (build 15149)\n"
19
19
 
20
20
#. ACCOMPLISHMENT: LoCo Team Member ('title' field)
297
297
#. ACCOMPLISHMENT: First Bazaar Branch Merged ('steps' field)
298
298
#. .
299
299
#. ENGLISH TRANSLATION:
300
 
#. You first need to perform a <i>Merge Proposal</i> to propose your branch is merged into another one. Go to the Launchpad page for the branch that you uploaded and you should see a Propose XXXXXXXXXX
 
300
#. You first need to perform a <i>Merge Proposal</i> to propose your branch is merged into another one. Go to the Launchpad page for the branch that you uploaded and you should see a <i>Propose For Merging</i> link. Click it.
 
301
#. In the form choose the branch you want to merge into and fill a detailed description of the change, fix, or feature that you have contributed.
 
302
#. Click the <i>Propose Merge</i> button to submit your contribution.
301
303
#. Wait for one of the target branch's reviewers to review your code, they will either (1) accept your code, and it will be merged, (2) modify your code slightly, and then merge it, or (3) ask for you to make some improvements before they merge it.
302
304
#. If they request changes to be made, make the changes requested and push them into your branch. Then comment back on your proposal to say that you have made the requested changes.
303
305
#. Now wait for the developer to review your changes. When it is merged you will get an email to inform you it was merged in.
306
308
#. Add a series of step-by-step instructions for how to accomplish this trophy.
307
309
#. NOTE: Put each step on a new line
308
310
#. FORMATTING ALLOWED: <i> <strong> <tt>
309
 
#: ../accomplishments/first-branch-merged.c:48
 
311
#: ../accomplishments/first-branch-merged.c:50
310
312
msgid "first-branch-merged_steps"
311
313
msgstr ""
312
314
 
322
324
#. Add tips and best practise for accomplishing this trophy.
323
325
#. NOTE: Put each tip on a new line
324
326
#. FORMATTING ALLOWED: <i> <strong> <tt>
325
 
#: ../accomplishments/first-branch-merged.c:62
 
327
#: ../accomplishments/first-branch-merged.c:64
326
328
msgid "first-branch-merged_tips"
327
329
msgstr ""
328
330
 
335
337
#. Add things the user should not do when working to accomplish this trophy.
336
338
#. NOTE: Put each pitfall on a new line
337
339
#. FORMATTING ALLOWED: <i> <strong> <tt>
338
 
#: ../accomplishments/first-branch-merged.c:73
 
340
#: ../accomplishments/first-branch-merged.c:75
339
341
msgid "first-branch-merged_pitfalls"
340
342
msgstr ""
341
343
 
348
350
#. ----- TRANSLATION INSTRUCTIONS -----
349
351
#. Add related web addresses (don't include a HTML link).
350
352
#. NOTE: Put each URL on a new line
351
 
#: ../accomplishments/first-branch-merged.c:84
 
353
#: ../accomplishments/first-branch-merged.c:86
352
354
msgid "first-branch-merged_links"
353
355
msgstr ""
354
356
 
361
363
#. Add related help resources (e.g. IRC channel names).
362
364
#. NOTE: Put each help resource on a new line
363
365
#. FORMATTING ALLOWED: <i> <strong> <tt>
364
 
#: ../accomplishments/first-branch-merged.c:95
 
366
#: ../accomplishments/first-branch-merged.c:97
365
367
msgid "first-branch-merged_help"
366
368
msgstr ""
367
369