1
# English (United Kingdom) translation for olive
2
# Copyright (c) 2006 Rosetta Contributors and Canonical Ltd 2006
3
# This file is distributed under the same license as the olive package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
8
"Project-Id-Version: olive\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2011-12-01 11:46+0100\n"
11
"PO-Revision-Date: 2011-11-30 22:58+0000\n"
12
"Last-Translator: Jelmer Vernooij <Unknown>\n"
13
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"X-Launchpad-Export-Date: 2011-12-02 05:55+0000\n"
18
"X-Generator: Launchpad (build 14414)\n"
20
#: ../bazaar-properties.desktop.in.h:1
21
msgid "Bazaar Preferences"
24
#: ../bazaar-properties.desktop.in.h:2
25
msgid "Configure Bazaar settings"
28
#: ../bzr-handle-patch.desktop.in.h:1
29
msgid "Apply Bazaar Bundle"
32
#: ../bzr-handle-patch.desktop.in.h:2
36
#: ../bzr-notify.desktop.in.h:1
37
msgid "Bazaar Notification"
40
#: ../bzr-notify.desktop.in.h:2
41
msgid "Notification Area Icon for Bazaar"
49
#: ../branch.py:49 ../checkout.py:49
50
msgid "Branch location:"
51
msgstr "Branch location:"
53
#: ../branch.py:51 ../checkout.py:50
61
#: ../branch.py:53 ../checkout.py:52
65
#: ../branch.py:54 ../checkout.py:47
66
msgid "Please select a folder"
67
msgstr "Please select a folder"
69
#: ../branch.py:134 ../checkout.py:153
70
msgid "Missing branch location"
71
msgstr "Missing branch location"
73
#: ../branch.py:135 ../checkout.py:154
74
msgid "You must specify a branch location."
75
msgstr "You must specify a branch location."
78
msgid "Branching successful"
79
msgstr "Branching successful"
83
msgid "%d revision(s) branched."
84
msgstr "%d revision(s) branched."
86
#: ../branch.py:183 ../checkout.py:185
100
msgid "_Lightweight checkout"
101
msgstr "_Light-weight checkout"
103
#: ../commands.py:305
104
msgid "Directory does not have a working tree"
105
msgstr "Directory does not have a working tree"
107
#: ../commands.py:306
108
msgid "Operation aborted."
109
msgstr "Operation aborted."
111
#: ../commands.py:410
112
msgid "There are local changes in the branch"
113
msgstr "There are local changes in the branch"
115
#: ../commands.py:411
116
msgid "Please commit or revert the changes before merging."
117
msgstr "Please commit or revert the changes before merging."
132
msgid "renamed and modified"
133
msgstr "renamed and modified"
144
msgid "<b>Commit Message</b>"
148
msgid "_Only commit locally"
149
msgstr "_Only commit locally"
160
msgid "Commit all changes"
164
msgid "Only commit selected changes"
168
msgid "Commit all changes*"
179
#: ../commit.py:443 ../conflicts.py:107
183
#: ../commit.py:445 ../conflicts.py:109
188
msgid "<i>* Cannot select specific files when merging</i>"
192
msgid "Pending Revisions"
203
#: ../commit.py:507 ../search.py:60
207
#. TODO: jam 2007-10-30 The diff label is currently disabled. If we
208
#. decide that we really don't ever want to display it, we should
209
#. actually remove it, and other references to it, along with the
210
#. tests that it is set properly.
212
msgid "Diff for whole tree"
216
#: ../commit.py:542 ../commit.py:626
217
msgid "File commit message"
221
msgid "Global Commit Message"
225
msgid "<b>Global Commit Message</b>"
233
msgid "Commit message for "
237
msgid "Commit cancelled"
241
msgid "Do you want to save your commit messages ?"
245
msgid "Commit with an empty message?"
246
msgstr "Commit with an empty message?"
249
msgid "You can describe your commit intent in the message."
250
msgstr "You can describe your commit intent in the message."
253
msgid "Commit with unknowns?"
254
msgstr "Commit with unknowns?"
257
msgid "Unknown files exist in the working tree. Commit anyway?"
258
msgstr "Unknown files exist in the working tree. Commit anyway?"
261
msgid "Commit with no changes?"
262
msgstr "Commit with no changes?"
266
"There are no changes in the working tree. Do you want to commit anyway?"
269
#: ../conflicts.py:45
270
msgid "External utility:"
271
msgstr "External utility:"
273
#: ../conflicts.py:97
277
#: ../conflicts.py:100
278
msgid "No conflicts in working tree."
279
msgstr "No conflicts in working tree."
281
#: ../conflicts.py:114
282
msgid "path conflict"
283
msgstr "path conflict"
285
#: ../conflicts.py:116
286
msgid "contents conflict"
287
msgstr "contents conflict"
289
#: ../conflicts.py:118
290
msgid "text conflict"
291
msgstr "text conflict"
293
#: ../conflicts.py:120
295
msgstr "duplicate id"
297
#: ../conflicts.py:122
301
#: ../conflicts.py:124
305
#: ../conflicts.py:126
306
msgid "unversioned parent"
307
msgstr "unversioned parent"
309
#: ../conflicts.py:128
310
msgid "missing parent"
311
msgstr "missing parent"
313
#: ../conflicts.py:130
314
msgid "deleting parent"
315
msgstr "deleting parent"
317
#: ../conflicts.py:132
318
msgid "unknown type of conflict"
319
msgstr "unknown type of conflict"
321
#: ../conflicts.py:161
322
msgid "No file was selected"
323
msgstr "No file was selected"
325
#: ../conflicts.py:162
326
msgid "Please select a file from the list."
327
msgstr "Please select a file from the list."
329
#: ../conflicts.py:172
330
msgid "Call to external utility failed"
331
msgstr "Call to external utility failed"
333
#: ../conflicts.py:174
334
msgid "Cannot resolve conflict"
335
msgstr "Cannot resolve conflict"
337
#: ../conflicts.py:175
339
"Only conflicts on the text of files can be resolved with Olive at the "
340
"moment. Content conflicts, on the structure of the tree, need to be resolved "
341
"using the command line."
343
"Only conflicts on the text of files can be resolved with Olive at the "
344
"moment. Content conflicts, on the structure of the tree, need to be resolved "
345
"using the command line."
353
msgid "Wrap _Long Lines"
356
#. No conflicts found.
357
#: ../diff.py:493 ../merge.py:144
358
msgid "Merge successful"
359
msgstr "Merge successful"
361
#: ../diff.py:494 ../merge.py:145
362
msgid "All changes applied successfully."
363
msgstr "All changes applied successfully."
365
#. There are conflicts to be resolved.
366
#: ../diff.py:497 ../merge.py:148
367
msgid "Conflicts encountered"
368
msgstr "Conflicts encountered"
370
#: ../diff.py:498 ../merge.py:149
371
msgid "Please resolve the conflicts manually before committing."
372
msgstr "Please resolve the conflicts manually before committing."
375
msgid "Directory is not a branch"
376
msgstr "Directory is not a branch"
379
msgid "You can perform this action only in a branch."
380
msgstr "You can perform this action only in a branch."
383
msgid "Directory is not a checkout"
384
msgstr "Directory is not a checkout"
387
msgid "You can perform local commit only on checkouts."
388
msgstr "You can perform local commit only on checkouts."
391
msgid "No changes to commit"
392
msgstr "No changes to commit"
395
msgid "Try force commit if you want to commit anyway."
396
msgstr "Try force commit if you want to commit anyway."
399
msgid "No changes to merge"
403
msgid "Merge location is already fully merged in working tree."
407
msgid "Conflicts in tree"
408
msgstr "Conflicts in tree"
411
msgid "You need to resolve the conflicts before committing."
412
msgstr "You need to resolve the conflicts before committing."
415
msgid "Strict commit failed"
416
msgstr "Strict commit failed"
420
"There are unknown files in the working tree.\n"
421
"Please add or delete them."
423
"There are unknown files in the working tree.\n"
424
"Please add or delete them."
427
msgid "Bound branch is out of date"
428
msgstr "Bound branch is out of date"
430
#. FIXME: Really ? Internationalizing %s ?? --vila080505
437
msgid "File not versioned"
438
msgstr "File not versioned"
441
msgid "The selected file is not versioned."
442
msgstr "The selected file is not versioned."
444
#: ../errors.py:56 ../push.py:100
445
msgid "Branches have been diverged"
446
msgstr "Branches have been diverged"
450
"You cannot push if branches have diverged. Use the\n"
451
"overwrite option if you want to push anyway."
453
"You cannot push if branches have diverged. Use the\n"
454
"overwrite option if you want to push anyway."
457
msgid "No diff output"
458
msgstr "No diff output"
461
msgid "The selected file hasn't changed."
462
msgstr "The selected file hasn't changed."
465
msgid "No such revision"
466
msgstr "No such revision"
469
msgid "The revision you specified doesn't exist."
470
msgstr "The revision you specified doesn't exist."
473
msgid "Target already exists"
474
msgstr "Target already exists"
477
msgid "Target directory already exists. Please select another target."
478
msgstr "Target directory already exists. Please select another target."
481
msgid "Directory is already a branch"
482
msgstr "Directory is already a branch"
487
"The current directory (%s) is already a branch.\n"
488
"You can start using it, or initialize another directory."
490
"The current directory (%s) is already a branch.\n"
491
"You can start using it, or initialise another directory."
494
msgid "Branch without a working tree"
495
msgstr "Branch without a working tree"
500
"The current directory (%s)\n"
501
"is a branch without a working tree."
503
"The current directory (%s)\n"
504
"is a branch without a working tree."
507
msgid "Unknown bzr error"
508
msgstr "Unknown bzr error"
511
msgid "Permission denied"
512
msgstr "Permission denied"
515
msgid "permission denied."
516
msgstr "permission denied."
519
msgid "Unknown error"
520
msgstr "Unknown error"
522
#. Create the widgets
523
#: ../initialize.py:46
527
#: ../initialize.py:47
528
msgid "Which directory do you want to initialize?"
529
msgstr "Which directory do you want to initialise?"
531
#: ../initialize.py:49
532
msgid "Current directory"
533
msgstr "Current directory"
535
#: ../initialize.py:51
536
msgid "Create a new directory with the name:"
537
msgstr "Create a new directory with the name:"
539
#: ../initialize.py:87
540
msgid "Directory name not specified"
541
msgstr "Directory name not specified"
543
#: ../initialize.py:88
544
msgid "You should specify a new directory name."
545
msgstr "You should specify a new directory name."
548
msgid "Upgrade to Loom branch?"
552
msgid "Branch is not a loom branch. Upgrade to Loom format?"
564
msgid "Custom Location"
572
msgid "Branch not given"
573
msgstr "Branch not given"
576
msgid "Please specify a branch to merge from."
577
msgstr "Please specify a branch to merge from."
580
msgid "Bazaar command error"
581
msgstr "Bazaar command error"
583
#: ../nautilus-bzr.py:460
587
#: ../nautilus-bzr.py:463
591
#: ../nautilus-bzr.py:469
592
msgid "Last Change Revision:"
595
#: ../nautilus-bzr.py:474
596
msgid "Last Change Author:"
599
#: ../nautilus-bzr.py:515
600
msgid "Push location:"
603
#: ../nautilus-bzr.py:518
604
msgid "Parent location:"
607
#: ../nautilus-bzr.py:521
608
msgid "Bound location:"
611
#: ../nautilus-bzr.py:524
612
msgid "Public location:"
615
#: ../nautilus-bzr.py:527
616
msgid "Submit location:"
619
#: ../nautilus-bzr.py:530
620
msgid "Append revisions only"
623
#. Create the widgets
634
"You cannot push if branches have diverged.\n"
637
"You cannot push if branches have diverged.\n"
641
msgid "Push successful"
642
msgstr "Push successful"
646
msgid "%d revision(s) pushed."
647
msgstr "%d revision(s) pushed."
650
msgid "Non existing parent directory"
651
msgstr "Non existing parent directory"
656
"The parent directory (%s)\n"
657
"doesn't exist. Create?"
659
"The parent directory (%s)\n"
660
"doesn't exist. Create?"
662
#. Create the widgets
663
#: ../revbrowser.py:35
713
msgid "Tags are not supported by this branch format. Please upgrade."
714
msgstr "Tags are not supported by this branch format. Please upgrade."
717
msgid "No tagged revisions in the branch."
718
msgstr "No tagged revisions in the branch."
725
msgid "<b><big>Remove tag?</big></b>"
726
msgstr "<b><big>Remove tag?</big></b>"
730
msgid "Are you sure you want to remove the tag: <b>%s</b>?"
731
msgstr "Are you sure you want to remove the tag: <b>%s</b>?"
733
#. Create the widgets
744
msgstr "Revision ID:"
747
msgid "No tag name specified"
748
msgstr "No tag name specified"
751
msgid "You have to specify the tag's desired name."
752
msgstr "You have to specify the tag's desired name."
added
removed
po/en_GB.po
