« back to all changes in this revision
Viewing changes to po/id.po
- browse files at revision 5361.3.7
- compare with another revision
- download diff
- download tarball
- view history from revision 5361.3.7
- Committer: John Arbash Meinel
- Date: 2010-08-27 17:53:08 UTC
- mfrom: (5390 +trunk)
- mto: This revision was merged to the branch mainline in revision 5393.
- Revision ID: john@arbash-meinel.com-20100827175308-qsvcc11dkfvkrny1
Merge bzr.dev 5390
- files added:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_repository_vf
- po
- files renamed:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- doc/en/release-notes/release-template.txt => NEWS-template.txt
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- files modified:
- .bzrignore
added
removed
po/id.po
1
# Indonesian translation for bzr
2
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2013-07-10 08:51+0000\n"
12
"Last-Translator: dhardiputra <dhardiputra@gmail.com>\n"
13
"Language-Team: Indonesian <id@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=1; plural=0;\n"
18
"X-Launchpad-Export-Date: 2013-07-11 04:30+0000\n"
19
"X-Generator: Launchpad (build 16696)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "melewatkan {0} (larger than {1} of {2} bytes)"
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr "Unstacking"
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Mendorong ke revisi %d."
33
34
#: bzrlib/branch.py:2957
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d tag diperbarui."
39
40
#: bzrlib/branch.py:2960
41
msgid "No new revisions or tags to push."
42
msgstr "Tidak ada revisi baru atau tag."
43
44
#: bzrlib/branch.py:2962
45
msgid "No new revisions to push."
46
msgstr "Tidak ada revisi baru."
47
48
#: bzrlib/branch.py:2982
49
msgid "checked branch {0} format {1}"
50
msgstr "diperiksa cabang {0} format {1}"
51
52
#: bzrlib/branch.py:2985
53
#, python-format
54
msgid "found error:%s"
55
msgstr "ada kesalahan:%s"
56
57
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
58
#, python-format
59
msgid "Ignoring files outside view. View is %s"
60
msgstr "Mengabaikan file di luar viewn. View adalah %s"
61
62
#: bzrlib/builtins.py:260
63
#, python-format
64
msgid "bzr %s --revision takes exactly one revision identifier"
65
msgstr "bzr %s --revisi memakan waktu tepat satu revisi mengidentifikasi"
66
67
#: bzrlib/builtins.py:315
68
msgid "Display status summary."
69
msgstr "Tampilan ringkasan status."
70
71
#: bzrlib/builtins.py:317
72
msgid ""
73
"This reports on versioned and unknown files, reporting them\n"
74
"grouped by state. Possible states are:"
75
msgstr ""
76
77
#: bzrlib/builtins.py:320
78
msgid ""
79
"added\n"
80
" Versioned in the working copy but not in the previous revision."
81
msgstr ""
82
"ditambahkan\n"
83
" Berversi dalam copy pekerjaan tetapi tidak dalam revisi sebelumnya."
84
85
#: bzrlib/builtins.py:323
86
msgid ""
87
"removed\n"
88
" Versioned in the previous revision but removed or deleted\n"
89
" in the working copy."
90
msgstr ""
91
"dihapus\n"
92
" Berversi dalam revisi sebelumnya tapi dihapus atau dihapus\n"
93
" dalam copy pekerjaan."
94
95
#: bzrlib/builtins.py:327
96
msgid ""
97
"renamed\n"
98
" Path of this file changed from the previous revision;\n"
99
" the text may also have changed. This includes files whose\n"
100
" parent directory was renamed."
101
msgstr ""
102
103
#: bzrlib/builtins.py:332
104
msgid ""
105
"modified\n"
106
" Text has changed since the previous revision."
107
msgstr ""
108
"dimodifikasi\n"
109
" Teks telah berubah sejak revisi sebelumnya."
110
111
#: bzrlib/builtins.py:335
112
msgid ""
113
"kind changed\n"
114
" File kind has been changed (e.g. from file to directory)."
115
msgstr ""
116
"jenis berubah\n"
117
" Jenis file yang telah diubah (misalnya dari file ke direktori)."
118
119
#: bzrlib/builtins.py:338
120
msgid ""
121
"unknown\n"
122
" Not versioned and not matching an ignore pattern."
123
msgstr ""
124
"yang tidak dikenal\n"
125
" Tidak diversi dan tidak sesuai pola abaikan."
126
127
#: bzrlib/builtins.py:341
128
msgid ""
129
"Additionally for directories, symlinks and files with a changed\n"
130
"executable bit, Bazaar indicates their type using a trailing\n"
131
"character: '/', '@' or '*' respectively. These decorations can be\n"
132
"disabled using the '--no-classify' option."
133
msgstr ""
134
135
#: bzrlib/builtins.py:346
136
msgid ""
137
"To see ignored files use 'bzr ignored'. For details on the\n"
138
"changes to file texts, use 'bzr diff'."
139
msgstr ""
140
"Untuk melihat file diabaikan menggunakan 'bzr diabaikan'. Untuk rincian "
141
"tentang\n"
142
"perubahan teks berkas, penggunaan 'bzr diff'."
143
144
#: bzrlib/builtins.py:349
145
msgid ""
146
"Note that --short or -S gives status flags for each item, similar\n"
147
"to Subversion's status command. To get output similar to svn -q,\n"
148
"use bzr status -SV."
149
msgstr ""
150
151
#: bzrlib/builtins.py:353
152
msgid ""
153
"If no arguments are specified, the status of the entire working\n"
154
"directory is shown. Otherwise, only the status of the specified\n"
155
"files or directories is reported. If a directory is given, status\n"
156
"is reported for everything inside that directory."
157
msgstr ""
158
"Jika tidak ada argumen yang ditentukan, status seluruh pekerja\n"
159
"direktori ditampilkan. Jika tidak, hanya status tertentu\n"
160
"file atau direktori dilaporkan. Jika direktori yang diberikan, status\n"
161
"dilaporkan untuk segala sesuatu di dalam direktori tersebut."
162
163
#: bzrlib/builtins.py:358
164
msgid ""
165
"Before merges are committed, the pending merge tip revisions are\n"
166
"shown. To see all pending merge revisions, use the -v option.\n"
167
"To skip the display of pending merge information altogether, use\n"
168
"the no-pending option or specify a file/directory."
169
msgstr ""
170
171
#: bzrlib/builtins.py:363
172
msgid ""
173
"To compare the working directory to a specific revision, pass a\n"
174
"single revision to the revision argument."
175
msgstr ""
176
177
#: bzrlib/builtins.py:366
178
msgid ""
179
"To see which files have changed in a specific revision, or between\n"
180
"two revisions, pass a revision range to the revision argument.\n"
181
"This will produce the same results as calling 'bzr diff --summarize'."
182
msgstr ""
183
184
#: bzrlib/builtins.py:375
185
msgid "Use short status indicators."
186
msgstr "Gunakan indikator status."
187
188
#: bzrlib/builtins.py:377
189
msgid "Only show versioned files."
190
msgstr "Hanya menampilkan versi berkas."
191
192
#: bzrlib/builtins.py:379
193
msgid "Don't show pending merges."
194
msgstr "Jangan tampilkan gabungan yang tertunda."
195
196
#: bzrlib/builtins.py:382
197
msgid "Do not mark object type using indicator."
198
msgstr "Jangan menandai jenis objek dengan menggunakan indikator."
199
200
#: bzrlib/builtins.py:397
201
msgid "bzr status --revision takes exactly one or two revision specifiers"
202
msgstr ""
203
"status bzr -- revisi memakan waktu tepat satu atau dua revisi spesifikasi"
204
205
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
206
msgid "You can only supply one of revision_id or --revision"
207
msgstr "Anda hanya dapat menyediakan satu atau revision_id --revisi"
208
209
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
210
msgid "You must supply either --revision or a revision_id"
211
msgstr "Anda harus memberikan baik --revisi atau revision_id"
212
213
#: bzrlib/builtins.py:451
214
#, python-format
215
msgid "Repository %r does not support access to raw revision texts"
216
msgstr "Repositori %r tidak mendukung akses ke teks revisi baku"
217
218
#: bzrlib/builtins.py:462
219
msgid "The repository {0} contains no revision {1}."
220
msgstr "Repositori {0} tidak mengandung revisi {1}."
221
222
#: bzrlib/builtins.py:469
223
msgid "You cannot specify a NULL revision."
224
msgstr "Anda tidak bisa menentukan revisi NULL."
225
226
#: bzrlib/builtins.py:561
227
msgid "Remove the working tree from a given branch/checkout."
228
msgstr ""
229
230
#: bzrlib/builtins.py:563
231
msgid ""
232
"Since a lightweight checkout is little more than a working tree\n"
233
"this will refuse to run against one."
234
msgstr ""
235
236
#: bzrlib/builtins.py:566
237
msgid "To re-create the working tree, use \"bzr checkout\"."
238
msgstr ""
239
240
#: bzrlib/builtins.py:572
241
msgid ""
242
"Remove the working tree even if it has uncommitted or shelved changes."
243
msgstr ""
244
245
#: bzrlib/builtins.py:586
246
msgid "No working tree to remove"
247
msgstr ""
248
249
#: bzrlib/builtins.py:588
250
msgid "You cannot remove the working tree of a remote path"
251
msgstr ""
252
253
#: bzrlib/builtins.py:597
254
msgid "You cannot remove the working tree from a lightweight checkout"
255
msgstr ""
256
257
#: bzrlib/builtins.py:637
258
msgid ""
259
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
260
"instead. Use \"--force\" if you are sure you want to reset the working tree."
261
msgstr ""
262
263
#: bzrlib/builtins.py:648
264
msgid ""
265
", the header appears corrupt, try passing -r -1 to set the state to the last "
266
"commit"
267
msgstr ""
268
269
#: bzrlib/builtins.py:652
270
msgid "failed to reset the tree state{0}"
271
msgstr ""
272
273
#: bzrlib/builtins.py:656
274
msgid "Show current revision number."
275
msgstr "Tampilkan nomor revisi saat ini."
276
277
#: bzrlib/builtins.py:658
278
msgid "This is equal to the number of revisions on this branch."
279
msgstr "Ini sama dengan jumlah revisi pada cabang ini."
280
281
#: bzrlib/builtins.py:671
282
msgid "--tree and --revision can not be used together"
283
msgstr "--tree dan --revisi tidak dapat digunakan bersama-sama"
284
285
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
286
msgid "Tags can only be placed on a single revision, not on a range"
287
msgstr "Tag hanya dapat ditempatkan pada revisi tunggal, bukan pada kisaran"
288
289
#: bzrlib/builtins.py:712
290
msgid "Show revno of working tree."
291
msgstr ""
292
293
#: bzrlib/builtins.py:760
294
msgid "Add specified files or directories."
295
msgstr "Tambahkan file tertentu atau direktori."
296
297
#: bzrlib/builtins.py:762
298
msgid ""
299
"In non-recursive mode, all the named items are added, regardless\n"
300
"of whether they were previously ignored. A warning is given if\n"
301
"any of the named files are already versioned."
302
msgstr ""
303
304
#: bzrlib/builtins.py:766
305
msgid ""
306
"In recursive mode (the default), files are treated the same way\n"
307
"but the behaviour for directories is different. Directories that\n"
308
"are already versioned do not give a warning. All directories,\n"
309
"whether already versioned or not, are searched for files or\n"
310
"subdirectories that are neither versioned or ignored, and these\n"
311
"are added. This search proceeds recursively into versioned\n"
312
"directories. If no names are given '.' is assumed."
313
msgstr ""
314
315
#: bzrlib/builtins.py:774
316
msgid ""
317
"A warning will be printed when nested trees are encountered,\n"
318
"unless they are explicitly ignored."
319
msgstr ""
320
321
#: bzrlib/builtins.py:777
322
msgid ""
323
"Therefore simply saying 'bzr add' will version all files that\n"
324
"are currently unknown."
325
msgstr ""
326
327
#: bzrlib/builtins.py:780
328
msgid ""
329
"Adding a file whose parent directory is not versioned will\n"
330
"implicitly add the parent, and so on up to the root. This means\n"
331
"you should never need to explicitly add a directory, they'll just\n"
332
"get added when you add a file in the directory."
333
msgstr ""
334
335
#: bzrlib/builtins.py:785
336
msgid ""
337
"--dry-run will show which files would be added, but not actually\n"
338
"add them."
339
msgstr ""
340
"- dry-run akan menunjukkan file mana yang akan ditambahkan, tapi tidak benar-"
341
"benar\n"
342
"menambahkannya."
343
344
#: bzrlib/builtins.py:788
345
msgid ""
346
"--file-ids-from will try to use the file ids from the supplied path.\n"
347
"It looks up ids trying to find a matching parent directory with the\n"
348
"same filename, and then by pure path. This option is rarely needed\n"
349
"but can be useful when adding the same logical file into two\n"
350
"branches that will be merged later (without showing the two different\n"
351
"adds as a conflict). It is also useful when merging another project\n"
352
"into a subdirectory of this one."
353
msgstr ""
354
355
#: bzrlib/builtins.py:796
356
msgid ""
357
"Any files matching patterns in the ignore list will not be added\n"
358
"unless they are explicitly mentioned."
359
msgstr ""
360
"Setiap file pola yang cocok dalam daftar diabaikan tidak akan ditambahkan\n"
361
"kecuali mereka secara eksplisit disebutkan."
362
363
#: bzrlib/builtins.py:799
364
msgid ""
365
"In recursive mode, files larger than the configuration option \n"
366
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
367
"to file size."
368
msgstr ""
369
370
#: bzrlib/builtins.py:806
371
msgid "Don't recursively add the contents of directories."
372
msgstr "Jangan menambahkan isi dari direktori."
373
374
#: bzrlib/builtins.py:813
375
msgid "Lookup file ids from this tree."
376
msgstr ""
377
378
#: bzrlib/builtins.py:849
379
msgid "ignored {0} matching \"{1}\"\n"
380
msgstr "diabaikan {0} pencocokan \"{1}\"\n"
381
382
#: bzrlib/builtins.py:854
383
msgid "Create a new versioned directory."
384
msgstr "Buat direktori versi baru."
385
386
#: bzrlib/builtins.py:856
387
msgid "This is equivalent to creating the directory and then adding it."
388
msgstr ""
389
"Hal ini setara dengan menciptakan direktori dan kemudian menambahkannya."
390
391
#: bzrlib/builtins.py:863
392
msgid "No error if existing, make parent directories as needed."
393
msgstr "Jika tidak ada kesalahan, buat direktori induk yang diperlukan."
394
395
#: bzrlib/builtins.py:897
396
#, python-format
397
msgid "added %s\n"
398
msgstr "menambahkan %s\n"
399
400
#: bzrlib/builtins.py:939
401
#, python-format
402
msgid "invalid kind %r specified"
403
msgstr ""
404
405
#: bzrlib/builtins.py:976
406
msgid "Move or rename a file."
407
msgstr "Memindahkan atau mengganti nama file."
408
409
#: bzrlib/builtins.py:978
410
msgid " bzr mv SOURCE... DESTINATION"
411
msgstr " bzr mv SUMBER... TUJUAN"
412
413
#: bzrlib/builtins.py:980
414
msgid ""
415
"If the last argument is a versioned directory, all the other names\n"
416
"are moved into it. Otherwise, there must be exactly two arguments\n"
417
"and the file is changed to a new name."
418
msgstr ""
419
420
#: bzrlib/builtins.py:984
421
msgid ""
422
"If OLDNAME does not exist on the filesystem but is versioned and\n"
423
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
424
"assumes that the file has been manually moved and only updates\n"
425
"its internal inventory to reflect that change.\n"
426
"The same is valid when moving many SOURCE files to a DESTINATION."
427
msgstr ""
428
429
#: bzrlib/builtins.py:990
430
msgid "Files cannot be moved between branches."
431
msgstr "File tidak dapat dipindahkan antar cabang."
432
433
#: bzrlib/builtins.py:997
434
msgid ""
435
"Move only the bzr identifier of the file, because the file has already been "
436
"moved."
437
msgstr ""
438
"Bergerak hanya identifier bzr file, karena file tersebut telah dipindahkan."
439
440
#: bzrlib/builtins.py:999
441
msgid "Automatically guess renames."
442
msgstr "Secara otomatis mengganti nama."
443
444
#: bzrlib/builtins.py:1000
445
msgid "Avoid making changes when guessing renames."
446
msgstr "Hindari membuat perubahan ketika menebak mengganti nama."
447
448
#: bzrlib/builtins.py:1009
449
msgid "--dry-run requires --auto."
450
msgstr "--dry-run membutuhkan --auto."
451
452
#: bzrlib/builtins.py:1013
453
msgid "missing file argument"
454
msgstr "argumen file hilang"
455
456
#: bzrlib/builtins.py:1017
457
msgid "can not move root of branch"
458
msgstr ""
459
460
#: bzrlib/builtins.py:1023
461
msgid "Only one path may be specified to --auto."
462
msgstr "Hanya satu jalur dapat ditentukan untuk --auto."
463
464
#: bzrlib/builtins.py:1026
465
msgid "--after cannot be specified with --auto."
466
msgstr "--after tidak dapat ditentukan dengan --auto."
467
468
#: bzrlib/builtins.py:1062
469
msgid "to mv multiple files the destination must be a versioned directory"
470
msgstr "untuk mv beberapa file tujuan harus direktori berversi"
471
472
#: bzrlib/builtins.py:1114
473
msgid "Turn this branch into a mirror of another branch."
474
msgstr ""
475
476
#: bzrlib/builtins.py:1116
477
msgid ""
478
"By default, this command only works on branches that have not diverged.\n"
479
"Branches are considered diverged if the destination branch's most recent \n"
480
"commit is one that has not been merged (directly or indirectly) into the \n"
481
"parent."
482
msgstr ""
483
484
#: bzrlib/builtins.py:1121
485
msgid ""
486
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
487
"from one into the other. Once one branch has merged, the other should\n"
488
"be able to pull it again."
489
msgstr ""
490
491
#: bzrlib/builtins.py:1125
492
msgid ""
493
"If you want to replace your local changes and just want your branch to\n"
494
"match the remote one, use pull --overwrite. This will work even if the two\n"
495
"branches have diverged."
496
msgstr ""
497
498
#: bzrlib/builtins.py:1129
499
msgid ""
500
"If there is no default location set, the first pull will set it (use\n"
501
"--no-remember to avoid setting it). After that, you can omit the\n"
502
"location to use the default. To change the default, use --remember. The\n"
503
"value will only be saved if the remote location can be accessed."
504
msgstr ""
505
506
#: bzrlib/builtins.py:1134
507
msgid ""
508
"The --verbose option will display the revisions pulled using the log_format\n"
509
"configuration option. You can use a different format by overriding it with\n"
510
"-Olog_format=<other_format>."
511
msgstr ""
512
513
#: bzrlib/builtins.py:1138
514
msgid ""
515
"Note: The location can be specified either in the form of a branch,\n"
516
"or in the form of a path to a file containing a merge directive generated\n"
517
"with bzr send."
518
msgstr ""
519
520
#: bzrlib/builtins.py:1146
521
msgid "Show logs of pulled revisions."
522
msgstr "Tampilkan log revisi ditarik."
523
524
#: bzrlib/builtins.py:1148
525
msgid ""
526
"Branch to pull into, rather than the one containing the working directory."
527
msgstr ""
528
529
#: bzrlib/builtins.py:1151
530
msgid ""
531
"Perform a local pull in a bound branch. Local pulls are not applied to the "
532
"master branch."
533
msgstr ""
534
535
#: bzrlib/builtins.py:1189
536
msgid "Need working tree for --show-base."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1205
540
msgid "No pull location known or specified."
541
msgstr "Tidak ada lokasi yang diketahui atau ditentukan."
542
543
#: bzrlib/builtins.py:1211
544
#, python-format
545
msgid "Using saved parent location: %s\n"
546
msgstr "Using saved parent location: %s\n"
547
548
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
549
msgid "Cannot use -r with merge directives or bundles"
550
msgstr "Tidak dapat menggunakan -r arahan merge atau bundel"
551
552
#: bzrlib/builtins.py:1261
553
msgid "Update a mirror of this branch."
554
msgstr "Perbarui cermin dari cabang ini."
555
556
#: bzrlib/builtins.py:1263
557
msgid ""
558
"The target branch will not have its working tree populated because this\n"
559
"is both expensive, and is not supported on remote file systems."
560
msgstr ""
561
562
#: bzrlib/builtins.py:1266
563
msgid ""
564
"Some smart servers or protocols *may* put the working tree in place in\n"
565
"the future."
566
msgstr ""
567
568
#: bzrlib/builtins.py:1269
569
msgid ""
570
"This command only works on branches that have not diverged. Branches are\n"
571
"considered diverged if the destination branch's most recent commit is one\n"
572
"that has not been merged (directly or indirectly) by the source branch."
573
msgstr ""
574
575
#: bzrlib/builtins.py:1273
576
msgid ""
577
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
578
"the other branch completely, discarding its unmerged changes."
579
msgstr ""
580
581
#: bzrlib/builtins.py:1276
582
msgid ""
583
"If you want to ensure you have the different changes in the other branch,\n"
584
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
585
"After that you will be able to do a push without '--overwrite'."
586
msgstr ""
587
588
#: bzrlib/builtins.py:1280
589
msgid ""
590
"If there is no default push location set, the first push will set it (use\n"
591
"--no-remember to avoid setting it). After that, you can omit the\n"
592
"location to use the default. To change the default, use --remember. The\n"
593
"value will only be saved if the remote location can be accessed."
594
msgstr ""
595
596
#: bzrlib/builtins.py:1285
597
msgid ""
598
"The --verbose option will display the revisions pushed using the log_format\n"
599
"configuration option. You can use a different format by overriding it with\n"
600
"-Olog_format=<other_format>."
601
msgstr ""
602
603
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
604
msgid ""
605
"Branch to push from, rather than the one containing the working directory."
606
msgstr ""
607
608
#: bzrlib/builtins.py:1299
609
msgid ""
610
"By default push will fail if the target directory exists, but does not "
611
"already have a control directory. This flag will allow push to proceed."
612
msgstr ""
613
614
#: bzrlib/builtins.py:1304
615
msgid ""
616
"Create a stacked branch that references the public location of the parent "
617
"branch."
618
msgstr ""
619
620
#: bzrlib/builtins.py:1307
621
msgid ""
622
"Create a stacked branch that refers to another branch for the commit "
623
"history. Only the work not present in the referenced branch is included in "
624
"the branch created."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
628
msgid ""
629
"Refuse to push if there are uncommitted changes in the working tree, --no-"
630
"strict disables the check."
631
msgstr ""
632
633
#: bzrlib/builtins.py:1315
634
msgid "Don't populate the working tree, even for protocols that support it."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1318
638
msgid "Overwrite tags only."
639
msgstr "Timpa tag saja."
640
641
#: bzrlib/builtins.py:1369
642
msgid "Could not determine branch to refer to."
643
msgstr "Tidak dapat menentukan cabang untuk merujuk."
644
645
#: bzrlib/builtins.py:1378
646
#, python-format
647
msgid ""
648
"No push location known or specified. To push to the parent branch (at %s), "
649
"use 'bzr push :parent'."
650
msgstr ""
651
652
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
653
msgid "No push location known or specified."
654
msgstr "Tidak ada lokasi mendorong diketahui atau ditentukan."
655
656
#: bzrlib/builtins.py:1388
657
#, python-format
658
msgid "Using saved push location: %s"
659
msgstr "Menggunakan lokasi mendorong disimpan: %s"
660
661
#: bzrlib/builtins.py:1398
662
msgid "Create a new branch that is a copy of an existing branch."
663
msgstr ""
664
665
#: bzrlib/builtins.py:1400
666
msgid ""
667
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
668
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
669
"./bar.\n"
670
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
671
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
672
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
673
"create ./foo-bar."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1407
677
msgid ""
678
"To retrieve the branch as of a particular revision, supply the --revision\n"
679
"parameter, as in \"branch foo/bar -r 5\"."
680
msgstr ""
681
682
#: bzrlib/builtins.py:1410
683
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1420
687
msgid "Create a branch without a working-tree."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1422
691
msgid "Switch the checkout in the current directory to the new branch."
692
msgstr ""
693
694
#: bzrlib/builtins.py:1425
695
msgid ""
696
"Create a stacked branch referring to the source branch. The new branch will "
697
"depend on the availability of the source branch for all operations."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1429
701
msgid "Do not use a shared repository, even if available."
702
msgstr "Jangan menggunakan repositori, bahkan jika tersedia."
703
704
#: bzrlib/builtins.py:1431
705
msgid ""
706
"By default branch will fail if the target directory exists, but does not "
707
"already have a control directory. This flag will allow branch to proceed."
708
msgstr ""
709
710
#: bzrlib/builtins.py:1436
711
msgid "Bind new branch to from location."
712
msgstr ""
713
714
#: bzrlib/builtins.py:1483
715
#, python-format
716
msgid "Target directory \"%s\" already exists."
717
msgstr ""
718
719
#: bzrlib/builtins.py:1495
720
#, python-format
721
msgid "Parent of \"%s\" does not exist."
722
msgstr ""
723
724
#: bzrlib/builtins.py:1514
725
msgid "The branch {0} has no revision {1}."
726
msgstr ""
727
728
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
729
#, python-format
730
msgid "Created new stacked branch referring to %s."
731
msgstr ""
732
733
#: bzrlib/builtins.py:1533
734
#, python-format
735
msgid "Branched %d revision."
736
msgid_plural "Branched %d revisions."
737
msgstr[0] ""
738
msgstr[1] ""
739
740
#: bzrlib/builtins.py:1538
741
#, python-format
742
msgid "New branch bound to %s"
743
msgstr ""
744
745
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
746
#, python-format
747
msgid "Switched to branch: %s"
748
msgstr ""
749
750
#: bzrlib/builtins.py:1548
751
msgid "List the branches available at the current location."
752
msgstr ""
753
754
#: bzrlib/builtins.py:1550
755
msgid ""
756
"This command will print the names of all the branches at the current\n"
757
"location."
758
msgstr ""
759
760
#: bzrlib/builtins.py:1557
761
msgid ""
762
"Recursively scan for branches rather than just looking in the specified "
763
"location."
764
msgstr ""
765
766
#: bzrlib/builtins.py:1586
767
msgid "(default)"
768
msgstr "(Standar)"
769
770
#: bzrlib/builtins.py:1598
771
msgid "Create a new checkout of an existing branch."
772
msgstr ""
773
774
#: bzrlib/builtins.py:1600
775
msgid ""
776
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
777
"for\n"
778
"the branch found in '.'. This is useful if you have removed the working "
779
"tree\n"
780
"or if it was never created - i.e. if you pushed the branch to its current\n"
781
"location using SFTP."
782
msgstr ""
783
784
#: bzrlib/builtins.py:1605
785
msgid ""
786
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
787
"will\n"
788
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
789
"./bar.\n"
790
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
791
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
792
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
793
"create ./foo-bar."
794
msgstr ""
795
796
#: bzrlib/builtins.py:1612
797
msgid ""
798
"To retrieve the branch as of a particular revision, supply the --revision\n"
799
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
800
"immediately\n"
801
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
802
"old\n"
803
"code.)"
804
msgstr ""
805
806
#: bzrlib/builtins.py:1622
807
msgid ""
808
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
809
"the branch for every operation. Normal checkouts can perform common "
810
"operations like diff and status without such access, and also support local "
811
"commits."
812
msgstr ""
813
814
#: bzrlib/builtins.py:1629
815
msgid "Get file contents from this tree."
816
msgstr ""
817
818
#: bzrlib/builtins.py:1631
819
msgid "Hard-link working tree files where possible."
820
msgstr ""
821
822
#: bzrlib/builtins.py:1672
823
msgid ""
824
"Show list of renamed files.\n"
825
" "
826
msgstr ""
827
828
#: bzrlib/builtins.py:1700
829
msgid "Update a working tree to a new revision."
830
msgstr ""
831
832
#: bzrlib/builtins.py:1702
833
msgid ""
834
"This will perform a merge of the destination revision (the tip of the\n"
835
"branch, or the specified revision) into the working tree, and then make\n"
836
"that revision the basis revision for the working tree. "
837
msgstr ""
838
839
#: bzrlib/builtins.py:1706
840
msgid ""
841
"You can use this to visit an older revision, or to update a working tree\n"
842
"that is out of date from its branch."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1709
846
msgid ""
847
"If there are any uncommitted changes in the tree, they will be carried\n"
848
"across and remain as uncommitted changes after the update. To discard\n"
849
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
850
"with the changes brought in by the change in basis revision."
851
msgstr ""
852
853
#: bzrlib/builtins.py:1714
854
msgid ""
855
"If the tree's branch is bound to a master branch, bzr will also update\n"
856
"the branch from the master."
857
msgstr ""
858
859
#: bzrlib/builtins.py:1717
860
msgid ""
861
"You cannot update just a single file or directory, because each Bazaar\n"
862
"working tree has just a single basis revision. If you want to restore a\n"
863
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
864
"update'. If you want to restore a file to its state in a previous\n"
865
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
866
"out the old content of that file to a new location."
867
msgstr ""
868
869
#: bzrlib/builtins.py:1724
870
msgid ""
871
"The 'dir' argument, if given, must be the location of the root of a\n"
872
"working tree to update. By default, the working tree that contains the \n"
873
"current working directory is used."
874
msgstr ""
875
876
#: bzrlib/builtins.py:1740
877
msgid "bzr update --revision takes exactly one revision"
878
msgstr ""
879
880
#: bzrlib/builtins.py:1748
881
msgid "bzr update can only update a whole tree, not a file or subdirectory"
882
msgstr ""
883
884
#: bzrlib/builtins.py:1779
885
msgid "Tree is up to date at revision {0} of branch {1}"
886
msgstr ""
887
888
#: bzrlib/builtins.py:1795
889
#, python-format
890
msgid ""
891
"branch has no revision %s\n"
892
"bzr update --revision only works for a revision in the branch history"
893
msgstr ""
894
895
#: bzrlib/builtins.py:1801
896
msgid "Updated to revision {0} of branch {1}"
897
msgstr ""
898
899
#: bzrlib/builtins.py:1805
900
msgid ""
901
"Your local commits will now show as pending merges with 'bzr status', and "
902
"can be committed with 'bzr commit'."
903
msgstr ""
904
905
#: bzrlib/builtins.py:1814
906
msgid "Show information about a working tree, branch or repository."
907
msgstr ""
908
909
#: bzrlib/builtins.py:1816
910
msgid ""
911
"This command will show all known locations and formats associated to the\n"
912
"tree, branch or repository."
913
msgstr ""
914
915
#: bzrlib/builtins.py:1819
916
msgid ""
917
"In verbose mode, statistical information is included with each report.\n"
918
"To see extended statistic information, use a verbosity level of 2 or\n"
919
"higher by specifying the verbose option multiple times, e.g. -vv."
920
msgstr ""
921
922
#: bzrlib/builtins.py:1823
923
msgid "Branches and working trees will also report any missing revisions."
924
msgstr ""
925
926
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
927
#: bzrlib/builtins.py:6466
928
msgid ":Examples:"
929
msgstr ":Misal:"
930
931
#: bzrlib/builtins.py:1827
932
msgid " Display information on the format and related locations:"
933
msgstr ""
934
935
#: bzrlib/builtins.py:1829
936
msgid " bzr info"
937
msgstr ""
938
939
#: bzrlib/builtins.py:1831
940
msgid ""
941
" Display the above together with extended format information and\n"
942
" basic statistics (like the number of files in the working tree and\n"
943
" number of revisions in the branch and repository):"
944
msgstr ""
945
946
#: bzrlib/builtins.py:1835
947
msgid " bzr info -v"
948
msgstr ""
949
950
#: bzrlib/builtins.py:1837
951
msgid " Display the above together with number of committers to the branch:"
952
msgstr ""
953
954
#: bzrlib/builtins.py:1839
955
msgid " bzr info -vv"
956
msgstr ""
957
958
#: bzrlib/builtins.py:1858
959
msgid "Remove files or directories."
960
msgstr "Hapus file atau direktori."
961
962
#: bzrlib/builtins.py:1860
963
msgid ""
964
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
965
"delete them if they can easily be recovered using revert otherwise they\n"
966
"will be backed up (adding an extension of the form .~#~). If no options or\n"
967
"parameters are given Bazaar will scan for files that are being tracked by\n"
968
"Bazaar but missing in your tree and stop tracking them for you."
969
msgstr ""
970
971
#: bzrlib/builtins.py:1868
972
msgid "Only remove files that have never been committed."
973
msgstr "Hanya menghapus file yang belum pernah dilakukan."
974
975
#: bzrlib/builtins.py:1870
976
msgid "The file deletion mode to be used."
977
msgstr "Modus penghapusan file yang akan digunakan."
978
979
#: bzrlib/builtins.py:1871
980
msgid "Deletion Strategy"
981
msgstr "Hapus Strategi"
982
983
#: bzrlib/builtins.py:1872
984
msgid "Backup changed files (default)."
985
msgstr ""
986
987
#: bzrlib/builtins.py:1873
988
msgid "Delete from bzr but leave the working copy."
989
msgstr ""
990
991
#: bzrlib/builtins.py:1874
992
msgid "Don't backup changed files."
993
msgstr ""
994
995
#: bzrlib/builtins.py:1875
996
msgid ""
997
"Delete all the specified files, even if they can not be recovered and even "
998
"if they are non-empty directories. (deprecated, use no-backup)"
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1884
1002
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1901
1006
msgid "No matching files."
1007
msgstr "Tidak ada file yang cocok."
1008
1009
#: bzrlib/builtins.py:1962
1010
msgid "Reconcile bzr metadata in a branch."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1964
1014
msgid ""
1015
"This can correct data mismatches that may have been caused by\n"
1016
"previous ghost operations or bzr upgrades. You should only\n"
1017
"need to run this command if 'bzr check' or a bzr developer\n"
1018
"advises you to run it."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1969
1022
msgid ""
1023
"If a second branch is provided, cross-branch reconciliation is\n"
1024
"also attempted, which will check that data like the tree root\n"
1025
"id which was not present in very early bzr versions is represented\n"
1026
"correctly in both branches."
1027
msgstr ""
1028
1029
#: bzrlib/builtins.py:1974
1030
msgid ""
1031
"At the same time it is run it may recompress data resulting in\n"
1032
"a potential saving in disk space or performance gain."
1033
msgstr ""
1034
1035
#: bzrlib/builtins.py:1977
1036
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1037
msgstr ""
1038
1039
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1040
msgid ""
1041
"Format for the bzr 2.0 series.\n"
1042
"Uses group-compress storage.\n"
1043
"Provides rich roots which are a one-way transition.\n"
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1047
msgid ""
1048
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1049
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1053
msgid "The 2a format with experimental support for colocated branches.\n"
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:2045
1057
msgid "Make a directory into a versioned branch."
1058
msgstr ""
1059
1060
#: bzrlib/builtins.py:2047
1061
msgid ""
1062
"Use this to create an empty branch, or before importing an\n"
1063
"existing project."
1064
msgstr ""
1065
1066
#: bzrlib/builtins.py:2050
1067
msgid ""
1068
"If there is a repository in a parent directory of the location, then\n"
1069
"the history of the branch will be stored in the repository. Otherwise\n"
1070
"init creates a standalone branch which carries its own history\n"
1071
"in the .bzr directory."
1072
msgstr ""
1073
1074
#: bzrlib/builtins.py:2055
1075
msgid ""
1076
"If there is already a branch at the location but it has no working tree,\n"
1077
"the tree can be populated with 'bzr checkout'."
1078
msgstr ""
1079
1080
#: bzrlib/builtins.py:2058
1081
msgid "Recipe for importing a tree of files::"
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:2060
1085
msgid ""
1086
" cd ~/project\n"
1087
" bzr init\n"
1088
" bzr add .\n"
1089
" bzr status\n"
1090
" bzr commit -m \"imported project\""
1091
msgstr ""
1092
1093
#: bzrlib/builtins.py:2071
1094
msgid ""
1095
"Create the path leading up to the branch if it does not already exist."
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:2074
1099
msgid "Specify a format for this branch. See \"help formats\"."
1100
msgstr ""
1101
1102
#: bzrlib/builtins.py:2082
1103
msgid ""
1104
"Never change revnos or the existing log. Append revisions to it only."
1105
msgstr ""
1106
1107
#: bzrlib/builtins.py:2085
1108
msgid "Create a branch without a working tree."
1109
msgstr ""
1110
1111
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1112
#, python-format
1113
msgid ""
1114
"Parent directory of %s does not exist.\n"
1115
"You may supply --create-prefix to create all leading parent directories."
1116
msgstr ""
1117
1118
#: bzrlib/builtins.py:2139
1119
msgid ""
1120
"This branch format cannot be set to append-revisions-only. Try --default."
1121
msgstr ""
1122
1123
#: bzrlib/builtins.py:2150
1124
msgid "Created a {0} (format: {1})\n"
1125
msgstr ""
1126
1127
#: bzrlib/builtins.py:2159
1128
#, python-format
1129
msgid "Using shared repository: %s\n"
1130
msgstr ""
1131
1132
#: bzrlib/builtins.py:2163
1133
msgid "Create a shared repository for branches to share storage space."
1134
msgstr ""
1135
1136
#: bzrlib/builtins.py:2165
1137
msgid ""
1138
"New branches created under the repository directory will store their\n"
1139
"revisions in the repository, not in the branch directory. For branches\n"
1140
"with shared history, this reduces the amount of storage needed and \n"
1141
"speeds up the creation of new branches."
1142
msgstr ""
1143
1144
#: bzrlib/builtins.py:2170
1145
msgid ""
1146
"If the --no-trees option is given then the branches in the repository\n"
1147
"will not have working trees by default. They will still exist as \n"
1148
"directories on disk, but they will not have separate copies of the \n"
1149
"files at a certain revision. This can be useful for repositories that\n"
1150
"store branches which are interacted with through checkouts or remote\n"
1151
"branches, such as on a server."
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2177
1155
msgid ""
1156
":Examples:\n"
1157
" Create a shared repository holding just branches::"
1158
msgstr ""
1159
1160
#: bzrlib/builtins.py:2180
1161
msgid ""
1162
" bzr init-repo --no-trees repo\n"
1163
" bzr init repo/trunk"
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2183
1167
msgid " Make a lightweight checkout elsewhere::"
1168
msgstr ""
1169
1170
#: bzrlib/builtins.py:2185
1171
msgid ""
1172
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1173
" cd trunk-checkout\n"
1174
" (add files here)"
1175
msgstr ""
1176
1177
#: bzrlib/builtins.py:2193
1178
msgid ""
1179
"Specify a format for this repository. See \"bzr help formats\" for details."
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:2197
1183
msgid "Repository format"
1184
msgstr "Format Repositori"
1185
1186
#: bzrlib/builtins.py:2199
1187
msgid "Branches in the repository will default to not having a working tree."
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:2225
1191
msgid "Show differences in the working tree, between revisions or branches."
1192
msgstr ""
1193
1194
#: bzrlib/builtins.py:2227
1195
msgid ""
1196
"If no arguments are given, all changes for the current tree are listed.\n"
1197
"If files are given, only the changes in those files are listed.\n"
1198
"Remote and multiple branches can be compared by using the --old and\n"
1199
"--new options. If not provided, the default for both is derived from\n"
1200
"the first argument, if any, or the current tree if no arguments are\n"
1201
"given."
1202
msgstr ""
1203
1204
#: bzrlib/builtins.py:2234
1205
msgid ""
1206
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1207
"produces patches suitable for \"patch -p1\"."
1208
msgstr ""
1209
1210
#: bzrlib/builtins.py:2237
1211
msgid ""
1212
"Note that when using the -r argument with a range of revisions, the\n"
1213
"differences are computed between the two specified revisions. That\n"
1214
"is, the command does not show the changes introduced by the first \n"
1215
"revision in the range. This differs from the interpretation of \n"
1216
"revision ranges used by \"bzr log\" which includes the first revision\n"
1217
"in the range."
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2244
1221
msgid ""
1222
":Exit values:\n"
1223
" 1 - changed\n"
1224
" 2 - unrepresentable changes\n"
1225
" 3 - error\n"
1226
" 0 - no change"
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2250
1230
msgid ""
1231
":Examples:\n"
1232
" Shows the difference in the working tree versus the last commit::"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2253
1236
msgid " bzr diff"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2255
1240
msgid " Difference between the working tree and revision 1::"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2257
1244
msgid " bzr diff -r1"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2259
1248
msgid " Difference between revision 3 and revision 1::"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2261
1252
msgid " bzr diff -r1..3"
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:2263
1256
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2265
1260
msgid " bzr diff -r1..3 xxx"
1261
msgstr ""
1262
1263
#: bzrlib/builtins.py:2267
1264
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1265
msgstr ""
1266
1267
#: bzrlib/builtins.py:2269
1268
msgid " bzr diff -c2"
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2271
1272
msgid ""
1273
" To see the changes introduced by revision X::\n"
1274
" \n"
1275
" bzr diff -cX"
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2275
1279
msgid ""
1280
" Note that in the case of a merge, the -c option shows the changes\n"
1281
" compared to the left hand parent. To see the changes against\n"
1282
" another parent, use::"
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2279
1286
msgid " bzr diff -r<chosen_parent>..X"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2281
1290
msgid ""
1291
" The changes between the current revision and the previous revision\n"
1292
" (equivalent to -c-1 and -r-2..-1)"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2284
1296
msgid " bzr diff -r-2.."
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2286
1300
msgid " Show just the differences for file NEWS::"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2288
1304
msgid " bzr diff NEWS"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2290
1308
msgid " Show the differences in working tree xxx for file NEWS::"
1309
msgstr ""
1310
1311
#: bzrlib/builtins.py:2292
1312
msgid " bzr diff xxx/NEWS"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2294
1316
msgid " Show the differences from branch xxx to this working tree:"
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2296
1320
msgid " bzr diff --old xxx"
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2298
1324
msgid " Show the differences between two branches for file NEWS::"
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2300
1328
msgid " bzr diff --old xxx --new yyy NEWS"
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2302
1332
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2304
1336
msgid ""
1337
" bzr diff --prefix old/:new/\n"
1338
" \n"
1339
" Show the differences using a custom diff program with options::\n"
1340
" \n"
1341
" bzr diff --using /usr/bin/diff --diff-options -wu"
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2314
1345
msgid "Pass these options to the external diff program."
1346
msgstr "Melewati pilihan ini untuk program diff eksternal."
1347
1348
#: bzrlib/builtins.py:2317
1349
msgid ""
1350
"Set prefixes added to old and new filenames, as two values separated by a "
1351
"colon. (eg \"old/:new/\")."
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2320
1355
msgid "Branch/tree to compare from."
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2324
1359
msgid "Branch/tree to compare to."
1360
msgstr ""
1361
1362
#: bzrlib/builtins.py:2330
1363
msgid "Use this command to compare files."
1364
msgstr "Gunakan perintah ini untuk membandingkan file."
1365
1366
#: bzrlib/builtins.py:2335
1367
msgid "Diff format to use."
1368
msgstr ""
1369
1370
#: bzrlib/builtins.py:2337
1371
msgid "Diff format"
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2359
1375
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2363
1379
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1380
msgstr ""
1381
1382
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1383
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1384
msgid "{0} and {1} are mutually exclusive"
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2388
1388
msgid ""
1389
"List files deleted in the working tree.\n"
1390
" "
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2465
1394
msgid "Show the tree root directory."
1395
msgstr ""
1396
1397
#: bzrlib/builtins.py:2467
1398
msgid ""
1399
"The root is the nearest enclosing directory with a .bzr control\n"
1400
"directory."
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2482
1404
msgid "The limit argument must be an integer."
1405
msgstr "Argumen batas harus berupa angka."
1406
1407
#: bzrlib/builtins.py:2490
1408
msgid "The levels argument must be an integer."
1409
msgstr "Argumen tingkat harus integer."
1410
1411
#: bzrlib/builtins.py:2495
1412
msgid "Show historical log for a branch or subset of a branch."
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2497
1416
msgid ""
1417
"log is bzr's default tool for exploring the history of a branch.\n"
1418
"The branch to use is taken from the first parameter. If no parameters\n"
1419
"are given, the branch containing the working directory is logged.\n"
1420
"Here are some simple examples::"
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2502
1424
msgid ""
1425
" bzr log log the current branch\n"
1426
" bzr log foo.py log a file in its branch\n"
1427
" bzr log http://server/branch log a branch on a server"
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2506
1431
msgid ""
1432
"The filtering, ordering and information shown for each revision can\n"
1433
"be controlled as explained below. By default, all revisions are\n"
1434
"shown sorted (topologically) so that newer revisions appear before\n"
1435
"older ones and descendants always appear before ancestors. If displayed,\n"
1436
"merged revisions are shown indented under the revision in which they\n"
1437
"were merged."
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2513
1441
msgid ":Output control:"
1442
msgstr ":Kontrol Output:"
1443
1444
#: bzrlib/builtins.py:2515
1445
msgid ""
1446
" The log format controls how information about each revision is\n"
1447
" displayed. The standard log formats are called ``long``, ``short``\n"
1448
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1449
" for more details on log formats."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2520
1453
msgid ""
1454
" The following options can be used to control what information is\n"
1455
" displayed::"
1456
msgstr ""
1457
1458
#: bzrlib/builtins.py:2523
1459
msgid ""
1460
" -l N display a maximum of N revisions\n"
1461
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1462
" -v display a status summary (delta) for each revision\n"
1463
" -p display a diff (patch) for each revision\n"
1464
" --show-ids display revision-ids (and file-ids), not just revnos"
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2529
1468
msgid ""
1469
" Note that the default number of levels to display is a function of the\n"
1470
" log format. If the -n option is not used, the standard log formats show\n"
1471
" just the top level (mainline)."
1472
msgstr ""
1473
1474
#: bzrlib/builtins.py:2533
1475
msgid ""
1476
" Status summaries are shown using status flags like A, M, etc. To see\n"
1477
" the changes explained using words like ``added`` and ``modified``\n"
1478
" instead, use the -vv option."
1479
msgstr ""
1480
1481
#: bzrlib/builtins.py:2537
1482
msgid ":Ordering control:"
1483
msgstr ""
1484
1485
#: bzrlib/builtins.py:2539
1486
msgid ""
1487
" To display revisions from oldest to newest, use the --forward option.\n"
1488
" In most cases, using this option will have little impact on the total\n"
1489
" time taken to produce a log, though --forward does not incrementally\n"
1490
" display revisions like --reverse does when it can."
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2544
1494
msgid ":Revision filtering:"
1495
msgstr ""
1496
1497
#: bzrlib/builtins.py:2546
1498
msgid ""
1499
" The -r option can be used to specify what revision or range of revisions\n"
1500
" to filter against. The various forms are shown below::"
1501
msgstr ""
1502
1503
#: bzrlib/builtins.py:2549
1504
msgid ""
1505
" -rX display revision X\n"
1506
" -rX.. display revision X and later\n"
1507
" -r..Y display up to and including revision Y\n"
1508
" -rX..Y display from X to Y inclusive"
1509
msgstr ""
1510
1511
#: bzrlib/builtins.py:2554
1512
msgid ""
1513
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1514
" Some common examples are given below::"
1515
msgstr ""
1516
1517
#: bzrlib/builtins.py:2557
1518
msgid ""
1519
" -r-1 show just the tip\n"
1520
" -r-10.. show the last 10 mainline revisions\n"
1521
" -rsubmit:.. show what's new on this branch\n"
1522
" -rancestor:path.. show changes since the common ancestor of this\n"
1523
" branch and the one at location path\n"
1524
" -rdate:yesterday.. show changes since yesterday"
1525
msgstr ""
1526
1527
#: bzrlib/builtins.py:2564
1528
msgid ""
1529
" When logging a range of revisions using -rX..Y, log starts at\n"
1530
" revision Y and searches back in history through the primary\n"
1531
" (\"left-hand\") parents until it finds X. When logging just the\n"
1532
" top level (using -n1), an error is reported if X is not found\n"
1533
" along the way. If multi-level logging is used (-n0), X may be\n"
1534
" a nested merge revision and the log will be truncated accordingly."
1535
msgstr ""
1536
1537
#: bzrlib/builtins.py:2571
1538
msgid ":Path filtering:"
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2573
1542
msgid ""
1543
" If parameters are given and the first one is not a branch, the log\n"
1544
" will be filtered to show only those revisions that changed the\n"
1545
" nominated files or directories."
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2577
1549
msgid ""
1550
" Filenames are interpreted within their historical context. To log a\n"
1551
" deleted file, specify a revision range so that the file existed at\n"
1552
" the end or start of the range."
1553
msgstr ""
1554
1555
#: bzrlib/builtins.py:2581
1556
msgid ""
1557
" Historical context is also important when interpreting pathnames of\n"
1558
" renamed files/directories. Consider the following example:"
1559
msgstr ""
1560
1561
#: bzrlib/builtins.py:2584
1562
msgid ""
1563
" * revision 1: add tutorial.txt\n"
1564
" * revision 2: modify tutorial.txt\n"
1565
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2588
1569
msgid " In this case:"
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2590
1573
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2592
1577
msgid ""
1578
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1579
msgstr ""
1580
1581
#: bzrlib/builtins.py:2594
1582
msgid ""
1583
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1584
" the original file in revision 2."
1585
msgstr ""
1586
1587
#: bzrlib/builtins.py:2597
1588
msgid ""
1589
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1590
" was no file called guide.txt in revision 2."
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:2600
1594
msgid ""
1595
" Renames are always followed by log. By design, there is no need to\n"
1596
" explicitly ask for this (and no way to stop logging a file back\n"
1597
" until it was last renamed)."
1598
msgstr ""
1599
1600
#: bzrlib/builtins.py:2604
1601
msgid ":Other filtering:"
1602
msgstr ""
1603
1604
#: bzrlib/builtins.py:2606
1605
msgid ""
1606
" The --match option can be used for finding revisions that match a\n"
1607
" regular expression in a commit message, committer, author or bug.\n"
1608
" Specifying the option several times will match any of the supplied\n"
1609
" expressions. --match-author, --match-bugs, --match-committer and\n"
1610
" --match-message can be used to only match a specific field."
1611
msgstr ""
1612
1613
#: bzrlib/builtins.py:2612
1614
msgid ":Tips & tricks:"
1615
msgstr ":Tip & trik:"
1616
1617
#: bzrlib/builtins.py:2614
1618
msgid ""
1619
" GUI tools and IDEs are often better at exploring history than command\n"
1620
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1621
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1622
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1623
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1624
msgstr ""
1625
1626
#: bzrlib/builtins.py:2620
1627
msgid ""
1628
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1629
msgstr ""
1630
1631
#: bzrlib/builtins.py:2622
1632
msgid ""
1633
" [ALIASES]\n"
1634
" tip = log -r-1\n"
1635
" top = log -l10 --line\n"
1636
" show = log -v -p"
1637
msgstr ""
1638
1639
#: bzrlib/builtins.py:2627
1640
msgid ""
1641
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1642
" will show the last 10 mainline revisions. To see the details of a\n"
1643
" particular revision X, ``bzr show -rX``."
1644
msgstr ""
1645
1646
#: bzrlib/builtins.py:2631
1647
msgid ""
1648
" If you are interested in looking deeper into a particular merge X,\n"
1649
" use ``bzr log -n0 -rX``."
1650
msgstr ""
1651
1652
#: bzrlib/builtins.py:2634
1653
msgid ""
1654
" ``bzr log -v`` on a branch with lots of history is currently\n"
1655
" very slow. A fix for this issue is currently under development.\n"
1656
" With or without that fix, it is recommended that a revision range\n"
1657
" be given when using the -v option."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2639
1661
msgid ""
1662
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1663
" used to find revisions matching user names, commit messages, etc.\n"
1664
" Among other features, this plugin can find all revisions containing\n"
1665
" a list of words but not others."
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2644
1669
msgid ""
1670
" When exploring non-mainline history on large projects with deep\n"
1671
" history, the performance of log can be greatly improved by installing\n"
1672
" the historycache plugin. This plugin buffers historical information\n"
1673
" trading disk space for faster speed."
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2653
1677
msgid "Show from oldest to newest."
1678
msgstr "Tampilkan dari yang lama ke baru."
1679
1680
#: bzrlib/builtins.py:2656
1681
msgid "Show files changed in each revision."
1682
msgstr "Tampilkan file yang diubah dalam setiap revisi."
1683
1684
#: bzrlib/builtins.py:2662
1685
msgid "Show just the specified revision. See also \"help revisionspec\"."
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2666
1689
msgid "What names to list as authors - first, all or committer."
1690
msgstr ""
1691
1692
#: bzrlib/builtins.py:2667
1693
msgid "Authors"
1694
msgstr ""
1695
1696
#: bzrlib/builtins.py:2672
1697
msgid "Number of levels to display - 0 for all, 1 for flat."
1698
msgstr ""
1699
1700
#: bzrlib/builtins.py:2682
1701
msgid "Limit the output to the first N revisions."
1702
msgstr ""
1703
1704
#: bzrlib/builtins.py:2687
1705
msgid "Show changes made in each revision as a patch."
1706
msgstr ""
1707
"Tampilkan perubahan yang dibuat dalam revisi masing-masing sebagai patch."
1708
1709
#: bzrlib/builtins.py:2689
1710
msgid "Show merged revisions like --levels 0 does."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2693
1714
msgid "Do not report commits with more than one parent."
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2695
1718
msgid ""
1719
"Display only the revisions that are not part of both ancestries (require -"
1720
"rX..Y)."
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2699
1724
msgid "Show digital signature validity."
1725
msgstr "Tampilkan validitas tanda tangan digital."
1726
1727
#: bzrlib/builtins.py:2702
1728
msgid "Show revisions whose properties match this expression."
1729
msgstr "Tampilkan revisi yang sifat sesuai dengan ungkapan ini."
1730
1731
#: bzrlib/builtins.py:2706
1732
msgid "Show revisions whose message matches this expression."
1733
msgstr ""
1734
1735
#: bzrlib/builtins.py:2710
1736
msgid "Show revisions whose committer matches this expression."
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2714
1740
msgid "Show revisions whose authors match this expression."
1741
msgstr ""
1742
1743
#: bzrlib/builtins.py:2718
1744
msgid "Show revisions whose bugs match this expression."
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2772
1748
msgid "--exclude-common-ancestry requires -r with two revisions"
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2800
1752
#, python-format
1753
msgid "Path unknown at end or start of revision range: %s"
1754
msgstr ""
1755
1756
#: bzrlib/builtins.py:2917
1757
#, python-format
1758
msgid "bzr %s doesn't accept two revisions in different branches."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2933
1762
#, python-format
1763
msgid "bzr %s --revision takes one or two values."
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2978
1767
msgid ""
1768
"List files in a tree.\n"
1769
" "
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2987
1773
msgid "Recurse into subdirectories."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2989
1777
msgid "Print paths relative to the root of the branch."
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2991
1781
msgid "Print unknown files."
1782
msgstr "Mencetak file tidak diketahui."
1783
1784
#: bzrlib/builtins.py:2992
1785
msgid "Print versioned files."
1786
msgstr "Mencetak file berversi."
1787
1788
#: bzrlib/builtins.py:2995
1789
msgid "Print ignored files."
1790
msgstr "Mencetak file diabaikan."
1791
1792
#: bzrlib/builtins.py:2997
1793
msgid "List entries of a particular kind: file, directory, symlink."
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:3010
1797
msgid "invalid kind specified"
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:3013
1801
msgid "Cannot set both --verbose and --null"
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:3022
1805
msgid "cannot specify both --from-root and PATH"
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:3109
1809
msgid "Ignore specified files or patterns."
1810
msgstr "Abaikan file tertentu atau pola."
1811
1812
#: bzrlib/builtins.py:3111
1813
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1814
msgstr ""
1815
1816
#: bzrlib/builtins.py:3113
1817
msgid ""
1818
"If a .bzrignore file does not exist, the ignore command\n"
1819
"will create one and add the specified files or patterns to the newly\n"
1820
"created file. The ignore command will also automatically add the \n"
1821
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1822
"the use of the ignore command will require an explicit add command."
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:3119
1826
msgid ""
1827
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1828
"After adding, editing or deleting that file either indirectly by\n"
1829
"using this command or directly by using an editor, be sure to commit\n"
1830
"it."
1831
msgstr ""
1832
1833
#: bzrlib/builtins.py:3124
1834
msgid ""
1835
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1836
"the global ignore file can be found in the application data directory as\n"
1837
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1838
"Global ignores are not touched by this command. The global ignore file\n"
1839
"can be edited directly using an editor."
1840
msgstr ""
1841
1842
#: bzrlib/builtins.py:3130
1843
msgid ""
1844
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1845
"precedence over regular ignores. Such exceptions are used to specify\n"
1846
"files that should be versioned which would otherwise be ignored."
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:3134
1850
msgid ""
1851
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1852
"precedence over the '!' exception patterns."
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:3137
1856
msgid ""
1857
":Notes: \n"
1858
" \n"
1859
"* Ignore patterns containing shell wildcards must be quoted from\n"
1860
" the shell on Unix."
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:3142
1864
msgid ""
1865
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1866
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3145
1870
msgid ""
1871
":Examples:\n"
1872
" Ignore the top level Makefile::"
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3148
1876
msgid " bzr ignore ./Makefile"
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3150
1880
msgid " Ignore .class files in all directories...::"
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3152
1884
msgid " bzr ignore \"*.class\""
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:3154
1888
msgid " ...but do not ignore \"special.class\"::"
1889
msgstr ""
1890
1891
#: bzrlib/builtins.py:3156
1892
msgid " bzr ignore \"!special.class\""
1893
msgstr ""
1894
1895
#: bzrlib/builtins.py:3158
1896
msgid " Ignore files whose name begins with the \"#\" character::"
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3160
1900
msgid " bzr ignore \"RE:^#\""
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1904
msgid " Ignore .o files under the lib directory::"
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3164
1908
msgid " bzr ignore \"lib/**/*.o\""
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3168
1912
msgid " bzr ignore \"RE:lib/.*\\.o\""
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:3170
1916
msgid " Ignore everything but the \"debian\" toplevel directory::"
1917
msgstr ""
1918
1919
#: bzrlib/builtins.py:3172
1920
msgid ""
1921
" bzr ignore \"RE:(?!debian/).*\"\n"
1922
" \n"
1923
" Ignore everything except the \"local\" toplevel directory,\n"
1924
" but always ignore autosave files ending in ~, even under local/::\n"
1925
" \n"
1926
" bzr ignore \"*\"\n"
1927
" bzr ignore \"!./local\"\n"
1928
" bzr ignore \"!!*~\""
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3186
1932
msgid "Display the default ignore rules that bzr uses."
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3198
1936
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:3209
1940
#, python-format
1941
msgid "Invalid ignore pattern found. %s"
1942
msgid_plural "Invalid ignore patterns found. %s"
1943
msgstr[0] ""
1944
msgstr[1] ""
1945
1946
#: bzrlib/builtins.py:3218
1947
msgid "NAME_PATTERN should not be an absolute path"
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:3231
1951
#, python-format
1952
msgid ""
1953
"Warning: the following files are version controlled and match your ignore "
1954
"pattern:\n"
1955
"%s\n"
1956
"These files will continue to be version controlled unless you 'bzr remove' "
1957
"them.\n"
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3238
1961
msgid "List ignored files and the patterns that matched them."
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3240
1965
msgid ""
1966
"List all the ignored files and the ignore pattern that caused the file to\n"
1967
"be ignored."
1968
msgstr ""
1969
1970
#: bzrlib/builtins.py:3243
1971
msgid "Alternatively, to list just the files::"
1972
msgstr "Atau, untuk daftar hanya file ::"
1973
1974
#: bzrlib/builtins.py:3245
1975
msgid " bzr ls --ignored"
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3279
1979
#, python-format
1980
msgid "not a valid revision-number: %r"
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3286
1984
msgid ""
1985
"Export current or past revision to a destination directory or archive."
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3288
1989
msgid "If no revision is specified this exports the last committed revision."
1990
msgstr ""
1991
1992
#: bzrlib/builtins.py:3290
1993
msgid ""
1994
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1995
"given, try to find the format with the extension. If no extension\n"
1996
"is found exports to a directory (equivalent to --format=dir)."
1997
msgstr ""
1998
1999
#: bzrlib/builtins.py:3294
2000
msgid ""
2001
"If root is supplied, it will be used as the root directory inside\n"
2002
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2003
"to the exported filename. The root option has no effect for 'dir' format."
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3298
2007
msgid ""
2008
"If branch is omitted then the branch containing the current working\n"
2009
"directory will be used."
2010
msgstr ""
2011
2012
#: bzrlib/builtins.py:3301
2013
msgid ""
2014
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2015
msgstr ""
2016
2017
#: bzrlib/builtins.py:3303
2018
msgid ""
2019
" ================= =========================\n"
2020
" Supported formats Autodetected by extension\n"
2021
" ================= =========================\n"
2022
" dir (none)\n"
2023
" tar .tar\n"
2024
" tbz2 .tar.bz2, .tbz2\n"
2025
" tgz .tar.gz, .tgz\n"
2026
" zip .zip\n"
2027
" ================= ========================="
2028
msgstr ""
2029
2030
#: bzrlib/builtins.py:3317
2031
msgid "Type of file to export to."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3320
2035
msgid "Apply content filters to export the convenient form."
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3324
2039
msgid "Name of the root directory inside the exported file."
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3326
2043
msgid ""
2044
"Set modification time of files to that of the last revision in which it was "
2045
"changed."
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3329
2049
msgid ""
2050
"Export the working tree contents rather than that of the last revision."
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3348
2054
msgid "--uncommitted requires a working tree"
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:3357
2058
#, python-format
2059
msgid "Unsupported export format: %s"
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3361
2063
msgid ""
2064
"Write the contents of a file as of a given revision to standard output."
2065
msgstr "Menulis isi file pada revisi yang diberikan ke output standar."
2066
2067
#: bzrlib/builtins.py:3363
2068
msgid "If no revision is nominated, the last revision is used."
2069
msgstr "Jika tidak ada revisi lagi, revisi terakhir digunakan."
2070
2071
#: bzrlib/builtins.py:3365
2072
msgid ""
2073
"Note: Take care to redirect standard output when using this command on a\n"
2074
"binary file."
2075
msgstr ""
2076
2077
#: bzrlib/builtins.py:3371
2078
msgid "The path name in the old tree."
2079
msgstr ""
2080
2081
#: bzrlib/builtins.py:3372
2082
msgid "Apply content filters to display the convenience form."
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3383
2086
msgid "bzr cat --revision takes exactly one revision specifier"
2087
msgstr ""
2088
2089
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2090
msgid "{0!r} is not present in revision {1}"
2091
msgstr ""
2092
2093
#: bzrlib/builtins.py:3443
2094
msgid "Commit changes into a new revision."
2095
msgstr ""
2096
2097
#: bzrlib/builtins.py:3445
2098
msgid ""
2099
"An explanatory message needs to be given for each commit. This is\n"
2100
"often done by using the --message option (getting the message from the\n"
2101
"command line) or by using the --file option (getting the message from\n"
2102
"a file). If neither of these options is given, an editor is opened for\n"
2103
"the user to enter the message. To see the changed files in the\n"
2104
"boilerplate text loaded into the editor, use the --show-diff option."
2105
msgstr ""
2106
2107
#: bzrlib/builtins.py:3452
2108
msgid ""
2109
"By default, the entire tree is committed and the person doing the\n"
2110
"commit is assumed to be the author. These defaults can be overridden\n"
2111
"as explained below."
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3456
2115
msgid ":Selective commits:"
2116
msgstr ""
2117
2118
#: bzrlib/builtins.py:3458
2119
msgid ""
2120
" If selected files are specified, only changes to those files are\n"
2121
" committed. If a directory is specified then the directory and\n"
2122
" everything within it is committed."
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3462
2126
msgid ""
2127
" When excludes are given, they take precedence over selected files.\n"
2128
" For example, to commit only changes within foo, but not changes\n"
2129
" within foo/bar::"
2130
msgstr ""
2131
2132
#: bzrlib/builtins.py:3466
2133
msgid " bzr commit foo -x foo/bar"
2134
msgstr ""
2135
2136
#: bzrlib/builtins.py:3468
2137
msgid " A selective commit after a merge is not yet supported."
2138
msgstr ""
2139
2140
#: bzrlib/builtins.py:3470
2141
msgid ":Custom authors:"
2142
msgstr ""
2143
2144
#: bzrlib/builtins.py:3472
2145
msgid ""
2146
" If the author of the change is not the same person as the committer,\n"
2147
" you can specify the author's name using the --author option. The\n"
2148
" name should be in the same format as a committer-id, e.g.\n"
2149
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2150
" the change you can specify the option multiple times, once for each\n"
2151
" author."
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3479
2155
msgid ":Checks:"
2156
msgstr ":Cek:"
2157
2158
#: bzrlib/builtins.py:3481
2159
msgid ""
2160
" A common mistake is to forget to add a new file or directory before\n"
2161
" running the commit command. The --strict option checks for unknown\n"
2162
" files and aborts the commit if any are found. More advanced pre-commit\n"
2163
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2164
" for details."
2165
msgstr ""
2166
2167
#: bzrlib/builtins.py:3487
2168
msgid ":Things to note:"
2169
msgstr ""
2170
2171
#: bzrlib/builtins.py:3489
2172
msgid ""
2173
" If you accidentially commit the wrong changes or make a spelling\n"
2174
" mistake in the commit message say, you can use the uncommit command\n"
2175
" to undo it. See ``bzr help uncommit`` for details."
2176
msgstr ""
2177
2178
#: bzrlib/builtins.py:3493
2179
msgid ""
2180
" Hooks can also be configured to run after a commit. This allows you\n"
2181
" to trigger updates to external systems like bug trackers. The --fixes\n"
2182
" option can be used to record the association between a revision and\n"
2183
" one or more bugs. See ``bzr help bugs`` for details."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3503
2187
msgid "Do not consider changes made to a given path."
2188
msgstr ""
2189
2190
#: bzrlib/builtins.py:3506
2191
msgid "Description of the new revision."
2192
msgstr "Deskripsi revisi baru."
2193
2194
#: bzrlib/builtins.py:3509
2195
msgid "Commit even if nothing has changed."
2196
msgstr ""
2197
2198
#: bzrlib/builtins.py:3513
2199
msgid "Take commit message from this file."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3515
2203
msgid "Refuse to commit if there are unknown files in the working tree."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3518
2207
msgid ""
2208
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2209
"08:00:00 +0100'."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3521
2213
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2214
msgstr ""
2215
2216
#: bzrlib/builtins.py:3524
2217
msgid "Set the author's name, if it's different from the committer."
2218
msgstr ""
2219
2220
#: bzrlib/builtins.py:3527
2221
msgid ""
2222
"Perform a local commit in a bound branch. Local commits are not pushed to "
2223
"the master branch until a normal commit is performed."
2224
msgstr ""
2225
2226
#: bzrlib/builtins.py:3533
2227
msgid ""
2228
"When no message is supplied, show the diff along with the status summary in "
2229
"the message editor."
2230
msgstr ""
2231
2232
#: bzrlib/builtins.py:3536
2233
msgid ""
2234
"When committing to a foreign version control system do not push data that "
2235
"can not be natively represented."
2236
msgstr ""
2237
2238
#: bzrlib/builtins.py:3554
2239
#, python-format
2240
msgid ""
2241
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2242
"default bug tracker using the `bugtracker` option.\n"
2243
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3563
2247
#, python-format
2248
msgid ""
2249
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2250
"for more information on this feature.\n"
2251
"Commit refused."
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3572
2255
#, python-format
2256
msgid "Unrecognized bug %s. Commit refused."
2257
msgstr ""
2258
2259
#: bzrlib/builtins.py:3575
2260
#, python-format
2261
msgid ""
2262
"%s\n"
2263
"Commit refused."
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3599
2267
msgid "Could not parse --commit-time: "
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3639
2271
msgid "please specify either --message or --file"
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3668
2275
msgid "please specify a commit message with either --message or --file"
2276
msgstr ""
2277
2278
#: bzrlib/builtins.py:3671
2279
msgid ""
2280
"Empty commit message specified. Please specify a commit message with either -"
2281
"-message or --file or leave a blank message with --message \"\"."
2282
msgstr ""
2283
2284
#: bzrlib/builtins.py:3691
2285
msgid ""
2286
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2287
"-unchanged to force an empty commit."
2288
msgstr ""
2289
2290
#: bzrlib/builtins.py:3695
2291
msgid ""
2292
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2293
"resolve FILE\" to resolve."
2294
msgstr ""
2295
2296
#: bzrlib/builtins.py:3699
2297
msgid "Commit refused because there are unknown files in the working tree."
2298
msgstr ""
2299
2300
#: bzrlib/builtins.py:3702
2301
msgid ""
2302
"\n"
2303
"To commit to master branch, run update and then commit.\n"
2304
"You can also pass --local to commit to continue working disconnected."
2305
msgstr ""
2306
2307
#: bzrlib/builtins.py:3710
2308
msgid ""
2309
"Validate working tree structure, branch consistency and repository history."
2310
msgstr ""
2311
2312
#: bzrlib/builtins.py:3712
2313
msgid ""
2314
"This command checks various invariants about branch and repository storage\n"
2315
"to detect data corruption or bzr bugs."
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3715
2319
msgid ""
2320
"The working tree and branch checks will only give output if a problem is\n"
2321
"detected. The output fields of the repository check are:"
2322
msgstr ""
2323
2324
#: bzrlib/builtins.py:3718
2325
msgid ""
2326
"revisions\n"
2327
" This is just the number of revisions checked. It doesn't\n"
2328
" indicate a problem."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3722
2332
msgid ""
2333
"versionedfiles\n"
2334
" This is just the number of versionedfiles checked. It\n"
2335
" doesn't indicate a problem."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3726
2339
msgid ""
2340
"unreferenced ancestors\n"
2341
" Texts that are ancestors of other texts, but\n"
2342
" are not properly referenced by the revision ancestry. This is a\n"
2343
" subtle problem that Bazaar can work around."
2344
msgstr ""
2345
2346
#: bzrlib/builtins.py:3731
2347
msgid ""
2348
"unique file texts\n"
2349
" This is the total number of unique file contents\n"
2350
" seen in the checked revisions. It does not indicate a problem."
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3735
2354
msgid ""
2355
"repeated file texts\n"
2356
" This is the total number of repeated texts seen\n"
2357
" in the checked revisions. Texts can be repeated when their file\n"
2358
" entries are modified, but the file contents are not. It does not\n"
2359
" indicate a problem."
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3741
2363
msgid ""
2364
"If no restrictions are specified, all Bazaar data that is found at the "
2365
"given\n"
2366
"location will be checked."
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3746
2370
msgid " Check the tree and branch at 'foo'::"
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3748
2374
msgid " bzr check --tree --branch foo"
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3750
2378
msgid " Check only the repository at 'bar'::"
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3752
2382
msgid " bzr check --repo bar"
2383
msgstr ""
2384
2385
#: bzrlib/builtins.py:3754
2386
msgid " Check everything at 'baz'::"
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3756
2390
msgid " bzr check baz"
2391
msgstr ""
2392
2393
#: bzrlib/builtins.py:3762
2394
msgid "Check the branch related to the current directory."
2395
msgstr ""
2396
2397
#: bzrlib/builtins.py:3764
2398
msgid "Check the repository related to the current directory."
2399
msgstr ""
2400
2401
#: bzrlib/builtins.py:3766
2402
msgid "Check the working tree related to the current directory."
2403
msgstr ""
2404
2405
#: bzrlib/builtins.py:3780
2406
msgid "Upgrade a repository, branch or working tree to a newer format."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3782
2410
msgid ""
2411
"When the default format has changed after a major new release of\n"
2412
"Bazaar, you may be informed during certain operations that you\n"
2413
"should upgrade. Upgrading to a newer format may improve performance\n"
2414
"or make new features available. It may however limit interoperability\n"
2415
"with older repositories or with older versions of Bazaar."
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:3788
2419
msgid ""
2420
"If you wish to upgrade to a particular format rather than the\n"
2421
"current default, that can be specified using the --format option.\n"
2422
"As a consequence, you can use the upgrade command this way to\n"
2423
"\"downgrade\" to an earlier format, though some conversions are\n"
2424
"a one way process (e.g. changing from the 1.x default to the\n"
2425
"2.x default) so downgrading is not always possible."
2426
msgstr ""
2427
2428
#: bzrlib/builtins.py:3795
2429
msgid ""
2430
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2431
"process (where # is a number). By default, this is left there on\n"
2432
"completion. If the conversion fails, delete the new .bzr directory\n"
2433
"and rename this one back in its place. Use the --clean option to ask\n"
2434
"for the backup.bzr directory to be removed on successful conversion.\n"
2435
"Alternatively, you can delete it by hand if everything looks good\n"
2436
"afterwards."
2437
msgstr ""
2438
2439
#: bzrlib/builtins.py:3803
2440
msgid ""
2441
"If the location given is a shared repository, dependent branches\n"
2442
"are also converted provided the repository converts successfully.\n"
2443
"If the conversion of a branch fails, remaining branches are still\n"
2444
"tried."
2445
msgstr ""
2446
2447
#: bzrlib/builtins.py:3808
2448
msgid ""
2449
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2450
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3816
2454
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3820
2458
msgid "Branch format"
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3822
2462
msgid "Remove the backup.bzr directory if successful."
2463
msgstr "Menghapus direktori backup.bzr jika berhasil."
2464
2465
#: bzrlib/builtins.py:3824
2466
msgid "Show what would be done, but don't actually do anything."
2467
msgstr "Tampilkan apa yang akan dilakukan, tetapi tidak melakukan apa-apa."
2468
2469
#: bzrlib/builtins.py:3839
2470
msgid "Show or set bzr user id."
2471
msgstr "Tampilkan atau mengatur id bzr pengguna."
2472
2473
#: bzrlib/builtins.py:3841
2474
msgid ""
2475
":Examples:\n"
2476
" Show the email of the current user::"
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3844
2480
msgid " bzr whoami --email"
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:3846
2484
msgid " Set the current user::"
2485
msgstr ""
2486
2487
#: bzrlib/builtins.py:3848
2488
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2489
msgstr ""
2490
2491
#: bzrlib/builtins.py:3852
2492
msgid "Display email address only."
2493
msgstr "Menampilkan alamat email saja."
2494
2495
#: bzrlib/builtins.py:3854
2496
msgid "Set identity for the current branch instead of globally."
2497
msgstr ""
2498
2499
#: bzrlib/builtins.py:3880
2500
msgid "--email can only be used to display existing identity"
2501
msgstr ""
2502
2503
#: bzrlib/builtins.py:3904
2504
msgid "Print or set the branch nickname."
2505
msgstr ""
2506
2507
#: bzrlib/builtins.py:3906
2508
msgid ""
2509
"If unset, the colocated branch name is used for colocated branches, and\n"
2510
"the branch directory name is used for other branches. To print the\n"
2511
"current nickname, execute with no argument."
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3910
2515
msgid ""
2516
"Bound branches use the nickname of its master branch unless it is set\n"
2517
"locally."
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3930
2521
msgid "Set/unset and display aliases."
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3932
2525
msgid ""
2526
":Examples:\n"
2527
" Show the current aliases::"
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3935
2531
msgid " bzr alias"
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:3937
2535
msgid " Show the alias specified for 'll'::"
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3939
2539
msgid " bzr alias ll"
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:3941
2543
msgid " Set an alias for 'll'::"
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3943
2547
msgid " bzr alias ll=\"log --line -r-10..-1\""
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3945
2551
msgid " To remove an alias for 'll'::"
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3947
2555
msgid " bzr alias --remove ll"
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:3952
2559
msgid "Remove the alias."
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:3970
2563
msgid "bzr alias --remove expects an alias to remove."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:4151
2567
msgid ""
2568
"subunit not available. subunit needs to be installed to use --subunit."
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:4168
2572
msgid ""
2573
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:4215
2577
msgid "Show version of bzr."
2578
msgstr "Tampilkan versi bzr."
2579
2580
#: bzrlib/builtins.py:4219
2581
msgid "Print just the version number."
2582
msgstr "Mencetak hanya nomor versi."
2583
2584
#: bzrlib/builtins.py:4238
2585
msgid "It sure does!\n"
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:4262
2589
#, python-format
2590
msgid "merge base is revision %s\n"
2591
msgstr ""
2592
2593
#: bzrlib/builtins.py:4266
2594
msgid "Perform a three-way merge."
2595
msgstr ""
2596
2597
#: bzrlib/builtins.py:4268
2598
msgid ""
2599
"The source of the merge can be specified either in the form of a branch,\n"
2600
"or in the form of a path to a file containing a merge directive generated\n"
2601
"with bzr send. If neither is specified, the default is the upstream branch\n"
2602
"or the branch most recently merged using --remember. The source of the\n"
2603
"merge may also be specified in the form of a path to a file in another\n"
2604
"branch: in this case, only the modifications to that file are merged into\n"
2605
"the current working tree."
2606
msgstr ""
2607
2608
#: bzrlib/builtins.py:4276
2609
msgid ""
2610
"When merging from a branch, by default bzr will try to merge in all new\n"
2611
"work from the other branch, automatically determining an appropriate base\n"
2612
"revision. If this fails, you may need to give an explicit base."
2613
msgstr ""
2614
2615
#: bzrlib/builtins.py:4280
2616
msgid ""
2617
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2618
"try to merge in all new work up to and including revision OTHER."
2619
msgstr ""
2620
2621
#: bzrlib/builtins.py:4283
2622
msgid ""
2623
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2624
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2625
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2626
"not already contain revision BASE, such a merge is commonly referred to as\n"
2627
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2628
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2629
"changes from the other branch is not stored in the commit."
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:4291
2633
msgid "Revision numbers are always relative to the source branch."
2634
msgstr ""
2635
2636
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2637
msgid ""
2638
"Merge will do its best to combine the changes in two branches, but there\n"
2639
"are some kinds of problems only a human can fix. When it encounters those,\n"
2640
"it will mark a conflict. A conflict means that you need to fix something,\n"
2641
"before you can commit."
2642
msgstr ""
2643
2644
#: bzrlib/builtins.py:4298
2645
msgid ""
2646
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2647
msgstr ""
2648
2649
#: bzrlib/builtins.py:4300
2650
msgid ""
2651
"If there is no default branch set, the first merge will set it (use\n"
2652
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2653
"to use the default. To change the default, use --remember. The value will\n"
2654
"only be saved if the remote location can be accessed."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:4305
2658
msgid ""
2659
"The results of the merge are placed into the destination working\n"
2660
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2661
"committed to record the result of the merge."
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4309
2665
msgid ""
2666
"merge refuses to run if there are any uncommitted changes, unless\n"
2667
"--force is given. If --force is given, then the changes from the source \n"
2668
"will be merged with the current working tree, including any uncommitted\n"
2669
"changes in the tree. The --force option can also be used to create a\n"
2670
"merge revision which has more than two parents."
2671
msgstr ""
2672
2673
#: bzrlib/builtins.py:4315
2674
msgid ""
2675
"If one would like to merge changes from the working tree of the other\n"
2676
"branch without merging any committed revisions, the --uncommitted option\n"
2677
"can be given."
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4319
2681
msgid ""
2682
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2683
"you to apply each diff hunk and file change, similar to \"shelve\"."
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4322
2687
msgid ""
2688
":Examples:\n"
2689
" To merge all new revisions from bzr.dev::"
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4325
2693
msgid " bzr merge ../bzr.dev"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4327
2697
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4329
2701
msgid " bzr merge -r 82 ../bzr.dev"
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4331
2705
msgid " To merge the changes introduced by 82, without previous changes::"
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:4333
2709
msgid " bzr merge -r 81..82 ../bzr.dev"
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4335
2713
msgid " To apply a merge directive contained in /tmp/merge::"
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4337
2717
msgid " bzr merge /tmp/merge"
2718
msgstr ""
2719
2720
#: bzrlib/builtins.py:4339
2721
msgid ""
2722
" To create a merge revision with three parents from two branches\n"
2723
" feature1a and feature1b:"
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:4342
2727
msgid ""
2728
" bzr merge ../feature1a\n"
2729
" bzr merge ../feature1b --force\n"
2730
" bzr commit -m 'revision with three parents'"
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4354
2734
msgid "Merge even if the destination tree has uncommitted changes."
2735
msgstr ""
2736
2737
#: bzrlib/builtins.py:4360
2738
msgid ""
2739
"Apply uncommitted changes from a working copy, instead of branch changes."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4362
2743
msgid ""
2744
"If the destination is already completely merged into the source, pull from "
2745
"the source rather than merging. When this happens, you do not need to "
2746
"commit the result."
2747
msgstr ""
2748
2749
#: bzrlib/builtins.py:4367
2750
msgid ""
2751
"Branch to merge into, rather than the one containing the working directory."
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:4369
2755
msgid "Instead of merging, show a diff of the merge."
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4371
2759
msgid "Select changes interactively."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4393
2763
msgid ""
2764
"Merging into empty branches not currently supported, "
2765
"https://bugs.launchpad.net/bzr/+bug/308562"
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4420
2769
msgid "Cannot use --uncommitted with bundles or merge directives."
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:4431
2773
msgid "Cannot use --uncommitted and --revision at the same time."
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4451
2777
msgid "merger: "
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2781
msgid "Nothing to do."
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4457
2785
msgid "Cannot pull individual files"
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4465
2789
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4523
2793
#, python-format
2794
msgid "Show-base is not supported for this merge type. %s"
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4532
2798
#, python-format
2799
msgid "Conflict reduction is not supported for merge type %s."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4536
2803
msgid "Cannot do conflict reduction and show base."
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4647
2807
msgid "No location specified or remembered"
2808
msgstr "Tidak ada lokasi yang ditentukan atau diingat"
2809
2810
#: bzrlib/builtins.py:4649
2811
msgid "{0} remembered {1} location {2}"
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4655
2815
msgid "Redo a merge."
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4657
2819
msgid ""
2820
"Use this if you want to try a different merge technique while resolving\n"
2821
"conflicts. Some merge techniques are better than others, and remerge\n"
2822
"lets you try different ones on different files."
2823
msgstr ""
2824
2825
#: bzrlib/builtins.py:4661
2826
msgid ""
2827
"The options for remerge have the same meaning and defaults as the ones for\n"
2828
"merge. The difference is that remerge can (only) be run when there is a\n"
2829
"pending merge, and it lets you specify particular files."
2830
msgstr ""
2831
2832
#: bzrlib/builtins.py:4665
2833
msgid ""
2834
":Examples:\n"
2835
" Re-do the merge of all conflicted files, and show the base text in\n"
2836
" conflict regions, in addition to the usual THIS and OTHER texts::"
2837
msgstr ""
2838
2839
#: bzrlib/builtins.py:4669
2840
msgid " bzr remerge --show-base"
2841
msgstr ""
2842
2843
#: bzrlib/builtins.py:4671
2844
msgid ""
2845
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2846
" additional processing to reduce the size of conflict regions::"
2847
msgstr ""
2848
2849
#: bzrlib/builtins.py:4674
2850
msgid " bzr remerge --merge-type weave --reprocess foobar"
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4681
2854
msgid "Show base revision text in conflicts."
2855
msgstr "Tampilkan revisi dasar teks dalam konflik."
2856
2857
#: bzrlib/builtins.py:4693
2858
msgid ""
2859
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2860
"merges."
2861
msgstr ""
2862
2863
#: bzrlib/builtins.py:4751
2864
msgid ""
2865
"Set files in the working tree back to the contents of a previous revision."
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4753
2869
msgid ""
2870
"Giving a list of files will revert only those files. Otherwise, all files\n"
2871
"will be reverted. If the revision is not specified with '--revision', the\n"
2872
"working tree basis revision is used. A revert operation affects only the\n"
2873
"working tree, not any revision history like the branch and repository or\n"
2874
"the working tree basis revision."
2875
msgstr ""
2876
2877
#: bzrlib/builtins.py:4759
2878
msgid ""
2879
"To remove only some changes, without reverting to a prior version, use\n"
2880
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2881
"will remove the changes introduced by the second last commit (-2), without\n"
2882
"affecting the changes introduced by the last commit (-1). To remove\n"
2883
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2884
"To update the branch to a specific revision or the latest revision and\n"
2885
"update the working tree accordingly while preserving local changes, see the\n"
2886
"update command."
2887
msgstr ""
2888
2889
#: bzrlib/builtins.py:4768
2890
msgid ""
2891
"Uncommitted changes to files that are reverted will be discarded.\n"
2892
"Howver, by default, any files that have been manually changed will be\n"
2893
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2894
"files have '.~#~' appended to their name, where # is a number."
2895
msgstr ""
2896
2897
#: bzrlib/builtins.py:4773
2898
msgid ""
2899
"When you provide files, you can use their current pathname or the pathname\n"
2900
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2901
"name. If you name a directory, all the contents of that directory will be\n"
2902
"reverted."
2903
msgstr ""
2904
2905
#: bzrlib/builtins.py:4778
2906
msgid ""
2907
"If you have newly added files since the target revision, they will be\n"
2908
"removed. If the files to be removed have been changed, backups will be\n"
2909
"created as above. Directories containing unknown files will not be\n"
2910
"deleted."
2911
msgstr ""
2912
2913
#: bzrlib/builtins.py:4783
2914
msgid ""
2915
"The working tree contains a list of revisions that have been merged but\n"
2916
"not yet committed. These revisions will be included as additional parents\n"
2917
"of the next commit. Normally, using revert clears that list as well as\n"
2918
"reverting the files. If any files are specified, revert leaves the list\n"
2919
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2920
".`` in the tree root to revert all files but keep the recorded merges,\n"
2921
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2922
"reverting any files."
2923
msgstr ""
2924
2925
#: bzrlib/builtins.py:4792
2926
msgid ""
2927
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2928
"changes from a branch in a single revision. To do this, perform the merge\n"
2929
"as desired. Then doing revert with the \"--forget-merges\" option will "
2930
"keep\n"
2931
"the content of the tree as it was, but it will clear the list of pending\n"
2932
"merges. The next commit will then contain all of the changes that are\n"
2933
"present in the other branch, but without any other parent revisions.\n"
2934
"Because this technique forgets where these changes originated, it may\n"
2935
"cause additional conflicts on later merges involving the same source and\n"
2936
"target branches."
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4806
2940
msgid "Do not save backups of reverted files."
2941
msgstr ""
2942
2943
#: bzrlib/builtins.py:4808
2944
msgid "Remove pending merge marker, without changing any files."
2945
msgstr ""
2946
2947
#: bzrlib/builtins.py:4839
2948
msgid ""
2949
"Show help on a command or other topic.\n"
2950
" "
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4844
2954
msgid "Show help on all commands."
2955
msgstr "Tampilkan bantuan pada semua perintah."
2956
2957
#: bzrlib/builtins.py:4873
2958
msgid "Show unmerged/unpulled revisions between two branches."
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4875
2962
msgid "OTHER_BRANCH may be local or remote."
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4877
2966
msgid ""
2967
"To filter on a range of revisions, you can use the command -r begin..end\n"
2968
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2969
"also valid.\n"
2970
" \n"
2971
":Exit values:\n"
2972
" 1 - some missing revisions\n"
2973
" 0 - no missing revisions"
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4887
2977
msgid ""
2978
" Determine the missing revisions between this and the branch at the\n"
2979
" remembered pull location::"
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4890
2983
msgid " bzr missing"
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:4892
2987
msgid " Determine the missing revisions between this and another branch::"
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4894
2991
msgid " bzr missing http://server/branch"
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4896
2995
msgid ""
2996
" Determine the missing revisions up to a specific revision on the other\n"
2997
" branch::"
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:4899
3001
msgid " bzr missing -r ..-10"
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4901
3005
msgid ""
3006
" Determine the missing revisions up to a specific revision on this\n"
3007
" branch::"
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4904
3011
msgid " bzr missing --my-revision ..-10"
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4911
3015
msgid "Reverse the order of revisions."
3016
msgstr "Membalik urutan revisi."
3017
3018
#: bzrlib/builtins.py:4913
3019
msgid "Display changes in the local branch only."
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4914
3023
msgid "Same as --mine-only."
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4916
3027
msgid "Display changes in the remote branch only."
3028
msgstr ""
3029
3030
#: bzrlib/builtins.py:4917
3031
msgid "Same as --theirs-only."
3032
msgstr ""
3033
3034
#: bzrlib/builtins.py:4922
3035
msgid ""
3036
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3037
"details."
3038
msgstr ""
3039
3040
#: bzrlib/builtins.py:4926
3041
msgid ""
3042
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3043
"details."
3044
msgstr ""
3045
3046
#: bzrlib/builtins.py:4929
3047
msgid "Show all revisions in addition to the mainline ones."
3048
msgstr "Tampilkan semua revisi selain yang utama."
3049
3050
#: bzrlib/builtins.py:4983
3051
msgid "No peer location known or specified."
3052
msgstr ""
3053
3054
#: bzrlib/builtins.py:4987
3055
msgid "Using saved parent location: {0}\n"
3056
msgstr ""
3057
3058
#: bzrlib/builtins.py:5020
3059
#, python-format
3060
msgid "You have %d extra revision:\n"
3061
msgid_plural "You have %d extra revisions:\n"
3062
msgstr[0] ""
3063
msgstr[1] ""
3064
3065
#: bzrlib/builtins.py:5040
3066
#, python-format
3067
msgid "You are missing %d revision:\n"
3068
msgid_plural "You are missing %d revisions:\n"
3069
msgstr[0] ""
3070
msgstr[1] ""
3071
3072
#: bzrlib/builtins.py:5055
3073
msgid "This branch has no new revisions.\n"
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:5058
3077
msgid "Other branch has no new revisions.\n"
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:5063
3081
msgid "Branches are up to date.\n"
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:5074
3085
msgid "Compress the data within a repository."
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:5076
3089
msgid ""
3090
"This operation compresses the data within a bazaar repository. As\n"
3091
"bazaar supports automatic packing of repository, this operation is\n"
3092
"normally not required to be done manually."
3093
msgstr ""
3094
3095
#: bzrlib/builtins.py:5080
3096
msgid ""
3097
"During the pack operation, bazaar takes a backup of existing repository\n"
3098
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3099
"automatically when it is safe to do so. To save disk space by removing\n"
3100
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3101
"used."
3102
msgstr ""
3103
3104
#: bzrlib/builtins.py:5086
3105
msgid ""
3106
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3107
"during or immediately after repacking, you may be left with a state\n"
3108
"where the deletion has been written to disk but the new packs have not\n"
3109
"been. In this case the repository may be unusable."
3110
msgstr ""
3111
3112
#: bzrlib/builtins.py:5095
3113
msgid "Delete obsolete packs to save disk space."
3114
msgstr "Hapus paket usang untuk menghemat ruang disk."
3115
3116
#: bzrlib/builtins.py:5109
3117
msgid "List the installed plugins."
3118
msgstr "Daftar plugin yang terpasang."
3119
3120
#: bzrlib/builtins.py:5111
3121
msgid ""
3122
"This command displays the list of installed plugins including\n"
3123
"version of plugin and a short description of each."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5114
3127
msgid "--verbose shows the path where each plugin is located."
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:5116
3131
msgid ""
3132
"A plugin is an external component for Bazaar that extends the\n"
3133
"revision control system, by adding or replacing code in Bazaar.\n"
3134
"Plugins can do a variety of things, including overriding commands,\n"
3135
"adding new commands, providing additional network transports and\n"
3136
"customizing log output."
3137
msgstr ""
3138
3139
#: bzrlib/builtins.py:5122
3140
msgid ""
3141
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3142
"for further information on plugins including where to find them and how to\n"
3143
"install them. Instructions are also provided there on how to write new\n"
3144
"plugins using the Python programming language."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:5138
3148
msgid "Show testament (signing-form) of a revision."
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:5141
3152
msgid "Produce long-format testament."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:5143
3156
msgid "Produce a strict-format testament."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:5169
3160
msgid "Show the origin of each line in a file."
3161
msgstr ""
3162
3163
#: bzrlib/builtins.py:5171
3164
msgid ""
3165
"This prints out the given file with an annotation on the left side\n"
3166
"indicating which revision, author and date introduced the change."
3167
msgstr ""
3168
3169
#: bzrlib/builtins.py:5174
3170
msgid ""
3171
"If the origin is the same for a run of consecutive lines, it is\n"
3172
"shown only at the top, unless the --all option is given."
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:5182
3176
msgid "Show annotations on all lines."
3177
msgstr ""
3178
3179
#: bzrlib/builtins.py:5183
3180
msgid "Show commit date in annotations."
3181
msgstr ""
3182
3183
#: bzrlib/builtins.py:5270
3184
msgid "Cannot sign a range of non-revision-history revisions"
3185
msgstr ""
3186
3187
#: bzrlib/builtins.py:5282
3188
msgid "Please supply either one revision, or a range."
3189
msgstr ""
3190
3191
#: bzrlib/builtins.py:5286
3192
msgid ""
3193
"Convert the current branch into a checkout of the supplied branch.\n"
3194
"If no branch is supplied, rebind to the last bound location."
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5289
3198
msgid ""
3199
"Once converted into a checkout, commits must succeed on the master branch\n"
3200
"before they will be applied to the local branch."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5292
3204
msgid ""
3205
"Bound branches use the nickname of its master branch unless it is set\n"
3206
"locally, in which case binding will update the local nickname to be\n"
3207
"that of the master."
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:5307
3211
msgid "No location supplied. This format does not remember old locations."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5313
3215
msgid "Branch is already bound"
3216
msgstr ""
3217
3218
#: bzrlib/builtins.py:5316
3219
msgid "No location supplied and no previous location known"
3220
msgstr ""
3221
3222
#: bzrlib/builtins.py:5322
3223
msgid "These branches have diverged. Try merging, and then bind again."
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:5329
3227
msgid "Convert the current checkout into a regular branch."
3228
msgstr ""
3229
3230
#: bzrlib/builtins.py:5331
3231
msgid ""
3232
"After unbinding, the local branch is considered independent and subsequent\n"
3233
"commits will be local only."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5342
3237
msgid "Local branch is not bound"
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5346
3241
msgid "Remove the last committed revision."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5348
3245
msgid ""
3246
"--verbose will print out what is being removed.\n"
3247
"--dry-run will go through all the motions, but not actually\n"
3248
"remove anything."
3249
msgstr ""
3250
3251
#: bzrlib/builtins.py:5352
3252
msgid ""
3253
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3254
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3255
"branch at revision 15."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5356
3259
msgid ""
3260
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3261
"it may make is to restore any pending merges that were present before\n"
3262
"the commit."
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5367
3266
msgid "Don't actually make changes."
3267
msgstr ""
3268
3269
#: bzrlib/builtins.py:5368
3270
msgid "Say yes to all questions."
3271
msgstr ""
3272
3273
#: bzrlib/builtins.py:5370
3274
msgid "Keep tags that point to removed revisions."
3275
msgstr ""
3276
3277
#: bzrlib/builtins.py:5372
3278
msgid "Only remove the commits from the local branch when in a checkout."
3279
msgstr ""
3280
3281
#: bzrlib/builtins.py:5421
3282
msgid "No revisions to uncommit.\n"
3283
msgstr ""
3284
3285
#: bzrlib/builtins.py:5436
3286
msgid "Dry-run, pretending to remove the above revisions.\n"
3287
msgstr ""
3288
3289
#: bzrlib/builtins.py:5439
3290
msgid "The above revision(s) will be removed.\n"
3291
msgstr ""
3292
3293
#: bzrlib/builtins.py:5443
3294
msgid "Uncommit these revisions"
3295
msgstr ""
3296
3297
#: bzrlib/builtins.py:5446
3298
msgid "Canceled\n"
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5453
3302
#, python-format
3303
msgid ""
3304
"You can restore the old tip by running:\n"
3305
" bzr pull . -r revid:%s\n"
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:5458
3309
msgid "Break a dead lock."
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:5460
3313
msgid ""
3314
"This command breaks a lock on a repository, branch, working directory or\n"
3315
"config file."
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:5463
3319
msgid ""
3320
"CAUTION: Locks should only be broken when you are sure that the process\n"
3321
"holding the lock has been stopped."
3322
msgstr ""
3323
3324
#: bzrlib/builtins.py:5466
3325
msgid ""
3326
"You can get information on what locks are open via the 'bzr info\n"
3327
"[location]' command."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5469
3331
msgid ""
3332
":Examples:\n"
3333
" bzr break-lock\n"
3334
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3335
" bzr break-lock --conf ~/.bazaar"
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:5478
3339
msgid "LOCATION is the directory where the config lock is."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5480
3343
msgid "Do not ask for confirmation before breaking the lock."
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:5515
3347
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5516
3351
msgid "Run the bzr server."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5522
3355
msgid "Serve on stdin/out for use from inetd or sshd."
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5523
3359
msgid "protocol"
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5524
3363
msgid "Protocol to serve."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:5528
3367
msgid "Listen for connections on nominated address."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:5530
3371
msgid ""
3372
"Listen for connections on nominated port. Passing 0 as the port number will "
3373
"result in a dynamically allocated port. The default port depends on the "
3374
"protocol."
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:5535
3378
msgid "Serve contents of this directory."
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:5537
3382
msgid ""
3383
"By default the server is a readonly server. Supplying --allow-writes "
3384
"enables write access to the contents of the served directory and below. "
3385
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3386
"of external authentication is arranged supplying this option leads to global "
3387
"uncontrolled write access to your file system."
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5546
3391
msgid "Override the default idle client timeout (5min)."
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5564
3395
msgid "Combine a tree into its containing tree."
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5566
3399
msgid "This command requires the target tree to be in a rich-root format."
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5568
3403
msgid ""
3404
"The TREE argument should be an independent tree, inside another tree, but\n"
3405
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3406
"running \"bzr branch\" with the target inside a tree.)"
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5572
3410
msgid ""
3411
"The result is a combined tree, with the subtree no longer an independent\n"
3412
"part. This is marked as a merge of the subtree into the containing tree,\n"
3413
"and all history is preserved."
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5590
3417
#, python-format
3418
msgid ""
3419
"Can't join trees because %s doesn't support rich root data.\n"
3420
"You can use bzr upgrade on the repository."
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3424
msgid "Cannot join {0}. {1}"
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5610
3428
msgid "Split a subdirectory of a tree into a separate tree."
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5612
3432
msgid ""
3433
"This command will produce a target tree in a format that supports\n"
3434
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3435
"converted into earlier formats like 'dirstate-tags'."
3436
msgstr ""
3437
3438
#: bzrlib/builtins.py:5616
3439
msgid ""
3440
"The TREE argument should be a subdirectory of a working tree. That\n"
3441
"subdirectory will be converted into an independent tree, with its own\n"
3442
"branch. Commits in the top-level tree will not apply to the new subtree."
3443
msgstr ""
3444
3445
#: bzrlib/builtins.py:5696
3446
msgid "No submit branch specified or known"
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3450
msgid "No public branch specified or known"
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5710
3454
msgid "bzr merge-directive takes at most two one revision identifiers"
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5719
3458
msgid "No revisions to bundle."
3459
msgstr ""
3460
3461
#: bzrlib/builtins.py:5738
3462
msgid "Mail or create a merge-directive for submitting changes."
3463
msgstr ""
3464
3465
#: bzrlib/builtins.py:5740
3466
msgid "A merge directive provides many things needed for requesting merges:"
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:5742
3470
msgid "* A machine-readable description of the merge to perform"
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5744
3474
msgid "* An optional patch that is a preview of the changes requested"
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:5746
3478
msgid ""
3479
"* An optional bundle of revision data, so that the changes can be applied\n"
3480
" directly from the merge directive, without retrieving data from a\n"
3481
" branch."
3482
msgstr ""
3483
3484
#: bzrlib/builtins.py:5750
3485
msgid ""
3486
"`bzr send` creates a compact data set that, when applied using bzr\n"
3487
"merge, has the same effect as merging from the source branch. "
3488
msgstr ""
3489
3490
#: bzrlib/builtins.py:5753
3491
msgid ""
3492
"By default the merge directive is self-contained and can be applied to any\n"
3493
"branch containing submit_branch in its ancestory without needing access to\n"
3494
"the source branch."
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5757
3498
msgid ""
3499
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3500
"revisions, but only a structured request to merge from the\n"
3501
"public_location. In that case the public_branch is needed and it must be\n"
3502
"up-to-date and accessible to the recipient. The public_branch is always\n"
3503
"included if known, so that people can check it later."
3504
msgstr ""
3505
3506
#: bzrlib/builtins.py:5763
3507
msgid ""
3508
"The submit branch defaults to the parent of the source branch, but can be\n"
3509
"overridden. Both submit branch and public branch will be remembered in\n"
3510
"branch.conf the first time they are used for a particular branch. The\n"
3511
"source branch defaults to that containing the working directory, but can\n"
3512
"be changed using --from."
3513
msgstr ""
3514
3515
#: bzrlib/builtins.py:5769
3516
msgid ""
3517
"Both the submit branch and the public branch follow the usual behavior with\n"
3518
"respect to --remember: If there is no default location set, the first send\n"
3519
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3520
"omit the location to use the default. To change the default, use\n"
3521
"--remember. The value will only be saved if the location can be accessed."
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:5775
3525
msgid ""
3526
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3527
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3528
"If a public location is known for the submit_branch, that location is used\n"
3529
"in the merge directive."
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5780
3533
msgid ""
3534
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3535
"given, in which case it is sent to a file."
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5783
3539
msgid ""
3540
"Mail is sent using your preferred mail program. This should be transparent\n"
3541
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3542
"If the preferred client can't be found (or used), your editor will be used."
3543
msgstr ""
3544
3545
#: bzrlib/builtins.py:5787
3546
msgid ""
3547
"To use a specific mail program, set the mail_client configuration option.\n"
3548
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3549
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3550
"(MacOS X's\n"
3551
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3552
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3553
"add\n"
3554
"supported clients."
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5794
3558
msgid ""
3559
"If mail is being sent, a to address is required. This can be supplied\n"
3560
"either on the commandline, by setting the submit_to configuration\n"
3561
"option in the branch itself or the child_submit_to configuration option\n"
3562
"in the submit branch."
3563
msgstr ""
3564
3565
#: bzrlib/builtins.py:5799
3566
msgid ""
3567
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3568
"and\n"
3569
"merge directive format 2. It is significantly faster and smaller than\n"
3570
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3571
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3572
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5805
3576
msgid ""
3577
"The merge directives created by bzr send may be applied using bzr merge or\n"
3578
"bzr pull by specifying a file containing a merge directive as the location."
3579
msgstr ""
3580
3581
#: bzrlib/builtins.py:5808
3582
msgid ""
3583
"bzr send makes extensive use of public locations to map local locations "
3584
"into\n"
3585
"URLs that can be used by other people. See `bzr help configuration` to\n"
3586
"set them, and use `bzr info` to display them."
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5832
3590
msgid "Write merge directive to this file or directory; use - for stdout."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5836
3594
msgid ""
3595
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3596
"strict disables the check."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5838
3600
msgid "Mail the request to this address."
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5842
3604
msgid "Body for the email."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5895
3608
msgid "Do not include a bundle in the merge directive."
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5896
3612
msgid "Do not include a preview patch in the merge directive."
3613
msgstr ""
3614
3615
#: bzrlib/builtins.py:5899
3616
msgid "Remember submit and public branch."
3617
msgstr ""
3618
3619
#: bzrlib/builtins.py:5901
3620
msgid ""
3621
"Branch to generate the submission from, rather than the one containing the "
3622
"working directory."
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3626
msgid "format"
3627
msgstr ""
3628
3629
#: bzrlib/builtins.py:5912
3630
msgid "Use the specified output format."
3631
msgstr ""
3632
3633
#: bzrlib/builtins.py:5934
3634
msgid "Create, remove or modify a tag naming a revision."
3635
msgstr ""
3636
3637
#: bzrlib/builtins.py:5936
3638
msgid ""
3639
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3640
"(--revision) option can be given -rtag:X, where X is any previously\n"
3641
"created tag."
3642
msgstr ""
3643
3644
#: bzrlib/builtins.py:5940
3645
msgid ""
3646
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3647
"along when you branch, push, pull or merge."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5943
3651
msgid ""
3652
"It is an error to give a tag name that already exists unless you pass\n"
3653
"--force, in which case the tag is moved to point to the new revision."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5946
3657
msgid ""
3658
"To rename a tag (change the name but keep it on the same revsion), run "
3659
"``bzr\n"
3660
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3661
msgstr ""
3662
3663
#: bzrlib/builtins.py:5949
3664
msgid ""
3665
"If no tag name is specified it will be determined through the \n"
3666
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3667
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3668
"details."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:5959
3672
msgid "Delete this tag rather than placing it."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5962
3676
msgid "Branch in which to place the tag."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5964
3680
msgid "Replace existing tags."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:5979
3684
msgid "No tag specified to delete."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5981
3688
#, python-format
3689
msgid "Deleted tag %s."
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:5995
3693
msgid "Please specify a tag name."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:6003
3697
#, python-format
3698
msgid "Tag %s already exists for that revision."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:6007
3702
#, python-format
3703
msgid "Created tag %s."
3704
msgstr ""
3705
3706
#: bzrlib/builtins.py:6009
3707
#, python-format
3708
msgid "Updated tag %s."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:6013
3712
msgid "List tags."
3713
msgstr ""
3714
3715
#: bzrlib/builtins.py:6015
3716
msgid ""
3717
"This command shows a table of tag names and the revisions they reference."
3718
msgstr ""
3719
3720
#: bzrlib/builtins.py:6021
3721
msgid "Branch whose tags should be displayed."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:6023
3725
msgid "Sort tags by different criteria."
3726
msgstr ""
3727
3728
#: bzrlib/builtins.py:6023
3729
msgid "Sorting"
3730
msgstr ""
3731
3732
#: bzrlib/builtins.py:6092
3733
msgid "Reconfigure the type of a bzr directory."
3734
msgstr ""
3735
3736
#: bzrlib/builtins.py:6094
3737
msgid "A target configuration must be specified."
3738
msgstr ""
3739
3740
#: bzrlib/builtins.py:6096
3741
msgid ""
3742
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3743
"The order of preference is\n"
3744
"1. For a lightweight checkout, the current bound location.\n"
3745
"2. For branches that used to be checkouts, the previously-bound location.\n"
3746
"3. The push location.\n"
3747
"4. The parent location.\n"
3748
"If none of these is available, --bind-to must be specified."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6110
3752
msgid "Tree type"
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6111
3756
msgid "The relation between branch and tree."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6113
3760
msgid "Reconfigure to be an unbound branch with no working tree."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6114
3764
msgid "Reconfigure to be an unbound branch with a working tree."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:6115
3768
msgid "Reconfigure to be a bound branch with a working tree."
3769
msgstr ""
3770
3771
#: bzrlib/builtins.py:6116
3772
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3773
msgstr ""
3774
3775
#: bzrlib/builtins.py:6121
3776
msgid "Repository type"
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:6122
3780
msgid "Location fo the repository."
3781
msgstr ""
3782
3783
#: bzrlib/builtins.py:6124
3784
msgid ""
3785
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3786
msgstr ""
3787
3788
#: bzrlib/builtins.py:6126
3789
msgid "Reconfigure to use a shared repository."
3790
msgstr ""
3791
3792
#: bzrlib/builtins.py:6130
3793
msgid "Trees in Repository"
3794
msgstr ""
3795
3796
#: bzrlib/builtins.py:6131
3797
msgid "Whether new branches in the repository have trees."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:6133
3801
msgid ""
3802
"Reconfigure repository to create working trees on branches by default."
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:6135
3806
msgid ""
3807
"Reconfigure repository to not create working trees on branches by default."
3808
msgstr ""
3809
3810
#: bzrlib/builtins.py:6138
3811
msgid "Branch to bind checkout to."
3812
msgstr ""
3813
3814
#: bzrlib/builtins.py:6140
3815
msgid "Perform reconfiguration even if local changes will be lost."
3816
msgstr ""
3817
3818
#: bzrlib/builtins.py:6143
3819
msgid "Reconfigure a branch to be stacked on another branch."
3820
msgstr ""
3821
3822
#: bzrlib/builtins.py:6147
3823
msgid ""
3824
"Reconfigure a branch to be unstacked. This may require copying substantial "
3825
"data into it."
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:6157
3829
msgid "Can't use both --stacked-on and --unstacked"
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:6171
3833
msgid "No target configuration specified"
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:6206
3837
msgid "Set the branch of a checkout and update."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6208
3841
msgid ""
3842
"For lightweight checkouts, this changes the branch being referenced.\n"
3843
"For heavyweight checkouts, this checks that there are no local commits\n"
3844
"versus the current bound branch, then it makes the local branch a mirror\n"
3845
"of the new location and binds to it."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6213
3849
msgid ""
3850
"In both cases, the working tree is updated and uncommitted changes\n"
3851
"are merged. The user can commit or revert these as they desire."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:6216
3855
msgid "Pending merges need to be committed or reverted before using switch."
3856
msgstr ""
3857
3858
#: bzrlib/builtins.py:6218
3859
msgid ""
3860
"The path to the branch to switch to can be specified relative to the parent\n"
3861
"directory of the current branch. For example, if you are currently in a\n"
3862
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3863
"/path/to/newbranch."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:6223
3867
msgid ""
3868
"Bound branches use the nickname of its master branch unless it is set\n"
3869
"locally, in which case switching will update the local nickname to be\n"
3870
"that of the master."
3871
msgstr ""
3872
3873
#: bzrlib/builtins.py:6231
3874
msgid "Switch even if local commits will be lost."
3875
msgstr ""
3876
3877
#: bzrlib/builtins.py:6234
3878
msgid "Create the target branch from this one before switching to it."
3879
msgstr ""
3880
3881
#: bzrlib/builtins.py:6248
3882
msgid "You must supply either a revision or a location"
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6261
3886
msgid "cannot create branch without source branch"
3887
msgstr ""
3888
3889
#: bzrlib/builtins.py:6286
3890
msgid "Manage filtered views."
3891
msgstr ""
3892
3893
#: bzrlib/builtins.py:6288
3894
msgid ""
3895
"Views provide a mask over the tree so that users can focus on\n"
3896
"a subset of a tree when doing their work. After creating a view,\n"
3897
"commands that support a list of files - status, diff, commit, etc -\n"
3898
"effectively have that list of files implicitly given each time.\n"
3899
"An explicit list of files can still be given but those files\n"
3900
"must be within the current view."
3901
msgstr ""
3902
3903
#: bzrlib/builtins.py:6295
3904
msgid ""
3905
"In most cases, a view has a short life-span: it is created to make\n"
3906
"a selected change and is deleted once that change is committed.\n"
3907
"At other times, you may wish to create one or more named views\n"
3908
"and switch between them."
3909
msgstr ""
3910
3911
#: bzrlib/builtins.py:6300
3912
msgid ""
3913
"To disable the current view without deleting it, you can switch to\n"
3914
"the pseudo view called ``off``. This can be useful when you need\n"
3915
"to see the whole tree for an operation or two (e.g. merge) but\n"
3916
"want to switch back to your view after that."
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:6305
3920
msgid ""
3921
":Examples:\n"
3922
" To define the current view::"
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6308
3926
msgid " bzr view file1 dir1 ..."
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6310
3930
msgid " To list the current view::"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6312
3934
msgid " bzr view"
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6314
3938
msgid " To delete the current view::"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6316
3942
msgid " bzr view --delete"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6318
3946
msgid " To disable the current view without deleting it::"
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6320
3950
msgid " bzr view --switch off"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6322
3954
msgid " To define a named view and switch to it::"
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6324
3958
msgid " bzr view --name view-name file1 dir1 ..."
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6326
3962
msgid " To list a named view::"
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6328
3966
msgid " bzr view --name view-name"
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6330
3970
msgid " To delete a named view::"
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6332
3974
msgid " bzr view --name view-name --delete"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6334
3978
msgid " To switch to a named view::"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6336
3982
msgid " bzr view --switch view-name"
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6338
3986
msgid " To list all views defined::"
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6340
3990
msgid " bzr view --all"
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6342
3994
msgid " To delete all views::"
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6344
3998
msgid " bzr view --delete --all"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6351
4002
msgid "Apply list or delete action to all views."
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6354
4006
msgid "Delete the view."
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6357
4010
msgid "Name of the view to define, list or delete."
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6361
4014
msgid "Name of the view to switch to."
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6380
4018
msgid "Both --delete and a file list specified"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:6383
4022
msgid "Both --delete and --switch specified"
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:6386
4026
msgid "Deleted all views.\n"
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6388
4030
msgid "No current view to delete"
4031
msgstr ""
4032
4033
#: bzrlib/builtins.py:6391
4034
#, python-format
4035
msgid "Deleted '%s' view.\n"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6395
4039
msgid "Both --switch and a file list specified"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6398
4043
msgid "Both --switch and --all specified"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6401
4047
msgid "No current view to disable"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6403
4051
#, python-format
4052
msgid "Disabled '%s' view.\n"
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4056
msgid "Using '{0}' view: {1}\n"
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6410
4060
msgid "Views defined:\n"
4061
msgstr ""
4062
4063
#: bzrlib/builtins.py:6419
4064
msgid "No views defined.\n"
4065
msgstr ""
4066
4067
#: bzrlib/builtins.py:6426
4068
msgid "Cannot change the 'off' pseudo view"
4069
msgstr ""
4070
4071
#: bzrlib/builtins.py:6434
4072
msgid "No current view.\n"
4073
msgstr ""
4074
4075
#: bzrlib/builtins.py:6437
4076
msgid "'{0}' view is: {1}\n"
4077
msgstr ""
4078
4079
#: bzrlib/builtins.py:6457
4080
msgid " <no hooks installed>\n"
4081
msgstr ""
4082
4083
#: bzrlib/builtins.py:6461
4084
msgid "Remove a branch."
4085
msgstr ""
4086
4087
#: bzrlib/builtins.py:6463
4088
msgid ""
4089
"This will remove the branch from the specified location but \n"
4090
"will keep any working tree or repository in place."
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6468
4094
msgid " Remove the branch at repo/trunk::"
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:6470
4098
msgid " bzr remove-branch repo/trunk"
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6477
4102
msgid "Remove branch even if it is the active branch."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6491
4106
msgid "Branch is active. Use --force to remove it."
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6495
4110
msgid "Plaintext diff output."
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:6496
4114
msgid "Temporarily set aside some changes from the current tree."
4115
msgstr ""
4116
4117
#: bzrlib/builtins.py:6498
4118
msgid ""
4119
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4120
"ie. out of the way, until a later time when you can bring them back from\n"
4121
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4122
"your working tree, and so they aren't propagated along with your branch nor\n"
4123
"will they survive its deletion."
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6504
4127
msgid "If shelve --list is specified, previously-shelved changes are listed."
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6506
4131
msgid ""
4132
"Shelve is intended to help separate several sets of changes that have\n"
4133
"been inappropriately mingled. If you just want to get rid of all changes\n"
4134
"and you don't need to restore them later, use revert. If you want to\n"
4135
"shelve all text changes at once, use shelve --all."
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6511
4139
msgid ""
4140
"If filenames are specified, only the changes to those files will be\n"
4141
"shelved. Other files will be left untouched."
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6514
4145
msgid ""
4146
"If a revision is specified, changes since that revision will be shelved."
4147
msgstr ""
4148
4149
#: bzrlib/builtins.py:6516
4150
msgid ""
4151
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4152
"restore the most recently shelved changes."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6519
4156
msgid ""
4157
"For complicated changes, it is possible to edit the changes in a separate\n"
4158
"editor program to decide what the file remaining in the working copy\n"
4159
"should look like. To do this, add the configuration option"
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6523
4163
msgid " change_editor = PROGRAM @new_path @old_path"
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6525
4167
msgid ""
4168
"where @new_path is replaced with the path of the new version of the \n"
4169
"file and @old_path is replaced with the path of the old version of \n"
4170
"the file. The PROGRAM should save the new file with the desired \n"
4171
"contents of the file in the working tree.\n"
4172
" "
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6537
4176
msgid "Shelve all changes."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:6539
4180
msgid "Method to use for writing diffs."
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:6539
4184
msgid "writer"
4185
msgstr ""
4186
4187
#: bzrlib/builtins.py:6543
4188
msgid "List shelved changes."
4189
msgstr ""
4190
4191
#: bzrlib/builtins.py:6545
4192
msgid "Destroy removed changes instead of shelving them."
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:6574
4196
msgid "No shelved changes."
4197
msgstr ""
4198
4199
#: bzrlib/builtins.py:6585
4200
msgid "Restore shelved changes."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6587
4204
msgid ""
4205
"By default, the most recently shelved changes are restored. However if you\n"
4206
"specify a shelf by id those changes will be restored instead. This works\n"
4207
"best when the changes don't depend on each other."
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6596
4211
msgid "The action to perform."
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4215
msgid "action"
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6598
4219
msgid "Apply changes and remove from the shelf."
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6599
4223
msgid "Show changes, but do not apply or remove them."
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6600
4227
msgid ""
4228
"Instead of unshelving the changes, show the diff that would result from "
4229
"unshelving."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6602
4233
msgid "Delete changes without applying them."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6603
4237
msgid "Apply changes but don't delete them."
4238
msgstr ""
4239
4240
#: bzrlib/builtins.py:6618
4241
msgid "Remove unwanted files from working tree."
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:6620
4245
msgid ""
4246
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4247
"files are never deleted."
4248
msgstr ""
4249
4250
#: bzrlib/builtins.py:6623
4251
msgid ""
4252
"Another class is 'detritus', which includes files emitted by bzr during\n"
4253
"normal operations and selftests. (The value of these files decreases with\n"
4254
"time.)"
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6627
4258
msgid ""
4259
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4260
"flags are respected, and may be combined."
4261
msgstr ""
4262
4263
#: bzrlib/builtins.py:6630
4264
msgid "To check what clean-tree will do, use --dry-run."
4265
msgstr ""
4266
4267
#: bzrlib/builtins.py:6633
4268
msgid "Delete all ignored files."
4269
msgstr ""
4270
4271
#: bzrlib/builtins.py:6634
4272
msgid ""
4273
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4274
msgstr ""
4275
4276
#: bzrlib/builtins.py:6637
4277
msgid "Delete files unknown to bzr (default)."
4278
msgstr ""
4279
4280
#: bzrlib/builtins.py:6638
4281
msgid "Show files to delete instead of deleting them."
4282
msgstr ""
4283
4284
#: bzrlib/builtins.py:6640
4285
msgid "Do not prompt before deleting."
4286
msgstr ""
4287
4288
#: bzrlib/bundle/__init__.py:59
4289
msgid "A directory cannot be a bundle"
4290
msgstr ""
4291
4292
#: bzrlib/bundle/apply_bundle.py:40
4293
msgid "Install revisions"
4294
msgstr ""
4295
4296
#: bzrlib/bundle/commands.py:64
4297
msgid "--verbose requires a merge directive"
4298
msgstr ""
4299
4300
#: bzrlib/bundle/commands.py:67
4301
msgid "Bundle format not supported"
4302
msgstr ""
4303
4304
#: bzrlib/bundle/commands.py:77
4305
msgid "Records\n"
4306
msgstr ""
4307
4308
#: bzrlib/bundle/commands.py:81
4309
msgid "{0}: {1} ({2} multiparent)\n"
4310
msgstr ""
4311
4312
#: bzrlib/bundle/commands.py:83
4313
#, python-format
4314
msgid "unique files: %d\n"
4315
msgstr ""
4316
4317
#: bzrlib/bundle/commands.py:92
4318
msgid "Revisions\n"
4319
msgstr ""
4320
4321
#: bzrlib/bundle/commands.py:93
4322
#, python-format
4323
msgid "nicks: %s\n"
4324
msgstr ""
4325
4326
#: bzrlib/bundle/commands.py:95
4327
#, python-format
4328
msgid ""
4329
"committers: \n"
4330
"%s\n"
4331
msgstr ""
4332
4333
#: bzrlib/bundle/commands.py:103
4334
msgid "Decoded contents\n"
4335
msgstr ""
4336
4337
#: bzrlib/bundle/serializer/v4.py:327
4338
#, python-format
4339
msgid "Bundling %d revision."
4340
msgid_plural "Bundling %d revisions."
4341
msgstr[0] ""
4342
msgstr[1] ""
4343
4344
#: bzrlib/bzrdir.py:487
4345
msgid ""
4346
"making backup of {0}\n"
4347
" to {1}"
4348
msgstr ""
4349
4350
#: bzrlib/bzrdir.py:510
4351
msgid "renamed {0} to {1}"
4352
msgstr ""
4353
4354
#: bzrlib/bzrdir.py:1639
4355
#, python-format
4356
msgid ""
4357
"Source repository format does not support stacking, using format:\n"
4358
" %s"
4359
msgstr ""
4360
4361
#: bzrlib/bzrdir.py:1659
4362
#, python-format
4363
msgid ""
4364
"Source branch format does not support stacking, using format:\n"
4365
" %s"
4366
msgstr ""
4367
4368
#: bzrlib/bzrdir.py:1805
4369
msgid "starting repository conversion"
4370
msgstr ""
4371
4372
#: bzrlib/bzrdir.py:2026
4373
msgid "Using default stacking branch {0} at {1}"
4374
msgstr ""
4375
4376
#: bzrlib/check.py:108
4377
msgid "check"
4378
msgstr ""
4379
4380
#: bzrlib/check.py:110
4381
msgid "checking revisions"
4382
msgstr ""
4383
4384
#: bzrlib/check.py:112
4385
msgid "checking commit contents"
4386
msgstr ""
4387
4388
#: bzrlib/check.py:114
4389
msgid "checking file graphs"
4390
msgstr ""
4391
4392
#: bzrlib/check.py:118
4393
msgid "checking branches and trees"
4394
msgstr ""
4395
4396
#: bzrlib/check.py:205
4397
msgid "checked repository {0} format {1}"
4398
msgstr ""
4399
4400
#: bzrlib/check.py:208
4401
#, python-format
4402
msgid "%6d revisions"
4403
msgstr ""
4404
4405
#: bzrlib/check.py:209
4406
#, python-format
4407
msgid "%6d file-ids"
4408
msgstr ""
4409
4410
#: bzrlib/check.py:211
4411
#, python-format
4412
msgid "%6d unreferenced text versions"
4413
msgstr ""
4414
4415
#: bzrlib/check.py:215
4416
msgid "unreferenced version: {{{0}}} in {1}"
4417
msgstr ""
4418
4419
#: bzrlib/check.py:218
4420
#, python-format
4421
msgid "%6d revisions are missing inventory_sha1"
4422
msgstr ""
4423
4424
#: bzrlib/check.py:221
4425
#, python-format
4426
msgid "%6d revisions are mentioned but not present"
4427
msgstr ""
4428
4429
#: bzrlib/check.py:224
4430
#, python-format
4431
msgid "%6d ghost revisions"
4432
msgstr ""
4433
4434
#: bzrlib/check.py:229
4435
#, python-format
4436
msgid "%6d revisions missing parents in ancestry"
4437
msgstr ""
4438
4439
#: bzrlib/check.py:233
4440
#, python-format
4441
msgid " %s should be in the ancestry for:"
4442
msgstr ""
4443
4444
#: bzrlib/check.py:237
4445
#, python-format
4446
msgid "%6d inconsistent parents"
4447
msgstr ""
4448
4449
#: bzrlib/check.py:241
4450
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4451
msgstr ""
4452
4453
#: bzrlib/check.py:247
4454
#, python-format
4455
msgid "%6d revisions have incorrect parents in the revision index"
4456
msgstr ""
4457
4458
#: bzrlib/check.py:253
4459
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4460
msgstr ""
4461
4462
#: bzrlib/check.py:267
4463
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4464
msgstr ""
4465
4466
#: bzrlib/check.py:296
4467
msgid ""
4468
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4469
"{{{4}}}"
4470
msgstr ""
4471
4472
#: bzrlib/check.py:354
4473
#, python-format
4474
msgid "Checking branch at '%s'."
4475
msgstr ""
4476
4477
#: bzrlib/check.py:374
4478
#, python-format
4479
msgid "Checking working tree at '%s'."
4480
msgstr ""
4481
4482
#: bzrlib/check.py:427 bzrlib/check.py:441
4483
msgid "No branch found at specified location."
4484
msgstr ""
4485
4486
#: bzrlib/check.py:429 bzrlib/check.py:439
4487
msgid "No working tree found at specified location."
4488
msgstr ""
4489
4490
#: bzrlib/check.py:432
4491
#, python-format
4492
msgid "Checking repository at '%s'."
4493
msgstr ""
4494
4495
#: bzrlib/check.py:443
4496
msgid "No repository found at specified location."
4497
msgstr ""
4498
4499
#: bzrlib/clean_tree.py:63
4500
msgid "Nothing to delete."
4501
msgstr ""
4502
4503
#: bzrlib/clean_tree.py:68
4504
msgid "Are you sure you wish to delete these"
4505
msgstr ""
4506
4507
#: bzrlib/clean_tree.py:70
4508
msgid "Canceled"
4509
msgstr ""
4510
4511
#: bzrlib/clean_tree.py:107
4512
#, python-format
4513
msgid "unable to remove %s"
4514
msgstr ""
4515
4516
#: bzrlib/clean_tree.py:111
4517
msgid "deleting paths:"
4518
msgstr ""
4519
4520
#: bzrlib/clean_tree.py:125
4521
msgid "unable to remove \"{0}\": {1}."
4522
msgstr ""
4523
4524
#: bzrlib/clean_tree.py:130
4525
msgid "No files deleted."
4526
msgstr ""
4527
4528
#: bzrlib/cmd_version_info.py:47
4529
msgid "No known version info format {0}. Supported types are: {1}"
4530
msgstr ""
4531
4532
#: bzrlib/cmd_version_info.py:52
4533
msgid "Version info in Custom template-based format."
4534
msgstr ""
4535
4536
#: bzrlib/cmd_version_info.py:52
4537
msgid "Version info in Python format."
4538
msgstr ""
4539
4540
#: bzrlib/cmd_version_info.py:52
4541
msgid "Version info in RIO (simple text) format (default)."
4542
msgstr ""
4543
4544
#: bzrlib/cmd_version_info.py:53
4545
msgid "Show version information about this tree."
4546
msgstr ""
4547
4548
#: bzrlib/cmd_version_info.py:55
4549
msgid ""
4550
"You can use this command to add information about version into\n"
4551
"source code of an application. The output can be in one of the\n"
4552
"supported formats or in a custom format based on a template."
4553
msgstr ""
4554
4555
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4556
#: en/help_topics/configuration.txt:722
4557
msgid "For example::"
4558
msgstr ""
4559
4560
#: bzrlib/cmd_version_info.py:61
4561
msgid ""
4562
" bzr version-info --custom \\\n"
4563
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:64
4567
msgid ""
4568
"will produce a C header file with formatted string containing the\n"
4569
"current revision number. Other supported variables in templates are:"
4570
msgstr ""
4571
4572
#: bzrlib/cmd_version_info.py:67
4573
msgid ""
4574
" * {date} - date of the last revision\n"
4575
" * {build_date} - current date\n"
4576
" * {revno} - revision number\n"
4577
" * {revision_id} - revision id\n"
4578
" * {branch_nick} - branch nickname\n"
4579
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4580
" otherwise 1"
4581
msgstr ""
4582
4583
#: bzrlib/cmd_version_info.py:77
4584
msgid "Select the output format."
4585
msgstr ""
4586
4587
#: bzrlib/cmd_version_info.py:81
4588
msgid "Include all possible information."
4589
msgstr ""
4590
4591
#: bzrlib/cmd_version_info.py:82
4592
msgid "Check if tree is clean."
4593
msgstr ""
4594
4595
#: bzrlib/cmd_version_info.py:84
4596
msgid "Include the revision-history."
4597
msgstr ""
4598
4599
#: bzrlib/cmd_version_info.py:86
4600
msgid "Include the last revision for each file."
4601
msgstr ""
4602
4603
#: bzrlib/cmd_version_info.py:87
4604
msgid "Template for the output."
4605
msgstr ""
4606
4607
#: bzrlib/cmd_version_info.py:101
4608
msgid "bzr version-info --revision takes exactly one revision specifier"
4609
msgstr ""
4610
4611
#: bzrlib/commands.py:229
4612
#, python-format
4613
msgid "unknown command \"%s\""
4614
msgstr ""
4615
4616
#: bzrlib/commands.py:476
4617
msgid "No help for this command."
4618
msgstr ""
4619
4620
#: bzrlib/commands.py:489
4621
#, python-format
4622
msgid ":Purpose: %s\n"
4623
msgstr ""
4624
4625
#: bzrlib/commands.py:491
4626
#, python-format
4627
msgid ""
4628
":Usage:\n"
4629
"%s\n"
4630
msgstr ""
4631
4632
#: bzrlib/commands.py:493
4633
#, python-format
4634
msgid ":Usage: %s\n"
4635
msgstr ""
4636
4637
#: bzrlib/commands.py:512
4638
#, python-format
4639
msgid ":Options:%s"
4640
msgstr ""
4641
4642
#: bzrlib/commands.py:523
4643
#, python-format
4644
msgid ""
4645
":Description:\n"
4646
" %s\n"
4647
"\n"
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:533
4651
#, python-format
4652
msgid ""
4653
"See bzr help %s for more details and examples.\n"
4654
"\n"
4655
msgstr ""
4656
4657
#: bzrlib/commands.py:538
4658
msgid ":Aliases: "
4659
msgstr ""
4660
4661
#: bzrlib/commands.py:542
4662
#, python-format
4663
msgid ":From: plugin \"%s\"\n"
4664
msgstr ""
4665
4666
#: bzrlib/commands.py:554
4667
msgid ":doc:`{0} <{1}-help>`"
4668
msgstr ""
4669
4670
#: bzrlib/commands.py:558
4671
#, python-format
4672
msgid ":See also: %s"
4673
msgstr ""
4674
4675
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4676
msgid "Only ASCII permitted in option names"
4677
msgstr ""
4678
4679
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4680
msgid "command {0!r} needs one or more {1}"
4681
msgstr ""
4682
4683
#: bzrlib/commands.py:868
4684
msgid "command {0!r} requires argument {1}"
4685
msgstr ""
4686
4687
#: bzrlib/commands.py:875
4688
msgid "extra argument to command {0}: {1}"
4689
msgstr ""
4690
4691
#: bzrlib/commands.py:972
4692
#, python-format
4693
msgid "Profile data written to \"%s\"."
4694
msgstr ""
4695
4696
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4697
msgid "added"
4698
msgstr ""
4699
4700
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4701
msgid "modified"
4702
msgstr ""
4703
4704
#: bzrlib/commit.py:131
4705
#, python-format
4706
msgid "Committing%s"
4707
msgstr ""
4708
4709
#: bzrlib/commit.py:134
4710
#, python-format
4711
msgid "Committed revision %d."
4712
msgstr ""
4713
4714
#: bzrlib/commit.py:143
4715
#, python-format
4716
msgid "deleted %s"
4717
msgstr ""
4718
4719
#: bzrlib/commit.py:146
4720
#, python-format
4721
msgid "missing %s"
4722
msgstr ""
4723
4724
#: bzrlib/commit.py:511
4725
msgid ""
4726
"Conflicting tags in bound branch:\n"
4727
"{0}"
4728
msgstr ""
4729
4730
#: bzrlib/commit.py:742
4731
msgid "renamed"
4732
msgstr ""
4733
4734
#: bzrlib/commit.py:976
4735
msgid "unchanged"
4736
msgstr ""
4737
4738
#: bzrlib/commit.py:998
4739
msgid "{0} [{1}] - Stage"
4740
msgstr ""
4741
4742
#: bzrlib/commit.py:1001
4743
#, python-format
4744
msgid "%s - Stage"
4745
msgstr ""
4746
4747
#: bzrlib/commit_signature_commands.py:34
4748
msgid "Sign all commits by a given committer."
4749
msgstr ""
4750
4751
#: bzrlib/commit_signature_commands.py:36
4752
msgid ""
4753
"If location is not specified the local tree is used.\n"
4754
"If committer is not specified the default committer is used."
4755
msgstr ""
4756
4757
#: bzrlib/commit_signature_commands.py:39
4758
msgid "This does not sign commits that already have signatures."
4759
msgstr ""
4760
4761
#: bzrlib/commit_signature_commands.py:47
4762
msgid ""
4763
"Don't actually sign anything, just print the revisions that would be signed."
4764
msgstr ""
4765
4766
#: bzrlib/commit_signature_commands.py:98
4767
#, python-format
4768
msgid "Signed %d revision.\n"
4769
msgid_plural "Signed %d revisions.\n"
4770
msgstr[0] ""
4771
msgstr[1] ""
4772
4773
#: bzrlib/commit_signature_commands.py:103
4774
msgid "Verify all commit signatures."
4775
msgstr ""
4776
4777
#: bzrlib/commit_signature_commands.py:105
4778
msgid ""
4779
"Verifies that all commits in the branch are signed by known GnuPG keys."
4780
msgstr ""
4781
4782
#: bzrlib/commit_signature_commands.py:110
4783
msgid ""
4784
"Comma separated list of GPG key patterns which are acceptable for "
4785
"verification."
4786
msgstr ""
4787
4788
#: bzrlib/commit_signature_commands.py:148
4789
msgid "Cannot verify a range of non-revision-history revisions"
4790
msgstr ""
4791
4792
#: bzrlib/commit_signature_commands.py:166
4793
msgid "All commits signed with verifiable keys"
4794
msgstr ""
4795
4796
#: bzrlib/config.py:436
4797
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4798
msgstr ""
4799
4800
#: bzrlib/config.py:2452
4801
msgid "{0} is not an SI unit."
4802
msgstr ""
4803
4804
#: bzrlib/config.py:2971
4805
msgid ""
4806
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4807
"will be saved."
4808
msgstr ""
4809
4810
#: bzrlib/config.py:3116
4811
#, python-format
4812
msgid "Invalid '%s', should be of the form 'name=value'"
4813
msgstr ""
4814
4815
#: bzrlib/config.py:4018
4816
msgid "Display, set or remove a configuration option."
4817
msgstr ""
4818
4819
#: bzrlib/config.py:4020
4820
msgid "Display the active value for a given option."
4821
msgstr ""
4822
4823
#: bzrlib/config.py:4022
4824
msgid ""
4825
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4826
"matching options are displayed mentioning their scope. The active value\n"
4827
"that bzr will take into account is the first one displayed for each option."
4828
msgstr ""
4829
4830
#: bzrlib/config.py:4026
4831
msgid "If no NAME is given, --all .* is implied."
4832
msgstr ""
4833
4834
#: bzrlib/config.py:4028
4835
msgid ""
4836
"Setting a value is achieved by using name=value without spaces. The value\n"
4837
"is set in the most relevant scope and can be checked by displaying the\n"
4838
"option again."
4839
msgstr ""
4840
4841
#: bzrlib/config.py:4040
4842
msgid "Reduce the scope to the specified configuration file."
4843
msgstr ""
4844
4845
#: bzrlib/config.py:4044
4846
msgid "Display all the defined values for the matching options."
4847
msgstr ""
4848
4849
#: bzrlib/config.py:4046
4850
msgid "Remove the option from the configuration file."
4851
msgstr ""
4852
4853
#: bzrlib/conflicts.py:50
4854
msgid "List files with conflicts."
4855
msgstr ""
4856
4857
#: bzrlib/conflicts.py:57
4858
msgid ""
4859
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4860
"is supplied, the pathnames of files with text conflicts are listed,\n"
4861
"instead. (This is useful for editing all files with text conflicts.)"
4862
msgstr ""
4863
4864
#: bzrlib/conflicts.py:61
4865
msgid "Use bzr resolve when you have fixed a problem."
4866
msgstr ""
4867
4868
#: bzrlib/conflicts.py:66
4869
msgid "List paths of files with text conflicts."
4870
msgstr ""
4871
4872
#: bzrlib/conflicts.py:85
4873
msgid "Marks the conflict as resolved."
4874
msgstr ""
4875
4876
#: bzrlib/conflicts.py:88
4877
msgid "Resolve the conflict preserving the version in the working tree."
4878
msgstr ""
4879
4880
#: bzrlib/conflicts.py:91
4881
msgid "Resolve the conflict taking the merged version into account."
4882
msgstr ""
4883
4884
#: bzrlib/conflicts.py:98
4885
msgid "How to resolve the conflict."
4886
msgstr ""
4887
4888
#: bzrlib/conflicts.py:104
4889
msgid "Mark a conflict as resolved."
4890
msgstr ""
4891
4892
#: bzrlib/conflicts.py:111
4893
msgid ""
4894
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4895
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4896
"as\n"
4897
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4898
msgstr ""
4899
4900
#: bzrlib/conflicts.py:119
4901
msgid "Resolve all conflicts in this tree."
4902
msgstr ""
4903
4904
#: bzrlib/conflicts.py:126
4905
msgid "If --all is specified, no FILE may be provided"
4906
msgstr ""
4907
4908
#: bzrlib/conflicts.py:151
4909
#, python-format
4910
msgid "%d conflict auto-resolved."
4911
msgid_plural "%d conflicts auto-resolved."
4912
msgstr[0] ""
4913
msgstr[1] ""
4914
4915
#: bzrlib/conflicts.py:154
4916
msgid "Remaining conflicts:"
4917
msgstr ""
4918
4919
#: bzrlib/conflicts.py:159
4920
msgid "All conflicts resolved."
4921
msgstr ""
4922
4923
#: bzrlib/conflicts.py:168
4924
msgid "{0} conflict resolved, {1} remaining"
4925
msgid_plural "{0} conflicts resolved, {1} remaining"
4926
msgstr[0] ""
4927
msgstr[1] ""
4928
4929
#: bzrlib/controldir.py:712
4930
msgid "{0} is{1} redirected to {2}"
4931
msgstr ""
4932
4933
#: bzrlib/diff.py:399
4934
#, python-format
4935
msgid "*** Ignoring files outside view. View is %s"
4936
msgstr ""
4937
4938
#: bzrlib/errors.py:157
4939
msgid "The tree builder is already building a tree."
4940
msgstr ""
4941
4942
#: bzrlib/errors.py:178
4943
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4944
msgstr ""
4945
4946
#: bzrlib/errors.py:197
4947
msgid ""
4948
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4949
"versions \"%(minimum)s\" to \"%(current)s\"."
4950
msgstr ""
4951
4952
#: bzrlib/errors.py:209
4953
msgid "The transport '%(transport)s' is only accessible within this process."
4954
msgstr ""
4955
4956
#: bzrlib/errors.py:227
4957
msgid "Invalid revision number %(revno)s"
4958
msgstr ""
4959
4960
#: bzrlib/errors.py:236
4961
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4962
msgstr ""
4963
4964
#: bzrlib/errors.py:247
4965
msgid "Reserved revision-id {%(revision_id)s}"
4966
msgstr ""
4967
4968
#: bzrlib/errors.py:261
4969
msgid "There is no public branch set for \"%(branch_url)s\"."
4970
msgstr ""
4971
4972
#: bzrlib/errors.py:271
4973
msgid ""
4974
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4975
"obtain a list of topics."
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:280
4979
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:290
4983
msgid ""
4984
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:299
4988
msgid "The branch '%(branch)s' is not stacked."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:313
4992
msgid "No WorkingTree exists for \"%(base)s\"."
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:322
4996
msgid "Not currently building a tree."
4997
msgstr ""
4998
4999
#: bzrlib/errors.py:327
5000
msgid "%(url)s is not a local path."
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:355
5004
msgid "%(not_locked)r is not write locked but needs to be."
5005
msgstr ""
5006
5007
#: bzrlib/errors.py:363
5008
msgid "Error in command line options"
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:368
5012
msgid "%(value)s is not an index of type %(_type)s."
5013
msgstr ""
5014
5015
#: bzrlib/errors.py:378
5016
msgid "Error in data for index %(value)s."
5017
msgstr ""
5018
5019
#: bzrlib/errors.py:387
5020
msgid "The key '%(key)s' is already in index '%(index)s'."
5021
msgstr ""
5022
5023
#: bzrlib/errors.py:397
5024
msgid "The key '%(key)s' is not a valid key."
5025
msgstr ""
5026
5027
#: bzrlib/errors.py:406
5028
msgid "Could not parse options for index %(value)s."
5029
msgstr ""
5030
5031
#: bzrlib/errors.py:415
5032
msgid "The value '%(value)s' is not a valid value."
5033
msgstr ""
5034
5035
#: bzrlib/errors.py:424
5036
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5037
msgstr ""
5038
5039
#: bzrlib/errors.py:443
5040
msgid "Generic path error: %(path)r%(extra)s)"
5041
msgstr ""
5042
5043
#: bzrlib/errors.py:456
5044
msgid "No such file: %(path)r%(extra)s"
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:461
5048
msgid "File exists: %(path)r%(extra)s"
5049
msgstr ""
5050
5051
#: bzrlib/errors.py:467
5052
msgid ""
5053
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5054
"after to tell bzr about a rename that has already happened)%(extra)s"
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:483
5058
msgid "\"%(path)s\" is not a directory %(extra)s"
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:488
5062
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:493
5066
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:498
5070
msgid "Hard-linking \"%(path)s\" is not supported"
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:513
5074
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:518
5078
msgid "Permission denied: \"%(path)s\"%(extra)s"
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:523
5082
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:528
5086
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:539
5090
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:561
5094
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:571
5098
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:579
5102
msgid ""
5103
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5104
"upgrade the branch to permit branch stacking."
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:590
5108
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5109
msgstr ""
5110
5111
#: bzrlib/errors.py:600
5112
msgid ""
5113
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5114
"need to upgrade the repository to permit branch stacking."
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:611
5118
msgid "Error reading from %(path)r."
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:630
5122
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:646
5126
msgid "Path \"%(path)s\" is not unicode normalized"
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:654
5130
msgid "Not a branch: \"%(path)s\"%(detail)s."
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:696
5134
msgid "No submit branch available for branch \"%(path)s\""
5135
msgstr ""
5136
5137
#: bzrlib/errors.py:705
5138
msgid "A control directory already exists: \"%(path)s\"."
5139
msgstr ""
5140
5141
#: bzrlib/errors.py:710
5142
msgid "Already a branch: \"%(path)s\"."
5143
msgstr ""
5144
5145
#: bzrlib/errors.py:715
5146
msgid "Invalid branch name: %(name)s"
5147
msgstr ""
5148
5149
#: bzrlib/errors.py:724
5150
msgid "Parent branch already exists: \"%(path)s\"."
5151
msgstr ""
5152
5153
#: bzrlib/errors.py:730
5154
msgid ""
5155
"Directory contains a branch, but no working tree (use bzr checkout if you "
5156
"wish to build a working tree): \"%(path)s\""
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:735
5160
msgid ""
5161
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5162
msgstr ""
5163
5164
#: bzrlib/errors.py:745
5165
msgid ""
5166
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:755
5170
msgid "No repository present: \"%(path)s\""
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:762
5174
msgid ""
5175
"Unsupported branch format: %(format)s\n"
5176
"Please run 'bzr upgrade'"
5177
msgstr ""
5178
5179
#: bzrlib/errors.py:768
5180
msgid "Unknown %(kind)s format: %(format)r"
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:777
5184
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:787
5188
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:802
5192
msgid ""
5193
"%(target)s\n"
5194
"is not compatible with\n"
5195
"%(source)s\n"
5196
"%(details)s"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:818
5200
msgid "Revision is not compatible with %(repo_format)s"
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:828
5204
msgid "%(context_info)s%(path)s is already versioned."
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:849
5208
msgid "%(context_info)s%(path)s is not versioned."
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:870
5212
msgid "Path(s) are not versioned: %(paths_as_string)s"
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:881
5216
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:900
5220
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:908
5224
msgid ""
5225
"Filename %(filename)r is not valid in your current filesystem encoding "
5226
"%(fs_encoding)s"
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:919
5230
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:937
5234
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:976
5238
msgid "Cannot lock %(lock)s: %(why)s"
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:986
5242
msgid ""
5243
"A transaction related operation was attempted after the transaction finished."
5244
msgstr ""
5245
5246
#: bzrlib/errors.py:1013
5247
msgid "Cannot lock: transport is read only: %(transport)s"
5248
msgstr ""
5249
5250
#: bzrlib/errors.py:1021
5251
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1032
5255
msgid ""
5256
"Lock was broken while still open: %(lock)s - check storage consistency!"
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:1043
5260
msgid ""
5261
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5262
"%(holder)r, wanted to break %(target)r"
5263
msgstr ""
5264
5265
#: bzrlib/errors.py:1055
5266
msgid ""
5267
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5268
"Use 'bzr break-lock' to clear it"
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:1068
5272
msgid "Lock not held: %(lock)s"
5273
msgstr ""
5274
5275
#: bzrlib/errors.py:1097
5276
msgid "No changes to commit"
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1102
5280
msgid ""
5281
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:1112
5285
msgid ""
5286
"Excluding paths during commit is not supported by repository at "
5287
"%(repository)r."
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:1121
5291
msgid ""
5292
"The specified commit message contains characters unsupported by the current "
5293
"encoding."
5294
msgstr ""
5295
5296
#: bzrlib/errors.py:1127
5297
msgid "Upgrade URL cannot work with readonly URLs."
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:1132
5301
msgid "The branch format %(format)s is already at the most recent format."
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:1155
5305
msgid "Option --change does not accept revision ranges"
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:1160
5309
msgid "No namespace registered for string: %(spec)r"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:1179
5313
msgid ""
5314
"Requested revision: '%(spec)s' does not exist in branch: "
5315
"%(branch_url)s%(extra)s"
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:1193
5319
msgid ""
5320
"Operation denied because it would change the main history, which is not "
5321
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1204
5325
msgid ""
5326
"These branches have diverged. Use the missing command to see how.\n"
5327
"Use the merge command to reconcile them."
5328
msgstr ""
5329
5330
#: bzrlib/errors.py:1224
5331
msgid ""
5332
"Branches have no common ancestor, and no merge base revision was specified."
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:1230
5336
msgid ""
5337
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1236
5341
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1245
5345
msgid ""
5346
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1254
5350
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1263
5354
msgid "Branch %(branch)s has no commits."
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:1281
5358
msgid ""
5359
"Bound branch %(branch)s is out of date with master branch "
5360
"%(master)s.%(extra_help)s"
5361
msgstr ""
5362
5363
#: bzrlib/errors.py:1293
5364
msgid ""
5365
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5366
"bound to %(remote)s."
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1305
5370
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1314
5374
msgid ""
5375
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5376
"%(error)s"
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:1326
5380
msgid "Error in processing weave: %(msg)s"
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:1335
5384
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5385
msgstr ""
5386
5387
#: bzrlib/errors.py:1346
5388
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:1356
5392
msgid "Weave invariant violated: %(what)s"
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:1365
5396
msgid "Parents are mismatched between two revisions. %(msg)s"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:1387
5400
msgid ""
5401
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5402
"%(weave_b)s"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1399
5406
msgid "Versioned file error"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1404
5410
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1414
5414
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1424
5418
msgid "Text did not match its checksum: %(msg)s"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1550
5422
msgid "Export format %(format)r not supported"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1559
5426
msgid "Transport error: %(msg)s %(orig_error)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1585
5430
msgid "Generic bzr smart protocol error: %(details)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1593
5434
msgid "Received bad protocol version marker: %(marker)r"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1625
5438
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1630
5442
msgid "Connection error: %(msg)s %(orig_error)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1635
5446
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1656
5450
msgid "Connection closed: %(msg)s %(orig_error)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1661
5454
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1666
5458
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1676
5462
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1691
5466
msgid "Certificate error: %(error)s"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1699
5470
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1713
5474
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1721
5478
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1730
5482
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:1744
5486
msgid "Too many redirections"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1749
5490
msgid "Working tree has conflicts."
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1753
5494
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:1762
5498
msgid ""
5499
"Error(s) parsing config file %(filename)s:\n"
5500
"%(errors)s"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1772
5504
msgid ""
5505
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5506
"See ``bzr help %(name)s``"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1782
5510
msgid "%(username)r does not seem to contain a reasonable email address"
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1791
5514
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:1799
5518
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:1807
5522
msgid "Unable to import library \"%(library)s\": %(error)s"
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:1815
5526
msgid "python-gpgme is not installed, it is needed to verify signatures"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:1823
5530
msgid ""
5531
"The working tree for %(basedir)s has changed since the last commit, but "
5532
"weave merge requires that it be unchanged"
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1833
5536
msgid ""
5537
"Can't reprocess and show base, because reprocessing obscures the "
5538
"relationship of conflicting lines to the base"
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:1839
5542
msgid "Cycle in graph %(graph)r"
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:1867
5546
msgid "File %(filename)s is not conflicted."
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:1889
5550
msgid "No bundle was found in \"%(filename)s\"."
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:1898
5554
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:1908
5558
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:1921
5562
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:1931
5566
msgid "Key %(key)s is already present in map"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:1936
5570
msgid "The prefix %(prefix)s is in the help search path twice."
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:1946
5574
msgid ""
5575
"No final name for trans_id %(trans_id)r\n"
5576
"file-id: %(file_id)r\n"
5577
"root trans-id: %(root_trans_id)r\n"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:1978
5581
msgid "Attempt to reuse a transform that has already been applied."
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:1983
5585
msgid "Moving the root directory is not supported at this time"
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:1988
5589
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:1999
5593
msgid ""
5594
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:2035
5598
msgid ""
5599
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:2065
5603
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:2073
5607
msgid "Nothing to merge."
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:2078
5611
msgid "Format %(format)s cannot be initialised by this version of bzr."
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:2087
5615
msgid ""
5616
"Cannot convert from format %(from_format)s to format %(format)s. "
5617
"%(problem)s"
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:2099
5621
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:2107
5625
msgid "%(exe_name)s could not be found on this machine"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:2115
5629
msgid "Diff is not installed on this machine: %(msg)s"
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:2123
5633
msgid "Diff3 is not installed on this machine."
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:2129
5637
msgid "The content being inserted is already present."
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:2134
5641
msgid ""
5642
"This tree contains left-over files from a failed operation.\n"
5643
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5644
"to\n"
5645
" keep, and delete it when you are done."
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:2145
5649
msgid ""
5650
"This tree contains left-over files from a failed operation.\n"
5651
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5652
" wish to keep, and delete it when you are done."
5653
msgstr ""
5654
5655
#: bzrlib/errors.py:2155
5656
msgid ""
5657
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5658
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5659
"to\n"
5660
" keep, and delete it when you are done."
5661
msgstr ""
5662
5663
#: bzrlib/errors.py:2166
5664
msgid ""
5665
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5666
"examine %(pending_deletion)s to see if it contains any files you wish to "
5667
"keep, and delete it when you are done."
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:2176
5671
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:2190
5675
msgid ""
5676
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2203
5680
msgid "Error in merge modified format"
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:2208
5684
msgid "Format error in conflict listings"
5685
msgstr ""
5686
5687
#: bzrlib/errors.py:2212
5688
msgid ""
5689
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5690
"Error: %(description)s"
5691
msgstr ""
5692
5693
#: bzrlib/errors.py:2223
5694
msgid ""
5695
"An error has been detected in the repository %(repo_path)s.\n"
5696
"Please run bzr reconcile on this repository."
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2234
5700
msgid ""
5701
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5702
"reason: %(reason)s"
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:2247
5706
msgid ""
5707
"An inconsistent delta was supplied: %(delta)r\n"
5708
"reason: %(reason)s"
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:2259
5712
msgid "To use this feature you must upgrade your branch at %(path)s."
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:2268
5716
msgid "To use this feature you must upgrade your repository at %(path)s."
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:2273
5720
msgid ""
5721
"To use this feature you must upgrade your branch at %(path)s to a format "
5722
"which supports rich roots."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2279
5726
msgid "Cannot perform local-only commits on unbound branches."
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:2284
5730
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2305
5734
msgid "Ghost tags not supported by format %(format)r."
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:2313
5738
msgid "File is binary but should be text."
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:2318
5742
msgid "The path %(path)s is not permitted on this platform"
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:2327
5746
msgid ""
5747
"Testament did not match expected value.\n"
5748
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5749
" {%(measured)s}"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2339
5753
msgid "Not a bzr revision-bundle: %(text)r"
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:2348
5757
msgid "Bad bzr revision-bundle: %(text)r"
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:2357
5761
msgid "Malformed bzr revision-bundle header: %(text)r"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:2362
5765
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:2367
5769
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:2372
5773
msgid "End of line marker was not \\n in bzr revision-bundle"
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:2382
5777
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:2392
5781
msgid "Root class for inventory serialization errors"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:2396
5785
msgid ""
5786
"The inventory was not in the expected format:\n"
5787
" %(msg)s"
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2405
5791
msgid "This operation requires rich root data storage"
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2418
5795
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:2427
5799
msgid ""
5800
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5801
"variable."
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:2434
5805
msgid ""
5806
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5807
"ghost at {%(ghost_revision_id)s}"
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2444
5811
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2495
5815
msgid ""
5816
"A merge directive must provide either a bundle or a public branch location."
5817
msgstr ""
5818
5819
#: bzrlib/errors.py:2502
5820
msgid "Bad merge directive payload %(start)r"
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:2512
5824
msgid "Preview patch does not match requested changes."
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2518
5828
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5829
msgstr ""
5830
5831
#: bzrlib/errors.py:2528
5832
msgid ""
5833
"Your branch does not have all of the revisions required in order to merge "
5834
"this merge directive and the target location specified in the merge "
5835
"directive is not a branch: %(location)s."
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2540
5839
msgid "Unsupported entry kind %(kind)s"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2548
5843
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2558
5847
msgid "Subsume target %(other_tree)s needs to be upgraded."
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2577
5851
msgid "No such tag: %(tag_name)s"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2585
5855
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2594
5859
msgid "Tag %(tag_name)s already exists."
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2602
5863
msgid ""
5864
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5865
"bugs\" for more information on this feature."
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2612
5869
msgid ""
5870
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2622
5874
msgid ""
5875
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2632
5879
msgid "Invalid line in bugs property: '%(line)s'"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2640
5883
msgid "Invalid bug status: '%(status)s'"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2648
5887
msgid "Could not understand response from smart server: %(response_tuple)r"
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2687
5891
msgid "Server sent an unexpected error: %(error_tuple)r"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2706
5895
msgid "Unrecognised container format: %(container_format)r"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2714
5899
msgid "Unexpected end of container stream"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2719
5903
msgid "Unknown record type: %(record_type)r"
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2727
5907
msgid "Invalid record: %(reason)s"
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2735
5911
msgid "Container has data after end marker: %(excess)r"
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2743
5915
msgid "Container has multiple records with the same name: %(name)s"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2756
5919
msgid "Corrupt or incompatible data stream: %(reason)s"
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2764
5923
msgid "SMTP error: %(error)s"
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2772
5927
msgid "No message supplied."
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2777
5931
msgid "No mail-to address (--mail-to) or output (-o) specified."
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2782
5935
msgid ""
5936
"Unable to find mail client with the following names: "
5937
"%(mail_command_list_string)s"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2792
5941
msgid "SMTP connection to %(host)s refused"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2801
5945
msgid "Please specify smtp_server. No server at default %(host)s."
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2815
5949
msgid ""
5950
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5951
"reconfigure."
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2827
5955
msgid "'%(display_url)s' is already a branch."
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2832
5959
msgid "'%(display_url)s' is already a tree."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2837
5963
msgid "'%(display_url)s' is already a checkout."
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2842
5967
msgid "'%(display_url)s' is already a lightweight checkout."
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2847
5971
msgid "'%(display_url)s' is already using a shared repository."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2852
5975
msgid "'%(display_url)s' is already standalone."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2857
5979
msgid "Shared repository '%(display_url)s' already creates working trees."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2863
5983
msgid ""
5984
"Shared repository '%(display_url)s' already doesn't create working trees."
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:2869
5988
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:2874
5992
msgid "No location could be found to bind to at %(display_url)s."
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:2879
5996
msgid ""
5997
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5998
"status).%(more)s"
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2898
6002
msgid ""
6003
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6004
"list).%(more)s"
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:2904
6008
msgid "Variable {%(name)s} is not available."
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:2912
6012
msgid "No template specified."
6013
msgstr ""
6014
6015
#: bzrlib/errors.py:2917
6016
msgid "Unable to create symlink %(path_str)son this platform"
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:2932
6020
msgid ""
6021
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6022
"\"original\", \"local\"."
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:2966
6026
msgid ""
6027
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:2978
6031
msgid "The \"%(config_id)s\" configuration does not exist."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:2986
6035
msgid "The \"%(option_name)s\" configuration option does not exist."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:2994
6039
msgid "The alias \"%(alias_name)s\" does not exist."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:3008
6043
msgid "\"%(alias_name)s\" is not a valid location alias."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3016
6047
msgid "No %(alias_name)s location assigned."
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3024
6051
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3034
6055
msgid "Unknown rules detected: %(unknowns_str)s."
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3045
6059
msgid "Tip change rejected: %(msg)s"
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3053
6063
msgid "Shelf corrupt."
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3058
6067
msgid "Corruption while decompressing repository file%(orig_error)s"
6068
msgstr ""
6069
6070
#: bzrlib/errors.py:3070
6071
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6072
msgstr ""
6073
6074
#: bzrlib/errors.py:3078
6075
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6076
msgstr ""
6077
6078
#: bzrlib/errors.py:3086
6079
msgid ""
6080
"An attempt to access a url outside the server jail was made: '%(url)s'."
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:3094
6084
msgid "The user aborted the operation."
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:3099
6088
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:3109
6092
msgid "No such view: %(view_name)s."
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:3119
6096
msgid ""
6097
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6098
"to a later format."
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:3128
6102
msgid ""
6103
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:3195
6107
msgid "%(bzrdir)r does not support co-located branches."
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:3201
6111
msgid ""
6112
"Unable to determine your name.\n"
6113
"Please, set your name with the 'whoami' command.\n"
6114
"E.g. bzr whoami \"Your Name <name@example.com>\""
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:3210
6118
msgid "Invalid pattern(s) found. %(msg)s"
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:3218
6122
msgid ""
6123
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6124
"unbind` to fix."
6125
msgstr ""
6126
6127
#: bzrlib/errors.py:3229
6128
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6129
msgstr ""
6130
6131
#: bzrlib/errors.py:3238
6132
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:3247
6136
msgid ""
6137
"No compatible object available for operations from %(source)r to %(target)r."
6138
msgstr ""
6139
6140
#: bzrlib/errors.py:3257
6141
msgid ""
6142
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6143
"%(arguments)s."
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:3267
6147
msgid ""
6148
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6149
"format %(format)r"
6150
msgstr ""
6151
6152
#: bzrlib/errors.py:3279
6153
msgid ""
6154
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6155
"plugin."
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:3292
6159
msgid "Binary files section encountered."
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:3300
6163
msgid ""
6164
"Malformed patch header. %(desc)s\n"
6165
"%(line)r"
6166
msgstr ""
6167
6168
#: bzrlib/errors.py:3309
6169
msgid ""
6170
"Malformed hunk header. %(desc)s\n"
6171
"%(line)r"
6172
msgstr ""
6173
6174
#: bzrlib/errors.py:3318
6175
msgid ""
6176
"Malformed line. %(desc)s\n"
6177
"%(line)r"
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:3328
6181
msgid ""
6182
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6183
"but patch says it should be \"%(patch_line)s\""
6184
msgstr ""
6185
6186
#: bzrlib/errors.py:3339
6187
msgid "The feature %(feature)s has already been registered."
6188
msgstr ""
6189
6190
#: bzrlib/export_pot.py:252
6191
#, python-format
6192
msgid "Exporting messages from builtin command: %s"
6193
msgstr ""
6194
6195
#: bzrlib/export_pot.py:271
6196
msgid "Exporting messages from plugin command: {0} in {1}"
6197
msgstr ""
6198
6199
#: bzrlib/export_pot.py:292
6200
#, python-format
6201
msgid "Exporting message from error: %s"
6202
msgstr ""
6203
6204
#: bzrlib/fetch.py:98
6205
msgid "Finding revisions"
6206
msgstr ""
6207
6208
#: bzrlib/fetch.py:103
6209
msgid "Fetching revisions"
6210
msgstr ""
6211
6212
#: bzrlib/foreign.py:262
6213
msgid "Push into a different VCS without any custom bzr metadata."
6214
msgstr ""
6215
6216
#: bzrlib/foreign.py:264
6217
msgid ""
6218
"This will afterwards rebase the local branch on the remote\n"
6219
"branch unless the --no-rebase option is used, in which case \n"
6220
"the two branches will be out of sync after the push. "
6221
msgstr ""
6222
6223
#: bzrlib/foreign.py:277
6224
msgid "Do not rebase after push."
6225
msgstr ""
6226
6227
#: bzrlib/foreign.py:311
6228
#, python-format
6229
msgid "Using saved location: %s\n"
6230
msgstr ""
6231
6232
#: bzrlib/foreign.py:321
6233
msgid ""
6234
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6235
"regular push."
6236
msgstr ""
6237
6238
#: bzrlib/gpg.py:366
6239
msgid "No GnuPG key results for pattern: {0}"
6240
msgstr ""
6241
6242
#: bzrlib/gpg.py:439
6243
msgid "{0} commits with valid signatures"
6244
msgstr ""
6245
6246
#: bzrlib/gpg.py:445
6247
msgid "{0} commit with unknown key"
6248
msgid_plural "{0} commits with unknown keys"
6249
msgstr[0] ""
6250
msgstr[1] ""
6251
6252
#: bzrlib/gpg.py:453
6253
msgid "{0} commit not valid"
6254
msgid_plural "{0} commits not valid"
6255
msgstr[0] ""
6256
msgstr[1] ""
6257
6258
#: bzrlib/gpg.py:461
6259
msgid "{0} commit not signed"
6260
msgid_plural "{0} commits not signed"
6261
msgstr[0] ""
6262
msgstr[1] ""
6263
6264
#: bzrlib/gpg.py:469
6265
msgid "{0} commit with key now expired"
6266
msgid_plural "{0} commits with key now expired"
6267
msgstr[0] ""
6268
msgstr[1] ""
6269
6270
#: bzrlib/gpg.py:489
6271
msgid "{0} commit by author {1} with key {2} now expired"
6272
msgid_plural "{0} commits by author {1} with key {2} now expired"
6273
msgstr[0] ""
6274
msgstr[1] ""
6275
6276
#: bzrlib/gpg.py:505
6277
msgid "{0} signed {1} commit"
6278
msgid_plural "{0} signed {1} commits"
6279
msgstr[0] ""
6280
msgstr[1] ""
6281
6282
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6283
msgid "{0} commit by author {1}"
6284
msgid_plural "{0} commits by author {1}"
6285
msgstr[0] ""
6286
msgstr[1] ""
6287
6288
#: bzrlib/gpg.py:554
6289
msgid "Unknown key {0} signed {1} commit"
6290
msgid_plural "Unknown key {0} signed {1} commits"
6291
msgstr[0] ""
6292
msgstr[1] ""
6293
6294
#: bzrlib/groupcompress.py:1739
6295
#, python-format
6296
msgid "Insert claimed random_id=True, but then inserted %r two times"
6297
msgstr ""
6298
6299
#: bzrlib/hooks.py:313
6300
#, python-format
6301
msgid "Introduced in: %s"
6302
msgstr ""
6303
6304
#: bzrlib/hooks.py:316
6305
#, python-format
6306
msgid "Deprecated in: %s"
6307
msgstr ""
6308
6309
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6310
msgid "Walking content"
6311
msgstr ""
6312
6313
#: bzrlib/knit.py:3330
6314
msgid "annotating"
6315
msgstr ""
6316
6317
#: bzrlib/lock.py:548
6318
msgid "{0!r} was {1} locked again"
6319
msgstr ""
6320
6321
#: bzrlib/lockdir.py:321
6322
#, python-format
6323
msgid "error removing pending lock: %s"
6324
msgstr ""
6325
6326
#: bzrlib/lockdir.py:616
6327
msgid "Unable to obtain"
6328
msgstr ""
6329
6330
#: bzrlib/lockdir.py:618
6331
msgid "Lock owner changed for"
6332
msgstr ""
6333
6334
#: bzrlib/lockdir.py:620
6335
msgid "{0} lock {1} {2}."
6336
msgstr ""
6337
6338
#: bzrlib/lockdir.py:627
6339
#, python-format
6340
msgid "Will continue to try until %s, unless you press Ctrl-C."
6341
msgstr ""
6342
6343
#: bzrlib/lockdir.py:629
6344
msgid "See \"bzr help break-lock\" for more."
6345
msgstr ""
6346
6347
#: bzrlib/lockdir.py:739
6348
#, python-format
6349
msgid ""
6350
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6351
msgstr ""
6352
6353
#: bzrlib/log.py:563
6354
msgid "--exclude-common-ancestry requires two different revisions"
6355
msgstr ""
6356
6357
#: bzrlib/log.py:565
6358
#, python-format
6359
msgid "invalid direction %r"
6360
msgstr ""
6361
6362
#: bzrlib/log.py:653
6363
msgid "Start revision not found in history of end revision."
6364
msgstr ""
6365
6366
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6367
msgid "Logging revision 0 is invalid."
6368
msgstr ""
6369
6370
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6371
msgid "Start revision must be older than the end revision."
6372
msgstr ""
6373
6374
#: bzrlib/log.py:1818
6375
#, python-format
6376
msgid "unknown log formatter: %r"
6377
msgstr ""
6378
6379
#: bzrlib/log.py:2114
6380
msgid "fixes bug"
6381
msgid_plural "fixes bugs"
6382
msgstr[0] ""
6383
msgstr[1] ""
6384
6385
#: bzrlib/merge.py:689
6386
msgid "All changes applied successfully."
6387
msgstr ""
6388
6389
#: bzrlib/merge.py:691
6390
#, python-format
6391
msgid "%d conflicts encountered."
6392
msgstr ""
6393
6394
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6395
msgid "Preparing file merge"
6396
msgstr ""
6397
6398
#: bzrlib/multiparent.py:426
6399
msgid "Importing revisions"
6400
msgstr ""
6401
6402
#: bzrlib/option.py:526
6403
msgid "Show help message."
6404
msgstr ""
6405
6406
#: bzrlib/option.py:528
6407
msgid "Only display errors and warnings."
6408
msgstr ""
6409
6410
#: bzrlib/option.py:531
6411
msgid "Show usage message and options."
6412
msgstr ""
6413
6414
#: bzrlib/option.py:533
6415
msgid "Display more information."
6416
msgstr ""
6417
6418
#: bzrlib/option.py:541
6419
msgid ""
6420
"Select changes introduced by the specified revision. See also \"help "
6421
"revisionspec\"."
6422
msgstr ""
6423
6424
#: bzrlib/option.py:543
6425
msgid "Branch to operate on, instead of working directory."
6426
msgstr ""
6427
6428
#: bzrlib/option.py:545
6429
msgid "Detailed log format."
6430
msgstr ""
6431
6432
#: bzrlib/option.py:545
6433
msgid "Format used by GNU ChangeLog files."
6434
msgstr ""
6435
6436
#: bzrlib/option.py:545
6437
msgid "Log format with one line per revision."
6438
msgstr ""
6439
6440
#: bzrlib/option.py:545
6441
msgid "Moderately short log format."
6442
msgstr ""
6443
6444
#: bzrlib/option.py:545
6445
msgid "Use specified log format."
6446
msgstr ""
6447
6448
#: bzrlib/option.py:547
6449
msgid "Log format"
6450
msgstr ""
6451
6452
#: bzrlib/option.py:549
6453
msgid "LCA-newness merge."
6454
msgstr ""
6455
6456
#: bzrlib/option.py:549
6457
msgid "Merge using external diff3."
6458
msgstr ""
6459
6460
#: bzrlib/option.py:549
6461
msgid "Native diff3-style merge."
6462
msgstr ""
6463
6464
#: bzrlib/option.py:549
6465
msgid "Select a particular merge algorithm."
6466
msgstr ""
6467
6468
#: bzrlib/option.py:549
6469
msgid "Weave-based merge."
6470
msgstr ""
6471
6472
#: bzrlib/option.py:551
6473
msgid "Merge algorithm"
6474
msgstr ""
6475
6476
#: bzrlib/option.py:554
6477
msgid "Message string."
6478
msgstr ""
6479
6480
#: bzrlib/option.py:556
6481
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6482
msgstr ""
6483
6484
#: bzrlib/option.py:558
6485
msgid "Ignore differences between branches and overwrite unconditionally."
6486
msgstr ""
6487
6488
#: bzrlib/option.py:560
6489
msgid "Remember the specified location as a default."
6490
msgstr ""
6491
6492
#: bzrlib/option.py:562
6493
msgid "Reprocess to reduce spurious conflicts."
6494
msgstr ""
6495
6496
#: bzrlib/option.py:566
6497
msgid "See \"help revisionspec\" for details."
6498
msgstr ""
6499
6500
#: bzrlib/option.py:568
6501
msgid "Show internal object ids."
6502
msgstr ""
6503
6504
#: bzrlib/option.py:571
6505
msgid "Display timezone as local, original, or utc."
6506
msgstr ""
6507
6508
#: bzrlib/osutils.py:100
6509
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6510
msgstr ""
6511
6512
#: bzrlib/osutils.py:220
6513
msgid "lstat/stat of ({0!r}): {1!r}"
6514
msgstr ""
6515
6516
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6517
#, python-format
6518
msgid "sorry, %r not allowed in path"
6519
msgstr ""
6520
6521
#: bzrlib/osutils.py:1259
6522
#, python-format
6523
msgid "%r is too short to calculate a relative path"
6524
msgstr ""
6525
6526
#: bzrlib/plugin.py:143
6527
#, python-format
6528
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6529
msgstr ""
6530
6531
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6532
msgid "Enable completions for the selected plugin (default: all plugins)"
6533
msgstr ""
6534
6535
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6536
msgid "Generate a shell function for bash command line completion."
6537
msgstr ""
6538
6539
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6540
msgid ""
6541
"This command generates a shell function which can be used by bash to\n"
6542
"automatically complete the currently typed command when the user presses\n"
6543
"the completion key (usually tab)."
6544
msgstr ""
6545
6546
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6547
msgid ""
6548
"Commonly used like this:\n"
6549
" eval \"`bzr bash-completion`\""
6550
msgstr ""
6551
6552
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6553
msgid "Name of the generated function (default: _bzr)"
6554
msgstr ""
6555
6556
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6557
msgid "Generate only the shell function, don't enable it"
6558
msgstr ""
6559
6560
#: bzrlib/plugins/launchpad/account.py:66
6561
msgid "Setting ssh/sftp usernames for launchpad.net."
6562
msgstr ""
6563
6564
#: bzrlib/plugins/launchpad/cmds.py:44
6565
msgid "Register a branch with launchpad.net."
6566
msgstr ""
6567
6568
#: bzrlib/plugins/launchpad/cmds.py:46
6569
msgid ""
6570
"This command lists a bzr branch in the directory of branches on\n"
6571
"launchpad.net. Registration allows the branch to be associated with\n"
6572
"bugs or specifications."
6573
msgstr ""
6574
6575
#: bzrlib/plugins/launchpad/cmds.py:50
6576
msgid ""
6577
"Before using this command you must register the project to which the\n"
6578
"branch belongs, and create an account for yourself on launchpad.net."
6579
msgstr ""
6580
6581
#: bzrlib/plugins/launchpad/cmds.py:53
6582
msgid ""
6583
"arguments:\n"
6584
" public_url: The publicly visible url for the branch to register.\n"
6585
" This must be an http or https url (which Launchpad can read\n"
6586
" from to access the branch). Local file urls, SFTP urls, and\n"
6587
" bzr+ssh urls will not work.\n"
6588
" If no public_url is provided, bzr will use the configured\n"
6589
" public_url if there is one for the current branch, and\n"
6590
" otherwise error."
6591
msgstr ""
6592
6593
#: bzrlib/plugins/launchpad/cmds.py:62
6594
msgid ""
6595
"example:\n"
6596
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6597
" --project fooproject"
6598
msgstr ""
6599
6600
#: bzrlib/plugins/launchpad/cmds.py:69
6601
msgid "Launchpad project short name to associate with the branch."
6602
msgstr ""
6603
6604
#: bzrlib/plugins/launchpad/cmds.py:76
6605
msgid ""
6606
"Short name for the branch; by default taken from the last component of the "
6607
"url."
6608
msgstr ""
6609
6610
#: bzrlib/plugins/launchpad/cmds.py:80
6611
msgid "One-sentence description of the branch."
6612
msgstr ""
6613
6614
#: bzrlib/plugins/launchpad/cmds.py:83
6615
msgid "Longer description of the purpose or contents of the branch."
6616
msgstr ""
6617
6618
#: bzrlib/plugins/launchpad/cmds.py:86
6619
msgid "Branch author's email address, if not yourself."
6620
msgstr ""
6621
6622
#: bzrlib/plugins/launchpad/cmds.py:89
6623
msgid "The bug this branch fixes."
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/cmds.py:92
6627
msgid "Prepare the request but don't actually send it."
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/cmds.py:114
6631
msgid ""
6632
"register-branch requires a public branch url - see bzr help register-branch."
6633
msgstr ""
6634
6635
#: bzrlib/plugins/launchpad/cmds.py:122
6636
msgid "--product is deprecated; please use --project."
6637
msgstr ""
6638
6639
#: bzrlib/plugins/launchpad/cmds.py:152
6640
msgid "Open a Launchpad branch page in your web browser."
6641
msgstr ""
6642
6643
#: bzrlib/plugins/launchpad/cmds.py:157
6644
msgid "Do not actually open the browser. Just say the URL we would use."
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/cmds.py:192
6648
#, python-format
6649
msgid "Opening %s in web browser"
6650
msgstr ""
6651
6652
#: bzrlib/plugins/launchpad/cmds.py:200
6653
msgid "Show or set the Launchpad user ID."
6654
msgstr ""
6655
6656
#: bzrlib/plugins/launchpad/cmds.py:202
6657
msgid ""
6658
"When communicating with Launchpad, some commands need to know your\n"
6659
"Launchpad user ID. This command can be used to set or show the\n"
6660
"user ID that Bazaar will use for such communication."
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/cmds.py:206
6664
msgid ""
6665
":Examples:\n"
6666
" Show the Launchpad ID of the current user::"
6667
msgstr ""
6668
6669
#: bzrlib/plugins/launchpad/cmds.py:209
6670
msgid " bzr launchpad-login"
6671
msgstr ""
6672
6673
#: bzrlib/plugins/launchpad/cmds.py:211
6674
msgid " Set the Launchpad ID of the current user to 'bob'::"
6675
msgstr ""
6676
6677
#: bzrlib/plugins/launchpad/cmds.py:213
6678
msgid " bzr launchpad-login bob"
6679
msgstr ""
6680
6681
#: bzrlib/plugins/launchpad/cmds.py:220
6682
msgid "Don't check that the user name is valid."
6683
msgstr ""
6684
6685
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6686
msgid "Launchpad user ID exists and has SSH keys.\n"
6687
msgstr ""
6688
6689
#: bzrlib/plugins/launchpad/cmds.py:238
6690
msgid "No Launchpad user ID configured.\n"
6691
msgstr ""
6692
6693
#: bzrlib/plugins/launchpad/cmds.py:249
6694
#, python-format
6695
msgid "Launchpad user ID set to '%s'.\n"
6696
msgstr ""
6697
6698
#: bzrlib/plugins/launchpad/cmds.py:255
6699
msgid "Ask Launchpad to mirror a branch now."
6700
msgstr ""
6701
6702
#: bzrlib/plugins/launchpad/cmds.py:272
6703
msgid "Propose merging a branch on Launchpad."
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/cmds.py:274
6707
msgid ""
6708
"This will open your usual editor to provide the initial comment. When it\n"
6709
"has created the proposal, it will open it in your default web browser."
6710
msgstr ""
6711
6712
#: bzrlib/plugins/launchpad/cmds.py:277
6713
msgid ""
6714
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6715
"is not supplied, the remembered submit branch will be used. If no submit\n"
6716
"branch is remembered, the development focus will be used."
6717
msgstr ""
6718
6719
#: bzrlib/plugins/launchpad/cmds.py:281
6720
msgid ""
6721
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6722
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6723
"The parameter the launchpad account name of the desired reviewer. This\n"
6724
"may optionally be followed by '=' and the review type. For example:"
6725
msgstr ""
6726
6727
#: bzrlib/plugins/launchpad/cmds.py:286
6728
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6729
msgstr ""
6730
6731
#: bzrlib/plugins/launchpad/cmds.py:288
6732
msgid ""
6733
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6734
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6735
msgstr ""
6736
6737
#: bzrlib/plugins/launchpad/cmds.py:293
6738
msgid "Propose the merge on staging."
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/cmds.py:295
6742
msgid "Commit message."
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/cmds.py:297
6746
msgid "Mark the proposal as approved immediately."
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/cmds.py:298
6750
msgid "The bug this proposal fixes."
6751
msgstr ""
6752
6753
#: bzrlib/plugins/launchpad/cmds.py:300
6754
msgid "Requested reviewer and optional type."
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/cmds.py:335
6758
msgid "Find the proposal to merge this revision."
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/cmds.py:337
6762
msgid ""
6763
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6764
"This works only if the selected branch was the merge proposal target, and\n"
6765
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6766
"are opened in a web browser."
6767
msgstr ""
6768
6769
#: bzrlib/plugins/launchpad/cmds.py:342
6770
msgid ""
6771
"Any revision involved in the merge may be specified-- the revision in\n"
6772
"which the merge was performed, or one of the revisions that was merged."
6773
msgstr ""
6774
6775
#: bzrlib/plugins/launchpad/cmds.py:345
6776
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/cmds.py:347
6780
msgid " bzr lp-find-proposal -r annotate:README:1"
6781
msgstr ""
6782
6783
#: bzrlib/plugins/launchpad/cmds.py:363
6784
msgid "No review found."
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/cmds.py:364
6788
#, python-format
6789
msgid "%d proposals(s) found."
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/cmds.py:374
6793
msgid "Finding revision-id"
6794
msgstr ""
6795
6796
#: bzrlib/plugins/launchpad/cmds.py:381
6797
msgid "Finding merge"
6798
msgstr ""
6799
6800
#: bzrlib/plugins/launchpad/cmds.py:386
6801
msgid "Finding revno"
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/cmds.py:392
6805
msgid "Finding Launchpad branch"
6806
msgstr ""
6807
6808
#: bzrlib/plugins/launchpad/cmds.py:395
6809
msgid "Finding proposals"
6810
msgstr ""
6811
6812
#: bzrlib/plugins/launchpad/lp_api.py:241
6813
#: bzrlib/plugins/launchpad/lp_api.py:246
6814
#, python-format
6815
msgid "%s is not registered on Launchpad"
6816
msgstr ""
6817
6818
#: bzrlib/plugins/launchpad/lp_api.py:256
6819
#, python-format
6820
msgid "%s has no development focus."
6821
msgstr ""
6822
6823
#: bzrlib/plugins/launchpad/lp_api.py:261
6824
#, python-format
6825
msgid "development focus %s has no branch."
6826
msgstr ""
6827
6828
#: bzrlib/plugins/launchpad/lp_api.py:266
6829
#, python-format
6830
msgid "source package %s has no branch."
6831
msgstr ""
6832
6833
#: bzrlib/plugins/launchpad/lp_api.py:270
6834
#, python-format
6835
msgid "%s has no associated product or source package."
6836
msgstr ""
6837
6838
#: bzrlib/plugins/launchpad/lp_api.py:282
6839
#, python-format
6840
msgid "%s is already up-to-date."
6841
msgstr ""
6842
6843
#: bzrlib/plugins/launchpad/lp_api.py:289
6844
#, python-format
6845
msgid "Pushing to %s"
6846
msgstr ""
6847
6848
#: bzrlib/plugins/launchpad/lp_directory.py:170
6849
msgid ""
6850
"resolution for {0}\n"
6851
" local: {1}\n"
6852
" remote: {2}"
6853
msgstr ""
6854
6855
#: bzrlib/plugins/launchpad/lp_propose.py:150
6856
#, python-format
6857
msgid "There is already a branch merge proposal: %s"
6858
msgstr ""
6859
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6861
msgid "pb parameter to convert() is deprecated"
6862
msgstr ""
6863
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6865
msgid "starting upgrade from format 4 to 5"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6869
msgid "note: upgrade may be faster if all store files are ungzipped first"
6870
msgstr ""
6871
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6873
msgid "converting revision"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6877
msgid "upgraded to weaves:"
6878
msgstr ""
6879
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6881
#, python-format
6882
msgid "%6d revisions and inventories"
6883
msgstr ""
6884
6885
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6886
#, python-format
6887
msgid "%6d revisions not present"
6888
msgstr ""
6889
6890
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6891
#, python-format
6892
msgid "%6d texts"
6893
msgstr ""
6894
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6896
msgid "writing weave"
6897
msgstr ""
6898
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6901
msgid "inventory"
6902
msgstr ""
6903
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6905
msgid "write revision"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6909
msgid "loading revision"
6910
msgstr ""
6911
6912
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6913
#, python-format
6914
msgid "revision {%s} not present in branch; will be converted as a ghost"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6918
msgid "starting upgrade from format 5 to 6"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6922
#, python-format
6923
msgid "adding prefixes to %s"
6924
msgstr ""
6925
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6927
msgid "starting upgrade from format 6 to metadir"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6931
msgid "Removing ancestry.weave"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6935
msgid "Finding branch files"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6939
msgid "Upgrading repository"
6940
msgstr ""
6941
6942
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6943
msgid "Upgrading branch"
6944
msgstr ""
6945
6946
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6947
msgid "No working tree."
6948
msgstr ""
6949
6950
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6951
msgid "Upgrading working tree"
6952
msgstr ""
6953
6954
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6955
#, python-format
6956
msgid "Make %s lock"
6957
msgstr ""
6958
6959
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6960
#, python-format
6961
msgid "Moving %s"
6962
msgstr ""
6963
6964
#: bzrlib/push.py:56
6965
msgid "Created new branch."
6966
msgstr ""
6967
6968
#: bzrlib/push.py:97
6969
#, python-format
6970
msgid ""
6971
"Target directory %s already contains a .bzr directory, but it is not valid."
6972
msgstr ""
6973
6974
#: bzrlib/push.py:101
6975
#, python-format
6976
msgid ""
6977
"Target directory %s already exists, but does not have a .bzr directory. "
6978
"Supply --use-existing-dir to push there anyway."
6979
msgstr ""
6980
6981
#: bzrlib/push.py:122
6982
#, python-format
6983
msgid "Too many redirections trying to make %s."
6984
msgstr ""
6985
6986
#: bzrlib/push.py:148
6987
msgid ""
6988
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6989
"information."
6990
msgstr ""
6991
6992
#: bzrlib/push.py:152
6993
#, python-format
6994
msgid ""
6995
"It is not possible to losslessly push to %s. You may want to use dpush "
6996
"instead."
6997
msgstr ""
6998
6999
#: bzrlib/push.py:158
7000
#, python-format
7001
msgid ""
7002
"At %s you have a valid .bzr control directory, but not a branch or "
7003
"repository. This is an unsupported configuration. Please move the target "
7004
"directory out of the way and try again."
7005
msgstr ""
7006
7007
#: bzrlib/reconcile.py:97
7008
#, python-format
7009
msgid "Reconciling branch %s"
7010
msgstr ""
7011
7012
#: bzrlib/reconcile.py:103
7013
#, python-format
7014
msgid "Reconciling repository %s"
7015
msgstr ""
7016
7017
#: bzrlib/reconcile.py:105
7018
msgid "Reconciling repository"
7019
msgstr ""
7020
7021
#: bzrlib/reconcile.py:111
7022
#, python-format
7023
msgid "%s cannot canonicalize CHKs."
7024
msgstr ""
7025
7026
#: bzrlib/reconcile.py:119
7027
msgid "Reconcile aborted: revision index has inconsistent parents."
7028
msgstr ""
7029
7030
#: bzrlib/reconcile.py:121
7031
msgid "Run \"bzr check\" for more details."
7032
msgstr ""
7033
7034
#: bzrlib/reconcile.py:123
7035
msgid "Reconciliation complete."
7036
msgstr ""
7037
7038
#: bzrlib/reconcile.py:166
7039
msgid "Fixing last revision info {0} => {1}"
7040
msgstr ""
7041
7042
#: bzrlib/reconcile.py:173
7043
msgid "revision_history ok."
7044
msgstr ""
7045
7046
#: bzrlib/reconcile.py:234
7047
msgid "Reading inventory data"
7048
msgstr ""
7049
7050
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7051
msgid "Inventory ok."
7052
msgstr ""
7053
7054
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7055
msgid "Backing up inventory"
7056
msgstr ""
7057
7058
#: bzrlib/reconcile.py:258
7059
msgid "Backup inventory created."
7060
msgstr ""
7061
7062
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7063
msgid "Writing weave"
7064
msgstr ""
7065
7066
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7067
msgid "Inventory regenerated."
7068
msgstr ""
7069
7070
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7071
msgid "Reading indexes"
7072
msgstr ""
7073
7074
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7075
msgid "Checking unused inventories"
7076
msgstr ""
7077
7078
#: bzrlib/reconcile.py:388
7079
msgid "Backup Inventory created"
7080
msgstr ""
7081
7082
#: bzrlib/reconcile.py:446
7083
msgid "Fixing text parents"
7084
msgstr ""
7085
7086
#: bzrlib/reconfigure.py:54
7087
msgid "{0} is now stacked on {1}\n"
7088
msgstr ""
7089
7090
#: bzrlib/reconfigure.py:69
7091
#, python-format
7092
msgid "%s is now not stacked\n"
7093
msgstr ""
7094
7095
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7096
#, python-format
7097
msgid "bzr: ERROR (ignored): %s"
7098
msgstr ""
7099
7100
#: bzrlib/remote.py:2534
7101
msgid "Copying repository content as tarball..."
7102
msgstr ""
7103
7104
#: bzrlib/rename_map.py:69
7105
msgid "Calculating hashes"
7106
msgstr ""
7107
7108
#: bzrlib/rename_map.py:107
7109
msgid "Determining hash hits"
7110
msgstr ""
7111
7112
#: bzrlib/rename_map.py:242
7113
msgid "{0} => {1}"
7114
msgstr ""
7115
7116
#: bzrlib/repository.py:1738
7117
msgid "Moving repository to repository.backup"
7118
msgstr ""
7119
7120
#: bzrlib/repository.py:1745
7121
msgid "Creating new repository"
7122
msgstr ""
7123
7124
#: bzrlib/repository.py:1750
7125
msgid "Copying content"
7126
msgstr ""
7127
7128
#: bzrlib/repository.py:1754
7129
msgid "Deleting old repository content"
7130
msgstr ""
7131
7132
#: bzrlib/repository.py:1756
7133
msgid "repository converted"
7134
msgstr ""
7135
7136
#: bzrlib/revisionspec.py:903
7137
msgid "Using {0} {1}"
7138
msgstr ""
7139
7140
#: bzrlib/send.py:59
7141
#, python-format
7142
msgid "Mail client \"%s\" does not support specifying body"
7143
msgstr ""
7144
7145
#: bzrlib/send.py:63
7146
msgid "--remember requires a branch to be specified."
7147
msgstr ""
7148
7149
#: bzrlib/send.py:78
7150
msgid "No submit branch known or specified"
7151
msgstr ""
7152
7153
#: bzrlib/send.py:81
7154
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7155
msgstr ""
7156
7157
#: bzrlib/send.py:99
7158
#, python-format
7159
msgid "No such send format '%s'."
7160
msgstr ""
7161
7162
#: bzrlib/send.py:115
7163
msgid "bzr send takes at most two one revision identifiers"
7164
msgstr ""
7165
7166
#: bzrlib/send.py:128
7167
msgid "No revisions to submit."
7168
msgstr ""
7169
7170
#: bzrlib/send.py:140
7171
msgid ""
7172
"- not supported for merge directives that use more than one output file."
7173
msgstr ""
7174
7175
#: bzrlib/send.py:186
7176
msgid "Format 0.9 does not permit bundle with no patch"
7177
msgstr ""
7178
7179
#: bzrlib/shelf_ui.py:46
7180
#, python-format
7181
msgid "Shelve adding file \"%(path)s\"?"
7182
msgstr ""
7183
7184
#: bzrlib/shelf_ui.py:47
7185
msgid "Shelve binary changes?"
7186
msgstr ""
7187
7188
#: bzrlib/shelf_ui.py:48
7189
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7190
msgstr ""
7191
7192
#: bzrlib/shelf_ui.py:50
7193
#, python-format
7194
msgid "Shelve removing file \"%(path)s\"?"
7195
msgstr ""
7196
7197
#: bzrlib/shelf_ui.py:51
7198
#, python-format
7199
msgid "Shelve %d change(s)?"
7200
msgstr ""
7201
7202
#: bzrlib/shelf_ui.py:52
7203
msgid "Shelve?"
7204
msgstr ""
7205
7206
#: bzrlib/shelf_ui.py:53
7207
#, python-format
7208
msgid ""
7209
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7210
msgstr ""
7211
7212
#: bzrlib/shelf_ui.py:55
7213
#, python-format
7214
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7215
msgstr ""
7216
7217
#: bzrlib/shelf_ui.py:70
7218
#, python-format
7219
msgid "Changes shelved with id \"%d\"."
7220
msgstr ""
7221
7222
#: bzrlib/shelf_ui.py:74
7223
msgid "Selected changes destroyed."
7224
msgstr ""
7225
7226
#: bzrlib/shelf_ui.py:78
7227
msgid "Selected changes:"
7228
msgstr ""
7229
7230
#: bzrlib/shelf_ui.py:98
7231
#, python-format
7232
msgid "Delete file \"%(path)s\"?"
7233
msgstr ""
7234
7235
#: bzrlib/shelf_ui.py:99
7236
msgid "Apply binary changes?"
7237
msgstr ""
7238
7239
#: bzrlib/shelf_ui.py:100
7240
#, python-format
7241
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7242
msgstr ""
7243
7244
#: bzrlib/shelf_ui.py:102
7245
#, python-format
7246
msgid "Add file \"%(path)s\"?"
7247
msgstr ""
7248
7249
#: bzrlib/shelf_ui.py:103
7250
#, python-format
7251
msgid "Apply %d change(s)?"
7252
msgstr ""
7253
7254
#: bzrlib/shelf_ui.py:104
7255
msgid "Apply change?"
7256
msgstr ""
7257
7258
#: bzrlib/shelf_ui.py:105
7259
#, python-format
7260
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7261
msgstr ""
7262
7263
#: bzrlib/shelf_ui.py:107
7264
#, python-format
7265
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7266
msgstr ""
7267
7268
#: bzrlib/shelf_ui.py:402
7269
msgid "No changes are shelved."
7270
msgstr ""
7271
7272
#: bzrlib/shelf_ui.py:460
7273
#, python-format
7274
msgid "Using changes with id \"%d\"."
7275
msgstr ""
7276
7277
#: bzrlib/shelf_ui.py:464
7278
#, python-format
7279
msgid "Message: %s"
7280
msgstr ""
7281
7282
#: bzrlib/shelf_ui.py:476
7283
#, python-format
7284
msgid "Deleted changes with id \"%d\"."
7285
msgstr ""
7286
7287
#: bzrlib/smart/medium.py:714
7288
msgid "HPSS calls: {0} ({1} vfs) {2}"
7289
msgstr ""
7290
7291
#: bzrlib/smart/server.py:169
7292
msgid "Requested to stop gracefully"
7293
msgstr ""
7294
7295
#: bzrlib/smart/server.py:179
7296
#, python-format
7297
msgid "Waiting for %d client(s) to finish"
7298
msgstr ""
7299
7300
#: bzrlib/smart/server.py:185
7301
#, python-format
7302
msgid "Still waiting for %d client(s) to finish"
7303
msgstr ""
7304
7305
#: bzrlib/smart/server.py:219
7306
#, python-format
7307
msgid "listening socket error: %s"
7308
msgstr ""
7309
7310
#: bzrlib/smart/server.py:452
7311
#, python-format
7312
msgid "listening on port: %s"
7313
msgstr ""
7314
7315
#: bzrlib/switch.py:73
7316
msgid "Pending merges must be committed or reverted before using switch."
7317
msgstr ""
7318
7319
#: bzrlib/switch.py:100
7320
msgid ""
7321
"Cannot switch as local commits found in the checkout. Commit these to the "
7322
"bound branch or use --force to throw them away."
7323
msgstr ""
7324
7325
#: bzrlib/switch.py:105
7326
#, python-format
7327
msgid ""
7328
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7329
"anyway, use --force."
7330
msgstr ""
7331
7332
#: bzrlib/switch.py:129
7333
msgid "Cannot switch a branch, only a checkout."
7334
msgstr ""
7335
7336
#: bzrlib/switch.py:167
7337
#, python-format
7338
msgid "Tree is up to date at revision %d."
7339
msgstr ""
7340
7341
#: bzrlib/switch.py:173
7342
#, python-format
7343
msgid "Updated to revision %d."
7344
msgstr ""
7345
7346
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7347
msgid "Apply phase"
7348
msgstr ""
7349
7350
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7351
msgid "removing file"
7352
msgstr ""
7353
7354
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7355
msgid "adding file"
7356
msgstr ""
7357
7358
#: bzrlib/transform.py:2598
7359
msgid "Building tree"
7360
msgstr ""
7361
7362
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7363
msgid "Adding file contents"
7364
msgstr ""
7365
7366
#: bzrlib/transform.py:3017
7367
msgid "Resolution pass"
7368
msgstr ""
7369
7370
#: bzrlib/transport/ftp/_gssapi.py:88
7371
#, python-format
7372
msgid "Authenticated as %s"
7373
msgstr ""
7374
7375
#: bzrlib/tree.py:647
7376
msgid "*** {0} content-filter: {1} => {2!r}"
7377
msgstr ""
7378
7379
#: bzrlib/upgrade.py:77
7380
#, python-format
7381
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7382
msgstr ""
7383
7384
#: bzrlib/upgrade.py:100
7385
#, python-format
7386
msgid "cannot upgrade from bzrdir format %s"
7387
msgstr ""
7388
7389
#: bzrlib/upgrade.py:103
7390
#, python-format
7391
msgid "starting upgrade of %s"
7392
msgstr ""
7393
7394
#: bzrlib/upgrade.py:110
7395
msgid "finished"
7396
msgstr ""
7397
7398
#: bzrlib/upgrade.py:120
7399
msgid "Deleting backup.bzr"
7400
msgstr ""
7401
7402
#: bzrlib/upgrade.py:151
7403
msgid ""
7404
"\n"
7405
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7406
msgstr ""
7407
7408
#: bzrlib/upgrade.py:208
7409
#, python-format
7410
msgid "Found %d dependent branches - upgrading ..."
7411
msgstr ""
7412
7413
#: bzrlib/upgrade.py:276
7414
msgid "Upgrading bzrdirs"
7415
msgstr ""
7416
7417
#: bzrlib/upgrade.py:282
7418
#, python-format
7419
msgid "Upgrading %s"
7420
msgstr ""
7421
7422
#: bzrlib/upgrade.py:283
7423
msgid "Upgrading {0} {1} ..."
7424
msgstr ""
7425
7426
#: bzrlib/upgrade.py:301
7427
msgid "Removing backup ..."
7428
msgstr ""
7429
7430
#: bzrlib/upgrade.py:305
7431
msgid "failed to clean-up {0}: {1}"
7432
msgstr ""
7433
7434
#: bzrlib/vf_repository.py:1091
7435
msgid "inventories"
7436
msgstr ""
7437
7438
#: bzrlib/vf_repository.py:1117
7439
msgid "texts"
7440
msgstr ""
7441
7442
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7443
msgid "Calculating text parents"
7444
msgstr ""
7445
7446
#: bzrlib/vf_repository.py:1707
7447
msgid "Fetch texts"
7448
msgstr ""
7449
7450
#: bzrlib/vf_repository.py:2536
7451
msgid "loading text store"
7452
msgstr ""
7453
7454
#: bzrlib/vf_repository.py:2542
7455
msgid "checking text graph"
7456
msgstr ""
7457
7458
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7459
#: bzrlib/vf_repository.py:3127
7460
msgid "Transferring revisions"
7461
msgstr ""
7462
7463
#: bzrlib/win32utils.py:146
7464
msgid "Failed to GetProcessMemoryInfo()"
7465
msgstr ""
7466
7467
#: bzrlib/win32utils.py:167
7468
msgid "Cannot debug memory on win32 without ctypes or win32process"
7469
msgstr ""
7470
7471
#: bzrlib/win32utils.py:172
7472
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7473
msgstr ""
7474
7475
#: bzrlib/win32utils.py:180
7476
#, python-format
7477
msgid "WorkingSize %8d KiB"
7478
msgstr ""
7479
7480
#: bzrlib/win32utils.py:181
7481
#, python-format
7482
msgid "PeakWorking %8d KiB"
7483
msgstr ""
7484
7485
#: bzrlib/win32utils.py:182
7486
#, python-format
7487
msgid "PagefileUsage %8d KiB"
7488
msgstr ""
7489
7490
#: bzrlib/win32utils.py:183
7491
#, python-format
7492
msgid "PeakPagefileUsage %8d KiB"
7493
msgstr ""
7494
7495
#: bzrlib/win32utils.py:185
7496
#, python-format
7497
msgid "PrivateUsage %8d KiB"
7498
msgstr ""
7499
7500
#: bzrlib/win32utils.py:186
7501
#, python-format
7502
msgid "PageFaultCount %8d"
7503
msgstr ""
7504
7505
#: bzrlib/workingtree.py:1482
7506
msgid "Rerun update after fixing the conflicts."
7507
msgstr ""
7508
7509
#: dummy/help_topics/authentication/summary.txt:1
7510
msgid "Information on configuring authentication"
7511
msgstr ""
7512
7513
#: dummy/help_topics/basic/detail.txt:1
7514
msgid ""
7515
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7516
"http://bazaar.canonical.com/"
7517
msgstr ""
7518
7519
#: dummy/help_topics/basic/detail.txt:4
7520
msgid ""
7521
"Basic commands:\n"
7522
" bzr init makes this directory a versioned branch\n"
7523
" bzr branch make a copy of another branch"
7524
msgstr ""
7525
7526
#: dummy/help_topics/basic/detail.txt:8
7527
msgid ""
7528
" bzr add make files or directories versioned\n"
7529
" bzr ignore ignore a file or pattern\n"
7530
" bzr mv move or rename a versioned file"
7531
msgstr ""
7532
7533
#: dummy/help_topics/basic/detail.txt:12
7534
msgid ""
7535
" bzr status summarize changes in working copy\n"
7536
" bzr diff show detailed diffs"
7537
msgstr ""
7538
7539
#: dummy/help_topics/basic/detail.txt:15
7540
msgid ""
7541
" bzr merge pull in changes from another branch\n"
7542
" bzr commit save some or all changes\n"
7543
" bzr send send changes via email"
7544
msgstr ""
7545
7546
#: dummy/help_topics/basic/detail.txt:19
7547
msgid ""
7548
" bzr log show history of changes\n"
7549
" bzr check validate storage"
7550
msgstr ""
7551
7552
#: dummy/help_topics/basic/detail.txt:22
7553
msgid ""
7554
" bzr help init more help on e.g. init command\n"
7555
" bzr help commands list all commands\n"
7556
" bzr help topics list all help topics\n"
7557
msgstr ""
7558
7559
#: dummy/help_topics/basic/summary.txt:1
7560
msgid "Basic commands"
7561
msgstr ""
7562
7563
#: dummy/help_topics/branches/detail.txt:1
7564
msgid "Branches"
7565
msgstr ""
7566
7567
#: dummy/help_topics/branches/detail.txt:3
7568
msgid ""
7569
"A branch consists of the state of a project, including all of its\n"
7570
"history. All branches have a repository associated (which is where the\n"
7571
"branch history is stored), but multiple branches may share the same\n"
7572
"repository (a shared repository). Branches can be copied and merged."
7573
msgstr ""
7574
7575
#: dummy/help_topics/branches/detail.txt:8
7576
msgid ""
7577
"In addition, one branch may be bound to another one. Binding to another\n"
7578
"branch indicates that commits which happen in this branch must also \n"
7579
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7580
"commits when the two branches are out of date. In order for a commit \n"
7581
"to succeed, it may be necessary to update the current branch using \n"
7582
"``bzr update``."
7583
msgstr ""
7584
7585
#: dummy/help_topics/branches/detail.txt:15
7586
#: dummy/help_topics/checkouts/detail.txt:66
7587
#: dummy/help_topics/repositories/detail.txt:36
7588
msgid "Related commands::"
7589
msgstr ""
7590
7591
#: dummy/help_topics/branches/detail.txt:17
7592
msgid ""
7593
" init Change a directory into a versioned branch.\n"
7594
" branch Create a new branch that is a copy of an existing branch.\n"
7595
" merge Perform a three-way merge.\n"
7596
" bind Bind a branch to another one.\n"
7597
msgstr ""
7598
7599
#: dummy/help_topics/branches/summary.txt:1
7600
msgid "Information on what a branch is"
7601
msgstr ""
7602
7603
#: dummy/help_topics/bugs/summary.txt:1
7604
msgid "Bug tracker settings"
7605
msgstr ""
7606
7607
#: dummy/help_topics/checkouts/detail.txt:1
7608
msgid "Checkouts"
7609
msgstr ""
7610
7611
#: dummy/help_topics/checkouts/detail.txt:3
7612
msgid ""
7613
"Checkouts are source trees that are connected to a branch, so that when\n"
7614
"you commit in the source tree, the commit goes into that branch. They\n"
7615
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7616
"Bazaar's decentralized features until you want them. Using checkouts\n"
7617
"with shared repositories is very similar to working with SVN or CVS, but\n"
7618
"doesn't have the same restrictions. And using checkouts still allows\n"
7619
"others working on the project to use whatever workflow they like."
7620
msgstr ""
7621
7622
#: dummy/help_topics/checkouts/detail.txt:11
7623
msgid ""
7624
"A checkout is created with the bzr checkout command (see \"help "
7625
"checkout\").\n"
7626
"You pass it a reference to another branch, and it will create a local copy\n"
7627
"for you that still contains a reference to the branch you created the\n"
7628
"checkout from (the master branch). Then if you make any commits they will "
7629
"be\n"
7630
"made on the other branch first. This creates an instant mirror of your work, "
7631
"or\n"
7632
"facilitates lockstep development, where each developer is working together,\n"
7633
"continuously integrating the changes of others."
7634
msgstr ""
7635
7636
#: dummy/help_topics/checkouts/detail.txt:19
7637
msgid ""
7638
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7639
"you have the full history locally. As you have a first class branch you "
7640
"can\n"
7641
"also commit locally if you want, for instance due to the temporary loss af "
7642
"a\n"
7643
"network connection. Use the --local option to commit to do this. All the "
7644
"local\n"
7645
"commits will then be made on the master branch the next time you do a non-"
7646
"local\n"
7647
"commit."
7648
msgstr ""
7649
7650
#: dummy/help_topics/checkouts/detail.txt:26
7651
msgid ""
7652
"If you are using a checkout from a shared branch you will periodically want "
7653
"to\n"
7654
"pull in all the changes made by others. This is done using the \"update\"\n"
7655
"command. The changes need to be applied before any non-local commit, but\n"
7656
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7657
"command when needed."
7658
msgstr ""
7659
7660
#: dummy/help_topics/checkouts/detail.txt:32
7661
msgid ""
7662
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7663
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7664
"SVN checkout in that it is not a first class branch, it mainly consists of "
7665
"the\n"
7666
"working tree. This means that any history operations must query the master\n"
7667
"branch, which could be slow if a network connection is involved. Also, as "
7668
"you\n"
7669
"don't have a local branch, then you cannot commit locally."
7670
msgstr ""
7671
7672
#: dummy/help_topics/checkouts/detail.txt:39
7673
msgid ""
7674
"Lightweight checkouts work best when you have fast reliable access to the\n"
7675
"master branch. This means that if the master branch is on the same disk or "
7676
"LAN\n"
7677
"a lightweight checkout will be faster than a heavyweight one for any "
7678
"commands\n"
7679
"that modify the revision history (as only one copy of the branch needs to\n"
7680
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7681
"that uses the history but does not change it, but if the master branch is "
7682
"on\n"
7683
"the same disk then there won't be a noticeable difference."
7684
msgstr ""
7685
7686
#: dummy/help_topics/checkouts/detail.txt:47
7687
msgid ""
7688
"Another possible use for a checkout is to use it with a treeless repository\n"
7689
"containing your branches, where you maintain only one working tree by\n"
7690
"switching the master branch that the checkout points to when you want to\n"
7691
"work on a different branch."
7692
msgstr ""
7693
7694
#: dummy/help_topics/checkouts/detail.txt:52
7695
msgid ""
7696
"Obviously to commit on a checkout you need to be able to write to the "
7697
"master\n"
7698
"branch. This means that the master branch must be accessible over a "
7699
"writeable\n"
7700
"protocol , such as sftp://, and that you have write permissions at the "
7701
"other\n"
7702
"end. Checkouts also work on the local file system, so that all that matters "
7703
"is\n"
7704
"file permissions."
7705
msgstr ""
7706
7707
#: dummy/help_topics/checkouts/detail.txt:58
7708
msgid ""
7709
"You can change the master of a checkout by using the \"switch\" command "
7710
"(see\n"
7711
"\"help switch\"). This will change the location that the commits are sent "
7712
"to.\n"
7713
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7714
"checkout. If you would like to convert your heavy checkout into a normal\n"
7715
"branch so that every commit is local, you can use the \"unbind\" command. To "
7716
"see\n"
7717
"whether or not a branch is bound or not you can use the \"info\" command. If "
7718
"the\n"
7719
"branch is bound it will tell you the location of the bound branch."
7720
msgstr ""
7721
7722
#: dummy/help_topics/checkouts/detail.txt:68
7723
msgid ""
7724
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7725
" checkout\n"
7726
" update Pull any changes in the master branch in to your checkout\n"
7727
" commit Make a commit that is sent to the master branch. If you have\n"
7728
" a heavy checkout then the --local option will commit to the\n"
7729
" checkout without sending the commit to the master\n"
7730
" switch Change the master branch that the commits in the checkout "
7731
"will\n"
7732
" be sent to\n"
7733
" bind Turn a standalone branch into a heavy checkout so that any\n"
7734
" commits will be sent to the master branch\n"
7735
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7736
" commits are only made locally\n"
7737
" info Displays whether a branch is bound or unbound. If the branch "
7738
"is\n"
7739
" bound, then it will also display the location of the bound "
7740
"branch\n"
7741
msgstr ""
7742
7743
#: dummy/help_topics/checkouts/summary.txt:1
7744
msgid "Information on what a checkout is"
7745
msgstr ""
7746
7747
#: dummy/help_topics/commands/summary.txt:1
7748
msgid "Basic help for all commands"
7749
msgstr ""
7750
7751
#: dummy/help_topics/configuration/summary.txt:1
7752
msgid "Details on the configuration settings available"
7753
msgstr ""
7754
7755
#: dummy/help_topics/conflict-types/summary.txt:1
7756
msgid "Types of conflicts and what to do about them"
7757
msgstr ""
7758
7759
#: dummy/help_topics/content-filters/summary.txt:1
7760
msgid "Conversion of content into/from working trees"
7761
msgstr ""
7762
7763
#: dummy/help_topics/criss-cross/detail.txt:1
7764
msgid "Criss-Cross"
7765
msgstr ""
7766
7767
#: dummy/help_topics/criss-cross/detail.txt:3
7768
msgid ""
7769
"A criss-cross in the branch history can cause the default merge technique\n"
7770
"to emit more conflicts than would normally be expected."
7771
msgstr ""
7772
7773
#: dummy/help_topics/criss-cross/detail.txt:6
7774
msgid ""
7775
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7776
"give\n"
7777
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7778
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7779
msgstr ""
7780
7781
#: dummy/help_topics/criss-cross/detail.txt:10
7782
msgid ""
7783
"Criss-crosses occur in a branch's history if two branches merge the same "
7784
"thing\n"
7785
"and then merge one another, or if two branches merge one another at the "
7786
"same\n"
7787
"time. They can be avoided by having each branch only merge from or into a\n"
7788
"designated central branch (a \"star topology\")."
7789
msgstr ""
7790
7791
#: dummy/help_topics/criss-cross/detail.txt:15
7792
msgid ""
7793
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7794
"default\n"
7795
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7796
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7797
"differences between THIS and OTHER are due to one side adding lines, or\n"
7798
"from another side removing lines."
7799
msgstr ""
7800
7801
#: dummy/help_topics/criss-cross/detail.txt:21
7802
msgid ""
7803
"Criss-crosses mean there is no good choice for a base. Selecting the "
7804
"recent\n"
7805
"merge points could cause one side's changes to be silently discarded.\n"
7806
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7807
"are emitted."
7808
msgstr ""
7809
7810
#: dummy/help_topics/criss-cross/detail.txt:26
7811
msgid ""
7812
"The ``weave`` merge type is not affected by this problem because it uses\n"
7813
"line-origin detection instead of a basis revision to determine the cause of\n"
7814
"differences.\n"
7815
msgstr ""
7816
7817
#: dummy/help_topics/criss-cross/summary.txt:1
7818
msgid "Information on criss-cross merging"
7819
msgstr ""
7820
7821
#: dummy/help_topics/current-formats/summary.txt:1
7822
msgid "Current storage formats"
7823
msgstr ""
7824
7825
#: dummy/help_topics/debug-flags/summary.txt:1
7826
msgid "Options to show or record debug information"
7827
msgstr ""
7828
7829
#: dummy/help_topics/diverged-branches/summary.txt:1
7830
msgid "How to fix diverged branches"
7831
msgstr ""
7832
7833
#: dummy/help_topics/env-variables/summary.txt:1
7834
msgid "Environment variable names and values"
7835
msgstr ""
7836
7837
#: dummy/help_topics/eol/summary.txt:1
7838
msgid "Information on end-of-line handling"
7839
msgstr ""
7840
7841
#: dummy/help_topics/files/detail.txt:1
7842
msgid "Files"
7843
msgstr ""
7844
7845
#: dummy/help_topics/files/detail.txt:3
7846
msgid ""
7847
":On Unix: ~/.bazaar/bazaar.conf\n"
7848
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7849
"bazaar\\\\2.0\\\\bazaar.conf"
7850
msgstr ""
7851
7852
#: dummy/help_topics/files/detail.txt:6
7853
msgid ""
7854
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7855
"used to define general configuration that will be applied everywhere.\n"
7856
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7857
"commonly used options."
7858
msgstr ""
7859
7860
#: dummy/help_topics/files/detail.txt:11
7861
msgid "A typical config file might look something like::"
7862
msgstr ""
7863
7864
#: dummy/help_topics/files/detail.txt:13
7865
msgid ""
7866
" [DEFAULT]\n"
7867
" email=John Doe <jdoe@isp.com>"
7868
msgstr ""
7869
7870
#: dummy/help_topics/files/detail.txt:16
7871
msgid ""
7872
" [ALIASES]\n"
7873
" commit = commit --strict\n"
7874
" log10 = log --short -r -10..-1\n"
7875
msgstr ""
7876
7877
#: dummy/help_topics/files/summary.txt:1
7878
msgid "Information on configuration and log files"
7879
msgstr ""
7880
7881
#: dummy/help_topics/formats/detail.txt:1
7882
msgid "Storage Formats"
7883
msgstr ""
7884
7885
#: dummy/help_topics/formats/detail.txt:3
7886
msgid ""
7887
"To ensure that older clients do not access data incorrectly,\n"
7888
"Bazaar's policy is to introduce a new storage format whenever\n"
7889
"new features requiring new metadata are added. New storage\n"
7890
"formats may also be introduced to improve performance and\n"
7891
"scalability."
7892
msgstr ""
7893
7894
#: dummy/help_topics/formats/detail.txt:9
7895
msgid ""
7896
"The newest format, 2a, is highly recommended. If your\n"
7897
"project is not using 2a, then you should suggest to the\n"
7898
"project owner to upgrade."
7899
msgstr ""
7900
7901
#: dummy/help_topics/formats/detail.txt:13
7902
msgid ""
7903
"\n"
7904
".. note::"
7905
msgstr ""
7906
7907
#: dummy/help_topics/formats/detail.txt:16
7908
msgid ""
7909
" Some of the older formats have two variants:\n"
7910
" a plain one and a rich-root one. The latter include an additional\n"
7911
" field about the root of the tree. There is no performance cost\n"
7912
" for using a rich-root format but you cannot easily merge changes\n"
7913
" from a rich-root format into a plain format. As a consequence,\n"
7914
" moving a project to a rich-root format takes some co-ordination\n"
7915
" in that all contributors need to upgrade their repositories\n"
7916
" around the same time. 2a and all future formats will be\n"
7917
" implicitly rich-root."
7918
msgstr ""
7919
7920
#: dummy/help_topics/formats/detail.txt:26
7921
msgid ""
7922
"See :doc:`current-formats-help` for the complete list of\n"
7923
"currently supported formats. See :doc:`other-formats-help` for\n"
7924
"descriptions of any available experimental and deprecated formats.\n"
7925
msgstr ""
7926
7927
#: dummy/help_topics/formats/summary.txt:1
7928
msgid "Information on choosing a storage format"
7929
msgstr ""
7930
7931
#: dummy/help_topics/global-options/detail.txt:1
7932
msgid "Global Options"
7933
msgstr ""
7934
7935
#: dummy/help_topics/global-options/detail.txt:3
7936
msgid ""
7937
"These options may be used with any command, and may appear in front of any\n"
7938
"command. (e.g. ``bzr --profile help``)."
7939
msgstr ""
7940
7941
#: dummy/help_topics/global-options/detail.txt:6
7942
msgid ""
7943
"--version Print the version number. Must be supplied before the "
7944
"command.\n"
7945
"--no-aliases Do not process command aliases when running this command.\n"
7946
"--builtin Use the built-in version of a command, not the plugin "
7947
"version.\n"
7948
" This does not suppress other plugin effects.\n"
7949
"--no-plugins Do not process any plugins.\n"
7950
"--no-l10n Do not translate messages.\n"
7951
"--concurrency Number of processes that can be run concurrently (selftest)."
7952
msgstr ""
7953
7954
#: dummy/help_topics/global-options/detail.txt:14
7955
msgid ""
7956
"--profile Profile execution using the hotshot profiler.\n"
7957
"--lsprof Profile execution using the lsprof profiler.\n"
7958
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7959
" results to a specified file. If the filename ends with "
7960
"\".txt\",\n"
7961
" text format will be used. If the filename either starts "
7962
"with\n"
7963
" \"callgrind.out\" or end with \".callgrind\", the output will "
7964
"be\n"
7965
" formatted for use with KCacheGrind. Otherwise, the output\n"
7966
" will be a pickle.\n"
7967
"--coverage Generate line coverage report in the specified directory."
7968
msgstr ""
7969
7970
#: dummy/help_topics/global-options/detail.txt:24
7971
msgid ""
7972
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7973
"for\n"
7974
" the duration of the command. This can be used multiple times "
7975
"if\n"
7976
" several options need to be overridden."
7977
msgstr ""
7978
7979
#: dummy/help_topics/global-options/detail.txt:28
7980
msgid ""
7981
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7982
"information on profiling."
7983
msgstr ""
7984
7985
#: dummy/help_topics/global-options/detail.txt:31
7986
msgid ""
7987
"A number of debug flags are also available to assist troubleshooting and\n"
7988
"development. See :doc:`debug-flags-help`.\n"
7989
msgstr ""
7990
7991
#: dummy/help_topics/global-options/summary.txt:1
7992
msgid "Options that control how Bazaar runs"
7993
msgstr ""
7994
7995
#: dummy/help_topics/hidden-commands/summary.txt:1
7996
msgid "All hidden commands"
7997
msgstr ""
7998
7999
#: dummy/help_topics/hooks/summary.txt:1
8000
msgid "Points at which custom processing can be added"
8001
msgstr ""
8002
8003
#: dummy/help_topics/launchpad/detail.txt:1
8004
msgid "Integration with Launchpad.net"
8005
msgstr ""
8006
8007
#: dummy/help_topics/launchpad/detail.txt:3
8008
msgid ""
8009
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8010
"specification tracking."
8011
msgstr ""
8012
8013
#: dummy/help_topics/launchpad/detail.txt:6
8014
msgid ""
8015
"The bzr client (through the plugin called 'launchpad') has special\n"
8016
"features to communicate with Launchpad:"
8017
msgstr ""
8018
8019
#: dummy/help_topics/launchpad/detail.txt:9
8020
msgid ""
8021
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8022
"This\n"
8023
" is then used by the 'lp:' transport to download your branches using\n"
8024
" bzr+ssh://."
8025
msgstr ""
8026
8027
#: dummy/help_topics/launchpad/detail.txt:13
8028
msgid ""
8029
" * The 'lp:' transport uses Launchpad as a directory service: for "
8030
"example\n"
8031
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8032
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8033
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8034
msgstr ""
8035
8036
#: dummy/help_topics/launchpad/detail.txt:18
8037
msgid ""
8038
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8039
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8040
"lp:12345'\n"
8041
" will record a revision property that marks that revision as fixing\n"
8042
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8043
" automatically be linked to the bug report."
8044
msgstr ""
8045
8046
#: dummy/help_topics/launchpad/detail.txt:24
8047
msgid ""
8048
" * The register-branch command tells Launchpad about the url of a\n"
8049
" public branch. Launchpad will then mirror the branch, display\n"
8050
" its contents and allow it to be attached to bugs and other\n"
8051
" objects."
8052
msgstr ""
8053
8054
#: dummy/help_topics/launchpad/detail.txt:29
8055
msgid "For more information see http://help.launchpad.net/\n"
8056
msgstr ""
8057
8058
#: dummy/help_topics/launchpad/summary.txt:1
8059
msgid "Using Bazaar with Launchpad.net"
8060
msgstr ""
8061
8062
#: dummy/help_topics/location-alias/summary.txt:1
8063
msgid "Aliases for remembered locations"
8064
msgstr ""
8065
8066
#: dummy/help_topics/log-formats/summary.txt:1
8067
msgid "Details on the logging formats available"
8068
msgstr ""
8069
8070
#: dummy/help_topics/other-formats/summary.txt:1
8071
msgid "Experimental and deprecated storage formats"
8072
msgstr ""
8073
8074
#: dummy/help_topics/patterns/summary.txt:1
8075
msgid "Information on the pattern syntax"
8076
msgstr ""
8077
8078
#: dummy/help_topics/repositories/detail.txt:1
8079
msgid "Repositories"
8080
msgstr ""
8081
8082
#: dummy/help_topics/repositories/detail.txt:3
8083
msgid ""
8084
"Repositories in Bazaar are where committed information is stored. There is\n"
8085
"a repository associated with every branch."
8086
msgstr ""
8087
8088
#: dummy/help_topics/repositories/detail.txt:6
8089
msgid ""
8090
"Repositories are a form of database. Bzr will usually maintain this for\n"
8091
"good performance automatically, but in some situations (e.g. when doing\n"
8092
"very many commits in a short time period) you may want to ask bzr to\n"
8093
"optimise the database indices. This can be done by the 'bzr pack' command."
8094
msgstr ""
8095
8096
#: dummy/help_topics/repositories/detail.txt:11
8097
msgid ""
8098
"By default just running 'bzr init' will create a repository within the new\n"
8099
"branch but it is possible to create a shared repository which allows "
8100
"multiple\n"
8101
"branches to share their information in the same location. When a new branch "
8102
"is\n"
8103
"created it will first look to see if there is a containing shared repository "
8104
"it\n"
8105
"can use."
8106
msgstr ""
8107
8108
#: dummy/help_topics/repositories/detail.txt:17
8109
msgid ""
8110
"When two branches of the same project share a repository, there is\n"
8111
"generally a large space saving. For some operations (e.g. branching\n"
8112
"within the repository) this translates in to a large time saving."
8113
msgstr ""
8114
8115
#: dummy/help_topics/repositories/detail.txt:21
8116
msgid ""
8117
"To create a shared repository use the init-repository command (or the alias\n"
8118
"init-repo). This command takes the location of the repository to create. "
8119
"This\n"
8120
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8121
"which contains a shared repository. Any new branches that are created in "
8122
"this\n"
8123
"directory will then use it for storage."
8124
msgstr ""
8125
8126
#: dummy/help_topics/repositories/detail.txt:27
8127
msgid ""
8128
"It is a good idea to create a repository whenever you might create more\n"
8129
"than one branch of a project. This is true for both working areas where you\n"
8130
"are doing the development, and any server areas that you use for hosting\n"
8131
"projects. In the latter case, it is common to want branches without working\n"
8132
"trees. Since the files in the branch will not be edited directly there is "
8133
"no\n"
8134
"need to use up disk space for a working tree. To create a repository in "
8135
"which\n"
8136
"the branches will not have working trees pass the '--no-trees' option to\n"
8137
"'init-repository'."
8138
msgstr ""
8139
8140
#: dummy/help_topics/repositories/detail.txt:38
8141
msgid ""
8142
" init-repository Create a shared repository. Use --no-trees to create "
8143
"one\n"
8144
" in which new branches won't get a working tree.\n"
8145
msgstr ""
8146
8147
#: dummy/help_topics/repositories/summary.txt:1
8148
msgid "Basic information on shared repositories."
8149
msgstr ""
8150
8151
#: dummy/help_topics/revisionspec/summary.txt:1
8152
msgid "Explain how to use --revision"
8153
msgstr ""
8154
8155
#: dummy/help_topics/rules/summary.txt:1
8156
msgid "Information on defining rule-based preferences"
8157
msgstr ""
8158
8159
#: dummy/help_topics/standalone-trees/detail.txt:1
8160
msgid "Standalone Trees"
8161
msgstr ""
8162
8163
#: dummy/help_topics/standalone-trees/detail.txt:3
8164
msgid ""
8165
"A standalone tree is a working tree with an associated repository. It\n"
8166
"is an independently usable branch, with no dependencies on any other.\n"
8167
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8168
"an existing project under version control."
8169
msgstr ""
8170
8171
#: dummy/help_topics/standalone-trees/detail.txt:8
8172
msgid "Related Commands::"
8173
msgstr ""
8174
8175
#: dummy/help_topics/standalone-trees/detail.txt:10
8176
msgid " init Make a directory into a versioned branch.\n"
8177
msgstr ""
8178
8179
#: dummy/help_topics/standalone-trees/summary.txt:1
8180
msgid "Information on what a standalone tree is"
8181
msgstr ""
8182
8183
#: dummy/help_topics/standard-options/detail.txt:1
8184
msgid "Standard Options"
8185
msgstr ""
8186
8187
#: dummy/help_topics/standard-options/detail.txt:3
8188
msgid "Standard options are legal for all commands."
8189
msgstr ""
8190
8191
#: dummy/help_topics/standard-options/detail.txt:5
8192
msgid ""
8193
"--help, -h Show help message.\n"
8194
"--verbose, -v Display more information.\n"
8195
"--quiet, -q Only display errors and warnings."
8196
msgstr ""
8197
8198
#: dummy/help_topics/standard-options/detail.txt:9
8199
msgid "Unlike global options, standard options can be used in aliases.\n"
8200
msgstr ""
8201
8202
#: dummy/help_topics/standard-options/summary.txt:1
8203
msgid "Options that can be used with any command"
8204
msgstr ""
8205
8206
#: dummy/help_topics/status-flags/detail.txt:1
8207
msgid "Status Flags"
8208
msgstr ""
8209
8210
#: dummy/help_topics/status-flags/detail.txt:3
8211
msgid ""
8212
"Status flags are used to summarise changes to the working tree in a concise\n"
8213
"manner. They are in the form::"
8214
msgstr ""
8215
8216
#: dummy/help_topics/status-flags/detail.txt:6
8217
msgid " xxx <filename>"
8218
msgstr ""
8219
8220
#: dummy/help_topics/status-flags/detail.txt:8
8221
msgid "where the columns' meanings are as follows."
8222
msgstr ""
8223
8224
#: dummy/help_topics/status-flags/detail.txt:10
8225
msgid "Column 1 - versioning/renames::"
8226
msgstr ""
8227
8228
#: dummy/help_topics/status-flags/detail.txt:12
8229
msgid ""
8230
" + File versioned\n"
8231
" - File unversioned\n"
8232
" R File renamed\n"
8233
" ? File unknown\n"
8234
" X File nonexistent (and unknown to bzr)\n"
8235
" C File has conflicts\n"
8236
" P Entry for a pending merge (not a file)"
8237
msgstr ""
8238
8239
#: dummy/help_topics/status-flags/detail.txt:20
8240
msgid "Column 2 - contents::"
8241
msgstr ""
8242
8243
#: dummy/help_topics/status-flags/detail.txt:22
8244
msgid ""
8245
" N File created\n"
8246
" D File deleted\n"
8247
" K File kind changed\n"
8248
" M File modified"
8249
msgstr ""
8250
8251
#: dummy/help_topics/status-flags/detail.txt:27
8252
msgid "Column 3 - execute::"
8253
msgstr ""
8254
8255
#: dummy/help_topics/status-flags/detail.txt:29
8256
msgid " * The execute bit was changed\n"
8257
msgstr ""
8258
8259
#: dummy/help_topics/status-flags/summary.txt:1
8260
msgid "Help on status flags"
8261
msgstr ""
8262
8263
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8264
msgid "Branches Out of Sync"
8265
msgstr ""
8266
8267
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8268
msgid ""
8269
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8270
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8271
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8272
"have the same last revision as the new reference branch for the lightweight\n"
8273
"checkout, data could be lost, so Bazaar refuses."
8274
msgstr ""
8275
8276
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8277
msgid "How you deal with this depends on *why* the branches are out of sync."
8278
msgstr ""
8279
8280
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8281
msgid ""
8282
"If you have a checkout and have done local commits, you can get back in "
8283
"sync\n"
8284
"by running \"bzr update\" (and possibly \"bzr commit\")."
8285
msgstr ""
8286
8287
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8288
msgid ""
8289
"If you have a branch and the remote branch is out-of-date, you can push\n"
8290
"the local changes using \"bzr push\". If the local branch is out of date, "
8291
"you\n"
8292
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8293
"commit\n"
8294
"and then push your changes. If you decide that some of the changes aren't\n"
8295
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8296
msgstr ""
8297
8298
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8299
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8300
msgstr ""
8301
8302
#: dummy/help_topics/topics/summary.txt:1
8303
msgid "Topics list"
8304
msgstr ""
8305
8306
#: dummy/help_topics/url-special-chars/summary.txt:1
8307
msgid "Special character handling in URLs"
8308
msgstr ""
8309
8310
#: dummy/help_topics/urlspec/summary.txt:1
8311
msgid "Supported transport protocols"
8312
msgstr ""
8313
8314
#: dummy/help_topics/working-trees/detail.txt:1
8315
msgid "Working Trees"
8316
msgstr ""
8317
8318
#: dummy/help_topics/working-trees/detail.txt:3
8319
msgid ""
8320
"A working tree is the contents of a branch placed on disk so that you can\n"
8321
"see the files and edit them. The working tree is where you make changes to "
8322
"a\n"
8323
"branch, and when you commit the current state of the working tree is the\n"
8324
"snapshot that is recorded in the commit."
8325
msgstr ""
8326
8327
#: dummy/help_topics/working-trees/detail.txt:8
8328
msgid ""
8329
"When you push a branch to a remote system, a working tree will not be\n"
8330
"created. If one is already present the files will not be updated. The\n"
8331
"branch information will be updated and the working tree will be marked\n"
8332
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8333
"may be uncommitted changes or the update may cause content conflicts that "
8334
"are\n"
8335
"difficult to deal with remotely."
8336
msgstr ""
8337
8338
#: dummy/help_topics/working-trees/detail.txt:15
8339
msgid ""
8340
"If you have a branch with no working tree you can use the 'checkout' "
8341
"command\n"
8342
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8343
"will\n"
8344
"create the working tree. If the branch is updated remotely, you can update "
8345
"the\n"
8346
"working tree by running 'bzr update' in that directory."
8347
msgstr ""
8348
8349
#: dummy/help_topics/working-trees/detail.txt:20
8350
msgid ""
8351
"If you have a branch with a working tree that you do not want the 'remove-"
8352
"tree'\n"
8353
"command will remove the tree if it is safe. This can be done to avoid the\n"
8354
"warning about the remote working tree not being updated when pushing to the\n"
8355
"branch. It can also be useful when working with a '--no-trees' repository\n"
8356
"(see 'bzr help repositories')."
8357
msgstr ""
8358
8359
#: dummy/help_topics/working-trees/detail.txt:26
8360
msgid ""
8361
"If you want to have a working tree on a remote machine that you push to you\n"
8362
"can either run 'bzr update' in the remote branch after each push, or use "
8363
"some\n"
8364
"other method to update the tree during the push. There is an 'rspush' "
8365
"plugin\n"
8366
"that will update the working tree using rsync as well as doing a push. "
8367
"There\n"
8368
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8369
"SSH\n"
8370
"after each push."
8371
msgstr ""
8372
8373
#: dummy/help_topics/working-trees/detail.txt:33
8374
msgid "Useful commands::"
8375
msgstr ""
8376
8377
#: dummy/help_topics/working-trees/detail.txt:35
8378
msgid ""
8379
" checkout Create a working tree when a branch does not have one.\n"
8380
" remove-tree Removes the working tree from a branch when it is safe to do "
8381
"so.\n"
8382
" update When a working tree is out of sync with its associated "
8383
"branch\n"
8384
" this will update the tree to match the branch.\n"
8385
msgstr ""
8386
8387
#: dummy/help_topics/working-trees/summary.txt:1
8388
msgid "Information on working trees"
8389
msgstr ""
8390
8391
#: en/help_topics/authentication.txt:1
8392
msgid ""
8393
"Authentication Settings\n"
8394
"======================="
8395
msgstr ""
8396
8397
#: en/help_topics/authentication.txt:4
8398
msgid ""
8399
"\n"
8400
"Intent\n"
8401
"------"
8402
msgstr ""
8403
8404
#: en/help_topics/authentication.txt:8
8405
msgid ""
8406
"Many different authentication policies can be described in the\n"
8407
"``authentication.conf`` file but a particular user should need only a few\n"
8408
"definitions to cover his needs without having to specify a user and a "
8409
"password\n"
8410
"for every branch he uses."
8411
msgstr ""
8412
8413
#: en/help_topics/authentication.txt:13
8414
msgid ""
8415
"The definitions found in this file are used to find the credentials to use "
8416
"for\n"
8417
"a given url. The same credentials can generally be used for as many branches "
8418
"as\n"
8419
"possible by grouping their declaration around the remote servers that need\n"
8420
"them. It's even possible to declare credentials that will be used by "
8421
"different\n"
8422
"servers."
8423
msgstr ""
8424
8425
#: en/help_topics/authentication.txt:19
8426
msgid ""
8427
"The intent is to make this file as small as possible to minimize maintenance."
8428
msgstr ""
8429
8430
#: en/help_topics/authentication.txt:21
8431
msgid ""
8432
"Once the relevant credentials are declared in this file you may use branch "
8433
"urls\n"
8434
"without embedding passwords (security hazard) or even users (enabling "
8435
"sharing\n"
8436
"of your urls with others)."
8437
msgstr ""
8438
8439
#: en/help_topics/authentication.txt:25
8440
msgid "Instead of using::"
8441
msgstr ""
8442
8443
#: en/help_topics/authentication.txt:27
8444
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8445
msgstr ""
8446
8447
#: en/help_topics/authentication.txt:29
8448
msgid "you simply use::"
8449
msgstr ""
8450
8451
#: en/help_topics/authentication.txt:31
8452
msgid " bzr branch ftp://host.com/path/to/my/branch"
8453
msgstr ""
8454
8455
#: en/help_topics/authentication.txt:33
8456
msgid ""
8457
"provided you have created the following ``authentication.conf`` file::"
8458
msgstr ""
8459
8460
#: en/help_topics/authentication.txt:35
8461
msgid ""
8462
" [myprojects]\n"
8463
" scheme=ftp\n"
8464
" host=host.com\n"
8465
" user=joe\n"
8466
" password=secret\n"
8467
" "
8468
msgstr ""
8469
8470
#: en/help_topics/authentication.txt:42
8471
msgid ""
8472
"Authentication definitions\n"
8473
"--------------------------"
8474
msgstr ""
8475
8476
#: en/help_topics/authentication.txt:45
8477
msgid ""
8478
"There are two kinds of authentication used by the various schemes supported "
8479
"by\n"
8480
"bzr:"
8481
msgstr ""
8482
8483
#: en/help_topics/authentication.txt:48
8484
msgid "1. user and password"
8485
msgstr ""
8486
8487
#: en/help_topics/authentication.txt:50
8488
msgid ""
8489
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8490
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8491
"ssh agents are a better, more secure solution. So we have chosen to not "
8492
"provide\n"
8493
"our own less secure method."
8494
msgstr ""
8495
8496
#: en/help_topics/authentication.txt:55
8497
msgid "2. user, realm and password"
8498
msgstr ""
8499
8500
#: en/help_topics/authentication.txt:57
8501
msgid ""
8502
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8503
"against a host. But, by using ``.htaccess`` files, for example, it is "
8504
"possible\n"
8505
"to define several (``user, realm, password``) for a given ``host``. So what "
8506
"is\n"
8507
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8508
"is\n"
8509
"not taken into account in the definitions, but will displayed if bzr "
8510
"prompts\n"
8511
"you for a password."
8512
msgstr ""
8513
8514
#: en/help_topics/authentication.txt:64
8515
msgid ""
8516
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8517
"specifying the appropriate port."
8518
msgstr ""
8519
8520
#: en/help_topics/authentication.txt:67
8521
msgid ""
8522
"To take all schemes into account, the password will be deduced from a set "
8523
"of\n"
8524
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8525
"``user``,\n"
8526
"``password``)."
8527
msgstr ""
8528
8529
#: en/help_topics/authentication.txt:71
8530
msgid ""
8531
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8532
"used\n"
8533
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8534
"``ssh``\n"
8535
" should be used instead since this is the real scheme regarding\n"
8536
" authentication,"
8537
msgstr ""
8538
8539
#: en/help_topics/authentication.txt:76
8540
msgid " * ``host``: can be empty (to act as a default for any host),"
8541
msgstr ""
8542
8543
#: en/help_topics/authentication.txt:78
8544
msgid ""
8545
" * ``port`` can be empty (useful when an host provides several servers for "
8546
"the\n"
8547
" same scheme), only numerical values are allowed, this should be used "
8548
"only\n"
8549
" when the server uses a port different than the scheme standard port,"
8550
msgstr ""
8551
8552
#: en/help_topics/authentication.txt:82
8553
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8554
msgstr ""
8555
8556
#: en/help_topics/authentication.txt:84
8557
msgid ""
8558
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8559
" ``getpass.get_user()``),"
8560
msgstr ""
8561
8562
#: en/help_topics/authentication.txt:87
8563
msgid ""
8564
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8565
" password."
8566
msgstr ""
8567
8568
#: en/help_topics/authentication.txt:90
8569
msgid ""
8570
"Multiple definitions can be provided and, for a given URL, bzr will select "
8571
"a\n"
8572
"(``user`` [, ``password``]) based on the following rules :"
8573
msgstr ""
8574
8575
#: en/help_topics/authentication.txt:93
8576
msgid " 1. the first match wins,"
8577
msgstr ""
8578
8579
#: en/help_topics/authentication.txt:95
8580
msgid " 2. empty fields match everything,"
8581
msgstr ""
8582
8583
#: en/help_topics/authentication.txt:97
8584
msgid ""
8585
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8586
msgstr ""
8587
8588
#: en/help_topics/authentication.txt:99
8589
msgid ""
8590
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8591
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8592
"``projectbzr.sf.net``\n"
8593
" will not match ``bzr.sf.net``)."
8594
msgstr ""
8595
8596
#: en/help_topics/authentication.txt:103
8597
msgid ""
8598
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8599
msgstr ""
8600
8601
#: en/help_topics/authentication.txt:105
8602
msgid ""
8603
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8604
"above,\n"
8605
" empty paths will match any provided path)."
8606
msgstr ""
8607
8608
#: en/help_topics/authentication.txt:110
8609
msgid ""
8610
"File format\n"
8611
"-----------"
8612
msgstr ""
8613
8614
#: en/help_topics/authentication.txt:113
8615
msgid ""
8616
"The general rules for :doc:`configuration files <configuration-help>`\n"
8617
"apply except for the variable policies."
8618
msgstr ""
8619
8620
#: en/help_topics/authentication.txt:116
8621
msgid "Each section describes an authentication definition."
8622
msgstr ""
8623
8624
#: en/help_topics/authentication.txt:118
8625
msgid ""
8626
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8627
"reserved\n"
8628
"and should appear as the *last* section."
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:121
8632
msgid "Each section should define:"
8633
msgstr ""
8634
8635
#: en/help_topics/authentication.txt:123
8636
msgid "* ``user``: the login to be used,"
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:125
8640
msgid "Each section could define:"
8641
msgstr ""
8642
8643
#: en/help_topics/authentication.txt:127
8644
msgid "* ``host``: the remote server,"
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:129
8648
msgid "* ``port``: the port the server is listening,"
8649
msgstr ""
8650
8651
#: en/help_topics/authentication.txt:131
8652
msgid "* ``path``: the branch location,"
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:133
8656
msgid "* ``password``: the password."
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:135
8660
msgid ""
8661
"\n"
8662
"Examples\n"
8663
"--------"
8664
msgstr ""
8665
8666
#: en/help_topics/authentication.txt:139
8667
msgid ""
8668
"\n"
8669
"Personal projects hosted outside\n"
8670
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8671
msgstr ""
8672
8673
#: en/help_topics/authentication.txt:143
8674
msgid ""
8675
"All connections are done with the same ``user`` (the remote one for which "
8676
"the\n"
8677
"default bzr one is not appropriate) and the password is always prompted "
8678
"with\n"
8679
"some exceptions::"
8680
msgstr ""
8681
8682
#: en/help_topics/authentication.txt:147
8683
msgid ""
8684
" # Pet projects on hobby.net\n"
8685
" [hobby]\n"
8686
" host=r.hobby.net\n"
8687
" user=jim\n"
8688
" password=obvious1234\n"
8689
" \n"
8690
" # Home server\n"
8691
" [home]\n"
8692
" scheme=https\n"
8693
" host=home.net\n"
8694
" user=joe\n"
8695
" password=1essobV10us\n"
8696
" \n"
8697
" [DEFAULT]\n"
8698
" # Our local user is barbaz, on all remote sites we're known as "
8699
"foobar\n"
8700
" user=foobar"
8701
msgstr ""
8702
8703
#: en/help_topics/authentication.txt:164
8704
msgid ""
8705
"\n"
8706
"Source hosting provider\n"
8707
"~~~~~~~~~~~~~~~~~~~~~~~"
8708
msgstr ""
8709
8710
#: en/help_topics/authentication.txt:168
8711
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8712
msgstr ""
8713
8714
#: en/help_topics/authentication.txt:170
8715
msgid ""
8716
" [shpnet domain]\n"
8717
" # we use sftp, but ssh is the scheme used for authentication\n"
8718
" scheme=ssh\n"
8719
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8720
" host=.shp.net\n"
8721
" user=joe\n"
8722
" # bzr don't support supplying a password for sftp,\n"
8723
" # consider using an ssh agent if you don't want to supply\n"
8724
" # a password interactively. (pageant, ssh-agent, etc)"
8725
msgstr ""
8726
8727
#: en/help_topics/authentication.txt:180
8728
msgid ""
8729
"HTTPS, SFTP servers and their proxy\n"
8730
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8731
msgstr ""
8732
8733
#: en/help_topics/authentication.txt:183
8734
msgid ""
8735
"At company.com, the server hosting release and integration branches is "
8736
"behind a\n"
8737
"proxy, and the two branches use different authentication policies::"
8738
msgstr ""
8739
8740
#: en/help_topics/authentication.txt:186
8741
msgid ""
8742
" [reference code]\n"
8743
" scheme=https\n"
8744
" host=dev.company.com\n"
8745
" path=/dev\n"
8746
" user=user1\n"
8747
" password=pass1"
8748
msgstr ""
8749
8750
#: en/help_topics/authentication.txt:193
8751
msgid ""
8752
" # development branches on dev server\n"
8753
" [dev]\n"
8754
" scheme=ssh # bzr+ssh and sftp are available here\n"
8755
" host=dev.company.com\n"
8756
" path=/dev/integration\n"
8757
" user=user2\n"
8758
" \n"
8759
" # proxy\n"
8760
" [proxy]\n"
8761
" scheme=http\n"
8762
" host=proxy.company.com\n"
8763
" port=3128\n"
8764
" user=proxyuser1\n"
8765
" password=proxypass1"
8766
msgstr ""
8767
8768
#: en/help_topics/authentication.txt:208
8769
msgid ""
8770
"\n"
8771
"Planned enhancements\n"
8772
"--------------------"
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:212
8776
msgid ""
8777
"The following are not yet implemented but planned as parts of a work in\n"
8778
"progress:"
8779
msgstr ""
8780
8781
#: en/help_topics/authentication.txt:215
8782
msgid "* add a ``password_encoding`` field allowing:"
8783
msgstr ""
8784
8785
#: en/help_topics/authentication.txt:217
8786
msgid ""
8787
" - storing the passwords in various obfuscating encodings (base64 for one),"
8788
msgstr ""
8789
8790
#: en/help_topics/authentication.txt:219
8791
msgid " - delegate password storage to plugins (.netrc for example)."
8792
msgstr ""
8793
8794
#: en/help_topics/authentication.txt:221
8795
msgid ""
8796
"* update the credentials when the user is prompted for user or password,"
8797
msgstr ""
8798
8799
#: en/help_topics/authentication.txt:223
8800
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8801
msgstr ""
8802
8803
#: en/help_topics/authentication.txt:225
8804
msgid ""
8805
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8806
"but\n"
8807
"ignored in the actual implementation.\n"
8808
msgstr ""
8809
8810
#: en/help_topics/bugs.txt:1
8811
msgid "Bug Tracker Settings"
8812
msgstr ""
8813
8814
#: en/help_topics/bugs.txt:3
8815
msgid ""
8816
"When making a commit, metadata about bugs fixed by that change can be\n"
8817
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8818
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8819
"(The only ``status`` value currently supported is ``fixed.``)"
8820
msgstr ""
8821
8822
#: en/help_topics/bugs.txt:8
8823
msgid ""
8824
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8825
"identifier\n"
8826
"rather than a full URL. This looks like::"
8827
msgstr ""
8828
8829
#: en/help_topics/bugs.txt:11
8830
msgid " bzr commit --fixes <tracker>:<id>"
8831
msgstr ""
8832
8833
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8834
msgid "or::"
8835
msgstr ""
8836
8837
#: en/help_topics/bugs.txt:15
8838
msgid " bzr commit --fixes <id>"
8839
msgstr ""
8840
8841
#: en/help_topics/bugs.txt:17
8842
msgid ""
8843
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8844
"the\n"
8845
"identifier for that bug within the bugtracker, usually the bug number.\n"
8846
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8847
"or global configuration is used."
8848
msgstr ""
8849
8850
#: en/help_topics/bugs.txt:22
8851
msgid ""
8852
"Bazaar knows about a few bug trackers that have many users. If\n"
8853
"you use one of these bug trackers then there is no setup required to\n"
8854
"use this feature, you just need to know the tracker identifier to use.\n"
8855
"These are the bugtrackers that are built in:"
8856
msgstr ""
8857
8858
#: en/help_topics/bugs.txt:27
8859
msgid ""
8860
" ============================ ============ ============\n"
8861
" URL Abbreviation Example\n"
8862
" ============================ ============ ============\n"
8863
" https://bugs.launchpad.net/ lp lp:12345\n"
8864
" http://bugs.debian.org/ deb deb:12345\n"
8865
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8866
" ============================ ============ ============"
8867
msgstr ""
8868
8869
#: en/help_topics/bugs.txt:35
8870
msgid ""
8871
"For the bug trackers not listed above configuration is required.\n"
8872
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8873
"is built in, along with a template mechanism for other bugtrackers with\n"
8874
"simple URL schemes. If your bug tracker can't be described by one\n"
8875
"of the schemes described below then you can write a plugin to support\n"
8876
"it."
8877
msgstr ""
8878
8879
#: en/help_topics/bugs.txt:42
8880
msgid ""
8881
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8882
"variable which contains the base URL of the bug tracker. These options\n"
8883
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8884
"configuration section in ``locations.conf``. You can set up these values\n"
8885
"for each of the projects you work on."
8886
msgstr ""
8887
8888
#: en/help_topics/bugs.txt:48
8889
msgid ""
8890
"Note: As you provide a short name for each tracker, you can specify one or\n"
8891
"more bugs in one or more trackers at commit time if you wish."
8892
msgstr ""
8893
8894
#: en/help_topics/bugs.txt:51
8895
msgid ""
8896
"Launchpad\n"
8897
"---------"
8898
msgstr ""
8899
8900
#: en/help_topics/bugs.txt:54
8901
msgid ""
8902
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8903
msgstr ""
8904
8905
#: en/help_topics/bugs.txt:56
8906
msgid ""
8907
"bugzilla_<tracker>_url\n"
8908
"----------------------"
8909
msgstr ""
8910
8911
#: en/help_topics/bugs.txt:59
8912
msgid ""
8913
"If present, the location of the Bugzilla bug tracker referred to by\n"
8914
"<tracker>. This option can then be used together with ``bzr commit\n"
8915
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8916
"example::"
8917
msgstr ""
8918
8919
#: en/help_topics/bugs.txt:64
8920
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8921
msgstr ""
8922
8923
#: en/help_topics/bugs.txt:66
8924
msgid ""
8925
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8926
"fixed."
8927
msgstr ""
8928
8929
#: en/help_topics/bugs.txt:69
8930
msgid ""
8931
"trac_<tracker>_url\n"
8932
"------------------"
8933
msgstr ""
8934
8935
#: en/help_topics/bugs.txt:72
8936
msgid ""
8937
"If present, the location of the Trac instance referred to by\n"
8938
"<tracker>. This option can then be used together with ``bzr commit\n"
8939
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8940
"example::"
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:77
8944
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8945
msgstr ""
8946
8947
#: en/help_topics/bugs.txt:79
8948
msgid ""
8949
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8950
"as\n"
8951
"fixed."
8952
msgstr ""
8953
8954
#: en/help_topics/bugs.txt:82
8955
msgid ""
8956
"bugtracker_<tracker>_url\n"
8957
"------------------------"
8958
msgstr ""
8959
8960
#: en/help_topics/bugs.txt:85
8961
msgid ""
8962
"If present, the location of a generic bug tracker instance referred to by\n"
8963
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8964
"which will be replaced by a specific bug ID. This option can then be used\n"
8965
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8966
"fixed by that commit. For example::"
8967
msgstr ""
8968
8969
#: en/help_topics/bugs.txt:91
8970
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8971
msgstr ""
8972
8973
#: en/help_topics/bugs.txt:93
8974
msgid ""
8975
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8976
"Roundup bug tracker as fixed, or::"
8977
msgstr ""
8978
8979
#: en/help_topics/bugs.txt:96
8980
msgid ""
8981
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8982
msgstr ""
8983
8984
#: en/help_topics/bugs.txt:98
8985
msgid ""
8986
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8987
"RT bug tracker as fixed, or::"
8988
msgstr ""
8989
8990
#: en/help_topics/bugs.txt:101
8991
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8992
msgstr ""
8993
8994
#: en/help_topics/bugs.txt:103
8995
msgid ""
8996
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8997
"1234\n"
8998
"in Hudson's JIRA bug tracker as fixed.\n"
8999
msgstr ""
9000
9001
#: en/help_topics/commands.txt:1
9002
msgid ""
9003
"add Add specified files or directories.\n"
9004
"alias Set/unset and display aliases.\n"
9005
"annotate Show the origin of each line in a file.\n"
9006
"bash-completion Generate a shell function for bash command line "
9007
"completion.\n"
9008
" [bash_completion]\n"
9009
"bind Convert the current branch into a checkout of the "
9010
"supplied\n"
9011
" branch.\n"
9012
"branch Create a new branch that is a copy of an existing branch.\n"
9013
"branches List the branches available at the current location.\n"
9014
"break-lock Break a dead lock.\n"
9015
"cat Write the contents of a file as of a given revision to\n"
9016
" standard output.\n"
9017
"check Validate working tree structure, branch consistency and\n"
9018
" repository history.\n"
9019
"checkout Create a new checkout of an existing branch.\n"
9020
"clean-tree Remove unwanted files from working tree.\n"
9021
"commit Commit changes into a new revision.\n"
9022
"config Display, set or remove a configuration option.\n"
9023
"conflicts List files with conflicts.\n"
9024
"deleted List files deleted in the working tree.\n"
9025
"diff Show differences in the working tree, between revisions "
9026
"or\n"
9027
" branches.\n"
9028
"dpush Push into a different VCS without any custom bzr "
9029
"metadata.\n"
9030
"export Export current or past revision to a destination directory "
9031
"or\n"
9032
" archive.\n"
9033
"help Show help on a command or other topic.\n"
9034
"ignore Ignore specified files or patterns.\n"
9035
"ignored List ignored files and the patterns that matched them.\n"
9036
"info Show information about a working tree, branch or "
9037
"repository.\n"
9038
"init Make a directory into a versioned branch.\n"
9039
"init-repository Create a shared repository for branches to share storage\n"
9040
" space.\n"
9041
"join Combine a tree into its containing tree.\n"
9042
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9043
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9044
"launchpad-open Open a Launchpad branch page in your web browser. "
9045
"[launchpad]\n"
9046
"log Show historical log for a branch or subset of a branch.\n"
9047
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9048
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9049
"ls List files in a tree.\n"
9050
"merge Perform a three-way merge.\n"
9051
"missing Show unmerged/unpulled revisions between two branches.\n"
9052
"mkdir Create a new versioned directory.\n"
9053
"mv Move or rename a file.\n"
9054
"nick Print or set the branch nickname.\n"
9055
"pack Compress the data within a repository.\n"
9056
"plugins List the installed plugins.\n"
9057
"pull Turn this branch into a mirror of another branch.\n"
9058
"push Update a mirror of this branch.\n"
9059
"reconcile Reconcile bzr metadata in a branch.\n"
9060
"reconfigure Reconfigure the type of a bzr directory.\n"
9061
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9062
"remerge Redo a merge.\n"
9063
"remove Remove files or directories.\n"
9064
"remove-branch Remove a branch.\n"
9065
"remove-tree Remove the working tree from a given branch/checkout.\n"
9066
"renames Show list of renamed files.\n"
9067
"resolve Mark a conflict as resolved.\n"
9068
"revert Set files in the working tree back to the contents of a\n"
9069
" previous revision.\n"
9070
"revno Show current revision number.\n"
9071
"root Show the tree root directory.\n"
9072
"send Mail or create a merge-directive for submitting changes.\n"
9073
"serve Run the bzr server.\n"
9074
"shelve Temporarily set aside some changes from the current tree.\n"
9075
"sign-my-commits Sign all commits by a given committer.\n"
9076
"split Split a subdirectory of a tree into a separate tree.\n"
9077
"status Display status summary.\n"
9078
"switch Set the branch of a checkout and update.\n"
9079
"tag Create, remove or modify a tag naming a revision.\n"
9080
"tags List tags.\n"
9081
"testament Show testament (signing-form) of a revision.\n"
9082
"unbind Convert the current checkout into a regular branch.\n"
9083
"uncommit Remove the last committed revision.\n"
9084
"unshelve Restore shelved changes.\n"
9085
"update Update a working tree to a new revision.\n"
9086
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9087
" format.\n"
9088
"verify-signatures Verify all commit signatures.\n"
9089
"version Show version of bzr.\n"
9090
"version-info Show version information about this tree.\n"
9091
"view Manage filtered views.\n"
9092
"whoami Show or set bzr user id.\n"
9093
msgstr ""
9094
9095
#: en/help_topics/configuration.txt:1
9096
msgid ""
9097
"Configuration Settings\n"
9098
"======================="
9099
msgstr ""
9100
9101
#: en/help_topics/configuration.txt:4
9102
msgid ""
9103
"Environment settings\n"
9104
"---------------------"
9105
msgstr ""
9106
9107
#: en/help_topics/configuration.txt:7
9108
msgid ""
9109
"While most configuration is handled by configuration files, some options\n"
9110
"which may be semi-permanent can also be controlled through the environment."
9111
msgstr ""
9112
9113
#: en/help_topics/configuration.txt:10
9114
msgid ""
9115
"BZR_EMAIL\n"
9116
"~~~~~~~~~"
9117
msgstr ""
9118
9119
#: en/help_topics/configuration.txt:13
9120
msgid "Override the email id used by Bazaar. Typical format::"
9121
msgstr ""
9122
9123
#: en/help_topics/configuration.txt:15
9124
msgid " \"John Doe <jdoe@example.com>\""
9125
msgstr ""
9126
9127
#: en/help_topics/configuration.txt:17
9128
msgid "See also the ``email`` configuration option."
9129
msgstr ""
9130
9131
#: en/help_topics/configuration.txt:19
9132
msgid ""
9133
"BZR_PROGRESS_BAR\n"
9134
"~~~~~~~~~~~~~~~~"
9135
msgstr ""
9136
9137
#: en/help_topics/configuration.txt:22
9138
msgid ""
9139
"Override the progress display. Possible values are \"none\" or \"text\". "
9140
"If\n"
9141
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9142
"draws\n"
9143
"the ordinary command line progress bar."
9144
msgstr ""
9145
9146
#: en/help_topics/configuration.txt:26
9147
msgid ""
9148
"BZR_SIGQUIT_PDB\n"
9149
"~~~~~~~~~~~~~~~"
9150
msgstr ""
9151
9152
#: en/help_topics/configuration.txt:29
9153
msgid ""
9154
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9155
msgstr ""
9156
9157
#: en/help_topics/configuration.txt:31
9158
msgid ""
9159
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9160
"* 1 = Invoke breakin debugger (default)"
9161
msgstr ""
9162
9163
#: en/help_topics/configuration.txt:34
9164
msgid ""
9165
"BZR_HOME\n"
9166
"~~~~~~~~"
9167
msgstr ""
9168
9169
#: en/help_topics/configuration.txt:37
9170
msgid "Override the home directory used by Bazaar."
9171
msgstr ""
9172
9173
#: en/help_topics/configuration.txt:39
9174
msgid ""
9175
"BZR_SSH\n"
9176
"~~~~~~~"
9177
msgstr ""
9178
9179
#: en/help_topics/configuration.txt:42
9180
msgid "Select a different SSH implementation."
9181
msgstr ""
9182
9183
#: en/help_topics/configuration.txt:44
9184
msgid ""
9185
"BZR_PDB\n"
9186
"~~~~~~~"
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:47
9190
msgid "Control whether to launch a debugger on error."
9191
msgstr ""
9192
9193
#: en/help_topics/configuration.txt:49
9194
msgid ""
9195
"* 0 = Standard behavior\n"
9196
"* 1 = Launch debugger"
9197
msgstr ""
9198
9199
#: en/help_topics/configuration.txt:52
9200
msgid ""
9201
"BZR_REMOTE_PATH\n"
9202
"~~~~~~~~~~~~~~~"
9203
msgstr ""
9204
9205
#: en/help_topics/configuration.txt:55
9206
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9207
msgstr ""
9208
9209
#: en/help_topics/configuration.txt:57
9210
msgid "See also the ``bzr_remote_path`` configuration option."
9211
msgstr ""
9212
9213
#: en/help_topics/configuration.txt:59
9214
msgid ""
9215
"BZR_EDITOR\n"
9216
"~~~~~~~~~~"
9217
msgstr ""
9218
9219
#: en/help_topics/configuration.txt:62
9220
msgid "Path to the editor Bazaar should use for commit messages, etc."
9221
msgstr ""
9222
9223
#: en/help_topics/configuration.txt:64
9224
msgid ""
9225
"BZR_LOG\n"
9226
"~~~~~~~"
9227
msgstr ""
9228
9229
#: en/help_topics/configuration.txt:67
9230
msgid ""
9231
"Location of the Bazaar log file. You can check the current location by\n"
9232
"running ``bzr version``."
9233
msgstr ""
9234
9235
#: en/help_topics/configuration.txt:70
9236
msgid ""
9237
"The log file contains debug information that is useful for diagnosing or\n"
9238
"reporting problems with Bazaar."
9239
msgstr ""
9240
9241
#: en/help_topics/configuration.txt:73
9242
msgid ""
9243
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9244
"will disable logging."
9245
msgstr ""
9246
9247
#: en/help_topics/configuration.txt:76
9248
msgid ""
9249
"\n"
9250
"BZR_PLUGIN_PATH\n"
9251
"~~~~~~~~~~~~~~~"
9252
msgstr ""
9253
9254
#: en/help_topics/configuration.txt:80
9255
msgid ""
9256
"The path to the plugins directory that Bazaar should use.\n"
9257
"If not set, Bazaar will search for plugins in:"
9258
msgstr ""
9259
9260
#: en/help_topics/configuration.txt:83
9261
msgid ""
9262
"* the user specific plugin directory (containing the ``user`` plugins),"
9263
msgstr ""
9264
9265
#: en/help_topics/configuration.txt:85
9266
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9267
msgstr ""
9268
9269
#: en/help_topics/configuration.txt:87
9270
msgid ""
9271
"* the site specific plugin directory if applicable (containing\n"
9272
" the ``site`` plugins)."
9273
msgstr ""
9274
9275
#: en/help_topics/configuration.txt:90
9276
msgid ""
9277
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9278
"the way the plugin are searched. "
9279
msgstr ""
9280
9281
#: en/help_topics/configuration.txt:93
9282
msgid ""
9283
"As for the ``PATH`` variables, if multiple directories are\n"
9284
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9285
"platform specific appropriate character (':' on Unix,\n"
9286
"';' on windows)"
9287
msgstr ""
9288
9289
#: en/help_topics/configuration.txt:98
9290
msgid ""
9291
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9292
"in ``user``. However it will continue to search in ``core`` and\n"
9293
"``site`` unless they are explicitly removed."
9294
msgstr ""
9295
9296
#: en/help_topics/configuration.txt:102
9297
msgid ""
9298
"If you need to change the order or remove one of these\n"
9299
"directories, you should use special values:"
9300
msgstr ""
9301
9302
#: en/help_topics/configuration.txt:105
9303
msgid ""
9304
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9305
" path from the default values,"
9306
msgstr ""
9307
9308
#: en/help_topics/configuration.txt:108
9309
msgid ""
9310
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9311
" before the remaining default values (and also remove it from\n"
9312
" the default values)."
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:112
9316
msgid ""
9317
"Note that the special values 'user', 'core' and 'site' should be\n"
9318
"used literally, they will be substituted by the corresponding,\n"
9319
"platform specific, values."
9320
msgstr ""
9321
9322
#: en/help_topics/configuration.txt:116
9323
msgid ""
9324
"The examples below use ':' as the separator, windows users\n"
9325
"should use ';'."
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:119
9329
msgid "Overriding the default user plugin directory::"
9330
msgstr ""
9331
9332
#: en/help_topics/configuration.txt:121
9333
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:123
9337
msgid "Disabling the site directory while retaining the user directory::"
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:125
9341
msgid " BZR_PLUGIN_PATH='-site:+user'"
9342
msgstr ""
9343
9344
#: en/help_topics/configuration.txt:127
9345
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:129
9349
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:131
9353
msgid "Overriding the default site plugin directory::"
9354
msgstr ""
9355
9356
#: en/help_topics/configuration.txt:133
9357
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9358
msgstr ""
9359
9360
#: en/help_topics/configuration.txt:135
9361
msgid ""
9362
"BZR_DISABLE_PLUGINS\n"
9363
"~~~~~~~~~~~~~~~~~~~"
9364
msgstr ""
9365
9366
#: en/help_topics/configuration.txt:138
9367
msgid ""
9368
"Under special circumstances (mostly when trying to diagnose a\n"
9369
"bug), it's better to disable a plugin (or several) rather than\n"
9370
"uninstalling them completely. Such plugins can be specified in\n"
9371
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9372
msgstr ""
9373
9374
#: en/help_topics/configuration.txt:143
9375
msgid ""
9376
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9377
"will raise an import error if they are explicitly imported (by\n"
9378
"another plugin that depends on them for example)."
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:147
9382
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:149
9386
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:151
9390
msgid ""
9391
"BZR_PLUGINS_AT\n"
9392
"~~~~~~~~~~~~~~"
9393
msgstr ""
9394
9395
#: en/help_topics/configuration.txt:154
9396
msgid ""
9397
"When adding a new feature or working on a bug in a plugin,\n"
9398
"developers often need to use a specific version of a given\n"
9399
"plugin. Since python requires that the directory containing the\n"
9400
"code is named like the plugin itself this make it impossible to\n"
9401
"use arbitrary directory names (using a two-level directory scheme\n"
9402
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9403
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9404
msgstr ""
9405
9406
#: en/help_topics/configuration.txt:162
9407
msgid ""
9408
"Plugins specified in this environment variable takes precedence\n"
9409
"over the ones in ``BZR_PLUGIN_PATH``."
9410
msgstr ""
9411
9412
#: en/help_topics/configuration.txt:165
9413
msgid ""
9414
"The variable specified a list of ``plugin_name@plugin path``,\n"
9415
"``plugin_name`` being the name of the plugin as it appears in\n"
9416
"python module paths, ``plugin_path`` being the path to the\n"
9417
"directory containing the plugin code itself\n"
9418
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9419
"separator, use ';' on windows."
9420
msgstr ""
9421
9422
#: en/help_topics/configuration.txt:172
9423
msgid ""
9424
"Example:\n"
9425
"~~~~~~~~"
9426
msgstr ""
9427
9428
#: en/help_topics/configuration.txt:175
9429
msgid ""
9430
"Using a specific version of ``myplugin``:\n"
9431
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9432
msgstr ""
9433
9434
#: en/help_topics/configuration.txt:178
9435
msgid ""
9436
"BZRPATH\n"
9437
"~~~~~~~"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:181
9441
msgid "The path where Bazaar should look for shell plugin external commands."
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:183
9445
msgid ""
9446
"\n"
9447
"http_proxy, https_proxy\n"
9448
"~~~~~~~~~~~~~~~~~~~~~~~"
9449
msgstr ""
9450
9451
#: en/help_topics/configuration.txt:187
9452
msgid "Specifies the network proxy for outgoing connections, for example::"
9453
msgstr ""
9454
9455
#: en/help_topics/configuration.txt:189
9456
msgid ""
9457
" http_proxy=http://proxy.example.com:3128/ \n"
9458
" https_proxy=http://proxy.example.com:3128/"
9459
msgstr ""
9460
9461
#: en/help_topics/configuration.txt:192
9462
msgid ""
9463
"\n"
9464
"Configuration files\n"
9465
"-------------------"
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:196
9469
msgid ""
9470
"Location\n"
9471
"~~~~~~~~"
9472
msgstr ""
9473
9474
#: en/help_topics/configuration.txt:199
9475
msgid ""
9476
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9477
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9478
"on\n"
9479
"Windows. (You can check the location for your system by using\n"
9480
"``bzr version``.)"
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:204
9484
msgid "There are three primary configuration files in this location:"
9485
msgstr ""
9486
9487
#: en/help_topics/configuration.txt:206
9488
msgid "* ``bazaar.conf`` describes default configuration options,"
9489
msgstr ""
9490
9491
#: en/help_topics/configuration.txt:208
9492
msgid ""
9493
"* ``locations.conf`` describes configuration information for\n"
9494
" specific branch locations,"
9495
msgstr ""
9496
9497
#: en/help_topics/configuration.txt:211
9498
msgid ""
9499
"* ``authentication.conf`` describes credential information for\n"
9500
" remote servers."
9501
msgstr ""
9502
9503
#: en/help_topics/configuration.txt:214
9504
msgid ""
9505
"Each branch can also contain a configuration file that sets values specific\n"
9506
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9507
"the\n"
9508
"branch. This file is visible to all users of a branch, if you wish to "
9509
"override\n"
9510
"one of the values for a branch with a setting that is specific to you then "
9511
"you\n"
9512
"can do so in ``locations.conf``."
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:220
9516
msgid ""
9517
"General format\n"
9518
"~~~~~~~~~~~~~~"
9519
msgstr ""
9520
9521
#: en/help_topics/configuration.txt:223
9522
msgid ""
9523
"An ini file has three types of contructs: section headers, section\n"
9524
"options and comments."
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:226
9528
msgid ""
9529
"Comments\n"
9530
"^^^^^^^^"
9531
msgstr ""
9532
9533
#: en/help_topics/configuration.txt:229
9534
msgid ""
9535
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9536
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9537
"Bazaar when parsing ini files."
9538
msgstr ""
9539
9540
#: en/help_topics/configuration.txt:233
9541
msgid ""
9542
"Section headers\n"
9543
"^^^^^^^^^^^^^^^"
9544
msgstr ""
9545
9546
#: en/help_topics/configuration.txt:236
9547
msgid ""
9548
"A section header is a word enclosed in brackets that starts at the begining\n"
9549
"of a line. A typical section header looks like this::"
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:239
9553
msgid " [DEFAULT]"
9554
msgstr ""
9555
9556
#: en/help_topics/configuration.txt:241
9557
msgid ""
9558
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9559
"[ALIASES]. Section headers are case sensitive. The default section provides "
9560
"for\n"
9561
"setting options which can be overridden with the branch config file."
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:245
9565
msgid ""
9566
"For ``locations.conf``, the options from the section with the\n"
9567
"longest matching section header are used to the exclusion of other\n"
9568
"potentially valid section headers. A section header uses the path for\n"
9569
"the branch as the section header. Some examples include::"
9570
msgstr ""
9571
9572
#: en/help_topics/configuration.txt:250
9573
msgid ""
9574
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9575
" [/home/jdoe/branches/]"
9576
msgstr ""
9577
9578
#: en/help_topics/configuration.txt:253
9579
msgid ""
9580
"\n"
9581
"Section options\n"
9582
"^^^^^^^^^^^^^^^"
9583
msgstr ""
9584
9585
#: en/help_topics/configuration.txt:257
9586
msgid ""
9587
"A section option resides within a section. A section option contains an\n"
9588
"option name, an equals sign and a value. For example::"
9589
msgstr ""
9590
9591
#: en/help_topics/configuration.txt:260
9592
msgid ""
9593
" email = John Doe <jdoe@isp.com>\n"
9594
" gpg_signing_key = Amy Pond <amy@example.com>"
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:263
9598
msgid ""
9599
"A option can reference other options by enclosing them in curly brackets::"
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:265
9603
msgid ""
9604
" my_branch_name = feature_x\n"
9605
" my_server = bzr+ssh://example.com\n"
9606
" push_location = {my_server}/project/{my_branch_name}"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:269
9610
msgid ""
9611
"Option policies\n"
9612
"^^^^^^^^^^^^^^^"
9613
msgstr ""
9614
9615
#: en/help_topics/configuration.txt:272
9616
msgid ""
9617
"Options defined in a section affect the named directory or URL plus\n"
9618
"any locations they contain. Policies can be used to change how an\n"
9619
"option value is interpreted for contained locations. Currently\n"
9620
"there are three policies available:"
9621
msgstr ""
9622
9623
#: en/help_topics/configuration.txt:277
9624
msgid ""
9625
" none:\n"
9626
" the value is interpreted the same for contained locations. This is\n"
9627
" the default behaviour.\n"
9628
" norecurse:\n"
9629
" the value is only used for the exact location specified by the\n"
9630
" section name.\n"
9631
" appendpath:\n"
9632
" for contained locations, any additional path components are\n"
9633
" appended to the value."
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:287
9637
msgid ""
9638
"Policies are specified by keys with names of the form "
9639
"\"<option_name>:policy\".\n"
9640
"For example, to define the push location for a tree of branches, the\n"
9641
"following could be used::"
9642
msgstr ""
9643
9644
#: en/help_topics/configuration.txt:291
9645
msgid ""
9646
" [/top/location]\n"
9647
" push_location = sftp://example.com/location\n"
9648
" push_location:policy = appendpath"
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:295
9652
msgid ""
9653
"With this configuration, the push location for ``/top/location/branch1``\n"
9654
"would be ``sftp://example.com/location/branch1``."
9655
msgstr ""
9656
9657
#: en/help_topics/configuration.txt:298
9658
msgid ""
9659
"Section local options\n"
9660
"^^^^^^^^^^^^^^^^^^^^^"
9661
msgstr ""
9662
9663
#: en/help_topics/configuration.txt:301
9664
msgid ""
9665
"Some options are defined automatically inside a given section and can be\n"
9666
"refered to in this section only. "
9667
msgstr ""
9668
9669
#: en/help_topics/configuration.txt:304
9670
msgid "For example, the ``appendpath`` policy can be used like this::"
9671
msgstr ""
9672
9673
#: en/help_topics/configuration.txt:306
9674
msgid ""
9675
" [/home/vila/src/bzr/bugs]\n"
9676
" mypush = lp:~vila/bzr\n"
9677
" mypush:policy=appendpath"
9678
msgstr ""
9679
9680
#: en/help_topics/configuration.txt:310
9681
msgid "Using ``relpath`` to achieve the same result is done like this::"
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:312
9685
msgid ""
9686
" [/home/vila/src/bzr/bugs]\n"
9687
" mypush = lp:~vila/bzr/{relpath}"
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:315
9691
msgid ""
9692
"In both cases, when used in a directory like\n"
9693
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9694
msgstr ""
9695
9696
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9697
msgid ""
9698
" $ bzr config mypush\n"
9699
" lp:~vila/bzr/832013-expand-in-stack"
9700
msgstr ""
9701
9702
#: en/help_topics/configuration.txt:321
9703
msgid "Another such option is ``basename`` which can be used like this::"
9704
msgstr ""
9705
9706
#: en/help_topics/configuration.txt:323
9707
msgid ""
9708
" [/home/vila/src/bzr]\n"
9709
" mypush = lp:~vila/bzr/{basename}"
9710
msgstr ""
9711
9712
#: en/help_topics/configuration.txt:326
9713
msgid ""
9714
"When used in a directory like\n"
9715
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:332
9719
msgid ""
9720
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9721
"itself is defined as the relative path between the section name and the\n"
9722
"location it matches."
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:336
9726
msgid ""
9727
"Another such option is ``branchname``, which refers to the name of a "
9728
"colocated\n"
9729
"branch. For non-colocated branches, it behaves like basename. It can be "
9730
"used\n"
9731
"like this::"
9732
msgstr ""
9733
9734
#: en/help_topics/configuration.txt:340
9735
msgid ""
9736
" [/home/vila/src/bzr/bugs]\n"
9737
" mypush = lp:~vila/bzr/{branchname}"
9738
msgstr ""
9739
9740
#: en/help_topics/configuration.txt:343
9741
msgid ""
9742
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9743
"get::"
9744
msgstr ""
9745
9746
#: en/help_topics/configuration.txt:345
9747
msgid ""
9748
" bzr config mypush\n"
9749
" lp:~vila/bzr/832013-expand-in-stack"
9750
msgstr ""
9751
9752
#: en/help_topics/configuration.txt:348
9753
msgid ""
9754
"When an option is local to a Section, it cannot be referred to from option\n"
9755
"values in any other section from the same ``Store`` nor from any other\n"
9756
"``Store``."
9757
msgstr ""
9758
9759
#: en/help_topics/configuration.txt:352
9760
msgid ""
9761
"\n"
9762
"The main configuration file, bazaar.conf\n"
9763
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:356
9767
msgid ""
9768
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9769
"The default section contains the default\n"
9770
"configuration options for all branches. The default section can be\n"
9771
"overriden by providing a branch-specific section in ``locations.conf``."
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:361
9775
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9776
msgstr ""
9777
9778
#: en/help_topics/configuration.txt:363
9779
msgid ""
9780
" [DEFAULT]\n"
9781
" email = John Doe <jdoe@isp.com>\n"
9782
" editor = /usr/bin/vim\n"
9783
" create_signatures = when-required"
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:368
9787
msgid ""
9788
"\n"
9789
"The branch location configuration file, locations.conf\n"
9790
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:372
9794
msgid ""
9795
"``locations.conf`` allows one to specify overriding settings for\n"
9796
"a specific branch. The format is almost identical to the default section in\n"
9797
"bazaar.conf with one significant change: The section header, instead of "
9798
"saying\n"
9799
"default, will be the path to a branch that you wish to override a value\n"
9800
"for. The '?' and '*' wildcards are supported::"
9801
msgstr ""
9802
9803
#: en/help_topics/configuration.txt:378
9804
msgid ""
9805
" [/home/jdoe/branches/nethack]\n"
9806
" email = Nethack Admin <nethack@nethack.com>"
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:381
9810
msgid ""
9811
" [http://hypothetical.site.com/branches/devel-branch]\n"
9812
" create_signatures = always"
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:384
9816
msgid ""
9817
"The authentication configuration file, authentication.conf\n"
9818
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9819
msgstr ""
9820
9821
#: en/help_topics/configuration.txt:387
9822
msgid ""
9823
"``authentication.conf`` allows one to specify credentials for\n"
9824
"remote servers. This can be used for all the supported transports and any "
9825
"part\n"
9826
"of bzr that requires authentication (smtp for example)."
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:391
9830
msgid ""
9831
"The syntax of the file obeys the same rules as the others except for the\n"
9832
"option policies which don't apply."
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:394
9836
msgid ""
9837
"For more information on the possible uses of the authentication "
9838
"configuration\n"
9839
"file see :doc:`authentication-help`."
9840
msgstr ""
9841
9842
#: en/help_topics/configuration.txt:397
9843
msgid ""
9844
"\n"
9845
"Common options\n"
9846
"--------------"
9847
msgstr ""
9848
9849
#: en/help_topics/configuration.txt:401
9850
msgid ""
9851
"debug_flags\n"
9852
"~~~~~~~~~~~"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:404
9856
msgid ""
9857
"A comma-separated list of debugging options to turn on. The same values\n"
9858
"can be used as with the -D command-line option (see `help global-options`).\n"
9859
"For example::"
9860
msgstr ""
9861
9862
#: en/help_topics/configuration.txt:408
9863
msgid " debug_flags = hpss"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:412
9867
msgid " debug_flags = hpss,evil"
9868
msgstr ""
9869
9870
#: en/help_topics/configuration.txt:414
9871
msgid ""
9872
"email\n"
9873
"~~~~~"
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:417
9877
msgid ""
9878
"The email address to use when committing a branch. Typically takes the form\n"
9879
"of::"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:420
9883
msgid " email = Full Name <account@hostname.tld>"
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:422
9887
msgid ""
9888
"editor\n"
9889
"~~~~~~"
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:425
9893
msgid ""
9894
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9895
"a commit message. This setting is trumped by the environment variable\n"
9896
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9897
"variables."
9898
msgstr ""
9899
9900
#: en/help_topics/configuration.txt:430
9901
msgid ""
9902
"log_format\n"
9903
"~~~~~~~~~~"
9904
msgstr ""
9905
9906
#: en/help_topics/configuration.txt:433
9907
msgid ""
9908
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9909
"and ``line``. Additional formats may be provided by plugins. The default\n"
9910
"value is ``long``."
9911
msgstr ""
9912
9913
#: en/help_topics/configuration.txt:437
9914
msgid ""
9915
"check_signatures\n"
9916
"~~~~~~~~~~~~~~~~"
9917
msgstr ""
9918
9919
#: en/help_topics/configuration.txt:440
9920
msgid ""
9921
"Reserved for future use. These options will allow a policy for branches to\n"
9922
"require signatures."
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:443
9926
msgid ""
9927
"require\n"
9928
" The gnupg signature for revisions must be present and must be valid."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:446
9932
msgid ""
9933
"ignore\n"
9934
" Do not check gnupg signatures of revisions."
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:449
9938
msgid ""
9939
"check-available\n"
9940
" (default) If gnupg signatures for revisions are present, check them.\n"
9941
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9942
" no signature is present."
9943
msgstr ""
9944
9945
#: en/help_topics/configuration.txt:454
9946
msgid ""
9947
"create_signatures\n"
9948
"~~~~~~~~~~~~~~~~~"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:457
9952
msgid ""
9953
"Defines the behaviour of signing revisions on commits. By default bzr will "
9954
"not\n"
9955
"sign new commits."
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:460
9959
msgid ""
9960
"always\n"
9961
" Sign every new revision that is committed. If the signing fails then "
9962
"the\n"
9963
" commit will not be made."
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:464
9967
msgid ""
9968
"when-required\n"
9969
" Reserved for future use."
9970
msgstr ""
9971
9972
#: en/help_topics/configuration.txt:467
9973
msgid ""
9974
"never\n"
9975
" Reserved for future use."
9976
msgstr ""
9977
9978
#: en/help_topics/configuration.txt:470
9979
msgid ""
9980
"In future it is planned that ``when-required`` will sign newly\n"
9981
"committed revisions only when the branch requires them. ``never`` will "
9982
"refuse\n"
9983
"to sign newly committed revisions, even if the branch requires signatures."
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:474
9987
msgid ""
9988
"dirstate.fdatasync\n"
9989
"~~~~~~~~~~~~~~~~~~"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:477
9993
msgid ""
9994
"If true (default), working tree metadata changes are flushed through the\n"
9995
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9996
"should not be lost if the machine crashes. See also repository.fdatasync."
9997
msgstr ""
9998
9999
#: en/help_topics/configuration.txt:481
10000
msgid ""
10001
"gpg_signing_key\n"
10002
"~~~~~~~~~~~~~~~"
10003
msgstr ""
10004
10005
#: en/help_topics/configuration.txt:484
10006
msgid ""
10007
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10008
"address, key fingerprint or full key ID. When unset or when set to\n"
10009
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:488
10013
msgid ""
10014
"recurse\n"
10015
"~~~~~~~"
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:491
10019
msgid ""
10020
"Only useful in ``locations.conf``. Defines whether or not the\n"
10021
"configuration for this section applies to subdirectories:"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:494
10025
msgid ""
10026
"true\n"
10027
" (default) This section applies to subdirectories as well."
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:497
10031
msgid ""
10032
"false\n"
10033
" This section only applies to the branch at this directory and not\n"
10034
" branches below it."
10035
msgstr ""
10036
10037
#: en/help_topics/configuration.txt:501
10038
msgid ""
10039
"gpg_signing_command\n"
10040
"~~~~~~~~~~~~~~~~~~~"
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:504
10044
msgid ""
10045
"(Default: \"gpg\"). Which program should be used to sign and check "
10046
"revisions.\n"
10047
"For example::"
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:507
10051
msgid " gpg_signing_command = /usr/bin/gnpg"
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:509
10055
msgid ""
10056
"The specified command must accept the options \"--clearsign\" and \"-u "
10057
"<email>\"."
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:511
10061
msgid ""
10062
"bzr_remote_path\n"
10063
"~~~~~~~~~~~~~~~"
10064
msgstr ""
10065
10066
#: en/help_topics/configuration.txt:514
10067
msgid ""
10068
"(Default: \"bzr\"). The path to the command that should be used to run the "
10069
"smart\n"
10070
"server for bzr. This value may only be specified in locations.conf, because:"
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:517
10074
msgid ""
10075
"- it's needed before branch.conf is accessible\n"
10076
"- allowing remote branch.conf files to specify commands would be a security\n"
10077
" risk"
10078
msgstr ""
10079
10080
#: en/help_topics/configuration.txt:521
10081
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10082
msgstr ""
10083
10084
#: en/help_topics/configuration.txt:523
10085
msgid ""
10086
"smtp_server\n"
10087
"~~~~~~~~~~~"
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:526
10091
msgid ""
10092
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10093
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10094
msgstr ""
10095
10096
#: en/help_topics/configuration.txt:529
10097
msgid ""
10098
"smtp_username, smtp_password\n"
10099
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10100
msgstr ""
10101
10102
#: en/help_topics/configuration.txt:532
10103
msgid ""
10104
"User and password to authenticate to the SMTP server. If smtp_username\n"
10105
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10106
"These settings are only needed if the SMTP server requires authentication\n"
10107
"to send mail."
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:537
10111
msgid ""
10112
"locks.steal_dead\n"
10113
"~~~~~~~~~~~~~~~~"
10114
msgstr ""
10115
10116
#: en/help_topics/configuration.txt:540
10117
msgid ""
10118
"If set to true, bzr will automatically break locks held by processes from\n"
10119
"the same machine and user that are no longer alive. Otherwise, it will\n"
10120
"print a message and you can break the lock manually, if you are satisfied\n"
10121
"the object is no longer in use."
10122
msgstr ""
10123
10124
#: en/help_topics/configuration.txt:545
10125
msgid ""
10126
"mail_client\n"
10127
"~~~~~~~~~~~"
10128
msgstr ""
10129
10130
#: en/help_topics/configuration.txt:548
10131
msgid ""
10132
"A mail client to use for sending merge requests.\n"
10133
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10134
"it\n"
10135
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10136
"``editor``."
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:553
10140
msgid "Supported values for specific clients:"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:555
10144
msgid ""
10145
":claws: Use Claws. This skips a dialog for attaching files.\n"
10146
":evolution: Use Evolution.\n"
10147
":kmail: Use KMail.\n"
10148
":mutt: Use Mutt.\n"
10149
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10150
"1.5,\n"
10151
" this works around some bugs that xdg-email doesn't handle."
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:562
10155
msgid "Supported generic values are:"
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:564
10159
msgid ""
10160
":default: See above.\n"
10161
":editor: Use your editor to compose the merge request. This also uses\n"
10162
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10163
" smtp_username and smtp_password.\n"
10164
":mapi: Use your preferred e-mail client on Windows.\n"
10165
":xdg-email: Use xdg-email to run your preferred mail program"
10166
msgstr ""
10167
10168
#: en/help_topics/configuration.txt:571
10169
msgid ""
10170
"repository.fdatasync\n"
10171
"~~~~~~~~~~~~~~~~~~~~"
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:574
10175
msgid ""
10176
"If true (default), repository changes are flushed through the OS buffers\n"
10177
"to physical disk. This is somewhat slower, but means data should not be\n"
10178
"lost if the machine crashes. See also dirstate.fdatasync."
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:578
10182
msgid ""
10183
"submit_branch\n"
10184
"~~~~~~~~~~~~~"
10185
msgstr ""
10186
10187
#: en/help_topics/configuration.txt:581
10188
msgid ""
10189
"The branch you intend to submit your current work to. This is "
10190
"automatically\n"
10191
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10192
"This\n"
10193
"should usually be set on a per-branch or per-location basis."
10194
msgstr ""
10195
10196
#: en/help_topics/configuration.txt:585
10197
msgid ""
10198
"public_branch\n"
10199
"~~~~~~~~~~~~~"
10200
msgstr ""
10201
10202
#: en/help_topics/configuration.txt:588
10203
msgid ""
10204
"A publically-accessible version of this branch (implying that this version "
10205
"is\n"
10206
"not publically-accessible). Used (and set) by ``bzr send``."
10207
msgstr ""
10208
10209
#: en/help_topics/configuration.txt:591
10210
msgid ""
10211
"suppress_warnings\n"
10212
"~~~~~~~~~~~~~~~~~"
10213
msgstr ""
10214
10215
#: en/help_topics/configuration.txt:594
10216
msgid ""
10217
"A list of strings, each string represent a warning that can be emitted by\n"
10218
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:597
10222
msgid "Valid values:"
10223
msgstr ""
10224
10225
#: en/help_topics/configuration.txt:599
10226
msgid ""
10227
"* ``format_deprecation``:\n"
10228
" whether the format deprecation warning is shown on repositories that "
10229
"are\n"
10230
" using deprecated formats."
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:603
10234
msgid ""
10235
"default_format\n"
10236
"~~~~~~~~~~~~~~"
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:606
10240
msgid ""
10241
"A format name for the default format used when creating branches. See "
10242
"``bzr\n"
10243
"help formats`` for possible values."
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:609
10247
msgid ""
10248
"\n"
10249
"Unicode options\n"
10250
"---------------"
10251
msgstr ""
10252
10253
#: en/help_topics/configuration.txt:613
10254
msgid ""
10255
"output_encoding\n"
10256
"~~~~~~~~~~~~~~~"
10257
msgstr ""
10258
10259
#: en/help_topics/configuration.txt:616
10260
msgid ""
10261
"A Python unicode encoding name for text output from bzr, such as log\n"
10262
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10263
"is the terminal encoding prefered by the operating system."
10264
msgstr ""
10265
10266
#: en/help_topics/configuration.txt:620
10267
msgid ""
10268
"\n"
10269
"Branch type specific options\n"
10270
"----------------------------"
10271
msgstr ""
10272
10273
#: en/help_topics/configuration.txt:624
10274
msgid ""
10275
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10276
"later format. They\n"
10277
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10278
"manually set in ``locations.conf`` or ``bazaar.conf``."
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:629
10282
msgid ""
10283
"append_revisions_only\n"
10284
"~~~~~~~~~~~~~~~~~~~~~"
10285
msgstr ""
10286
10287
#: en/help_topics/configuration.txt:632
10288
msgid ""
10289
"If set to \"True\" then revisions can only be appended to the log, not\n"
10290
"removed. A branch with this setting enabled can only pull from another\n"
10291
"branch if the other branch's log is a longer version of its own. This is\n"
10292
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10293
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10294
"compatibility with previous bzr versions (older than 2.2)."
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:639
10298
msgid ""
10299
"parent_location\n"
10300
"~~~~~~~~~~~~~~~"
10301
msgstr ""
10302
10303
#: en/help_topics/configuration.txt:642
10304
msgid ""
10305
"If present, the location of the default branch for pull or merge. This "
10306
"option\n"
10307
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10308
"--remember``."
10309
msgstr ""
10310
10311
#: en/help_topics/configuration.txt:646
10312
msgid ""
10313
"push_location\n"
10314
"~~~~~~~~~~~~~"
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:649
10318
msgid ""
10319
"If present, the location of the default branch for push. This option\n"
10320
"is normally set by the first ``push`` or ``push --remember``."
10321
msgstr ""
10322
10323
#: en/help_topics/configuration.txt:652
10324
msgid ""
10325
"push_strict\n"
10326
"~~~~~~~~~~~"
10327
msgstr ""
10328
10329
#: en/help_topics/configuration.txt:655
10330
msgid ""
10331
"If present, defines the ``--strict`` option default value for checking\n"
10332
"uncommitted changes before pushing."
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:658
10336
msgid ""
10337
"dpush_strict\n"
10338
"~~~~~~~~~~~~"
10339
msgstr ""
10340
10341
#: en/help_topics/configuration.txt:661
10342
msgid ""
10343
"If present, defines the ``--strict`` option default value for checking\n"
10344
"uncommitted changes before pushing into a different VCS without any\n"
10345
"custom bzr metadata."
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:665
10349
msgid ""
10350
"bound_location\n"
10351
"~~~~~~~~~~~~~~"
10352
msgstr ""
10353
10354
#: en/help_topics/configuration.txt:668
10355
msgid ""
10356
"The location that commits should go to when acting as a checkout.\n"
10357
"This option is normally set by ``bind``."
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:671
10361
msgid ""
10362
"bound\n"
10363
"~~~~~"
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:674
10367
msgid ""
10368
"If set to \"True\", the branch should act as a checkout, and push each "
10369
"commit to\n"
10370
"the bound_location. This option is normally set by ``bind``/``unbind``."
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:677
10374
msgid ""
10375
"send_strict\n"
10376
"~~~~~~~~~~~"
10377
msgstr ""
10378
10379
#: en/help_topics/configuration.txt:680
10380
msgid ""
10381
"If present, defines the ``--strict`` option default value for checking\n"
10382
"uncommitted changes before sending a merge directive."
10383
msgstr ""
10384
10385
#: en/help_topics/configuration.txt:683
10386
msgid ""
10387
"add.maximum_file_size\n"
10388
"~~~~~~~~~~~~~~~~~~~~~"
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:686
10392
msgid ""
10393
"Defines the maximum file size the command line \"add\" operation will allow\n"
10394
"in recursive mode, with files larger than this value being skipped. You may "
10395
"\n"
10396
"specify this value as an integer (in which case it is interpreted as bytes), "
10397
"\n"
10398
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10399
"0 \n"
10400
"will disable skipping."
10401
msgstr ""
10402
10403
#: en/help_topics/configuration.txt:692
10404
msgid ""
10405
"External Merge Tools\n"
10406
"--------------------"
10407
msgstr ""
10408
10409
#: en/help_topics/configuration.txt:695
10410
msgid ""
10411
"bzr.mergetool.<name>\n"
10412
"~~~~~~~~~~~~~~~~~~~~"
10413
msgstr ""
10414
10415
#: en/help_topics/configuration.txt:698
10416
msgid ""
10417
"Defines an external merge tool called <name> with the given command-line.\n"
10418
"Arguments containing spaces should be quoted using single or double quotes. "
10419
"The\n"
10420
"executable may omit its path if it can be found on the PATH."
10421
msgstr ""
10422
10423
#: en/help_topics/configuration.txt:702
10424
msgid ""
10425
"The following markers can be used in the command-line to substitute "
10426
"filenames\n"
10427
"involved in the merge conflict::"
10428
msgstr ""
10429
10430
#: en/help_topics/configuration.txt:705
10431
msgid ""
10432
" {base} file.BASE\n"
10433
" {this} file.THIS\n"
10434
" {other} file.OTHER\n"
10435
" {result} output file\n"
10436
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10437
"merge\n"
10438
" succeeds."
10439
msgstr ""
10440
10441
#: en/help_topics/configuration.txt:714
10442
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:716
10446
msgid ""
10447
"bzr.default_mergetool\n"
10448
"~~~~~~~~~~~~~~~~~~~~~"
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:719
10452
msgid ""
10453
"Specifies which external merge tool (as defined above) should be selected "
10454
"by\n"
10455
"default in tools such as ``bzr qconflicts``."
10456
msgstr ""
10457
10458
#: en/help_topics/configuration.txt:724
10459
msgid " bzr.default_mergetool = kdiff3\n"
10460
msgstr ""
10461
10462
#: en/help_topics/conflict-types.txt:1
10463
msgid ""
10464
"Conflict Types\n"
10465
"=============="
10466
msgstr ""
10467
10468
#: en/help_topics/conflict-types.txt:4
10469
msgid ""
10470
"Some operations, like merge, revert and pull, modify the contents of your\n"
10471
"working tree. These modifications are programmatically generated, and so "
10472
"they\n"
10473
"may conflict with the current state of your working tree. "
10474
msgstr ""
10475
10476
#: en/help_topics/conflict-types.txt:8
10477
msgid ""
10478
"When conflicts are present in your working tree (as shown by ``bzr\n"
10479
"conflicts``), you should resolve them and then inform bzr that the "
10480
"conflicts\n"
10481
"have been resolved."
10482
msgstr ""
10483
10484
#: en/help_topics/conflict-types.txt:12
10485
msgid ""
10486
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10487
"should resolve them is not the one responsible for their occurrence, as is "
10488
"the\n"
10489
"case when merging other people's work or because some conflicts are "
10490
"presented\n"
10491
"in a way that is not easy to understand."
10492
msgstr ""
10493
10494
#: en/help_topics/conflict-types.txt:17
10495
msgid ""
10496
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10497
"conflict if and only if there's an actual conceptual conflict in the source\n"
10498
"tree. Because Bazaar doesn't understand the real meaning of the files "
10499
"being\n"
10500
"versioned, it can, when faced with ambiguities, fall short in either "
10501
"direction\n"
10502
"trying to resolve the conflict itself. Many kinds of changes can be "
10503
"combined\n"
10504
"programmatically, but sometimes only a human can determine the right thing "
10505
"to\n"
10506
"do."
10507
msgstr ""
10508
10509
#: en/help_topics/conflict-types.txt:25
10510
msgid ""
10511
"When Bazaar generates a conflict, it adds information into the working tree "
10512
"to\n"
10513
"present the conflicting versions, and it's up to you to find the correct\n"
10514
"resolution."
10515
msgstr ""
10516
10517
#: en/help_topics/conflict-types.txt:29
10518
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10519
msgstr ""
10520
10521
#: en/help_topics/conflict-types.txt:31
10522
msgid ""
10523
"1. Modify the working tree content so that the conflicted item is now in "
10524
"the\n"
10525
" state you want to keep, then"
10526
msgstr ""
10527
10528
#: en/help_topics/conflict-types.txt:34
10529
msgid ""
10530
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10531
" remaining generated information (``bzr resolve <item>``)."
10532
msgstr ""
10533
10534
#: en/help_topics/conflict-types.txt:37
10535
msgid ""
10536
"For most conflict types, there are some obvious ways to modify the working\n"
10537
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10538
"itself already made a choice, when possible."
10539
msgstr ""
10540
10541
#: en/help_topics/conflict-types.txt:41
10542
msgid ""
10543
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10544
"different ways to resolve the conflict."
10545
msgstr ""
10546
10547
#: en/help_topics/conflict-types.txt:44
10548
msgid ""
10549
"Each type of conflict is explained below, and the action which must be done "
10550
"to\n"
10551
"resolve the conflict is outlined."
10552
msgstr ""
10553
10554
#: en/help_topics/conflict-types.txt:47
10555
msgid ""
10556
"Various actions are available depending on the kind of conflict, for some "
10557
"of\n"
10558
"these actions, Bazaar can provide some help. In the end you should at least\n"
10559
"inform Bazaar that you're done with the conflict with::"
10560
msgstr ""
10561
10562
#: en/help_topics/conflict-types.txt:51
10563
msgid " ``bzr resolve FILE --action=done'"
10564
msgstr ""
10565
10566
#: en/help_topics/conflict-types.txt:53
10567
msgid ""
10568
"Note that this is the default action when a single file is involved so you "
10569
"can\n"
10570
"simply use::"
10571
msgstr ""
10572
10573
#: en/help_topics/conflict-types.txt:56
10574
msgid " ``bzr resolve FILE``"
10575
msgstr ""
10576
10577
#: en/help_topics/conflict-types.txt:58
10578
msgid "See ``bzr help resolve`` for more details."
10579
msgstr ""
10580
10581
#: en/help_topics/conflict-types.txt:60
10582
msgid ""
10583
"Text conflicts\n"
10584
"--------------"
10585
msgstr ""
10586
10587
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10588
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10589
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10590
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10591
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10592
msgid "Typical message::"
10593
msgstr ""
10594
10595
#: en/help_topics/conflict-types.txt:65
10596
msgid " Text conflict in FILE"
10597
msgstr ""
10598
10599
#: en/help_topics/conflict-types.txt:67
10600
msgid ""
10601
"These are produced when a text merge cannot completely reconcile two sets "
10602
"of\n"
10603
"text changes. Bazaar will emit files for each version with the extensions\n"
10604
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10605
"tree,\n"
10606
"i.e. the tree that you are merging changes into. OTHER is the version that "
10607
"you\n"
10608
"are merging into the target. BASE is an older version that is used as a "
10609
"basis\n"
10610
"for comparison."
10611
msgstr ""
10612
10613
#: en/help_topics/conflict-types.txt:74
10614
msgid ""
10615
"In the main copy of the file, Bazaar will include all the changes that it\n"
10616
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10617
"\"herringbone\" markers like ``<<<<<<<``."
10618
msgstr ""
10619
10620
#: en/help_topics/conflict-types.txt:78
10621
msgid ""
10622
"Say the initial text is \"The project leader released it.\", and THIS "
10623
"modifies it\n"
10624
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10625
"leader\n"
10626
"released Bazaar.\" A conflict would look like this::"
10627
msgstr ""
10628
10629
#: en/help_topics/conflict-types.txt:82
10630
msgid ""
10631
" <<<<<<< TREE\n"
10632
" Martin Pool released it.\n"
10633
" =======\n"
10634
" The project leader released Bazaar.\n"
10635
" >>>>>>> MERGE-SOURCE"
10636
msgstr ""
10637
10638
#: en/help_topics/conflict-types.txt:88
10639
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10640
msgstr ""
10641
10642
#: en/help_topics/conflict-types.txt:90
10643
msgid ""
10644
"You can handle text conflicts either by editing the main copy of the file,\n"
10645
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10646
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10647
"set of changes over the other (but see below when you encounter these\n"
10648
"cases). More often, the two sets of changes must be intelligently combined."
10649
msgstr ""
10650
10651
#: en/help_topics/conflict-types.txt:96
10652
msgid ""
10653
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10654
"you are done editing, the file should look like it never had a conflict, and "
10655
"be\n"
10656
"ready to commit."
10657
msgstr ""
10658
10659
#: en/help_topics/conflict-types.txt:100
10660
msgid ""
10661
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10662
"Bazaar will auto-detect which conflicts you have resolved."
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:103
10666
msgid ""
10667
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10668
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10669
"working tree."
10670
msgstr ""
10671
10672
#: en/help_topics/conflict-types.txt:107
10673
msgid ""
10674
"\n"
10675
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10676
"resolve`` with one of the following actions:"
10677
msgstr ""
10678
10679
#: en/help_topics/conflict-types.txt:111
10680
msgid ""
10681
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10682
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10683
msgstr ""
10684
10685
#: en/help_topics/conflict-types.txt:114
10686
msgid ""
10687
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10688
"modifications will be taken into account."
10689
msgstr ""
10690
10691
#: en/help_topics/conflict-types.txt:117
10692
msgid ""
10693
"Content conflicts\n"
10694
"-----------------"
10695
msgstr ""
10696
10697
#: en/help_topics/conflict-types.txt:122
10698
msgid " Contents conflict in FILE"
10699
msgstr ""
10700
10701
#: en/help_topics/conflict-types.txt:124
10702
msgid ""
10703
"This conflict happens when there are conflicting changes in the working "
10704
"tree\n"
10705
"and the merge source, but the conflicted items are not text files. They "
10706
"may\n"
10707
"be binary files, or symlinks, or directories. It can even happen with "
10708
"files\n"
10709
"that are deleted on one side, and modified on the other."
10710
msgstr ""
10711
10712
#: en/help_topics/conflict-types.txt:129
10713
msgid ""
10714
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10715
"be\n"
10716
"regular files, symlinks or directories). But it will not include a \"main "
10717
"copy\"\n"
10718
"of the file with herringbone conflict markers. It will appear that the "
10719
"\"main\n"
10720
"copy\" has been renamed to THIS or OTHER."
10721
msgstr ""
10722
10723
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10724
msgid ""
10725
"To resolve that kind of conflict, you should rebuild FILE from either "
10726
"version\n"
10727
"or a combination of both."
10728
msgstr ""
10729
10730
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10731
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10732
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10733
#: en/help_topics/conflict-types.txt:361
10734
msgid "``bzr resolve`` recognizes the following actions:"
10735
msgstr ""
10736
10737
#: en/help_topics/conflict-types.txt:139
10738
msgid ""
10739
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10740
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10741
"* ``--action=done`` will just mark the conflict as resolved."
10742
msgstr ""
10743
10744
#: en/help_topics/conflict-types.txt:143
10745
msgid ""
10746
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10747
"and\n"
10748
"``.OTHER`` files if they are still present in the working tree."
10749
msgstr ""
10750
10751
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10752
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10753
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10754
#: en/help_topics/conflict-types.txt:369
10755
msgid ""
10756
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10757
msgstr ""
10758
10759
#: en/help_topics/conflict-types.txt:148
10760
msgid ""
10761
"Tag conflicts\n"
10762
"-------------"
10763
msgstr ""
10764
10765
#: en/help_topics/conflict-types.txt:153
10766
msgid ""
10767
" Conflicting tags:\n"
10768
" version-0.1"
10769
msgstr ""
10770
10771
#: en/help_topics/conflict-types.txt:156
10772
msgid ""
10773
"When pulling from or pushing to another branch, Bazaar informs you about "
10774
"tags\n"
10775
"that conflict between the two branches; that is the same tag points to two\n"
10776
"different revisions. You need not resolve these conflicts, but subsequent\n"
10777
"uses of pull or push will result in the same message."
10778
msgstr ""
10779
10780
#: en/help_topics/conflict-types.txt:161
10781
msgid ""
10782
"To resolve the conflict, you must apply the correct tags to either the "
10783
"target\n"
10784
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10785
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10786
"target branch's tags match the source branch, then in the target branch do\n"
10787
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10788
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10789
"source\n"
10790
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10791
"favor of the target branch, you need to similarly use ``tag --force`` in "
10792
"the\n"
10793
"source branch. (Note that pulling or pushing using --overwrite will "
10794
"overwrite\n"
10795
"all tags as well.)"
10796
msgstr ""
10797
10798
#: en/help_topics/conflict-types.txt:172
10799
msgid ""
10800
"Duplicate paths\n"
10801
"---------------"
10802
msgstr ""
10803
10804
#: en/help_topics/conflict-types.txt:177
10805
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10806
msgstr ""
10807
10808
#: en/help_topics/conflict-types.txt:179
10809
msgid ""
10810
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10811
"already been used. The existing file will be renamed to \"FILE.moved\". "
10812
msgstr ""
10813
10814
#: en/help_topics/conflict-types.txt:187
10815
msgid ""
10816
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10817
"FILE``,\n"
10818
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10819
"* ``--action=done`` will just mark the conflict as resolved."
10820
msgstr ""
10821
10822
#: en/help_topics/conflict-types.txt:191
10823
msgid ""
10824
"Note that you must get rid of FILE.moved before using ``--action=done``."
10825
msgstr ""
10826
10827
#: en/help_topics/conflict-types.txt:195
10828
msgid ""
10829
"Unversioned parent\n"
10830
"------------------"
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:200
10834
msgid ""
10835
" Conflict because FILE is not versioned, but has versioned children."
10836
msgstr ""
10837
10838
#: en/help_topics/conflict-types.txt:202
10839
msgid ""
10840
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10841
"not\n"
10842
"versioned. This happens when the directory has been deleted in the target,\n"
10843
"but has a new child in the source, or vice versa. In this situation, "
10844
"Bazaar\n"
10845
"will version the parent directory as well. Resolving this issue depends\n"
10846
"very much on the particular scenario. You may wish to rename or delete "
10847
"either\n"
10848
"the file or the directory. When you are satisfied, you can run \"bzr "
10849
"resolve\n"
10850
"FILE\" to mark the conflict as resolved."
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:210
10854
msgid ""
10855
"Missing parent\n"
10856
"--------------"
10857
msgstr ""
10858
10859
#: en/help_topics/conflict-types.txt:215
10860
msgid " Conflict adding files to FILE. Created directory."
10861
msgstr ""
10862
10863
#: en/help_topics/conflict-types.txt:217
10864
msgid ""
10865
"This happens when a directory has been deleted in the target, but has new\n"
10866
"children in the source. This is similar to the \"unversioned parent\" "
10867
"conflict,\n"
10868
"except that the parent directory does not *exist*, instead of just being\n"
10869
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10870
"Resolving this issue depends very much on the particular scenario."
10871
msgstr ""
10872
10873
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10874
msgid ""
10875
"To resolve that kind of conflict, you should either remove or rename the\n"
10876
"children or the directory or a combination of both."
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:228
10880
msgid ""
10881
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10882
" children,\n"
10883
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10884
"children\n"
10885
" and restoring the directory,\n"
10886
"* ``--action=done`` will just mark the conflict as resolved."
10887
msgstr ""
10888
10889
#: en/help_topics/conflict-types.txt:236
10890
msgid ""
10891
"Deleting parent\n"
10892
"---------------"
10893
msgstr ""
10894
10895
#: en/help_topics/conflict-types.txt:241
10896
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10897
msgstr ""
10898
10899
#: en/help_topics/conflict-types.txt:243
10900
msgid ""
10901
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10902
"source, but has new children in the target (either because a directory\n"
10903
"deletion is merged or because the merge introduce new children). Bazaar\n"
10904
"will retain the directory. Resolving this issue depends very much on the\n"
10905
"particular scenario."
10906
msgstr ""
10907
10908
#: en/help_topics/conflict-types.txt:254
10909
msgid ""
10910
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10911
"directory,"
10912
msgstr ""
10913
10914
#: en/help_topics/conflict-types.txt:256
10915
msgid ""
10916
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10917
" children,"
10918
msgstr ""
10919
10920
#: en/help_topics/conflict-types.txt:259
10921
msgid "* ``--action=done`` will just mark the conflict as resolved."
10922
msgstr ""
10923
10924
#: en/help_topics/conflict-types.txt:261
10925
msgid ""
10926
"Note that when merging a directory deletion, if unversioned files are\n"
10927
"present, they become potential orphans has they don't have a directory\n"
10928
"parent anymore."
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:265
10932
msgid ""
10933
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10934
"setting the ``bzr.transform.orphan_policy`` configuration option."
10935
msgstr ""
10936
10937
#: en/help_topics/conflict-types.txt:268
10938
msgid "There are two possible values for this option:"
10939
msgstr ""
10940
10941
#: en/help_topics/conflict-types.txt:270
10942
msgid ""
10943
"* ``conflict`` (the default): will leave the orphans in place and\n"
10944
" generate a conflicts,"
10945
msgstr ""
10946
10947
#: en/help_topics/conflict-types.txt:273
10948
msgid ""
10949
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10950
"root\n"
10951
" of the working tree with names like ``<file>.~#~``."
10952
msgstr ""
10953
10954
#: en/help_topics/conflict-types.txt:278
10955
msgid ""
10956
"Path conflict\n"
10957
"-------------"
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:283
10961
msgid " Path conflict: PATH1 / PATH2"
10962
msgstr ""
10963
10964
#: en/help_topics/conflict-types.txt:285
10965
msgid ""
10966
"This happens when the source and target have each modified the name or "
10967
"parent\n"
10968
"directory of a file. Bazaar will use the path elements from the source."
10969
msgstr ""
10970
10971
#: en/help_topics/conflict-types.txt:288
10972
msgid ""
10973
"To resolve that kind of conflict, you just have to decide what name should "
10974
"be\n"
10975
"retained for the file involved."
10976
msgstr ""
10977
10978
#: en/help_topics/conflict-types.txt:293
10979
msgid ""
10980
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10981
" issuing ``bzr mv PATH2 PATH1``,\n"
10982
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10983
"``PATH2``,\n"
10984
"* ``--action=done`` will just mark the conflict as resolved."
10985
msgstr ""
10986
10987
#: en/help_topics/conflict-types.txt:300
10988
msgid ""
10989
"Parent loop\n"
10990
"-----------"
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:305
10994
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:307
10998
msgid ""
10999
"This happens when the source and the target have each moved directories, so\n"
11000
"that, if the change could be applied, a directory would be contained by "
11001
"itself.\n"
11002
"For example::"
11003
msgstr ""
11004
11005
#: en/help_topics/conflict-types.txt:311
11006
msgid ""
11007
" $ bzr init\n"
11008
" $ bzr mkdir white\n"
11009
" $ bzr mkdir black\n"
11010
" $ bzr commit -m \"BASE\"\n"
11011
" $ bzr branch . ../other\n"
11012
" $ bzr mv white black\n"
11013
" $ bzr commit -m \"THIS\"\n"
11014
" $ bzr mv ../other/black ../other/white\n"
11015
" $ bzr commit ../other -m \"OTHER\"\n"
11016
" $ bzr merge ../other"
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:322
11020
msgid ""
11021
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11022
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11023
"name should be retained for the directories involved."
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:328
11027
msgid ""
11028
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11029
"\n"
11030
" in ``black``,\n"
11031
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11032
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11033
"* ``--action=done`` will just mark the conflict as resolved."
11034
msgstr ""
11035
11036
#: en/help_topics/conflict-types.txt:336
11037
msgid ""
11038
"Non-directory parent\n"
11039
"--------------------"
11040
msgstr ""
11041
11042
#: en/help_topics/conflict-types.txt:341
11043
msgid ""
11044
" Conflict: foo.new is not a directory, but has files in it.\n"
11045
" Created directory."
11046
msgstr ""
11047
11048
#: en/help_topics/conflict-types.txt:344
11049
msgid ""
11050
"This happens when one side has added files to a directory, and the other "
11051
"side\n"
11052
"has changed the directory into a file or symlink. For example::"
11053
msgstr ""
11054
11055
#: en/help_topics/conflict-types.txt:347
11056
msgid ""
11057
" $ bzr init\n"
11058
" $ bzr mkdir foo\n"
11059
" $ bzr commit -m \"BASE\"\n"
11060
" $ bzr branch . ../other\n"
11061
" $ rmdir foo\n"
11062
" $ touch foo\n"
11063
" $ bzr commit -m \"THIS\"\n"
11064
" $ bzr mkdir ../other/foo/bar\n"
11065
" $ bzr commit ../other -m \"OTHER\"\n"
11066
" $ bzr merge ../other"
11067
msgstr ""
11068
11069
#: en/help_topics/conflict-types.txt:358
11070
msgid ""
11071
"To resolve that kind of conflict, you have to decide what name should be\n"
11072
"retained for the file, directory or symlink involved."
11073
msgstr ""
11074
11075
#: en/help_topics/conflict-types.txt:363
11076
msgid ""
11077
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11078
" ``bzr add foo``,\n"
11079
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11080
" ``bzr mv foo.new foo``,\n"
11081
"* ``--action=done`` will just mark the conflict as resolved."
11082
msgstr ""
11083
11084
#: en/help_topics/conflict-types.txt:371
11085
msgid ""
11086
"MalformedTransform\n"
11087
"------------------"
11088
msgstr ""
11089
11090
#: en/help_topics/conflict-types.txt:374
11091
msgid ""
11092
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11093
"exception. This means that Bazaar encountered a filesystem conflict that it "
11094
"was\n"
11095
"unable to resolve. This usually indicates a bug. Please let us know if "
11096
"you\n"
11097
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11098
msgstr ""
11099
11100
#: en/help_topics/content-filters.txt:1
11101
msgid ""
11102
"Content Filters\n"
11103
"==============="
11104
msgstr ""
11105
11106
#: en/help_topics/content-filters.txt:4
11107
msgid ""
11108
"Content formats\n"
11109
"---------------"
11110
msgstr ""
11111
11112
#: en/help_topics/content-filters.txt:7
11113
msgid ""
11114
"Bazaar's content filtering allows you to store files in a different\n"
11115
"format from the copy in your working tree. This lets you, or your\n"
11116
"co-developers, use Windows development tools that expect CRLF files\n"
11117
"on projects that use other line-ending conventions. Among other things,\n"
11118
"content filters also let Unix developers more easily work on projects\n"
11119
"using Windows line-ending conventions, keyword expansion/compression,\n"
11120
"and trailing spaces on lines in text files to be implicitly stripped\n"
11121
"when committed."
11122
msgstr ""
11123
11124
#: en/help_topics/content-filters.txt:16
11125
msgid "To generalize, there are two content formats supported by Bazaar:"
11126
msgstr ""
11127
11128
#: en/help_topics/content-filters.txt:18
11129
msgid ""
11130
"* a canonical format - how files are stored internally\n"
11131
"* a convenience format - how files are created in a working tree."
11132
msgstr ""
11133
11134
#: en/help_topics/content-filters.txt:21
11135
msgid ""
11136
"\n"
11137
"Format conversion\n"
11138
"-----------------"
11139
msgstr ""
11140
11141
#: en/help_topics/content-filters.txt:25
11142
msgid ""
11143
"The conversion between these formats is done by content filters.\n"
11144
"A content filter has two parts:"
11145
msgstr ""
11146
11147
#: en/help_topics/content-filters.txt:28
11148
msgid ""
11149
"* a read converter - converts from convenience to canonical format\n"
11150
"* a write converter - converts from canonical to convenience format."
11151
msgstr ""
11152
11153
#: en/help_topics/content-filters.txt:31
11154
msgid ""
11155
"Many of these converters will provide *round-trip* conversion,\n"
11156
"i.e. applying the read converter followed by the write converter\n"
11157
"gives back the original content. However, others may provide an\n"
11158
"asymmetric conversion. For example, a read converter might strip\n"
11159
"trailing whitespace off lines in source code while the matching\n"
11160
"write converter might pass content through unchanged."
11161
msgstr ""
11162
11163
#: en/help_topics/content-filters.txt:38
11164
msgid ""
11165
"\n"
11166
"Enabling content filters\n"
11167
"------------------------"
11168
msgstr ""
11169
11170
#: en/help_topics/content-filters.txt:42
11171
msgid ""
11172
"Content filters are typically provided by plugins, so the first step\n"
11173
"in using them is to install the relevant plugins and read their\n"
11174
"documentation. Some plugins may be very specific about which files\n"
11175
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11176
"In other cases, the plugin may leave it in the user's hands to\n"
11177
"define which files are to be filtered. This is typically done\n"
11178
"using rule-based preferences. See ``bzr help rules`` for general\n"
11179
"information about defining these."
11180
msgstr ""
11181
11182
#: en/help_topics/content-filters.txt:51
11183
msgid ""
11184
"\n"
11185
"Impact on commands\n"
11186
"------------------"
11187
msgstr ""
11188
11189
#: en/help_topics/content-filters.txt:55
11190
msgid ""
11191
"Read converters are only applied to commands that read content from\n"
11192
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11193
"will apply read converters to files in the working tree, then compare\n"
11194
"the results to the content last committed."
11195
msgstr ""
11196
11197
#: en/help_topics/content-filters.txt:60
11198
msgid ""
11199
"Write converters are only applied by commands that **create files in a\n"
11200
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11201
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11202
"respectively."
11203
msgstr ""
11204
11205
#: en/help_topics/content-filters.txt:65
11206
msgid ""
11207
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11208
"comitting files. If this makes sense for a given plugin providing\n"
11209
"a content filter, the plugin can usually achieve this effect by using a\n"
11210
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11211
"for more information on hooks."
11212
msgstr ""
11213
11214
#: en/help_topics/content-filters.txt:71
11215
msgid ""
11216
"\n"
11217
"Refreshing your working tree\n"
11218
"----------------------------"
11219
msgstr ""
11220
11221
#: en/help_topics/content-filters.txt:75
11222
msgid ""
11223
"For performance reasons, Bazaar caches the timestamps of files in\n"
11224
"a working tree, and assumes files are unchanged if their timestamps\n"
11225
"match the cached values. As a consequence, there are times when\n"
11226
"you may need to explicitly ask for content filtering to be reapplied\n"
11227
"in one or both directions, e.g. after installing or reconfiguring\n"
11228
"plugins providing it."
11229
msgstr ""
11230
11231
#: en/help_topics/content-filters.txt:82
11232
msgid "Here are some general guidelines for doing this:"
11233
msgstr ""
11234
11235
#: en/help_topics/content-filters.txt:84
11236
msgid ""
11237
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11238
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11239
" relevant read converters and compare the end result with the\n"
11240
" canonical format."
11241
msgstr ""
11242
11243
#: en/help_topics/content-filters.txt:89
11244
msgid ""
11245
" * To reapply write converters, ensure there are no local changes,\n"
11246
" delete the relevant files and run ``bzr revert`` on those files."
11247
msgstr ""
11248
11249
#: en/help_topics/content-filters.txt:92
11250
msgid ""
11251
"Note: In the future, it is likely that additional options will be added\n"
11252
"to commands to make this refreshing process faster and safer.\n"
11253
msgstr ""
11254
11255
#: en/help_topics/current-formats.txt:1
11256
msgid "Current Storage Formats"
11257
msgstr ""
11258
11259
#: en/help_topics/current-formats.txt:3
11260
msgid ""
11261
":2a:\n"
11262
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11263
" compress storage. Provides rich roots which are a one-way\n"
11264
" transition."
11265
msgstr ""
11266
11267
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11268
msgid ""
11269
"\n"
11270
"See :doc:`formats-help` for more about storage formats."
11271
msgstr ""
11272
11273
#: en/help_topics/debug-flags.txt:1
11274
msgid ""
11275
"Debug Flags\n"
11276
"==========="
11277
msgstr ""
11278
11279
#: en/help_topics/debug-flags.txt:4
11280
msgid ""
11281
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11282
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11283
msgstr ""
11284
11285
#: en/help_topics/debug-flags.txt:7
11286
msgid ""
11287
"-Dauth Trace authentication sections used.\n"
11288
"-Dbytes Print out how many bytes were transferred\n"
11289
"-Ddirstate Trace dirstate activity (verbose!)\n"
11290
"-Derror Instead of normal error handling, always print a "
11291
"traceback\n"
11292
" on error.\n"
11293
"-Devil Capture call sites that do expensive or badly-scaling\n"
11294
" operations.\n"
11295
"-Dfetch Trace history copying between repositories.\n"
11296
"-Dfilters Emit information for debugging content filtering.\n"
11297
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11298
"fetch.\n"
11299
"-Dgraph Trace graph traversal.\n"
11300
"-Dhashcache Log every time a working file is read to determine its "
11301
"hash.\n"
11302
"-Dhooks Trace hook execution.\n"
11303
"-Dhpss Trace smart protocol requests and responses.\n"
11304
"-Dhpssdetail More hpss details.\n"
11305
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11306
"-Dhttp Trace http connections, requests and responses.\n"
11307
"-Dindex Trace major index operations.\n"
11308
"-Dknit Trace knit operations.\n"
11309
"-Dlock Trace when lockdir locks are taken or released.\n"
11310
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11311
" retrying the request.\n"
11312
"-Dprogress Trace progress bar operations.\n"
11313
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11314
"-Dmerge Emit information for debugging merges.\n"
11315
"-Dno_apport Don't use apport to report crashes.\n"
11316
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11317
"-Dpack Emit information about pack operations.\n"
11318
"-Drelock Emit a message every time a branch or repository object "
11319
"is\n"
11320
" unlocked then relocked the same way.\n"
11321
"-Dsftp Trace SFTP internals.\n"
11322
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11323
"expected\n"
11324
"-Dstream Trace fetch streams.\n"
11325
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11326
"portable\n"
11327
" manner.\n"
11328
"-Dunlock Some errors during unlock are treated as warnings.\n"
11329
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11330
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11331
"appropriate\n"
11332
" for the format, even for non-local fetches.\n"
11333
msgstr ""
11334
11335
#: en/help_topics/diverged-branches.txt:1
11336
msgid ""
11337
"Diverged Branches\n"
11338
"================="
11339
msgstr ""
11340
11341
#: en/help_topics/diverged-branches.txt:4
11342
msgid ""
11343
"When Bazaar tries to push one branch onto another, it requires that the\n"
11344
"destination branch must be ready to receive the source branch. If this "
11345
"isn't\n"
11346
"the case, then we say that the branches have ``diverged``. Branches are\n"
11347
"considered diverged if the destination branch's most recent commit is one "
11348
"that\n"
11349
"has not been merged (directly or indirectly) by the source branch. To "
11350
"recover\n"
11351
"from diverged branches, one must merge the missing revisions into the "
11352
"source\n"
11353
"branch."
11354
msgstr ""
11355
11356
#: en/help_topics/diverged-branches.txt:12
11357
msgid ""
11358
"This situation commonly arises when using a centralized workflow with local\n"
11359
"commits. If someone else has committed new work to the mainline since your\n"
11360
"last pull and you have local commits that have not yet been pushed to the\n"
11361
"mainline, then your local branch and the mainline have diverged."
11362
msgstr ""
11363
11364
#: en/help_topics/diverged-branches.txt:17
11365
msgid ""
11366
"Discovering What Has Diverged\n"
11367
"-----------------------------"
11368
msgstr ""
11369
11370
#: en/help_topics/diverged-branches.txt:20
11371
msgid ""
11372
"The ``bzr missing`` command is used to find out what revisions are in "
11373
"another\n"
11374
"branch that are not present in the current branch, and vice-versa. It shows "
11375
"a\n"
11376
"summary of which extra revisions exist in each branch. If you want to see "
11377
"the\n"
11378
"precise effects of those revisions, you can use ``bzr diff --"
11379
"old=other_branch``\n"
11380
"to show the differences between other_branch and your current branch."
11381
msgstr ""
11382
11383
#: en/help_topics/diverged-branches.txt:26
11384
msgid ""
11385
"A Solution\n"
11386
"----------"
11387
msgstr ""
11388
11389
#: en/help_topics/diverged-branches.txt:29
11390
msgid ""
11391
"The solution is to merge the revisions from the mainline into your local\n"
11392
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11393
"mainline. This merge may result in conflicts if the other developer's "
11394
"changes\n"
11395
"overlap with your changes. These conflicts should be resolved before\n"
11396
"continuing. After any conflicts have been resolved, or even if there were "
11397
"no\n"
11398
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11399
"to your local branch. This requirement gives you an opportunity to test "
11400
"the\n"
11401
"resulting working tree for correctness, since the merged revisions could "
11402
"have\n"
11403
"made arbitrary changes. After testing, you should commit the merge using\n"
11404
"``bzr commit``. This clears up the diverged branches situation. Your "
11405
"local\n"
11406
"branch can now be pushed to the mainline.\n"
11407
msgstr ""
11408
11409
#: en/help_topics/env-variables.txt:1
11410
msgid "Environment Variables"
11411
msgstr ""
11412
11413
#: en/help_topics/env-variables.txt:3
11414
msgid ""
11415
"=================== "
11416
"===========================================================\n"
11417
"BZRPATH Path where bzr is to look for shell plugin external\n"
11418
" commands.\n"
11419
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11420
"EMAIL E-Mail address of the user.\n"
11421
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11422
"EDITOR Editor for editing commit messages.\n"
11423
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11424
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11425
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11426
"BZR_PLUGIN_PATH.\n"
11427
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11428
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11429
"and\n"
11430
" HOME.\n"
11431
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11432
"URLs).\n"
11433
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11434
"sshcorp,\n"
11435
" plink or lsh.\n"
11436
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11437
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11438
"BZR_COLUMNS Override implicit terminal width.\n"
11439
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11440
"(selftest)\n"
11441
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11442
"'text'.\n"
11443
"BZR_PDB Control whether to launch a debugger on error.\n"
11444
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11445
" breakin debugger.\n"
11446
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11447
"(instead\n"
11448
" of char-based).\n"
11449
"=================== "
11450
"===========================================================\n"
11451
msgstr ""
11452
11453
#: en/help_topics/eol.txt:1
11454
msgid ""
11455
"End of Line Conversion\n"
11456
"======================"
11457
msgstr ""
11458
11459
#: en/help_topics/eol.txt:4
11460
msgid ""
11461
"EOL conversion is provided as a content filter where Bazaar internally\n"
11462
"stores a canonical format but outputs a convenience format. See\n"
11463
"``bzr help content-filters`` for general information about using these."
11464
msgstr ""
11465
11466
#: en/help_topics/eol.txt:8
11467
msgid ""
11468
"Note: Content filtering is only supported in recently added formats,\n"
11469
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11470
"in a recent format. (Just setting the format on the repository\n"
11471
"is not enough.) If content filtering does not appear to be working, use\n"
11472
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11473
"or later."
11474
msgstr ""
11475
11476
#: en/help_topics/eol.txt:15
11477
msgid ""
11478
"EOL conversion needs to be enabled for selected file patterns using\n"
11479
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11480
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11481
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11482
"supported in a future verison of Bazaar."
11483
msgstr ""
11484
11485
#: en/help_topics/eol.txt:21
11486
msgid ""
11487
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11488
"(If a value is not set, ``exact`` is the default.)"
11489
msgstr ""
11490
11491
#: en/help_topics/eol.txt:24
11492
msgid ""
11493
" ========== ===================================== ======================\n"
11494
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11495
" ========== ===================================== ======================\n"
11496
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11497
" ---------- ------------------------------------- ----------------------\n"
11498
" ``lf`` ``lf`` ``lf``\n"
11499
" ---------- ------------------------------------- ----------------------\n"
11500
" ``crlf`` ``crlf`` ``lf``\n"
11501
" ---------- ------------------------------------- ----------------------\n"
11502
" ``exact`` No conversion Exactly as in file\n"
11503
" ========== ===================================== ======================"
11504
msgstr ""
11505
11506
#: en/help_topics/eol.txt:36
11507
msgid ""
11508
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11509
"byte is detected in the file."
11510
msgstr ""
11511
11512
#: en/help_topics/eol.txt:39
11513
msgid ""
11514
"For users working on a cross-platform project, here is a suggested rule\n"
11515
"to use as a starting point::"
11516
msgstr ""
11517
11518
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11519
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11520
msgid ""
11521
" [name *]\n"
11522
" eol = native"
11523
msgstr ""
11524
11525
#: en/help_topics/eol.txt:45
11526
msgid ""
11527
"If you have binary files that do not contain a null byte though, be\n"
11528
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11529
"by giving more explicit patterns earlier in the rules file. For example::"
11530
msgstr ""
11531
11532
#: en/help_topics/eol.txt:49
11533
msgid ""
11534
" [name *.png]\n"
11535
" eol = exact"
11536
msgstr ""
11537
11538
#: en/help_topics/eol.txt:55
11539
msgid ""
11540
"If your working tree is on a network drive shared by users on different\n"
11541
"operating systems, you typically want to force certain conventions for\n"
11542
"certain files. In that way, if a file is created with the wrong line\n"
11543
"endings or line endings get mixed during editing, it gets committed\n"
11544
"correctly and gets checked out correctly. For example::"
11545
msgstr ""
11546
11547
#: en/help_topics/eol.txt:61
11548
msgid ""
11549
" [name *.bat]\n"
11550
" eol = crlf"
11551
msgstr ""
11552
11553
#: en/help_topics/eol.txt:64
11554
msgid ""
11555
" [name *.sh]\n"
11556
" eol = lf"
11557
msgstr ""
11558
11559
#: en/help_topics/eol.txt:70
11560
msgid ""
11561
"If you take the care to create files with their required endings, you can\n"
11562
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11563
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11564
"introducing mixed line endings will be corrected during commit for files\n"
11565
"with those settings."
11566
msgstr ""
11567
11568
#: en/help_topics/eol.txt:76
11569
msgid ""
11570
"If you have sample test data that deliberately has text files with mixed\n"
11571
"newline conventions, you can ask for those to be left alone like this::"
11572
msgstr ""
11573
11574
#: en/help_topics/eol.txt:79
11575
msgid ""
11576
" [name test_data/]\n"
11577
" eol = exact"
11578
msgstr ""
11579
11580
#: en/help_topics/eol.txt:85
11581
msgid ""
11582
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11583
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11584
"of content analysis to detect binary files for commands like ``diff``.\n"
11585
"In the future, a ``binary = true`` rule may be added but it is not\n"
11586
"supported yet.)"
11587
msgstr ""
11588
11589
#: en/help_topics/eol.txt:91
11590
msgid ""
11591
"If you have an existing repository with text files already stored using\n"
11592
"Windows newline conventions (``crlf``), then you may want to keep using "
11593
"that\n"
11594
"convention in the repository. Forcing certain files to this convention\n"
11595
"may also help users who do not have rules configured. To do this, set\n"
11596
"``eol`` to one of the values below."
11597
msgstr ""
11598
11599
#: en/help_topics/eol.txt:97
11600
msgid ""
11601
" ============================ ======================== "
11602
"======================\n"
11603
" Value Checkout end-of-lines as Commit end-of-lines "
11604
"as\n"
11605
" ============================ ======================== "
11606
"======================\n"
11607
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11608
" ``lf`` otherwise\n"
11609
" ---------------------------- ------------------------ ----------------------"
11610
"\n"
11611
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11612
" ---------------------------- ------------------------ ----------------------"
11613
"\n"
11614
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11615
" ============================ ======================== ======================"
11616
msgstr ""
11617
11618
#: en/help_topics/eol.txt:108
11619
msgid ""
11620
"For users working on an existing project that uses Windows newline\n"
11621
"conventions in their Bazaar repository, this rule is suggested as a\n"
11622
"starting point::"
11623
msgstr ""
11624
11625
#: en/help_topics/eol.txt:112
11626
msgid ""
11627
" [name *]\n"
11628
" eol = native-with-crlf-in-repo"
11629
msgstr ""
11630
11631
#: en/help_topics/eol.txt:115
11632
msgid ""
11633
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11634
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11635
"``crlf`` and ``exact``."
11636
msgstr ""
11637
11638
#: en/help_topics/eol.txt:119
11639
msgid ""
11640
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11641
"never reject files because a given line ending or mixed line endings\n"
11642
"are found. A precommit hook should be used if you wish to validate\n"
11643
"(and not just convert) content before committing.\n"
11644
msgstr ""
11645
11646
#: en/help_topics/hidden-commands.txt:1
11647
msgid ""
11648
"added List files added in working tree.\n"
11649
"ancestry List all revisions merged into this branch.\n"
11650
"assert-fail Test reporting of assertion failures\n"
11651
"bundle-info Output interesting stats about a bundle\n"
11652
"bundle-revisions Create a merge-directive for submitting changes.\n"
11653
"cat-revision Write out metadata for a revision.\n"
11654
"dump-btree Dump the contents of a btree index file to stdout.\n"
11655
"export-pot Export command helps and error messages in po format.\n"
11656
"file-id Print file_id of a particular file or directory.\n"
11657
"file-path Print path of file_ids to a file or directory.\n"
11658
"find-merge-base Find and print a base revision for merging two "
11659
"branches.\n"
11660
"hooks Show hooks.\n"
11661
"inventory Show inventory of the current working copy or a "
11662
"revision.\n"
11663
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11664
"lookup-revision Lookup the revision-id from a revision-number\n"
11665
"merge-directive Generate a merge directive for auto-merge tools.\n"
11666
"modified List files modified in working tree.\n"
11667
"re-sign Create a digital signature for an existing revision.\n"
11668
"reference list, view and set branch locations for nested trees.\n"
11669
"relpath Show path of a file relative to root\n"
11670
"repair-workingtree Reset the working tree state file.\n"
11671
"revision-history Display the list of revision ids on a branch.\n"
11672
"revision-info Show revision number and revision id for a given "
11673
"revision\n"
11674
" identifier.\n"
11675
"rocks Statement of optimism.\n"
11676
"selftest Run internal test suite.\n"
11677
"shell-complete Show appropriate completions for context.\n"
11678
"test-script Run a shell-like test from a file.\n"
11679
"touching-revisions Return revision-ids which affected a particular file.\n"
11680
"unknowns List unknown files.\n"
11681
"wait-until-signalled Test helper for\n"
11682
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11683
msgstr ""
11684
11685
#: en/help_topics/hooks.txt:1
11686
msgid ""
11687
"\n"
11688
"Hooks\n"
11689
"====="
11690
msgstr ""
11691
11692
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11693
msgid ""
11694
"Introduction\n"
11695
"------------"
11696
msgstr ""
11697
11698
#: en/help_topics/hooks.txt:8
11699
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11700
msgstr ""
11701
11702
#: en/help_topics/hooks.txt:10
11703
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11704
msgstr ""
11705
11706
#: en/help_topics/hooks.txt:12
11707
msgid ""
11708
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11709
msgstr ""
11710
11711
#: en/help_topics/hooks.txt:14
11712
msgid ""
11713
"The class that contains each hook is given before the hooks it supplies. "
11714
"For\n"
11715
"instance, BranchHooks as the class is the hooks class for\n"
11716
"`bzrlib.branch.Branch.hooks`."
11717
msgstr ""
11718
11719
#: en/help_topics/hooks.txt:18
11720
msgid ""
11721
"Each description also indicates whether the hook runs on the client (the\n"
11722
"machine where bzr was invoked) or the server (the machine addressed by\n"
11723
"the branch URL). These may be, but are not necessarily, the same machine."
11724
msgstr ""
11725
11726
#: en/help_topics/hooks.txt:22
11727
msgid ""
11728
"Plugins (including hooks) are run on the server if all of these is true:"
11729
msgstr ""
11730
11731
#: en/help_topics/hooks.txt:24
11732
msgid ""
11733
" * The connection is via a smart server (accessed with a URL starting with\n"
11734
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11735
"\"http://\"\n"
11736
" URL when a smart server is available via HTTP)."
11737
msgstr ""
11738
11739
#: en/help_topics/hooks.txt:28
11740
msgid ""
11741
" * The hook is either server specific or part of general infrastructure "
11742
"rather\n"
11743
" than client specific code (such as commit)."
11744
msgstr ""
11745
11746
#: en/help_topics/hooks.txt:31
11747
msgid ""
11748
"\n"
11749
"BranchHooks\n"
11750
"-----------"
11751
msgstr ""
11752
11753
#: en/help_topics/hooks.txt:35
11754
msgid ""
11755
"automatic_tag_name\n"
11756
"~~~~~~~~~~~~~~~~~~"
11757
msgstr ""
11758
11759
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11760
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11761
msgid "Introduced in: 2.2"
11762
msgstr ""
11763
11764
#: en/help_topics/hooks.txt:40
11765
msgid ""
11766
"Called to determine an automatic tag name for a revision.\n"
11767
"automatic_tag_name is called with (branch, revision_id) and should\n"
11768
"return a tag name or None if no tag name could be determined. The\n"
11769
"first non-None tag name returned will be used."
11770
msgstr ""
11771
11772
#: en/help_topics/hooks.txt:45
11773
msgid ""
11774
"open\n"
11775
"~~~~"
11776
msgstr ""
11777
11778
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11779
#: en/help_topics/hooks.txt:307
11780
msgid "Introduced in: 1.8"
11781
msgstr ""
11782
11783
#: en/help_topics/hooks.txt:50
11784
msgid ""
11785
"Called with the Branch object that has been opened after a branch is\n"
11786
"opened."
11787
msgstr ""
11788
11789
#: en/help_topics/hooks.txt:53
11790
msgid ""
11791
"post_branch_init\n"
11792
"~~~~~~~~~~~~~~~~"
11793
msgstr ""
11794
11795
#: en/help_topics/hooks.txt:58
11796
msgid ""
11797
"Called after new branch initialization completes. post_branch_init is\n"
11798
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11799
"branch and checkout (both heavyweight and lightweight) will all\n"
11800
"trigger this hook."
11801
msgstr ""
11802
11803
#: en/help_topics/hooks.txt:63
11804
msgid ""
11805
"post_change_branch_tip\n"
11806
"~~~~~~~~~~~~~~~~~~~~~~"
11807
msgstr ""
11808
11809
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11810
msgid "Introduced in: 1.4"
11811
msgstr ""
11812
11813
#: en/help_topics/hooks.txt:68
11814
msgid ""
11815
"Called in bzr client and server after a change to the tip of a branch\n"
11816
"is made. post_change_branch_tip is called with a\n"
11817
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11818
"uncommit will all trigger this hook."
11819
msgstr ""
11820
11821
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11822
msgid ""
11823
"post_commit\n"
11824
"~~~~~~~~~~~"
11825
msgstr ""
11826
11827
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11828
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11829
msgid "Introduced in: 0.15"
11830
msgstr ""
11831
11832
#: en/help_topics/hooks.txt:78
11833
msgid ""
11834
"Called in the bzr client after a commit has completed. post_commit is\n"
11835
"called with (local, master, old_revno, old_revid, new_revno,\n"
11836
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11837
"branch."
11838
msgstr ""
11839
11840
#: en/help_topics/hooks.txt:83
11841
msgid ""
11842
"post_pull\n"
11843
"~~~~~~~~~"
11844
msgstr ""
11845
11846
#: en/help_topics/hooks.txt:88
11847
msgid ""
11848
"Called after a pull operation completes. post_pull is called with a\n"
11849
"bzrlib.branch.PullResult object and only runs in the bzr client."
11850
msgstr ""
11851
11852
#: en/help_topics/hooks.txt:91
11853
msgid ""
11854
"post_push\n"
11855
"~~~~~~~~~"
11856
msgstr ""
11857
11858
#: en/help_topics/hooks.txt:96
11859
msgid ""
11860
"Called after a push operation completes. post_push is called with a\n"
11861
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11862
msgstr ""
11863
11864
#: en/help_topics/hooks.txt:99
11865
msgid ""
11866
"post_switch\n"
11867
"~~~~~~~~~~~"
11868
msgstr ""
11869
11870
#: en/help_topics/hooks.txt:104
11871
msgid ""
11872
"Called after a checkout switches branch. post_switch is called with a\n"
11873
"bzrlib.branch.SwitchHookParams."
11874
msgstr ""
11875
11876
#: en/help_topics/hooks.txt:107
11877
msgid ""
11878
"post_uncommit\n"
11879
"~~~~~~~~~~~~~"
11880
msgstr ""
11881
11882
#: en/help_topics/hooks.txt:112
11883
msgid ""
11884
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11885
"called with (local, master, old_revno, old_revid, new_revno,\n"
11886
"new_revid) where local is the local branch or None, master is the\n"
11887
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11888
"of None."
11889
msgstr ""
11890
11891
#: en/help_topics/hooks.txt:118
11892
msgid ""
11893
"pre_change_branch_tip\n"
11894
"~~~~~~~~~~~~~~~~~~~~~"
11895
msgstr ""
11896
11897
#: en/help_topics/hooks.txt:121
11898
msgid "Introduced in: 1.6"
11899
msgstr ""
11900
11901
#: en/help_topics/hooks.txt:123
11902
msgid ""
11903
"Called in bzr client and server before a change to the tip of a branch\n"
11904
"is made. pre_change_branch_tip is called with a\n"
11905
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11906
"uncommit will all trigger this hook."
11907
msgstr ""
11908
11909
#: en/help_topics/hooks.txt:128
11910
msgid ""
11911
"pre_commit\n"
11912
"~~~~~~~~~~"
11913
msgstr ""
11914
11915
#: en/help_topics/hooks.txt:131
11916
msgid "Introduced in: 0.91"
11917
msgstr ""
11918
11919
#: en/help_topics/hooks.txt:133
11920
msgid ""
11921
"Called after a commit is calculated but before it is completed.\n"
11922
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11923
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11924
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11925
"TreeDelta object describing changes from the basis revision. hooks\n"
11926
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11927
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11928
"tree."
11929
msgstr ""
11930
11931
#: en/help_topics/hooks.txt:142
11932
msgid ""
11933
"transform_fallback_location\n"
11934
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:145
11938
msgid "Introduced in: 1.9"
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:147
11942
msgid ""
11943
"Called when a stacked branch is activating its fallback locations.\n"
11944
"transform_fallback_location is called with (branch, url), and should\n"
11945
"return a new url. Returning the same url allows it to be used as-is,\n"
11946
"returning a different one can be used to cause the branch to stack on\n"
11947
"a closer copy of that fallback_location. Note that the branch cannot\n"
11948
"have history accessing methods called on it during this hook because\n"
11949
"the fallback locations have not been activated. When there are\n"
11950
"multiple hooks installed for transform_fallback_location, all are\n"
11951
"called with the url returned from the previous hook.The order is\n"
11952
"however undefined."
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:158
11956
msgid ""
11957
"CommandHooks\n"
11958
"------------"
11959
msgstr ""
11960
11961
#: en/help_topics/hooks.txt:161
11962
msgid ""
11963
"extend_command\n"
11964
"~~~~~~~~~~~~~~"
11965
msgstr ""
11966
11967
#: en/help_topics/hooks.txt:164
11968
msgid "Introduced in: 1.13"
11969
msgstr ""
11970
11971
#: en/help_topics/hooks.txt:166
11972
msgid ""
11973
"Called after creating a command object to allow modifications such as\n"
11974
"adding or removing options, docs etc. Called with the new\n"
11975
"bzrlib.commands.Command object."
11976
msgstr ""
11977
11978
#: en/help_topics/hooks.txt:170
11979
msgid ""
11980
"get_command\n"
11981
"~~~~~~~~~~~"
11982
msgstr ""
11983
11984
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11985
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11986
msgid "Introduced in: 1.17"
11987
msgstr ""
11988
11989
#: en/help_topics/hooks.txt:175
11990
msgid ""
11991
"Called when creating a single command. Called with (cmd_or_None,\n"
11992
"command_name). get_command should either return the cmd_or_None\n"
11993
"parameter, or a replacement Command object that should be used for the\n"
11994
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11995
"Many users will prefer to use bzrlib.commands.register_command or\n"
11996
"plugin_cmds.register_lazy."
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:182
12000
msgid ""
12001
"get_missing_command\n"
12002
"~~~~~~~~~~~~~~~~~~~"
12003
msgstr ""
12004
12005
#: en/help_topics/hooks.txt:187
12006
msgid ""
12007
"Called when creating a single command if no command could be found.\n"
12008
"Called with (command_name). get_missing_command should either return\n"
12009
"None, or a Command object to be used for the command."
12010
msgstr ""
12011
12012
#: en/help_topics/hooks.txt:191
12013
msgid ""
12014
"list_commands\n"
12015
"~~~~~~~~~~~~~"
12016
msgstr ""
12017
12018
#: en/help_topics/hooks.txt:196
12019
msgid ""
12020
"Called when enumerating commands. Called with a set of cmd_name\n"
12021
"strings for all the commands found so far. This set is safe to mutate\n"
12022
"- e.g. to remove a command. list_commands should return the updated\n"
12023
"set of command names."
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:201
12027
msgid ""
12028
"post_command\n"
12029
"~~~~~~~~~~~~"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12033
msgid "Introduced in: 2.6"
12034
msgstr ""
12035
12036
#: en/help_topics/hooks.txt:206
12037
msgid "Called after executing a command. Called with the command object."
12038
msgstr ""
12039
12040
#: en/help_topics/hooks.txt:208
12041
msgid ""
12042
"pre_command\n"
12043
"~~~~~~~~~~~"
12044
msgstr ""
12045
12046
#: en/help_topics/hooks.txt:213
12047
msgid "Called prior to executing a command. Called with the command object."
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:215
12051
msgid ""
12052
"_ConfigHooks\n"
12053
"------------"
12054
msgstr ""
12055
12056
#: en/help_topics/hooks.txt:218
12057
msgid ""
12058
"get\n"
12059
"~~~"
12060
msgstr ""
12061
12062
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12063
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12064
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12065
#: en/help_topics/hooks.txt:446
12066
msgid "Introduced in: 2.4"
12067
msgstr ""
12068
12069
#: en/help_topics/hooks.txt:223
12070
msgid ""
12071
"Invoked when a config option is read. The signature is (stack, name,\n"
12072
"value)."
12073
msgstr ""
12074
12075
#: en/help_topics/hooks.txt:226
12076
msgid ""
12077
"load\n"
12078
"~~~~"
12079
msgstr ""
12080
12081
#: en/help_topics/hooks.txt:231
12082
msgid "Invoked when a config store is loaded. The signature is (store)."
12083
msgstr ""
12084
12085
#: en/help_topics/hooks.txt:233
12086
msgid ""
12087
"remove\n"
12088
"~~~~~~"
12089
msgstr ""
12090
12091
#: en/help_topics/hooks.txt:238
12092
msgid ""
12093
"Invoked when a config option is removed. The signature is (stack,\n"
12094
"name)."
12095
msgstr ""
12096
12097
#: en/help_topics/hooks.txt:241
12098
msgid ""
12099
"save\n"
12100
"~~~~"
12101
msgstr ""
12102
12103
#: en/help_topics/hooks.txt:246
12104
msgid "Invoked when a config store is saved. The signature is (store)."
12105
msgstr ""
12106
12107
#: en/help_topics/hooks.txt:248
12108
msgid ""
12109
"set\n"
12110
"~~~"
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:253
12114
msgid ""
12115
"Invoked when a config option is set. The signature is (stack, name,\n"
12116
"value)."
12117
msgstr ""
12118
12119
#: en/help_topics/hooks.txt:256
12120
msgid ""
12121
"ControlDirHooks\n"
12122
"---------------"
12123
msgstr ""
12124
12125
#: en/help_topics/hooks.txt:259
12126
msgid ""
12127
"post_repo_init\n"
12128
"~~~~~~~~~~~~~~"
12129
msgstr ""
12130
12131
#: en/help_topics/hooks.txt:264
12132
msgid ""
12133
"Invoked after a repository has been initialized. post_repo_init is\n"
12134
"called with a bzrlib.controldir.RepoInitHookParams."
12135
msgstr ""
12136
12137
#: en/help_topics/hooks.txt:267
12138
msgid ""
12139
"pre_open\n"
12140
"~~~~~~~~"
12141
msgstr ""
12142
12143
#: en/help_topics/hooks.txt:270
12144
msgid "Introduced in: 1.14"
12145
msgstr ""
12146
12147
#: en/help_topics/hooks.txt:272
12148
msgid ""
12149
"Invoked before attempting to open a ControlDir with the transport that\n"
12150
"the open will use."
12151
msgstr ""
12152
12153
#: en/help_topics/hooks.txt:275
12154
msgid ""
12155
"InfoHooks\n"
12156
"---------"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:278
12160
msgid ""
12161
"repository\n"
12162
"~~~~~~~~~~"
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12166
#: en/help_topics/hooks.txt:524
12167
msgid "Introduced in: 1.15"
12168
msgstr ""
12169
12170
#: en/help_topics/hooks.txt:283
12171
msgid ""
12172
"Invoked when displaying the statistics for a repository. repository is\n"
12173
"called with a statistics dictionary as returned by the repository and\n"
12174
"a file-like object to write to."
12175
msgstr ""
12176
12177
#: en/help_topics/hooks.txt:287
12178
msgid ""
12179
"LockHooks\n"
12180
"---------"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:290
12184
msgid ""
12185
"lock_acquired\n"
12186
"~~~~~~~~~~~~~"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:295
12190
msgid ""
12191
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12192
msgstr ""
12193
12194
#: en/help_topics/hooks.txt:297
12195
msgid ""
12196
"lock_broken\n"
12197
"~~~~~~~~~~~"
12198
msgstr ""
12199
12200
#: en/help_topics/hooks.txt:302
12201
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12202
msgstr ""
12203
12204
#: en/help_topics/hooks.txt:304
12205
msgid ""
12206
"lock_released\n"
12207
"~~~~~~~~~~~~~"
12208
msgstr ""
12209
12210
#: en/help_topics/hooks.txt:309
12211
msgid ""
12212
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12213
msgstr ""
12214
12215
#: en/help_topics/hooks.txt:311
12216
msgid ""
12217
"MergeHooks\n"
12218
"----------"
12219
msgstr ""
12220
12221
#: en/help_topics/hooks.txt:314
12222
msgid ""
12223
"merge_file_content\n"
12224
"~~~~~~~~~~~~~~~~~~"
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:317
12228
msgid "Introduced in: 2.1"
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:319
12232
msgid ""
12233
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12234
"object when starting a merge. Should return either None or a subclass\n"
12235
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12236
"called per file that needs to be merged (including when one side has\n"
12237
"deleted the file and the other has changed it). See the\n"
12238
"AbstractPerFileMerger API docs for details on how it is used by merge."
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:326
12242
msgid ""
12243
"post_merge\n"
12244
"~~~~~~~~~~"
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12248
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12249
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12250
msgid "Introduced in: 2.5"
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:331
12254
msgid ""
12255
"Called after a merge. Receives a Merger object as the single argument.\n"
12256
"The return value is ignored."
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:334
12260
msgid ""
12261
"pre_merge\n"
12262
"~~~~~~~~~"
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:339
12266
msgid ""
12267
"Called before a merge. Receives a Merger object as the single\n"
12268
"argument."
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:342
12272
msgid ""
12273
"MergeDirectiveHooks\n"
12274
"-------------------"
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:345
12278
msgid ""
12279
"merge_request_body\n"
12280
"~~~~~~~~~~~~~~~~~~"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:348
12284
msgid "Introduced in: 1.15.0"
12285
msgstr ""
12286
12287
#: en/help_topics/hooks.txt:350
12288
msgid ""
12289
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12290
"request. Callbacks must return a body. If more than one callback is\n"
12291
"registered, the output of one callback is provided to the next."
12292
msgstr ""
12293
12294
#: en/help_topics/hooks.txt:354
12295
msgid ""
12296
"MessageEditorHooks\n"
12297
"------------------"
12298
msgstr ""
12299
12300
#: en/help_topics/hooks.txt:357
12301
msgid ""
12302
"commit_message_template\n"
12303
"~~~~~~~~~~~~~~~~~~~~~~~"
12304
msgstr ""
12305
12306
#: en/help_topics/hooks.txt:360
12307
msgid "Introduced in: 1.10"
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:362
12311
msgid ""
12312
"Called when a commit message is being generated.\n"
12313
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12314
"and the message that is known so far. commit_message_template must\n"
12315
"return a new message to use (which could be the same as it was given).\n"
12316
"When there are multiple hooks registered for commit_message_template,\n"
12317
"they are chained with the result from the first passed into the\n"
12318
"second, and so on."
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:370
12322
msgid ""
12323
"set_commit_message\n"
12324
"~~~~~~~~~~~~~~~~~~"
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:375
12328
msgid ""
12329
"Set a fixed commit message. set_commit_message is called with the\n"
12330
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12331
"properties by editing commit.builder._revprops) and the message so\n"
12332
"far. set_commit_message must return the message to use or None if it\n"
12333
"should use the message editor as normal."
12334
msgstr ""
12335
12336
#: en/help_topics/hooks.txt:381
12337
msgid ""
12338
"MutableTreeHooks\n"
12339
"----------------"
12340
msgstr ""
12341
12342
#: en/help_topics/hooks.txt:384
12343
msgid ""
12344
"post_build_tree\n"
12345
"~~~~~~~~~~~~~~~"
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:389
12349
msgid ""
12350
"Called after a completely new tree is built. The hook is called with\n"
12351
"the tree as its only argument."
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:395
12355
msgid "Introduced in: 2.0"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:397
12359
msgid ""
12360
"Called after a commit is performed on a tree. The hook is called with\n"
12361
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12362
"commit was performed on is available via the mutable_tree attribute of\n"
12363
"that object."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:402
12367
msgid ""
12368
"post_transform\n"
12369
"~~~~~~~~~~~~~~"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:407
12373
msgid ""
12374
"Called after a tree transform has been performed on a tree. The hook\n"
12375
"is called with the tree that is being transformed and the transform."
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:410
12379
msgid ""
12380
"pre_transform\n"
12381
"~~~~~~~~~~~~~"
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:415
12385
msgid ""
12386
"Called before a tree transform on this tree. The hook is called with\n"
12387
"the tree that is being transformed and the transform."
12388
msgstr ""
12389
12390
#: en/help_topics/hooks.txt:418
12391
msgid ""
12392
"start_commit\n"
12393
"~~~~~~~~~~~~"
12394
msgstr ""
12395
12396
#: en/help_topics/hooks.txt:423
12397
msgid ""
12398
"Called before a commit is performed on a tree. The start commit hook\n"
12399
"is able to change the tree before the commit takes place. start_commit\n"
12400
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12401
"being performed on."
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:428
12405
msgid ""
12406
"SmartClientHooks\n"
12407
"----------------"
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:431
12411
msgid ""
12412
"call\n"
12413
"~~~~"
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:434
12417
msgid "Introduced in: unknown"
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:436
12421
msgid ""
12422
"Called when the smart client is submitting a request to the smart\n"
12423
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12424
"Streaming request bodies, and responses, are not accessible."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:440
12428
msgid ""
12429
"SmartServerHooks\n"
12430
"----------------"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:443
12434
msgid ""
12435
"server_exception\n"
12436
"~~~~~~~~~~~~~~~~"
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:448
12440
msgid ""
12441
"Called by the bzr server when an exception occurs. server_exception is\n"
12442
"called with the sys.exc_info() tuple return true for the hook if the\n"
12443
"exception has been handled, in which case the server will exit\n"
12444
"normally."
12445
msgstr ""
12446
12447
#: en/help_topics/hooks.txt:453
12448
msgid ""
12449
"server_started\n"
12450
"~~~~~~~~~~~~~~"
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12454
msgid "Introduced in: 0.16"
12455
msgstr ""
12456
12457
#: en/help_topics/hooks.txt:458
12458
msgid ""
12459
"Called by the bzr server when it starts serving a directory.\n"
12460
"server_started is called with (backing urls, public url), where\n"
12461
"backing_url is a list of URLs giving the server-specific directory\n"
12462
"locations, and public_url is the public URL for the directory being\n"
12463
"served."
12464
msgstr ""
12465
12466
#: en/help_topics/hooks.txt:464
12467
msgid ""
12468
"server_started_ex\n"
12469
"~~~~~~~~~~~~~~~~~"
12470
msgstr ""
12471
12472
#: en/help_topics/hooks.txt:469
12473
msgid ""
12474
"Called by the bzr server when it starts serving a directory.\n"
12475
"server_started is called with (backing_urls, server_obj)."
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:472
12479
msgid ""
12480
"server_stopped\n"
12481
"~~~~~~~~~~~~~~"
12482
msgstr ""
12483
12484
#: en/help_topics/hooks.txt:477
12485
msgid ""
12486
"Called by the bzr server when it stops serving a directory.\n"
12487
"server_stopped is called with the same parameters as the\n"
12488
"server_started hook: (backing_urls, public_url)."
12489
msgstr ""
12490
12491
#: en/help_topics/hooks.txt:481
12492
msgid ""
12493
"StatusHooks\n"
12494
"-----------"
12495
msgstr ""
12496
12497
#: en/help_topics/hooks.txt:484
12498
msgid ""
12499
"post_status\n"
12500
"~~~~~~~~~~~"
12501
msgstr ""
12502
12503
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12504
msgid "Introduced in: 2.3"
12505
msgstr ""
12506
12507
#: en/help_topics/hooks.txt:489
12508
msgid ""
12509
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12510
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12511
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12512
"correspond to the command line options specified by the user for the\n"
12513
"status command. to_file is the output stream for writing."
12514
msgstr ""
12515
12516
#: en/help_topics/hooks.txt:495
12517
msgid ""
12518
"pre_status\n"
12519
"~~~~~~~~~~"
12520
msgstr ""
12521
12522
#: en/help_topics/hooks.txt:500
12523
msgid ""
12524
"Called with argument StatusHookParams before Bazaar displays the\n"
12525
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12526
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12527
"correspond to the command line options specified by the user for the\n"
12528
"status command. to_file is the output stream for writing."
12529
msgstr ""
12530
12531
#: en/help_topics/hooks.txt:506
12532
msgid ""
12533
"TransportHooks\n"
12534
"--------------"
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:509
12538
msgid ""
12539
"post_connect\n"
12540
"~~~~~~~~~~~~"
12541
msgstr ""
12542
12543
#: en/help_topics/hooks.txt:514
12544
msgid ""
12545
"Called after a new connection is established or a reconnect occurs.\n"
12546
"The sole argument passed is either the connected transport or smart\n"
12547
"medium instance."
12548
msgstr ""
12549
12550
#: en/help_topics/hooks.txt:518
12551
msgid ""
12552
"RioVersionInfoBuilderHooks\n"
12553
"--------------------------"
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:521
12557
msgid ""
12558
"revision\n"
12559
"~~~~~~~~"
12560
msgstr ""
12561
12562
#: en/help_topics/hooks.txt:526
12563
msgid ""
12564
"Invoked when adding information about a revision to the RIO stanza\n"
12565
"that is printed. revision is called with a revision object and a RIO\n"
12566
"stanza.\n"
12567
msgstr ""
12568
12569
#: en/help_topics/location-alias.txt:1
12570
msgid ""
12571
"Location aliases\n"
12572
"================"
12573
msgstr ""
12574
12575
#: en/help_topics/location-alias.txt:4
12576
msgid ""
12577
"Bazaar defines several aliases for locations associated with a branch. "
12578
"These\n"
12579
"can be used with most commands that expect a location, such as `bzr push`."
12580
msgstr ""
12581
12582
#: en/help_topics/location-alias.txt:7
12583
msgid "The aliases are::"
12584
msgstr ""
12585
12586
#: en/help_topics/location-alias.txt:9
12587
msgid ""
12588
" :bound The branch this branch is bound to, for bound branches.\n"
12589
" :parent The parent of this branch.\n"
12590
" :public The public location of this branch.\n"
12591
" :push The saved location used for `bzr push` with no arguments.\n"
12592
" :submit The submit branch for this branch.\n"
12593
" :this This branch."
12594
msgstr ""
12595
12596
#: en/help_topics/location-alias.txt:16
12597
msgid "For example, to push to the parent location::"
12598
msgstr ""
12599
12600
#: en/help_topics/location-alias.txt:18
12601
msgid " bzr push :parent\n"
12602
msgstr ""
12603
12604
#: en/help_topics/log-formats.txt:1
12605
msgid ""
12606
"Log Formats\n"
12607
"==========="
12608
msgstr ""
12609
12610
#: en/help_topics/log-formats.txt:4
12611
msgid ""
12612
"A log format controls how information about each revision is displayed.\n"
12613
"The standard log formats are compared below::"
12614
msgstr ""
12615
12616
#: en/help_topics/log-formats.txt:7
12617
msgid ""
12618
" Feature long short line\n"
12619
" ---------------------- ------------- ------------ -------------------\n"
12620
" design goal detailed view concise view 1 revision per line\n"
12621
" committer name+email name only name only\n"
12622
" author name+email - -\n"
12623
" date-time format full date only date only\n"
12624
" commit message full full top line\n"
12625
" tags yes yes yes\n"
12626
" merges indicator - yes -\n"
12627
" status/delta optional optional -\n"
12628
" diff/patch optional optional -\n"
12629
" revision-id optional optional -\n"
12630
" branch nick yes - -\n"
12631
" foreign vcs properties yes yes -\n"
12632
" preferred levels all 1 1\n"
12633
" digital signature optional - -"
12634
msgstr ""
12635
12636
#: en/help_topics/log-formats.txt:24
12637
msgid ""
12638
"The default format is ``long``. To change this, define the ``log_format``\n"
12639
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12640
msgstr ""
12641
12642
#: en/help_topics/log-formats.txt:27
12643
msgid ""
12644
" [DEFAULT]\n"
12645
" log_format = short"
12646
msgstr ""
12647
12648
#: en/help_topics/log-formats.txt:30
12649
msgid ""
12650
"Alternatively, to change the log format used for a given query, use the\n"
12651
"--long, --short or --line options."
12652
msgstr ""
12653
12654
#: en/help_topics/log-formats.txt:33
12655
msgid ""
12656
"If one of the standard log formats does not meet your needs, additional\n"
12657
"formats can be provided by plugins.\n"
12658
msgstr ""
12659
12660
#: en/help_topics/other-formats.txt:1
12661
msgid "Other Storage Formats"
12662
msgstr ""
12663
12664
#: en/help_topics/other-formats.txt:3
12665
msgid "Experimental formats are shown below."
12666
msgstr ""
12667
12668
#: en/help_topics/other-formats.txt:5
12669
msgid ""
12670
":development-colo:\n"
12671
" (native) The 2a format with experimental support for colocated\n"
12672
" branches."
12673
msgstr ""
12674
12675
#: en/help_topics/other-formats.txt:9
12676
msgid ""
12677
"\n"
12678
"Deprecated formats are shown below."
12679
msgstr ""
12680
12681
#: en/help_topics/other-formats.txt:12
12682
msgid ""
12683
":pack-0.92:\n"
12684
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12685
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12686
" by bzr < 0.92."
12687
msgstr ""
12688
12689
#: en/help_topics/patterns.txt:1
12690
msgid ""
12691
"Patterns\n"
12692
"========"
12693
msgstr ""
12694
12695
#: en/help_topics/patterns.txt:4
12696
msgid ""
12697
"Bazaar uses patterns to match files at various times. For example,\n"
12698
"the ``add`` command skips over files that match ignore patterns\n"
12699
"and preferences can be associated with files using rule patterns.\n"
12700
"The pattern syntax is described below."
12701
msgstr ""
12702
12703
#: en/help_topics/patterns.txt:9
12704
msgid ""
12705
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12706
"slash or is a regular expression, it is compared to the whole path\n"
12707
"from the branch root. Otherwise, it is compared to only the last\n"
12708
"component of the path. To match a file only in the root directory,\n"
12709
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12710
msgstr ""
12711
12712
#: en/help_topics/patterns.txt:15
12713
msgid "Patterns may include globbing wildcards such as::"
12714
msgstr ""
12715
12716
#: en/help_topics/patterns.txt:17
12717
msgid ""
12718
" ? - Matches any single character except '/'\n"
12719
" * - Matches 0 or more characters except '/'\n"
12720
" /**/ - Matches 0 or more directories in a path\n"
12721
" [a-z] - Matches a single character from within a group of characters"
12722
msgstr ""
12723
12724
#: en/help_topics/patterns.txt:22
12725
msgid ""
12726
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12727
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12728
"expression. Regular expression patterns may not include named or\n"
12729
"numbered groups."
12730
msgstr ""
12731
12732
#: en/help_topics/patterns.txt:27
12733
msgid ""
12734
"Case insensitive ignore patterns can be specified with regular expressions\n"
12735
"by using the ``i`` (for ignore case) flag in the pattern."
12736
msgstr ""
12737
12738
#: en/help_topics/patterns.txt:30
12739
msgid ""
12740
"For example, a case insensitive match for ``foo`` may be specified as::"
12741
msgstr ""
12742
12743
#: en/help_topics/patterns.txt:32
12744
msgid " RE:(?i)foo"
12745
msgstr ""
12746
12747
#: en/help_topics/patterns.txt:34
12748
msgid ""
12749
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12750
"matched by that pattern will not be ignored."
12751
msgstr ""
12752
12753
#: en/help_topics/patterns.txt:37
12754
msgid ""
12755
".. _Python regular expressions: http://docs.python.org/library/re.html"
12756
msgstr ""
12757
12758
#: en/help_topics/revisionspec.txt:1
12759
msgid "Revision Identifiers"
12760
msgstr ""
12761
12762
#: en/help_topics/revisionspec.txt:3
12763
msgid ""
12764
"A revision identifier refers to a specific state of a branch's history. It\n"
12765
"can be expressed in several ways. It can begin with a keyword to\n"
12766
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12767
"'before:yesterday' and 'submit:'."
12768
msgstr ""
12769
12770
#: en/help_topics/revisionspec.txt:8
12771
msgid ""
12772
"Alternately, it can be given without a keyword, in which case it will be\n"
12773
"checked as a revision number, a tag, a revision id, a date specification, or "
12774
"a\n"
12775
"branch specification, in that order. For example, 'date:today' could be\n"
12776
"written as simply 'today', though if you have a tag called 'today' that "
12777
"will\n"
12778
"be found first."
12779
msgstr ""
12780
12781
#: en/help_topics/revisionspec.txt:14
12782
msgid ""
12783
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12784
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12785
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12786
"or\n"
12787
"spaces around the '..')."
12788
msgstr ""
12789
12790
#: en/help_topics/revisionspec.txt:19
12791
msgid ""
12792
"Ranges are interpreted differently by different commands. To the \"log\" "
12793
"command,\n"
12794
"a range is a sequence of log messages, but to the \"diff\" command, the "
12795
"range\n"
12796
"denotes a change between revisions (and not a sequence of changes). In\n"
12797
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12798
"consider it\n"
12799
"to be open-ended, that is, they include one end but not the other. For "
12800
"example:\n"
12801
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12802
"3649,\n"
12803
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12804
"and\n"
12805
"3649, but not 3647."
12806
msgstr ""
12807
12808
#: en/help_topics/revisionspec.txt:28
12809
msgid "The keywords used as revision selection methods are the following:"
12810
msgstr ""
12811
12812
#: en/help_topics/revisionspec.txt:30
12813
msgid ""
12814
":revid:\n"
12815
"\tSelects a revision using the revision id.\n"
12816
":submit:\n"
12817
"\tSelects a common ancestor with the submit branch.\n"
12818
":ancestor:\n"
12819
"\tSelects a common ancestor with a second branch.\n"
12820
":date:\n"
12821
"\tSelects a revision on the basis of a datestamp.\n"
12822
":branch:\n"
12823
"\tSelects the last revision of a specified branch.\n"
12824
":tag:\n"
12825
"\tSelects a revision identified by a tag name.\n"
12826
":revno:\n"
12827
"\tSelects a revision using a number.\n"
12828
":before:\n"
12829
"\tSelects the parent of the revision specified.\n"
12830
":annotate:\n"
12831
"\tSelect the revision that last modified the specified line.\n"
12832
":mainline:\n"
12833
"\tSelect mainline revision that merged the specified revision.\n"
12834
":last:\n"
12835
"\tSelects the nth revision from the end."
12836
msgstr ""
12837
12838
#: en/help_topics/revisionspec.txt:53
12839
msgid "In addition, plugins can provide other keywords."
12840
msgstr ""
12841
12842
#: en/help_topics/revisionspec.txt:55
12843
msgid "A detailed description of each keyword is given below."
12844
msgstr ""
12845
12846
#: en/help_topics/revisionspec.txt:57
12847
msgid ":revid:"
12848
msgstr ""
12849
12850
#: en/help_topics/revisionspec.txt:59
12851
msgid ""
12852
" Supply a specific revision id, that can be used to specify any\n"
12853
" revision id in the ancestry of the branch.\n"
12854
" Including merges, and pending merges.\n"
12855
" Examples::"
12856
msgstr ""
12857
12858
#: en/help_topics/revisionspec.txt:64
12859
msgid ""
12860
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:66
12864
msgid ":submit:"
12865
msgstr ""
12866
12867
#: en/help_topics/revisionspec.txt:68
12868
msgid ""
12869
" Diffing against this shows all the changes that were made in this "
12870
"branch,\n"
12871
" and is a good predictor of what merge will do. The submit branch is\n"
12872
" used by the bundle and merge directive commands. If no submit branch\n"
12873
" is specified, the parent branch is used instead."
12874
msgstr ""
12875
12876
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12877
msgid ""
12878
" The common ancestor is the last revision that existed in both\n"
12879
" branches. Usually this is the branch point, but it could also be\n"
12880
" a revision that was merged."
12881
msgstr ""
12882
12883
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12884
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12885
#: en/help_topics/revisionspec.txt:153
12886
msgid " Examples::"
12887
msgstr ""
12888
12889
#: en/help_topics/revisionspec.txt:79
12890
msgid " $ bzr diff -r submit:"
12891
msgstr ""
12892
12893
#: en/help_topics/revisionspec.txt:81
12894
msgid ":ancestor:"
12895
msgstr ""
12896
12897
#: en/help_topics/revisionspec.txt:83
12898
msgid " Supply the path to a branch to select the common ancestor."
12899
msgstr ""
12900
12901
#: en/help_topics/revisionspec.txt:89
12902
msgid ""
12903
" This is frequently used with 'diff' to return all of the changes\n"
12904
" that your branch introduces, while excluding the changes that you\n"
12905
" have not merged from the remote branch."
12906
msgstr ""
12907
12908
#: en/help_topics/revisionspec.txt:95
12909
msgid ""
12910
" ancestor:/path/to/branch\n"
12911
" $ bzr diff -r ancestor:../../mainline/branch"
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:98
12915
msgid ":date:"
12916
msgstr ""
12917
12918
#: en/help_topics/revisionspec.txt:100
12919
msgid ""
12920
" Supply a datestamp to select the first revision that matches the date.\n"
12921
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12922
" Matches the first entry after a given date (either at midnight or\n"
12923
" at a specified time)."
12924
msgstr ""
12925
12926
#: en/help_topics/revisionspec.txt:105
12927
msgid " One way to display all the changes since yesterday would be::"
12928
msgstr ""
12929
12930
#: en/help_topics/revisionspec.txt:107
12931
msgid " bzr log -r date:yesterday.."
12932
msgstr ""
12933
12934
#: en/help_topics/revisionspec.txt:111
12935
msgid ""
12936
" date:yesterday -> select the first revision since "
12937
"yesterday\n"
12938
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12939
" August 14th, 2006 at 5:10pm."
12940
msgstr ""
12941
12942
#: en/help_topics/revisionspec.txt:115
12943
msgid ":branch:"
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:117
12947
msgid " Supply the path to a branch to select its last revision."
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:121
12951
msgid " branch:/path/to/branch"
12952
msgstr ""
12953
12954
#: en/help_topics/revisionspec.txt:123
12955
msgid ":tag:"
12956
msgstr ""
12957
12958
#: en/help_topics/revisionspec.txt:125
12959
msgid " Tags are stored in the branch and created by the 'tag' command."
12960
msgstr ""
12961
12962
#: en/help_topics/revisionspec.txt:127
12963
msgid ":revno:"
12964
msgstr ""
12965
12966
#: en/help_topics/revisionspec.txt:129
12967
msgid ""
12968
" Use an integer to specify a revision in the history of the branch.\n"
12969
" Optionally a branch can be specified. A negative number will count\n"
12970
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12971
" one). If the negative number is larger than the branch's history, the\n"
12972
" first revision is returned.\n"
12973
" Examples::"
12974
msgstr ""
12975
12976
#: en/help_topics/revisionspec.txt:136
12977
msgid ""
12978
" revno:1 -> return the first revision of this branch\n"
12979
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12980
" the branch '/path/to/branch'\n"
12981
" revno:-1 -> The last revision in a branch.\n"
12982
" -2:http://other/branch -> The second to last revision in the\n"
12983
" remote branch.\n"
12984
" -1000000 -> Most likely the first revision, unless\n"
12985
" your history is very long."
12986
msgstr ""
12987
12988
#: en/help_topics/revisionspec.txt:145
12989
msgid ":before:"
12990
msgstr ""
12991
12992
#: en/help_topics/revisionspec.txt:147
12993
msgid ""
12994
" Supply any revision spec to return the parent of that revision. This "
12995
"is\n"
12996
" mostly useful when inspecting revisions that are not in the revision "
12997
"history\n"
12998
" of a branch."
12999
msgstr ""
13000
13001
#: en/help_topics/revisionspec.txt:151
13002
msgid ""
13003
" It is an error to request the parent of the null revision (before:0)."
13004
msgstr ""
13005
13006
#: en/help_topics/revisionspec.txt:155
13007
msgid ""
13008
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13009
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13010
" aaaa@bbbb-1234567890\n"
13011
" bzr diff -r before:1913..1913\n"
13012
" -> Find the changes between revision 1913 and its parent "
13013
"(1912).\n"
13014
" (What changes did revision 1913 introduce).\n"
13015
" This is equivalent to: bzr diff -c 1913"
13016
msgstr ""
13017
13018
#: en/help_topics/revisionspec.txt:163
13019
msgid ":annotate:"
13020
msgstr ""
13021
13022
#: en/help_topics/revisionspec.txt:165
13023
msgid ""
13024
" Select the revision that last modified the specified line. Line is\n"
13025
" specified as path:number. Path is a relative path to the file. "
13026
"Numbers\n"
13027
" start at 1, and are relative to the current version, not the last-\n"
13028
" committed version of the file."
13029
msgstr ""
13030
13031
#: en/help_topics/revisionspec.txt:170
13032
msgid ":mainline:"
13033
msgstr ""
13034
13035
#: en/help_topics/revisionspec.txt:172
13036
msgid ""
13037
" Select the revision that merged the specified revision into mainline."
13038
msgstr ""
13039
13040
#: en/help_topics/revisionspec.txt:174
13041
msgid ":last:"
13042
msgstr ""
13043
13044
#: en/help_topics/revisionspec.txt:176
13045
msgid ""
13046
" Supply a positive number to get the nth revision from the end.\n"
13047
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13048
" Examples::"
13049
msgstr ""
13050
13051
#: en/help_topics/revisionspec.txt:180
13052
msgid ""
13053
" last:1 -> return the last revision\n"
13054
" last:3 -> return the revision 2 before the end.\n"
13055
msgstr ""
13056
13057
#: en/help_topics/rules.txt:1
13058
msgid ""
13059
"Rules\n"
13060
"====="
13061
msgstr ""
13062
13063
#: en/help_topics/rules.txt:7
13064
msgid ""
13065
"Rules are defined in ini file format where the sections are file glob\n"
13066
"patterns and the contents of each section are the preferences for files\n"
13067
"matching that pattern(s). For example::"
13068
msgstr ""
13069
13070
#: en/help_topics/rules.txt:11
13071
msgid ""
13072
" [name *.bat]\n"
13073
" eol = native"
13074
msgstr ""
13075
13076
#: en/help_topics/rules.txt:14
13077
msgid ""
13078
" [name *.html *.xml]\n"
13079
" keywords = xml_escape"
13080
msgstr ""
13081
13082
#: en/help_topics/rules.txt:17
13083
msgid ""
13084
"Preferences like these are useful for commands and plugins wishing to\n"
13085
"provide custom behaviour for selected files. For more information on \n"
13086
"end of line conversion see :doc:`eol-help`.\n"
13087
"Keyword support is provided by the `keywords plugin\n"
13088
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13089
msgstr ""
13090
13091
#: en/help_topics/rules.txt:23
13092
msgid ""
13093
"Files\n"
13094
"-----"
13095
msgstr ""
13096
13097
#: en/help_topics/rules.txt:26
13098
msgid ""
13099
"Default rules for all branches are defined in the optional file\n"
13100
"``BZR_HOME/rules``. "
13101
msgstr ""
13102
13103
#: en/help_topics/rules.txt:29
13104
msgid ""
13105
"Rule Patterns\n"
13106
"-------------"
13107
msgstr ""
13108
13109
#: en/help_topics/rules.txt:32
13110
msgid ""
13111
"Patterns are ordered and searching stops as soon as one matches.\n"
13112
"As a consequence, more explicit patterns should be placed towards\n"
13113
"the top of the file. Rule patterns use exactly the same conventions\n"
13114
"as ignore patterns. See :doc:`patterns-help` for details."
13115
msgstr ""
13116
13117
#: en/help_topics/rules.txt:37
13118
msgid ".. note::"
13119
msgstr ""
13120
13121
#: en/help_topics/rules.txt:39
13122
msgid ""
13123
" Patterns containing square brackets or spaces should be\n"
13124
" surrounded in quotes to ensure they are correctly parsed.\n"
13125
msgstr ""
13126
13127
#: en/help_topics/topics.txt:1
13128
msgid ""
13129
"authentication Information on configuring authentication\n"
13130
"basic Basic commands\n"
13131
"branches Information on what a branch is\n"
13132
"bugs Bug tracker settings\n"
13133
"checkouts Information on what a checkout is\n"
13134
"commands Basic help for all commands\n"
13135
"configuration Details on the configuration settings available\n"
13136
"conflict-types Types of conflicts and what to do about them\n"
13137
"content-filters Conversion of content into/from working trees\n"
13138
"criss-cross Information on criss-cross merging\n"
13139
"current-formats Current storage formats\n"
13140
"debug-flags Options to show or record debug information\n"
13141
"diverged-branches How to fix diverged branches\n"
13142
"env-variables Environment variable names and values\n"
13143
"eol Information on end-of-line handling\n"
13144
"files Information on configuration and log files\n"
13145
"formats Information on choosing a storage format\n"
13146
"global-options Options that control how Bazaar runs\n"
13147
"hidden-commands All hidden commands\n"
13148
"hooks Points at which custom processing can be added\n"
13149
"launchpad Using Bazaar with Launchpad.net\n"
13150
"location-alias Aliases for remembered locations\n"
13151
"log-formats Details on the logging formats available\n"
13152
"other-formats Experimental and deprecated storage formats\n"
13153
"patterns Information on the pattern syntax\n"
13154
"repositories Basic information on shared repositories.\n"
13155
"revisionspec Explain how to use --revision\n"
13156
"rules Information on defining rule-based preferences\n"
13157
"standalone-trees Information on what a standalone tree is\n"
13158
"standard-options Options that can be used with any command\n"
13159
"status-flags Help on status flags\n"
13160
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13161
"topics Topics list\n"
13162
"url-special-chars Special character handling in URLs\n"
13163
"urlspec Supported transport protocols\n"
13164
"working-trees Information on working trees\n"
13165
msgstr ""
13166
13167
#: en/help_topics/url-special-chars.txt:1
13168
msgid ""
13169
"Special character handling in URLs\n"
13170
"=================================="
13171
msgstr ""
13172
13173
#: en/help_topics/url-special-chars.txt:4
13174
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13175
msgstr ""
13176
13177
#: en/help_topics/url-special-chars.txt:6
13178
msgid " * Fully qualified URLs"
13179
msgstr ""
13180
13181
#: en/help_topics/url-special-chars.txt:8
13182
msgid " * File system paths, relative or absolute"
13183
msgstr ""
13184
13185
#: en/help_topics/url-special-chars.txt:10
13186
msgid ""
13187
"Internally bzr treats all locations as URLs. For any file system paths\n"
13188
"that are specified it will automatically determine the appropriate URL\n"
13189
"representation, and escape special characters where necessary."
13190
msgstr ""
13191
13192
#: en/help_topics/url-special-chars.txt:14
13193
msgid ""
13194
"There are a few characters which have special meaning in URLs and need "
13195
"careful\n"
13196
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13197
"value in URLs. Any non-ASCII characters in a file path will automatically "
13198
"be\n"
13199
"urlencoded when the path is converted to a URL."
13200
msgstr ""
13201
13202
#: en/help_topics/url-special-chars.txt:19
13203
msgid ""
13204
"URLs represent non-ASCII characters in an encoding defined by the server, "
13205
"but\n"
13206
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13207
"be\n"
13208
"generous in what it accepts as a URL and to print them in a way that\n"
13209
"will be readable."
13210
msgstr ""
13211
13212
#: en/help_topics/url-special-chars.txt:24
13213
msgid ""
13214
"For example, if you have a directory named '/tmp/%2False' these are all "
13215
"valid\n"
13216
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13217
"slash)::"
13218
msgstr ""
13219
13220
#: en/help_topics/url-special-chars.txt:27
13221
msgid ""
13222
" cd /tmp\n"
13223
" bzr log /tmp/%2False\n"
13224
" bzr log %2False\n"
13225
" bzr log file:///tmp/%252False\n"
13226
" bzr log file://localhost/tmp/%252False\n"
13227
" bzr log file:%252False"
13228
msgstr ""
13229
13230
#: en/help_topics/url-special-chars.txt:34
13231
msgid "These are valid but do not refer to the same file::"
13232
msgstr ""
13233
13234
#: en/help_topics/url-special-chars.txt:36
13235
msgid ""
13236
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13237
" bzr log %252False (refers to a file called /tmp/%252False)"
13238
msgstr ""
13239
13240
#: en/help_topics/url-special-chars.txt:39
13241
msgid ""
13242
"Comma also has special meaning in URLs, because it denotes `segment "
13243
"parameters`_"
13244
msgstr ""
13245
13246
#: en/help_topics/url-special-chars.txt:41
13247
msgid ""
13248
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13249
msgstr ""
13250
13251
#: en/help_topics/url-special-chars.txt:43
13252
msgid ""
13253
"Comma is also special in any file system paths that are specified. To use a "
13254
"literal\n"
13255
"comma in a file system path, specify a URL and URL encode the comma::"
13256
msgstr ""
13257
13258
#: en/help_topics/url-special-chars.txt:46
13259
msgid ""
13260
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13261
"\"branch\" set to \"bla\"\n"
13262
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13263
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13264
"\"branch\" set to \"bla\"\n"
13265
msgstr ""
13266
13267
#: en/help_topics/urlspec.txt:1
13268
msgid "URL Identifiers"
13269
msgstr ""
13270
13271
#: en/help_topics/urlspec.txt:3
13272
msgid "Supported URL prefixes::"
13273
msgstr ""
13274
13275
#: en/help_topics/urlspec.txt:5
13276
msgid ""
13277
" aftp:// Access using active FTP.\n"
13278
" bzr:// Fast access using the Bazaar smart server.\n"
13279
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13280
" file:// Access using the standard filesystem (default)\n"
13281
" ftp:// Access using passive FTP.\n"
13282
" http:// Read-only access of branches exported on the web.\n"
13283
" https:// Read-only access of branches exported on the web using "
13284
"SSL.\n"
13285
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13286
msgstr ""
13287
13288
#: en/help_topics/urlspec.txt:14
13289
msgid "Supported modifiers::"
13290
msgstr ""
13291
13292
#: en/help_topics/urlspec.txt:16
13293
msgid " gio+ Access using any GIO supported protocols."
13294
msgstr ""
13295
13296
#: en/help_topics/urlspec.txt:18
13297
msgid "Bazaar supports all of the standard parts within the URL::"
13298
msgstr ""
13299
13300
#: en/help_topics/urlspec.txt:20
13301
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13302
msgstr ""
13303
13304
#: en/help_topics/urlspec.txt:22
13305
msgid "allowing URLs such as::"
13306
msgstr ""
13307
13308
#: en/help_topics/urlspec.txt:24
13309
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13310
msgstr ""
13311
13312
#: en/help_topics/urlspec.txt:26
13313
msgid ""
13314
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13315
"with '~' as meaning that the rest of the path should be interpreted\n"
13316
"relative to the remote user's home directory. For example if the user\n"
13317
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13318
"shell.example.com, then::"
13319
msgstr ""
13320
13321
#: en/help_topics/urlspec.txt:32
13322
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13323
msgstr ""
13324
13325
#: en/help_topics/urlspec.txt:34
13326
msgid "would refer to ``/home/remote/myproject/trunk``."
13327
msgstr ""
13328
13329
#: en/help_topics/urlspec.txt:36
13330
msgid ""
13331
"Many commands that accept URLs also accept location aliases too.\n"
13332
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13333
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1