« back to all changes in this revision
Viewing changes to po/pt_BR.po
- browse files at revision 6472.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6472.2.1
- Committer: Jelmer Vernooij
- Date: 2012-02-23 19:45:15 UTC
- mto: This revision was merged to the branch mainline in revision 6486.
- Revision ID: jelmer@samba.org-20120223194515-1ctgfzj362m0tu0k
Use bzrdir.controldir for generic access to control directories.
- files added:
- doc/en/release-notes/bzr-2.6.txt
- files modified:
- bzr
added
removed
po/pt_BR.po
1
# Brazilian Portuguese translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
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-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Brazilian Portuguese <pt_BR@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=2; plural=n > 1;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:17+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "saltar {0} (maior que {1} de {2} bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "Desempilhar"
28
29
#: bzrlib/branch.py:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Enviar para revisão %d."
33
34
#: bzrlib/branch.py:3185
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d tag atualizada."
39
msgstr[1] "%d tags atualizadas."
40
41
#: bzrlib/branch.py:3188
42
msgid "No new revisions or tags to push."
43
msgstr "Nenhuma revisão ou tags para enviar."
44
45
#: bzrlib/branch.py:3190
46
msgid "No new revisions to push."
47
msgstr "Nenhuma revisão para enviar."
48
49
#: bzrlib/branch.py:3210
50
msgid "checked branch {0} format {1}"
51
msgstr "verificado o ramo {0} formato {1}"
52
53
#: bzrlib/branch.py:3213
54
#, python-format
55
msgid "found error:%s"
56
msgstr "erro encontrado:%s"
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignorar arquivos fora da visualização. A visualização é %s"
62
63
#: bzrlib/builtins.py:130
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision produz exatamente o identificador da revisão"
67
68
#: bzrlib/builtins.py:215
69
msgid "Display status summary."
70
msgstr "Mostrar o resumo do estado."
71
72
#: bzrlib/builtins.py:217
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Este é um relatório de arquivos desconhecidos e versionados, reportá-los\n"
78
"agrupados por estado. Estados possíveis são:"
79
80
#: bzrlib/builtins.py:220
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"adicionado\n"
86
" Versionado na cópia de trabalho, mas não na revisão anterior."
87
88
#: bzrlib/builtins.py:223
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removido\n"
95
" Versionado na revisão anterior, mas removido ou excluído\n"
96
" na cópia de trabalho."
97
98
#: bzrlib/builtins.py:227
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renomeado\n"
106
" O caminho deste arquivo foi alterado a partir da revisão anterior;\n"
107
" o texto também pode ter mudado. Isso inclui arquivos cujo\n"
108
" diretório pai foi renomeado."
109
110
#: bzrlib/builtins.py:232
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modificado\n"
116
" O texto mudou desde a versão anterior."
117
118
#: bzrlib/builtins.py:235
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"tipo alterado\n"
124
" Tipo de arquivo foi alterado (por exemplo, de arquivo para o diretório)."
125
126
#: bzrlib/builtins.py:238
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"desconhecido\n"
132
" Não versionado e não corresponde aos padrões de ignorar."
133
134
#: bzrlib/builtins.py:241
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Além disso para diretórios, links simbólicos e arquivos com um bit\n"
142
"executáve alterado, o Bazaar indica seu tipo usando um caracter\n"
143
"de fuga: '/', '@' ou '*' respectivamente. Estes adicionais podem ser\n"
144
"desativados usando a opção '--no-classify'."
145
146
#: bzrlib/builtins.py:246
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"Para ver arquivos ignorados use 'bzr ignored'. Para detalhes sobre\n"
152
"alterações em arquivos texto, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:249
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note que --short ou -S oferecem sinalizadores de status para cada item, "
161
"similar\n"
162
"ao comando status do Subversion. Para obter uma saída semelhante ao svn -q,\n"
163
"use bzr status -SV."
164
165
#: bzrlib/builtins.py:253
166
msgid ""
167
"If no arguments are specified, the status of the entire working\n"
168
"directory is shown. Otherwise, only the status of the specified\n"
169
"files or directories is reported. If a directory is given, status\n"
170
"is reported for everything inside that directory."
171
msgstr ""
172
"Se nenhum argumento for especificado, o status total do diretório\n"
173
"de trabalho é mostrado. Caso contrário, apenas o status do arquivo\n"
174
"ou diretório especificado é relatado. Se um diretório for passado, o\n"
175
"status é relatado para tudo dentro deste diretório."
176
177
#: bzrlib/builtins.py:258
178
msgid ""
179
"Before merges are committed, the pending merge tip revisions are\n"
180
"shown. To see all pending merge revisions, use the -v option.\n"
181
"To skip the display of pending merge information altogether, use\n"
182
"the no-pending option or specify a file/directory."
183
msgstr ""
184
"Antes de mesclar são enviadas, as revisões pendentes do ponto de mesclagem\n"
185
"mostrado. Para ver todas as revisões pendentes da mesclagem, use a opção -"
186
"v.\n"
187
"Para ignorar a exibição de pendência de informações e fundir completamente, "
188
"use\n"
189
"a opção no-pending ou especifique um arquivo/diretório."
190
191
#: bzrlib/builtins.py:263
192
msgid ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
msgstr ""
196
"Para comparar o diretório de trabalho com uma revisão específica,\n"
197
"passe uma simples revisão como argumento."
198
199
#: bzrlib/builtins.py:266
200
msgid ""
201
"To see which files have changed in a specific revision, or between\n"
202
"two revisions, pass a revision range to the revision argument.\n"
203
"This will produce the same results as calling 'bzr diff --summarize'."
204
msgstr ""
205
"Para ver quais arquivos foram alterados em uma revisão específica, ou entre\n"
206
"duas revisões, passe uma intervalo de revisões como argumento.\n"
207
"Isto irá produzir os mesmos resultados de 'bzr diff --summarize'."
208
209
#: bzrlib/builtins.py:275
210
msgid "Use short status indicators."
211
msgstr "Use indicadores de status curto."
212
213
#: bzrlib/builtins.py:277
214
msgid "Only show versioned files."
215
msgstr "Mostrar apenas arquivos versionados."
216
217
#: bzrlib/builtins.py:279
218
msgid "Don't show pending merges."
219
msgstr "Não mostrar mesclagens pendentes."
220
221
#: bzrlib/builtins.py:282
222
msgid "Do not mark object type using indicator."
223
msgstr "Não marque o tipo do objeto através do indicador."
224
225
#: bzrlib/builtins.py:297
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
227
msgstr ""
228
"bzr status --revision produz exatamente um ou dois especificadores de revisão"
229
230
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
231
msgid "You can only supply one of revision_id or --revision"
232
msgstr "Você só pode fornecer um entre revision_id e --revision"
233
234
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
235
msgid "You must supply either --revision or a revision_id"
236
msgstr "Você deve fornecer qualquer um entre --revision e revision_id"
237
238
#: bzrlib/builtins.py:351
239
#, python-format
240
msgid "Repository %r does not support access to raw revision texts"
241
msgstr "O repositório %r não suporta acesso a textos de revisão tipo raw"
242
243
#: bzrlib/builtins.py:362
244
msgid "The repository {0} contains no revision {1}."
245
msgstr "O repositório {0} não contém revisão {1}."
246
247
#: bzrlib/builtins.py:369
248
msgid "You cannot specify a NULL revision."
249
msgstr "Você não pode especificar uma revisão NULL."
250
251
#: bzrlib/builtins.py:461
252
msgid "Remove the working tree from a given branch/checkout."
253
msgstr ""
254
"Remover a árvore de trabalho a partir de um determinado ramo/projeto obtido."
255
256
#: bzrlib/builtins.py:463
257
msgid ""
258
"Since a lightweight checkout is little more than a working tree\n"
259
"this will refuse to run against one."
260
msgstr ""
261
262
#: bzrlib/builtins.py:466
263
msgid "To re-create the working tree, use \"bzr checkout\"."
264
msgstr "Para recriar a árvore de trabalho, use \"bzr checkout\"."
265
266
#: bzrlib/builtins.py:472
267
msgid ""
268
"Remove the working tree even if it has uncommitted or shelved changes."
269
msgstr ""
270
"Remover a árvore de trabalho, mesmo que tenha mudanças não confirmadas ou "
271
"arquivadas."
272
273
#: bzrlib/builtins.py:486
274
msgid "No working tree to remove"
275
msgstr "Nenhuma árvore de trabalho para remover"
276
277
#: bzrlib/builtins.py:488
278
msgid "You cannot remove the working tree of a remote path"
279
msgstr "Você não pode remover a árvore de trabalho de um caminho remoto"
280
281
#: bzrlib/builtins.py:497
282
msgid "You cannot remove the working tree from a lightweight checkout"
283
msgstr "Você não pode remover a árvore de trabalho de um projeto importado"
284
285
#: bzrlib/builtins.py:537
286
msgid ""
287
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
288
"instead. Use \"--force\" if you are sure you want to reset the working tree."
289
msgstr ""
290
"A árvore não parece estar corrompida. Você provavelmente vai querer usar "
291
"\"bzr reverter\" como alternativa. Use \"--force\" se você tem certeza que "
292
"deseja redefinir a árvore de trabalho."
293
294
#: bzrlib/builtins.py:548
295
msgid ""
296
", the header appears corrupt, try passing -r -1 to set the state to the last "
297
"commit"
298
msgstr ""
299
", o cabeçalho parece estar corrompido, tente passar -r -1 para definir o "
300
"estado como última submissão"
301
302
#: bzrlib/builtins.py:552
303
msgid "failed to reset the tree state{0}"
304
msgstr "falhou para redefinir o estado da árvore{0}"
305
306
#: bzrlib/builtins.py:556
307
msgid "Show current revision number."
308
msgstr "Mostrar o número da revisão atual."
309
310
#: bzrlib/builtins.py:558
311
msgid "This is equal to the number of revisions on this branch."
312
msgstr "Este é equivalente ao número de revisões no ramo."
313
314
#: bzrlib/builtins.py:571
315
msgid "--tree and --revision can not be used together"
316
msgstr "--tre e --revision não podem ser usados juntos"
317
318
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
319
msgid "Tags can only be placed on a single revision, not on a range"
320
msgstr ""
321
"Tags podem apenas serem colocadas em uma revisão simples, não em um intervalo"
322
323
#: bzrlib/builtins.py:612
324
msgid "Show revno of working tree."
325
msgstr "Mostrar número de revisão da árvore de trabalho."
326
327
#: bzrlib/builtins.py:660
328
msgid "Add specified files or directories."
329
msgstr "Adicionar arquivos ou diretórios especificados."
330
331
#: bzrlib/builtins.py:662
332
msgid ""
333
"In non-recursive mode, all the named items are added, regardless\n"
334
"of whether they were previously ignored. A warning is given if\n"
335
"any of the named files are already versioned."
336
msgstr ""
337
"Em modo não-recursivo, todos os itens nomeados são adicionados, \n"
338
"independentemente de terem sido anteriormente ignorados. Um aviso \n"
339
"é dado se qualquer um dos arquivos nomeados já estiverem versionados."
340
341
#: bzrlib/builtins.py:666
342
msgid ""
343
"In recursive mode (the default), files are treated the same way\n"
344
"but the behaviour for directories is different. Directories that\n"
345
"are already versioned do not give a warning. All directories,\n"
346
"whether already versioned or not, are searched for files or\n"
347
"subdirectories that are neither versioned or ignored, and these\n"
348
"are added. This search proceeds recursively into versioned\n"
349
"directories. If no names are given '.' is assumed."
350
msgstr ""
351
"No modo recursivo (o padrão), os arquivos são tratados da mesma maneira\n"
352
"mas o comportamento é diferente para os diretórios. Os diretórios que\n"
353
"já estão versionados não dão um aviso. Todos os diretórios, já versionado \n"
354
"ou não, são pesquisados para que arquivos ou subdiretórios que não \n"
355
"são de nenhuma versão ou foram ignorados, possam ser adicionados. \n"
356
"Esta pesquisa ocorre recursivamente dentro de diretórios \n"
357
"versionados. Se nenhum nome é dado '.' é assumido."
358
359
#: bzrlib/builtins.py:674
360
msgid ""
361
"A warning will be printed when nested trees are encountered,\n"
362
"unless they are explicitly ignored."
363
msgstr ""
364
"Um alerta será impresso quando árvores aninhadas forem encontradas,\n"
365
"exceto que seja explicitamente ignorado."
366
367
#: bzrlib/builtins.py:677
368
msgid ""
369
"Therefore simply saying 'bzr add' will version all files that\n"
370
"are currently unknown."
371
msgstr ""
372
"Portanto, dizendo simplesmente 'bzr add' assumimos que a \n"
373
"versão de todos os arquivos são atualmente desconhecidas."
374
375
#: bzrlib/builtins.py:680
376
msgid ""
377
"Adding a file whose parent directory is not versioned will\n"
378
"implicitly add the parent, and so on up to the root. This means\n"
379
"you should never need to explicitly add a directory, they'll just\n"
380
"get added when you add a file in the directory."
381
msgstr ""
382
"Adicionar um arquivo cujo diretório pai não é versionado irá\n"
383
"implicitamente adicionar o diretório pai, e assim por diante até a raiz. "
384
"Isto significa\n"
385
"que você nunca precisará adicionar explicitamente um diretório, eles apenas\n"
386
"serão adicionados quando você adicionar um arquivo no diretório."
387
388
#: bzrlib/builtins.py:685
389
msgid ""
390
"--dry-run will show which files would be added, but not actually\n"
391
"add them."
392
msgstr ""
393
"--dry-run irá mostrar quais arquivos deveriam ser adicionados, mas na "
394
"verdade\n"
395
"não os adiciona."
396
397
#: bzrlib/builtins.py:688
398
msgid ""
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
"It looks up ids trying to find a matching parent directory with the\n"
401
"same filename, and then by pure path. This option is rarely needed\n"
402
"but can be useful when adding the same logical file into two\n"
403
"branches that will be merged later (without showing the two different\n"
404
"adds as a conflict). It is also useful when merging another project\n"
405
"into a subdirectory of this one."
406
msgstr ""
407
"--file-ids-from tentará usar os ids de arquivo do caminho fornecido.\n"
408
"Procura ids tentando encontrar um diretório pai correspondente com\n"
409
"o mesmo nome, e depois pelo caminho absoluto. Esta opção é raramente \n"
410
"necessária mas pode ser útil quando adicionar o mesmo arquivo lógico em \n"
411
"duas ramificações que serão mescladas mais tarde (sem mostrar as duas "
412
"adições \n"
413
"como conflitos). Isto também pode ser útil quando estiver mesclando outro \n"
414
"projeto dentro de um subdiretório deste."
415
416
#: bzrlib/builtins.py:696
417
msgid ""
418
"Any files matching patterns in the ignore list will not be added\n"
419
"unless they are explicitly mentioned."
420
msgstr ""
421
"Quaisquer arquivos correspondentes com o padrão na lista ignorar não serão "
422
"adicionados\n"
423
"a menos que eles sejam explicitamente mencionados."
424
425
#: bzrlib/builtins.py:699
426
msgid ""
427
"In recursive mode, files larger than the configuration option \n"
428
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
429
"to file size."
430
msgstr ""
431
"No modo recursivo, arquivos maiores do que a opção de configuração \n"
432
"add.maximum_file_size serão pulados. Itens nomeados nunca são pulados\n"
433
"devido ao tamanho do arquivo."
434
435
#: bzrlib/builtins.py:706
436
msgid "Don't recursively add the contents of directories."
437
msgstr "Não adiciona recursivamente o conteúdo dos diretórios."
438
439
#: bzrlib/builtins.py:712
440
msgid "Lookup file ids from this tree."
441
msgstr "Pesquisa de arquivo por ids nesta árvore"
442
443
#: bzrlib/builtins.py:748
444
msgid "ignored {0} matching \"{1}\"\n"
445
msgstr "ignorado {0} correspondente a \"{1}\"\n"
446
447
#: bzrlib/builtins.py:753
448
msgid "Create a new versioned directory."
449
msgstr "Criar um novo diretório versionado."
450
451
#: bzrlib/builtins.py:755
452
msgid "This is equivalent to creating the directory and then adding it."
453
msgstr "Isto é equivalente a criar o diretório e depois adicioná-lo."
454
455
#: bzrlib/builtins.py:762
456
msgid "No error if existing, make parent directories as needed."
457
msgstr ""
458
459
#: bzrlib/builtins.py:796
460
#, python-format
461
msgid "added %s\n"
462
msgstr "%s adicionado\n"
463
464
#: bzrlib/builtins.py:838
465
#, python-format
466
msgid "invalid kind %r specified"
467
msgstr "tipo especificado %r é inválido"
468
469
#: bzrlib/builtins.py:875
470
msgid "Move or rename a file."
471
msgstr "Mover ou renomear um arquivo."
472
473
#: bzrlib/builtins.py:877
474
msgid " bzr mv SOURCE... DESTINATION"
475
msgstr " bzr mv ORIGEM... DESTINO"
476
477
#: bzrlib/builtins.py:879
478
msgid ""
479
"If the last argument is a versioned directory, all the other names\n"
480
"are moved into it. Otherwise, there must be exactly two arguments\n"
481
"and the file is changed to a new name."
482
msgstr ""
483
"Se o último argumento é um diretório versionado, todos os outros nomes\n"
484
"são movidos para ele. Caso contrário, deve haver exatamente dois argumentos\n"
485
"e o arquivo é alterado para um novo nome."
486
487
#: bzrlib/builtins.py:883
488
msgid ""
489
"If OLDNAME does not exist on the filesystem but is versioned and\n"
490
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
491
"assumes that the file has been manually moved and only updates\n"
492
"its internal inventory to reflect that change.\n"
493
"The same is valid when moving many SOURCE files to a DESTINATION."
494
msgstr ""
495
"Se NOMEANTIGO não existe no sistema de arquivos, mas é versionado e\n"
496
"NOVONAME existe no sistema de arquivos, mas não é versionado, mv\n"
497
"assume que o arquivo foi movido manualmente e atualiza apenas\n"
498
"seu inventário interno para refletir essa mudança. O mesmo é válido \n"
499
"quando se deslocam muitos arquivos de ORIGEM para um DESTINO."
500
501
#: bzrlib/builtins.py:889
502
msgid "Files cannot be moved between branches."
503
msgstr "Os arquivos não podem ser movidos entre os ramos."
504
505
#: bzrlib/builtins.py:896
506
msgid ""
507
"Move only the bzr identifier of the file, because the file has already been "
508
"moved."
509
msgstr ""
510
"Mover apenas o identificador bzr do arquivo, porque o arquivo já foi movido."
511
512
#: bzrlib/builtins.py:898
513
msgid "Automatically guess renames."
514
msgstr "Prever que será renomeado automaticamente."
515
516
#: bzrlib/builtins.py:899
517
msgid "Avoid making changes when guessing renames."
518
msgstr "Evite fazer alterações quando prever que será renomeado."
519
520
#: bzrlib/builtins.py:908
521
msgid "--dry-run requires --auto."
522
msgstr "--dry-run requer --auto."
523
524
#: bzrlib/builtins.py:912
525
msgid "missing file argument"
526
msgstr "falta argumento de arquivo"
527
528
#: bzrlib/builtins.py:916
529
msgid "can not move root of branch"
530
msgstr "não é possível mover a raiz do ramo"
531
532
#: bzrlib/builtins.py:922
533
msgid "Only one path may be specified to --auto."
534
msgstr "Apenas um caminho deve ser especificado para --auto."
535
536
#: bzrlib/builtins.py:925
537
msgid "--after cannot be specified with --auto."
538
msgstr "--after não pode ser especificado com --auto."
539
540
#: bzrlib/builtins.py:962
541
msgid "to mv multiple files the destination must be a versioned directory"
542
msgstr ""
543
"para mover múltiplos arquivos, o destino deve ser um diretório versionado"
544
545
#: bzrlib/builtins.py:1014
546
msgid "Turn this branch into a mirror of another branch."
547
msgstr "Transformar esse ramo em um espelho de outro ramo."
548
549
#: bzrlib/builtins.py:1016
550
msgid ""
551
"By default, this command only works on branches that have not diverged.\n"
552
"Branches are considered diverged if the destination branch's most recent \n"
553
"commit is one that has not been merged (directly or indirectly) into the \n"
554
"parent."
555
msgstr ""
556
"Por padrão, este comando só funciona em ramos não divergentes.\n"
557
"Ramos são considerados não divergentes se o ramo de destino mais \n"
558
"recentemente submetido é aquele que não foi mesclado (direta ou \n"
559
"indiretamente) para o pai."
560
561
#: bzrlib/builtins.py:1021
562
msgid ""
563
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
564
"from one into the other. Once one branch has merged, the other should\n"
565
"be able to pull it again."
566
msgstr ""
567
"Se os ramos divergiram, você pode usar 'bzr merge' para mesclar as "
568
"alterações\n"
569
"de um para o outro. Uma vez que um ramo se fundiu, o outro deve\n"
570
"ser capaz de puxá-lo novamente."
571
572
#: bzrlib/builtins.py:1025
573
msgid ""
574
"If you want to replace your local changes and just want your branch to\n"
575
"match the remote one, use pull --overwrite. This will work even if the two\n"
576
"branches have diverged."
577
msgstr ""
578
"Se você quer substituir suas alterações locais e quer apenas a sua "
579
"ramificação\n"
580
"para corresponder com a remota, use pull --overwrite. Isto funcionará mesmo "
581
"se\n"
582
"as duas ramificações divergiram."
583
584
#: bzrlib/builtins.py:1029
585
msgid ""
586
"If there is no default location set, the first pull will set it (use\n"
587
"--no-remember to avoid setting it). After that, you can omit the\n"
588
"location to use the default. To change the default, use --remember. The\n"
589
"value will only be saved if the remote location can be accessed."
590
msgstr ""
591
"Se não estiver definido a localização padrão, na primeira vez que o projeto "
592
"for puxado será definido (use \n"
593
"--no-remember para evitar isso). Após isso, você pode omitir a localização\n"
594
"para usar o padrão. Para alterar o padrão, use --remember. O valor será\n"
595
"salvo apenas se o local remoto puder ser acessado."
596
597
#: bzrlib/builtins.py:1034
598
msgid ""
599
"The --verbose option will display the revisions pulled using the log_format\n"
600
"configuration option. You can use a different format by overriding it with\n"
601
"-Olog_format=<other_format>."
602
msgstr ""
603
604
#: bzrlib/builtins.py:1038
605
msgid ""
606
"Note: The location can be specified either in the form of a branch,\n"
607
"or in the form of a path to a file containing a merge directive generated\n"
608
"with bzr send."
609
msgstr ""
610
"Nota: a localização pode ser especificada ou na forma de uma ramificação,\n"
611
"ou na forma de um caminho para um arquivo contendo uma diretiva\n"
612
"de mesclagem gerada com bzr send."
613
614
#: bzrlib/builtins.py:1046
615
msgid "Show logs of pulled revisions."
616
msgstr "Mostrar os logs de revisões puxadas."
617
618
#: bzrlib/builtins.py:1048
619
msgid ""
620
"Branch to pull into, rather than the one containing the working directory."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1051
624
msgid ""
625
"Perform a local pull in a bound branch. Local pulls are not applied to the "
626
"master branch."
627
msgstr ""
628
629
#: bzrlib/builtins.py:1080
630
msgid "Need working tree for --show-base."
631
msgstr "Necessário a árvore de trabalho para --show-base."
632
633
#: bzrlib/builtins.py:1096
634
msgid "No pull location known or specified."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1102
638
#, python-format
639
msgid "Using saved parent location: %s\n"
640
msgstr ""
641
642
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
643
msgid "Cannot use -r with merge directives or bundles"
644
msgstr ""
645
646
#: bzrlib/builtins.py:1150
647
msgid "Update a mirror of this branch."
648
msgstr "Atualização de um espelho deste ramo."
649
650
#: bzrlib/builtins.py:1152
651
msgid ""
652
"The target branch will not have its working tree populated because this\n"
653
"is both expensive, and is not supported on remote file systems."
654
msgstr ""
655
656
#: bzrlib/builtins.py:1155
657
msgid ""
658
"Some smart servers or protocols *may* put the working tree in place in\n"
659
"the future."
660
msgstr ""
661
"Alguns servidores inteligentes ou protocolos * pode * colocar a árvore de "
662
"trabalho em vigor no\n"
663
"futuro."
664
665
#: bzrlib/builtins.py:1158
666
msgid ""
667
"This command only works on branches that have not diverged. Branches are\n"
668
"considered diverged if the destination branch's most recent commit is one\n"
669
"that has not been merged (directly or indirectly) by the source branch."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1162
673
msgid ""
674
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
675
"the other branch completely, discarding its unmerged changes."
676
msgstr ""
677
678
#: bzrlib/builtins.py:1165
679
msgid ""
680
"If you want to ensure you have the different changes in the other branch,\n"
681
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
682
"After that you will be able to do a push without '--overwrite'."
683
msgstr ""
684
685
#: bzrlib/builtins.py:1169
686
msgid ""
687
"If there is no default push location set, the first push will set it (use\n"
688
"--no-remember to avoid setting it). After that, you can omit the\n"
689
"location to use the default. To change the default, use --remember. The\n"
690
"value will only be saved if the remote location can be accessed."
691
msgstr ""
692
693
#: bzrlib/builtins.py:1174
694
msgid ""
695
"The --verbose option will display the revisions pushed using the log_format\n"
696
"configuration option. You can use a different format by overriding it with\n"
697
"-Olog_format=<other_format>."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
701
msgid ""
702
"Branch to push from, rather than the one containing the working directory."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1188
706
msgid ""
707
"By default push will fail if the target directory exists, but does not "
708
"already have a control directory. This flag will allow push to proceed."
709
msgstr ""
710
711
#: bzrlib/builtins.py:1193
712
msgid ""
713
"Create a stacked branch that references the public location of the parent "
714
"branch."
715
msgstr ""
716
717
#: bzrlib/builtins.py:1196
718
msgid ""
719
"Create a stacked branch that refers to another branch for the commit "
720
"history. Only the work not present in the referenced branch is included in "
721
"the branch created."
722
msgstr ""
723
724
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
725
msgid ""
726
"Refuse to push if there are uncommitted changes in the working tree, --no-"
727
"strict disables the check."
728
msgstr ""
729
730
#: bzrlib/builtins.py:1204
731
msgid "Don't populate the working tree, even for protocols that support it."
732
msgstr ""
733
734
#: bzrlib/builtins.py:1248
735
msgid "Could not determine branch to refer to."
736
msgstr ""
737
738
#: bzrlib/builtins.py:1257
739
#, python-format
740
msgid ""
741
"No push location known or specified. To push to the parent branch (at %s), "
742
"use 'bzr push :parent'."
743
msgstr ""
744
745
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
746
msgid "No push location known or specified."
747
msgstr ""
748
749
#: bzrlib/builtins.py:1267
750
#, python-format
751
msgid "Using saved push location: %s"
752
msgstr ""
753
754
#: bzrlib/builtins.py:1277
755
msgid "Create a new branch that is a copy of an existing branch."
756
msgstr ""
757
758
#: bzrlib/builtins.py:1279
759
msgid ""
760
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
761
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
762
"./bar.\n"
763
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
764
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
765
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
766
"create ./foo-bar."
767
msgstr ""
768
769
#: bzrlib/builtins.py:1286
770
msgid ""
771
"To retrieve the branch as of a particular revision, supply the --revision\n"
772
"parameter, as in \"branch foo/bar -r 5\"."
773
msgstr ""
774
775
#: bzrlib/builtins.py:1289
776
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
777
msgstr ""
778
779
#: bzrlib/builtins.py:1299
780
msgid "Create a branch without a working-tree."
781
msgstr ""
782
783
#: bzrlib/builtins.py:1301
784
msgid "Switch the checkout in the current directory to the new branch."
785
msgstr ""
786
787
#: bzrlib/builtins.py:1304
788
msgid ""
789
"Create a stacked branch referring to the source branch. The new branch will "
790
"depend on the availability of the source branch for all operations."
791
msgstr ""
792
793
#: bzrlib/builtins.py:1308
794
msgid "Do not use a shared repository, even if available."
795
msgstr "Não utilizar um repositório compartilhado, mesmo se disponível."
796
797
#: bzrlib/builtins.py:1310
798
msgid ""
799
"By default branch will fail if the target directory exists, but does not "
800
"already have a control directory. This flag will allow branch to proceed."
801
msgstr ""
802
803
#: bzrlib/builtins.py:1315
804
msgid "Bind new branch to from location."
805
msgstr ""
806
807
#: bzrlib/builtins.py:1362
808
#, python-format
809
msgid "Target directory \"%s\" already exists."
810
msgstr ""
811
812
#: bzrlib/builtins.py:1374
813
#, python-format
814
msgid "Parent of \"%s\" does not exist."
815
msgstr ""
816
817
#: bzrlib/builtins.py:1393
818
msgid "The branch {0} has no revision {1}."
819
msgstr ""
820
821
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
822
#, python-format
823
msgid "Created new stacked branch referring to %s."
824
msgstr ""
825
826
#: bzrlib/builtins.py:1407
827
#, python-format
828
msgid "Branched %d revision."
829
msgid_plural "Branched %d revisions."
830
msgstr[0] ""
831
msgstr[1] ""
832
833
#: bzrlib/builtins.py:1412
834
#, python-format
835
msgid "New branch bound to %s"
836
msgstr ""
837
838
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
839
#, python-format
840
msgid "Switched to branch: %s"
841
msgstr ""
842
843
#: bzrlib/builtins.py:1422
844
msgid "List the branches available at the current location."
845
msgstr ""
846
847
#: bzrlib/builtins.py:1424
848
msgid ""
849
"This command will print the names of all the branches at the current\n"
850
"location."
851
msgstr ""
852
853
#: bzrlib/builtins.py:1431
854
msgid ""
855
"Recursively scan for branches rather than just looking in the specified "
856
"location."
857
msgstr ""
858
859
#: bzrlib/builtins.py:1461
860
msgid "(default)"
861
msgstr ""
862
863
#: bzrlib/builtins.py:1473
864
msgid "Create a new checkout of an existing branch."
865
msgstr ""
866
867
#: bzrlib/builtins.py:1475
868
msgid ""
869
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
870
"for\n"
871
"the branch found in '.'. This is useful if you have removed the working "
872
"tree\n"
873
"or if it was never created - i.e. if you pushed the branch to its current\n"
874
"location using SFTP."
875
msgstr ""
876
877
#: bzrlib/builtins.py:1480
878
msgid ""
879
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
880
"will\n"
881
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
882
"./bar.\n"
883
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
884
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
885
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
886
"create ./foo-bar."
887
msgstr ""
888
889
#: bzrlib/builtins.py:1487
890
msgid ""
891
"To retrieve the branch as of a particular revision, supply the --revision\n"
892
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
893
"immediately\n"
894
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
895
"old\n"
896
"code.)"
897
msgstr ""
898
899
#: bzrlib/builtins.py:1497
900
msgid ""
901
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
902
"the branch for every operation. Normal checkouts can perform common "
903
"operations like diff and status without such access, and also support local "
904
"commits."
905
msgstr ""
906
907
#: bzrlib/builtins.py:1504
908
msgid "Get file contents from this tree."
909
msgstr ""
910
911
#: bzrlib/builtins.py:1506
912
msgid "Hard-link working tree files where possible."
913
msgstr ""
914
915
#: bzrlib/builtins.py:1547
916
msgid ""
917
"Show list of renamed files.\n"
918
" "
919
msgstr ""
920
921
#: bzrlib/builtins.py:1577
922
msgid "Update a working tree to a new revision."
923
msgstr ""
924
925
#: bzrlib/builtins.py:1579
926
msgid ""
927
"This will perform a merge of the destination revision (the tip of the\n"
928
"branch, or the specified revision) into the working tree, and then make\n"
929
"that revision the basis revision for the working tree. "
930
msgstr ""
931
932
#: bzrlib/builtins.py:1583
933
msgid ""
934
"You can use this to visit an older revision, or to update a working tree\n"
935
"that is out of date from its branch."
936
msgstr ""
937
938
#: bzrlib/builtins.py:1586
939
msgid ""
940
"If there are any uncommitted changes in the tree, they will be carried\n"
941
"across and remain as uncommitted changes after the update. To discard\n"
942
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
943
"with the changes brought in by the change in basis revision."
944
msgstr ""
945
946
#: bzrlib/builtins.py:1591
947
msgid ""
948
"If the tree's branch is bound to a master branch, bzr will also update\n"
949
"the branch from the master."
950
msgstr ""
951
952
#: bzrlib/builtins.py:1594
953
msgid ""
954
"You cannot update just a single file or directory, because each Bazaar\n"
955
"working tree has just a single basis revision. If you want to restore a\n"
956
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
957
"update'. If you want to restore a file to its state in a previous\n"
958
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
959
"out the old content of that file to a new location."
960
msgstr ""
961
962
#: bzrlib/builtins.py:1601
963
msgid ""
964
"The 'dir' argument, if given, must be the location of the root of a\n"
965
"working tree to update. By default, the working tree that contains the \n"
966
"current working directory is used."
967
msgstr ""
968
969
#: bzrlib/builtins.py:1617
970
msgid "bzr update --revision takes exactly one revision"
971
msgstr ""
972
973
#: bzrlib/builtins.py:1625
974
msgid "bzr update can only update a whole tree, not a file or subdirectory"
975
msgstr ""
976
977
#: bzrlib/builtins.py:1656
978
msgid "Tree is up to date at revision {0} of branch {1}"
979
msgstr ""
980
981
#: bzrlib/builtins.py:1672
982
#, python-format
983
msgid ""
984
"branch has no revision %s\n"
985
"bzr update --revision only works for a revision in the branch history"
986
msgstr ""
987
988
#: bzrlib/builtins.py:1678
989
msgid "Updated to revision {0} of branch {1}"
990
msgstr ""
991
992
#: bzrlib/builtins.py:1682
993
msgid ""
994
"Your local commits will now show as pending merges with 'bzr status', and "
995
"can be committed with 'bzr commit'."
996
msgstr ""
997
998
#: bzrlib/builtins.py:1691
999
msgid "Show information about a working tree, branch or repository."
1000
msgstr ""
1001
1002
#: bzrlib/builtins.py:1693
1003
msgid ""
1004
"This command will show all known locations and formats associated to the\n"
1005
"tree, branch or repository."
1006
msgstr ""
1007
1008
#: bzrlib/builtins.py:1696
1009
msgid ""
1010
"In verbose mode, statistical information is included with each report.\n"
1011
"To see extended statistic information, use a verbosity level of 2 or\n"
1012
"higher by specifying the verbose option multiple times, e.g. -vv."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1700
1016
msgid "Branches and working trees will also report any missing revisions."
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
1020
#: bzrlib/builtins.py:6389
1021
msgid ":Examples:"
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:1704
1025
msgid " Display information on the format and related locations:"
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1706
1029
msgid " bzr info"
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:1708
1033
msgid ""
1034
" Display the above together with extended format information and\n"
1035
" basic statistics (like the number of files in the working tree and\n"
1036
" number of revisions in the branch and repository):"
1037
msgstr ""
1038
1039
#: bzrlib/builtins.py:1712
1040
msgid " bzr info -v"
1041
msgstr ""
1042
1043
#: bzrlib/builtins.py:1714
1044
msgid " Display the above together with number of committers to the branch:"
1045
msgstr ""
1046
1047
#: bzrlib/builtins.py:1716
1048
msgid " bzr info -vv"
1049
msgstr ""
1050
1051
#: bzrlib/builtins.py:1735
1052
msgid "Remove files or directories."
1053
msgstr ""
1054
1055
#: bzrlib/builtins.py:1737
1056
msgid ""
1057
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1058
"delete them if they can easily be recovered using revert otherwise they\n"
1059
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1060
"parameters are given Bazaar will scan for files that are being tracked by\n"
1061
"Bazaar but missing in your tree and stop tracking them for you."
1062
msgstr ""
1063
1064
#: bzrlib/builtins.py:1745
1065
msgid "Only remove files that have never been committed."
1066
msgstr ""
1067
1068
#: bzrlib/builtins.py:1747
1069
msgid "The file deletion mode to be used."
1070
msgstr ""
1071
1072
#: bzrlib/builtins.py:1748
1073
msgid "Deletion Strategy"
1074
msgstr ""
1075
1076
#: bzrlib/builtins.py:1749
1077
msgid "Backup changed files (default)."
1078
msgstr ""
1079
1080
#: bzrlib/builtins.py:1750
1081
msgid "Delete from bzr but leave the working copy."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:1751
1085
msgid "Don't backup changed files."
1086
msgstr ""
1087
1088
#: bzrlib/builtins.py:1752
1089
msgid ""
1090
"Delete all the specified files, even if they can not be recovered and even "
1091
"if they are non-empty directories. (deprecated, use no-backup)"
1092
msgstr ""
1093
1094
#: bzrlib/builtins.py:1761
1095
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:1778
1099
msgid "No matching files."
1100
msgstr ""
1101
1102
#: bzrlib/builtins.py:1839
1103
msgid "Reconcile bzr metadata in a branch."
1104
msgstr ""
1105
1106
#: bzrlib/builtins.py:1841
1107
msgid ""
1108
"This can correct data mismatches that may have been caused by\n"
1109
"previous ghost operations or bzr upgrades. You should only\n"
1110
"need to run this command if 'bzr check' or a bzr developer\n"
1111
"advises you to run it."
1112
msgstr ""
1113
1114
#: bzrlib/builtins.py:1846
1115
msgid ""
1116
"If a second branch is provided, cross-branch reconciliation is\n"
1117
"also attempted, which will check that data like the tree root\n"
1118
"id which was not present in very early bzr versions is represented\n"
1119
"correctly in both branches."
1120
msgstr ""
1121
1122
#: bzrlib/builtins.py:1851
1123
msgid ""
1124
"At the same time it is run it may recompress data resulting in\n"
1125
"a potential saving in disk space or performance gain."
1126
msgstr ""
1127
1128
#: bzrlib/builtins.py:1854
1129
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1130
msgstr ""
1131
1132
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1133
msgid ""
1134
"Format for the bzr 2.0 series.\n"
1135
"Uses group-compress storage.\n"
1136
"Provides rich roots which are a one-way transition.\n"
1137
msgstr ""
1138
1139
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1140
msgid ""
1141
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1142
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1143
msgstr ""
1144
1145
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1146
msgid "The 2a format with experimental support for colocated branches.\n"
1147
msgstr ""
1148
1149
#: bzrlib/builtins.py:1922
1150
msgid "Make a directory into a versioned branch."
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:1924
1154
msgid ""
1155
"Use this to create an empty branch, or before importing an\n"
1156
"existing project."
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:1927
1160
msgid ""
1161
"If there is a repository in a parent directory of the location, then\n"
1162
"the history of the branch will be stored in the repository. Otherwise\n"
1163
"init creates a standalone branch which carries its own history\n"
1164
"in the .bzr directory."
1165
msgstr ""
1166
1167
#: bzrlib/builtins.py:1932
1168
msgid ""
1169
"If there is already a branch at the location but it has no working tree,\n"
1170
"the tree can be populated with 'bzr checkout'."
1171
msgstr ""
1172
1173
#: bzrlib/builtins.py:1935
1174
msgid "Recipe for importing a tree of files::"
1175
msgstr ""
1176
1177
#: bzrlib/builtins.py:1937
1178
msgid ""
1179
" cd ~/project\n"
1180
" bzr init\n"
1181
" bzr add .\n"
1182
" bzr status\n"
1183
" bzr commit -m \"imported project\""
1184
msgstr ""
1185
1186
#: bzrlib/builtins.py:1948
1187
msgid ""
1188
"Create the path leading up to the branch if it does not already exist."
1189
msgstr ""
1190
1191
#: bzrlib/builtins.py:1951
1192
msgid "Specify a format for this branch. See \"help formats\"."
1193
msgstr ""
1194
1195
#: bzrlib/builtins.py:1959
1196
msgid ""
1197
"Never change revnos or the existing log. Append revisions to it only."
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:1962
1201
msgid "Create a branch without a working tree."
1202
msgstr ""
1203
1204
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1205
#, python-format
1206
msgid ""
1207
"Parent directory of %s does not exist.\n"
1208
"You may supply --create-prefix to create all leading parent directories."
1209
msgstr ""
1210
1211
#: bzrlib/builtins.py:2016
1212
msgid ""
1213
"This branch format cannot be set to append-revisions-only. Try --default."
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2027
1217
msgid "Created a {0} (format: {1})\n"
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2036
1221
#, python-format
1222
msgid "Using shared repository: %s\n"
1223
msgstr ""
1224
1225
#: bzrlib/builtins.py:2040
1226
msgid "Create a shared repository for branches to share storage space."
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2042
1230
msgid ""
1231
"New branches created under the repository directory will store their\n"
1232
"revisions in the repository, not in the branch directory. For branches\n"
1233
"with shared history, this reduces the amount of storage needed and \n"
1234
"speeds up the creation of new branches."
1235
msgstr ""
1236
1237
#: bzrlib/builtins.py:2047
1238
msgid ""
1239
"If the --no-trees option is given then the branches in the repository\n"
1240
"will not have working trees by default. They will still exist as \n"
1241
"directories on disk, but they will not have separate copies of the \n"
1242
"files at a certain revision. This can be useful for repositories that\n"
1243
"store branches which are interacted with through checkouts or remote\n"
1244
"branches, such as on a server."
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2054
1248
msgid ""
1249
":Examples:\n"
1250
" Create a shared repository holding just branches::"
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2057
1254
msgid ""
1255
" bzr init-repo --no-trees repo\n"
1256
" bzr init repo/trunk"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2060
1260
msgid " Make a lightweight checkout elsewhere::"
1261
msgstr ""
1262
1263
#: bzrlib/builtins.py:2062
1264
msgid ""
1265
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1266
" cd trunk-checkout\n"
1267
" (add files here)"
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2070
1271
msgid ""
1272
"Specify a format for this repository. See \"bzr help formats\" for details."
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2074
1276
msgid "Repository format"
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2076
1280
msgid "Branches in the repository will default to not having a working tree."
1281
msgstr ""
1282
1283
#: bzrlib/builtins.py:2102
1284
msgid "Show differences in the working tree, between revisions or branches."
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2104
1288
msgid ""
1289
"If no arguments are given, all changes for the current tree are listed.\n"
1290
"If files are given, only the changes in those files are listed.\n"
1291
"Remote and multiple branches can be compared by using the --old and\n"
1292
"--new options. If not provided, the default for both is derived from\n"
1293
"the first argument, if any, or the current tree if no arguments are\n"
1294
"given."
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2111
1298
msgid ""
1299
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1300
"produces patches suitable for \"patch -p1\"."
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2114
1304
msgid ""
1305
"Note that when using the -r argument with a range of revisions, the\n"
1306
"differences are computed between the two specified revisions. That\n"
1307
"is, the command does not show the changes introduced by the first \n"
1308
"revision in the range. This differs from the interpretation of \n"
1309
"revision ranges used by \"bzr log\" which includes the first revision\n"
1310
"in the range."
1311
msgstr ""
1312
1313
#: bzrlib/builtins.py:2121
1314
msgid ""
1315
":Exit values:\n"
1316
" 1 - changed\n"
1317
" 2 - unrepresentable changes\n"
1318
" 3 - error\n"
1319
" 0 - no change"
1320
msgstr ""
1321
1322
#: bzrlib/builtins.py:2127
1323
msgid ""
1324
":Examples:\n"
1325
" Shows the difference in the working tree versus the last commit::"
1326
msgstr ""
1327
1328
#: bzrlib/builtins.py:2130
1329
msgid " bzr diff"
1330
msgstr ""
1331
1332
#: bzrlib/builtins.py:2132
1333
msgid " Difference between the working tree and revision 1::"
1334
msgstr ""
1335
1336
#: bzrlib/builtins.py:2134
1337
msgid " bzr diff -r1"
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2136
1341
msgid " Difference between revision 3 and revision 1::"
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2138
1345
msgid " bzr diff -r1..3"
1346
msgstr ""
1347
1348
#: bzrlib/builtins.py:2140
1349
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1350
msgstr ""
1351
1352
#: bzrlib/builtins.py:2142
1353
msgid " bzr diff -r1..3 xxx"
1354
msgstr ""
1355
1356
#: bzrlib/builtins.py:2144
1357
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2146
1361
msgid " bzr diff -c2"
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2148
1365
msgid ""
1366
" To see the changes introduced by revision X::\n"
1367
" \n"
1368
" bzr diff -cX"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2152
1372
msgid ""
1373
" Note that in the case of a merge, the -c option shows the changes\n"
1374
" compared to the left hand parent. To see the changes against\n"
1375
" another parent, use::"
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2156
1379
msgid " bzr diff -r<chosen_parent>..X"
1380
msgstr ""
1381
1382
#: bzrlib/builtins.py:2158
1383
msgid ""
1384
" The changes between the current revision and the previous revision\n"
1385
" (equivalent to -c-1 and -r-2..-1)"
1386
msgstr ""
1387
1388
#: bzrlib/builtins.py:2161
1389
msgid " bzr diff -r-2.."
1390
msgstr ""
1391
1392
#: bzrlib/builtins.py:2163
1393
msgid " Show just the differences for file NEWS::"
1394
msgstr ""
1395
1396
#: bzrlib/builtins.py:2165
1397
msgid " bzr diff NEWS"
1398
msgstr ""
1399
1400
#: bzrlib/builtins.py:2167
1401
msgid " Show the differences in working tree xxx for file NEWS::"
1402
msgstr ""
1403
1404
#: bzrlib/builtins.py:2169
1405
msgid " bzr diff xxx/NEWS"
1406
msgstr ""
1407
1408
#: bzrlib/builtins.py:2171
1409
msgid " Show the differences from branch xxx to this working tree:"
1410
msgstr ""
1411
1412
#: bzrlib/builtins.py:2173
1413
msgid " bzr diff --old xxx"
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2175
1417
msgid " Show the differences between two branches for file NEWS::"
1418
msgstr ""
1419
1420
#: bzrlib/builtins.py:2177
1421
msgid " bzr diff --old xxx --new yyy NEWS"
1422
msgstr ""
1423
1424
#: bzrlib/builtins.py:2179
1425
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1426
msgstr ""
1427
1428
#: bzrlib/builtins.py:2181
1429
msgid ""
1430
" bzr diff --prefix old/:new/\n"
1431
" \n"
1432
" Show the differences using a custom diff program with options::\n"
1433
" \n"
1434
" bzr diff --using /usr/bin/diff --diff-options -wu"
1435
msgstr ""
1436
1437
#: bzrlib/builtins.py:2191
1438
msgid "Pass these options to the external diff program."
1439
msgstr ""
1440
1441
#: bzrlib/builtins.py:2194
1442
msgid ""
1443
"Set prefixes added to old and new filenames, as two values separated by a "
1444
"colon. (eg \"old/:new/\")."
1445
msgstr ""
1446
1447
#: bzrlib/builtins.py:2197
1448
msgid "Branch/tree to compare from."
1449
msgstr ""
1450
1451
#: bzrlib/builtins.py:2201
1452
msgid "Branch/tree to compare to."
1453
msgstr ""
1454
1455
#: bzrlib/builtins.py:2207
1456
msgid "Use this command to compare files."
1457
msgstr ""
1458
1459
#: bzrlib/builtins.py:2212
1460
msgid "Diff format to use."
1461
msgstr ""
1462
1463
#: bzrlib/builtins.py:2214
1464
msgid "Diff format"
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2236
1468
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1469
msgstr ""
1470
1471
#: bzrlib/builtins.py:2240
1472
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1473
msgstr ""
1474
1475
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1476
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1477
msgid "{0} and {1} are mutually exclusive"
1478
msgstr ""
1479
1480
#: bzrlib/builtins.py:2265
1481
msgid ""
1482
"List files deleted in the working tree.\n"
1483
" "
1484
msgstr ""
1485
1486
#: bzrlib/builtins.py:2343
1487
msgid "Show the tree root directory."
1488
msgstr ""
1489
1490
#: bzrlib/builtins.py:2345
1491
msgid ""
1492
"The root is the nearest enclosing directory with a .bzr control\n"
1493
"directory."
1494
msgstr ""
1495
1496
#: bzrlib/builtins.py:2360
1497
msgid "The limit argument must be an integer."
1498
msgstr ""
1499
1500
#: bzrlib/builtins.py:2368
1501
msgid "The levels argument must be an integer."
1502
msgstr ""
1503
1504
#: bzrlib/builtins.py:2373
1505
msgid "Show historical log for a branch or subset of a branch."
1506
msgstr ""
1507
1508
#: bzrlib/builtins.py:2375
1509
msgid ""
1510
"log is bzr's default tool for exploring the history of a branch.\n"
1511
"The branch to use is taken from the first parameter. If no parameters\n"
1512
"are given, the branch containing the working directory is logged.\n"
1513
"Here are some simple examples::"
1514
msgstr ""
1515
1516
#: bzrlib/builtins.py:2380
1517
msgid ""
1518
" bzr log log the current branch\n"
1519
" bzr log foo.py log a file in its branch\n"
1520
" bzr log http://server/branch log a branch on a server"
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2384
1524
msgid ""
1525
"The filtering, ordering and information shown for each revision can\n"
1526
"be controlled as explained below. By default, all revisions are\n"
1527
"shown sorted (topologically) so that newer revisions appear before\n"
1528
"older ones and descendants always appear before ancestors. If displayed,\n"
1529
"merged revisions are shown indented under the revision in which they\n"
1530
"were merged."
1531
msgstr ""
1532
1533
#: bzrlib/builtins.py:2391
1534
msgid ":Output control:"
1535
msgstr ""
1536
1537
#: bzrlib/builtins.py:2393
1538
msgid ""
1539
" The log format controls how information about each revision is\n"
1540
" displayed. The standard log formats are called ``long``, ``short``\n"
1541
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1542
" for more details on log formats."
1543
msgstr ""
1544
1545
#: bzrlib/builtins.py:2398
1546
msgid ""
1547
" The following options can be used to control what information is\n"
1548
" displayed::"
1549
msgstr ""
1550
1551
#: bzrlib/builtins.py:2401
1552
msgid ""
1553
" -l N display a maximum of N revisions\n"
1554
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1555
" -v display a status summary (delta) for each revision\n"
1556
" -p display a diff (patch) for each revision\n"
1557
" --show-ids display revision-ids (and file-ids), not just revnos"
1558
msgstr ""
1559
1560
#: bzrlib/builtins.py:2407
1561
msgid ""
1562
" Note that the default number of levels to display is a function of the\n"
1563
" log format. If the -n option is not used, the standard log formats show\n"
1564
" just the top level (mainline)."
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2411
1568
msgid ""
1569
" Status summaries are shown using status flags like A, M, etc. To see\n"
1570
" the changes explained using words like ``added`` and ``modified``\n"
1571
" instead, use the -vv option."
1572
msgstr ""
1573
1574
#: bzrlib/builtins.py:2415
1575
msgid ":Ordering control:"
1576
msgstr ""
1577
1578
#: bzrlib/builtins.py:2417
1579
msgid ""
1580
" To display revisions from oldest to newest, use the --forward option.\n"
1581
" In most cases, using this option will have little impact on the total\n"
1582
" time taken to produce a log, though --forward does not incrementally\n"
1583
" display revisions like --reverse does when it can."
1584
msgstr ""
1585
1586
#: bzrlib/builtins.py:2422
1587
msgid ":Revision filtering:"
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2424
1591
msgid ""
1592
" The -r option can be used to specify what revision or range of revisions\n"
1593
" to filter against. The various forms are shown below::"
1594
msgstr ""
1595
1596
#: bzrlib/builtins.py:2427
1597
msgid ""
1598
" -rX display revision X\n"
1599
" -rX.. display revision X and later\n"
1600
" -r..Y display up to and including revision Y\n"
1601
" -rX..Y display from X to Y inclusive"
1602
msgstr ""
1603
1604
#: bzrlib/builtins.py:2432
1605
msgid ""
1606
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1607
" Some common examples are given below::"
1608
msgstr ""
1609
1610
#: bzrlib/builtins.py:2435
1611
msgid ""
1612
" -r-1 show just the tip\n"
1613
" -r-10.. show the last 10 mainline revisions\n"
1614
" -rsubmit:.. show what's new on this branch\n"
1615
" -rancestor:path.. show changes since the common ancestor of this\n"
1616
" branch and the one at location path\n"
1617
" -rdate:yesterday.. show changes since yesterday"
1618
msgstr ""
1619
1620
#: bzrlib/builtins.py:2442
1621
msgid ""
1622
" When logging a range of revisions using -rX..Y, log starts at\n"
1623
" revision Y and searches back in history through the primary\n"
1624
" (\"left-hand\") parents until it finds X. When logging just the\n"
1625
" top level (using -n1), an error is reported if X is not found\n"
1626
" along the way. If multi-level logging is used (-n0), X may be\n"
1627
" a nested merge revision and the log will be truncated accordingly."
1628
msgstr ""
1629
1630
#: bzrlib/builtins.py:2449
1631
msgid ":Path filtering:"
1632
msgstr ""
1633
1634
#: bzrlib/builtins.py:2451
1635
msgid ""
1636
" If parameters are given and the first one is not a branch, the log\n"
1637
" will be filtered to show only those revisions that changed the\n"
1638
" nominated files or directories."
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2455
1642
msgid ""
1643
" Filenames are interpreted within their historical context. To log a\n"
1644
" deleted file, specify a revision range so that the file existed at\n"
1645
" the end or start of the range."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2459
1649
msgid ""
1650
" Historical context is also important when interpreting pathnames of\n"
1651
" renamed files/directories. Consider the following example:"
1652
msgstr ""
1653
1654
#: bzrlib/builtins.py:2462
1655
msgid ""
1656
" * revision 1: add tutorial.txt\n"
1657
" * revision 2: modify tutorial.txt\n"
1658
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2466
1662
msgid " In this case:"
1663
msgstr ""
1664
1665
#: bzrlib/builtins.py:2468
1666
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1667
msgstr ""
1668
1669
#: bzrlib/builtins.py:2470
1670
msgid ""
1671
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1672
msgstr ""
1673
1674
#: bzrlib/builtins.py:2472
1675
msgid ""
1676
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1677
" the original file in revision 2."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2475
1681
msgid ""
1682
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1683
" was no file called guide.txt in revision 2."
1684
msgstr ""
1685
1686
#: bzrlib/builtins.py:2478
1687
msgid ""
1688
" Renames are always followed by log. By design, there is no need to\n"
1689
" explicitly ask for this (and no way to stop logging a file back\n"
1690
" until it was last renamed)."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2482
1694
msgid ":Other filtering:"
1695
msgstr ""
1696
1697
#: bzrlib/builtins.py:2484
1698
msgid ""
1699
" The --match option can be used for finding revisions that match a\n"
1700
" regular expression in a commit message, committer, author or bug.\n"
1701
" Specifying the option several times will match any of the supplied\n"
1702
" expressions. --match-author, --match-bugs, --match-committer and\n"
1703
" --match-message can be used to only match a specific field."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2490
1707
msgid ":Tips & tricks:"
1708
msgstr ""
1709
1710
#: bzrlib/builtins.py:2492
1711
msgid ""
1712
" GUI tools and IDEs are often better at exploring history than command\n"
1713
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1714
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1715
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1716
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2498
1720
msgid ""
1721
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2500
1725
msgid ""
1726
" [ALIASES]\n"
1727
" tip = log -r-1\n"
1728
" top = log -l10 --line\n"
1729
" show = log -v -p"
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2505
1733
msgid ""
1734
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1735
" will show the last 10 mainline revisions. To see the details of a\n"
1736
" particular revision X, ``bzr show -rX``."
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2509
1740
msgid ""
1741
" If you are interested in looking deeper into a particular merge X,\n"
1742
" use ``bzr log -n0 -rX``."
1743
msgstr ""
1744
1745
#: bzrlib/builtins.py:2512
1746
msgid ""
1747
" ``bzr log -v`` on a branch with lots of history is currently\n"
1748
" very slow. A fix for this issue is currently under development.\n"
1749
" With or without that fix, it is recommended that a revision range\n"
1750
" be given when using the -v option."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2517
1754
msgid ""
1755
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1756
" used to find revisions matching user names, commit messages, etc.\n"
1757
" Among other features, this plugin can find all revisions containing\n"
1758
" a list of words but not others."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2522
1762
msgid ""
1763
" When exploring non-mainline history on large projects with deep\n"
1764
" history, the performance of log can be greatly improved by installing\n"
1765
" the historycache plugin. This plugin buffers historical information\n"
1766
" trading disk space for faster speed."
1767
msgstr ""
1768
1769
#: bzrlib/builtins.py:2531
1770
msgid "Show from oldest to newest."
1771
msgstr ""
1772
1773
#: bzrlib/builtins.py:2534
1774
msgid "Show files changed in each revision."
1775
msgstr ""
1776
1777
#: bzrlib/builtins.py:2540
1778
msgid "Show just the specified revision. See also \"help revisionspec\"."
1779
msgstr ""
1780
1781
#: bzrlib/builtins.py:2544
1782
msgid "What names to list as authors - first, all or committer."
1783
msgstr ""
1784
1785
#: bzrlib/builtins.py:2545
1786
msgid "Authors"
1787
msgstr ""
1788
1789
#: bzrlib/builtins.py:2550
1790
msgid "Number of levels to display - 0 for all, 1 for flat."
1791
msgstr ""
1792
1793
#: bzrlib/builtins.py:2560
1794
msgid "Limit the output to the first N revisions."
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:2565
1798
msgid "Show changes made in each revision as a patch."
1799
msgstr ""
1800
1801
#: bzrlib/builtins.py:2567
1802
msgid "Show merged revisions like --levels 0 does."
1803
msgstr ""
1804
1805
#: bzrlib/builtins.py:2571
1806
msgid "Do not report commits with more than one parent."
1807
msgstr ""
1808
1809
#: bzrlib/builtins.py:2573
1810
msgid ""
1811
"Display only the revisions that are not part of both ancestries (require -"
1812
"rX..Y)."
1813
msgstr ""
1814
1815
#: bzrlib/builtins.py:2577
1816
msgid "Show digital signature validity."
1817
msgstr ""
1818
1819
#: bzrlib/builtins.py:2580
1820
msgid "Show revisions whose properties match this expression."
1821
msgstr ""
1822
1823
#: bzrlib/builtins.py:2584
1824
msgid "Show revisions whose message matches this expression."
1825
msgstr ""
1826
1827
#: bzrlib/builtins.py:2588
1828
msgid "Show revisions whose committer matches this expression."
1829
msgstr ""
1830
1831
#: bzrlib/builtins.py:2592
1832
msgid "Show revisions whose authors match this expression."
1833
msgstr ""
1834
1835
#: bzrlib/builtins.py:2596
1836
msgid "Show revisions whose bugs match this expression."
1837
msgstr ""
1838
1839
#: bzrlib/builtins.py:2650
1840
msgid "--exclude-common-ancestry requires -r with two revisions"
1841
msgstr ""
1842
1843
#: bzrlib/builtins.py:2678
1844
#, python-format
1845
msgid "Path unknown at end or start of revision range: %s"
1846
msgstr ""
1847
1848
#: bzrlib/builtins.py:2795
1849
#, python-format
1850
msgid "bzr %s doesn't accept two revisions in different branches."
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:2811
1854
#, python-format
1855
msgid "bzr %s --revision takes one or two values."
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:2856
1859
msgid ""
1860
"List files in a tree.\n"
1861
" "
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:2865
1865
msgid "Recurse into subdirectories."
1866
msgstr ""
1867
1868
#: bzrlib/builtins.py:2867
1869
msgid "Print paths relative to the root of the branch."
1870
msgstr ""
1871
1872
#: bzrlib/builtins.py:2869
1873
msgid "Print unknown files."
1874
msgstr ""
1875
1876
#: bzrlib/builtins.py:2870
1877
msgid "Print versioned files."
1878
msgstr ""
1879
1880
#: bzrlib/builtins.py:2873
1881
msgid "Print ignored files."
1882
msgstr ""
1883
1884
#: bzrlib/builtins.py:2875
1885
msgid "List entries of a particular kind: file, directory, symlink."
1886
msgstr ""
1887
1888
#: bzrlib/builtins.py:2888
1889
msgid "invalid kind specified"
1890
msgstr ""
1891
1892
#: bzrlib/builtins.py:2891
1893
msgid "Cannot set both --verbose and --null"
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:2900
1897
msgid "cannot specify both --from-root and PATH"
1898
msgstr ""
1899
1900
#: bzrlib/builtins.py:2987
1901
msgid "Ignore specified files or patterns."
1902
msgstr ""
1903
1904
#: bzrlib/builtins.py:2989
1905
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1906
msgstr ""
1907
1908
#: bzrlib/builtins.py:2991
1909
msgid ""
1910
"If a .bzrignore file does not exist, the ignore command\n"
1911
"will create one and add the specified files or patterns to the newly\n"
1912
"created file. The ignore command will also automatically add the \n"
1913
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1914
"the use of the ignore command will require an explicit add command."
1915
msgstr ""
1916
1917
#: bzrlib/builtins.py:2997
1918
msgid ""
1919
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1920
"After adding, editing or deleting that file either indirectly by\n"
1921
"using this command or directly by using an editor, be sure to commit\n"
1922
"it."
1923
msgstr ""
1924
1925
#: bzrlib/builtins.py:3002
1926
msgid ""
1927
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1928
"the global ignore file can be found in the application data directory as\n"
1929
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1930
"Global ignores are not touched by this command. The global ignore file\n"
1931
"can be edited directly using an editor."
1932
msgstr ""
1933
1934
#: bzrlib/builtins.py:3008
1935
msgid ""
1936
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1937
"precedence over regular ignores. Such exceptions are used to specify\n"
1938
"files that should be versioned which would otherwise be ignored."
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3012
1942
msgid ""
1943
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1944
"precedence over the '!' exception patterns."
1945
msgstr ""
1946
1947
#: bzrlib/builtins.py:3015
1948
msgid ""
1949
":Notes: \n"
1950
" \n"
1951
"* Ignore patterns containing shell wildcards must be quoted from\n"
1952
" the shell on Unix."
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3020
1956
msgid ""
1957
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1958
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1959
msgstr ""
1960
1961
#: bzrlib/builtins.py:3023
1962
msgid ""
1963
":Examples:\n"
1964
" Ignore the top level Makefile::"
1965
msgstr ""
1966
1967
#: bzrlib/builtins.py:3026
1968
msgid " bzr ignore ./Makefile"
1969
msgstr ""
1970
1971
#: bzrlib/builtins.py:3028
1972
msgid " Ignore .class files in all directories...::"
1973
msgstr ""
1974
1975
#: bzrlib/builtins.py:3030
1976
msgid " bzr ignore \"*.class\""
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:3032
1980
msgid " ...but do not ignore \"special.class\"::"
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3034
1984
msgid " bzr ignore \"!special.class\""
1985
msgstr ""
1986
1987
#: bzrlib/builtins.py:3036
1988
msgid " Ignore files whose name begins with the \"#\" character::"
1989
msgstr ""
1990
1991
#: bzrlib/builtins.py:3038
1992
msgid " bzr ignore \"RE:^#\""
1993
msgstr ""
1994
1995
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1996
msgid " Ignore .o files under the lib directory::"
1997
msgstr ""
1998
1999
#: bzrlib/builtins.py:3042
2000
msgid " bzr ignore \"lib/**/*.o\""
2001
msgstr ""
2002
2003
#: bzrlib/builtins.py:3046
2004
msgid " bzr ignore \"RE:lib/.*\\.o\""
2005
msgstr ""
2006
2007
#: bzrlib/builtins.py:3048
2008
msgid " Ignore everything but the \"debian\" toplevel directory::"
2009
msgstr ""
2010
2011
#: bzrlib/builtins.py:3050
2012
msgid ""
2013
" bzr ignore \"RE:(?!debian/).*\"\n"
2014
" \n"
2015
" Ignore everything except the \"local\" toplevel directory,\n"
2016
" but always ignore autosave files ending in ~, even under local/::\n"
2017
" \n"
2018
" bzr ignore \"*\"\n"
2019
" bzr ignore \"!./local\"\n"
2020
" bzr ignore \"!!*~\""
2021
msgstr ""
2022
2023
#: bzrlib/builtins.py:3064
2024
msgid "Display the default ignore rules that bzr uses."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3076
2028
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2029
msgstr ""
2030
2031
#: bzrlib/builtins.py:3087
2032
#, python-format
2033
msgid "Invalid ignore pattern found. %s"
2034
msgid_plural "Invalid ignore patterns found. %s"
2035
msgstr[0] ""
2036
msgstr[1] ""
2037
2038
#: bzrlib/builtins.py:3096
2039
msgid "NAME_PATTERN should not be an absolute path"
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3109
2043
#, python-format
2044
msgid ""
2045
"Warning: the following files are version controlled and match your ignore "
2046
"pattern:\n"
2047
"%s\n"
2048
"These files will continue to be version controlled unless you 'bzr remove' "
2049
"them.\n"
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3116
2053
msgid "List ignored files and the patterns that matched them."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3118
2057
msgid ""
2058
"List all the ignored files and the ignore pattern that caused the file to\n"
2059
"be ignored."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3121
2063
msgid "Alternatively, to list just the files::"
2064
msgstr ""
2065
2066
#: bzrlib/builtins.py:3123
2067
msgid " bzr ls --ignored"
2068
msgstr ""
2069
2070
#: bzrlib/builtins.py:3157
2071
#, python-format
2072
msgid "not a valid revision-number: %r"
2073
msgstr ""
2074
2075
#: bzrlib/builtins.py:3164
2076
msgid ""
2077
"Export current or past revision to a destination directory or archive."
2078
msgstr ""
2079
2080
#: bzrlib/builtins.py:3166
2081
msgid "If no revision is specified this exports the last committed revision."
2082
msgstr ""
2083
2084
#: bzrlib/builtins.py:3168
2085
msgid ""
2086
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2087
"given, try to find the format with the extension. If no extension\n"
2088
"is found exports to a directory (equivalent to --format=dir)."
2089
msgstr ""
2090
2091
#: bzrlib/builtins.py:3172
2092
msgid ""
2093
"If root is supplied, it will be used as the root directory inside\n"
2094
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2095
"to the exported filename. The root option has no effect for 'dir' format."
2096
msgstr ""
2097
2098
#: bzrlib/builtins.py:3176
2099
msgid ""
2100
"If branch is omitted then the branch containing the current working\n"
2101
"directory will be used."
2102
msgstr ""
2103
2104
#: bzrlib/builtins.py:3179
2105
msgid ""
2106
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2107
msgstr ""
2108
2109
#: bzrlib/builtins.py:3181
2110
msgid ""
2111
" ================= =========================\n"
2112
" Supported formats Autodetected by extension\n"
2113
" ================= =========================\n"
2114
" dir (none)\n"
2115
" tar .tar\n"
2116
" tbz2 .tar.bz2, .tbz2\n"
2117
" tgz .tar.gz, .tgz\n"
2118
" zip .zip\n"
2119
" ================= ========================="
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3195
2123
msgid "Type of file to export to."
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3198
2127
msgid "Apply content filters to export the convenient form."
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3202
2131
msgid "Name of the root directory inside the exported file."
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3204
2135
msgid ""
2136
"Set modification time of files to that of the last revision in which it was "
2137
"changed."
2138
msgstr ""
2139
2140
#: bzrlib/builtins.py:3207
2141
msgid ""
2142
"Export the working tree contents rather than that of the last revision."
2143
msgstr ""
2144
2145
#: bzrlib/builtins.py:3226
2146
msgid "--uncommitted requires a working tree"
2147
msgstr ""
2148
2149
#: bzrlib/builtins.py:3235
2150
#, python-format
2151
msgid "Unsupported export format: %s"
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3239
2155
msgid ""
2156
"Write the contents of a file as of a given revision to standard output."
2157
msgstr ""
2158
2159
#: bzrlib/builtins.py:3241
2160
msgid "If no revision is nominated, the last revision is used."
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3243
2164
msgid ""
2165
"Note: Take care to redirect standard output when using this command on a\n"
2166
"binary file."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3249
2170
msgid "The path name in the old tree."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3250
2174
msgid "Apply content filters to display the convenience form."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3261
2178
msgid "bzr cat --revision takes exactly one revision specifier"
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2182
msgid "{0!r} is not present in revision {1}"
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:3321
2186
msgid "Commit changes into a new revision."
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:3323
2190
msgid ""
2191
"An explanatory message needs to be given for each commit. This is\n"
2192
"often done by using the --message option (getting the message from the\n"
2193
"command line) or by using the --file option (getting the message from\n"
2194
"a file). If neither of these options is given, an editor is opened for\n"
2195
"the user to enter the message. To see the changed files in the\n"
2196
"boilerplate text loaded into the editor, use the --show-diff option."
2197
msgstr ""
2198
2199
#: bzrlib/builtins.py:3330
2200
msgid ""
2201
"By default, the entire tree is committed and the person doing the\n"
2202
"commit is assumed to be the author. These defaults can be overridden\n"
2203
"as explained below."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3334
2207
msgid ":Selective commits:"
2208
msgstr ""
2209
2210
#: bzrlib/builtins.py:3336
2211
msgid ""
2212
" If selected files are specified, only changes to those files are\n"
2213
" committed. If a directory is specified then the directory and\n"
2214
" everything within it is committed."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3340
2218
msgid ""
2219
" When excludes are given, they take precedence over selected files.\n"
2220
" For example, to commit only changes within foo, but not changes\n"
2221
" within foo/bar::"
2222
msgstr ""
2223
2224
#: bzrlib/builtins.py:3344
2225
msgid " bzr commit foo -x foo/bar"
2226
msgstr ""
2227
2228
#: bzrlib/builtins.py:3346
2229
msgid " A selective commit after a merge is not yet supported."
2230
msgstr ""
2231
2232
#: bzrlib/builtins.py:3348
2233
msgid ":Custom authors:"
2234
msgstr ""
2235
2236
#: bzrlib/builtins.py:3350
2237
msgid ""
2238
" If the author of the change is not the same person as the committer,\n"
2239
" you can specify the author's name using the --author option. The\n"
2240
" name should be in the same format as a committer-id, e.g.\n"
2241
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2242
" the change you can specify the option multiple times, once for each\n"
2243
" author."
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3357
2247
msgid ":Checks:"
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3359
2251
msgid ""
2252
" A common mistake is to forget to add a new file or directory before\n"
2253
" running the commit command. The --strict option checks for unknown\n"
2254
" files and aborts the commit if any are found. More advanced pre-commit\n"
2255
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2256
" for details."
2257
msgstr ""
2258
2259
#: bzrlib/builtins.py:3365
2260
msgid ":Things to note:"
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3367
2264
msgid ""
2265
" If you accidentially commit the wrong changes or make a spelling\n"
2266
" mistake in the commit message say, you can use the uncommit command\n"
2267
" to undo it. See ``bzr help uncommit`` for details."
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3371
2271
msgid ""
2272
" Hooks can also be configured to run after a commit. This allows you\n"
2273
" to trigger updates to external systems like bug trackers. The --fixes\n"
2274
" option can be used to record the association between a revision and\n"
2275
" one or more bugs. See ``bzr help bugs`` for details."
2276
msgstr ""
2277
2278
#: bzrlib/builtins.py:3381
2279
msgid "Do not consider changes made to a given path."
2280
msgstr ""
2281
2282
#: bzrlib/builtins.py:3384
2283
msgid "Description of the new revision."
2284
msgstr ""
2285
2286
#: bzrlib/builtins.py:3387
2287
msgid "Commit even if nothing has changed."
2288
msgstr ""
2289
2290
#: bzrlib/builtins.py:3391
2291
msgid "Take commit message from this file."
2292
msgstr ""
2293
2294
#: bzrlib/builtins.py:3393
2295
msgid "Refuse to commit if there are unknown files in the working tree."
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3396
2299
msgid ""
2300
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2301
"08:00:00 +0100'."
2302
msgstr ""
2303
2304
#: bzrlib/builtins.py:3399
2305
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2306
msgstr ""
2307
2308
#: bzrlib/builtins.py:3402
2309
msgid "Set the author's name, if it's different from the committer."
2310
msgstr ""
2311
2312
#: bzrlib/builtins.py:3405
2313
msgid ""
2314
"Perform a local commit in a bound branch. Local commits are not pushed to "
2315
"the master branch until a normal commit is performed."
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3411
2319
msgid ""
2320
"When no message is supplied, show the diff along with the status summary in "
2321
"the message editor."
2322
msgstr ""
2323
2324
#: bzrlib/builtins.py:3414
2325
msgid ""
2326
"When committing to a foreign version control system do not push data that "
2327
"can not be natively represented."
2328
msgstr ""
2329
2330
#: bzrlib/builtins.py:3432
2331
#, python-format
2332
msgid ""
2333
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2334
"default bug tracker using the `bugtracker` option.\n"
2335
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3441
2339
#, python-format
2340
msgid ""
2341
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2342
"for more information on this feature.\n"
2343
"Commit refused."
2344
msgstr ""
2345
2346
#: bzrlib/builtins.py:3450
2347
#, python-format
2348
msgid "Unrecognized bug %s. Commit refused."
2349
msgstr ""
2350
2351
#: bzrlib/builtins.py:3453
2352
#, python-format
2353
msgid ""
2354
"%s\n"
2355
"Commit refused."
2356
msgstr ""
2357
2358
#: bzrlib/builtins.py:3477
2359
msgid "Could not parse --commit-time: "
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3517
2363
msgid "please specify either --message or --file"
2364
msgstr ""
2365
2366
#: bzrlib/builtins.py:3546
2367
msgid "please specify a commit message with either --message or --file"
2368
msgstr ""
2369
2370
#: bzrlib/builtins.py:3549
2371
msgid ""
2372
"Empty commit message specified. Please specify a commit message with either -"
2373
"-message or --file or leave a blank message with --message \"\"."
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3569
2377
msgid ""
2378
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2379
"-unchanged to force an empty commit."
2380
msgstr ""
2381
2382
#: bzrlib/builtins.py:3573
2383
msgid ""
2384
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2385
"resolve FILE\" to resolve."
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3577
2389
msgid "Commit refused because there are unknown files in the working tree."
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3580
2393
msgid ""
2394
"\n"
2395
"To commit to master branch, run update and then commit.\n"
2396
"You can also pass --local to commit to continue working disconnected."
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3588
2400
msgid ""
2401
"Validate working tree structure, branch consistency and repository history."
2402
msgstr ""
2403
2404
#: bzrlib/builtins.py:3590
2405
msgid ""
2406
"This command checks various invariants about branch and repository storage\n"
2407
"to detect data corruption or bzr bugs."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3593
2411
msgid ""
2412
"The working tree and branch checks will only give output if a problem is\n"
2413
"detected. The output fields of the repository check are:"
2414
msgstr ""
2415
2416
#: bzrlib/builtins.py:3596
2417
msgid ""
2418
"revisions\n"
2419
" This is just the number of revisions checked. It doesn't\n"
2420
" indicate a problem."
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3600
2424
msgid ""
2425
"versionedfiles\n"
2426
" This is just the number of versionedfiles checked. It\n"
2427
" doesn't indicate a problem."
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3604
2431
msgid ""
2432
"unreferenced ancestors\n"
2433
" Texts that are ancestors of other texts, but\n"
2434
" are not properly referenced by the revision ancestry. This is a\n"
2435
" subtle problem that Bazaar can work around."
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3609
2439
msgid ""
2440
"unique file texts\n"
2441
" This is the total number of unique file contents\n"
2442
" seen in the checked revisions. It does not indicate a problem."
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3613
2446
msgid ""
2447
"repeated file texts\n"
2448
" This is the total number of repeated texts seen\n"
2449
" in the checked revisions. Texts can be repeated when their file\n"
2450
" entries are modified, but the file contents are not. It does not\n"
2451
" indicate a problem."
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3619
2455
msgid ""
2456
"If no restrictions are specified, all Bazaar data that is found at the "
2457
"given\n"
2458
"location will be checked."
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3624
2462
msgid " Check the tree and branch at 'foo'::"
2463
msgstr ""
2464
2465
#: bzrlib/builtins.py:3626
2466
msgid " bzr check --tree --branch foo"
2467
msgstr ""
2468
2469
#: bzrlib/builtins.py:3628
2470
msgid " Check only the repository at 'bar'::"
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3630
2474
msgid " bzr check --repo bar"
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3632
2478
msgid " Check everything at 'baz'::"
2479
msgstr ""
2480
2481
#: bzrlib/builtins.py:3634
2482
msgid " bzr check baz"
2483
msgstr ""
2484
2485
#: bzrlib/builtins.py:3640
2486
msgid "Check the branch related to the current directory."
2487
msgstr ""
2488
2489
#: bzrlib/builtins.py:3642
2490
msgid "Check the repository related to the current directory."
2491
msgstr ""
2492
2493
#: bzrlib/builtins.py:3644
2494
msgid "Check the working tree related to the current directory."
2495
msgstr ""
2496
2497
#: bzrlib/builtins.py:3658
2498
msgid "Upgrade a repository, branch or working tree to a newer format."
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3660
2502
msgid ""
2503
"When the default format has changed after a major new release of\n"
2504
"Bazaar, you may be informed during certain operations that you\n"
2505
"should upgrade. Upgrading to a newer format may improve performance\n"
2506
"or make new features available. It may however limit interoperability\n"
2507
"with older repositories or with older versions of Bazaar."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3666
2511
msgid ""
2512
"If you wish to upgrade to a particular format rather than the\n"
2513
"current default, that can be specified using the --format option.\n"
2514
"As a consequence, you can use the upgrade command this way to\n"
2515
"\"downgrade\" to an earlier format, though some conversions are\n"
2516
"a one way process (e.g. changing from the 1.x default to the\n"
2517
"2.x default) so downgrading is not always possible."
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3673
2521
msgid ""
2522
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2523
"process (where # is a number). By default, this is left there on\n"
2524
"completion. If the conversion fails, delete the new .bzr directory\n"
2525
"and rename this one back in its place. Use the --clean option to ask\n"
2526
"for the backup.bzr directory to be removed on successful conversion.\n"
2527
"Alternatively, you can delete it by hand if everything looks good\n"
2528
"afterwards."
2529
msgstr ""
2530
2531
#: bzrlib/builtins.py:3681
2532
msgid ""
2533
"If the location given is a shared repository, dependent branches\n"
2534
"are also converted provided the repository converts successfully.\n"
2535
"If the conversion of a branch fails, remaining branches are still\n"
2536
"tried."
2537
msgstr ""
2538
2539
#: bzrlib/builtins.py:3686
2540
msgid ""
2541
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2542
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2543
msgstr ""
2544
2545
#: bzrlib/builtins.py:3694
2546
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2547
msgstr ""
2548
2549
#: bzrlib/builtins.py:3698
2550
msgid "Branch format"
2551
msgstr ""
2552
2553
#: bzrlib/builtins.py:3700
2554
msgid "Remove the backup.bzr directory if successful."
2555
msgstr ""
2556
2557
#: bzrlib/builtins.py:3702
2558
msgid "Show what would be done, but don't actually do anything."
2559
msgstr ""
2560
2561
#: bzrlib/builtins.py:3717
2562
msgid "Show or set bzr user id."
2563
msgstr ""
2564
2565
#: bzrlib/builtins.py:3719
2566
msgid ""
2567
":Examples:\n"
2568
" Show the email of the current user::"
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:3722
2572
msgid " bzr whoami --email"
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:3724
2576
msgid " Set the current user::"
2577
msgstr ""
2578
2579
#: bzrlib/builtins.py:3726
2580
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2581
msgstr ""
2582
2583
#: bzrlib/builtins.py:3730
2584
msgid "Display email address only."
2585
msgstr ""
2586
2587
#: bzrlib/builtins.py:3732
2588
msgid "Set identity for the current branch instead of globally."
2589
msgstr ""
2590
2591
#: bzrlib/builtins.py:3758
2592
msgid "--email can only be used to display existing identity"
2593
msgstr ""
2594
2595
#: bzrlib/builtins.py:3780
2596
msgid "Print or set the branch nickname."
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:3782
2600
msgid ""
2601
"If unset, the tree root directory name is used as the nickname.\n"
2602
"To print the current nickname, execute with no argument."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:3785
2606
msgid ""
2607
"Bound branches use the nickname of its master branch unless it is set\n"
2608
"locally."
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:3805
2612
msgid "Set/unset and display aliases."
2613
msgstr ""
2614
2615
#: bzrlib/builtins.py:3807
2616
msgid ""
2617
":Examples:\n"
2618
" Show the current aliases::"
2619
msgstr ""
2620
2621
#: bzrlib/builtins.py:3810
2622
msgid " bzr alias"
2623
msgstr ""
2624
2625
#: bzrlib/builtins.py:3812
2626
msgid " Show the alias specified for 'll'::"
2627
msgstr ""
2628
2629
#: bzrlib/builtins.py:3814
2630
msgid " bzr alias ll"
2631
msgstr ""
2632
2633
#: bzrlib/builtins.py:3816
2634
msgid " Set an alias for 'll'::"
2635
msgstr ""
2636
2637
#: bzrlib/builtins.py:3818
2638
msgid " bzr alias ll=\"log --line -r-10..-1\""
2639
msgstr ""
2640
2641
#: bzrlib/builtins.py:3820
2642
msgid " To remove an alias for 'll'::"
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:3822
2646
msgid " bzr alias --remove ll"
2647
msgstr ""
2648
2649
#: bzrlib/builtins.py:3827
2650
msgid "Remove the alias."
2651
msgstr ""
2652
2653
#: bzrlib/builtins.py:3845
2654
msgid "bzr alias --remove expects an alias to remove."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:4026
2658
msgid ""
2659
"subunit not available. subunit needs to be installed to use --subunit."
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4043
2663
msgid ""
2664
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:4090
2668
msgid "Show version of bzr."
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:4094
2672
msgid "Print just the version number."
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:4113
2676
msgid "It sure does!\n"
2677
msgstr ""
2678
2679
#: bzrlib/builtins.py:4137
2680
#, python-format
2681
msgid "merge base is revision %s\n"
2682
msgstr ""
2683
2684
#: bzrlib/builtins.py:4141
2685
msgid "Perform a three-way merge."
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4143
2689
msgid ""
2690
"The source of the merge can be specified either in the form of a branch,\n"
2691
"or in the form of a path to a file containing a merge directive generated\n"
2692
"with bzr send. If neither is specified, the default is the upstream branch\n"
2693
"or the branch most recently merged using --remember. The source of the\n"
2694
"merge may also be specified in the form of a path to a file in another\n"
2695
"branch: in this case, only the modifications to that file are merged into\n"
2696
"the current working tree."
2697
msgstr ""
2698
2699
#: bzrlib/builtins.py:4151
2700
msgid ""
2701
"When merging from a branch, by default bzr will try to merge in all new\n"
2702
"work from the other branch, automatically determining an appropriate base\n"
2703
"revision. If this fails, you may need to give an explicit base."
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:4155
2707
msgid ""
2708
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2709
"try to merge in all new work up to and including revision OTHER."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4158
2713
msgid ""
2714
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2715
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2716
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2717
"not already contain revision BASE, such a merge is commonly referred to as\n"
2718
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2719
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2720
"changes from the other branch is not stored in the commit."
2721
msgstr ""
2722
2723
#: bzrlib/builtins.py:4166
2724
msgid "Revision numbers are always relative to the source branch."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2728
msgid ""
2729
"Merge will do its best to combine the changes in two branches, but there\n"
2730
"are some kinds of problems only a human can fix. When it encounters those,\n"
2731
"it will mark a conflict. A conflict means that you need to fix something,\n"
2732
"before you should commit."
2733
msgstr ""
2734
2735
#: bzrlib/builtins.py:4173
2736
msgid ""
2737
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4175
2741
msgid ""
2742
"If there is no default branch set, the first merge will set it (use\n"
2743
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2744
"to use the default. To change the default, use --remember. The value will\n"
2745
"only be saved if the remote location can be accessed."
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4180
2749
msgid ""
2750
"The results of the merge are placed into the destination working\n"
2751
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2752
"committed to record the result of the merge."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4184
2756
msgid ""
2757
"merge refuses to run if there are any uncommitted changes, unless\n"
2758
"--force is given. If --force is given, then the changes from the source \n"
2759
"will be merged with the current working tree, including any uncommitted\n"
2760
"changes in the tree. The --force option can also be used to create a\n"
2761
"merge revision which has more than two parents."
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4190
2765
msgid ""
2766
"If one would like to merge changes from the working tree of the other\n"
2767
"branch without merging any committed revisions, the --uncommitted option\n"
2768
"can be given."
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4194
2772
msgid ""
2773
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2774
"you to apply each diff hunk and file change, similar to \"shelve\"."
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4197
2778
msgid ""
2779
":Examples:\n"
2780
" To merge all new revisions from bzr.dev::"
2781
msgstr ""
2782
2783
#: bzrlib/builtins.py:4200
2784
msgid " bzr merge ../bzr.dev"
2785
msgstr ""
2786
2787
#: bzrlib/builtins.py:4202
2788
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2789
msgstr ""
2790
2791
#: bzrlib/builtins.py:4204
2792
msgid " bzr merge -r 82 ../bzr.dev"
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:4206
2796
msgid " To merge the changes introduced by 82, without previous changes::"
2797
msgstr ""
2798
2799
#: bzrlib/builtins.py:4208
2800
msgid " bzr merge -r 81..82 ../bzr.dev"
2801
msgstr ""
2802
2803
#: bzrlib/builtins.py:4210
2804
msgid " To apply a merge directive contained in /tmp/merge::"
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:4212
2808
msgid " bzr merge /tmp/merge"
2809
msgstr ""
2810
2811
#: bzrlib/builtins.py:4214
2812
msgid ""
2813
" To create a merge revision with three parents from two branches\n"
2814
" feature1a and feature1b:"
2815
msgstr ""
2816
2817
#: bzrlib/builtins.py:4217
2818
msgid ""
2819
" bzr merge ../feature1a\n"
2820
" bzr merge ../feature1b --force\n"
2821
" bzr commit -m 'revision with three parents'"
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4229
2825
msgid "Merge even if the destination tree has uncommitted changes."
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:4235
2829
msgid ""
2830
"Apply uncommitted changes from a working copy, instead of branch changes."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4237
2834
msgid ""
2835
"If the destination is already completely merged into the source, pull from "
2836
"the source rather than merging. When this happens, you do not need to "
2837
"commit the result."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4242
2841
msgid ""
2842
"Branch to merge into, rather than the one containing the working directory."
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4244
2846
msgid "Instead of merging, show a diff of the merge."
2847
msgstr ""
2848
2849
#: bzrlib/builtins.py:4246
2850
msgid "Select changes interactively."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4268
2854
msgid ""
2855
"Merging into empty branches not currently supported, "
2856
"https://bugs.launchpad.net/bzr/+bug/308562"
2857
msgstr ""
2858
2859
#: bzrlib/builtins.py:4295
2860
msgid "Cannot use --uncommitted with bundles or merge directives."
2861
msgstr ""
2862
2863
#: bzrlib/builtins.py:4306
2864
msgid "Cannot use --uncommitted and --revision at the same time."
2865
msgstr ""
2866
2867
#: bzrlib/builtins.py:4326
2868
msgid "merger: "
2869
msgstr ""
2870
2871
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2872
msgid "Nothing to do."
2873
msgstr ""
2874
2875
#: bzrlib/builtins.py:4332
2876
msgid "Cannot pull individual files"
2877
msgstr ""
2878
2879
#: bzrlib/builtins.py:4340
2880
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2881
msgstr ""
2882
2883
#: bzrlib/builtins.py:4398
2884
#, python-format
2885
msgid "Show-base is not supported for this merge type. %s"
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4407
2889
#, python-format
2890
msgid "Conflict reduction is not supported for merge type %s."
2891
msgstr ""
2892
2893
#: bzrlib/builtins.py:4411
2894
msgid "Cannot do conflict reduction and show base."
2895
msgstr ""
2896
2897
#: bzrlib/builtins.py:4522
2898
msgid "No location specified or remembered"
2899
msgstr ""
2900
2901
#: bzrlib/builtins.py:4524
2902
msgid "{0} remembered {1} location {2}"
2903
msgstr ""
2904
2905
#: bzrlib/builtins.py:4530
2906
msgid "Redo a merge."
2907
msgstr ""
2908
2909
#: bzrlib/builtins.py:4532
2910
msgid ""
2911
"Use this if you want to try a different merge technique while resolving\n"
2912
"conflicts. Some merge techniques are better than others, and remerge\n"
2913
"lets you try different ones on different files."
2914
msgstr ""
2915
2916
#: bzrlib/builtins.py:4536
2917
msgid ""
2918
"The options for remerge have the same meaning and defaults as the ones for\n"
2919
"merge. The difference is that remerge can (only) be run when there is a\n"
2920
"pending merge, and it lets you specify particular files."
2921
msgstr ""
2922
2923
#: bzrlib/builtins.py:4540
2924
msgid ""
2925
":Examples:\n"
2926
" Re-do the merge of all conflicted files, and show the base text in\n"
2927
" conflict regions, in addition to the usual THIS and OTHER texts::"
2928
msgstr ""
2929
2930
#: bzrlib/builtins.py:4544
2931
msgid " bzr remerge --show-base"
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:4546
2935
msgid ""
2936
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2937
" additional processing to reduce the size of conflict regions::"
2938
msgstr ""
2939
2940
#: bzrlib/builtins.py:4549
2941
msgid " bzr remerge --merge-type weave --reprocess foobar"
2942
msgstr ""
2943
2944
#: bzrlib/builtins.py:4556
2945
msgid "Show base revision text in conflicts."
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:4568
2949
msgid ""
2950
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2951
"merges."
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:4624
2955
msgid "Revert files to a previous revision."
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:4626
2959
msgid ""
2960
"Giving a list of files will revert only those files. Otherwise, all files\n"
2961
"will be reverted. If the revision is not specified with '--revision', the\n"
2962
"last committed revision is used."
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4630
2966
msgid ""
2967
"To remove only some changes, without reverting to a prior version, use\n"
2968
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2969
"will remove the changes introduced by the second last commit (-2), without\n"
2970
"affecting the changes introduced by the last commit (-1). To remove\n"
2971
"certain changes on a hunk-by-hunk basis, see the shelve command."
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:4636
2975
msgid ""
2976
"By default, any files that have been manually changed will be backed up\n"
2977
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2978
"'.~#~' appended to their name, where # is a number."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4640
2982
msgid ""
2983
"When you provide files, you can use their current pathname or the pathname\n"
2984
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2985
"name. If you name a directory, all the contents of that directory will be\n"
2986
"reverted."
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4645
2990
msgid ""
2991
"If you have newly added files since the target revision, they will be\n"
2992
"removed. If the files to be removed have been changed, backups will be\n"
2993
"created as above. Directories containing unknown files will not be\n"
2994
"deleted."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4650
2998
msgid ""
2999
"The working tree contains a list of revisions that have been merged but\n"
3000
"not yet committed. These revisions will be included as additional parents\n"
3001
"of the next commit. Normally, using revert clears that list as well as\n"
3002
"reverting the files. If any files are specified, revert leaves the list\n"
3003
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3004
".`` in the tree root to revert all files but keep the recorded merges,\n"
3005
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3006
"reverting any files."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4659
3010
msgid ""
3011
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3012
"changes from a branch in a single revision. To do this, perform the merge\n"
3013
"as desired. Then doing revert with the \"--forget-merges\" option will "
3014
"keep\n"
3015
"the content of the tree as it was, but it will clear the list of pending\n"
3016
"merges. The next commit will then contain all of the changes that are\n"
3017
"present in the other branch, but without any other parent revisions.\n"
3018
"Because this technique forgets where these changes originated, it may\n"
3019
"cause additional conflicts on later merges involving the same source and\n"
3020
"target branches."
3021
msgstr ""
3022
3023
#: bzrlib/builtins.py:4673
3024
msgid "Do not save backups of reverted files."
3025
msgstr ""
3026
3027
#: bzrlib/builtins.py:4675
3028
msgid "Remove pending merge marker, without changing any files."
3029
msgstr ""
3030
3031
#: bzrlib/builtins.py:4706
3032
msgid ""
3033
"Show help on a command or other topic.\n"
3034
" "
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:4711
3038
msgid "Show help on all commands."
3039
msgstr ""
3040
3041
#: bzrlib/builtins.py:4740
3042
msgid "Show unmerged/unpulled revisions between two branches."
3043
msgstr ""
3044
3045
#: bzrlib/builtins.py:4742
3046
msgid "OTHER_BRANCH may be local or remote."
3047
msgstr ""
3048
3049
#: bzrlib/builtins.py:4744
3050
msgid ""
3051
"To filter on a range of revisions, you can use the command -r begin..end\n"
3052
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3053
"also valid.\n"
3054
" \n"
3055
":Exit values:\n"
3056
" 1 - some missing revisions\n"
3057
" 0 - no missing revisions"
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:4754
3061
msgid ""
3062
" Determine the missing revisions between this and the branch at the\n"
3063
" remembered pull location::"
3064
msgstr ""
3065
3066
#: bzrlib/builtins.py:4757
3067
msgid " bzr missing"
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:4759
3071
msgid " Determine the missing revisions between this and another branch::"
3072
msgstr ""
3073
3074
#: bzrlib/builtins.py:4761
3075
msgid " bzr missing http://server/branch"
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:4763
3079
msgid ""
3080
" Determine the missing revisions up to a specific revision on the other\n"
3081
" branch::"
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:4766
3085
msgid " bzr missing -r ..-10"
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:4768
3089
msgid ""
3090
" Determine the missing revisions up to a specific revision on this\n"
3091
" branch::"
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:4771
3095
msgid " bzr missing --my-revision ..-10"
3096
msgstr ""
3097
3098
#: bzrlib/builtins.py:4778
3099
msgid "Reverse the order of revisions."
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:4780
3103
msgid "Display changes in the local branch only."
3104
msgstr ""
3105
3106
#: bzrlib/builtins.py:4781
3107
msgid "Same as --mine-only."
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:4783
3111
msgid "Display changes in the remote branch only."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:4784
3115
msgid "Same as --theirs-only."
3116
msgstr ""
3117
3118
#: bzrlib/builtins.py:4789
3119
msgid ""
3120
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3121
"details."
3122
msgstr ""
3123
3124
#: bzrlib/builtins.py:4793
3125
msgid ""
3126
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3127
"details."
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:4796
3131
msgid "Show all revisions in addition to the mainline ones."
3132
msgstr ""
3133
3134
#: bzrlib/builtins.py:4850
3135
msgid "No peer location known or specified."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:4854
3139
msgid "Using saved parent location: {0}\n"
3140
msgstr ""
3141
3142
#: bzrlib/builtins.py:4887
3143
#, python-format
3144
msgid "You have %d extra revision:\n"
3145
msgid_plural "You have %d extra revisions:\n"
3146
msgstr[0] ""
3147
msgstr[1] ""
3148
3149
#: bzrlib/builtins.py:4903
3150
#, python-format
3151
msgid "You are missing %d revision:\n"
3152
msgid_plural "You are missing %d revisions:\n"
3153
msgstr[0] ""
3154
msgstr[1] ""
3155
3156
#: bzrlib/builtins.py:4915
3157
msgid "This branch has no new revisions.\n"
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:4918
3161
msgid "Other branch has no new revisions.\n"
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:4923
3165
msgid "Branches are up to date.\n"
3166
msgstr ""
3167
3168
#: bzrlib/builtins.py:4934
3169
msgid "Compress the data within a repository."
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:4936
3173
msgid ""
3174
"This operation compresses the data within a bazaar repository. As\n"
3175
"bazaar supports automatic packing of repository, this operation is\n"
3176
"normally not required to be done manually."
3177
msgstr ""
3178
3179
#: bzrlib/builtins.py:4940
3180
msgid ""
3181
"During the pack operation, bazaar takes a backup of existing repository\n"
3182
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3183
"automatically when it is safe to do so. To save disk space by removing\n"
3184
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3185
"used."
3186
msgstr ""
3187
3188
#: bzrlib/builtins.py:4946
3189
msgid ""
3190
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3191
"during or immediately after repacking, you may be left with a state\n"
3192
"where the deletion has been written to disk but the new packs have not\n"
3193
"been. In this case the repository may be unusable."
3194
msgstr ""
3195
3196
#: bzrlib/builtins.py:4955
3197
msgid "Delete obsolete packs to save disk space."
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:4969
3201
msgid "List the installed plugins."
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:4971
3205
msgid ""
3206
"This command displays the list of installed plugins including\n"
3207
"version of plugin and a short description of each."
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:4974
3211
msgid "--verbose shows the path where each plugin is located."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:4976
3215
msgid ""
3216
"A plugin is an external component for Bazaar that extends the\n"
3217
"revision control system, by adding or replacing code in Bazaar.\n"
3218
"Plugins can do a variety of things, including overriding commands,\n"
3219
"adding new commands, providing additional network transports and\n"
3220
"customizing log output."
3221
msgstr ""
3222
3223
#: bzrlib/builtins.py:4982
3224
msgid ""
3225
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3226
"for further information on plugins including where to find them and how to\n"
3227
"install them. Instructions are also provided there on how to write new\n"
3228
"plugins using the Python programming language."
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:4998
3232
msgid "Show testament (signing-form) of a revision."
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5001
3236
msgid "Produce long-format testament."
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:5003
3240
msgid "Produce a strict-format testament."
3241
msgstr ""
3242
3243
#: bzrlib/builtins.py:5029
3244
msgid "Show the origin of each line in a file."
3245
msgstr ""
3246
3247
#: bzrlib/builtins.py:5031
3248
msgid ""
3249
"This prints out the given file with an annotation on the left side\n"
3250
"indicating which revision, author and date introduced the change."
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5034
3254
msgid ""
3255
"If the origin is the same for a run of consecutive lines, it is\n"
3256
"shown only at the top, unless the --all option is given."
3257
msgstr ""
3258
3259
#: bzrlib/builtins.py:5042
3260
msgid "Show annotations on all lines."
3261
msgstr ""
3262
3263
#: bzrlib/builtins.py:5043
3264
msgid "Show commit date in annotations."
3265
msgstr ""
3266
3267
#: bzrlib/builtins.py:5130
3268
msgid "Cannot sign a range of non-revision-history revisions"
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:5142
3272
msgid "Please supply either one revision, or a range."
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5146
3276
msgid ""
3277
"Convert the current branch into a checkout of the supplied branch.\n"
3278
"If no branch is supplied, rebind to the last bound location."
3279
msgstr ""
3280
3281
#: bzrlib/builtins.py:5149
3282
msgid ""
3283
"Once converted into a checkout, commits must succeed on the master branch\n"
3284
"before they will be applied to the local branch."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5152
3288
msgid ""
3289
"Bound branches use the nickname of its master branch unless it is set\n"
3290
"locally, in which case binding will update the local nickname to be\n"
3291
"that of the master."
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5167
3295
msgid "No location supplied. This format does not remember old locations."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5172
3299
msgid "Branch is already bound"
3300
msgstr ""
3301
3302
#: bzrlib/builtins.py:5174
3303
msgid "No location supplied and no previous location known"
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:5180
3307
msgid "These branches have diverged. Try merging, and then bind again."
3308
msgstr ""
3309
3310
#: bzrlib/builtins.py:5187
3311
msgid "Convert the current checkout into a regular branch."
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5189
3315
msgid ""
3316
"After unbinding, the local branch is considered independent and subsequent\n"
3317
"commits will be local only."
3318
msgstr ""
3319
3320
#: bzrlib/builtins.py:5200
3321
msgid "Local branch is not bound"
3322
msgstr ""
3323
3324
#: bzrlib/builtins.py:5204
3325
msgid "Remove the last committed revision."
3326
msgstr ""
3327
3328
#: bzrlib/builtins.py:5206
3329
msgid ""
3330
"--verbose will print out what is being removed.\n"
3331
"--dry-run will go through all the motions, but not actually\n"
3332
"remove anything."
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5210
3336
msgid ""
3337
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3338
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3339
"branch at revision 15."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5214
3343
msgid ""
3344
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3345
"it may make is to restore any pending merges that were present before\n"
3346
"the commit."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5225
3350
msgid "Don't actually make changes."
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5226
3354
msgid "Say yes to all questions."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5228
3358
msgid "Keep tags that point to removed revisions."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5230
3362
msgid "Only remove the commits from the local branch when in a checkout."
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5279
3366
msgid "No revisions to uncommit.\n"
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5294
3370
msgid "Dry-run, pretending to remove the above revisions.\n"
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:5297
3374
msgid "The above revision(s) will be removed.\n"
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:5301
3378
msgid "Uncommit these revisions"
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:5304
3382
msgid "Canceled\n"
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:5311
3386
#, python-format
3387
msgid ""
3388
"You can restore the old tip by running:\n"
3389
" bzr pull . -r revid:%s\n"
3390
msgstr ""
3391
3392
#: bzrlib/builtins.py:5316
3393
msgid "Break a dead lock."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:5318
3397
msgid ""
3398
"This command breaks a lock on a repository, branch, working directory or\n"
3399
"config file."
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5321
3403
msgid ""
3404
"CAUTION: Locks should only be broken when you are sure that the process\n"
3405
"holding the lock has been stopped."
3406
msgstr ""
3407
3408
#: bzrlib/builtins.py:5324
3409
msgid ""
3410
"You can get information on what locks are open via the 'bzr info\n"
3411
"[location]' command."
3412
msgstr ""
3413
3414
#: bzrlib/builtins.py:5327
3415
msgid ""
3416
":Examples:\n"
3417
" bzr break-lock\n"
3418
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3419
" bzr break-lock --conf ~/.bazaar"
3420
msgstr ""
3421
3422
#: bzrlib/builtins.py:5336
3423
msgid "LOCATION is the directory where the config lock is."
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:5338
3427
msgid "Do not ask for confirmation before breaking the lock."
3428
msgstr ""
3429
3430
#: bzrlib/builtins.py:5373
3431
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5374
3435
msgid "Run the bzr server."
3436
msgstr ""
3437
3438
#: bzrlib/builtins.py:5380
3439
msgid "Serve on stdin/out for use from inetd or sshd."
3440
msgstr ""
3441
3442
#: bzrlib/builtins.py:5381
3443
msgid "protocol"
3444
msgstr ""
3445
3446
#: bzrlib/builtins.py:5382
3447
msgid "Protocol to serve."
3448
msgstr ""
3449
3450
#: bzrlib/builtins.py:5386
3451
msgid ""
3452
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3453
"Passing 0 as the port number will result in a dynamically allocated port. "
3454
"The default port depends on the protocol."
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5392
3458
msgid "Serve contents of this directory."
3459
msgstr ""
3460
3461
#: bzrlib/builtins.py:5394
3462
msgid ""
3463
"By default the server is a readonly server. Supplying --allow-writes "
3464
"enables write access to the contents of the served directory and below. "
3465
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3466
"of external authentication is arranged supplying this option leads to global "
3467
"uncontrolled write access to your file system."
3468
msgstr ""
3469
3470
#: bzrlib/builtins.py:5403
3471
msgid "Override the default idle client timeout (5min)."
3472
msgstr ""
3473
3474
#: bzrlib/builtins.py:5453
3475
msgid "Combine a tree into its containing tree."
3476
msgstr ""
3477
3478
#: bzrlib/builtins.py:5455
3479
msgid "This command requires the target tree to be in a rich-root format."
3480
msgstr ""
3481
3482
#: bzrlib/builtins.py:5457
3483
msgid ""
3484
"The TREE argument should be an independent tree, inside another tree, but\n"
3485
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3486
"running \"bzr branch\" with the target inside a tree.)"
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:5461
3490
msgid ""
3491
"The result is a combined tree, with the subtree no longer an independent\n"
3492
"part. This is marked as a merge of the subtree into the containing tree,\n"
3493
"and all history is preserved."
3494
msgstr ""
3495
3496
#: bzrlib/builtins.py:5479
3497
#, python-format
3498
msgid ""
3499
"Can't join trees because %s doesn't support rich root data.\n"
3500
"You can use bzr upgrade on the repository."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3504
msgid "Cannot join {0}. {1}"
3505
msgstr ""
3506
3507
#: bzrlib/builtins.py:5499
3508
msgid "Split a subdirectory of a tree into a separate tree."
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5501
3512
msgid ""
3513
"This command will produce a target tree in a format that supports\n"
3514
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3515
"converted into earlier formats like 'dirstate-tags'."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5505
3519
msgid ""
3520
"The TREE argument should be a subdirectory of a working tree. That\n"
3521
"subdirectory will be converted into an independent tree, with its own\n"
3522
"branch. Commits in the top-level tree will not apply to the new subtree."
3523
msgstr ""
3524
3525
#: bzrlib/builtins.py:5585
3526
msgid "No submit branch specified or known"
3527
msgstr ""
3528
3529
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3530
msgid "No public branch specified or known"
3531
msgstr ""
3532
3533
#: bzrlib/builtins.py:5598
3534
msgid "bzr merge-directive takes at most two one revision identifiers"
3535
msgstr ""
3536
3537
#: bzrlib/builtins.py:5607
3538
msgid "No revisions to bundle."
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:5626
3542
msgid "Mail or create a merge-directive for submitting changes."
3543
msgstr ""
3544
3545
#: bzrlib/builtins.py:5628
3546
msgid "A merge directive provides many things needed for requesting merges:"
3547
msgstr ""
3548
3549
#: bzrlib/builtins.py:5630
3550
msgid "* A machine-readable description of the merge to perform"
3551
msgstr ""
3552
3553
#: bzrlib/builtins.py:5632
3554
msgid "* An optional patch that is a preview of the changes requested"
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5634
3558
msgid ""
3559
"* An optional bundle of revision data, so that the changes can be applied\n"
3560
" directly from the merge directive, without retrieving data from a\n"
3561
" branch."
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5638
3565
msgid ""
3566
"`bzr send` creates a compact data set that, when applied using bzr\n"
3567
"merge, has the same effect as merging from the source branch. "
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5641
3571
msgid ""
3572
"By default the merge directive is self-contained and can be applied to any\n"
3573
"branch containing submit_branch in its ancestory without needing access to\n"
3574
"the source branch."
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5645
3578
msgid ""
3579
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3580
"revisions, but only a structured request to merge from the\n"
3581
"public_location. In that case the public_branch is needed and it must be\n"
3582
"up-to-date and accessible to the recipient. The public_branch is always\n"
3583
"included if known, so that people can check it later."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5651
3587
msgid ""
3588
"The submit branch defaults to the parent of the source branch, but can be\n"
3589
"overridden. Both submit branch and public branch will be remembered in\n"
3590
"branch.conf the first time they are used for a particular branch. The\n"
3591
"source branch defaults to that containing the working directory, but can\n"
3592
"be changed using --from."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5657
3596
msgid ""
3597
"Both the submit branch and the public branch follow the usual behavior with\n"
3598
"respect to --remember: If there is no default location set, the first send\n"
3599
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3600
"omit the location to use the default. To change the default, use\n"
3601
"--remember. The value will only be saved if the location can be accessed."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5663
3605
msgid ""
3606
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3607
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3608
"If a public location is known for the submit_branch, that location is used\n"
3609
"in the merge directive."
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5668
3613
msgid ""
3614
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3615
"given, in which case it is sent to a file."
3616
msgstr ""
3617
3618
#: bzrlib/builtins.py:5671
3619
msgid ""
3620
"Mail is sent using your preferred mail program. This should be transparent\n"
3621
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3622
"If the preferred client can't be found (or used), your editor will be used."
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5675
3626
msgid ""
3627
"To use a specific mail program, set the mail_client configuration option.\n"
3628
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3629
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3630
"(MacOS X's\n"
3631
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3632
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3633
"add\n"
3634
"supported clients."
3635
msgstr ""
3636
3637
#: bzrlib/builtins.py:5682
3638
msgid ""
3639
"If mail is being sent, a to address is required. This can be supplied\n"
3640
"either on the commandline, by setting the submit_to configuration\n"
3641
"option in the branch itself or the child_submit_to configuration option\n"
3642
"in the submit branch."
3643
msgstr ""
3644
3645
#: bzrlib/builtins.py:5687
3646
msgid ""
3647
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3648
"and\n"
3649
"merge directive format 2. It is significantly faster and smaller than\n"
3650
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3651
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3652
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3653
msgstr ""
3654
3655
#: bzrlib/builtins.py:5693
3656
msgid ""
3657
"The merge directives created by bzr send may be applied using bzr merge or\n"
3658
"bzr pull by specifying a file containing a merge directive as the location."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5696
3662
msgid ""
3663
"bzr send makes extensive use of public locations to map local locations "
3664
"into\n"
3665
"URLs that can be used by other people. See `bzr help configuration` to\n"
3666
"set them, and use `bzr info` to display them."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5720
3670
msgid "Write merge directive to this file or directory; use - for stdout."
3671
msgstr ""
3672
3673
#: bzrlib/builtins.py:5724
3674
msgid ""
3675
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3676
"strict disables the check."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5726
3680
msgid "Mail the request to this address."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:5730
3684
msgid "Body for the email."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5783
3688
msgid "Do not include a bundle in the merge directive."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:5784
3692
msgid "Do not include a preview patch in the merge directive."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:5787
3696
msgid "Remember submit and public branch."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:5789
3700
msgid ""
3701
"Branch to generate the submission from, rather than the one containing the "
3702
"working directory."
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3706
msgid "format"
3707
msgstr ""
3708
3709
#: bzrlib/builtins.py:5800
3710
msgid "Use the specified output format."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5822
3714
msgid "Create, remove or modify a tag naming a revision."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:5824
3718
msgid ""
3719
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3720
"(--revision) option can be given -rtag:X, where X is any previously\n"
3721
"created tag."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:5828
3725
msgid ""
3726
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3727
"along when you branch, push, pull or merge."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:5831
3731
msgid ""
3732
"It is an error to give a tag name that already exists unless you pass\n"
3733
"--force, in which case the tag is moved to point to the new revision."
3734
msgstr ""
3735
3736
#: bzrlib/builtins.py:5834
3737
msgid ""
3738
"To rename a tag (change the name but keep it on the same revsion), run "
3739
"``bzr\n"
3740
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:5837
3744
msgid ""
3745
"If no tag name is specified it will be determined through the \n"
3746
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3747
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3748
"details."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:5847
3752
msgid "Delete this tag rather than placing it."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:5850
3756
msgid "Branch in which to place the tag."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:5852
3760
msgid "Replace existing tags."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:5867
3764
msgid "No tag specified to delete."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:5869
3768
#, python-format
3769
msgid "Deleted tag %s."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5883
3773
msgid "Please specify a tag name."
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:5891
3777
#, python-format
3778
msgid "Tag %s already exists for that revision."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:5895
3782
#, python-format
3783
msgid "Created tag %s."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:5897
3787
#, python-format
3788
msgid "Updated tag %s."
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:5901
3792
msgid "List tags."
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:5903
3796
msgid ""
3797
"This command shows a table of tag names and the revisions they reference."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:5909
3801
msgid "Branch whose tags should be displayed."
3802
msgstr ""
3803
3804
#: bzrlib/builtins.py:5911
3805
msgid "Sort tags by different criteria."
3806
msgstr ""
3807
3808
#: bzrlib/builtins.py:5911
3809
msgid "Sorting"
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:5980
3813
msgid "Reconfigure the type of a bzr directory."
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:5982
3817
msgid "A target configuration must be specified."
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:5984
3821
msgid ""
3822
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3823
"The order of preference is\n"
3824
"1. For a lightweight checkout, the current bound location.\n"
3825
"2. For branches that used to be checkouts, the previously-bound location.\n"
3826
"3. The push location.\n"
3827
"4. The parent location.\n"
3828
"If none of these is available, --bind-to must be specified."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:5998
3832
msgid "Tree type"
3833
msgstr ""
3834
3835
#: bzrlib/builtins.py:5999
3836
msgid "The relation between branch and tree."
3837
msgstr ""
3838
3839
#: bzrlib/builtins.py:6001
3840
msgid "Reconfigure to be an unbound branch with no working tree."
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:6002
3844
msgid "Reconfigure to be an unbound branch with a working tree."
3845
msgstr ""
3846
3847
#: bzrlib/builtins.py:6003
3848
msgid "Reconfigure to be a bound branch with a working tree."
3849
msgstr ""
3850
3851
#: bzrlib/builtins.py:6004
3852
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:6009
3856
msgid "Repository type"
3857
msgstr ""
3858
3859
#: bzrlib/builtins.py:6010
3860
msgid "Location fo the repository."
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:6012
3864
msgid ""
3865
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6014
3869
msgid "Reconfigure to use a shared repository."
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:6018
3873
msgid "Trees in Repository"
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:6019
3877
msgid "Whether new branches in the repository have trees."
3878
msgstr ""
3879
3880
#: bzrlib/builtins.py:6021
3881
msgid ""
3882
"Reconfigure repository to create working trees on branches by default."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6023
3886
msgid ""
3887
"Reconfigure repository to not create working trees on branches by default."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:6026
3891
msgid "Branch to bind checkout to."
3892
msgstr ""
3893
3894
#: bzrlib/builtins.py:6028
3895
msgid "Perform reconfiguration even if local changes will be lost."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:6031
3899
msgid "Reconfigure a branch to be stacked on another branch."
3900
msgstr ""
3901
3902
#: bzrlib/builtins.py:6035
3903
msgid ""
3904
"Reconfigure a branch to be unstacked. This may require copying substantial "
3905
"data into it."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6045
3909
msgid "Can't use both --stacked-on and --unstacked"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6059
3913
msgid "No target configuration specified"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6094
3917
msgid "Set the branch of a checkout and update."
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6096
3921
msgid ""
3922
"For lightweight checkouts, this changes the branch being referenced.\n"
3923
"For heavyweight checkouts, this checks that there are no local commits\n"
3924
"versus the current bound branch, then it makes the local branch a mirror\n"
3925
"of the new location and binds to it."
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6101
3929
msgid ""
3930
"In both cases, the working tree is updated and uncommitted changes\n"
3931
"are merged. The user can commit or revert these as they desire."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:6104
3935
msgid "Pending merges need to be committed or reverted before using switch."
3936
msgstr ""
3937
3938
#: bzrlib/builtins.py:6106
3939
msgid ""
3940
"The path to the branch to switch to can be specified relative to the parent\n"
3941
"directory of the current branch. For example, if you are currently in a\n"
3942
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3943
"/path/to/newbranch."
3944
msgstr ""
3945
3946
#: bzrlib/builtins.py:6111
3947
msgid ""
3948
"Bound branches use the nickname of its master branch unless it is set\n"
3949
"locally, in which case switching will update the local nickname to be\n"
3950
"that of the master."
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6119
3954
msgid "Switch even if local commits will be lost."
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6122
3958
msgid "Create the target branch from this one before switching to it."
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6134
3962
msgid "You must supply either a revision or a location"
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6145
3966
msgid "cannot create branch without source branch"
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6209
3970
msgid "Manage filtered views."
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6211
3974
msgid ""
3975
"Views provide a mask over the tree so that users can focus on\n"
3976
"a subset of a tree when doing their work. After creating a view,\n"
3977
"commands that support a list of files - status, diff, commit, etc -\n"
3978
"effectively have that list of files implicitly given each time.\n"
3979
"An explicit list of files can still be given but those files\n"
3980
"must be within the current view."
3981
msgstr ""
3982
3983
#: bzrlib/builtins.py:6218
3984
msgid ""
3985
"In most cases, a view has a short life-span: it is created to make\n"
3986
"a selected change and is deleted once that change is committed.\n"
3987
"At other times, you may wish to create one or more named views\n"
3988
"and switch between them."
3989
msgstr ""
3990
3991
#: bzrlib/builtins.py:6223
3992
msgid ""
3993
"To disable the current view without deleting it, you can switch to\n"
3994
"the pseudo view called ``off``. This can be useful when you need\n"
3995
"to see the whole tree for an operation or two (e.g. merge) but\n"
3996
"want to switch back to your view after that."
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:6228
4000
msgid ""
4001
":Examples:\n"
4002
" To define the current view::"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6231
4006
msgid " bzr view file1 dir1 ..."
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6233
4010
msgid " To list the current view::"
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6235
4014
msgid " bzr view"
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6237
4018
msgid " To delete the current view::"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:6239
4022
msgid " bzr view --delete"
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:6241
4026
msgid " To disable the current view without deleting it::"
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6243
4030
msgid " bzr view --switch off"
4031
msgstr ""
4032
4033
#: bzrlib/builtins.py:6245
4034
msgid " To define a named view and switch to it::"
4035
msgstr ""
4036
4037
#: bzrlib/builtins.py:6247
4038
msgid " bzr view --name view-name file1 dir1 ..."
4039
msgstr ""
4040
4041
#: bzrlib/builtins.py:6249
4042
msgid " To list a named view::"
4043
msgstr ""
4044
4045
#: bzrlib/builtins.py:6251
4046
msgid " bzr view --name view-name"
4047
msgstr ""
4048
4049
#: bzrlib/builtins.py:6253
4050
msgid " To delete a named view::"
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:6255
4054
msgid " bzr view --name view-name --delete"
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6257
4058
msgid " To switch to a named view::"
4059
msgstr ""
4060
4061
#: bzrlib/builtins.py:6259
4062
msgid " bzr view --switch view-name"
4063
msgstr ""
4064
4065
#: bzrlib/builtins.py:6261
4066
msgid " To list all views defined::"
4067
msgstr ""
4068
4069
#: bzrlib/builtins.py:6263
4070
msgid " bzr view --all"
4071
msgstr ""
4072
4073
#: bzrlib/builtins.py:6265
4074
msgid " To delete all views::"
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6267
4078
msgid " bzr view --delete --all"
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6274
4082
msgid "Apply list or delete action to all views."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6277
4086
msgid "Delete the view."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6280
4090
msgid "Name of the view to define, list or delete."
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6284
4094
msgid "Name of the view to switch to."
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:6303
4098
msgid "Both --delete and a file list specified"
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6306
4102
msgid "Both --delete and --switch specified"
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6309
4106
msgid "Deleted all views.\n"
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6311
4110
msgid "No current view to delete"
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:6314
4114
#, python-format
4115
msgid "Deleted '%s' view.\n"
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6318
4119
msgid "Both --switch and a file list specified"
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:6321
4123
msgid "Both --switch and --all specified"
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6324
4127
msgid "No current view to disable"
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6326
4131
#, python-format
4132
msgid "Disabled '%s' view.\n"
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4136
msgid "Using '{0}' view: {1}\n"
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:6333
4140
msgid "Views defined:\n"
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6342
4144
msgid "No views defined.\n"
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6349
4148
msgid "Cannot change the 'off' pseudo view"
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6357
4152
msgid "No current view.\n"
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6360
4156
msgid "'{0}' view is: {1}\n"
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6380
4160
msgid " <no hooks installed>\n"
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:6384
4164
msgid "Remove a branch."
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:6386
4168
msgid ""
4169
"This will remove the branch from the specified location but \n"
4170
"will keep any working tree or repository in place."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6391
4174
msgid " Remove the branch at repo/trunk::"
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6393
4178
msgid " bzr remove-branch repo/trunk"
4179
msgstr ""
4180
4181
#: bzrlib/builtins.py:6408
4182
msgid "Plaintext diff output."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6409
4186
msgid "Temporarily set aside some changes from the current tree."
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6411
4190
msgid ""
4191
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4192
"ie. out of the way, until a later time when you can bring them back from\n"
4193
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4194
"your working tree, and so they aren't propagated along with your branch nor\n"
4195
"will they survive its deletion."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6417
4199
msgid "If shelve --list is specified, previously-shelved changes are listed."
4200
msgstr ""
4201
4202
#: bzrlib/builtins.py:6419
4203
msgid ""
4204
"Shelve is intended to help separate several sets of changes that have\n"
4205
"been inappropriately mingled. If you just want to get rid of all changes\n"
4206
"and you don't need to restore them later, use revert. If you want to\n"
4207
"shelve all text changes at once, use shelve --all."
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6424
4211
msgid ""
4212
"If filenames are specified, only the changes to those files will be\n"
4213
"shelved. Other files will be left untouched."
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6427
4217
msgid ""
4218
"If a revision is specified, changes since that revision will be shelved."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6429
4222
msgid ""
4223
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4224
"restore the most recently shelved changes."
4225
msgstr ""
4226
4227
#: bzrlib/builtins.py:6432
4228
msgid ""
4229
"For complicated changes, it is possible to edit the changes in a separate\n"
4230
"editor program to decide what the file remaining in the working copy\n"
4231
"should look like. To do this, add the configuration option"
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6436
4235
msgid " change_editor = PROGRAM @new_path @old_path"
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6438
4239
msgid ""
4240
"where @new_path is replaced with the path of the new version of the \n"
4241
"file and @old_path is replaced with the path of the old version of \n"
4242
"the file. The PROGRAM should save the new file with the desired \n"
4243
"contents of the file in the working tree.\n"
4244
" "
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6450
4248
msgid "Shelve all changes."
4249
msgstr ""
4250
4251
#: bzrlib/builtins.py:6452
4252
msgid "Method to use for writing diffs."
4253
msgstr ""
4254
4255
#: bzrlib/builtins.py:6452
4256
msgid "writer"
4257
msgstr ""
4258
4259
#: bzrlib/builtins.py:6456
4260
msgid "List shelved changes."
4261
msgstr ""
4262
4263
#: bzrlib/builtins.py:6458
4264
msgid "Destroy removed changes instead of shelving them."
4265
msgstr ""
4266
4267
#: bzrlib/builtins.py:6487
4268
msgid "No shelved changes."
4269
msgstr ""
4270
4271
#: bzrlib/builtins.py:6498
4272
msgid "Restore shelved changes."
4273
msgstr ""
4274
4275
#: bzrlib/builtins.py:6500
4276
msgid ""
4277
"By default, the most recently shelved changes are restored. However if you\n"
4278
"specify a shelf by id those changes will be restored instead. This works\n"
4279
"best when the changes don't depend on each other."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6509
4283
msgid "The action to perform."
4284
msgstr ""
4285
4286
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4287
msgid "action"
4288
msgstr ""
4289
4290
#: bzrlib/builtins.py:6511
4291
msgid "Apply changes and remove from the shelf."
4292
msgstr ""
4293
4294
#: bzrlib/builtins.py:6512
4295
msgid "Show changes, but do not apply or remove them."
4296
msgstr ""
4297
4298
#: bzrlib/builtins.py:6513
4299
msgid ""
4300
"Instead of unshelving the changes, show the diff that would result from "
4301
"unshelving."
4302
msgstr ""
4303
4304
#: bzrlib/builtins.py:6515
4305
msgid "Delete changes without applying them."
4306
msgstr ""
4307
4308
#: bzrlib/builtins.py:6516
4309
msgid "Apply changes but don't delete them."
4310
msgstr ""
4311
4312
#: bzrlib/builtins.py:6531
4313
msgid "Remove unwanted files from working tree."
4314
msgstr ""
4315
4316
#: bzrlib/builtins.py:6533
4317
msgid ""
4318
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4319
"files are never deleted."
4320
msgstr ""
4321
4322
#: bzrlib/builtins.py:6536
4323
msgid ""
4324
"Another class is 'detritus', which includes files emitted by bzr during\n"
4325
"normal operations and selftests. (The value of these files decreases with\n"
4326
"time.)"
4327
msgstr ""
4328
4329
#: bzrlib/builtins.py:6540
4330
msgid ""
4331
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4332
"flags are respected, and may be combined."
4333
msgstr ""
4334
4335
#: bzrlib/builtins.py:6543
4336
msgid "To check what clean-tree will do, use --dry-run."
4337
msgstr ""
4338
4339
#: bzrlib/builtins.py:6546
4340
msgid "Delete all ignored files."
4341
msgstr ""
4342
4343
#: bzrlib/builtins.py:6547
4344
msgid ""
4345
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4346
msgstr ""
4347
4348
#: bzrlib/builtins.py:6550
4349
msgid "Delete files unknown to bzr (default)."
4350
msgstr ""
4351
4352
#: bzrlib/builtins.py:6551
4353
msgid "Show files to delete instead of deleting them."
4354
msgstr ""
4355
4356
#: bzrlib/builtins.py:6553
4357
msgid "Do not prompt before deleting."
4358
msgstr ""
4359
4360
#: bzrlib/bundle/__init__.py:59
4361
msgid "A directory cannot be a bundle"
4362
msgstr ""
4363
4364
#: bzrlib/bundle/apply_bundle.py:40
4365
msgid "Install revisions"
4366
msgstr ""
4367
4368
#: bzrlib/bundle/commands.py:64
4369
msgid "--verbose requires a merge directive"
4370
msgstr ""
4371
4372
#: bzrlib/bundle/commands.py:67
4373
msgid "Bundle format not supported"
4374
msgstr ""
4375
4376
#: bzrlib/bundle/commands.py:77
4377
msgid "Records\n"
4378
msgstr ""
4379
4380
#: bzrlib/bundle/commands.py:81
4381
msgid "{0}: {1} ({2} multiparent)\n"
4382
msgstr ""
4383
4384
#: bzrlib/bundle/commands.py:83
4385
#, python-format
4386
msgid "unique files: %d\n"
4387
msgstr ""
4388
4389
#: bzrlib/bundle/commands.py:92
4390
msgid "Revisions\n"
4391
msgstr ""
4392
4393
#: bzrlib/bundle/commands.py:93
4394
#, python-format
4395
msgid "nicks: %s\n"
4396
msgstr ""
4397
4398
#: bzrlib/bundle/commands.py:95
4399
#, python-format
4400
msgid ""
4401
"committers: \n"
4402
"%s\n"
4403
msgstr ""
4404
4405
#: bzrlib/bundle/commands.py:103
4406
msgid "Decoded contents\n"
4407
msgstr ""
4408
4409
#: bzrlib/bundle/serializer/v4.py:327
4410
#, python-format
4411
msgid "Bundling %d revision."
4412
msgid_plural "Bundling %d revisions."
4413
msgstr[0] ""
4414
msgstr[1] ""
4415
4416
#: bzrlib/bzrdir.py:489
4417
msgid ""
4418
"making backup of {0}\n"
4419
" to {1}"
4420
msgstr ""
4421
4422
#: bzrlib/bzrdir.py:512
4423
msgid "renamed {0} to {1}"
4424
msgstr ""
4425
4426
#: bzrlib/bzrdir.py:1663
4427
#, python-format
4428
msgid ""
4429
"Source repository format does not support stacking, using format:\n"
4430
" %s"
4431
msgstr ""
4432
4433
#: bzrlib/bzrdir.py:1683
4434
#, python-format
4435
msgid ""
4436
"Source branch format does not support stacking, using format:\n"
4437
" %s"
4438
msgstr ""
4439
4440
#: bzrlib/bzrdir.py:1829
4441
msgid "starting repository conversion"
4442
msgstr ""
4443
4444
#: bzrlib/bzrdir.py:2058
4445
msgid "Using default stacking branch {0} at {1}"
4446
msgstr ""
4447
4448
#: bzrlib/check.py:108
4449
msgid "check"
4450
msgstr ""
4451
4452
#: bzrlib/check.py:110
4453
msgid "checking revisions"
4454
msgstr ""
4455
4456
#: bzrlib/check.py:112
4457
msgid "checking commit contents"
4458
msgstr ""
4459
4460
#: bzrlib/check.py:114
4461
msgid "checking file graphs"
4462
msgstr ""
4463
4464
#: bzrlib/check.py:118
4465
msgid "checking branches and trees"
4466
msgstr ""
4467
4468
#: bzrlib/check.py:205
4469
msgid "checked repository {0} format {1}"
4470
msgstr ""
4471
4472
#: bzrlib/check.py:208
4473
#, python-format
4474
msgid "%6d revisions"
4475
msgstr ""
4476
4477
#: bzrlib/check.py:209
4478
#, python-format
4479
msgid "%6d file-ids"
4480
msgstr ""
4481
4482
#: bzrlib/check.py:211
4483
#, python-format
4484
msgid "%6d unreferenced text versions"
4485
msgstr ""
4486
4487
#: bzrlib/check.py:215
4488
msgid "unreferenced version: {{{0}}} in {1}"
4489
msgstr ""
4490
4491
#: bzrlib/check.py:218
4492
#, python-format
4493
msgid "%6d revisions are missing inventory_sha1"
4494
msgstr ""
4495
4496
#: bzrlib/check.py:221
4497
#, python-format
4498
msgid "%6d revisions are mentioned but not present"
4499
msgstr ""
4500
4501
#: bzrlib/check.py:224
4502
#, python-format
4503
msgid "%6d ghost revisions"
4504
msgstr ""
4505
4506
#: bzrlib/check.py:229
4507
#, python-format
4508
msgid "%6d revisions missing parents in ancestry"
4509
msgstr ""
4510
4511
#: bzrlib/check.py:233
4512
#, python-format
4513
msgid " %s should be in the ancestry for:"
4514
msgstr ""
4515
4516
#: bzrlib/check.py:237
4517
#, python-format
4518
msgid "%6d inconsistent parents"
4519
msgstr ""
4520
4521
#: bzrlib/check.py:241
4522
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4523
msgstr ""
4524
4525
#: bzrlib/check.py:247
4526
#, python-format
4527
msgid "%6d revisions have incorrect parents in the revision index"
4528
msgstr ""
4529
4530
#: bzrlib/check.py:253
4531
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4532
msgstr ""
4533
4534
#: bzrlib/check.py:267
4535
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4536
msgstr ""
4537
4538
#: bzrlib/check.py:296
4539
msgid ""
4540
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4541
"{{{4}}}"
4542
msgstr ""
4543
4544
#: bzrlib/check.py:354
4545
#, python-format
4546
msgid "Checking branch at '%s'."
4547
msgstr ""
4548
4549
#: bzrlib/check.py:374
4550
#, python-format
4551
msgid "Checking working tree at '%s'."
4552
msgstr ""
4553
4554
#: bzrlib/check.py:427 bzrlib/check.py:441
4555
msgid "No branch found at specified location."
4556
msgstr ""
4557
4558
#: bzrlib/check.py:429 bzrlib/check.py:439
4559
msgid "No working tree found at specified location."
4560
msgstr ""
4561
4562
#: bzrlib/check.py:432
4563
#, python-format
4564
msgid "Checking repository at '%s'."
4565
msgstr ""
4566
4567
#: bzrlib/check.py:443
4568
msgid "No repository found at specified location."
4569
msgstr ""
4570
4571
#: bzrlib/clean_tree.py:63
4572
msgid "Nothing to delete."
4573
msgstr ""
4574
4575
#: bzrlib/clean_tree.py:68
4576
msgid "Are you sure you wish to delete these"
4577
msgstr ""
4578
4579
#: bzrlib/clean_tree.py:70
4580
msgid "Canceled"
4581
msgstr ""
4582
4583
#: bzrlib/clean_tree.py:107
4584
#, python-format
4585
msgid "unable to remove %s"
4586
msgstr ""
4587
4588
#: bzrlib/clean_tree.py:111
4589
msgid "deleting paths:"
4590
msgstr ""
4591
4592
#: bzrlib/clean_tree.py:125
4593
msgid "unable to remove \"{0}\": {1}."
4594
msgstr ""
4595
4596
#: bzrlib/clean_tree.py:130
4597
msgid "No files deleted."
4598
msgstr ""
4599
4600
#: bzrlib/cmd_version_info.py:47
4601
msgid "No known version info format {0}. Supported types are: {1}"
4602
msgstr ""
4603
4604
#: bzrlib/cmd_version_info.py:52
4605
msgid "Version info in Custom template-based format."
4606
msgstr ""
4607
4608
#: bzrlib/cmd_version_info.py:52
4609
msgid "Version info in Python format."
4610
msgstr ""
4611
4612
#: bzrlib/cmd_version_info.py:52
4613
msgid "Version info in RIO (simple text) format (default)."
4614
msgstr ""
4615
4616
#: bzrlib/cmd_version_info.py:53
4617
msgid "Show version information about this tree."
4618
msgstr ""
4619
4620
#: bzrlib/cmd_version_info.py:55
4621
msgid ""
4622
"You can use this command to add information about version into\n"
4623
"source code of an application. The output can be in one of the\n"
4624
"supported formats or in a custom format based on a template."
4625
msgstr ""
4626
4627
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4628
#: en/help_topics/configuration.txt:710
4629
msgid "For example::"
4630
msgstr ""
4631
4632
#: bzrlib/cmd_version_info.py:61
4633
msgid ""
4634
" bzr version-info --custom \\\n"
4635
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4636
msgstr ""
4637
4638
#: bzrlib/cmd_version_info.py:64
4639
msgid ""
4640
"will produce a C header file with formatted string containing the\n"
4641
"current revision number. Other supported variables in templates are:"
4642
msgstr ""
4643
4644
#: bzrlib/cmd_version_info.py:67
4645
msgid ""
4646
" * {date} - date of the last revision\n"
4647
" * {build_date} - current date\n"
4648
" * {revno} - revision number\n"
4649
" * {revision_id} - revision id\n"
4650
" * {branch_nick} - branch nickname\n"
4651
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4652
" otherwise 1"
4653
msgstr ""
4654
4655
#: bzrlib/cmd_version_info.py:77
4656
msgid "Select the output format."
4657
msgstr ""
4658
4659
#: bzrlib/cmd_version_info.py:81
4660
msgid "Include all possible information."
4661
msgstr ""
4662
4663
#: bzrlib/cmd_version_info.py:82
4664
msgid "Check if tree is clean."
4665
msgstr ""
4666
4667
#: bzrlib/cmd_version_info.py:84
4668
msgid "Include the revision-history."
4669
msgstr ""
4670
4671
#: bzrlib/cmd_version_info.py:86
4672
msgid "Include the last revision for each file."
4673
msgstr ""
4674
4675
#: bzrlib/cmd_version_info.py:87
4676
msgid "Template for the output."
4677
msgstr ""
4678
4679
#: bzrlib/cmd_version_info.py:101
4680
msgid "bzr version-info --revision takes exactly one revision specifier"
4681
msgstr ""
4682
4683
#: bzrlib/commands.py:228
4684
#, python-format
4685
msgid "unknown command \"%s\""
4686
msgstr ""
4687
4688
#: bzrlib/commands.py:475
4689
msgid "No help for this command."
4690
msgstr ""
4691
4692
#: bzrlib/commands.py:488
4693
#, python-format
4694
msgid ":Purpose: %s\n"
4695
msgstr ""
4696
4697
#: bzrlib/commands.py:490
4698
#, python-format
4699
msgid ""
4700
":Usage:\n"
4701
"%s\n"
4702
msgstr ""
4703
4704
#: bzrlib/commands.py:492
4705
#, python-format
4706
msgid ":Usage: %s\n"
4707
msgstr ""
4708
4709
#: bzrlib/commands.py:511
4710
#, python-format
4711
msgid ":Options:%s"
4712
msgstr ""
4713
4714
#: bzrlib/commands.py:522
4715
#, python-format
4716
msgid ""
4717
":Description:\n"
4718
" %s\n"
4719
"\n"
4720
msgstr ""
4721
4722
#: bzrlib/commands.py:532
4723
#, python-format
4724
msgid ""
4725
"See bzr help %s for more details and examples.\n"
4726
"\n"
4727
msgstr ""
4728
4729
#: bzrlib/commands.py:537
4730
msgid ":Aliases: "
4731
msgstr ""
4732
4733
#: bzrlib/commands.py:541
4734
#, python-format
4735
msgid ":From: plugin \"%s\"\n"
4736
msgstr ""
4737
4738
#: bzrlib/commands.py:553
4739
msgid ":doc:`{0} <{1}-help>`"
4740
msgstr ""
4741
4742
#: bzrlib/commands.py:557
4743
#, python-format
4744
msgid ":See also: %s"
4745
msgstr ""
4746
4747
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4748
msgid "Only ASCII permitted in option names"
4749
msgstr ""
4750
4751
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4752
msgid "command {0!r} needs one or more {1}"
4753
msgstr ""
4754
4755
#: bzrlib/commands.py:857
4756
msgid "command {0!r} requires argument {1}"
4757
msgstr ""
4758
4759
#: bzrlib/commands.py:864
4760
msgid "extra argument to command {0}: {1}"
4761
msgstr ""
4762
4763
#: bzrlib/commands.py:961
4764
#, python-format
4765
msgid "Profile data written to \"%s\"."
4766
msgstr ""
4767
4768
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4769
msgid "added"
4770
msgstr ""
4771
4772
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4773
msgid "modified"
4774
msgstr ""
4775
4776
#: bzrlib/commit.py:131
4777
#, python-format
4778
msgid "Committing%s"
4779
msgstr ""
4780
4781
#: bzrlib/commit.py:134
4782
#, python-format
4783
msgid "Committed revision %d."
4784
msgstr ""
4785
4786
#: bzrlib/commit.py:143
4787
#, python-format
4788
msgid "deleted %s"
4789
msgstr ""
4790
4791
#: bzrlib/commit.py:146
4792
#, python-format
4793
msgid "missing %s"
4794
msgstr ""
4795
4796
#: bzrlib/commit.py:511
4797
msgid ""
4798
"Conflicting tags in bound branch:\n"
4799
"{0}"
4800
msgstr ""
4801
4802
#: bzrlib/commit.py:742
4803
msgid "renamed"
4804
msgstr ""
4805
4806
#: bzrlib/commit.py:977
4807
msgid "unchanged"
4808
msgstr ""
4809
4810
#: bzrlib/commit.py:999
4811
msgid "{0} [{1}] - Stage"
4812
msgstr ""
4813
4814
#: bzrlib/commit.py:1002
4815
#, python-format
4816
msgid "%s - Stage"
4817
msgstr ""
4818
4819
#: bzrlib/commit_signature_commands.py:36
4820
msgid "Sign all commits by a given committer."
4821
msgstr ""
4822
4823
#: bzrlib/commit_signature_commands.py:38
4824
msgid ""
4825
"If location is not specified the local tree is used.\n"
4826
"If committer is not specified the default committer is used."
4827
msgstr ""
4828
4829
#: bzrlib/commit_signature_commands.py:41
4830
msgid "This does not sign commits that already have signatures."
4831
msgstr ""
4832
4833
#: bzrlib/commit_signature_commands.py:49
4834
msgid ""
4835
"Don't actually sign anything, just print the revisions that would be signed."
4836
msgstr ""
4837
4838
#: bzrlib/commit_signature_commands.py:103
4839
msgid "Verify all commit signatures."
4840
msgstr ""
4841
4842
#: bzrlib/commit_signature_commands.py:105
4843
msgid ""
4844
"Verifies that all commits in the branch are signed by known GnuPG keys."
4845
msgstr ""
4846
4847
#: bzrlib/commit_signature_commands.py:110
4848
msgid ""
4849
"Comma separated list of GPG key patterns which are acceptable for "
4850
"verification."
4851
msgstr ""
4852
4853
#: bzrlib/commit_signature_commands.py:147
4854
msgid "Cannot verify a range of non-revision-history revisions"
4855
msgstr ""
4856
4857
#: bzrlib/commit_signature_commands.py:168
4858
msgid "All commits signed with verifiable keys"
4859
msgstr ""
4860
4861
#: bzrlib/config.py:475
4862
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4863
msgstr ""
4864
4865
#: bzrlib/config.py:2499
4866
msgid "{0} is not an SI unit."
4867
msgstr ""
4868
4869
#: bzrlib/config.py:2956
4870
msgid ""
4871
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4872
"will be saved."
4873
msgstr ""
4874
4875
#: bzrlib/config.py:3100
4876
#, python-format
4877
msgid "Invalid '%s', should be of the form 'name=value'"
4878
msgstr ""
4879
4880
#: bzrlib/config.py:3969
4881
msgid "Display, set or remove a configuration option."
4882
msgstr ""
4883
4884
#: bzrlib/config.py:3971
4885
msgid "Display the active value for a given option."
4886
msgstr ""
4887
4888
#: bzrlib/config.py:3973
4889
msgid ""
4890
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4891
"matching options are displayed mentioning their scope. The active value\n"
4892
"that bzr will take into account is the first one displayed for each option."
4893
msgstr ""
4894
4895
#: bzrlib/config.py:3977
4896
msgid "If no NAME is given, --all .* is implied."
4897
msgstr ""
4898
4899
#: bzrlib/config.py:3979
4900
msgid ""
4901
"Setting a value is achieved by using name=value without spaces. The value\n"
4902
"is set in the most relevant scope and can be checked by displaying the\n"
4903
"option again."
4904
msgstr ""
4905
4906
#: bzrlib/config.py:3991
4907
msgid "Reduce the scope to the specified configuration file."
4908
msgstr ""
4909
4910
#: bzrlib/config.py:3995
4911
msgid "Display all the defined values for the matching options."
4912
msgstr ""
4913
4914
#: bzrlib/config.py:3997
4915
msgid "Remove the option from the configuration file."
4916
msgstr ""
4917
4918
#: bzrlib/conflicts.py:50
4919
msgid "List files with conflicts."
4920
msgstr ""
4921
4922
#: bzrlib/conflicts.py:57
4923
msgid ""
4924
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4925
"is supplied, the pathnames of files with text conflicts are listed,\n"
4926
"instead. (This is useful for editing all files with text conflicts.)"
4927
msgstr ""
4928
4929
#: bzrlib/conflicts.py:61
4930
msgid "Use bzr resolve when you have fixed a problem."
4931
msgstr ""
4932
4933
#: bzrlib/conflicts.py:66
4934
msgid "List paths of files with text conflicts."
4935
msgstr ""
4936
4937
#: bzrlib/conflicts.py:85
4938
msgid "Marks the conflict as resolved."
4939
msgstr ""
4940
4941
#: bzrlib/conflicts.py:88
4942
msgid "Resolve the conflict preserving the version in the working tree."
4943
msgstr ""
4944
4945
#: bzrlib/conflicts.py:91
4946
msgid "Resolve the conflict taking the merged version into account."
4947
msgstr ""
4948
4949
#: bzrlib/conflicts.py:98
4950
msgid "How to resolve the conflict."
4951
msgstr ""
4952
4953
#: bzrlib/conflicts.py:104
4954
msgid "Mark a conflict as resolved."
4955
msgstr ""
4956
4957
#: bzrlib/conflicts.py:111
4958
msgid ""
4959
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4960
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4961
"as\n"
4962
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4963
msgstr ""
4964
4965
#: bzrlib/conflicts.py:119
4966
msgid "Resolve all conflicts in this tree."
4967
msgstr ""
4968
4969
#: bzrlib/conflicts.py:126
4970
msgid "If --all is specified, no FILE may be provided"
4971
msgstr ""
4972
4973
#: bzrlib/conflicts.py:151
4974
#, python-format
4975
msgid "%d conflict auto-resolved."
4976
msgid_plural "%d conflicts auto-resolved."
4977
msgstr[0] ""
4978
msgstr[1] ""
4979
4980
#: bzrlib/conflicts.py:154
4981
msgid "Remaining conflicts:"
4982
msgstr ""
4983
4984
#: bzrlib/conflicts.py:159
4985
msgid "All conflicts resolved."
4986
msgstr ""
4987
4988
#: bzrlib/conflicts.py:168
4989
msgid "{0} conflict resolved, {1} remaining"
4990
msgid_plural "{0} conflicts resolved, {1} remaining"
4991
msgstr[0] ""
4992
msgstr[1] ""
4993
4994
#: bzrlib/controldir.py:698
4995
msgid "{0} is{1} redirected to {2}"
4996
msgstr ""
4997
4998
#: bzrlib/diff.py:399
4999
#, python-format
5000
msgid "*** Ignoring files outside view. View is %s"
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:157
5004
msgid "The tree builder is already building a tree."
5005
msgstr ""
5006
5007
#: bzrlib/errors.py:178
5008
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:197
5012
msgid ""
5013
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5014
"versions \"%(minimum)s\" to \"%(current)s\"."
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:209
5018
msgid "The transport '%(transport)s' is only accessible within this process."
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:227
5022
msgid "Invalid revision number %(revno)s"
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:236
5026
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5027
msgstr ""
5028
5029
#: bzrlib/errors.py:247
5030
msgid "Reserved revision-id {%(revision_id)s}"
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:261
5034
msgid "There is no public branch set for \"%(branch_url)s\"."
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:271
5038
msgid ""
5039
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5040
"obtain a list of topics."
5041
msgstr ""
5042
5043
#: bzrlib/errors.py:280
5044
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:290
5048
msgid ""
5049
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:299
5053
msgid "The branch '%(branch)s' is not stacked."
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:313
5057
msgid "No WorkingTree exists for \"%(base)s\"."
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:322
5061
msgid "Not currently building a tree."
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:327
5065
msgid "%(url)s is not a local path."
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:355
5069
msgid "%(not_locked)r is not write locked but needs to be."
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:363
5073
msgid "Error in command line options"
5074
msgstr ""
5075
5076
#: bzrlib/errors.py:368
5077
msgid "%(value)s is not an index of type %(_type)s."
5078
msgstr ""
5079
5080
#: bzrlib/errors.py:378
5081
msgid "Error in data for index %(value)s."
5082
msgstr ""
5083
5084
#: bzrlib/errors.py:387
5085
msgid "The key '%(key)s' is already in index '%(index)s'."
5086
msgstr ""
5087
5088
#: bzrlib/errors.py:397
5089
msgid "The key '%(key)s' is not a valid key."
5090
msgstr ""
5091
5092
#: bzrlib/errors.py:406
5093
msgid "Could not parse options for index %(value)s."
5094
msgstr ""
5095
5096
#: bzrlib/errors.py:415
5097
msgid "The value '%(value)s' is not a valid value."
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:443
5101
msgid "Generic path error: %(path)r%(extra)s)"
5102
msgstr ""
5103
5104
#: bzrlib/errors.py:456
5105
msgid "No such file: %(path)r%(extra)s"
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:461
5109
msgid "File exists: %(path)r%(extra)s"
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:467
5113
msgid ""
5114
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5115
"after to tell bzr about a rename that has already happened)%(extra)s"
5116
msgstr ""
5117
5118
#: bzrlib/errors.py:483
5119
msgid "\"%(path)s\" is not a directory %(extra)s"
5120
msgstr ""
5121
5122
#: bzrlib/errors.py:488
5123
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5124
msgstr ""
5125
5126
#: bzrlib/errors.py:493
5127
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5128
msgstr ""
5129
5130
#: bzrlib/errors.py:498
5131
msgid "Hard-linking \"%(path)s\" is not supported"
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:513
5135
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5136
msgstr ""
5137
5138
#: bzrlib/errors.py:518
5139
msgid "Permission denied: \"%(path)s\"%(extra)s"
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:523
5143
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5144
msgstr ""
5145
5146
#: bzrlib/errors.py:528
5147
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5148
msgstr ""
5149
5150
#: bzrlib/errors.py:539
5151
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5152
msgstr ""
5153
5154
#: bzrlib/errors.py:561
5155
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5156
msgstr ""
5157
5158
#: bzrlib/errors.py:571
5159
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:579
5163
msgid ""
5164
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5165
"upgrade the branch to permit branch stacking."
5166
msgstr ""
5167
5168
#: bzrlib/errors.py:590
5169
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5170
msgstr ""
5171
5172
#: bzrlib/errors.py:600
5173
msgid ""
5174
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5175
"need to upgrade the repository to permit branch stacking."
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:611
5179
msgid "Error reading from %(path)r."
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:630
5183
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:646
5187
msgid "Path \"%(path)s\" is not unicode normalized"
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:654
5191
msgid "Not a branch: \"%(path)s\"%(detail)s."
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:696
5195
msgid "No submit branch available for branch \"%(path)s\""
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:705
5199
msgid "Already a branch: \"%(path)s\"."
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:711
5203
msgid ""
5204
"Directory contains a branch, but no working tree (use bzr checkout if you "
5205
"wish to build a working tree): \"%(path)s\""
5206
msgstr ""
5207
5208
#: bzrlib/errors.py:716
5209
msgid ""
5210
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:726
5214
msgid ""
5215
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5216
msgstr ""
5217
5218
#: bzrlib/errors.py:736
5219
msgid "No repository present: \"%(path)s\""
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:743
5223
msgid ""
5224
"Unsupported branch format: %(format)s\n"
5225
"Please run 'bzr upgrade'"
5226
msgstr ""
5227
5228
#: bzrlib/errors.py:749
5229
msgid "Unknown %(kind)s format: %(format)r"
5230
msgstr ""
5231
5232
#: bzrlib/errors.py:758
5233
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5234
msgstr ""
5235
5236
#: bzrlib/errors.py:768
5237
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5238
msgstr ""
5239
5240
#: bzrlib/errors.py:783
5241
msgid ""
5242
"%(target)s\n"
5243
"is not compatible with\n"
5244
"%(source)s\n"
5245
"%(details)s"
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:799
5249
msgid "Revision is not compatible with %(repo_format)s"
5250
msgstr ""
5251
5252
#: bzrlib/errors.py:809
5253
msgid "%(context_info)s%(path)s is already versioned."
5254
msgstr ""
5255
5256
#: bzrlib/errors.py:830
5257
msgid "%(context_info)s%(path)s is not versioned."
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:851
5261
msgid "Path(s) are not versioned: %(paths_as_string)s"
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:862
5265
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:881
5269
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:889
5273
msgid ""
5274
"Filename %(filename)r is not valid in your current filesystem encoding "
5275
"%(fs_encoding)s"
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:900
5279
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5280
msgstr ""
5281
5282
#: bzrlib/errors.py:918
5283
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:957
5287
msgid "Cannot lock %(lock)s: %(why)s"
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:967
5291
msgid ""
5292
"A transaction related operation was attempted after the transaction finished."
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:994
5296
msgid "Cannot lock: transport is read only: %(transport)s"
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:1002
5300
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:1013
5304
msgid ""
5305
"Lock was broken while still open: %(lock)s - check storage consistency!"
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:1024
5309
msgid ""
5310
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5311
"%(holder)r, wanted to break %(target)r"
5312
msgstr ""
5313
5314
#: bzrlib/errors.py:1036
5315
msgid ""
5316
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5317
"Use 'bzr break-lock' to clear it"
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1049
5321
msgid "Lock not held: %(lock)s"
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1078
5325
msgid "No changes to commit"
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1083
5329
msgid ""
5330
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1093
5334
msgid ""
5335
"Excluding paths during commit is not supported by repository at "
5336
"%(repository)r."
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:1102
5340
msgid ""
5341
"The specified commit message contains characters unsupported by the current "
5342
"encoding."
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:1108
5346
msgid "Upgrade URL cannot work with readonly URLs."
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1113
5350
msgid "The branch format %(format)s is already at the most recent format."
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1136
5354
msgid "Option --change does not accept revision ranges"
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:1141
5358
msgid "No namespace registered for string: %(spec)r"
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:1160
5362
msgid ""
5363
"Requested revision: '%(spec)s' does not exist in branch: "
5364
"%(branch_url)s%(extra)s"
5365
msgstr ""
5366
5367
#: bzrlib/errors.py:1174
5368
msgid ""
5369
"Operation denied because it would change the main history, which is not "
5370
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1185
5374
msgid ""
5375
"These branches have diverged. Use the missing command to see how.\n"
5376
"Use the merge command to reconcile them."
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:1205
5380
msgid ""
5381
"Branches have no common ancestor, and no merge base revision was specified."
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1211
5385
msgid ""
5386
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1217
5390
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1226
5394
msgid ""
5395
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5396
msgstr ""
5397
5398
#: bzrlib/errors.py:1235
5399
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:1244
5403
msgid "Branch %(branch)s has no commits."
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:1262
5407
msgid ""
5408
"Bound branch %(branch)s is out of date with master branch "
5409
"%(master)s.%(extra_help)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1274
5413
msgid ""
5414
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5415
"bound to %(remote)s."
5416
msgstr ""
5417
5418
#: bzrlib/errors.py:1286
5419
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5420
msgstr ""
5421
5422
#: bzrlib/errors.py:1295
5423
msgid ""
5424
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5425
"%(error)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1307
5429
msgid "Error in processing weave: %(msg)s"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1316
5433
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1327
5437
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1337
5441
msgid "Weave invariant violated: %(what)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1346
5445
msgid "Parents are mismatched between two revisions. %(msg)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1368
5449
msgid ""
5450
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5451
"%(weave_b)s"
5452
msgstr ""
5453
5454
#: bzrlib/errors.py:1380
5455
msgid "Versioned file error"
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:1385
5459
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5460
msgstr ""
5461
5462
#: bzrlib/errors.py:1395
5463
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:1405
5467
msgid "Text did not match its checksum: %(msg)s"
5468
msgstr ""
5469
5470
#: bzrlib/errors.py:1531
5471
msgid "Export format %(format)r not supported"
5472
msgstr ""
5473
5474
#: bzrlib/errors.py:1540
5475
msgid "Transport error: %(msg)s %(orig_error)s"
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:1566
5479
msgid "Generic bzr smart protocol error: %(details)s"
5480
msgstr ""
5481
5482
#: bzrlib/errors.py:1574
5483
msgid "Received bad protocol version marker: %(marker)r"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:1606
5487
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:1611
5491
msgid "Connection error: %(msg)s %(orig_error)s"
5492
msgstr ""
5493
5494
#: bzrlib/errors.py:1616
5495
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1637
5499
msgid "Connection closed: %(msg)s %(orig_error)s"
5500
msgstr ""
5501
5502
#: bzrlib/errors.py:1642
5503
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:1647
5507
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1657
5511
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:1672
5515
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:1686
5519
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5520
msgstr ""
5521
5522
#: bzrlib/errors.py:1694
5523
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:1703
5527
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:1717
5531
msgid "Too many redirections"
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:1722
5535
msgid "Working tree has conflicts."
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:1726
5539
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:1735
5543
msgid ""
5544
"Error(s) parsing config file %(filename)s:\n"
5545
"%(errors)s"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1746
5549
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1754
5553
msgid "%(username)r does not seem to contain a reasonable email address"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1763
5557
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:1771
5561
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:1779
5565
msgid "Unable to import library \"%(library)s\": %(error)s"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:1787
5569
msgid "python-gpgme is not installed, it is needed to verify signatures"
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:1795
5573
msgid ""
5574
"The working tree for %(basedir)s has changed since the last commit, but "
5575
"weave merge requires that it be unchanged"
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:1805
5579
msgid ""
5580
"Can't reprocess and show base, because reprocessing obscures the "
5581
"relationship of conflicting lines to the base"
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:1811
5585
msgid "Cycle in graph %(graph)r"
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:1839
5589
msgid "File %(filename)s is not conflicted."
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:1861
5593
msgid "No bundle was found in \"%(filename)s\"."
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:1870
5597
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:1880
5601
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:1893
5605
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:1903
5609
msgid "Key %(key)s is already present in map"
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:1908
5613
msgid "The prefix %(prefix)s is in the help search path twice."
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:1918
5617
msgid ""
5618
"No final name for trans_id %(trans_id)r\n"
5619
"file-id: %(file_id)r\n"
5620
"root trans-id: %(root_trans_id)r\n"
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:1950
5624
msgid "Attempt to reuse a transform that has already been applied."
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:1955
5628
msgid "Moving the root directory is not supported at this time"
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:1960
5632
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:1971
5636
msgid ""
5637
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:2007
5641
msgid ""
5642
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5643
msgstr ""
5644
5645
#: bzrlib/errors.py:2037
5646
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5647
msgstr ""
5648
5649
#: bzrlib/errors.py:2045
5650
msgid "Nothing to merge."
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:2050
5654
msgid "Format %(format)s cannot be initialised by this version of bzr."
5655
msgstr ""
5656
5657
#: bzrlib/errors.py:2059
5658
msgid ""
5659
"Cannot convert from format %(from_format)s to format %(format)s. "
5660
"%(problem)s"
5661
msgstr ""
5662
5663
#: bzrlib/errors.py:2071
5664
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2079
5668
msgid "%(exe_name)s could not be found on this machine"
5669
msgstr ""
5670
5671
#: bzrlib/errors.py:2087
5672
msgid "Diff is not installed on this machine: %(msg)s"
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:2095
5676
msgid "Diff3 is not installed on this machine."
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2101
5680
msgid "The content being inserted is already present."
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:2106
5684
msgid ""
5685
"This tree contains left-over files from a failed operation.\n"
5686
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5687
"to\n"
5688
" keep, and delete it when you are done."
5689
msgstr ""
5690
5691
#: bzrlib/errors.py:2117
5692
msgid ""
5693
"This tree contains left-over files from a failed operation.\n"
5694
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5695
" wish to keep, and delete it when you are done."
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2127
5699
msgid ""
5700
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5701
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5702
"to\n"
5703
" keep, and delete it when you are done."
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:2138
5707
msgid ""
5708
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5709
"examine %(pending_deletion)s to see if it contains any files you wish to "
5710
"keep, and delete it when you are done."
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2148
5714
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:2162
5718
msgid ""
5719
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:2175
5723
msgid "Error in merge modified format"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:2180
5727
msgid "Format error in conflict listings"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:2184
5731
msgid ""
5732
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5733
"Error: %(description)s"
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2195
5737
msgid ""
5738
"An error has been detected in the repository %(repo_path)s.\n"
5739
"Please run bzr reconcile on this repository."
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:2206
5743
msgid ""
5744
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5745
"reason: %(reason)s"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:2219
5749
msgid ""
5750
"An inconsistent delta was supplied: %(delta)r\n"
5751
"reason: %(reason)s"
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:2231
5755
msgid "To use this feature you must upgrade your branch at %(path)s."
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:2240
5759
msgid "To use this feature you must upgrade your repository at %(path)s."
5760
msgstr ""
5761
5762
#: bzrlib/errors.py:2245
5763
msgid ""
5764
"To use this feature you must upgrade your branch at %(path)s to a format "
5765
"which supports rich roots."
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:2251
5769
msgid "Cannot perform local-only commits on unbound branches."
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:2256
5773
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:2277
5777
msgid "Ghost tags not supported by format %(format)r."
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:2285
5781
msgid "File is binary but should be text."
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:2290
5785
msgid "The path %(path)s is not permitted on this platform"
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:2299
5789
msgid ""
5790
"Testament did not match expected value.\n"
5791
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5792
" {%(measured)s}"
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2311
5796
msgid "Not a bzr revision-bundle: %(text)r"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2320
5800
msgid "Bad bzr revision-bundle: %(text)r"
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2329
5804
msgid "Malformed bzr revision-bundle header: %(text)r"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2334
5808
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2339
5812
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5813
msgstr ""
5814
5815
#: bzrlib/errors.py:2344
5816
msgid "End of line marker was not \\n in bzr revision-bundle"
5817
msgstr ""
5818
5819
#: bzrlib/errors.py:2354
5820
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:2364
5824
msgid "Root class for inventory serialization errors"
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2368
5828
msgid ""
5829
"The inventory was not in the expected format:\n"
5830
" %(msg)s"
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2377
5834
msgid "This operation requires rich root data storage"
5835
msgstr ""
5836
5837
#: bzrlib/errors.py:2390
5838
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2399
5842
msgid ""
5843
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5844
"variable."
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2406
5848
msgid ""
5849
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5850
"ghost at {%(ghost_revision_id)s}"
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:2416
5854
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2467
5858
msgid ""
5859
"A merge directive must provide either a bundle or a public branch location."
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2474
5863
msgid "Bad merge directive payload %(start)r"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2484
5867
msgid "Preview patch does not match requested changes."
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2490
5871
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2500
5875
msgid ""
5876
"Your branch does not have all of the revisions required in order to merge "
5877
"this merge directive and the target location specified in the merge "
5878
"directive is not a branch: %(location)s."
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2512
5882
msgid "Unsupported entry kind %(kind)s"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2520
5886
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2530
5890
msgid "Subsume target %(other_tree)s needs to be upgraded."
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2549
5894
msgid "No such tag: %(tag_name)s"
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2557
5898
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2566
5902
msgid "Tag %(tag_name)s already exists."
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2574
5906
msgid ""
5907
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5908
"bugs\" for more information on this feature."
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:2584
5912
msgid ""
5913
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:2594
5917
msgid ""
5918
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2604
5922
msgid "Invalid line in bugs property: '%(line)s'"
5923
msgstr ""
5924
5925
#: bzrlib/errors.py:2612
5926
msgid "Invalid bug status: '%(status)s'"
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2620
5930
msgid "Could not understand response from smart server: %(response_tuple)r"
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2659
5934
msgid "Server sent an unexpected error: %(error_tuple)r"
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2678
5938
msgid "Unrecognised container format: %(container_format)r"
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2686
5942
msgid "Unexpected end of container stream"
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2691
5946
msgid "Unknown record type: %(record_type)r"
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2699
5950
msgid "Invalid record: %(reason)s"
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2707
5954
msgid "Container has data after end marker: %(excess)r"
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:2715
5958
msgid "Container has multiple records with the same name: %(name)s"
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2728
5962
msgid "Corrupt or incompatible data stream: %(reason)s"
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2736
5966
msgid "SMTP error: %(error)s"
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2744
5970
msgid "No message supplied."
5971
msgstr ""
5972
5973
#: bzrlib/errors.py:2749
5974
msgid "No mail-to address (--mail-to) or output (-o) specified."
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2754
5978
msgid "Unknown mail client: %(mail_client)s"
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:2762
5982
msgid ""
5983
"Unable to find mail client with the following names: "
5984
"%(mail_command_list_string)s"
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:2772
5988
msgid "SMTP connection to %(host)s refused"
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:2781
5992
msgid "Please specify smtp_server. No server at default %(host)s."
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:2795
5996
msgid ""
5997
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5998
"reconfigure."
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2807
6002
msgid "'%(display_url)s' is already a branch."
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:2812
6006
msgid "'%(display_url)s' is already a tree."
6007
msgstr ""
6008
6009
#: bzrlib/errors.py:2817
6010
msgid "'%(display_url)s' is already a checkout."
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:2822
6014
msgid "'%(display_url)s' is already a lightweight checkout."
6015
msgstr ""
6016
6017
#: bzrlib/errors.py:2827
6018
msgid "'%(display_url)s' is already using a shared repository."
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:2832
6022
msgid "'%(display_url)s' is already standalone."
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:2837
6026
msgid "Shared repository '%(display_url)s' already creates working trees."
6027
msgstr ""
6028
6029
#: bzrlib/errors.py:2843
6030
msgid ""
6031
"Shared repository '%(display_url)s' already doesn't create working trees."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:2849
6035
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:2854
6039
msgid "No location could be found to bind to at %(display_url)s."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:2859
6043
msgid ""
6044
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6045
"status).%(more)s"
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:2878
6049
msgid ""
6050
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6051
"list).%(more)s"
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:2884
6055
msgid "Variable {%(name)s} is not available."
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:2892
6059
msgid "No template specified."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:2897
6063
msgid "Unable to create symlink %(path_str)son this platform"
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:2912
6067
msgid ""
6068
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6069
"\"original\", \"local\"."
6070
msgstr ""
6071
6072
#: bzrlib/errors.py:2946
6073
msgid ""
6074
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:2958
6078
msgid "The \"%(config_id)s\" configuration does not exist."
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:2966
6082
msgid "The \"%(option_name)s\" configuration option does not exist."
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:2974
6086
msgid "The alias \"%(alias_name)s\" does not exist."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:2988
6090
msgid "\"%(alias_name)s\" is not a valid location alias."
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2996
6094
msgid "No %(alias_name)s location assigned."
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:3004
6098
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:3014
6102
msgid "Unknown rules detected: %(unknowns_str)s."
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3025
6106
msgid "Tip change rejected: %(msg)s"
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:3033
6110
msgid "Shelf corrupt."
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:3038
6114
msgid "Corruption while decompressing repository file%(orig_error)s"
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:3050
6118
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:3058
6122
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:3066
6126
msgid ""
6127
"An attempt to access a url outside the server jail was made: '%(url)s'."
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:3074
6131
msgid "The user aborted the operation."
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:3079
6135
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:3089
6139
msgid "No such view: %(view_name)s."
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:3099
6143
msgid ""
6144
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6145
"to a later format."
6146
msgstr ""
6147
6148
#: bzrlib/errors.py:3108
6149
msgid ""
6150
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:3175
6154
msgid "%(bzrdir)r does not support co-located branches."
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:3181
6158
msgid ""
6159
"Unable to determine your name.\n"
6160
"Please, set your name with the 'whoami' command.\n"
6161
"E.g. bzr whoami \"Your Name <name@example.com>\""
6162
msgstr ""
6163
6164
#: bzrlib/errors.py:3190
6165
msgid "Invalid pattern(s) found. %(msg)s"
6166
msgstr ""
6167
6168
#: bzrlib/errors.py:3198
6169
msgid ""
6170
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6171
"unbind` to fix."
6172
msgstr ""
6173
6174
#: bzrlib/errors.py:3209
6175
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:3218
6179
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6180
msgstr ""
6181
6182
#: bzrlib/errors.py:3227
6183
msgid ""
6184
"No compatible object available for operations from %(source)r to %(target)r."
6185
msgstr ""
6186
6187
#: bzrlib/errors.py:3237
6188
msgid ""
6189
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6190
"%(arguments)s."
6191
msgstr ""
6192
6193
#: bzrlib/errors.py:3247
6194
msgid ""
6195
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6196
"format %(format)r"
6197
msgstr ""
6198
6199
#: bzrlib/errors.py:3259
6200
msgid ""
6201
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6202
"plugin."
6203
msgstr ""
6204
6205
#: bzrlib/errors.py:3272
6206
msgid "Binary files section encountered."
6207
msgstr ""
6208
6209
#: bzrlib/errors.py:3280
6210
msgid ""
6211
"Malformed patch header. %(desc)s\n"
6212
"%(line)r"
6213
msgstr ""
6214
6215
#: bzrlib/errors.py:3289
6216
msgid ""
6217
"Malformed hunk header. %(desc)s\n"
6218
"%(line)r"
6219
msgstr ""
6220
6221
#: bzrlib/errors.py:3298
6222
msgid ""
6223
"Malformed line. %(desc)s\n"
6224
"%(line)r"
6225
msgstr ""
6226
6227
#: bzrlib/errors.py:3308
6228
msgid ""
6229
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6230
"but patch says it should be \"%(patch_line)s\""
6231
msgstr ""
6232
6233
#: bzrlib/errors.py:3319
6234
msgid "The feature %(feature)s has already been registered."
6235
msgstr ""
6236
6237
#: bzrlib/export_pot.py:252
6238
#, python-format
6239
msgid "Exporting messages from builtin command: %s"
6240
msgstr ""
6241
6242
#: bzrlib/export_pot.py:271
6243
msgid "Exporting messages from plugin command: {0} in {1}"
6244
msgstr ""
6245
6246
#: bzrlib/export_pot.py:292
6247
#, python-format
6248
msgid "Exporting message from error: %s"
6249
msgstr ""
6250
6251
#: bzrlib/fetch.py:98
6252
msgid "Finding revisions"
6253
msgstr ""
6254
6255
#: bzrlib/fetch.py:103
6256
msgid "Fetching revisions"
6257
msgstr ""
6258
6259
#: bzrlib/foreign.py:262
6260
msgid "Push into a different VCS without any custom bzr metadata."
6261
msgstr ""
6262
6263
#: bzrlib/foreign.py:264
6264
msgid ""
6265
"This will afterwards rebase the local branch on the remote\n"
6266
"branch unless the --no-rebase option is used, in which case \n"
6267
"the two branches will be out of sync after the push. "
6268
msgstr ""
6269
6270
#: bzrlib/foreign.py:277
6271
msgid "Do not rebase after push."
6272
msgstr ""
6273
6274
#: bzrlib/foreign.py:311
6275
#, python-format
6276
msgid "Using saved location: %s\n"
6277
msgstr ""
6278
6279
#: bzrlib/foreign.py:321
6280
msgid ""
6281
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6282
"regular push."
6283
msgstr ""
6284
6285
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6286
msgid "{0} commits with valid signatures"
6287
msgstr ""
6288
6289
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6290
msgid "{0} commit with unknown key"
6291
msgid_plural "{0} commits with unknown keys"
6292
msgstr[0] ""
6293
msgstr[1] ""
6294
6295
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6296
msgid "{0} commit not valid"
6297
msgid_plural "{0} commits not valid"
6298
msgstr[0] ""
6299
msgstr[1] ""
6300
6301
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6302
msgid "{0} commit not signed"
6303
msgid_plural "{0} commits not signed"
6304
msgstr[0] ""
6305
msgstr[1] ""
6306
6307
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6308
msgid "{0} commit with key now expired"
6309
msgid_plural "{0} commits with key now expired"
6310
msgstr[0] ""
6311
msgstr[1] ""
6312
6313
#: bzrlib/gpg.py:343
6314
msgid "No GnuPG key results for pattern: {0}"
6315
msgstr ""
6316
6317
#: bzrlib/gpg.py:386
6318
msgid "{0} signed {1} commit"
6319
msgid_plural "{0} signed {1} commits"
6320
msgstr[0] ""
6321
msgstr[1] ""
6322
6323
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6324
msgid "{0} commit by author {1}"
6325
msgid_plural "{0} commits by author {1}"
6326
msgstr[0] ""
6327
msgstr[1] ""
6328
6329
#: bzrlib/gpg.py:433
6330
msgid "Unknown key {0} signed {1} commit"
6331
msgid_plural "Unknown key {0} signed {1} commits"
6332
msgstr[0] ""
6333
msgstr[1] ""
6334
6335
#: bzrlib/gpg.py:452
6336
msgid "{0} commit by author {1} with key {2} now expired"
6337
msgid_plural "{0} commits by author {1} with key {2} now expired"
6338
msgstr[0] ""
6339
msgstr[1] ""
6340
6341
#: bzrlib/groupcompress.py:1739
6342
#, python-format
6343
msgid "Insert claimed random_id=True, but then inserted %r two times"
6344
msgstr ""
6345
6346
#: bzrlib/hooks.py:331
6347
#, python-format
6348
msgid "Introduced in: %s"
6349
msgstr ""
6350
6351
#: bzrlib/hooks.py:334
6352
#, python-format
6353
msgid "Deprecated in: %s"
6354
msgstr ""
6355
6356
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6357
msgid "Walking content"
6358
msgstr ""
6359
6360
#: bzrlib/knit.py:3330
6361
msgid "annotating"
6362
msgstr ""
6363
6364
#: bzrlib/lock.py:548
6365
msgid "{0!r} was {1} locked again"
6366
msgstr ""
6367
6368
#: bzrlib/lockdir.py:321
6369
#, python-format
6370
msgid "error removing pending lock: %s"
6371
msgstr ""
6372
6373
#: bzrlib/lockdir.py:616
6374
msgid "Unable to obtain"
6375
msgstr ""
6376
6377
#: bzrlib/lockdir.py:618
6378
msgid "Lock owner changed for"
6379
msgstr ""
6380
6381
#: bzrlib/lockdir.py:620
6382
msgid "{0} lock {1} {2}."
6383
msgstr ""
6384
6385
#: bzrlib/lockdir.py:627
6386
#, python-format
6387
msgid "Will continue to try until %s, unless you press Ctrl-C."
6388
msgstr ""
6389
6390
#: bzrlib/lockdir.py:629
6391
msgid "See \"bzr help break-lock\" for more."
6392
msgstr ""
6393
6394
#: bzrlib/lockdir.py:739
6395
#, python-format
6396
msgid ""
6397
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6398
msgstr ""
6399
6400
#: bzrlib/log.py:572
6401
msgid "--exclude-common-ancestry requires two different revisions"
6402
msgstr ""
6403
6404
#: bzrlib/log.py:574
6405
#, python-format
6406
msgid "invalid direction %r"
6407
msgstr ""
6408
6409
#: bzrlib/log.py:662
6410
msgid "Start revision not found in history of end revision."
6411
msgstr ""
6412
6413
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6414
msgid "Logging revision 0 is invalid."
6415
msgstr ""
6416
6417
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6418
msgid "Start revision must be older than the end revision."
6419
msgstr ""
6420
6421
#: bzrlib/log.py:1827
6422
#, python-format
6423
msgid "unknown log formatter: %r"
6424
msgstr ""
6425
6426
#: bzrlib/log.py:2123
6427
msgid "fixes bug"
6428
msgid_plural "fixes bugs"
6429
msgstr[0] ""
6430
msgstr[1] ""
6431
6432
#: bzrlib/merge.py:689
6433
msgid "All changes applied successfully."
6434
msgstr ""
6435
6436
#: bzrlib/merge.py:691
6437
#, python-format
6438
msgid "%d conflicts encountered."
6439
msgstr ""
6440
6441
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6442
msgid "Preparing file merge"
6443
msgstr ""
6444
6445
#: bzrlib/multiparent.py:426
6446
msgid "Importing revisions"
6447
msgstr ""
6448
6449
#: bzrlib/option.py:526
6450
msgid "Show help message."
6451
msgstr ""
6452
6453
#: bzrlib/option.py:528
6454
msgid "Only display errors and warnings."
6455
msgstr ""
6456
6457
#: bzrlib/option.py:531
6458
msgid "Show usage message and options."
6459
msgstr ""
6460
6461
#: bzrlib/option.py:533
6462
msgid "Display more information."
6463
msgstr ""
6464
6465
#: bzrlib/option.py:541
6466
msgid ""
6467
"Select changes introduced by the specified revision. See also \"help "
6468
"revisionspec\"."
6469
msgstr ""
6470
6471
#: bzrlib/option.py:543
6472
msgid "Branch to operate on, instead of working directory."
6473
msgstr ""
6474
6475
#: bzrlib/option.py:545
6476
msgid "Detailed log format."
6477
msgstr ""
6478
6479
#: bzrlib/option.py:545
6480
msgid "Format used by GNU ChangeLog files."
6481
msgstr ""
6482
6483
#: bzrlib/option.py:545
6484
msgid "Log format with one line per revision."
6485
msgstr ""
6486
6487
#: bzrlib/option.py:545
6488
msgid "Moderately short log format."
6489
msgstr ""
6490
6491
#: bzrlib/option.py:545
6492
msgid "Use specified log format."
6493
msgstr ""
6494
6495
#: bzrlib/option.py:547
6496
msgid "Log format"
6497
msgstr ""
6498
6499
#: bzrlib/option.py:549
6500
msgid "LCA-newness merge."
6501
msgstr ""
6502
6503
#: bzrlib/option.py:549
6504
msgid "Merge using external diff3."
6505
msgstr ""
6506
6507
#: bzrlib/option.py:549
6508
msgid "Native diff3-style merge."
6509
msgstr ""
6510
6511
#: bzrlib/option.py:549
6512
msgid "Select a particular merge algorithm."
6513
msgstr ""
6514
6515
#: bzrlib/option.py:549
6516
msgid "Weave-based merge."
6517
msgstr ""
6518
6519
#: bzrlib/option.py:551
6520
msgid "Merge algorithm"
6521
msgstr ""
6522
6523
#: bzrlib/option.py:554
6524
msgid "Message string."
6525
msgstr ""
6526
6527
#: bzrlib/option.py:556
6528
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6529
msgstr ""
6530
6531
#: bzrlib/option.py:558
6532
msgid "Ignore differences between branches and overwrite unconditionally."
6533
msgstr ""
6534
6535
#: bzrlib/option.py:560
6536
msgid "Remember the specified location as a default."
6537
msgstr ""
6538
6539
#: bzrlib/option.py:562
6540
msgid "Reprocess to reduce spurious conflicts."
6541
msgstr ""
6542
6543
#: bzrlib/option.py:566
6544
msgid "See \"help revisionspec\" for details."
6545
msgstr ""
6546
6547
#: bzrlib/option.py:568
6548
msgid "Show internal object ids."
6549
msgstr ""
6550
6551
#: bzrlib/option.py:571
6552
msgid "Display timezone as local, original, or utc."
6553
msgstr ""
6554
6555
#: bzrlib/osutils.py:100
6556
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6557
msgstr ""
6558
6559
#: bzrlib/osutils.py:220
6560
msgid "lstat/stat of ({0!r}): {1!r}"
6561
msgstr ""
6562
6563
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6564
#, python-format
6565
msgid "sorry, %r not allowed in path"
6566
msgstr ""
6567
6568
#: bzrlib/osutils.py:1226
6569
#, python-format
6570
msgid "%r is too short to calculate a relative path"
6571
msgstr ""
6572
6573
#: bzrlib/plugin.py:143
6574
#, python-format
6575
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6576
msgstr ""
6577
6578
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6579
msgid "Enable completions for the selected plugin (default: all plugins)"
6580
msgstr ""
6581
6582
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6583
msgid "Generate a shell function for bash command line completion."
6584
msgstr ""
6585
6586
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6587
msgid ""
6588
"This command generates a shell function which can be used by bash to\n"
6589
"automatically complete the currently typed command when the user presses\n"
6590
"the completion key (usually tab)."
6591
msgstr ""
6592
6593
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6594
msgid ""
6595
"Commonly used like this:\n"
6596
" eval \"`bzr bash-completion`\""
6597
msgstr ""
6598
6599
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6600
msgid "Name of the generated function (default: _bzr)"
6601
msgstr ""
6602
6603
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6604
msgid "Generate only the shell function, don't enable it"
6605
msgstr ""
6606
6607
#: bzrlib/plugins/launchpad/__init__.py:81
6608
msgid "Register a branch with launchpad.net."
6609
msgstr ""
6610
6611
#: bzrlib/plugins/launchpad/__init__.py:83
6612
msgid ""
6613
"This command lists a bzr branch in the directory of branches on\n"
6614
"launchpad.net. Registration allows the branch to be associated with\n"
6615
"bugs or specifications."
6616
msgstr ""
6617
6618
#: bzrlib/plugins/launchpad/__init__.py:87
6619
msgid ""
6620
"Before using this command you must register the project to which the\n"
6621
"branch belongs, and create an account for yourself on launchpad.net."
6622
msgstr ""
6623
6624
#: bzrlib/plugins/launchpad/__init__.py:90
6625
msgid ""
6626
"arguments:\n"
6627
" public_url: The publicly visible url for the branch to register.\n"
6628
" This must be an http or https url (which Launchpad can read\n"
6629
" from to access the branch). Local file urls, SFTP urls, and\n"
6630
" bzr+ssh urls will not work.\n"
6631
" If no public_url is provided, bzr will use the configured\n"
6632
" public_url if there is one for the current branch, and\n"
6633
" otherwise error."
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/__init__.py:99
6637
msgid ""
6638
"example:\n"
6639
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6640
" --project fooproject"
6641
msgstr ""
6642
6643
#: bzrlib/plugins/launchpad/__init__.py:106
6644
msgid "Launchpad project short name to associate with the branch."
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/__init__.py:113
6648
msgid ""
6649
"Short name for the branch; by default taken from the last component of the "
6650
"url."
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:117
6654
msgid "One-sentence description of the branch."
6655
msgstr ""
6656
6657
#: bzrlib/plugins/launchpad/__init__.py:120
6658
msgid "Longer description of the purpose or contents of the branch."
6659
msgstr ""
6660
6661
#: bzrlib/plugins/launchpad/__init__.py:123
6662
msgid "Branch author's email address, if not yourself."
6663
msgstr ""
6664
6665
#: bzrlib/plugins/launchpad/__init__.py:126
6666
msgid "The bug this branch fixes."
6667
msgstr ""
6668
6669
#: bzrlib/plugins/launchpad/__init__.py:129
6670
msgid "Prepare the request but don't actually send it."
6671
msgstr ""
6672
6673
#: bzrlib/plugins/launchpad/__init__.py:151
6674
msgid ""
6675
"register-branch requires a public branch url - see bzr help register-branch."
6676
msgstr ""
6677
6678
#: bzrlib/plugins/launchpad/__init__.py:159
6679
msgid "--product is deprecated; please use --project."
6680
msgstr ""
6681
6682
#: bzrlib/plugins/launchpad/__init__.py:191
6683
msgid "Open a Launchpad branch page in your web browser."
6684
msgstr ""
6685
6686
#: bzrlib/plugins/launchpad/__init__.py:196
6687
msgid "Do not actually open the browser. Just say the URL we would use."
6688
msgstr ""
6689
6690
#: bzrlib/plugins/launchpad/__init__.py:231
6691
#, python-format
6692
msgid "Opening %s in web browser"
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/__init__.py:241
6696
msgid "Show or set the Launchpad user ID."
6697
msgstr ""
6698
6699
#: bzrlib/plugins/launchpad/__init__.py:243
6700
msgid ""
6701
"When communicating with Launchpad, some commands need to know your\n"
6702
"Launchpad user ID. This command can be used to set or show the\n"
6703
"user ID that Bazaar will use for such communication."
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/__init__.py:247
6707
msgid ""
6708
":Examples:\n"
6709
" Show the Launchpad ID of the current user::"
6710
msgstr ""
6711
6712
#: bzrlib/plugins/launchpad/__init__.py:250
6713
msgid " bzr launchpad-login"
6714
msgstr ""
6715
6716
#: bzrlib/plugins/launchpad/__init__.py:252
6717
msgid " Set the Launchpad ID of the current user to 'bob'::"
6718
msgstr ""
6719
6720
#: bzrlib/plugins/launchpad/__init__.py:254
6721
msgid " bzr launchpad-login bob"
6722
msgstr ""
6723
6724
#: bzrlib/plugins/launchpad/__init__.py:261
6725
msgid "Don't check that the user name is valid."
6726
msgstr ""
6727
6728
#: bzrlib/plugins/launchpad/__init__.py:276
6729
#: bzrlib/plugins/launchpad/__init__.py:287
6730
msgid "Launchpad user ID exists and has SSH keys.\n"
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/__init__.py:279
6734
msgid "No Launchpad user ID configured.\n"
6735
msgstr ""
6736
6737
#: bzrlib/plugins/launchpad/__init__.py:290
6738
#, python-format
6739
msgid "Launchpad user ID set to '%s'.\n"
6740
msgstr ""
6741
6742
#: bzrlib/plugins/launchpad/__init__.py:298
6743
msgid "Ask Launchpad to mirror a branch now."
6744
msgstr ""
6745
6746
#: bzrlib/plugins/launchpad/__init__.py:318
6747
msgid "Propose merging a branch on Launchpad."
6748
msgstr ""
6749
6750
#: bzrlib/plugins/launchpad/__init__.py:320
6751
msgid ""
6752
"This will open your usual editor to provide the initial comment. When it\n"
6753
"has created the proposal, it will open it in your default web browser."
6754
msgstr ""
6755
6756
#: bzrlib/plugins/launchpad/__init__.py:323
6757
msgid ""
6758
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6759
"is not supplied, the remembered submit branch will be used. If no submit\n"
6760
"branch is remembered, the development focus will be used."
6761
msgstr ""
6762
6763
#: bzrlib/plugins/launchpad/__init__.py:327
6764
msgid ""
6765
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6766
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6767
"The parameter the launchpad account name of the desired reviewer. This\n"
6768
"may optionally be followed by '=' and the review type. For example:"
6769
msgstr ""
6770
6771
#: bzrlib/plugins/launchpad/__init__.py:332
6772
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6773
msgstr ""
6774
6775
#: bzrlib/plugins/launchpad/__init__.py:334
6776
msgid ""
6777
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6778
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6779
msgstr ""
6780
6781
#: bzrlib/plugins/launchpad/__init__.py:339
6782
msgid "Propose the merge on staging."
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/__init__.py:341
6786
msgid "Commit message."
6787
msgstr ""
6788
6789
#: bzrlib/plugins/launchpad/__init__.py:343
6790
msgid "Mark the proposal as approved immediately."
6791
msgstr ""
6792
6793
#: bzrlib/plugins/launchpad/__init__.py:345
6794
msgid "Requested reviewer and optional type."
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/__init__.py:382
6798
msgid "Find the proposal to merge this revision."
6799
msgstr ""
6800
6801
#: bzrlib/plugins/launchpad/__init__.py:384
6802
msgid ""
6803
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6804
"This works only if the selected branch was the merge proposal target, and\n"
6805
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6806
"are opened in a web browser."
6807
msgstr ""
6808
6809
#: bzrlib/plugins/launchpad/__init__.py:389
6810
msgid ""
6811
"Any revision involved in the merge may be specified-- the revision in\n"
6812
"which the merge was performed, or one of the revisions that was merged."
6813
msgstr ""
6814
6815
#: bzrlib/plugins/launchpad/__init__.py:392
6816
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6817
msgstr ""
6818
6819
#: bzrlib/plugins/launchpad/__init__.py:394
6820
msgid " bzr lp-find-proposal -r annotate:README:1"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/launchpad/__init__.py:409
6824
msgid "No review found."
6825
msgstr ""
6826
6827
#: bzrlib/plugins/launchpad/__init__.py:410
6828
#, python-format
6829
msgid "%d proposals(s) found."
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/__init__.py:420
6833
msgid "Finding revision-id"
6834
msgstr ""
6835
6836
#: bzrlib/plugins/launchpad/__init__.py:427
6837
msgid "Finding merge"
6838
msgstr ""
6839
6840
#: bzrlib/plugins/launchpad/__init__.py:432
6841
msgid "Finding revno"
6842
msgstr ""
6843
6844
#: bzrlib/plugins/launchpad/__init__.py:437
6845
msgid "Finding Launchpad branch"
6846
msgstr ""
6847
6848
#: bzrlib/plugins/launchpad/__init__.py:440
6849
msgid "Finding proposals"
6850
msgstr ""
6851
6852
#: bzrlib/plugins/launchpad/account.py:66
6853
msgid "Setting ssh/sftp usernames for launchpad.net."
6854
msgstr ""
6855
6856
#: bzrlib/plugins/launchpad/lp_api.py:241
6857
#: bzrlib/plugins/launchpad/lp_api.py:246
6858
#, python-format
6859
msgid "%s is not registered on Launchpad"
6860
msgstr ""
6861
6862
#: bzrlib/plugins/launchpad/lp_api.py:256
6863
#, python-format
6864
msgid "%s has no development focus."
6865
msgstr ""
6866
6867
#: bzrlib/plugins/launchpad/lp_api.py:261
6868
#, python-format
6869
msgid "development focus %s has no branch."
6870
msgstr ""
6871
6872
#: bzrlib/plugins/launchpad/lp_api.py:266
6873
#, python-format
6874
msgid "source package %s has no branch."
6875
msgstr ""
6876
6877
#: bzrlib/plugins/launchpad/lp_api.py:270
6878
#, python-format
6879
msgid "%s has no associated product or source package."
6880
msgstr ""
6881
6882
#: bzrlib/plugins/launchpad/lp_api.py:282
6883
#, python-format
6884
msgid "%s is already up-to-date."
6885
msgstr ""
6886
6887
#: bzrlib/plugins/launchpad/lp_api.py:289
6888
#, python-format
6889
msgid "Pushing to %s"
6890
msgstr ""
6891
6892
#: bzrlib/plugins/launchpad/lp_directory.py:170
6893
msgid ""
6894
"resolution for {0}\n"
6895
" local: {1}\n"
6896
" remote: {2}"
6897
msgstr ""
6898
6899
#: bzrlib/plugins/launchpad/lp_propose.py:149
6900
#, python-format
6901
msgid "There is already a branch merge proposal: %s"
6902
msgstr ""
6903
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6905
msgid "pb parameter to convert() is deprecated"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6909
msgid "starting upgrade from format 4 to 5"
6910
msgstr ""
6911
6912
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6913
msgid "note: upgrade may be faster if all store files are ungzipped first"
6914
msgstr ""
6915
6916
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6917
msgid "converting revision"
6918
msgstr ""
6919
6920
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6921
msgid "upgraded to weaves:"
6922
msgstr ""
6923
6924
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6925
#, python-format
6926
msgid "%6d revisions and inventories"
6927
msgstr ""
6928
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6930
#, python-format
6931
msgid "%6d revisions not present"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6935
#, python-format
6936
msgid "%6d texts"
6937
msgstr ""
6938
6939
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6940
msgid "writing weave"
6941
msgstr ""
6942
6943
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6944
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6945
msgid "inventory"
6946
msgstr ""
6947
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6949
msgid "write revision"
6950
msgstr ""
6951
6952
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6953
msgid "loading revision"
6954
msgstr ""
6955
6956
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6957
#, python-format
6958
msgid "revision {%s} not present in branch; will be converted as a ghost"
6959
msgstr ""
6960
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6962
msgid "starting upgrade from format 5 to 6"
6963
msgstr ""
6964
6965
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6966
#, python-format
6967
msgid "adding prefixes to %s"
6968
msgstr ""
6969
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6971
msgid "starting upgrade from format 6 to metadir"
6972
msgstr ""
6973
6974
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6975
msgid "Removing ancestry.weave"
6976
msgstr ""
6977
6978
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6979
msgid "Finding branch files"
6980
msgstr ""
6981
6982
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6983
msgid "Upgrading repository"
6984
msgstr ""
6985
6986
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6987
msgid "Upgrading branch"
6988
msgstr ""
6989
6990
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6991
msgid "No working tree."
6992
msgstr ""
6993
6994
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6995
msgid "Upgrading working tree"
6996
msgstr ""
6997
6998
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6999
#, python-format
7000
msgid "Make %s lock"
7001
msgstr ""
7002
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7004
#, python-format
7005
msgid "Moving %s"
7006
msgstr ""
7007
7008
#: bzrlib/push.py:56
7009
msgid "Created new branch."
7010
msgstr ""
7011
7012
#: bzrlib/push.py:98
7013
#, python-format
7014
msgid ""
7015
"Target directory %s already contains a .bzr directory, but it is not valid."
7016
msgstr ""
7017
7018
#: bzrlib/push.py:101
7019
#, python-format
7020
msgid ""
7021
"Target directory %s already exists, but does not have a .bzr directory. "
7022
"Supply --use-existing-dir to push there anyway."
7023
msgstr ""
7024
7025
#: bzrlib/push.py:122
7026
#, python-format
7027
msgid "Too many redirections trying to make %s."
7028
msgstr ""
7029
7030
#: bzrlib/push.py:147
7031
msgid ""
7032
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7033
"information."
7034
msgstr ""
7035
7036
#: bzrlib/push.py:151
7037
#, python-format
7038
msgid ""
7039
"It is not possible to losslessly push to %s. You may want to use dpush "
7040
"instead."
7041
msgstr ""
7042
7043
#: bzrlib/push.py:157
7044
#, python-format
7045
msgid ""
7046
"At %s you have a valid .bzr control directory, but not a branch or "
7047
"repository. This is an unsupported configuration. Please move the target "
7048
"directory out of the way and try again."
7049
msgstr ""
7050
7051
#: bzrlib/reconcile.py:97
7052
#, python-format
7053
msgid "Reconciling branch %s"
7054
msgstr ""
7055
7056
#: bzrlib/reconcile.py:103
7057
#, python-format
7058
msgid "Reconciling repository %s"
7059
msgstr ""
7060
7061
#: bzrlib/reconcile.py:105
7062
msgid "Reconciling repository"
7063
msgstr ""
7064
7065
#: bzrlib/reconcile.py:111
7066
#, python-format
7067
msgid "%s cannot canonicalize CHKs."
7068
msgstr ""
7069
7070
#: bzrlib/reconcile.py:119
7071
msgid "Reconcile aborted: revision index has inconsistent parents."
7072
msgstr ""
7073
7074
#: bzrlib/reconcile.py:121
7075
msgid "Run \"bzr check\" for more details."
7076
msgstr ""
7077
7078
#: bzrlib/reconcile.py:123
7079
msgid "Reconciliation complete."
7080
msgstr ""
7081
7082
#: bzrlib/reconcile.py:166
7083
msgid "Fixing last revision info {0} => {1}"
7084
msgstr ""
7085
7086
#: bzrlib/reconcile.py:173
7087
msgid "revision_history ok."
7088
msgstr ""
7089
7090
#: bzrlib/reconcile.py:234
7091
msgid "Reading inventory data"
7092
msgstr ""
7093
7094
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7095
msgid "Inventory ok."
7096
msgstr ""
7097
7098
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7099
msgid "Backing up inventory"
7100
msgstr ""
7101
7102
#: bzrlib/reconcile.py:258
7103
msgid "Backup inventory created."
7104
msgstr ""
7105
7106
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7107
msgid "Writing weave"
7108
msgstr ""
7109
7110
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7111
msgid "Inventory regenerated."
7112
msgstr ""
7113
7114
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7115
msgid "Reading indexes"
7116
msgstr ""
7117
7118
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7119
msgid "Checking unused inventories"
7120
msgstr ""
7121
7122
#: bzrlib/reconcile.py:388
7123
msgid "Backup Inventory created"
7124
msgstr ""
7125
7126
#: bzrlib/reconcile.py:446
7127
msgid "Fixing text parents"
7128
msgstr ""
7129
7130
#: bzrlib/reconfigure.py:54
7131
msgid "{0} is now stacked on {1}\n"
7132
msgstr ""
7133
7134
#: bzrlib/reconfigure.py:69
7135
#, python-format
7136
msgid "%s is now not stacked\n"
7137
msgstr ""
7138
7139
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7140
#, python-format
7141
msgid "bzr: ERROR (ignored): %s"
7142
msgstr ""
7143
7144
#: bzrlib/remote.py:2493
7145
msgid "Copying repository content as tarball..."
7146
msgstr ""
7147
7148
#: bzrlib/rename_map.py:69
7149
msgid "Calculating hashes"
7150
msgstr ""
7151
7152
#: bzrlib/rename_map.py:107
7153
msgid "Determining hash hits"
7154
msgstr ""
7155
7156
#: bzrlib/rename_map.py:242
7157
msgid "{0} => {1}"
7158
msgstr ""
7159
7160
#: bzrlib/repository.py:1787
7161
msgid "Moving repository to repository.backup"
7162
msgstr ""
7163
7164
#: bzrlib/repository.py:1794
7165
msgid "Creating new repository"
7166
msgstr ""
7167
7168
#: bzrlib/repository.py:1799
7169
msgid "Copying content"
7170
msgstr ""
7171
7172
#: bzrlib/repository.py:1803
7173
msgid "Deleting old repository content"
7174
msgstr ""
7175
7176
#: bzrlib/repository.py:1805
7177
msgid "repository converted"
7178
msgstr ""
7179
7180
#: bzrlib/revisionspec.py:903
7181
msgid "Using {0} {1}"
7182
msgstr ""
7183
7184
#: bzrlib/send.py:58
7185
#, python-format
7186
msgid "Mail client \"%s\" does not support specifying body"
7187
msgstr ""
7188
7189
#: bzrlib/send.py:62
7190
msgid "--remember requires a branch to be specified."
7191
msgstr ""
7192
7193
#: bzrlib/send.py:77
7194
msgid "No submit branch known or specified"
7195
msgstr ""
7196
7197
#: bzrlib/send.py:80
7198
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7199
msgstr ""
7200
7201
#: bzrlib/send.py:98
7202
#, python-format
7203
msgid "No such send format '%s'."
7204
msgstr ""
7205
7206
#: bzrlib/send.py:114
7207
msgid "bzr send takes at most two one revision identifiers"
7208
msgstr ""
7209
7210
#: bzrlib/send.py:127
7211
msgid "No revisions to submit."
7212
msgstr ""
7213
7214
#: bzrlib/send.py:139
7215
msgid ""
7216
"- not supported for merge directives that use more than one output file."
7217
msgstr ""
7218
7219
#: bzrlib/send.py:185
7220
msgid "Format 0.9 does not permit bundle with no patch"
7221
msgstr ""
7222
7223
#: bzrlib/shelf_ui.py:46
7224
#, python-format
7225
msgid "Shelve adding file \"%(path)s\"?"
7226
msgstr ""
7227
7228
#: bzrlib/shelf_ui.py:47
7229
msgid "Shelve binary changes?"
7230
msgstr ""
7231
7232
#: bzrlib/shelf_ui.py:48
7233
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7234
msgstr ""
7235
7236
#: bzrlib/shelf_ui.py:50
7237
#, python-format
7238
msgid "Shelve removing file \"%(path)s\"?"
7239
msgstr ""
7240
7241
#: bzrlib/shelf_ui.py:51
7242
#, python-format
7243
msgid "Shelve %d change(s)?"
7244
msgstr ""
7245
7246
#: bzrlib/shelf_ui.py:52
7247
msgid "Shelve?"
7248
msgstr ""
7249
7250
#: bzrlib/shelf_ui.py:53
7251
#, python-format
7252
msgid ""
7253
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7254
msgstr ""
7255
7256
#: bzrlib/shelf_ui.py:55
7257
#, python-format
7258
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7259
msgstr ""
7260
7261
#: bzrlib/shelf_ui.py:70
7262
#, python-format
7263
msgid "Changes shelved with id \"%d\"."
7264
msgstr ""
7265
7266
#: bzrlib/shelf_ui.py:74
7267
msgid "Selected changes destroyed."
7268
msgstr ""
7269
7270
#: bzrlib/shelf_ui.py:78
7271
msgid "Selected changes:"
7272
msgstr ""
7273
7274
#: bzrlib/shelf_ui.py:98
7275
#, python-format
7276
msgid "Delete file \"%(path)s\"?"
7277
msgstr ""
7278
7279
#: bzrlib/shelf_ui.py:99
7280
msgid "Apply binary changes?"
7281
msgstr ""
7282
7283
#: bzrlib/shelf_ui.py:100
7284
#, python-format
7285
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7286
msgstr ""
7287
7288
#: bzrlib/shelf_ui.py:102
7289
#, python-format
7290
msgid "Add file \"%(path)s\"?"
7291
msgstr ""
7292
7293
#: bzrlib/shelf_ui.py:103
7294
#, python-format
7295
msgid "Apply %d change(s)?"
7296
msgstr ""
7297
7298
#: bzrlib/shelf_ui.py:104
7299
msgid "Apply change?"
7300
msgstr ""
7301
7302
#: bzrlib/shelf_ui.py:105
7303
#, python-format
7304
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7305
msgstr ""
7306
7307
#: bzrlib/shelf_ui.py:107
7308
#, python-format
7309
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7310
msgstr ""
7311
7312
#: bzrlib/shelf_ui.py:402
7313
msgid "No changes are shelved."
7314
msgstr ""
7315
7316
#: bzrlib/shelf_ui.py:460
7317
#, python-format
7318
msgid "Using changes with id \"%d\"."
7319
msgstr ""
7320
7321
#: bzrlib/shelf_ui.py:464
7322
#, python-format
7323
msgid "Message: %s"
7324
msgstr ""
7325
7326
#: bzrlib/shelf_ui.py:476
7327
#, python-format
7328
msgid "Deleted changes with id \"%d\"."
7329
msgstr ""
7330
7331
#: bzrlib/smart/medium.py:714
7332
msgid "HPSS calls: {0} ({1} vfs) {2}"
7333
msgstr ""
7334
7335
#: bzrlib/smart/server.py:169
7336
msgid "Requested to stop gracefully"
7337
msgstr ""
7338
7339
#: bzrlib/smart/server.py:179
7340
#, python-format
7341
msgid "Waiting for %d client(s) to finish"
7342
msgstr ""
7343
7344
#: bzrlib/smart/server.py:185
7345
#, python-format
7346
msgid "Still waiting for %d client(s) to finish"
7347
msgstr ""
7348
7349
#: bzrlib/smart/server.py:219
7350
#, python-format
7351
msgid "listening socket error: %s"
7352
msgstr ""
7353
7354
#: bzrlib/smart/server.py:452
7355
#, python-format
7356
msgid "listening on port: %s"
7357
msgstr ""
7358
7359
#: bzrlib/switch.py:69
7360
msgid "Pending merges must be committed or reverted before using switch."
7361
msgstr ""
7362
7363
#: bzrlib/switch.py:96
7364
msgid ""
7365
"Cannot switch as local commits found in the checkout. Commit these to the "
7366
"bound branch or use --force to throw them away."
7367
msgstr ""
7368
7369
#: bzrlib/switch.py:101
7370
#, python-format
7371
msgid ""
7372
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7373
"anyway, use --force."
7374
msgstr ""
7375
7376
#: bzrlib/switch.py:110
7377
msgid "Cannot switch a branch, only a checkout."
7378
msgstr ""
7379
7380
#: bzrlib/switch.py:146
7381
#, python-format
7382
msgid "Tree is up to date at revision %d."
7383
msgstr ""
7384
7385
#: bzrlib/switch.py:152
7386
#, python-format
7387
msgid "Updated to revision %d."
7388
msgstr ""
7389
7390
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7391
msgid "Apply phase"
7392
msgstr ""
7393
7394
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7395
msgid "removing file"
7396
msgstr ""
7397
7398
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7399
msgid "adding file"
7400
msgstr ""
7401
7402
#: bzrlib/transform.py:2587
7403
msgid "Building tree"
7404
msgstr ""
7405
7406
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7407
msgid "Adding file contents"
7408
msgstr ""
7409
7410
#: bzrlib/transform.py:3024
7411
msgid "Resolution pass"
7412
msgstr ""
7413
7414
#: bzrlib/transport/ftp/_gssapi.py:88
7415
#, python-format
7416
msgid "Authenticated as %s"
7417
msgstr ""
7418
7419
#: bzrlib/tree.py:634
7420
msgid "*** {0} content-filter: {1} => {2!r}"
7421
msgstr ""
7422
7423
#: bzrlib/upgrade.py:77
7424
#, python-format
7425
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7426
msgstr ""
7427
7428
#: bzrlib/upgrade.py:100
7429
#, python-format
7430
msgid "cannot upgrade from bzrdir format %s"
7431
msgstr ""
7432
7433
#: bzrlib/upgrade.py:103
7434
#, python-format
7435
msgid "starting upgrade of %s"
7436
msgstr ""
7437
7438
#: bzrlib/upgrade.py:110
7439
msgid "finished"
7440
msgstr ""
7441
7442
#: bzrlib/upgrade.py:120
7443
msgid "Deleting backup.bzr"
7444
msgstr ""
7445
7446
#: bzrlib/upgrade.py:151
7447
msgid ""
7448
"\n"
7449
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7450
msgstr ""
7451
7452
#: bzrlib/upgrade.py:208
7453
#, python-format
7454
msgid "Found %d dependent branches - upgrading ..."
7455
msgstr ""
7456
7457
#: bzrlib/upgrade.py:276
7458
msgid "Upgrading bzrdirs"
7459
msgstr ""
7460
7461
#: bzrlib/upgrade.py:282
7462
#, python-format
7463
msgid "Upgrading %s"
7464
msgstr ""
7465
7466
#: bzrlib/upgrade.py:283
7467
msgid "Upgrading {0} {1} ..."
7468
msgstr ""
7469
7470
#: bzrlib/upgrade.py:301
7471
msgid "Removing backup ..."
7472
msgstr ""
7473
7474
#: bzrlib/upgrade.py:305
7475
msgid "failed to clean-up {0}: {1}"
7476
msgstr ""
7477
7478
#: bzrlib/vf_repository.py:1090
7479
msgid "inventories"
7480
msgstr ""
7481
7482
#: bzrlib/vf_repository.py:1116
7483
msgid "texts"
7484
msgstr ""
7485
7486
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7487
msgid "Calculating text parents"
7488
msgstr ""
7489
7490
#: bzrlib/vf_repository.py:1706
7491
msgid "Fetch texts"
7492
msgstr ""
7493
7494
#: bzrlib/vf_repository.py:2535
7495
msgid "loading text store"
7496
msgstr ""
7497
7498
#: bzrlib/vf_repository.py:2541
7499
msgid "checking text graph"
7500
msgstr ""
7501
7502
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7503
#: bzrlib/vf_repository.py:3124
7504
msgid "Transferring revisions"
7505
msgstr ""
7506
7507
#: bzrlib/win32utils.py:146
7508
msgid "Failed to GetProcessMemoryInfo()"
7509
msgstr ""
7510
7511
#: bzrlib/win32utils.py:167
7512
msgid "Cannot debug memory on win32 without ctypes or win32process"
7513
msgstr ""
7514
7515
#: bzrlib/win32utils.py:172
7516
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7517
msgstr ""
7518
7519
#: bzrlib/win32utils.py:180
7520
#, python-format
7521
msgid "WorkingSize %8d KiB"
7522
msgstr ""
7523
7524
#: bzrlib/win32utils.py:181
7525
#, python-format
7526
msgid "PeakWorking %8d KiB"
7527
msgstr ""
7528
7529
#: bzrlib/win32utils.py:182
7530
#, python-format
7531
msgid "PagefileUsage %8d KiB"
7532
msgstr ""
7533
7534
#: bzrlib/win32utils.py:183
7535
#, python-format
7536
msgid "PeakPagefileUsage %8d KiB"
7537
msgstr ""
7538
7539
#: bzrlib/win32utils.py:185
7540
#, python-format
7541
msgid "PrivateUsage %8d KiB"
7542
msgstr ""
7543
7544
#: bzrlib/win32utils.py:186
7545
#, python-format
7546
msgid "PageFaultCount %8d"
7547
msgstr ""
7548
7549
#: bzrlib/workingtree.py:1478
7550
msgid "Rerun update after fixing the conflicts."
7551
msgstr ""
7552
7553
#: dummy/help_topics/authentication/summary.txt:1
7554
msgid "Information on configuring authentication"
7555
msgstr ""
7556
7557
#: dummy/help_topics/basic/detail.txt:1
7558
msgid ""
7559
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7560
"http://bazaar.canonical.com/"
7561
msgstr ""
7562
7563
#: dummy/help_topics/basic/detail.txt:4
7564
msgid ""
7565
"Basic commands:\n"
7566
" bzr init makes this directory a versioned branch\n"
7567
" bzr branch make a copy of another branch"
7568
msgstr ""
7569
7570
#: dummy/help_topics/basic/detail.txt:8
7571
msgid ""
7572
" bzr add make files or directories versioned\n"
7573
" bzr ignore ignore a file or pattern\n"
7574
" bzr mv move or rename a versioned file"
7575
msgstr ""
7576
7577
#: dummy/help_topics/basic/detail.txt:12
7578
msgid ""
7579
" bzr status summarize changes in working copy\n"
7580
" bzr diff show detailed diffs"
7581
msgstr ""
7582
7583
#: dummy/help_topics/basic/detail.txt:15
7584
msgid ""
7585
" bzr merge pull in changes from another branch\n"
7586
" bzr commit save some or all changes\n"
7587
" bzr send send changes via email"
7588
msgstr ""
7589
7590
#: dummy/help_topics/basic/detail.txt:19
7591
msgid ""
7592
" bzr log show history of changes\n"
7593
" bzr check validate storage"
7594
msgstr ""
7595
7596
#: dummy/help_topics/basic/detail.txt:22
7597
msgid ""
7598
" bzr help init more help on e.g. init command\n"
7599
" bzr help commands list all commands\n"
7600
" bzr help topics list all help topics\n"
7601
msgstr ""
7602
7603
#: dummy/help_topics/basic/summary.txt:1
7604
msgid "Basic commands"
7605
msgstr ""
7606
7607
#: dummy/help_topics/branches/detail.txt:1
7608
msgid "Branches"
7609
msgstr ""
7610
7611
#: dummy/help_topics/branches/detail.txt:3
7612
msgid ""
7613
"A branch consists of the state of a project, including all of its\n"
7614
"history. All branches have a repository associated (which is where the\n"
7615
"branch history is stored), but multiple branches may share the same\n"
7616
"repository (a shared repository). Branches can be copied and merged."
7617
msgstr ""
7618
7619
#: dummy/help_topics/branches/detail.txt:8
7620
msgid ""
7621
"In addition, one branch may be bound to another one. Binding to another\n"
7622
"branch indicates that commits which happen in this branch must also \n"
7623
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7624
"commits when the two branches are out of date. In order for a commit \n"
7625
"to succeed, it may be necessary to update the current branch using \n"
7626
"``bzr update``."
7627
msgstr ""
7628
7629
#: dummy/help_topics/branches/detail.txt:15
7630
#: dummy/help_topics/checkouts/detail.txt:66
7631
#: dummy/help_topics/repositories/detail.txt:36
7632
msgid "Related commands::"
7633
msgstr ""
7634
7635
#: dummy/help_topics/branches/detail.txt:17
7636
msgid ""
7637
" init Change a directory into a versioned branch.\n"
7638
" branch Create a new branch that is a copy of an existing branch.\n"
7639
" merge Perform a three-way merge.\n"
7640
" bind Bind a branch to another one.\n"
7641
msgstr ""
7642
7643
#: dummy/help_topics/branches/summary.txt:1
7644
msgid "Information on what a branch is"
7645
msgstr ""
7646
7647
#: dummy/help_topics/bugs/summary.txt:1
7648
msgid "Bug tracker settings"
7649
msgstr ""
7650
7651
#: dummy/help_topics/checkouts/detail.txt:1
7652
msgid "Checkouts"
7653
msgstr ""
7654
7655
#: dummy/help_topics/checkouts/detail.txt:3
7656
msgid ""
7657
"Checkouts are source trees that are connected to a branch, so that when\n"
7658
"you commit in the source tree, the commit goes into that branch. They\n"
7659
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7660
"Bazaar's decentralized features until you want them. Using checkouts\n"
7661
"with shared repositories is very similar to working with SVN or CVS, but\n"
7662
"doesn't have the same restrictions. And using checkouts still allows\n"
7663
"others working on the project to use whatever workflow they like."
7664
msgstr ""
7665
7666
#: dummy/help_topics/checkouts/detail.txt:11
7667
msgid ""
7668
"A checkout is created with the bzr checkout command (see \"help "
7669
"checkout\").\n"
7670
"You pass it a reference to another branch, and it will create a local copy\n"
7671
"for you that still contains a reference to the branch you created the\n"
7672
"checkout from (the master branch). Then if you make any commits they will "
7673
"be\n"
7674
"made on the other branch first. This creates an instant mirror of your work, "
7675
"or\n"
7676
"facilitates lockstep development, where each developer is working together,\n"
7677
"continuously integrating the changes of others."
7678
msgstr ""
7679
7680
#: dummy/help_topics/checkouts/detail.txt:19
7681
msgid ""
7682
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7683
"you have the full history locally. As you have a first class branch you "
7684
"can\n"
7685
"also commit locally if you want, for instance due to the temporary loss af "
7686
"a\n"
7687
"network connection. Use the --local option to commit to do this. All the "
7688
"local\n"
7689
"commits will then be made on the master branch the next time you do a non-"
7690
"local\n"
7691
"commit."
7692
msgstr ""
7693
7694
#: dummy/help_topics/checkouts/detail.txt:26
7695
msgid ""
7696
"If you are using a checkout from a shared branch you will periodically want "
7697
"to\n"
7698
"pull in all the changes made by others. This is done using the \"update\"\n"
7699
"command. The changes need to be applied before any non-local commit, but\n"
7700
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7701
"command when needed."
7702
msgstr ""
7703
7704
#: dummy/help_topics/checkouts/detail.txt:32
7705
msgid ""
7706
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7707
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7708
"SVN checkout in that it is not a first class branch, it mainly consists of "
7709
"the\n"
7710
"working tree. This means that any history operations must query the master\n"
7711
"branch, which could be slow if a network connection is involved. Also, as "
7712
"you\n"
7713
"don't have a local branch, then you cannot commit locally."
7714
msgstr ""
7715
7716
#: dummy/help_topics/checkouts/detail.txt:39
7717
msgid ""
7718
"Lightweight checkouts work best when you have fast reliable access to the\n"
7719
"master branch. This means that if the master branch is on the same disk or "
7720
"LAN\n"
7721
"a lightweight checkout will be faster than a heavyweight one for any "
7722
"commands\n"
7723
"that modify the revision history (as only one copy of the branch needs to\n"
7724
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7725
"that uses the history but does not change it, but if the master branch is "
7726
"on\n"
7727
"the same disk then there won't be a noticeable difference."
7728
msgstr ""
7729
7730
#: dummy/help_topics/checkouts/detail.txt:47
7731
msgid ""
7732
"Another possible use for a checkout is to use it with a treeless repository\n"
7733
"containing your branches, where you maintain only one working tree by\n"
7734
"switching the master branch that the checkout points to when you want to\n"
7735
"work on a different branch."
7736
msgstr ""
7737
7738
#: dummy/help_topics/checkouts/detail.txt:52
7739
msgid ""
7740
"Obviously to commit on a checkout you need to be able to write to the "
7741
"master\n"
7742
"branch. This means that the master branch must be accessible over a "
7743
"writeable\n"
7744
"protocol , such as sftp://, and that you have write permissions at the "
7745
"other\n"
7746
"end. Checkouts also work on the local file system, so that all that matters "
7747
"is\n"
7748
"file permissions."
7749
msgstr ""
7750
7751
#: dummy/help_topics/checkouts/detail.txt:58
7752
msgid ""
7753
"You can change the master of a checkout by using the \"switch\" command "
7754
"(see\n"
7755
"\"help switch\"). This will change the location that the commits are sent "
7756
"to.\n"
7757
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7758
"checkout. If you would like to convert your heavy checkout into a normal\n"
7759
"branch so that every commit is local, you can use the \"unbind\" command. To "
7760
"see\n"
7761
"whether or not a branch is bound or not you can use the \"info\" command. If "
7762
"the\n"
7763
"branch is bound it will tell you the location of the bound branch."
7764
msgstr ""
7765
7766
#: dummy/help_topics/checkouts/detail.txt:68
7767
msgid ""
7768
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7769
" checkout\n"
7770
" update Pull any changes in the master branch in to your checkout\n"
7771
" commit Make a commit that is sent to the master branch. If you have\n"
7772
" a heavy checkout then the --local option will commit to the\n"
7773
" checkout without sending the commit to the master\n"
7774
" switch Change the master branch that the commits in the checkout "
7775
"will\n"
7776
" be sent to\n"
7777
" bind Turn a standalone branch into a heavy checkout so that any\n"
7778
" commits will be sent to the master branch\n"
7779
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7780
" commits are only made locally\n"
7781
" info Displays whether a branch is bound or unbound. If the branch "
7782
"is\n"
7783
" bound, then it will also display the location of the bound "
7784
"branch\n"
7785
msgstr ""
7786
7787
#: dummy/help_topics/checkouts/summary.txt:1
7788
msgid "Information on what a checkout is"
7789
msgstr ""
7790
7791
#: dummy/help_topics/commands/summary.txt:1
7792
msgid "Basic help for all commands"
7793
msgstr ""
7794
7795
#: dummy/help_topics/configuration/summary.txt:1
7796
msgid "Details on the configuration settings available"
7797
msgstr ""
7798
7799
#: dummy/help_topics/conflict-types/summary.txt:1
7800
msgid "Types of conflicts and what to do about them"
7801
msgstr ""
7802
7803
#: dummy/help_topics/content-filters/summary.txt:1
7804
msgid "Conversion of content into/from working trees"
7805
msgstr ""
7806
7807
#: dummy/help_topics/criss-cross/detail.txt:1
7808
msgid "Criss-Cross"
7809
msgstr ""
7810
7811
#: dummy/help_topics/criss-cross/detail.txt:3
7812
msgid ""
7813
"A criss-cross in the branch history can cause the default merge technique\n"
7814
"to emit more conflicts than would normally be expected."
7815
msgstr ""
7816
7817
#: dummy/help_topics/criss-cross/detail.txt:6
7818
msgid ""
7819
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7820
"give\n"
7821
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7822
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7823
msgstr ""
7824
7825
#: dummy/help_topics/criss-cross/detail.txt:10
7826
msgid ""
7827
"Criss-crosses occur in a branch's history if two branches merge the same "
7828
"thing\n"
7829
"and then merge one another, or if two branches merge one another at the "
7830
"same\n"
7831
"time. They can be avoided by having each branch only merge from or into a\n"
7832
"designated central branch (a \"star topology\")."
7833
msgstr ""
7834
7835
#: dummy/help_topics/criss-cross/detail.txt:15
7836
msgid ""
7837
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7838
"default\n"
7839
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7840
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7841
"differences between THIS and OTHER are due to one side adding lines, or\n"
7842
"from another side removing lines."
7843
msgstr ""
7844
7845
#: dummy/help_topics/criss-cross/detail.txt:21
7846
msgid ""
7847
"Criss-crosses mean there is no good choice for a base. Selecting the "
7848
"recent\n"
7849
"merge points could cause one side's changes to be silently discarded.\n"
7850
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7851
"are emitted."
7852
msgstr ""
7853
7854
#: dummy/help_topics/criss-cross/detail.txt:26
7855
msgid ""
7856
"The ``weave`` merge type is not affected by this problem because it uses\n"
7857
"line-origin detection instead of a basis revision to determine the cause of\n"
7858
"differences.\n"
7859
msgstr ""
7860
7861
#: dummy/help_topics/criss-cross/summary.txt:1
7862
msgid "Information on criss-cross merging"
7863
msgstr ""
7864
7865
#: dummy/help_topics/current-formats/summary.txt:1
7866
msgid "Current storage formats"
7867
msgstr ""
7868
7869
#: dummy/help_topics/debug-flags/summary.txt:1
7870
msgid "Options to show or record debug information"
7871
msgstr ""
7872
7873
#: dummy/help_topics/diverged-branches/summary.txt:1
7874
msgid "How to fix diverged branches"
7875
msgstr ""
7876
7877
#: dummy/help_topics/env-variables/detail.txt:1
7878
msgid "Environment Variables"
7879
msgstr ""
7880
7881
#: dummy/help_topics/env-variables/detail.txt:3
7882
msgid ""
7883
"=================== "
7884
"===========================================================\n"
7885
"BZRPATH Path where bzr is to look for shell plugin external\n"
7886
" commands.\n"
7887
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7888
"EMAIL E-Mail address of the user.\n"
7889
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7890
"EDITOR Editor for editing commit messages.\n"
7891
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7892
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7893
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7894
"BZR_PLUGIN_PATH.\n"
7895
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7896
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7897
"and\n"
7898
" HOME.\n"
7899
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7900
"URLs).\n"
7901
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7902
"sshcorp,\n"
7903
" plink or lsh.\n"
7904
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7905
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7906
"BZR_COLUMNS Override implicit terminal width.\n"
7907
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7908
"(selftest)\n"
7909
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7910
"'text'.\n"
7911
"BZR_PDB Control whether to launch a debugger on error.\n"
7912
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7913
" breakin debugger.\n"
7914
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7915
"(instead\n"
7916
" of char-based).\n"
7917
"=================== "
7918
"===========================================================\n"
7919
msgstr ""
7920
7921
#: dummy/help_topics/env-variables/summary.txt:1
7922
msgid "Environment variable names and values"
7923
msgstr ""
7924
7925
#: dummy/help_topics/eol/summary.txt:1
7926
msgid "Information on end-of-line handling"
7927
msgstr ""
7928
7929
#: dummy/help_topics/files/detail.txt:1
7930
msgid "Files"
7931
msgstr ""
7932
7933
#: dummy/help_topics/files/detail.txt:3
7934
msgid ""
7935
":On Unix: ~/.bazaar/bazaar.conf\n"
7936
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7937
"bazaar\\\\2.0\\\\bazaar.conf"
7938
msgstr ""
7939
7940
#: dummy/help_topics/files/detail.txt:6
7941
msgid ""
7942
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7943
"used to define general configuration that will be applied everywhere.\n"
7944
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7945
"commonly used options."
7946
msgstr ""
7947
7948
#: dummy/help_topics/files/detail.txt:11
7949
msgid "A typical config file might look something like::"
7950
msgstr ""
7951
7952
#: dummy/help_topics/files/detail.txt:13
7953
msgid ""
7954
" [DEFAULT]\n"
7955
" email=John Doe <jdoe@isp.com>"
7956
msgstr ""
7957
7958
#: dummy/help_topics/files/detail.txt:16
7959
msgid ""
7960
" [ALIASES]\n"
7961
" commit = commit --strict\n"
7962
" log10 = log --short -r -10..-1\n"
7963
msgstr ""
7964
7965
#: dummy/help_topics/files/summary.txt:1
7966
msgid "Information on configuration and log files"
7967
msgstr ""
7968
7969
#: dummy/help_topics/formats/detail.txt:1
7970
msgid "Storage Formats"
7971
msgstr ""
7972
7973
#: dummy/help_topics/formats/detail.txt:3
7974
msgid ""
7975
"To ensure that older clients do not access data incorrectly,\n"
7976
"Bazaar's policy is to introduce a new storage format whenever\n"
7977
"new features requiring new metadata are added. New storage\n"
7978
"formats may also be introduced to improve performance and\n"
7979
"scalability."
7980
msgstr ""
7981
7982
#: dummy/help_topics/formats/detail.txt:9
7983
msgid ""
7984
"The newest format, 2a, is highly recommended. If your\n"
7985
"project is not using 2a, then you should suggest to the\n"
7986
"project owner to upgrade."
7987
msgstr ""
7988
7989
#: dummy/help_topics/formats/detail.txt:13
7990
msgid ""
7991
"\n"
7992
".. note::"
7993
msgstr ""
7994
7995
#: dummy/help_topics/formats/detail.txt:16
7996
msgid ""
7997
" Some of the older formats have two variants:\n"
7998
" a plain one and a rich-root one. The latter include an additional\n"
7999
" field about the root of the tree. There is no performance cost\n"
8000
" for using a rich-root format but you cannot easily merge changes\n"
8001
" from a rich-root format into a plain format. As a consequence,\n"
8002
" moving a project to a rich-root format takes some co-ordination\n"
8003
" in that all contributors need to upgrade their repositories\n"
8004
" around the same time. 2a and all future formats will be\n"
8005
" implicitly rich-root."
8006
msgstr ""
8007
8008
#: dummy/help_topics/formats/detail.txt:26
8009
msgid ""
8010
"See :doc:`current-formats-help` for the complete list of\n"
8011
"currently supported formats. See :doc:`other-formats-help` for\n"
8012
"descriptions of any available experimental and deprecated formats.\n"
8013
msgstr ""
8014
8015
#: dummy/help_topics/formats/summary.txt:1
8016
msgid "Information on choosing a storage format"
8017
msgstr ""
8018
8019
#: dummy/help_topics/global-options/detail.txt:1
8020
msgid "Global Options"
8021
msgstr ""
8022
8023
#: dummy/help_topics/global-options/detail.txt:3
8024
msgid ""
8025
"These options may be used with any command, and may appear in front of any\n"
8026
"command. (e.g. ``bzr --profile help``)."
8027
msgstr ""
8028
8029
#: dummy/help_topics/global-options/detail.txt:6
8030
msgid ""
8031
"--version Print the version number. Must be supplied before the "
8032
"command.\n"
8033
"--no-aliases Do not process command aliases when running this command.\n"
8034
"--builtin Use the built-in version of a command, not the plugin "
8035
"version.\n"
8036
" This does not suppress other plugin effects.\n"
8037
"--no-plugins Do not process any plugins.\n"
8038
"--no-l10n Do not translate messages.\n"
8039
"--concurrency Number of processes that can be run concurrently (selftest)."
8040
msgstr ""
8041
8042
#: dummy/help_topics/global-options/detail.txt:14
8043
msgid ""
8044
"--profile Profile execution using the hotshot profiler.\n"
8045
"--lsprof Profile execution using the lsprof profiler.\n"
8046
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8047
" results to a specified file. If the filename ends with "
8048
"\".txt\",\n"
8049
" text format will be used. If the filename either starts "
8050
"with\n"
8051
" \"callgrind.out\" or end with \".callgrind\", the output will "
8052
"be\n"
8053
" formatted for use with KCacheGrind. Otherwise, the output\n"
8054
" will be a pickle.\n"
8055
"--coverage Generate line coverage report in the specified directory."
8056
msgstr ""
8057
8058
#: dummy/help_topics/global-options/detail.txt:24
8059
msgid ""
8060
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8061
"for\n"
8062
" the duration of the command. This can be used multiple times "
8063
"if\n"
8064
" several options need to be overridden."
8065
msgstr ""
8066
8067
#: dummy/help_topics/global-options/detail.txt:28
8068
msgid ""
8069
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8070
"information on profiling."
8071
msgstr ""
8072
8073
#: dummy/help_topics/global-options/detail.txt:31
8074
msgid ""
8075
"A number of debug flags are also available to assist troubleshooting and\n"
8076
"development. See :doc:`debug-flags-help`.\n"
8077
msgstr ""
8078
8079
#: dummy/help_topics/global-options/summary.txt:1
8080
msgid "Options that control how Bazaar runs"
8081
msgstr ""
8082
8083
#: dummy/help_topics/hidden-commands/summary.txt:1
8084
msgid "All hidden commands"
8085
msgstr ""
8086
8087
#: dummy/help_topics/hooks/summary.txt:1
8088
msgid "Points at which custom processing can be added"
8089
msgstr ""
8090
8091
#: dummy/help_topics/launchpad/detail.txt:1
8092
msgid "Integration with Launchpad.net"
8093
msgstr ""
8094
8095
#: dummy/help_topics/launchpad/detail.txt:3
8096
msgid ""
8097
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8098
"specification tracking."
8099
msgstr ""
8100
8101
#: dummy/help_topics/launchpad/detail.txt:6
8102
msgid ""
8103
"The bzr client (through the plugin called 'launchpad') has special\n"
8104
"features to communicate with Launchpad:"
8105
msgstr ""
8106
8107
#: dummy/help_topics/launchpad/detail.txt:9
8108
msgid ""
8109
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8110
"This\n"
8111
" is then used by the 'lp:' transport to download your branches using\n"
8112
" bzr+ssh://."
8113
msgstr ""
8114
8115
#: dummy/help_topics/launchpad/detail.txt:13
8116
msgid ""
8117
" * The 'lp:' transport uses Launchpad as a directory service: for "
8118
"example\n"
8119
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8120
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8121
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8122
msgstr ""
8123
8124
#: dummy/help_topics/launchpad/detail.txt:18
8125
msgid ""
8126
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8127
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8128
"lp:12345'\n"
8129
" will record a revision property that marks that revision as fixing\n"
8130
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8131
" automatically be linked to the bug report."
8132
msgstr ""
8133
8134
#: dummy/help_topics/launchpad/detail.txt:24
8135
msgid ""
8136
" * The register-branch command tells Launchpad about the url of a\n"
8137
" public branch. Launchpad will then mirror the branch, display\n"
8138
" its contents and allow it to be attached to bugs and other\n"
8139
" objects."
8140
msgstr ""
8141
8142
#: dummy/help_topics/launchpad/detail.txt:29
8143
msgid "For more information see http://help.launchpad.net/\n"
8144
msgstr ""
8145
8146
#: dummy/help_topics/launchpad/summary.txt:1
8147
msgid "Using Bazaar with Launchpad.net"
8148
msgstr ""
8149
8150
#: dummy/help_topics/location-alias/summary.txt:1
8151
msgid "Aliases for remembered locations"
8152
msgstr ""
8153
8154
#: dummy/help_topics/log-formats/summary.txt:1
8155
msgid "Details on the logging formats available"
8156
msgstr ""
8157
8158
#: dummy/help_topics/other-formats/summary.txt:1
8159
msgid "Experimental and deprecated storage formats"
8160
msgstr ""
8161
8162
#: dummy/help_topics/patterns/summary.txt:1
8163
msgid "Information on the pattern syntax"
8164
msgstr ""
8165
8166
#: dummy/help_topics/repositories/detail.txt:1
8167
msgid "Repositories"
8168
msgstr ""
8169
8170
#: dummy/help_topics/repositories/detail.txt:3
8171
msgid ""
8172
"Repositories in Bazaar are where committed information is stored. There is\n"
8173
"a repository associated with every branch."
8174
msgstr ""
8175
8176
#: dummy/help_topics/repositories/detail.txt:6
8177
msgid ""
8178
"Repositories are a form of database. Bzr will usually maintain this for\n"
8179
"good performance automatically, but in some situations (e.g. when doing\n"
8180
"very many commits in a short time period) you may want to ask bzr to\n"
8181
"optimise the database indices. This can be done by the 'bzr pack' command."
8182
msgstr ""
8183
8184
#: dummy/help_topics/repositories/detail.txt:11
8185
msgid ""
8186
"By default just running 'bzr init' will create a repository within the new\n"
8187
"branch but it is possible to create a shared repository which allows "
8188
"multiple\n"
8189
"branches to share their information in the same location. When a new branch "
8190
"is\n"
8191
"created it will first look to see if there is a containing shared repository "
8192
"it\n"
8193
"can use."
8194
msgstr ""
8195
8196
#: dummy/help_topics/repositories/detail.txt:17
8197
msgid ""
8198
"When two branches of the same project share a repository, there is\n"
8199
"generally a large space saving. For some operations (e.g. branching\n"
8200
"within the repository) this translates in to a large time saving."
8201
msgstr ""
8202
8203
#: dummy/help_topics/repositories/detail.txt:21
8204
msgid ""
8205
"To create a shared repository use the init-repository command (or the alias\n"
8206
"init-repo). This command takes the location of the repository to create. "
8207
"This\n"
8208
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8209
"which contains a shared repository. Any new branches that are created in "
8210
"this\n"
8211
"directory will then use it for storage."
8212
msgstr ""
8213
8214
#: dummy/help_topics/repositories/detail.txt:27
8215
msgid ""
8216
"It is a good idea to create a repository whenever you might create more\n"
8217
"than one branch of a project. This is true for both working areas where you\n"
8218
"are doing the development, and any server areas that you use for hosting\n"
8219
"projects. In the latter case, it is common to want branches without working\n"
8220
"trees. Since the files in the branch will not be edited directly there is "
8221
"no\n"
8222
"need to use up disk space for a working tree. To create a repository in "
8223
"which\n"
8224
"the branches will not have working trees pass the '--no-trees' option to\n"
8225
"'init-repository'."
8226
msgstr ""
8227
8228
#: dummy/help_topics/repositories/detail.txt:38
8229
msgid ""
8230
" init-repository Create a shared repository. Use --no-trees to create "
8231
"one\n"
8232
" in which new branches won't get a working tree.\n"
8233
msgstr ""
8234
8235
#: dummy/help_topics/repositories/summary.txt:1
8236
msgid "Basic information on shared repositories."
8237
msgstr ""
8238
8239
#: dummy/help_topics/revisionspec/summary.txt:1
8240
msgid "Explain how to use --revision"
8241
msgstr ""
8242
8243
#: dummy/help_topics/rules/summary.txt:1
8244
msgid "Information on defining rule-based preferences"
8245
msgstr ""
8246
8247
#: dummy/help_topics/standalone-trees/detail.txt:1
8248
msgid "Standalone Trees"
8249
msgstr ""
8250
8251
#: dummy/help_topics/standalone-trees/detail.txt:3
8252
msgid ""
8253
"A standalone tree is a working tree with an associated repository. It\n"
8254
"is an independently usable branch, with no dependencies on any other.\n"
8255
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8256
"an existing project under version control."
8257
msgstr ""
8258
8259
#: dummy/help_topics/standalone-trees/detail.txt:8
8260
msgid "Related Commands::"
8261
msgstr ""
8262
8263
#: dummy/help_topics/standalone-trees/detail.txt:10
8264
msgid " init Make a directory into a versioned branch.\n"
8265
msgstr ""
8266
8267
#: dummy/help_topics/standalone-trees/summary.txt:1
8268
msgid "Information on what a standalone tree is"
8269
msgstr ""
8270
8271
#: dummy/help_topics/standard-options/detail.txt:1
8272
msgid "Standard Options"
8273
msgstr ""
8274
8275
#: dummy/help_topics/standard-options/detail.txt:3
8276
msgid "Standard options are legal for all commands."
8277
msgstr ""
8278
8279
#: dummy/help_topics/standard-options/detail.txt:5
8280
msgid ""
8281
"--help, -h Show help message.\n"
8282
"--verbose, -v Display more information.\n"
8283
"--quiet, -q Only display errors and warnings."
8284
msgstr ""
8285
8286
#: dummy/help_topics/standard-options/detail.txt:9
8287
msgid "Unlike global options, standard options can be used in aliases.\n"
8288
msgstr ""
8289
8290
#: dummy/help_topics/standard-options/summary.txt:1
8291
msgid "Options that can be used with any command"
8292
msgstr ""
8293
8294
#: dummy/help_topics/status-flags/detail.txt:1
8295
msgid "Status Flags"
8296
msgstr ""
8297
8298
#: dummy/help_topics/status-flags/detail.txt:3
8299
msgid ""
8300
"Status flags are used to summarise changes to the working tree in a concise\n"
8301
"manner. They are in the form::"
8302
msgstr ""
8303
8304
#: dummy/help_topics/status-flags/detail.txt:6
8305
msgid " xxx <filename>"
8306
msgstr ""
8307
8308
#: dummy/help_topics/status-flags/detail.txt:8
8309
msgid "where the columns' meanings are as follows."
8310
msgstr ""
8311
8312
#: dummy/help_topics/status-flags/detail.txt:10
8313
msgid "Column 1 - versioning/renames::"
8314
msgstr ""
8315
8316
#: dummy/help_topics/status-flags/detail.txt:12
8317
msgid ""
8318
" + File versioned\n"
8319
" - File unversioned\n"
8320
" R File renamed\n"
8321
" ? File unknown\n"
8322
" X File nonexistent (and unknown to bzr)\n"
8323
" C File has conflicts\n"
8324
" P Entry for a pending merge (not a file)"
8325
msgstr ""
8326
8327
#: dummy/help_topics/status-flags/detail.txt:20
8328
msgid "Column 2 - contents::"
8329
msgstr ""
8330
8331
#: dummy/help_topics/status-flags/detail.txt:22
8332
msgid ""
8333
" N File created\n"
8334
" D File deleted\n"
8335
" K File kind changed\n"
8336
" M File modified"
8337
msgstr ""
8338
8339
#: dummy/help_topics/status-flags/detail.txt:27
8340
msgid "Column 3 - execute::"
8341
msgstr ""
8342
8343
#: dummy/help_topics/status-flags/detail.txt:29
8344
msgid " * The execute bit was changed\n"
8345
msgstr ""
8346
8347
#: dummy/help_topics/status-flags/summary.txt:1
8348
msgid "Help on status flags"
8349
msgstr ""
8350
8351
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8352
msgid "Branches Out of Sync"
8353
msgstr ""
8354
8355
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8356
msgid ""
8357
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8358
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8359
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8360
"have the same last revision as the new reference branch for the lightweight\n"
8361
"checkout, data could be lost, so Bazaar refuses."
8362
msgstr ""
8363
8364
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8365
msgid "How you deal with this depends on *why* the branches are out of sync."
8366
msgstr ""
8367
8368
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8369
msgid ""
8370
"If you have a checkout and have done local commits, you can get back in "
8371
"sync\n"
8372
"by running \"bzr update\" (and possibly \"bzr commit\")."
8373
msgstr ""
8374
8375
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8376
msgid ""
8377
"If you have a branch and the remote branch is out-of-date, you can push\n"
8378
"the local changes using \"bzr push\". If the local branch is out of date, "
8379
"you\n"
8380
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8381
"commit\n"
8382
"and then push your changes. If you decide that some of the changes aren't\n"
8383
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8384
msgstr ""
8385
8386
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8387
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8388
msgstr ""
8389
8390
#: dummy/help_topics/topics/summary.txt:1
8391
msgid "Topics list"
8392
msgstr ""
8393
8394
#: dummy/help_topics/url-special-chars/summary.txt:1
8395
msgid "Special character handling in URLs"
8396
msgstr ""
8397
8398
#: dummy/help_topics/urlspec/summary.txt:1
8399
msgid "Supported transport protocols"
8400
msgstr ""
8401
8402
#: dummy/help_topics/working-trees/detail.txt:1
8403
msgid "Working Trees"
8404
msgstr ""
8405
8406
#: dummy/help_topics/working-trees/detail.txt:3
8407
msgid ""
8408
"A working tree is the contents of a branch placed on disk so that you can\n"
8409
"see the files and edit them. The working tree is where you make changes to "
8410
"a\n"
8411
"branch, and when you commit the current state of the working tree is the\n"
8412
"snapshot that is recorded in the commit."
8413
msgstr ""
8414
8415
#: dummy/help_topics/working-trees/detail.txt:8
8416
msgid ""
8417
"When you push a branch to a remote system, a working tree will not be\n"
8418
"created. If one is already present the files will not be updated. The\n"
8419
"branch information will be updated and the working tree will be marked\n"
8420
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8421
"may be uncommitted changes or the update may cause content conflicts that "
8422
"are\n"
8423
"difficult to deal with remotely."
8424
msgstr ""
8425
8426
#: dummy/help_topics/working-trees/detail.txt:15
8427
msgid ""
8428
"If you have a branch with no working tree you can use the 'checkout' "
8429
"command\n"
8430
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8431
"will\n"
8432
"create the working tree. If the branch is updated remotely, you can update "
8433
"the\n"
8434
"working tree by running 'bzr update' in that directory."
8435
msgstr ""
8436
8437
#: dummy/help_topics/working-trees/detail.txt:20
8438
msgid ""
8439
"If you have a branch with a working tree that you do not want the 'remove-"
8440
"tree'\n"
8441
"command will remove the tree if it is safe. This can be done to avoid the\n"
8442
"warning about the remote working tree not being updated when pushing to the\n"
8443
"branch. It can also be useful when working with a '--no-trees' repository\n"
8444
"(see 'bzr help repositories')."
8445
msgstr ""
8446
8447
#: dummy/help_topics/working-trees/detail.txt:26
8448
msgid ""
8449
"If you want to have a working tree on a remote machine that you push to you\n"
8450
"can either run 'bzr update' in the remote branch after each push, or use "
8451
"some\n"
8452
"other method to update the tree during the push. There is an 'rspush' "
8453
"plugin\n"
8454
"that will update the working tree using rsync as well as doing a push. "
8455
"There\n"
8456
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8457
"SSH\n"
8458
"after each push."
8459
msgstr ""
8460
8461
#: dummy/help_topics/working-trees/detail.txt:33
8462
msgid "Useful commands::"
8463
msgstr ""
8464
8465
#: dummy/help_topics/working-trees/detail.txt:35
8466
msgid ""
8467
" checkout Create a working tree when a branch does not have one.\n"
8468
" remove-tree Removes the working tree from a branch when it is safe to do "
8469
"so.\n"
8470
" update When a working tree is out of sync with its associated "
8471
"branch\n"
8472
" this will update the tree to match the branch.\n"
8473
msgstr ""
8474
8475
#: dummy/help_topics/working-trees/summary.txt:1
8476
msgid "Information on working trees"
8477
msgstr ""
8478
8479
#: en/help_topics/authentication.txt:1
8480
msgid ""
8481
"Authentication Settings\n"
8482
"======================="
8483
msgstr ""
8484
8485
#: en/help_topics/authentication.txt:4
8486
msgid ""
8487
"\n"
8488
"Intent\n"
8489
"------"
8490
msgstr ""
8491
8492
#: en/help_topics/authentication.txt:8
8493
msgid ""
8494
"Many different authentication policies can be described in the\n"
8495
"``authentication.conf`` file but a particular user should need only a few\n"
8496
"definitions to cover his needs without having to specify a user and a "
8497
"password\n"
8498
"for every branch he uses."
8499
msgstr ""
8500
8501
#: en/help_topics/authentication.txt:13
8502
msgid ""
8503
"The definitions found in this file are used to find the credentials to use "
8504
"for\n"
8505
"a given url. The same credentials can generally be used for as many branches "
8506
"as\n"
8507
"possible by grouping their declaration around the remote servers that need\n"
8508
"them. It's even possible to declare credentials that will be used by "
8509
"different\n"
8510
"servers."
8511
msgstr ""
8512
8513
#: en/help_topics/authentication.txt:19
8514
msgid ""
8515
"The intent is to make this file as small as possible to minimize maintenance."
8516
msgstr ""
8517
8518
#: en/help_topics/authentication.txt:21
8519
msgid ""
8520
"Once the relevant credentials are declared in this file you may use branch "
8521
"urls\n"
8522
"without embedding passwords (security hazard) or even users (enabling "
8523
"sharing\n"
8524
"of your urls with others)."
8525
msgstr ""
8526
8527
#: en/help_topics/authentication.txt:25
8528
msgid "Instead of using::"
8529
msgstr ""
8530
8531
#: en/help_topics/authentication.txt:27
8532
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8533
msgstr ""
8534
8535
#: en/help_topics/authentication.txt:29
8536
msgid "you simply use::"
8537
msgstr ""
8538
8539
#: en/help_topics/authentication.txt:31
8540
msgid " bzr branch ftp://host.com/path/to/my/branch"
8541
msgstr ""
8542
8543
#: en/help_topics/authentication.txt:33
8544
msgid ""
8545
"provided you have created the following ``authentication.conf`` file::"
8546
msgstr ""
8547
8548
#: en/help_topics/authentication.txt:35
8549
msgid ""
8550
" [myprojects]\n"
8551
" scheme=ftp\n"
8552
" host=host.com\n"
8553
" user=joe\n"
8554
" password=secret\n"
8555
" "
8556
msgstr ""
8557
8558
#: en/help_topics/authentication.txt:42
8559
msgid ""
8560
"Authentication definitions\n"
8561
"--------------------------"
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:45
8565
msgid ""
8566
"There are two kinds of authentication used by the various schemes supported "
8567
"by\n"
8568
"bzr:"
8569
msgstr ""
8570
8571
#: en/help_topics/authentication.txt:48
8572
msgid "1. user and password"
8573
msgstr ""
8574
8575
#: en/help_topics/authentication.txt:50
8576
msgid ""
8577
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8578
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8579
"ssh agents are a better, more secure solution. So we have chosen to not "
8580
"provide\n"
8581
"our own less secure method."
8582
msgstr ""
8583
8584
#: en/help_topics/authentication.txt:55
8585
msgid "2. user, realm and password"
8586
msgstr ""
8587
8588
#: en/help_topics/authentication.txt:57
8589
msgid ""
8590
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8591
"against a host. But, by using ``.htaccess`` files, for example, it is "
8592
"possible\n"
8593
"to define several (``user, realm, password``) for a given ``host``. So what "
8594
"is\n"
8595
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8596
"is\n"
8597
"not taken into account in the definitions, but will displayed if bzr "
8598
"prompts\n"
8599
"you for a password."
8600
msgstr ""
8601
8602
#: en/help_topics/authentication.txt:64
8603
msgid ""
8604
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8605
"specifying the appropriate port."
8606
msgstr ""
8607
8608
#: en/help_topics/authentication.txt:67
8609
msgid ""
8610
"To take all schemes into account, the password will be deduced from a set "
8611
"of\n"
8612
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8613
"``user``,\n"
8614
"``password``)."
8615
msgstr ""
8616
8617
#: en/help_topics/authentication.txt:71
8618
msgid ""
8619
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8620
"used\n"
8621
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8622
"``ssh``\n"
8623
" should be used instead since this is the real scheme regarding\n"
8624
" authentication,"
8625
msgstr ""
8626
8627
#: en/help_topics/authentication.txt:76
8628
msgid " * ``host``: can be empty (to act as a default for any host),"
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:78
8632
msgid ""
8633
" * ``port`` can be empty (useful when an host provides several servers for "
8634
"the\n"
8635
" same scheme), only numerical values are allowed, this should be used "
8636
"only\n"
8637
" when the server uses a port different than the scheme standard port,"
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:82
8641
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8642
msgstr ""
8643
8644
#: en/help_topics/authentication.txt:84
8645
msgid ""
8646
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8647
" ``getpass.get_user()``),"
8648
msgstr ""
8649
8650
#: en/help_topics/authentication.txt:87
8651
msgid ""
8652
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8653
" password."
8654
msgstr ""
8655
8656
#: en/help_topics/authentication.txt:90
8657
msgid ""
8658
"Multiple definitions can be provided and, for a given URL, bzr will select "
8659
"a\n"
8660
"(``user`` [, ``password``]) based on the following rules :"
8661
msgstr ""
8662
8663
#: en/help_topics/authentication.txt:93
8664
msgid " 1. the first match wins,"
8665
msgstr ""
8666
8667
#: en/help_topics/authentication.txt:95
8668
msgid " 2. empty fields match everything,"
8669
msgstr ""
8670
8671
#: en/help_topics/authentication.txt:97
8672
msgid ""
8673
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8674
msgstr ""
8675
8676
#: en/help_topics/authentication.txt:99
8677
msgid ""
8678
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8679
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8680
"``projectbzr.sf.net``\n"
8681
" will not match ``bzr.sf.net``)."
8682
msgstr ""
8683
8684
#: en/help_topics/authentication.txt:103
8685
msgid ""
8686
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8687
msgstr ""
8688
8689
#: en/help_topics/authentication.txt:105
8690
msgid ""
8691
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8692
"above,\n"
8693
" empty paths will match any provided path)."
8694
msgstr ""
8695
8696
#: en/help_topics/authentication.txt:110
8697
msgid ""
8698
"File format\n"
8699
"-----------"
8700
msgstr ""
8701
8702
#: en/help_topics/authentication.txt:113
8703
msgid ""
8704
"The general rules for :doc:`configuration files <configuration-help>`\n"
8705
"apply except for the variable policies."
8706
msgstr ""
8707
8708
#: en/help_topics/authentication.txt:116
8709
msgid "Each section describes an authentication definition."
8710
msgstr ""
8711
8712
#: en/help_topics/authentication.txt:118
8713
msgid ""
8714
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8715
"reserved\n"
8716
"and should appear as the *last* section."
8717
msgstr ""
8718
8719
#: en/help_topics/authentication.txt:121
8720
msgid "Each section should define:"
8721
msgstr ""
8722
8723
#: en/help_topics/authentication.txt:123
8724
msgid "* ``user``: the login to be used,"
8725
msgstr ""
8726
8727
#: en/help_topics/authentication.txt:125
8728
msgid "Each section could define:"
8729
msgstr ""
8730
8731
#: en/help_topics/authentication.txt:127
8732
msgid "* ``host``: the remote server,"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:129
8736
msgid "* ``port``: the port the server is listening,"
8737
msgstr ""
8738
8739
#: en/help_topics/authentication.txt:131
8740
msgid "* ``path``: the branch location,"
8741
msgstr ""
8742
8743
#: en/help_topics/authentication.txt:133
8744
msgid "* ``password``: the password."
8745
msgstr ""
8746
8747
#: en/help_topics/authentication.txt:135
8748
msgid ""
8749
"\n"
8750
"Examples\n"
8751
"--------"
8752
msgstr ""
8753
8754
#: en/help_topics/authentication.txt:139
8755
msgid ""
8756
"\n"
8757
"Personal projects hosted outside\n"
8758
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8759
msgstr ""
8760
8761
#: en/help_topics/authentication.txt:143
8762
msgid ""
8763
"All connections are done with the same ``user`` (the remote one for which "
8764
"the\n"
8765
"default bzr one is not appropriate) and the password is always prompted "
8766
"with\n"
8767
"some exceptions::"
8768
msgstr ""
8769
8770
#: en/help_topics/authentication.txt:147
8771
msgid ""
8772
" # Pet projects on hobby.net\n"
8773
" [hobby]\n"
8774
" host=r.hobby.net\n"
8775
" user=jim\n"
8776
" password=obvious1234\n"
8777
" \n"
8778
" # Home server\n"
8779
" [home]\n"
8780
" scheme=https\n"
8781
" host=home.net\n"
8782
" user=joe\n"
8783
" password=1essobV10us\n"
8784
" \n"
8785
" [DEFAULT]\n"
8786
" # Our local user is barbaz, on all remote sites we're known as "
8787
"foobar\n"
8788
" user=foobar"
8789
msgstr ""
8790
8791
#: en/help_topics/authentication.txt:164
8792
msgid ""
8793
"\n"
8794
"Source hosting provider\n"
8795
"~~~~~~~~~~~~~~~~~~~~~~~"
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:168
8799
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8800
msgstr ""
8801
8802
#: en/help_topics/authentication.txt:170
8803
msgid ""
8804
" [shpnet domain]\n"
8805
" # we use sftp, but ssh is the scheme used for authentication\n"
8806
" scheme=ssh\n"
8807
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8808
" host=.shp.net\n"
8809
" user=joe\n"
8810
" # bzr don't support supplying a password for sftp,\n"
8811
" # consider using an ssh agent if you don't want to supply\n"
8812
" # a password interactively. (pageant, ssh-agent, etc)"
8813
msgstr ""
8814
8815
#: en/help_topics/authentication.txt:180
8816
msgid ""
8817
"HTTPS, SFTP servers and their proxy\n"
8818
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8819
msgstr ""
8820
8821
#: en/help_topics/authentication.txt:183
8822
msgid ""
8823
"At company.com, the server hosting release and integration branches is "
8824
"behind a\n"
8825
"proxy, and the two branches use different authentication policies::"
8826
msgstr ""
8827
8828
#: en/help_topics/authentication.txt:186
8829
msgid ""
8830
" [reference code]\n"
8831
" scheme=https\n"
8832
" host=dev.company.com\n"
8833
" path=/dev\n"
8834
" user=user1\n"
8835
" password=pass1"
8836
msgstr ""
8837
8838
#: en/help_topics/authentication.txt:193
8839
msgid ""
8840
" # development branches on dev server\n"
8841
" [dev]\n"
8842
" scheme=ssh # bzr+ssh and sftp are available here\n"
8843
" host=dev.company.com\n"
8844
" path=/dev/integration\n"
8845
" user=user2\n"
8846
" \n"
8847
" # proxy\n"
8848
" [proxy]\n"
8849
" scheme=http\n"
8850
" host=proxy.company.com\n"
8851
" port=3128\n"
8852
" user=proxyuser1\n"
8853
" password=proxypass1"
8854
msgstr ""
8855
8856
#: en/help_topics/authentication.txt:208
8857
msgid ""
8858
"\n"
8859
"Planned enhancements\n"
8860
"--------------------"
8861
msgstr ""
8862
8863
#: en/help_topics/authentication.txt:212
8864
msgid ""
8865
"The following are not yet implemented but planned as parts of a work in\n"
8866
"progress:"
8867
msgstr ""
8868
8869
#: en/help_topics/authentication.txt:215
8870
msgid "* add a ``password_encoding`` field allowing:"
8871
msgstr ""
8872
8873
#: en/help_topics/authentication.txt:217
8874
msgid ""
8875
" - storing the passwords in various obfuscating encodings (base64 for one),"
8876
msgstr ""
8877
8878
#: en/help_topics/authentication.txt:219
8879
msgid " - delegate password storage to plugins (.netrc for example)."
8880
msgstr ""
8881
8882
#: en/help_topics/authentication.txt:221
8883
msgid ""
8884
"* update the credentials when the user is prompted for user or password,"
8885
msgstr ""
8886
8887
#: en/help_topics/authentication.txt:223
8888
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8889
msgstr ""
8890
8891
#: en/help_topics/authentication.txt:225
8892
msgid ""
8893
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8894
"but\n"
8895
"ignored in the actual implementation.\n"
8896
msgstr ""
8897
8898
#: en/help_topics/bugs.txt:1
8899
msgid "Bug Tracker Settings"
8900
msgstr ""
8901
8902
#: en/help_topics/bugs.txt:3
8903
msgid ""
8904
"When making a commit, metadata about bugs fixed by that change can be\n"
8905
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8906
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8907
"(The only ``status`` value currently supported is ``fixed.``)"
8908
msgstr ""
8909
8910
#: en/help_topics/bugs.txt:8
8911
msgid ""
8912
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8913
"identifier\n"
8914
"rather than a full URL. This looks like::"
8915
msgstr ""
8916
8917
#: en/help_topics/bugs.txt:11
8918
msgid " bzr commit --fixes <tracker>:<id>"
8919
msgstr ""
8920
8921
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8922
msgid "or::"
8923
msgstr ""
8924
8925
#: en/help_topics/bugs.txt:15
8926
msgid " bzr commit --fixes <id>"
8927
msgstr ""
8928
8929
#: en/help_topics/bugs.txt:17
8930
msgid ""
8931
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8932
"the\n"
8933
"identifier for that bug within the bugtracker, usually the bug number.\n"
8934
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8935
"or global configuration is used."
8936
msgstr ""
8937
8938
#: en/help_topics/bugs.txt:22
8939
msgid ""
8940
"Bazaar knows about a few bug trackers that have many users. If\n"
8941
"you use one of these bug trackers then there is no setup required to\n"
8942
"use this feature, you just need to know the tracker identifier to use.\n"
8943
"These are the bugtrackers that are built in:"
8944
msgstr ""
8945
8946
#: en/help_topics/bugs.txt:27
8947
msgid ""
8948
" ============================ ============ ============\n"
8949
" URL Abbreviation Example\n"
8950
" ============================ ============ ============\n"
8951
" https://bugs.launchpad.net/ lp lp:12345\n"
8952
" http://bugs.debian.org/ deb deb:12345\n"
8953
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8954
" ============================ ============ ============"
8955
msgstr ""
8956
8957
#: en/help_topics/bugs.txt:35
8958
msgid ""
8959
"For the bug trackers not listed above configuration is required.\n"
8960
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8961
"is built in, along with a template mechanism for other bugtrackers with\n"
8962
"simple URL schemes. If your bug tracker can't be described by one\n"
8963
"of the schemes described below then you can write a plugin to support\n"
8964
"it."
8965
msgstr ""
8966
8967
#: en/help_topics/bugs.txt:42
8968
msgid ""
8969
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8970
"variable which contains the base URL of the bug tracker. These options\n"
8971
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8972
"configuration section in ``locations.conf``. You can set up these values\n"
8973
"for each of the projects you work on."
8974
msgstr ""
8975
8976
#: en/help_topics/bugs.txt:48
8977
msgid ""
8978
"Note: As you provide a short name for each tracker, you can specify one or\n"
8979
"more bugs in one or more trackers at commit time if you wish."
8980
msgstr ""
8981
8982
#: en/help_topics/bugs.txt:51
8983
msgid ""
8984
"Launchpad\n"
8985
"---------"
8986
msgstr ""
8987
8988
#: en/help_topics/bugs.txt:54
8989
msgid ""
8990
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8991
msgstr ""
8992
8993
#: en/help_topics/bugs.txt:56
8994
msgid ""
8995
"bugzilla_<tracker>_url\n"
8996
"----------------------"
8997
msgstr ""
8998
8999
#: en/help_topics/bugs.txt:59
9000
msgid ""
9001
"If present, the location of the Bugzilla bug tracker referred to by\n"
9002
"<tracker>. This option can then be used together with ``bzr commit\n"
9003
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9004
"example::"
9005
msgstr ""
9006
9007
#: en/help_topics/bugs.txt:64
9008
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9009
msgstr ""
9010
9011
#: en/help_topics/bugs.txt:66
9012
msgid ""
9013
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9014
"fixed."
9015
msgstr ""
9016
9017
#: en/help_topics/bugs.txt:69
9018
msgid ""
9019
"trac_<tracker>_url\n"
9020
"------------------"
9021
msgstr ""
9022
9023
#: en/help_topics/bugs.txt:72
9024
msgid ""
9025
"If present, the location of the Trac instance referred to by\n"
9026
"<tracker>. This option can then be used together with ``bzr commit\n"
9027
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9028
"example::"
9029
msgstr ""
9030
9031
#: en/help_topics/bugs.txt:77
9032
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9033
msgstr ""
9034
9035
#: en/help_topics/bugs.txt:79
9036
msgid ""
9037
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9038
"as\n"
9039
"fixed."
9040
msgstr ""
9041
9042
#: en/help_topics/bugs.txt:82
9043
msgid ""
9044
"bugtracker_<tracker>_url\n"
9045
"------------------------"
9046
msgstr ""
9047
9048
#: en/help_topics/bugs.txt:85
9049
msgid ""
9050
"If present, the location of a generic bug tracker instance referred to by\n"
9051
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9052
"which will be replaced by a specific bug ID. This option can then be used\n"
9053
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9054
"fixed by that commit. For example::"
9055
msgstr ""
9056
9057
#: en/help_topics/bugs.txt:91
9058
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9059
msgstr ""
9060
9061
#: en/help_topics/bugs.txt:93
9062
msgid ""
9063
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9064
"Roundup bug tracker as fixed, or::"
9065
msgstr ""
9066
9067
#: en/help_topics/bugs.txt:96
9068
msgid ""
9069
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9070
msgstr ""
9071
9072
#: en/help_topics/bugs.txt:98
9073
msgid ""
9074
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9075
"RT bug tracker as fixed, or::"
9076
msgstr ""
9077
9078
#: en/help_topics/bugs.txt:101
9079
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9080
msgstr ""
9081
9082
#: en/help_topics/bugs.txt:103
9083
msgid ""
9084
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9085
"1234\n"
9086
"in Hudson's JIRA bug tracker as fixed.\n"
9087
msgstr ""
9088
9089
#: en/help_topics/commands.txt:1
9090
msgid ""
9091
"add Add specified files or directories.\n"
9092
"alias Set/unset and display aliases.\n"
9093
"annotate Show the origin of each line in a file.\n"
9094
"bash-completion Generate a shell function for bash command line "
9095
"completion.\n"
9096
" [bash_completion]\n"
9097
"bind Convert the current branch into a checkout of the "
9098
"supplied\n"
9099
" branch.\n"
9100
"branch Create a new branch that is a copy of an existing branch.\n"
9101
"branches List the branches available at the current location.\n"
9102
"break-lock Break a dead lock.\n"
9103
"cat Write the contents of a file as of a given revision to\n"
9104
" standard output.\n"
9105
"check Validate working tree structure, branch consistency and\n"
9106
" repository history.\n"
9107
"checkout Create a new checkout of an existing branch.\n"
9108
"clean-tree Remove unwanted files from working tree.\n"
9109
"commit Commit changes into a new revision.\n"
9110
"config Display, set or remove a configuration option.\n"
9111
"conflicts List files with conflicts.\n"
9112
"deleted List files deleted in the working tree.\n"
9113
"diff Show differences in the working tree, between revisions "
9114
"or\n"
9115
" branches.\n"
9116
"dpush Push into a different VCS without any custom bzr "
9117
"metadata.\n"
9118
"export Export current or past revision to a destination directory "
9119
"or\n"
9120
" archive.\n"
9121
"help Show help on a command or other topic.\n"
9122
"ignore Ignore specified files or patterns.\n"
9123
"ignored List ignored files and the patterns that matched them.\n"
9124
"info Show information about a working tree, branch or "
9125
"repository.\n"
9126
"init Make a directory into a versioned branch.\n"
9127
"init-repository Create a shared repository for branches to share storage\n"
9128
" space.\n"
9129
"join Combine a tree into its containing tree.\n"
9130
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9131
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9132
"launchpad-open Open a Launchpad branch page in your web browser. "
9133
"[launchpad]\n"
9134
"log Show historical log for a branch or subset of a branch.\n"
9135
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9136
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9137
"ls List files in a tree.\n"
9138
"merge Perform a three-way merge.\n"
9139
"missing Show unmerged/unpulled revisions between two branches.\n"
9140
"mkdir Create a new versioned directory.\n"
9141
"mv Move or rename a file.\n"
9142
"nick Print or set the branch nickname.\n"
9143
"pack Compress the data within a repository.\n"
9144
"plugins List the installed plugins.\n"
9145
"pull Turn this branch into a mirror of another branch.\n"
9146
"push Update a mirror of this branch.\n"
9147
"reconcile Reconcile bzr metadata in a branch.\n"
9148
"reconfigure Reconfigure the type of a bzr directory.\n"
9149
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9150
"remerge Redo a merge.\n"
9151
"remove Remove files or directories.\n"
9152
"remove-branch Remove a branch.\n"
9153
"remove-tree Remove the working tree from a given branch/checkout.\n"
9154
"renames Show list of renamed files.\n"
9155
"resolve Mark a conflict as resolved.\n"
9156
"revert Revert files to a previous revision.\n"
9157
"revno Show current revision number.\n"
9158
"root Show the tree root directory.\n"
9159
"send Mail or create a merge-directive for submitting changes.\n"
9160
"serve Run the bzr server.\n"
9161
"shelve Temporarily set aside some changes from the current tree.\n"
9162
"sign-my-commits Sign all commits by a given committer.\n"
9163
"split Split a subdirectory of a tree into a separate tree.\n"
9164
"status Display status summary.\n"
9165
"switch Set the branch of a checkout and update.\n"
9166
"tag Create, remove or modify a tag naming a revision.\n"
9167
"tags List tags.\n"
9168
"testament Show testament (signing-form) of a revision.\n"
9169
"unbind Convert the current checkout into a regular branch.\n"
9170
"uncommit Remove the last committed revision.\n"
9171
"unshelve Restore shelved changes.\n"
9172
"update Update a working tree to a new revision.\n"
9173
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9174
" format.\n"
9175
"verify-signatures Verify all commit signatures.\n"
9176
"version Show version of bzr.\n"
9177
"version-info Show version information about this tree.\n"
9178
"view Manage filtered views.\n"
9179
"whoami Show or set bzr user id.\n"
9180
msgstr ""
9181
9182
#: en/help_topics/configuration.txt:1
9183
msgid ""
9184
"Configuration Settings\n"
9185
"======================="
9186
msgstr ""
9187
9188
#: en/help_topics/configuration.txt:4
9189
msgid ""
9190
"Environment settings\n"
9191
"---------------------"
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:7
9195
msgid ""
9196
"While most configuration is handled by configuration files, some options\n"
9197
"which may be semi-permanent can also be controlled through the environment."
9198
msgstr ""
9199
9200
#: en/help_topics/configuration.txt:10
9201
msgid ""
9202
"BZR_EMAIL\n"
9203
"~~~~~~~~~"
9204
msgstr ""
9205
9206
#: en/help_topics/configuration.txt:13
9207
msgid "Override the email id used by Bazaar. Typical format::"
9208
msgstr ""
9209
9210
#: en/help_topics/configuration.txt:15
9211
msgid " \"John Doe <jdoe@example.com>\""
9212
msgstr ""
9213
9214
#: en/help_topics/configuration.txt:17
9215
msgid "See also the ``email`` configuration option."
9216
msgstr ""
9217
9218
#: en/help_topics/configuration.txt:19
9219
msgid ""
9220
"BZR_PROGRESS_BAR\n"
9221
"~~~~~~~~~~~~~~~~"
9222
msgstr ""
9223
9224
#: en/help_topics/configuration.txt:22
9225
msgid ""
9226
"Override the progress display. Possible values are \"none\" or \"text\". "
9227
"If\n"
9228
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9229
"draws\n"
9230
"the ordinary command line progress bar."
9231
msgstr ""
9232
9233
#: en/help_topics/configuration.txt:26
9234
msgid ""
9235
"BZR_SIGQUIT_PDB\n"
9236
"~~~~~~~~~~~~~~~"
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:29
9240
msgid ""
9241
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9242
msgstr ""
9243
9244
#: en/help_topics/configuration.txt:31
9245
msgid ""
9246
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9247
"* 1 = Invoke breakin debugger (default)"
9248
msgstr ""
9249
9250
#: en/help_topics/configuration.txt:34
9251
msgid ""
9252
"BZR_HOME\n"
9253
"~~~~~~~~"
9254
msgstr ""
9255
9256
#: en/help_topics/configuration.txt:37
9257
msgid "Override the home directory used by Bazaar."
9258
msgstr ""
9259
9260
#: en/help_topics/configuration.txt:39
9261
msgid ""
9262
"BZR_SSH\n"
9263
"~~~~~~~"
9264
msgstr ""
9265
9266
#: en/help_topics/configuration.txt:42
9267
msgid "Select a different SSH implementation."
9268
msgstr ""
9269
9270
#: en/help_topics/configuration.txt:44
9271
msgid ""
9272
"BZR_PDB\n"
9273
"~~~~~~~"
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:47
9277
msgid "Control whether to launch a debugger on error."
9278
msgstr ""
9279
9280
#: en/help_topics/configuration.txt:49
9281
msgid ""
9282
"* 0 = Standard behavior\n"
9283
"* 1 = Launch debugger"
9284
msgstr ""
9285
9286
#: en/help_topics/configuration.txt:52
9287
msgid ""
9288
"BZR_REMOTE_PATH\n"
9289
"~~~~~~~~~~~~~~~"
9290
msgstr ""
9291
9292
#: en/help_topics/configuration.txt:55
9293
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9294
msgstr ""
9295
9296
#: en/help_topics/configuration.txt:57
9297
msgid "See also the ``bzr_remote_path`` configuration option."
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:59
9301
msgid ""
9302
"BZR_EDITOR\n"
9303
"~~~~~~~~~~"
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:62
9307
msgid "Path to the editor Bazaar should use for commit messages, etc."
9308
msgstr ""
9309
9310
#: en/help_topics/configuration.txt:64
9311
msgid ""
9312
"BZR_LOG\n"
9313
"~~~~~~~"
9314
msgstr ""
9315
9316
#: en/help_topics/configuration.txt:67
9317
msgid ""
9318
"Location of the Bazaar log file. You can check the current location by\n"
9319
"running ``bzr version``."
9320
msgstr ""
9321
9322
#: en/help_topics/configuration.txt:70
9323
msgid ""
9324
"The log file contains debug information that is useful for diagnosing or\n"
9325
"reporting problems with Bazaar."
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:73
9329
msgid ""
9330
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9331
"will disable logging."
9332
msgstr ""
9333
9334
#: en/help_topics/configuration.txt:76
9335
msgid ""
9336
"\n"
9337
"BZR_PLUGIN_PATH\n"
9338
"~~~~~~~~~~~~~~~"
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:80
9342
msgid ""
9343
"The path to the plugins directory that Bazaar should use.\n"
9344
"If not set, Bazaar will search for plugins in:"
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:83
9348
msgid ""
9349
"* the user specific plugin directory (containing the ``user`` plugins),"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:85
9353
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9354
msgstr ""
9355
9356
#: en/help_topics/configuration.txt:87
9357
msgid ""
9358
"* the site specific plugin directory if applicable (containing\n"
9359
" the ``site`` plugins)."
9360
msgstr ""
9361
9362
#: en/help_topics/configuration.txt:90
9363
msgid ""
9364
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9365
"the way the plugin are searched. "
9366
msgstr ""
9367
9368
#: en/help_topics/configuration.txt:93
9369
msgid ""
9370
"As for the ``PATH`` variables, if multiple directories are\n"
9371
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9372
"platform specific appropriate character (':' on Unix,\n"
9373
"';' on windows)"
9374
msgstr ""
9375
9376
#: en/help_topics/configuration.txt:98
9377
msgid ""
9378
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9379
"in ``user``. However it will continue to search in ``core`` and\n"
9380
"``site`` unless they are explicitly removed."
9381
msgstr ""
9382
9383
#: en/help_topics/configuration.txt:102
9384
msgid ""
9385
"If you need to change the order or remove one of these\n"
9386
"directories, you should use special values:"
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:105
9390
msgid ""
9391
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9392
" path from the default values,"
9393
msgstr ""
9394
9395
#: en/help_topics/configuration.txt:108
9396
msgid ""
9397
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9398
" before the remaining default values (and also remove it from\n"
9399
" the default values)."
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:112
9403
msgid ""
9404
"Note that the special values 'user', 'core' and 'site' should be\n"
9405
"used literally, they will be substituted by the corresponding,\n"
9406
"platform specific, values."
9407
msgstr ""
9408
9409
#: en/help_topics/configuration.txt:116
9410
msgid ""
9411
"The examples below use ':' as the separator, windows users\n"
9412
"should use ';'."
9413
msgstr ""
9414
9415
#: en/help_topics/configuration.txt:119
9416
msgid "Overriding the default user plugin directory::"
9417
msgstr ""
9418
9419
#: en/help_topics/configuration.txt:121
9420
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9421
msgstr ""
9422
9423
#: en/help_topics/configuration.txt:123
9424
msgid "Disabling the site directory while retaining the user directory::"
9425
msgstr ""
9426
9427
#: en/help_topics/configuration.txt:125
9428
msgid " BZR_PLUGIN_PATH='-site:+user'"
9429
msgstr ""
9430
9431
#: en/help_topics/configuration.txt:127
9432
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:129
9436
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9437
msgstr ""
9438
9439
#: en/help_topics/configuration.txt:131
9440
msgid "Overriding the default site plugin directory::"
9441
msgstr ""
9442
9443
#: en/help_topics/configuration.txt:133
9444
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9445
msgstr ""
9446
9447
#: en/help_topics/configuration.txt:135
9448
msgid ""
9449
"BZR_DISABLE_PLUGINS\n"
9450
"~~~~~~~~~~~~~~~~~~~"
9451
msgstr ""
9452
9453
#: en/help_topics/configuration.txt:138
9454
msgid ""
9455
"Under special circumstances (mostly when trying to diagnose a\n"
9456
"bug), it's better to disable a plugin (or several) rather than\n"
9457
"uninstalling them completely. Such plugins can be specified in\n"
9458
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9459
msgstr ""
9460
9461
#: en/help_topics/configuration.txt:143
9462
msgid ""
9463
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9464
"will raise an import error if they are explicitly imported (by\n"
9465
"another plugin that depends on them for example)."
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:147
9469
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9470
msgstr ""
9471
9472
#: en/help_topics/configuration.txt:149
9473
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9474
msgstr ""
9475
9476
#: en/help_topics/configuration.txt:151
9477
msgid ""
9478
"BZR_PLUGINS_AT\n"
9479
"~~~~~~~~~~~~~~"
9480
msgstr ""
9481
9482
#: en/help_topics/configuration.txt:154
9483
msgid ""
9484
"When adding a new feature or working on a bug in a plugin,\n"
9485
"developers often need to use a specific version of a given\n"
9486
"plugin. Since python requires that the directory containing the\n"
9487
"code is named like the plugin itself this make it impossible to\n"
9488
"use arbitrary directory names (using a two-level directory scheme\n"
9489
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9490
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9491
msgstr ""
9492
9493
#: en/help_topics/configuration.txt:162
9494
msgid ""
9495
"Plugins specified in this environment variable takes precedence\n"
9496
"over the ones in ``BZR_PLUGIN_PATH``."
9497
msgstr ""
9498
9499
#: en/help_topics/configuration.txt:165
9500
msgid ""
9501
"The variable specified a list of ``plugin_name@plugin path``,\n"
9502
"``plugin_name`` being the name of the plugin as it appears in\n"
9503
"python module paths, ``plugin_path`` being the path to the\n"
9504
"directory containing the plugin code itself\n"
9505
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9506
"separator, use ';' on windows."
9507
msgstr ""
9508
9509
#: en/help_topics/configuration.txt:172
9510
msgid ""
9511
"Example:\n"
9512
"~~~~~~~~"
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:175
9516
msgid ""
9517
"Using a specific version of ``myplugin``:\n"
9518
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9519
msgstr ""
9520
9521
#: en/help_topics/configuration.txt:178
9522
msgid ""
9523
"BZRPATH\n"
9524
"~~~~~~~"
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:181
9528
msgid "The path where Bazaar should look for shell plugin external commands."
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:183
9532
msgid ""
9533
"\n"
9534
"http_proxy, https_proxy\n"
9535
"~~~~~~~~~~~~~~~~~~~~~~~"
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:187
9539
msgid "Specifies the network proxy for outgoing connections, for example::"
9540
msgstr ""
9541
9542
#: en/help_topics/configuration.txt:189
9543
msgid ""
9544
" http_proxy=http://proxy.example.com:3128/ \n"
9545
" https_proxy=http://proxy.example.com:3128/"
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:192
9549
msgid ""
9550
"\n"
9551
"Configuration files\n"
9552
"-------------------"
9553
msgstr ""
9554
9555
#: en/help_topics/configuration.txt:196
9556
msgid ""
9557
"Location\n"
9558
"~~~~~~~~"
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:199
9562
msgid ""
9563
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9564
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9565
"on\n"
9566
"Windows. (You can check the location for your system by using\n"
9567
"``bzr version``.)"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:204
9571
msgid "There are three primary configuration files in this location:"
9572
msgstr ""
9573
9574
#: en/help_topics/configuration.txt:206
9575
msgid "* ``bazaar.conf`` describes default configuration options,"
9576
msgstr ""
9577
9578
#: en/help_topics/configuration.txt:208
9579
msgid ""
9580
"* ``locations.conf`` describes configuration information for\n"
9581
" specific branch locations,"
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:211
9585
msgid ""
9586
"* ``authentication.conf`` describes credential information for\n"
9587
" remote servers."
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:214
9591
msgid ""
9592
"Each branch can also contain a configuration file that sets values specific\n"
9593
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9594
"the\n"
9595
"branch. This file is visible to all users of a branch, if you wish to "
9596
"override\n"
9597
"one of the values for a branch with a setting that is specific to you then "
9598
"you\n"
9599
"can do so in ``locations.conf``."
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:220
9603
msgid ""
9604
"General format\n"
9605
"~~~~~~~~~~~~~~"
9606
msgstr ""
9607
9608
#: en/help_topics/configuration.txt:223
9609
msgid ""
9610
"An ini file has three types of contructs: section headers, section\n"
9611
"options and comments."
9612
msgstr ""
9613
9614
#: en/help_topics/configuration.txt:226
9615
msgid ""
9616
"Comments\n"
9617
"^^^^^^^^"
9618
msgstr ""
9619
9620
#: en/help_topics/configuration.txt:229
9621
msgid ""
9622
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9623
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9624
"Bazaar when parsing ini files."
9625
msgstr ""
9626
9627
#: en/help_topics/configuration.txt:233
9628
msgid ""
9629
"Section headers\n"
9630
"^^^^^^^^^^^^^^^"
9631
msgstr ""
9632
9633
#: en/help_topics/configuration.txt:236
9634
msgid ""
9635
"A section header is a word enclosed in brackets that starts at the begining\n"
9636
"of a line. A typical section header looks like this::"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:239
9640
msgid " [DEFAULT]"
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:241
9644
msgid ""
9645
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9646
"[ALIASES]. Section headers are case sensitive. The default section provides "
9647
"for\n"
9648
"setting options which can be overridden with the branch config file."
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:245
9652
msgid ""
9653
"For ``locations.conf``, the options from the section with the\n"
9654
"longest matching section header are used to the exclusion of other\n"
9655
"potentially valid section headers. A section header uses the path for\n"
9656
"the branch as the section header. Some examples include::"
9657
msgstr ""
9658
9659
#: en/help_topics/configuration.txt:250
9660
msgid ""
9661
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9662
" [/home/jdoe/branches/]"
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:253
9666
msgid ""
9667
"\n"
9668
"Section options\n"
9669
"^^^^^^^^^^^^^^^"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:257
9673
msgid ""
9674
"A section option resides within a section. A section option contains an\n"
9675
"option name, an equals sign and a value. For example::"
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:260
9679
msgid ""
9680
" email = John Doe <jdoe@isp.com>\n"
9681
" gpg_signing_key = Amy Pond <amy@example.com>"
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:263
9685
msgid ""
9686
"A option can reference other options by enclosing them in curly brackets::"
9687
msgstr ""
9688
9689
#: en/help_topics/configuration.txt:265
9690
msgid ""
9691
" my_branch_name = feature_x\n"
9692
" my_server = bzr+ssh://example.com\n"
9693
" push_location = {my_server}/project/{my_branch_name}"
9694
msgstr ""
9695
9696
#: en/help_topics/configuration.txt:269
9697
msgid ""
9698
"Option policies\n"
9699
"^^^^^^^^^^^^^^^"
9700
msgstr ""
9701
9702
#: en/help_topics/configuration.txt:272
9703
msgid ""
9704
"Options defined in a section affect the named directory or URL plus\n"
9705
"any locations they contain. Policies can be used to change how an\n"
9706
"option value is interpreted for contained locations. Currently\n"
9707
"there are three policies available:"
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:277
9711
msgid ""
9712
" none:\n"
9713
" the value is interpreted the same for contained locations. This is\n"
9714
" the default behaviour.\n"
9715
" norecurse:\n"
9716
" the value is only used for the exact location specified by the\n"
9717
" section name.\n"
9718
" appendpath:\n"
9719
" for contained locations, any additional path components are\n"
9720
" appended to the value."
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:287
9724
msgid ""
9725
"Policies are specified by keys with names of the form "
9726
"\"<option_name>:policy\".\n"
9727
"For example, to define the push location for a tree of branches, the\n"
9728
"following could be used::"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:291
9732
msgid ""
9733
" [/top/location]\n"
9734
" push_location = sftp://example.com/location\n"
9735
" push_location:policy = appendpath"
9736
msgstr ""
9737
9738
#: en/help_topics/configuration.txt:295
9739
msgid ""
9740
"With this configuration, the push location for ``/top/location/branch1``\n"
9741
"would be ``sftp://example.com/location/branch1``."
9742
msgstr ""
9743
9744
#: en/help_topics/configuration.txt:298
9745
msgid ""
9746
"Section local options\n"
9747
"^^^^^^^^^^^^^^^^^^^^^"
9748
msgstr ""
9749
9750
#: en/help_topics/configuration.txt:301
9751
msgid ""
9752
"Some options are defined automatically inside a given section and can be\n"
9753
"refered to in this section only. "
9754
msgstr ""
9755
9756
#: en/help_topics/configuration.txt:304
9757
msgid "For example, the ``appendpath`` policy can be used like this::"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:306
9761
msgid ""
9762
" [/home/vila/src/bzr/bugs]\n"
9763
" mypush = lp:~vila/bzr\n"
9764
" mypush:policy=appendpath"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:310
9768
msgid "Using ``relpath`` to achieve the same result is done like this::"
9769
msgstr ""
9770
9771
#: en/help_topics/configuration.txt:312
9772
msgid ""
9773
" [/home/vila/src/bzr/bugs]\n"
9774
" mypush = lp:~vila/bzr/{relpath}"
9775
msgstr ""
9776
9777
#: en/help_topics/configuration.txt:315
9778
msgid ""
9779
"In both cases, when used in a directory like\n"
9780
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9781
msgstr ""
9782
9783
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9784
msgid ""
9785
" $ bzr config mypush\n"
9786
" lp:~vila/bzr/832013-expand-in-stack"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:321
9790
msgid "Another such option is ``basename`` which can be used like this::"
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:323
9794
msgid ""
9795
" [/home/vila/src/bzr]\n"
9796
" mypush = lp:~vila/bzr/{basename}"
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:326
9800
msgid ""
9801
"When used in a directory like\n"
9802
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:332
9806
msgid ""
9807
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9808
"itself is defined as the relative path between the section name and the\n"
9809
"location it matches."
9810
msgstr ""
9811
9812
#: en/help_topics/configuration.txt:336
9813
msgid ""
9814
"When an option is local to a Section, it cannot be referred to from option\n"
9815
"values in any other section from the same ``Store`` nor from any other\n"
9816
"``Store``."
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:340
9820
msgid ""
9821
"\n"
9822
"The main configuration file, bazaar.conf\n"
9823
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:344
9827
msgid ""
9828
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9829
"The default section contains the default\n"
9830
"configuration options for all branches. The default section can be\n"
9831
"overriden by providing a branch-specific section in ``locations.conf``."
9832
msgstr ""
9833
9834
#: en/help_topics/configuration.txt:349
9835
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:351
9839
msgid ""
9840
" [DEFAULT]\n"
9841
" email = John Doe <jdoe@isp.com>\n"
9842
" editor = /usr/bin/vim\n"
9843
" create_signatures = when-required"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:356
9847
msgid ""
9848
"\n"
9849
"The branch location configuration file, locations.conf\n"
9850
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9851
msgstr ""
9852
9853
#: en/help_topics/configuration.txt:360
9854
msgid ""
9855
"``locations.conf`` allows one to specify overriding settings for\n"
9856
"a specific branch. The format is almost identical to the default section in\n"
9857
"bazaar.conf with one significant change: The section header, instead of "
9858
"saying\n"
9859
"default, will be the path to a branch that you wish to override a value\n"
9860
"for. The '?' and '*' wildcards are supported::"
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:366
9864
msgid ""
9865
" [/home/jdoe/branches/nethack]\n"
9866
" email = Nethack Admin <nethack@nethack.com>"
9867
msgstr ""
9868
9869
#: en/help_topics/configuration.txt:369
9870
msgid ""
9871
" [http://hypothetical.site.com/branches/devel-branch]\n"
9872
" create_signatures = always"
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:372
9876
msgid ""
9877
"The authentication configuration file, authentication.conf\n"
9878
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9879
msgstr ""
9880
9881
#: en/help_topics/configuration.txt:375
9882
msgid ""
9883
"``authentication.conf`` allows one to specify credentials for\n"
9884
"remote servers. This can be used for all the supported transports and any "
9885
"part\n"
9886
"of bzr that requires authentication (smtp for example)."
9887
msgstr ""
9888
9889
#: en/help_topics/configuration.txt:379
9890
msgid ""
9891
"The syntax of the file obeys the same rules as the others except for the\n"
9892
"option policies which don't apply."
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:382
9896
msgid ""
9897
"For more information on the possible uses of the authentication "
9898
"configuration\n"
9899
"file see :doc:`authentication-help`."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:385
9903
msgid ""
9904
"\n"
9905
"Common options\n"
9906
"--------------"
9907
msgstr ""
9908
9909
#: en/help_topics/configuration.txt:389
9910
msgid ""
9911
"debug_flags\n"
9912
"~~~~~~~~~~~"
9913
msgstr ""
9914
9915
#: en/help_topics/configuration.txt:392
9916
msgid ""
9917
"A comma-separated list of debugging options to turn on. The same values\n"
9918
"can be used as with the -D command-line option (see `help global-options`).\n"
9919
"For example::"
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:396
9923
msgid " debug_flags = hpss"
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:400
9927
msgid " debug_flags = hpss,evil"
9928
msgstr ""
9929
9930
#: en/help_topics/configuration.txt:402
9931
msgid ""
9932
"email\n"
9933
"~~~~~"
9934
msgstr ""
9935
9936
#: en/help_topics/configuration.txt:405
9937
msgid ""
9938
"The email address to use when committing a branch. Typically takes the form\n"
9939
"of::"
9940
msgstr ""
9941
9942
#: en/help_topics/configuration.txt:408
9943
msgid " email = Full Name <account@hostname.tld>"
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:410
9947
msgid ""
9948
"editor\n"
9949
"~~~~~~"
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:413
9953
msgid ""
9954
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9955
"a commit message. This setting is trumped by the environment variable\n"
9956
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9957
"variables."
9958
msgstr ""
9959
9960
#: en/help_topics/configuration.txt:418
9961
msgid ""
9962
"log_format\n"
9963
"~~~~~~~~~~"
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:421
9967
msgid ""
9968
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9969
"and ``line``. Additional formats may be provided by plugins. The default\n"
9970
"value is ``long``."
9971
msgstr ""
9972
9973
#: en/help_topics/configuration.txt:425
9974
msgid ""
9975
"check_signatures\n"
9976
"~~~~~~~~~~~~~~~~"
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:428
9980
msgid ""
9981
"Reserved for future use. These options will allow a policy for branches to\n"
9982
"require signatures."
9983
msgstr ""
9984
9985
#: en/help_topics/configuration.txt:431
9986
msgid ""
9987
"require\n"
9988
" The gnupg signature for revisions must be present and must be valid."
9989
msgstr ""
9990
9991
#: en/help_topics/configuration.txt:434
9992
msgid ""
9993
"ignore\n"
9994
" Do not check gnupg signatures of revisions."
9995
msgstr ""
9996
9997
#: en/help_topics/configuration.txt:437
9998
msgid ""
9999
"check-available\n"
10000
" (default) If gnupg signatures for revisions are present, check them.\n"
10001
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10002
" no signature is present."
10003
msgstr ""
10004
10005
#: en/help_topics/configuration.txt:442
10006
msgid ""
10007
"create_signatures\n"
10008
"~~~~~~~~~~~~~~~~~"
10009
msgstr ""
10010
10011
#: en/help_topics/configuration.txt:445
10012
msgid ""
10013
"Defines the behaviour of signing revisions on commits. By default bzr will "
10014
"not\n"
10015
"sign new commits."
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:448
10019
msgid ""
10020
"always\n"
10021
" Sign every new revision that is committed. If the signing fails then "
10022
"the\n"
10023
" commit will not be made."
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:452
10027
msgid ""
10028
"when-required\n"
10029
" Reserved for future use."
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:455
10033
msgid ""
10034
"never\n"
10035
" Reserved for future use."
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:458
10039
msgid ""
10040
"In future it is planned that ``when-required`` will sign newly\n"
10041
"committed revisions only when the branch requires them. ``never`` will "
10042
"refuse\n"
10043
"to sign newly committed revisions, even if the branch requires signatures."
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:462
10047
msgid ""
10048
"dirstate.fdatasync\n"
10049
"~~~~~~~~~~~~~~~~~~"
10050
msgstr ""
10051
10052
#: en/help_topics/configuration.txt:465
10053
msgid ""
10054
"If true (default), working tree metadata changes are flushed through the\n"
10055
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10056
"should not be lost if the machine crashes. See also repository.fdatasync."
10057
msgstr ""
10058
10059
#: en/help_topics/configuration.txt:469
10060
msgid ""
10061
"gpg_signing_key\n"
10062
"~~~~~~~~~~~~~~~"
10063
msgstr ""
10064
10065
#: en/help_topics/configuration.txt:472
10066
msgid ""
10067
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10068
"address, key fingerprint or full key ID. When unset or when set to\n"
10069
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10070
msgstr ""
10071
10072
#: en/help_topics/configuration.txt:476
10073
msgid ""
10074
"recurse\n"
10075
"~~~~~~~"
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:479
10079
msgid ""
10080
"Only useful in ``locations.conf``. Defines whether or not the\n"
10081
"configuration for this section applies to subdirectories:"
10082
msgstr ""
10083
10084
#: en/help_topics/configuration.txt:482
10085
msgid ""
10086
"true\n"
10087
" (default) This section applies to subdirectories as well."
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:485
10091
msgid ""
10092
"false\n"
10093
" This section only applies to the branch at this directory and not\n"
10094
" branches below it."
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:489
10098
msgid ""
10099
"gpg_signing_command\n"
10100
"~~~~~~~~~~~~~~~~~~~"
10101
msgstr ""
10102
10103
#: en/help_topics/configuration.txt:492
10104
msgid ""
10105
"(Default: \"gpg\"). Which program should be used to sign and check "
10106
"revisions.\n"
10107
"For example::"
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:495
10111
msgid " gpg_signing_command = /usr/bin/gnpg"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:497
10115
msgid ""
10116
"The specified command must accept the options \"--clearsign\" and \"-u "
10117
"<email>\"."
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:499
10121
msgid ""
10122
"bzr_remote_path\n"
10123
"~~~~~~~~~~~~~~~"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:502
10127
msgid ""
10128
"(Default: \"bzr\"). The path to the command that should be used to run the "
10129
"smart\n"
10130
"server for bzr. This value may only be specified in locations.conf, because:"
10131
msgstr ""
10132
10133
#: en/help_topics/configuration.txt:505
10134
msgid ""
10135
"- it's needed before branch.conf is accessible\n"
10136
"- allowing remote branch.conf files to specify commands would be a security\n"
10137
" risk"
10138
msgstr ""
10139
10140
#: en/help_topics/configuration.txt:509
10141
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10142
msgstr ""
10143
10144
#: en/help_topics/configuration.txt:511
10145
msgid ""
10146
"smtp_server\n"
10147
"~~~~~~~~~~~"
10148
msgstr ""
10149
10150
#: en/help_topics/configuration.txt:514
10151
msgid ""
10152
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10153
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10154
msgstr ""
10155
10156
#: en/help_topics/configuration.txt:517
10157
msgid ""
10158
"smtp_username, smtp_password\n"
10159
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:520
10163
msgid ""
10164
"User and password to authenticate to the SMTP server. If smtp_username\n"
10165
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10166
"These settings are only needed if the SMTP server requires authentication\n"
10167
"to send mail."
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:525
10171
msgid ""
10172
"locks.steal_dead\n"
10173
"~~~~~~~~~~~~~~~~"
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:528
10177
msgid ""
10178
"If set to true, bzr will automatically break locks held by processes from\n"
10179
"the same machine and user that are no longer alive. Otherwise, it will\n"
10180
"print a message and you can break the lock manually, if you are satisfied\n"
10181
"the object is no longer in use."
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:533
10185
msgid ""
10186
"mail_client\n"
10187
"~~~~~~~~~~~"
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:536
10191
msgid ""
10192
"A mail client to use for sending merge requests.\n"
10193
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10194
"it\n"
10195
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10196
"``editor``."
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:541
10200
msgid "Supported values for specific clients:"
10201
msgstr ""
10202
10203
#: en/help_topics/configuration.txt:543
10204
msgid ""
10205
":claws: Use Claws. This skips a dialog for attaching files.\n"
10206
":evolution: Use Evolution.\n"
10207
":kmail: Use KMail.\n"
10208
":mutt: Use Mutt.\n"
10209
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10210
"1.5,\n"
10211
" this works around some bugs that xdg-email doesn't handle."
10212
msgstr ""
10213
10214
#: en/help_topics/configuration.txt:550
10215
msgid "Supported generic values are:"
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:552
10219
msgid ""
10220
":default: See above.\n"
10221
":editor: Use your editor to compose the merge request. This also uses\n"
10222
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10223
" smtp_username and smtp_password.\n"
10224
":mapi: Use your preferred e-mail client on Windows.\n"
10225
":xdg-email: Use xdg-email to run your preferred mail program"
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:559
10229
msgid ""
10230
"repository.fdatasync\n"
10231
"~~~~~~~~~~~~~~~~~~~~"
10232
msgstr ""
10233
10234
#: en/help_topics/configuration.txt:562
10235
msgid ""
10236
"If true (default), repository changes are flushed through the OS buffers\n"
10237
"to physical disk. This is somewhat slower, but means data should not be\n"
10238
"lost if the machine crashes. See also dirstate.fdatasync."
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:566
10242
msgid ""
10243
"submit_branch\n"
10244
"~~~~~~~~~~~~~"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:569
10248
msgid ""
10249
"The branch you intend to submit your current work to. This is "
10250
"automatically\n"
10251
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10252
"This\n"
10253
"should usually be set on a per-branch or per-location basis."
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:573
10257
msgid ""
10258
"public_branch\n"
10259
"~~~~~~~~~~~~~"
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:576
10263
msgid ""
10264
"A publically-accessible version of this branch (implying that this version "
10265
"is\n"
10266
"not publically-accessible). Used (and set) by ``bzr send``."
10267
msgstr ""
10268
10269
#: en/help_topics/configuration.txt:579
10270
msgid ""
10271
"suppress_warnings\n"
10272
"~~~~~~~~~~~~~~~~~"
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:582
10276
msgid ""
10277
"A list of strings, each string represent a warning that can be emitted by\n"
10278
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:585
10282
msgid "Valid values:"
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:587
10286
msgid ""
10287
"* ``format_deprecation``:\n"
10288
" whether the format deprecation warning is shown on repositories that "
10289
"are\n"
10290
" using deprecated formats."
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:591
10294
msgid ""
10295
"default_format\n"
10296
"~~~~~~~~~~~~~~"
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:594
10300
msgid ""
10301
"A format name for the default format used when creating branches. See "
10302
"``bzr\n"
10303
"help formats`` for possible values."
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:597
10307
msgid ""
10308
"\n"
10309
"Unicode options\n"
10310
"---------------"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:601
10314
msgid ""
10315
"output_encoding\n"
10316
"~~~~~~~~~~~~~~~"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:604
10320
msgid ""
10321
"A Python unicode encoding name for text output from bzr, such as log\n"
10322
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10323
"is the terminal encoding prefered by the operating system."
10324
msgstr ""
10325
10326
#: en/help_topics/configuration.txt:608
10327
msgid ""
10328
"\n"
10329
"Branch type specific options\n"
10330
"----------------------------"
10331
msgstr ""
10332
10333
#: en/help_topics/configuration.txt:612
10334
msgid ""
10335
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10336
"later format. They\n"
10337
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10338
"manually set in ``locations.conf`` or ``bazaar.conf``."
10339
msgstr ""
10340
10341
#: en/help_topics/configuration.txt:617
10342
msgid ""
10343
"append_revisions_only\n"
10344
"~~~~~~~~~~~~~~~~~~~~~"
10345
msgstr ""
10346
10347
#: en/help_topics/configuration.txt:620
10348
msgid ""
10349
"If set to \"True\" then revisions can only be appended to the log, not\n"
10350
"removed. A branch with this setting enabled can only pull from another\n"
10351
"branch if the other branch's log is a longer version of its own. This is\n"
10352
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10353
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10354
"compatibility with previous bzr versions (older than 2.2)."
10355
msgstr ""
10356
10357
#: en/help_topics/configuration.txt:627
10358
msgid ""
10359
"parent_location\n"
10360
"~~~~~~~~~~~~~~~"
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:630
10364
msgid ""
10365
"If present, the location of the default branch for pull or merge. This "
10366
"option\n"
10367
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10368
"--remember``."
10369
msgstr ""
10370
10371
#: en/help_topics/configuration.txt:634
10372
msgid ""
10373
"push_location\n"
10374
"~~~~~~~~~~~~~"
10375
msgstr ""
10376
10377
#: en/help_topics/configuration.txt:637
10378
msgid ""
10379
"If present, the location of the default branch for push. This option\n"
10380
"is normally set by the first ``push`` or ``push --remember``."
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:640
10384
msgid ""
10385
"push_strict\n"
10386
"~~~~~~~~~~~"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:643
10390
msgid ""
10391
"If present, defines the ``--strict`` option default value for checking\n"
10392
"uncommitted changes before pushing."
10393
msgstr ""
10394
10395
#: en/help_topics/configuration.txt:646
10396
msgid ""
10397
"dpush_strict\n"
10398
"~~~~~~~~~~~~"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:649
10402
msgid ""
10403
"If present, defines the ``--strict`` option default value for checking\n"
10404
"uncommitted changes before pushing into a different VCS without any\n"
10405
"custom bzr metadata."
10406
msgstr ""
10407
10408
#: en/help_topics/configuration.txt:653
10409
msgid ""
10410
"bound_location\n"
10411
"~~~~~~~~~~~~~~"
10412
msgstr ""
10413
10414
#: en/help_topics/configuration.txt:656
10415
msgid ""
10416
"The location that commits should go to when acting as a checkout.\n"
10417
"This option is normally set by ``bind``."
10418
msgstr ""
10419
10420
#: en/help_topics/configuration.txt:659
10421
msgid ""
10422
"bound\n"
10423
"~~~~~"
10424
msgstr ""
10425
10426
#: en/help_topics/configuration.txt:662
10427
msgid ""
10428
"If set to \"True\", the branch should act as a checkout, and push each "
10429
"commit to\n"
10430
"the bound_location. This option is normally set by ``bind``/``unbind``."
10431
msgstr ""
10432
10433
#: en/help_topics/configuration.txt:665
10434
msgid ""
10435
"send_strict\n"
10436
"~~~~~~~~~~~"
10437
msgstr ""
10438
10439
#: en/help_topics/configuration.txt:668
10440
msgid ""
10441
"If present, defines the ``--strict`` option default value for checking\n"
10442
"uncommitted changes before sending a merge directive."
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:671
10446
msgid ""
10447
"add.maximum_file_size\n"
10448
"~~~~~~~~~~~~~~~~~~~~~"
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:674
10452
msgid ""
10453
"Defines the maximum file size the command line \"add\" operation will allow\n"
10454
"in recursive mode, with files larger than this value being skipped. You may "
10455
"\n"
10456
"specify this value as an integer (in which case it is interpreted as bytes), "
10457
"\n"
10458
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10459
"0 \n"
10460
"will disable skipping."
10461
msgstr ""
10462
10463
#: en/help_topics/configuration.txt:680
10464
msgid ""
10465
"External Merge Tools\n"
10466
"--------------------"
10467
msgstr ""
10468
10469
#: en/help_topics/configuration.txt:683
10470
msgid ""
10471
"bzr.mergetool.<name>\n"
10472
"~~~~~~~~~~~~~~~~~~~~"
10473
msgstr ""
10474
10475
#: en/help_topics/configuration.txt:686
10476
msgid ""
10477
"Defines an external merge tool called <name> with the given command-line.\n"
10478
"Arguments containing spaces should be quoted using single or double quotes. "
10479
"The\n"
10480
"executable may omit its path if it can be found on the PATH."
10481
msgstr ""
10482
10483
#: en/help_topics/configuration.txt:690
10484
msgid ""
10485
"The following markers can be used in the command-line to substitute "
10486
"filenames\n"
10487
"involved in the merge conflict::"
10488
msgstr ""
10489
10490
#: en/help_topics/configuration.txt:693
10491
msgid ""
10492
" {base} file.BASE\n"
10493
" {this} file.THIS\n"
10494
" {other} file.OTHER\n"
10495
" {result} output file\n"
10496
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10497
"merge\n"
10498
" succeeds."
10499
msgstr ""
10500
10501
#: en/help_topics/configuration.txt:702
10502
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10503
msgstr ""
10504
10505
#: en/help_topics/configuration.txt:704
10506
msgid ""
10507
"bzr.default_mergetool\n"
10508
"~~~~~~~~~~~~~~~~~~~~~"
10509
msgstr ""
10510
10511
#: en/help_topics/configuration.txt:707
10512
msgid ""
10513
"Specifies which external merge tool (as defined above) should be selected "
10514
"by\n"
10515
"default in tools such as ``bzr qconflicts``."
10516
msgstr ""
10517
10518
#: en/help_topics/configuration.txt:712
10519
msgid " bzr.default_mergetool = kdiff3\n"
10520
msgstr ""
10521
10522
#: en/help_topics/conflict-types.txt:1
10523
msgid ""
10524
"Conflict Types\n"
10525
"=============="
10526
msgstr ""
10527
10528
#: en/help_topics/conflict-types.txt:4
10529
msgid ""
10530
"Some operations, like merge, revert and pull, modify the contents of your\n"
10531
"working tree. These modifications are programmatically generated, and so "
10532
"they\n"
10533
"may conflict with the current state of your working tree. "
10534
msgstr ""
10535
10536
#: en/help_topics/conflict-types.txt:8
10537
msgid ""
10538
"When conflicts are present in your working tree (as shown by ``bzr\n"
10539
"conflicts``), you should resolve them and then inform bzr that the "
10540
"conflicts\n"
10541
"have been resolved."
10542
msgstr ""
10543
10544
#: en/help_topics/conflict-types.txt:12
10545
msgid ""
10546
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10547
"should resolve them is not the one responsible for their occurrence, as is "
10548
"the\n"
10549
"case when merging other people's work or because some conflicts are "
10550
"presented\n"
10551
"in a way that is not easy to understand."
10552
msgstr ""
10553
10554
#: en/help_topics/conflict-types.txt:17
10555
msgid ""
10556
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10557
"conflict if and only if there's an actual conceptual conflict in the source\n"
10558
"tree. Because Bazaar doesn't understand the real meaning of the files "
10559
"being\n"
10560
"versioned, it can, when faced with ambiguities, fall short in either "
10561
"direction\n"
10562
"trying to resolve the conflict itself. Many kinds of changes can be "
10563
"combined\n"
10564
"programmatically, but sometimes only a human can determine the right thing "
10565
"to\n"
10566
"do."
10567
msgstr ""
10568
10569
#: en/help_topics/conflict-types.txt:25
10570
msgid ""
10571
"When Bazaar generates a conflict, it adds information into the working tree "
10572
"to\n"
10573
"present the conflicting versions, and it's up to you to find the correct\n"
10574
"resolution."
10575
msgstr ""
10576
10577
#: en/help_topics/conflict-types.txt:29
10578
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10579
msgstr ""
10580
10581
#: en/help_topics/conflict-types.txt:31
10582
msgid ""
10583
"1. Modify the working tree content so that the conflicted item is now in "
10584
"the\n"
10585
" state you want to keep, then"
10586
msgstr ""
10587
10588
#: en/help_topics/conflict-types.txt:34
10589
msgid ""
10590
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10591
" remaining generated information (``bzr resolve <item>``)."
10592
msgstr ""
10593
10594
#: en/help_topics/conflict-types.txt:37
10595
msgid ""
10596
"For most conflict types, there are some obvious ways to modify the working\n"
10597
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10598
"itself already made a choice, when possible."
10599
msgstr ""
10600
10601
#: en/help_topics/conflict-types.txt:41
10602
msgid ""
10603
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10604
"different ways to resolve the conflict."
10605
msgstr ""
10606
10607
#: en/help_topics/conflict-types.txt:44
10608
msgid ""
10609
"Each type of conflict is explained below, and the action which must be done "
10610
"to\n"
10611
"resolve the conflict is outlined."
10612
msgstr ""
10613
10614
#: en/help_topics/conflict-types.txt:47
10615
msgid ""
10616
"Various actions are available depending on the kind of conflict, for some "
10617
"of\n"
10618
"these actions, Bazaar can provide some help. In the end you should at least\n"
10619
"inform Bazaar that you're done with the conflict with::"
10620
msgstr ""
10621
10622
#: en/help_topics/conflict-types.txt:51
10623
msgid " ``bzr resolve FILE --action=done'"
10624
msgstr ""
10625
10626
#: en/help_topics/conflict-types.txt:53
10627
msgid ""
10628
"Note that this is the default action when a single file is involved so you "
10629
"can\n"
10630
"simply use::"
10631
msgstr ""
10632
10633
#: en/help_topics/conflict-types.txt:56
10634
msgid " ``bzr resolve FILE``"
10635
msgstr ""
10636
10637
#: en/help_topics/conflict-types.txt:58
10638
msgid "See ``bzr help resolve`` for more details."
10639
msgstr ""
10640
10641
#: en/help_topics/conflict-types.txt:60
10642
msgid ""
10643
"Text conflicts\n"
10644
"--------------"
10645
msgstr ""
10646
10647
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10648
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10649
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10650
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10651
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10652
msgid "Typical message::"
10653
msgstr ""
10654
10655
#: en/help_topics/conflict-types.txt:65
10656
msgid " Text conflict in FILE"
10657
msgstr ""
10658
10659
#: en/help_topics/conflict-types.txt:67
10660
msgid ""
10661
"These are produced when a text merge cannot completely reconcile two sets "
10662
"of\n"
10663
"text changes. Bazaar will emit files for each version with the extensions\n"
10664
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10665
"tree,\n"
10666
"i.e. the tree that you are merging changes into. OTHER is the version that "
10667
"you\n"
10668
"are merging into the target. BASE is an older version that is used as a "
10669
"basis\n"
10670
"for comparison."
10671
msgstr ""
10672
10673
#: en/help_topics/conflict-types.txt:74
10674
msgid ""
10675
"In the main copy of the file, Bazaar will include all the changes that it\n"
10676
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10677
"\"herringbone\" markers like ``<<<<<<<``."
10678
msgstr ""
10679
10680
#: en/help_topics/conflict-types.txt:78
10681
msgid ""
10682
"Say the initial text is \"The project leader released it.\", and THIS "
10683
"modifies it\n"
10684
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10685
"leader\n"
10686
"released Bazaar.\" A conflict would look like this::"
10687
msgstr ""
10688
10689
#: en/help_topics/conflict-types.txt:82
10690
msgid ""
10691
" <<<<<<< TREE\n"
10692
" Martin Pool released it.\n"
10693
" =======\n"
10694
" The project leader released Bazaar.\n"
10695
" >>>>>>> MERGE-SOURCE"
10696
msgstr ""
10697
10698
#: en/help_topics/conflict-types.txt:88
10699
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10700
msgstr ""
10701
10702
#: en/help_topics/conflict-types.txt:90
10703
msgid ""
10704
"You can handle text conflicts either by editing the main copy of the file,\n"
10705
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10706
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10707
"set of changes over the other (but see below when you encounter these\n"
10708
"cases). More often, the two sets of changes must be intelligently combined."
10709
msgstr ""
10710
10711
#: en/help_topics/conflict-types.txt:96
10712
msgid ""
10713
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10714
"you are done editing, the file should look like it never had a conflict, and "
10715
"be\n"
10716
"ready to commit."
10717
msgstr ""
10718
10719
#: en/help_topics/conflict-types.txt:100
10720
msgid ""
10721
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10722
"Bazaar will auto-detect which conflicts you have resolved."
10723
msgstr ""
10724
10725
#: en/help_topics/conflict-types.txt:103
10726
msgid ""
10727
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10728
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10729
"working tree."
10730
msgstr ""
10731
10732
#: en/help_topics/conflict-types.txt:107
10733
msgid ""
10734
"\n"
10735
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10736
"resolve`` with one of the following actions:"
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:111
10740
msgid ""
10741
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10742
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10743
msgstr ""
10744
10745
#: en/help_topics/conflict-types.txt:114
10746
msgid ""
10747
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10748
"modifications will be taken into account."
10749
msgstr ""
10750
10751
#: en/help_topics/conflict-types.txt:117
10752
msgid ""
10753
"Content conflicts\n"
10754
"-----------------"
10755
msgstr ""
10756
10757
#: en/help_topics/conflict-types.txt:122
10758
msgid " Contents conflict in FILE"
10759
msgstr ""
10760
10761
#: en/help_topics/conflict-types.txt:124
10762
msgid ""
10763
"This conflict happens when there are conflicting changes in the working "
10764
"tree\n"
10765
"and the merge source, but the conflicted items are not text files. They "
10766
"may\n"
10767
"be binary files, or symlinks, or directories. It can even happen with "
10768
"files\n"
10769
"that are deleted on one side, and modified on the other."
10770
msgstr ""
10771
10772
#: en/help_topics/conflict-types.txt:129
10773
msgid ""
10774
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10775
"be\n"
10776
"regular files, symlinks or directories). But it will not include a \"main "
10777
"copy\"\n"
10778
"of the file with herringbone conflict markers. It will appear that the "
10779
"\"main\n"
10780
"copy\" has been renamed to THIS or OTHER."
10781
msgstr ""
10782
10783
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10784
msgid ""
10785
"To resolve that kind of conflict, you should rebuild FILE from either "
10786
"version\n"
10787
"or a combination of both."
10788
msgstr ""
10789
10790
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10791
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10792
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10793
#: en/help_topics/conflict-types.txt:361
10794
msgid "``bzr resolve`` recognizes the following actions:"
10795
msgstr ""
10796
10797
#: en/help_topics/conflict-types.txt:139
10798
msgid ""
10799
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10800
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10801
"* ``--action=done`` will just mark the conflict as resolved."
10802
msgstr ""
10803
10804
#: en/help_topics/conflict-types.txt:143
10805
msgid ""
10806
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10807
"and\n"
10808
"``.OTHER`` files if they are still present in the working tree."
10809
msgstr ""
10810
10811
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10812
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10813
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10814
#: en/help_topics/conflict-types.txt:369
10815
msgid ""
10816
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10817
msgstr ""
10818
10819
#: en/help_topics/conflict-types.txt:148
10820
msgid ""
10821
"Tag conflicts\n"
10822
"-------------"
10823
msgstr ""
10824
10825
#: en/help_topics/conflict-types.txt:153
10826
msgid ""
10827
" Conflicting tags:\n"
10828
" version-0.1"
10829
msgstr ""
10830
10831
#: en/help_topics/conflict-types.txt:156
10832
msgid ""
10833
"When pulling from or pushing to another branch, Bazaar informs you about "
10834
"tags\n"
10835
"that conflict between the two branches; that is the same tag points to two\n"
10836
"different revisions. You need not resolve these conflicts, but subsequent\n"
10837
"uses of pull or push will result in the same message."
10838
msgstr ""
10839
10840
#: en/help_topics/conflict-types.txt:161
10841
msgid ""
10842
"To resolve the conflict, you must apply the correct tags to either the "
10843
"target\n"
10844
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10845
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10846
"target branch's tags match the source branch, then in the target branch do\n"
10847
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10848
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10849
"source\n"
10850
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10851
"favor of the target branch, you need to similarly use ``tag --force`` in "
10852
"the\n"
10853
"source branch. (Note that pulling or pushing using --overwrite will "
10854
"overwrite\n"
10855
"all tags as well.)"
10856
msgstr ""
10857
10858
#: en/help_topics/conflict-types.txt:172
10859
msgid ""
10860
"Duplicate paths\n"
10861
"---------------"
10862
msgstr ""
10863
10864
#: en/help_topics/conflict-types.txt:177
10865
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10866
msgstr ""
10867
10868
#: en/help_topics/conflict-types.txt:179
10869
msgid ""
10870
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10871
"already been used. The existing file will be renamed to \"FILE.moved\". "
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:187
10875
msgid ""
10876
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10877
"FILE``,\n"
10878
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10879
"* ``--action=done`` will just mark the conflict as resolved."
10880
msgstr ""
10881
10882
#: en/help_topics/conflict-types.txt:191
10883
msgid ""
10884
"Note that you must get rid of FILE.moved before using ``--action=done``."
10885
msgstr ""
10886
10887
#: en/help_topics/conflict-types.txt:195
10888
msgid ""
10889
"Unversioned parent\n"
10890
"------------------"
10891
msgstr ""
10892
10893
#: en/help_topics/conflict-types.txt:200
10894
msgid ""
10895
" Conflict because FILE is not versioned, but has versioned children."
10896
msgstr ""
10897
10898
#: en/help_topics/conflict-types.txt:202
10899
msgid ""
10900
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10901
"not\n"
10902
"versioned. This happens when the directory has been deleted in the target,\n"
10903
"but has a new child in the source, or vice versa. In this situation, "
10904
"Bazaar\n"
10905
"will version the parent directory as well. Resolving this issue depends\n"
10906
"very much on the particular scenario. You may wish to rename or delete "
10907
"either\n"
10908
"the file or the directory. When you are satisfied, you can run \"bzr "
10909
"resolve\n"
10910
"FILE\" to mark the conflict as resolved."
10911
msgstr ""
10912
10913
#: en/help_topics/conflict-types.txt:210
10914
msgid ""
10915
"Missing parent\n"
10916
"--------------"
10917
msgstr ""
10918
10919
#: en/help_topics/conflict-types.txt:215
10920
msgid " Conflict adding files to FILE. Created directory."
10921
msgstr ""
10922
10923
#: en/help_topics/conflict-types.txt:217
10924
msgid ""
10925
"This happens when a directory has been deleted in the target, but has new\n"
10926
"children in the source. This is similar to the \"unversioned parent\" "
10927
"conflict,\n"
10928
"except that the parent directory does not *exist*, instead of just being\n"
10929
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10930
"Resolving this issue depends very much on the particular scenario."
10931
msgstr ""
10932
10933
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10934
msgid ""
10935
"To resolve that kind of conflict, you should either remove or rename the\n"
10936
"children or the directory or a combination of both."
10937
msgstr ""
10938
10939
#: en/help_topics/conflict-types.txt:228
10940
msgid ""
10941
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10942
" children,\n"
10943
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10944
"children\n"
10945
" and restoring the directory,\n"
10946
"* ``--action=done`` will just mark the conflict as resolved."
10947
msgstr ""
10948
10949
#: en/help_topics/conflict-types.txt:236
10950
msgid ""
10951
"Deleting parent\n"
10952
"---------------"
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:241
10956
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10957
msgstr ""
10958
10959
#: en/help_topics/conflict-types.txt:243
10960
msgid ""
10961
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10962
"source, but has new children in the target (either because a directory\n"
10963
"deletion is merged or because the merge introduce new children). Bazaar\n"
10964
"will retain the directory. Resolving this issue depends very much on the\n"
10965
"particular scenario."
10966
msgstr ""
10967
10968
#: en/help_topics/conflict-types.txt:254
10969
msgid ""
10970
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10971
"directory,"
10972
msgstr ""
10973
10974
#: en/help_topics/conflict-types.txt:256
10975
msgid ""
10976
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10977
" children,"
10978
msgstr ""
10979
10980
#: en/help_topics/conflict-types.txt:259
10981
msgid "* ``--action=done`` will just mark the conflict as resolved."
10982
msgstr ""
10983
10984
#: en/help_topics/conflict-types.txt:261
10985
msgid ""
10986
"Note that when merging a directory deletion, if unversioned files are\n"
10987
"present, they become potential orphans has they don't have a directory\n"
10988
"parent anymore."
10989
msgstr ""
10990
10991
#: en/help_topics/conflict-types.txt:265
10992
msgid ""
10993
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10994
"setting the ``bzr.transform.orphan_policy`` configuration option."
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:268
10998
msgid "There are two possible values for this option:"
10999
msgstr ""
11000
11001
#: en/help_topics/conflict-types.txt:270
11002
msgid ""
11003
"* ``conflict`` (the default): will leave the orphans in place and\n"
11004
" generate a conflicts,"
11005
msgstr ""
11006
11007
#: en/help_topics/conflict-types.txt:273
11008
msgid ""
11009
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11010
"root\n"
11011
" of the working tree with names like ``<file>.~#~``."
11012
msgstr ""
11013
11014
#: en/help_topics/conflict-types.txt:278
11015
msgid ""
11016
"Path conflict\n"
11017
"-------------"
11018
msgstr ""
11019
11020
#: en/help_topics/conflict-types.txt:283
11021
msgid " Path conflict: PATH1 / PATH2"
11022
msgstr ""
11023
11024
#: en/help_topics/conflict-types.txt:285
11025
msgid ""
11026
"This happens when the source and target have each modified the name or "
11027
"parent\n"
11028
"directory of a file. Bazaar will use the path elements from the source."
11029
msgstr ""
11030
11031
#: en/help_topics/conflict-types.txt:288
11032
msgid ""
11033
"To resolve that kind of conflict, you just have to decide what name should "
11034
"be\n"
11035
"retained for the file involved."
11036
msgstr ""
11037
11038
#: en/help_topics/conflict-types.txt:293
11039
msgid ""
11040
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11041
" issuing ``bzr mv PATH2 PATH1``,\n"
11042
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11043
"``PATH2``,\n"
11044
"* ``--action=done`` will just mark the conflict as resolved."
11045
msgstr ""
11046
11047
#: en/help_topics/conflict-types.txt:300
11048
msgid ""
11049
"Parent loop\n"
11050
"-----------"
11051
msgstr ""
11052
11053
#: en/help_topics/conflict-types.txt:305
11054
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11055
msgstr ""
11056
11057
#: en/help_topics/conflict-types.txt:307
11058
msgid ""
11059
"This happens when the source and the target have each moved directories, so\n"
11060
"that, if the change could be applied, a directory would be contained by "
11061
"itself.\n"
11062
"For example::"
11063
msgstr ""
11064
11065
#: en/help_topics/conflict-types.txt:311
11066
msgid ""
11067
" $ bzr init\n"
11068
" $ bzr mkdir white\n"
11069
" $ bzr mkdir black\n"
11070
" $ bzr commit -m \"BASE\"\n"
11071
" $ bzr branch . ../other\n"
11072
" $ bzr mv white black\n"
11073
" $ bzr commit -m \"THIS\"\n"
11074
" $ bzr mv ../other/black ../other/white\n"
11075
" $ bzr commit ../other -m \"OTHER\"\n"
11076
" $ bzr merge ../other"
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:322
11080
msgid ""
11081
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11082
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11083
"name should be retained for the directories involved."
11084
msgstr ""
11085
11086
#: en/help_topics/conflict-types.txt:328
11087
msgid ""
11088
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11089
"\n"
11090
" in ``black``,\n"
11091
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11092
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11093
"* ``--action=done`` will just mark the conflict as resolved."
11094
msgstr ""
11095
11096
#: en/help_topics/conflict-types.txt:336
11097
msgid ""
11098
"Non-directory parent\n"
11099
"--------------------"
11100
msgstr ""
11101
11102
#: en/help_topics/conflict-types.txt:341
11103
msgid ""
11104
" Conflict: foo.new is not a directory, but has files in it.\n"
11105
" Created directory."
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:344
11109
msgid ""
11110
"This happens when one side has added files to a directory, and the other "
11111
"side\n"
11112
"has changed the directory into a file or symlink. For example::"
11113
msgstr ""
11114
11115
#: en/help_topics/conflict-types.txt:347
11116
msgid ""
11117
" $ bzr init\n"
11118
" $ bzr mkdir foo\n"
11119
" $ bzr commit -m \"BASE\"\n"
11120
" $ bzr branch . ../other\n"
11121
" $ rmdir foo\n"
11122
" $ touch foo\n"
11123
" $ bzr commit -m \"THIS\"\n"
11124
" $ bzr mkdir ../other/foo/bar\n"
11125
" $ bzr commit ../other -m \"OTHER\"\n"
11126
" $ bzr merge ../other"
11127
msgstr ""
11128
11129
#: en/help_topics/conflict-types.txt:358
11130
msgid ""
11131
"To resolve that kind of conflict, you have to decide what name should be\n"
11132
"retained for the file, directory or symlink involved."
11133
msgstr ""
11134
11135
#: en/help_topics/conflict-types.txt:363
11136
msgid ""
11137
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11138
" ``bzr add foo``,\n"
11139
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11140
" ``bzr mv foo.new foo``,\n"
11141
"* ``--action=done`` will just mark the conflict as resolved."
11142
msgstr ""
11143
11144
#: en/help_topics/conflict-types.txt:371
11145
msgid ""
11146
"MalformedTransform\n"
11147
"------------------"
11148
msgstr ""
11149
11150
#: en/help_topics/conflict-types.txt:374
11151
msgid ""
11152
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11153
"exception. This means that Bazaar encountered a filesystem conflict that it "
11154
"was\n"
11155
"unable to resolve. This usually indicates a bug. Please let us know if "
11156
"you\n"
11157
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11158
msgstr ""
11159
11160
#: en/help_topics/content-filters.txt:1
11161
msgid ""
11162
"Content Filters\n"
11163
"==============="
11164
msgstr ""
11165
11166
#: en/help_topics/content-filters.txt:4
11167
msgid ""
11168
"Content formats\n"
11169
"---------------"
11170
msgstr ""
11171
11172
#: en/help_topics/content-filters.txt:7
11173
msgid ""
11174
"Bazaar's content filtering allows you to store files in a different\n"
11175
"format from the copy in your working tree. This lets you, or your\n"
11176
"co-developers, use Windows development tools that expect CRLF files\n"
11177
"on projects that use other line-ending conventions. Among other things,\n"
11178
"content filters also let Unix developers more easily work on projects\n"
11179
"using Windows line-ending conventions, keyword expansion/compression,\n"
11180
"and trailing spaces on lines in text files to be implicitly stripped\n"
11181
"when committed."
11182
msgstr ""
11183
11184
#: en/help_topics/content-filters.txt:16
11185
msgid "To generalize, there are two content formats supported by Bazaar:"
11186
msgstr ""
11187
11188
#: en/help_topics/content-filters.txt:18
11189
msgid ""
11190
"* a canonical format - how files are stored internally\n"
11191
"* a convenience format - how files are created in a working tree."
11192
msgstr ""
11193
11194
#: en/help_topics/content-filters.txt:21
11195
msgid ""
11196
"\n"
11197
"Format conversion\n"
11198
"-----------------"
11199
msgstr ""
11200
11201
#: en/help_topics/content-filters.txt:25
11202
msgid ""
11203
"The conversion between these formats is done by content filters.\n"
11204
"A content filter has two parts:"
11205
msgstr ""
11206
11207
#: en/help_topics/content-filters.txt:28
11208
msgid ""
11209
"* a read converter - converts from convenience to canonical format\n"
11210
"* a write converter - converts from canonical to convenience format."
11211
msgstr ""
11212
11213
#: en/help_topics/content-filters.txt:31
11214
msgid ""
11215
"Many of these converters will provide *round-trip* conversion,\n"
11216
"i.e. applying the read converter followed by the write converter\n"
11217
"gives back the original content. However, others may provide an\n"
11218
"asymmetric conversion. For example, a read converter might strip\n"
11219
"trailing whitespace off lines in source code while the matching\n"
11220
"write converter might pass content through unchanged."
11221
msgstr ""
11222
11223
#: en/help_topics/content-filters.txt:38
11224
msgid ""
11225
"\n"
11226
"Enabling content filters\n"
11227
"------------------------"
11228
msgstr ""
11229
11230
#: en/help_topics/content-filters.txt:42
11231
msgid ""
11232
"Content filters are typically provided by plugins, so the first step\n"
11233
"in using them is to install the relevant plugins and read their\n"
11234
"documentation. Some plugins may be very specific about which files\n"
11235
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11236
"In other cases, the plugin may leave it in the user's hands to\n"
11237
"define which files are to be filtered. This is typically done\n"
11238
"using rule-based preferences. See ``bzr help rules`` for general\n"
11239
"information about defining these."
11240
msgstr ""
11241
11242
#: en/help_topics/content-filters.txt:51
11243
msgid ""
11244
"\n"
11245
"Impact on commands\n"
11246
"------------------"
11247
msgstr ""
11248
11249
#: en/help_topics/content-filters.txt:55
11250
msgid ""
11251
"Read converters are only applied to commands that read content from\n"
11252
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11253
"will apply read converters to files in the working tree, then compare\n"
11254
"the results to the content last committed."
11255
msgstr ""
11256
11257
#: en/help_topics/content-filters.txt:60
11258
msgid ""
11259
"Write converters are only applied by commands that **create files in a\n"
11260
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11261
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11262
"respectively."
11263
msgstr ""
11264
11265
#: en/help_topics/content-filters.txt:65
11266
msgid ""
11267
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11268
"comitting files. If this makes sense for a given plugin providing\n"
11269
"a content filter, the plugin can usually achieve this effect by using a\n"
11270
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11271
"for more information on hooks."
11272
msgstr ""
11273
11274
#: en/help_topics/content-filters.txt:71
11275
msgid ""
11276
"\n"
11277
"Refreshing your working tree\n"
11278
"----------------------------"
11279
msgstr ""
11280
11281
#: en/help_topics/content-filters.txt:75
11282
msgid ""
11283
"For performance reasons, Bazaar caches the timestamps of files in\n"
11284
"a working tree, and assumes files are unchanged if their timestamps\n"
11285
"match the cached values. As a consequence, there are times when\n"
11286
"you may need to explicitly ask for content filtering to be reapplied\n"
11287
"in one or both directions, e.g. after installing or reconfiguring\n"
11288
"plugins providing it."
11289
msgstr ""
11290
11291
#: en/help_topics/content-filters.txt:82
11292
msgid "Here are some general guidelines for doing this:"
11293
msgstr ""
11294
11295
#: en/help_topics/content-filters.txt:84
11296
msgid ""
11297
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11298
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11299
" relevant read converters and compare the end result with the\n"
11300
" canonical format."
11301
msgstr ""
11302
11303
#: en/help_topics/content-filters.txt:89
11304
msgid ""
11305
" * To reapply write converters, ensure there are no local changes,\n"
11306
" delete the relevant files and run ``bzr revert`` on those files."
11307
msgstr ""
11308
11309
#: en/help_topics/content-filters.txt:92
11310
msgid ""
11311
"Note: In the future, it is likely that additional options will be added\n"
11312
"to commands to make this refreshing process faster and safer.\n"
11313
msgstr ""
11314
11315
#: en/help_topics/current-formats.txt:1
11316
msgid "Current Storage Formats"
11317
msgstr ""
11318
11319
#: en/help_topics/current-formats.txt:3
11320
msgid ""
11321
":2a:\n"
11322
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11323
" compress storage. Provides rich roots which are a one-way\n"
11324
" transition."
11325
msgstr ""
11326
11327
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11328
msgid ""
11329
"\n"
11330
"See :doc:`formats-help` for more about storage formats."
11331
msgstr ""
11332
11333
#: en/help_topics/debug-flags.txt:1
11334
msgid ""
11335
"Debug Flags\n"
11336
"==========="
11337
msgstr ""
11338
11339
#: en/help_topics/debug-flags.txt:4
11340
msgid ""
11341
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11342
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11343
msgstr ""
11344
11345
#: en/help_topics/debug-flags.txt:7
11346
msgid ""
11347
"-Dauth Trace authentication sections used.\n"
11348
"-Dbytes Print out how many bytes were transferred\n"
11349
"-Ddirstate Trace dirstate activity (verbose!)\n"
11350
"-Derror Instead of normal error handling, always print a "
11351
"traceback\n"
11352
" on error.\n"
11353
"-Devil Capture call sites that do expensive or badly-scaling\n"
11354
" operations.\n"
11355
"-Dfetch Trace history copying between repositories.\n"
11356
"-Dfilters Emit information for debugging content filtering.\n"
11357
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11358
"fetch.\n"
11359
"-Dgraph Trace graph traversal.\n"
11360
"-Dhashcache Log every time a working file is read to determine its "
11361
"hash.\n"
11362
"-Dhooks Trace hook execution.\n"
11363
"-Dhpss Trace smart protocol requests and responses.\n"
11364
"-Dhpssdetail More hpss details.\n"
11365
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11366
"-Dhttp Trace http connections, requests and responses.\n"
11367
"-Dindex Trace major index operations.\n"
11368
"-Dknit Trace knit operations.\n"
11369
"-Dlock Trace when lockdir locks are taken or released.\n"
11370
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11371
" retrying the request.\n"
11372
"-Dprogress Trace progress bar operations.\n"
11373
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11374
"-Dmerge Emit information for debugging merges.\n"
11375
"-Dno_apport Don't use apport to report crashes.\n"
11376
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11377
"-Dpack Emit information about pack operations.\n"
11378
"-Drelock Emit a message every time a branch or repository object "
11379
"is\n"
11380
" unlocked then relocked the same way.\n"
11381
"-Dsftp Trace SFTP internals.\n"
11382
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11383
"expected\n"
11384
"-Dstream Trace fetch streams.\n"
11385
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11386
"portable\n"
11387
" manner.\n"
11388
"-Dunlock Some errors during unlock are treated as warnings.\n"
11389
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11390
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11391
"appropriate\n"
11392
" for the format, even for non-local fetches.\n"
11393
msgstr ""
11394
11395
#: en/help_topics/diverged-branches.txt:1
11396
msgid ""
11397
"Diverged Branches\n"
11398
"================="
11399
msgstr ""
11400
11401
#: en/help_topics/diverged-branches.txt:4
11402
msgid ""
11403
"When Bazaar tries to push one branch onto another, it requires that the\n"
11404
"destination branch must be ready to receive the source branch. If this "
11405
"isn't\n"
11406
"the case, then we say that the branches have ``diverged``. Branches are\n"
11407
"considered diverged if the destination branch's most recent commit is one "
11408
"that\n"
11409
"has not been merged (directly or indirectly) by the source branch. To "
11410
"recover\n"
11411
"from diverged branches, one must merge the missing revisions into the "
11412
"source\n"
11413
"branch."
11414
msgstr ""
11415
11416
#: en/help_topics/diverged-branches.txt:12
11417
msgid ""
11418
"This situation commonly arises when using a centralized workflow with local\n"
11419
"commits. If someone else has committed new work to the mainline since your\n"
11420
"last pull and you have local commits that have not yet been pushed to the\n"
11421
"mainline, then your local branch and the mainline have diverged."
11422
msgstr ""
11423
11424
#: en/help_topics/diverged-branches.txt:17
11425
msgid ""
11426
"Discovering What Has Diverged\n"
11427
"-----------------------------"
11428
msgstr ""
11429
11430
#: en/help_topics/diverged-branches.txt:20
11431
msgid ""
11432
"The ``bzr missing`` command is used to find out what revisions are in "
11433
"another\n"
11434
"branch that are not present in the current branch, and vice-versa. It shows "
11435
"a\n"
11436
"summary of which extra revisions exist in each branch. If you want to see "
11437
"the\n"
11438
"precise effects of those revisions, you can use ``bzr diff --"
11439
"old=other_branch``\n"
11440
"to show the differences between other_branch and your current branch."
11441
msgstr ""
11442
11443
#: en/help_topics/diverged-branches.txt:26
11444
msgid ""
11445
"A Solution\n"
11446
"----------"
11447
msgstr ""
11448
11449
#: en/help_topics/diverged-branches.txt:29
11450
msgid ""
11451
"The solution is to merge the revisions from the mainline into your local\n"
11452
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11453
"mainline. This merge may result in conflicts if the other developer's "
11454
"changes\n"
11455
"overlap with your changes. These conflicts should be resolved before\n"
11456
"continuing. After any conflicts have been resolved, or even if there were "
11457
"no\n"
11458
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11459
"to your local branch. This requirement gives you an opportunity to test "
11460
"the\n"
11461
"resulting working tree for correctness, since the merged revisions could "
11462
"have\n"
11463
"made arbitrary changes. After testing, you should commit the merge using\n"
11464
"``bzr commit``. This clears up the diverged branches situation. Your "
11465
"local\n"
11466
"branch can now be pushed to the mainline.\n"
11467
msgstr ""
11468
11469
#: en/help_topics/eol.txt:1
11470
msgid ""
11471
"End of Line Conversion\n"
11472
"======================"
11473
msgstr ""
11474
11475
#: en/help_topics/eol.txt:4
11476
msgid ""
11477
"EOL conversion is provided as a content filter where Bazaar internally\n"
11478
"stores a canonical format but outputs a convenience format. See\n"
11479
"``bzr help content-filters`` for general information about using these."
11480
msgstr ""
11481
11482
#: en/help_topics/eol.txt:8
11483
msgid ""
11484
"Note: Content filtering is only supported in recently added formats,\n"
11485
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11486
"in a recent format. (Just setting the format on the repository\n"
11487
"is not enough.) If content filtering does not appear to be working, use\n"
11488
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11489
"or later."
11490
msgstr ""
11491
11492
#: en/help_topics/eol.txt:15
11493
msgid ""
11494
"EOL conversion needs to be enabled for selected file patterns using\n"
11495
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11496
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11497
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11498
"supported in a future verison of Bazaar."
11499
msgstr ""
11500
11501
#: en/help_topics/eol.txt:21
11502
msgid ""
11503
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11504
"(If a value is not set, ``exact`` is the default.)"
11505
msgstr ""
11506
11507
#: en/help_topics/eol.txt:24
11508
msgid ""
11509
" ========== ===================================== ======================\n"
11510
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11511
" ========== ===================================== ======================\n"
11512
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11513
" ---------- ------------------------------------- ----------------------\n"
11514
" ``lf`` ``lf`` ``lf``\n"
11515
" ---------- ------------------------------------- ----------------------\n"
11516
" ``crlf`` ``crlf`` ``lf``\n"
11517
" ---------- ------------------------------------- ----------------------\n"
11518
" ``exact`` No conversion Exactly as in file\n"
11519
" ========== ===================================== ======================"
11520
msgstr ""
11521
11522
#: en/help_topics/eol.txt:36
11523
msgid ""
11524
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11525
"byte is detected in the file."
11526
msgstr ""
11527
11528
#: en/help_topics/eol.txt:39
11529
msgid ""
11530
"For users working on a cross-platform project, here is a suggested rule\n"
11531
"to use as a starting point::"
11532
msgstr ""
11533
11534
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11535
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11536
msgid ""
11537
" [name *]\n"
11538
" eol = native"
11539
msgstr ""
11540
11541
#: en/help_topics/eol.txt:45
11542
msgid ""
11543
"If you have binary files that do not contain a null byte though, be\n"
11544
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11545
"by giving more explicit patterns earlier in the rules file. For example::"
11546
msgstr ""
11547
11548
#: en/help_topics/eol.txt:49
11549
msgid ""
11550
" [name *.png]\n"
11551
" eol = exact"
11552
msgstr ""
11553
11554
#: en/help_topics/eol.txt:55
11555
msgid ""
11556
"If your working tree is on a network drive shared by users on different\n"
11557
"operating systems, you typically want to force certain conventions for\n"
11558
"certain files. In that way, if a file is created with the wrong line\n"
11559
"endings or line endings get mixed during editing, it gets committed\n"
11560
"correctly and gets checked out correctly. For example::"
11561
msgstr ""
11562
11563
#: en/help_topics/eol.txt:61
11564
msgid ""
11565
" [name *.bat]\n"
11566
" eol = crlf"
11567
msgstr ""
11568
11569
#: en/help_topics/eol.txt:64
11570
msgid ""
11571
" [name *.sh]\n"
11572
" eol = lf"
11573
msgstr ""
11574
11575
#: en/help_topics/eol.txt:70
11576
msgid ""
11577
"If you take the care to create files with their required endings, you can\n"
11578
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11579
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11580
"introducing mixed line endings will be corrected during commit for files\n"
11581
"with those settings."
11582
msgstr ""
11583
11584
#: en/help_topics/eol.txt:76
11585
msgid ""
11586
"If you have sample test data that deliberately has text files with mixed\n"
11587
"newline conventions, you can ask for those to be left alone like this::"
11588
msgstr ""
11589
11590
#: en/help_topics/eol.txt:79
11591
msgid ""
11592
" [name test_data/]\n"
11593
" eol = exact"
11594
msgstr ""
11595
11596
#: en/help_topics/eol.txt:85
11597
msgid ""
11598
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11599
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11600
"of content analysis to detect binary files for commands like ``diff``.\n"
11601
"In the future, a ``binary = true`` rule may be added but it is not\n"
11602
"supported yet.)"
11603
msgstr ""
11604
11605
#: en/help_topics/eol.txt:91
11606
msgid ""
11607
"If you have an existing repository with text files already stored using\n"
11608
"Windows newline conventions (``crlf``), then you may want to keep using "
11609
"that\n"
11610
"convention in the repository. Forcing certain files to this convention\n"
11611
"may also help users who do not have rules configured. To do this, set\n"
11612
"``eol`` to one of the values below."
11613
msgstr ""
11614
11615
#: en/help_topics/eol.txt:97
11616
msgid ""
11617
" ============================ ======================== "
11618
"======================\n"
11619
" Value Checkout end-of-lines as Commit end-of-lines "
11620
"as\n"
11621
" ============================ ======================== "
11622
"======================\n"
11623
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11624
" ``lf`` otherwise\n"
11625
" ---------------------------- ------------------------ ----------------------"
11626
"\n"
11627
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11628
" ---------------------------- ------------------------ ----------------------"
11629
"\n"
11630
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11631
" ============================ ======================== ======================"
11632
msgstr ""
11633
11634
#: en/help_topics/eol.txt:108
11635
msgid ""
11636
"For users working on an existing project that uses Windows newline\n"
11637
"conventions in their Bazaar repository, this rule is suggested as a\n"
11638
"starting point::"
11639
msgstr ""
11640
11641
#: en/help_topics/eol.txt:112
11642
msgid ""
11643
" [name *]\n"
11644
" eol = native-with-crlf-in-repo"
11645
msgstr ""
11646
11647
#: en/help_topics/eol.txt:115
11648
msgid ""
11649
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11650
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11651
"``crlf`` and ``exact``."
11652
msgstr ""
11653
11654
#: en/help_topics/eol.txt:119
11655
msgid ""
11656
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11657
"never reject files because a given line ending or mixed line endings\n"
11658
"are found. A precommit hook should be used if you wish to validate\n"
11659
"(and not just convert) content before committing.\n"
11660
msgstr ""
11661
11662
#: en/help_topics/hidden-commands.txt:1
11663
msgid ""
11664
"added List files added in working tree.\n"
11665
"ancestry List all revisions merged into this branch.\n"
11666
"assert-fail Test reporting of assertion failures\n"
11667
"bundle-info Output interesting stats about a bundle\n"
11668
"bundle-revisions Create a merge-directive for submitting changes.\n"
11669
"cat-revision Write out metadata for a revision.\n"
11670
"dump-btree Dump the contents of a btree index file to stdout.\n"
11671
"export-pot Export command helps and error messages in po format.\n"
11672
"file-id Print file_id of a particular file or directory.\n"
11673
"file-path Print path of file_ids to a file or directory.\n"
11674
"find-merge-base Find and print a base revision for merging two "
11675
"branches.\n"
11676
"hooks Show hooks.\n"
11677
"inventory Show inventory of the current working copy or a "
11678
"revision.\n"
11679
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11680
"lookup-revision Lookup the revision-id from a revision-number\n"
11681
"merge-directive Generate a merge directive for auto-merge tools.\n"
11682
"modified List files modified in working tree.\n"
11683
"re-sign Create a digital signature for an existing revision.\n"
11684
"reference list, view and set branch locations for nested trees.\n"
11685
"relpath Show path of a file relative to root\n"
11686
"repair-workingtree Reset the working tree state file.\n"
11687
"revision-history Display the list of revision ids on a branch.\n"
11688
"revision-info Show revision number and revision id for a given "
11689
"revision\n"
11690
" identifier.\n"
11691
"rocks Statement of optimism.\n"
11692
"selftest Run internal test suite.\n"
11693
"shell-complete Show appropriate completions for context.\n"
11694
"test-script Run a shell-like test from a file.\n"
11695
"touching-revisions Return revision-ids which affected a particular file.\n"
11696
"unknowns List unknown files.\n"
11697
"wait-until-signalled Test helper for\n"
11698
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11699
msgstr ""
11700
11701
#: en/help_topics/hooks.txt:1
11702
msgid ""
11703
"\n"
11704
"Hooks\n"
11705
"====="
11706
msgstr ""
11707
11708
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11709
msgid ""
11710
"Introduction\n"
11711
"------------"
11712
msgstr ""
11713
11714
#: en/help_topics/hooks.txt:8
11715
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11716
msgstr ""
11717
11718
#: en/help_topics/hooks.txt:10
11719
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11720
msgstr ""
11721
11722
#: en/help_topics/hooks.txt:12
11723
msgid ""
11724
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11725
msgstr ""
11726
11727
#: en/help_topics/hooks.txt:14
11728
msgid ""
11729
"The class that contains each hook is given before the hooks it supplies. "
11730
"For\n"
11731
"instance, BranchHooks as the class is the hooks class for\n"
11732
"`bzrlib.branch.Branch.hooks`."
11733
msgstr ""
11734
11735
#: en/help_topics/hooks.txt:18
11736
msgid ""
11737
"Each description also indicates whether the hook runs on the client (the\n"
11738
"machine where bzr was invoked) or the server (the machine addressed by\n"
11739
"the branch URL). These may be, but are not necessarily, the same machine."
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:22
11743
msgid ""
11744
"Plugins (including hooks) are run on the server if all of these is true:"
11745
msgstr ""
11746
11747
#: en/help_topics/hooks.txt:24
11748
msgid ""
11749
" * The connection is via a smart server (accessed with a URL starting with\n"
11750
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11751
"\"http://\"\n"
11752
" URL when a smart server is available via HTTP)."
11753
msgstr ""
11754
11755
#: en/help_topics/hooks.txt:28
11756
msgid ""
11757
" * The hook is either server specific or part of general infrastructure "
11758
"rather\n"
11759
" than client specific code (such as commit)."
11760
msgstr ""
11761
11762
#: en/help_topics/hooks.txt:31
11763
msgid ""
11764
"\n"
11765
"BranchHooks\n"
11766
"-----------"
11767
msgstr ""
11768
11769
#: en/help_topics/hooks.txt:35
11770
msgid ""
11771
"automatic_tag_name\n"
11772
"~~~~~~~~~~~~~~~~~~"
11773
msgstr ""
11774
11775
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11776
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11777
msgid "Introduced in: 2.2"
11778
msgstr ""
11779
11780
#: en/help_topics/hooks.txt:40
11781
msgid ""
11782
"Called to determine an automatic tag name for a revision.\n"
11783
"automatic_tag_name is called with (branch, revision_id) and should\n"
11784
"return a tag name or None if no tag name could be determined. The\n"
11785
"first non-None tag name returned will be used."
11786
msgstr ""
11787
11788
#: en/help_topics/hooks.txt:45
11789
msgid ""
11790
"open\n"
11791
"~~~~"
11792
msgstr ""
11793
11794
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11795
#: en/help_topics/hooks.txt:304
11796
msgid "Introduced in: 1.8"
11797
msgstr ""
11798
11799
#: en/help_topics/hooks.txt:50
11800
msgid ""
11801
"Called with the Branch object that has been opened after a branch is\n"
11802
"opened."
11803
msgstr ""
11804
11805
#: en/help_topics/hooks.txt:53
11806
msgid ""
11807
"post_branch_init\n"
11808
"~~~~~~~~~~~~~~~~"
11809
msgstr ""
11810
11811
#: en/help_topics/hooks.txt:58
11812
msgid ""
11813
"Called after new branch initialization completes. post_branch_init is\n"
11814
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11815
"branch and checkout (both heavyweight and lightweight) will all\n"
11816
"trigger this hook."
11817
msgstr ""
11818
11819
#: en/help_topics/hooks.txt:63
11820
msgid ""
11821
"post_change_branch_tip\n"
11822
"~~~~~~~~~~~~~~~~~~~~~~"
11823
msgstr ""
11824
11825
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11826
msgid "Introduced in: 1.4"
11827
msgstr ""
11828
11829
#: en/help_topics/hooks.txt:68
11830
msgid ""
11831
"Called in bzr client and server after a change to the tip of a branch\n"
11832
"is made. post_change_branch_tip is called with a\n"
11833
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11834
"uncommit will all trigger this hook."
11835
msgstr ""
11836
11837
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11838
msgid ""
11839
"post_commit\n"
11840
"~~~~~~~~~~~"
11841
msgstr ""
11842
11843
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11844
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11845
#: en/help_topics/hooks.txt:145
11846
msgid "Introduced in: 0.15"
11847
msgstr ""
11848
11849
#: en/help_topics/hooks.txt:78
11850
msgid ""
11851
"Called in the bzr client after a commit has completed. post_commit is\n"
11852
"called with (local, master, old_revno, old_revid, new_revno,\n"
11853
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11854
"branch."
11855
msgstr ""
11856
11857
#: en/help_topics/hooks.txt:83
11858
msgid ""
11859
"post_pull\n"
11860
"~~~~~~~~~"
11861
msgstr ""
11862
11863
#: en/help_topics/hooks.txt:88
11864
msgid ""
11865
"Called after a pull operation completes. post_pull is called with a\n"
11866
"bzrlib.branch.PullResult object and only runs in the bzr client."
11867
msgstr ""
11868
11869
#: en/help_topics/hooks.txt:91
11870
msgid ""
11871
"post_push\n"
11872
"~~~~~~~~~"
11873
msgstr ""
11874
11875
#: en/help_topics/hooks.txt:96
11876
msgid ""
11877
"Called after a push operation completes. post_push is called with a\n"
11878
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11879
msgstr ""
11880
11881
#: en/help_topics/hooks.txt:99
11882
msgid ""
11883
"post_switch\n"
11884
"~~~~~~~~~~~"
11885
msgstr ""
11886
11887
#: en/help_topics/hooks.txt:104
11888
msgid ""
11889
"Called after a checkout switches branch. post_switch is called with a\n"
11890
"bzrlib.branch.SwitchHookParams."
11891
msgstr ""
11892
11893
#: en/help_topics/hooks.txt:107
11894
msgid ""
11895
"post_uncommit\n"
11896
"~~~~~~~~~~~~~"
11897
msgstr ""
11898
11899
#: en/help_topics/hooks.txt:112
11900
msgid ""
11901
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11902
"called with (local, master, old_revno, old_revid, new_revno,\n"
11903
"new_revid) where local is the local branch or None, master is the\n"
11904
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11905
"of None."
11906
msgstr ""
11907
11908
#: en/help_topics/hooks.txt:118
11909
msgid ""
11910
"pre_change_branch_tip\n"
11911
"~~~~~~~~~~~~~~~~~~~~~"
11912
msgstr ""
11913
11914
#: en/help_topics/hooks.txt:121
11915
msgid "Introduced in: 1.6"
11916
msgstr ""
11917
11918
#: en/help_topics/hooks.txt:123
11919
msgid ""
11920
"Called in bzr client and server before a change to the tip of a branch\n"
11921
"is made. pre_change_branch_tip is called with a\n"
11922
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11923
"uncommit will all trigger this hook."
11924
msgstr ""
11925
11926
#: en/help_topics/hooks.txt:128
11927
msgid ""
11928
"pre_commit\n"
11929
"~~~~~~~~~~"
11930
msgstr ""
11931
11932
#: en/help_topics/hooks.txt:131
11933
msgid "Introduced in: 0.91"
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:133
11937
msgid ""
11938
"Called after a commit is calculated but before it is completed.\n"
11939
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11940
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11941
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11942
"TreeDelta object describing changes from the basis revision. hooks\n"
11943
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11944
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11945
"tree."
11946
msgstr ""
11947
11948
#: en/help_topics/hooks.txt:142
11949
msgid ""
11950
"set_rh\n"
11951
"~~~~~~"
11952
msgstr ""
11953
11954
#: en/help_topics/hooks.txt:147
11955
msgid ""
11956
"Invoked whenever the revision history has been set via\n"
11957
"set_revision_history. The api signature is (branch, revision_history),\n"
11958
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11959
"for bzr to trigger, a better hook to use is\n"
11960
"Branch.post_change_branch_tip."
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:153
11964
msgid ""
11965
"transform_fallback_location\n"
11966
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11967
msgstr ""
11968
11969
#: en/help_topics/hooks.txt:156
11970
msgid "Introduced in: 1.9"
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:158
11974
msgid ""
11975
"Called when a stacked branch is activating its fallback locations.\n"
11976
"transform_fallback_location is called with (branch, url), and should\n"
11977
"return a new url. Returning the same url allows it to be used as-is,\n"
11978
"returning a different one can be used to cause the branch to stack on\n"
11979
"a closer copy of that fallback_location. Note that the branch cannot\n"
11980
"have history accessing methods called on it during this hook because\n"
11981
"the fallback locations have not been activated. When there are\n"
11982
"multiple hooks installed for transform_fallback_location, all are\n"
11983
"called with the url returned from the previous hook.The order is\n"
11984
"however undefined."
11985
msgstr ""
11986
11987
#: en/help_topics/hooks.txt:169
11988
msgid ""
11989
"CommandHooks\n"
11990
"------------"
11991
msgstr ""
11992
11993
#: en/help_topics/hooks.txt:172
11994
msgid ""
11995
"extend_command\n"
11996
"~~~~~~~~~~~~~~"
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:175
12000
msgid "Introduced in: 1.13"
12001
msgstr ""
12002
12003
#: en/help_topics/hooks.txt:177
12004
msgid ""
12005
"Called after creating a command object to allow modifications such as\n"
12006
"adding or removing options, docs etc. Called with the new\n"
12007
"bzrlib.commands.Command object."
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:181
12011
msgid ""
12012
"get_command\n"
12013
"~~~~~~~~~~~"
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12017
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12018
msgid "Introduced in: 1.17"
12019
msgstr ""
12020
12021
#: en/help_topics/hooks.txt:186
12022
msgid ""
12023
"Called when creating a single command. Called with (cmd_or_None,\n"
12024
"command_name). get_command should either return the cmd_or_None\n"
12025
"parameter, or a replacement Command object that should be used for the\n"
12026
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12027
"Many users will prefer to use bzrlib.commands.register_command or\n"
12028
"plugin_cmds.register_lazy."
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:193
12032
msgid ""
12033
"get_missing_command\n"
12034
"~~~~~~~~~~~~~~~~~~~"
12035
msgstr ""
12036
12037
#: en/help_topics/hooks.txt:198
12038
msgid ""
12039
"Called when creating a single command if no command could be found.\n"
12040
"Called with (command_name). get_missing_command should either return\n"
12041
"None, or a Command object to be used for the command."
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:202
12045
msgid ""
12046
"list_commands\n"
12047
"~~~~~~~~~~~~~"
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:207
12051
msgid ""
12052
"Called when enumerating commands. Called with a set of cmd_name\n"
12053
"strings for all the commands found so far. This set is safe to mutate\n"
12054
"- e.g. to remove a command. list_commands should return the updated\n"
12055
"set of command names."
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:212
12059
msgid ""
12060
"_ConfigHooks\n"
12061
"------------"
12062
msgstr ""
12063
12064
#: en/help_topics/hooks.txt:215
12065
msgid ""
12066
"get\n"
12067
"~~~"
12068
msgstr ""
12069
12070
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12071
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12072
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12073
#: en/help_topics/hooks.txt:427
12074
msgid "Introduced in: 2.4"
12075
msgstr ""
12076
12077
#: en/help_topics/hooks.txt:220
12078
msgid ""
12079
"Invoked when a config option is read. The signature is (stack, name,\n"
12080
"value)."
12081
msgstr ""
12082
12083
#: en/help_topics/hooks.txt:223
12084
msgid ""
12085
"load\n"
12086
"~~~~"
12087
msgstr ""
12088
12089
#: en/help_topics/hooks.txt:228
12090
msgid "Invoked when a config store is loaded. The signature is (store)."
12091
msgstr ""
12092
12093
#: en/help_topics/hooks.txt:230
12094
msgid ""
12095
"remove\n"
12096
"~~~~~~"
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:235
12100
msgid ""
12101
"Invoked when a config option is removed. The signature is (stack,\n"
12102
"name)."
12103
msgstr ""
12104
12105
#: en/help_topics/hooks.txt:238
12106
msgid ""
12107
"save\n"
12108
"~~~~"
12109
msgstr ""
12110
12111
#: en/help_topics/hooks.txt:243
12112
msgid "Invoked when a config store is saved. The signature is (store)."
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:245
12116
msgid ""
12117
"set\n"
12118
"~~~"
12119
msgstr ""
12120
12121
#: en/help_topics/hooks.txt:250
12122
msgid ""
12123
"Invoked when a config option is set. The signature is (stack, name,\n"
12124
"value)."
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:253
12128
msgid ""
12129
"ControlDirHooks\n"
12130
"---------------"
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:256
12134
msgid ""
12135
"post_repo_init\n"
12136
"~~~~~~~~~~~~~~"
12137
msgstr ""
12138
12139
#: en/help_topics/hooks.txt:261
12140
msgid ""
12141
"Invoked after a repository has been initialized. post_repo_init is\n"
12142
"called with a bzrlib.controldir.RepoInitHookParams."
12143
msgstr ""
12144
12145
#: en/help_topics/hooks.txt:264
12146
msgid ""
12147
"pre_open\n"
12148
"~~~~~~~~"
12149
msgstr ""
12150
12151
#: en/help_topics/hooks.txt:267
12152
msgid "Introduced in: 1.14"
12153
msgstr ""
12154
12155
#: en/help_topics/hooks.txt:269
12156
msgid ""
12157
"Invoked before attempting to open a ControlDir with the transport that\n"
12158
"the open will use."
12159
msgstr ""
12160
12161
#: en/help_topics/hooks.txt:272
12162
msgid ""
12163
"InfoHooks\n"
12164
"---------"
12165
msgstr ""
12166
12167
#: en/help_topics/hooks.txt:275
12168
msgid ""
12169
"repository\n"
12170
"~~~~~~~~~~"
12171
msgstr ""
12172
12173
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12174
#: en/help_topics/hooks.txt:505
12175
msgid "Introduced in: 1.15"
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:280
12179
msgid ""
12180
"Invoked when displaying the statistics for a repository. repository is\n"
12181
"called with a statistics dictionary as returned by the repository and\n"
12182
"a file-like object to write to."
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:284
12186
msgid ""
12187
"LockHooks\n"
12188
"---------"
12189
msgstr ""
12190
12191
#: en/help_topics/hooks.txt:287
12192
msgid ""
12193
"lock_acquired\n"
12194
"~~~~~~~~~~~~~"
12195
msgstr ""
12196
12197
#: en/help_topics/hooks.txt:292
12198
msgid ""
12199
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:294
12203
msgid ""
12204
"lock_broken\n"
12205
"~~~~~~~~~~~"
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:299
12209
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12210
msgstr ""
12211
12212
#: en/help_topics/hooks.txt:301
12213
msgid ""
12214
"lock_released\n"
12215
"~~~~~~~~~~~~~"
12216
msgstr ""
12217
12218
#: en/help_topics/hooks.txt:306
12219
msgid ""
12220
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:308
12224
msgid ""
12225
"MergeHooks\n"
12226
"----------"
12227
msgstr ""
12228
12229
#: en/help_topics/hooks.txt:311
12230
msgid ""
12231
"merge_file_content\n"
12232
"~~~~~~~~~~~~~~~~~~"
12233
msgstr ""
12234
12235
#: en/help_topics/hooks.txt:314
12236
msgid "Introduced in: 2.1"
12237
msgstr ""
12238
12239
#: en/help_topics/hooks.txt:316
12240
msgid ""
12241
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12242
"object when starting a merge. Should return either None or a subclass\n"
12243
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12244
"called per file that needs to be merged (including when one side has\n"
12245
"deleted the file and the other has changed it). See the\n"
12246
"AbstractPerFileMerger API docs for details on how it is used by merge."
12247
msgstr ""
12248
12249
#: en/help_topics/hooks.txt:323
12250
msgid ""
12251
"post_merge\n"
12252
"~~~~~~~~~~"
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12256
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12257
msgid "Introduced in: 2.5"
12258
msgstr ""
12259
12260
#: en/help_topics/hooks.txt:328
12261
msgid ""
12262
"Called after a merge. Receives a Merger object as the single argument.\n"
12263
"The return value is ignored."
12264
msgstr ""
12265
12266
#: en/help_topics/hooks.txt:331
12267
msgid ""
12268
"pre_merge\n"
12269
"~~~~~~~~~"
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:336
12273
msgid ""
12274
"Called before a merge. Receives a Merger object as the single\n"
12275
"argument."
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:339
12279
msgid ""
12280
"MergeDirectiveHooks\n"
12281
"-------------------"
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:342
12285
msgid ""
12286
"merge_request_body\n"
12287
"~~~~~~~~~~~~~~~~~~"
12288
msgstr ""
12289
12290
#: en/help_topics/hooks.txt:345
12291
msgid "Introduced in: 1.15.0"
12292
msgstr ""
12293
12294
#: en/help_topics/hooks.txt:347
12295
msgid ""
12296
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12297
"request. Callbacks must return a body. If more than one callback is\n"
12298
"registered, the output of one callback is provided to the next."
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:351
12302
msgid ""
12303
"MessageEditorHooks\n"
12304
"------------------"
12305
msgstr ""
12306
12307
#: en/help_topics/hooks.txt:354
12308
msgid ""
12309
"commit_message_template\n"
12310
"~~~~~~~~~~~~~~~~~~~~~~~"
12311
msgstr ""
12312
12313
#: en/help_topics/hooks.txt:357
12314
msgid "Introduced in: 1.10"
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:359
12318
msgid ""
12319
"Called when a commit message is being generated.\n"
12320
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12321
"and the message that is known so far. commit_message_template must\n"
12322
"return a new message to use (which could be the same as it was given).\n"
12323
"When there are multiple hooks registered for commit_message_template,\n"
12324
"they are chained with the result from the first passed into the\n"
12325
"second, and so on."
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:367
12329
msgid ""
12330
"set_commit_message\n"
12331
"~~~~~~~~~~~~~~~~~~"
12332
msgstr ""
12333
12334
#: en/help_topics/hooks.txt:372
12335
msgid ""
12336
"Set a fixed commit message. set_commit_message is called with the\n"
12337
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12338
"properties by editing commit.builder._revprops) and the message so\n"
12339
"far. set_commit_message must return the message to use or None if it\n"
12340
"should use the message editor as normal."
12341
msgstr ""
12342
12343
#: en/help_topics/hooks.txt:378
12344
msgid ""
12345
"MutableTreeHooks\n"
12346
"----------------"
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:381
12350
msgid ""
12351
"post_build_tree\n"
12352
"~~~~~~~~~~~~~~~"
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:386
12356
msgid ""
12357
"Called after a completely new tree is built. The hook is called with\n"
12358
"the tree as its only argument."
12359
msgstr ""
12360
12361
#: en/help_topics/hooks.txt:392
12362
msgid "Introduced in: 2.0"
12363
msgstr ""
12364
12365
#: en/help_topics/hooks.txt:394
12366
msgid ""
12367
"Called after a commit is performed on a tree. The hook is called with\n"
12368
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12369
"commit was performed on is available via the mutable_tree attribute of\n"
12370
"that object."
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:399
12374
msgid ""
12375
"start_commit\n"
12376
"~~~~~~~~~~~~"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:404
12380
msgid ""
12381
"Called before a commit is performed on a tree. The start commit hook\n"
12382
"is able to change the tree before the commit takes place. start_commit\n"
12383
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12384
"being performed on."
12385
msgstr ""
12386
12387
#: en/help_topics/hooks.txt:409
12388
msgid ""
12389
"SmartClientHooks\n"
12390
"----------------"
12391
msgstr ""
12392
12393
#: en/help_topics/hooks.txt:412
12394
msgid ""
12395
"call\n"
12396
"~~~~"
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:415
12400
msgid "Introduced in: unknown"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:417
12404
msgid ""
12405
"Called when the smart client is submitting a request to the smart\n"
12406
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12407
"Streaming request bodies, and responses, are not accessible."
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:421
12411
msgid ""
12412
"SmartServerHooks\n"
12413
"----------------"
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:424
12417
msgid ""
12418
"server_exception\n"
12419
"~~~~~~~~~~~~~~~~"
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:429
12423
msgid ""
12424
"Called by the bzr server when an exception occurs. server_exception is\n"
12425
"called with the sys.exc_info() tuple return true for the hook if the\n"
12426
"exception has been handled, in which case the server will exit\n"
12427
"normally."
12428
msgstr ""
12429
12430
#: en/help_topics/hooks.txt:434
12431
msgid ""
12432
"server_started\n"
12433
"~~~~~~~~~~~~~~"
12434
msgstr ""
12435
12436
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12437
msgid "Introduced in: 0.16"
12438
msgstr ""
12439
12440
#: en/help_topics/hooks.txt:439
12441
msgid ""
12442
"Called by the bzr server when it starts serving a directory.\n"
12443
"server_started is called with (backing urls, public url), where\n"
12444
"backing_url is a list of URLs giving the server-specific directory\n"
12445
"locations, and public_url is the public URL for the directory being\n"
12446
"served."
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:445
12450
msgid ""
12451
"server_started_ex\n"
12452
"~~~~~~~~~~~~~~~~~"
12453
msgstr ""
12454
12455
#: en/help_topics/hooks.txt:450
12456
msgid ""
12457
"Called by the bzr server when it starts serving a directory.\n"
12458
"server_started is called with (backing_urls, server_obj)."
12459
msgstr ""
12460
12461
#: en/help_topics/hooks.txt:453
12462
msgid ""
12463
"server_stopped\n"
12464
"~~~~~~~~~~~~~~"
12465
msgstr ""
12466
12467
#: en/help_topics/hooks.txt:458
12468
msgid ""
12469
"Called by the bzr server when it stops serving a directory.\n"
12470
"server_stopped is called with the same parameters as the\n"
12471
"server_started hook: (backing_urls, public_url)."
12472
msgstr ""
12473
12474
#: en/help_topics/hooks.txt:462
12475
msgid ""
12476
"StatusHooks\n"
12477
"-----------"
12478
msgstr ""
12479
12480
#: en/help_topics/hooks.txt:465
12481
msgid ""
12482
"post_status\n"
12483
"~~~~~~~~~~~"
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12487
msgid "Introduced in: 2.3"
12488
msgstr ""
12489
12490
#: en/help_topics/hooks.txt:470
12491
msgid ""
12492
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12493
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12494
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12495
"correspond to the command line options specified by the user for the\n"
12496
"status command. to_file is the output stream for writing."
12497
msgstr ""
12498
12499
#: en/help_topics/hooks.txt:476
12500
msgid ""
12501
"pre_status\n"
12502
"~~~~~~~~~~"
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:481
12506
msgid ""
12507
"Called with argument StatusHookParams before Bazaar displays the\n"
12508
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12509
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12510
"correspond to the command line options specified by the user for the\n"
12511
"status command. to_file is the output stream for writing."
12512
msgstr ""
12513
12514
#: en/help_topics/hooks.txt:487
12515
msgid ""
12516
"TransportHooks\n"
12517
"--------------"
12518
msgstr ""
12519
12520
#: en/help_topics/hooks.txt:490
12521
msgid ""
12522
"post_connect\n"
12523
"~~~~~~~~~~~~"
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:495
12527
msgid ""
12528
"Called after a new connection is established or a reconnect occurs.\n"
12529
"The sole argument passed is either the connected transport or smart\n"
12530
"medium instance."
12531
msgstr ""
12532
12533
#: en/help_topics/hooks.txt:499
12534
msgid ""
12535
"RioVersionInfoBuilderHooks\n"
12536
"--------------------------"
12537
msgstr ""
12538
12539
#: en/help_topics/hooks.txt:502
12540
msgid ""
12541
"revision\n"
12542
"~~~~~~~~"
12543
msgstr ""
12544
12545
#: en/help_topics/hooks.txt:507
12546
msgid ""
12547
"Invoked when adding information about a revision to the RIO stanza\n"
12548
"that is printed. revision is called with a revision object and a RIO\n"
12549
"stanza.\n"
12550
msgstr ""
12551
12552
#: en/help_topics/location-alias.txt:1
12553
msgid ""
12554
"Location aliases\n"
12555
"================"
12556
msgstr ""
12557
12558
#: en/help_topics/location-alias.txt:4
12559
msgid ""
12560
"Bazaar defines several aliases for locations associated with a branch. "
12561
"These\n"
12562
"can be used with most commands that expect a location, such as `bzr push`."
12563
msgstr ""
12564
12565
#: en/help_topics/location-alias.txt:7
12566
msgid "The aliases are::"
12567
msgstr ""
12568
12569
#: en/help_topics/location-alias.txt:9
12570
msgid ""
12571
" :bound The branch this branch is bound to, for bound branches.\n"
12572
" :parent The parent of this branch.\n"
12573
" :public The public location of this branch.\n"
12574
" :push The saved location used for `bzr push` with no arguments.\n"
12575
" :submit The submit branch for this branch.\n"
12576
" :this This branch."
12577
msgstr ""
12578
12579
#: en/help_topics/location-alias.txt:16
12580
msgid "For example, to push to the parent location::"
12581
msgstr ""
12582
12583
#: en/help_topics/location-alias.txt:18
12584
msgid " bzr push :parent\n"
12585
msgstr ""
12586
12587
#: en/help_topics/log-formats.txt:1
12588
msgid ""
12589
"Log Formats\n"
12590
"==========="
12591
msgstr ""
12592
12593
#: en/help_topics/log-formats.txt:4
12594
msgid ""
12595
"A log format controls how information about each revision is displayed.\n"
12596
"The standard log formats are compared below::"
12597
msgstr ""
12598
12599
#: en/help_topics/log-formats.txt:7
12600
msgid ""
12601
" Feature long short line\n"
12602
" ---------------------- ------------- ------------ -------------------\n"
12603
" design goal detailed view concise view 1 revision per line\n"
12604
" committer name+email name only name only\n"
12605
" author name+email - -\n"
12606
" date-time format full date only date only\n"
12607
" commit message full full top line\n"
12608
" tags yes yes yes\n"
12609
" merges indicator - yes -\n"
12610
" status/delta optional optional -\n"
12611
" diff/patch optional optional -\n"
12612
" revision-id optional optional -\n"
12613
" branch nick yes - -\n"
12614
" foreign vcs properties yes yes -\n"
12615
" preferred levels all 1 1\n"
12616
" digital signature optional - -"
12617
msgstr ""
12618
12619
#: en/help_topics/log-formats.txt:24
12620
msgid ""
12621
"The default format is ``long``. To change this, define the ``log_format``\n"
12622
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12623
msgstr ""
12624
12625
#: en/help_topics/log-formats.txt:27
12626
msgid ""
12627
" [DEFAULT]\n"
12628
" log_format = short"
12629
msgstr ""
12630
12631
#: en/help_topics/log-formats.txt:30
12632
msgid ""
12633
"Alternatively, to change the log format used for a given query, use the\n"
12634
"--long, --short or --line options."
12635
msgstr ""
12636
12637
#: en/help_topics/log-formats.txt:33
12638
msgid ""
12639
"If one of the standard log formats does not meet your needs, additional\n"
12640
"formats can be provided by plugins.\n"
12641
msgstr ""
12642
12643
#: en/help_topics/other-formats.txt:1
12644
msgid "Other Storage Formats"
12645
msgstr ""
12646
12647
#: en/help_topics/other-formats.txt:3
12648
msgid "Experimental formats are shown below."
12649
msgstr ""
12650
12651
#: en/help_topics/other-formats.txt:5
12652
msgid ""
12653
":development-colo:\n"
12654
" (native) The 2a format with experimental support for colocated\n"
12655
" branches."
12656
msgstr ""
12657
12658
#: en/help_topics/other-formats.txt:9
12659
msgid ""
12660
"\n"
12661
"Deprecated formats are shown below."
12662
msgstr ""
12663
12664
#: en/help_topics/other-formats.txt:12
12665
msgid ""
12666
":pack-0.92:\n"
12667
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12668
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12669
" by bzr < 0.92."
12670
msgstr ""
12671
12672
#: en/help_topics/patterns.txt:1
12673
msgid ""
12674
"Patterns\n"
12675
"========"
12676
msgstr ""
12677
12678
#: en/help_topics/patterns.txt:4
12679
msgid ""
12680
"Bazaar uses patterns to match files at various times. For example,\n"
12681
"the ``add`` command skips over files that match ignore patterns\n"
12682
"and preferences can be associated with files using rule patterns.\n"
12683
"The pattern syntax is described below."
12684
msgstr ""
12685
12686
#: en/help_topics/patterns.txt:9
12687
msgid ""
12688
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12689
"slash or is a regular expression, it is compared to the whole path\n"
12690
"from the branch root. Otherwise, it is compared to only the last\n"
12691
"component of the path. To match a file only in the root directory,\n"
12692
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12693
msgstr ""
12694
12695
#: en/help_topics/patterns.txt:15
12696
msgid "Patterns may include globbing wildcards such as::"
12697
msgstr ""
12698
12699
#: en/help_topics/patterns.txt:17
12700
msgid ""
12701
" ? - Matches any single character except '/'\n"
12702
" * - Matches 0 or more characters except '/'\n"
12703
" /**/ - Matches 0 or more directories in a path\n"
12704
" [a-z] - Matches a single character from within a group of characters"
12705
msgstr ""
12706
12707
#: en/help_topics/patterns.txt:22
12708
msgid ""
12709
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12710
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12711
"expression. Regular expression patterns may not include named or\n"
12712
"numbered groups."
12713
msgstr ""
12714
12715
#: en/help_topics/patterns.txt:27
12716
msgid ""
12717
"Case insensitive ignore patterns can be specified with regular expressions\n"
12718
"by using the ``i`` (for ignore case) flag in the pattern."
12719
msgstr ""
12720
12721
#: en/help_topics/patterns.txt:30
12722
msgid ""
12723
"For example, a case insensitive match for ``foo`` may be specified as::"
12724
msgstr ""
12725
12726
#: en/help_topics/patterns.txt:32
12727
msgid " RE:(?i)foo"
12728
msgstr ""
12729
12730
#: en/help_topics/patterns.txt:34
12731
msgid ""
12732
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12733
"matched by that pattern will not be ignored."
12734
msgstr ""
12735
12736
#: en/help_topics/patterns.txt:37
12737
msgid ""
12738
".. _Python regular expressions: http://docs.python.org/library/re.html"
12739
msgstr ""
12740
12741
#: en/help_topics/revisionspec.txt:1
12742
msgid "Revision Identifiers"
12743
msgstr ""
12744
12745
#: en/help_topics/revisionspec.txt:3
12746
msgid ""
12747
"A revision identifier refers to a specific state of a branch's history. It\n"
12748
"can be expressed in several ways. It can begin with a keyword to\n"
12749
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12750
"'before:yesterday' and 'submit:'."
12751
msgstr ""
12752
12753
#: en/help_topics/revisionspec.txt:8
12754
msgid ""
12755
"Alternately, it can be given without a keyword, in which case it will be\n"
12756
"checked as a revision number, a tag, a revision id, a date specification, or "
12757
"a\n"
12758
"branch specification, in that order. For example, 'date:today' could be\n"
12759
"written as simply 'today', though if you have a tag called 'today' that "
12760
"will\n"
12761
"be found first."
12762
msgstr ""
12763
12764
#: en/help_topics/revisionspec.txt:14
12765
msgid ""
12766
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12767
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12768
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12769
"or\n"
12770
"spaces around the '..')."
12771
msgstr ""
12772
12773
#: en/help_topics/revisionspec.txt:19
12774
msgid ""
12775
"Ranges are interpreted differently by different commands. To the \"log\" "
12776
"command,\n"
12777
"a range is a sequence of log messages, but to the \"diff\" command, the "
12778
"range\n"
12779
"denotes a change between revisions (and not a sequence of changes). In\n"
12780
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12781
"consider it\n"
12782
"to be open-ended, that is, they include one end but not the other. For "
12783
"example:\n"
12784
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12785
"3649,\n"
12786
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12787
"and\n"
12788
"3649, but not 3647."
12789
msgstr ""
12790
12791
#: en/help_topics/revisionspec.txt:28
12792
msgid "The keywords used as revision selection methods are the following:"
12793
msgstr ""
12794
12795
#: en/help_topics/revisionspec.txt:30
12796
msgid ""
12797
":revid:\n"
12798
"\tSelects a revision using the revision id.\n"
12799
":submit:\n"
12800
"\tSelects a common ancestor with the submit branch.\n"
12801
":ancestor:\n"
12802
"\tSelects a common ancestor with a second branch.\n"
12803
":date:\n"
12804
"\tSelects a revision on the basis of a datestamp.\n"
12805
":branch:\n"
12806
"\tSelects the last revision of a specified branch.\n"
12807
":tag:\n"
12808
"\tSelects a revision identified by a tag name.\n"
12809
":revno:\n"
12810
"\tSelects a revision using a number.\n"
12811
":before:\n"
12812
"\tSelects the parent of the revision specified.\n"
12813
":annotate:\n"
12814
"\tSelect the revision that last modified the specified line.\n"
12815
":mainline:\n"
12816
"\tSelect mainline revision that merged the specified revision.\n"
12817
":last:\n"
12818
"\tSelects the nth revision from the end."
12819
msgstr ""
12820
12821
#: en/help_topics/revisionspec.txt:53
12822
msgid "In addition, plugins can provide other keywords."
12823
msgstr ""
12824
12825
#: en/help_topics/revisionspec.txt:55
12826
msgid "A detailed description of each keyword is given below."
12827
msgstr ""
12828
12829
#: en/help_topics/revisionspec.txt:57
12830
msgid ":revid:"
12831
msgstr ""
12832
12833
#: en/help_topics/revisionspec.txt:59
12834
msgid ""
12835
" Supply a specific revision id, that can be used to specify any\n"
12836
" revision id in the ancestry of the branch.\n"
12837
" Including merges, and pending merges.\n"
12838
" Examples::"
12839
msgstr ""
12840
12841
#: en/help_topics/revisionspec.txt:64
12842
msgid ""
12843
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12844
msgstr ""
12845
12846
#: en/help_topics/revisionspec.txt:66
12847
msgid ":submit:"
12848
msgstr ""
12849
12850
#: en/help_topics/revisionspec.txt:68
12851
msgid ""
12852
" Diffing against this shows all the changes that were made in this "
12853
"branch,\n"
12854
" and is a good predictor of what merge will do. The submit branch is\n"
12855
" used by the bundle and merge directive commands. If no submit branch\n"
12856
" is specified, the parent branch is used instead."
12857
msgstr ""
12858
12859
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12860
msgid ""
12861
" The common ancestor is the last revision that existed in both\n"
12862
" branches. Usually this is the branch point, but it could also be\n"
12863
" a revision that was merged."
12864
msgstr ""
12865
12866
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12867
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12868
#: en/help_topics/revisionspec.txt:153
12869
msgid " Examples::"
12870
msgstr ""
12871
12872
#: en/help_topics/revisionspec.txt:79
12873
msgid " $ bzr diff -r submit:"
12874
msgstr ""
12875
12876
#: en/help_topics/revisionspec.txt:81
12877
msgid ":ancestor:"
12878
msgstr ""
12879
12880
#: en/help_topics/revisionspec.txt:83
12881
msgid " Supply the path to a branch to select the common ancestor."
12882
msgstr ""
12883
12884
#: en/help_topics/revisionspec.txt:89
12885
msgid ""
12886
" This is frequently used with 'diff' to return all of the changes\n"
12887
" that your branch introduces, while excluding the changes that you\n"
12888
" have not merged from the remote branch."
12889
msgstr ""
12890
12891
#: en/help_topics/revisionspec.txt:95
12892
msgid ""
12893
" ancestor:/path/to/branch\n"
12894
" $ bzr diff -r ancestor:../../mainline/branch"
12895
msgstr ""
12896
12897
#: en/help_topics/revisionspec.txt:98
12898
msgid ":date:"
12899
msgstr ""
12900
12901
#: en/help_topics/revisionspec.txt:100
12902
msgid ""
12903
" Supply a datestamp to select the first revision that matches the date.\n"
12904
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12905
" Matches the first entry after a given date (either at midnight or\n"
12906
" at a specified time)."
12907
msgstr ""
12908
12909
#: en/help_topics/revisionspec.txt:105
12910
msgid " One way to display all the changes since yesterday would be::"
12911
msgstr ""
12912
12913
#: en/help_topics/revisionspec.txt:107
12914
msgid " bzr log -r date:yesterday.."
12915
msgstr ""
12916
12917
#: en/help_topics/revisionspec.txt:111
12918
msgid ""
12919
" date:yesterday -> select the first revision since "
12920
"yesterday\n"
12921
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12922
" August 14th, 2006 at 5:10pm."
12923
msgstr ""
12924
12925
#: en/help_topics/revisionspec.txt:115
12926
msgid ":branch:"
12927
msgstr ""
12928
12929
#: en/help_topics/revisionspec.txt:117
12930
msgid " Supply the path to a branch to select its last revision."
12931
msgstr ""
12932
12933
#: en/help_topics/revisionspec.txt:121
12934
msgid " branch:/path/to/branch"
12935
msgstr ""
12936
12937
#: en/help_topics/revisionspec.txt:123
12938
msgid ":tag:"
12939
msgstr ""
12940
12941
#: en/help_topics/revisionspec.txt:125
12942
msgid " Tags are stored in the branch and created by the 'tag' command."
12943
msgstr ""
12944
12945
#: en/help_topics/revisionspec.txt:127
12946
msgid ":revno:"
12947
msgstr ""
12948
12949
#: en/help_topics/revisionspec.txt:129
12950
msgid ""
12951
" Use an integer to specify a revision in the history of the branch.\n"
12952
" Optionally a branch can be specified. A negative number will count\n"
12953
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12954
" one). If the negative number is larger than the branch's history, the\n"
12955
" first revision is returned.\n"
12956
" Examples::"
12957
msgstr ""
12958
12959
#: en/help_topics/revisionspec.txt:136
12960
msgid ""
12961
" revno:1 -> return the first revision of this branch\n"
12962
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12963
" the branch '/path/to/branch'\n"
12964
" revno:-1 -> The last revision in a branch.\n"
12965
" -2:http://other/branch -> The second to last revision in the\n"
12966
" remote branch.\n"
12967
" -1000000 -> Most likely the first revision, unless\n"
12968
" your history is very long."
12969
msgstr ""
12970
12971
#: en/help_topics/revisionspec.txt:145
12972
msgid ":before:"
12973
msgstr ""
12974
12975
#: en/help_topics/revisionspec.txt:147
12976
msgid ""
12977
" Supply any revision spec to return the parent of that revision. This "
12978
"is\n"
12979
" mostly useful when inspecting revisions that are not in the revision "
12980
"history\n"
12981
" of a branch."
12982
msgstr ""
12983
12984
#: en/help_topics/revisionspec.txt:151
12985
msgid ""
12986
" It is an error to request the parent of the null revision (before:0)."
12987
msgstr ""
12988
12989
#: en/help_topics/revisionspec.txt:155
12990
msgid ""
12991
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12992
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12993
" aaaa@bbbb-1234567890\n"
12994
" bzr diff -r before:1913..1913\n"
12995
" -> Find the changes between revision 1913 and its parent "
12996
"(1912).\n"
12997
" (What changes did revision 1913 introduce).\n"
12998
" This is equivalent to: bzr diff -c 1913"
12999
msgstr ""
13000
13001
#: en/help_topics/revisionspec.txt:163
13002
msgid ":annotate:"
13003
msgstr ""
13004
13005
#: en/help_topics/revisionspec.txt:165
13006
msgid ""
13007
" Select the revision that last modified the specified line. Line is\n"
13008
" specified as path:number. Path is a relative path to the file. "
13009
"Numbers\n"
13010
" start at 1, and are relative to the current version, not the last-\n"
13011
" committed version of the file."
13012
msgstr ""
13013
13014
#: en/help_topics/revisionspec.txt:170
13015
msgid ":mainline:"
13016
msgstr ""
13017
13018
#: en/help_topics/revisionspec.txt:172
13019
msgid ""
13020
" Select the revision that merged the specified revision into mainline."
13021
msgstr ""
13022
13023
#: en/help_topics/revisionspec.txt:174
13024
msgid ":last:"
13025
msgstr ""
13026
13027
#: en/help_topics/revisionspec.txt:176
13028
msgid ""
13029
" Supply a positive number to get the nth revision from the end.\n"
13030
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13031
" Examples::"
13032
msgstr ""
13033
13034
#: en/help_topics/revisionspec.txt:180
13035
msgid ""
13036
" last:1 -> return the last revision\n"
13037
" last:3 -> return the revision 2 before the end.\n"
13038
msgstr ""
13039
13040
#: en/help_topics/rules.txt:1
13041
msgid ""
13042
"Rules\n"
13043
"====="
13044
msgstr ""
13045
13046
#: en/help_topics/rules.txt:7
13047
msgid ""
13048
"Rules are defined in ini file format where the sections are file glob\n"
13049
"patterns and the contents of each section are the preferences for files\n"
13050
"matching that pattern(s). For example::"
13051
msgstr ""
13052
13053
#: en/help_topics/rules.txt:11
13054
msgid ""
13055
" [name *.bat]\n"
13056
" eol = native"
13057
msgstr ""
13058
13059
#: en/help_topics/rules.txt:14
13060
msgid ""
13061
" [name *.html *.xml]\n"
13062
" keywords = xml_escape"
13063
msgstr ""
13064
13065
#: en/help_topics/rules.txt:17
13066
msgid ""
13067
"Preferences like these are useful for commands and plugins wishing to\n"
13068
"provide custom behaviour for selected files. For more information on \n"
13069
"end of line conversion see :doc:`eol-help`.\n"
13070
"Keyword support is provided by the `keywords plugin\n"
13071
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13072
msgstr ""
13073
13074
#: en/help_topics/rules.txt:23
13075
msgid ""
13076
"Files\n"
13077
"-----"
13078
msgstr ""
13079
13080
#: en/help_topics/rules.txt:26
13081
msgid ""
13082
"Default rules for all branches are defined in the optional file\n"
13083
"``BZR_HOME/rules``. "
13084
msgstr ""
13085
13086
#: en/help_topics/rules.txt:29
13087
msgid ""
13088
"Rule Patterns\n"
13089
"-------------"
13090
msgstr ""
13091
13092
#: en/help_topics/rules.txt:32
13093
msgid ""
13094
"Patterns are ordered and searching stops as soon as one matches.\n"
13095
"As a consequence, more explicit patterns should be placed towards\n"
13096
"the top of the file. Rule patterns use exactly the same conventions\n"
13097
"as ignore patterns. See :doc:`patterns-help` for details."
13098
msgstr ""
13099
13100
#: en/help_topics/rules.txt:37
13101
msgid ".. note::"
13102
msgstr ""
13103
13104
#: en/help_topics/rules.txt:39
13105
msgid ""
13106
" Patterns containing square brackets or spaces should be\n"
13107
" surrounded in quotes to ensure they are correctly parsed.\n"
13108
msgstr ""
13109
13110
#: en/help_topics/topics.txt:1
13111
msgid ""
13112
"authentication Information on configuring authentication\n"
13113
"basic Basic commands\n"
13114
"branches Information on what a branch is\n"
13115
"bugs Bug tracker settings\n"
13116
"checkouts Information on what a checkout is\n"
13117
"commands Basic help for all commands\n"
13118
"configuration Details on the configuration settings available\n"
13119
"conflict-types Types of conflicts and what to do about them\n"
13120
"content-filters Conversion of content into/from working trees\n"
13121
"criss-cross Information on criss-cross merging\n"
13122
"current-formats Current storage formats\n"
13123
"debug-flags Options to show or record debug information\n"
13124
"diverged-branches How to fix diverged branches\n"
13125
"env-variables Environment variable names and values\n"
13126
"eol Information on end-of-line handling\n"
13127
"files Information on configuration and log files\n"
13128
"formats Information on choosing a storage format\n"
13129
"global-options Options that control how Bazaar runs\n"
13130
"hidden-commands All hidden commands\n"
13131
"hooks Points at which custom processing can be added\n"
13132
"launchpad Using Bazaar with Launchpad.net\n"
13133
"location-alias Aliases for remembered locations\n"
13134
"log-formats Details on the logging formats available\n"
13135
"other-formats Experimental and deprecated storage formats\n"
13136
"patterns Information on the pattern syntax\n"
13137
"repositories Basic information on shared repositories.\n"
13138
"revisionspec Explain how to use --revision\n"
13139
"rules Information on defining rule-based preferences\n"
13140
"standalone-trees Information on what a standalone tree is\n"
13141
"standard-options Options that can be used with any command\n"
13142
"status-flags Help on status flags\n"
13143
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13144
"topics Topics list\n"
13145
"url-special-chars Special character handling in URLs\n"
13146
"urlspec Supported transport protocols\n"
13147
"working-trees Information on working trees\n"
13148
msgstr ""
13149
13150
#: en/help_topics/url-special-chars.txt:1
13151
msgid ""
13152
"Special character handling in URLs\n"
13153
"=================================="
13154
msgstr ""
13155
13156
#: en/help_topics/url-special-chars.txt:4
13157
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13158
msgstr ""
13159
13160
#: en/help_topics/url-special-chars.txt:6
13161
msgid " * Fully qualified URLs"
13162
msgstr ""
13163
13164
#: en/help_topics/url-special-chars.txt:8
13165
msgid " * File system paths, relative or absolute"
13166
msgstr ""
13167
13168
#: en/help_topics/url-special-chars.txt:10
13169
msgid ""
13170
"Internally bzr treats all locations as URLs. For any file system paths\n"
13171
"that are specified it will automatically determine the appropriate URL\n"
13172
"representation, and escape special characters where necessary."
13173
msgstr ""
13174
13175
#: en/help_topics/url-special-chars.txt:14
13176
msgid ""
13177
"There are a few characters which have special meaning in URLs and need "
13178
"careful\n"
13179
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13180
"value in URLs. Any non-ASCII characters in a file path will automatically "
13181
"be\n"
13182
"urlencoded when the path is converted to a URL."
13183
msgstr ""
13184
13185
#: en/help_topics/url-special-chars.txt:19
13186
msgid ""
13187
"URLs represent non-ASCII characters in an encoding defined by the server, "
13188
"but\n"
13189
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13190
"be\n"
13191
"generous in what it accepts as a URL and to print them in a way that\n"
13192
"will be readable."
13193
msgstr ""
13194
13195
#: en/help_topics/url-special-chars.txt:24
13196
msgid ""
13197
"For example, if you have a directory named '/tmp/%2False' these are all "
13198
"valid\n"
13199
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13200
"slash)::"
13201
msgstr ""
13202
13203
#: en/help_topics/url-special-chars.txt:27
13204
msgid ""
13205
" cd /tmp\n"
13206
" bzr log /tmp/%2False\n"
13207
" bzr log %2False\n"
13208
" bzr log file:///tmp/%252False\n"
13209
" bzr log file://localhost/tmp/%252False\n"
13210
" bzr log file:%252False"
13211
msgstr ""
13212
13213
#: en/help_topics/url-special-chars.txt:34
13214
msgid "These are valid but do not refer to the same file::"
13215
msgstr ""
13216
13217
#: en/help_topics/url-special-chars.txt:36
13218
msgid ""
13219
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13220
" bzr log %252False (refers to a file called /tmp/%252False)"
13221
msgstr ""
13222
13223
#: en/help_topics/url-special-chars.txt:39
13224
msgid ""
13225
"Comma also has special meaning in URLs, because it denotes `segment "
13226
"parameters`_"
13227
msgstr ""
13228
13229
#: en/help_topics/url-special-chars.txt:41
13230
msgid ""
13231
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13232
msgstr ""
13233
13234
#: en/help_topics/url-special-chars.txt:43
13235
msgid ""
13236
"Comma is also special in any file system paths that are specified. To use a "
13237
"literal\n"
13238
"comma in a file system path, specify a URL and URL encode the comma::"
13239
msgstr ""
13240
13241
#: en/help_topics/url-special-chars.txt:46
13242
msgid ""
13243
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13244
"\"branch\" set to \"bla\"\n"
13245
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13246
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13247
"\"branch\" set to \"bla\"\n"
13248
msgstr ""
13249
13250
#: en/help_topics/urlspec.txt:1
13251
msgid "URL Identifiers"
13252
msgstr ""
13253
13254
#: en/help_topics/urlspec.txt:3
13255
msgid "Supported URL prefixes::"
13256
msgstr ""
13257
13258
#: en/help_topics/urlspec.txt:5
13259
msgid ""
13260
" aftp:// Access using active FTP.\n"
13261
" bzr:// Fast access using the Bazaar smart server.\n"
13262
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13263
" file:// Access using the standard filesystem (default)\n"
13264
" ftp:// Access using passive FTP.\n"
13265
" http:// Read-only access of branches exported on the web.\n"
13266
" https:// Read-only access of branches exported on the web using "
13267
"SSL.\n"
13268
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13269
msgstr ""
13270
13271
#: en/help_topics/urlspec.txt:14
13272
msgid "Supported modifiers::"
13273
msgstr ""
13274
13275
#: en/help_topics/urlspec.txt:16
13276
msgid " gio+ Access using any GIO supported protocols."
13277
msgstr ""
13278
13279
#: en/help_topics/urlspec.txt:18
13280
msgid "Bazaar supports all of the standard parts within the URL::"
13281
msgstr ""
13282
13283
#: en/help_topics/urlspec.txt:20
13284
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13285
msgstr " <protocolo>://[usuário[:senha]@]servidor[:porta]/[diretório]"
13286
13287
#: en/help_topics/urlspec.txt:22
13288
msgid "allowing URLs such as::"
13289
msgstr "permitindo URLs, tais como::"
13290
13291
#: en/help_topics/urlspec.txt:24
13292
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13293
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13294
13295
#: en/help_topics/urlspec.txt:26
13296
msgid ""
13297
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13298
"with '~' as meaning that the rest of the path should be interpreted\n"
13299
"relative to the remote user's home directory. For example if the user\n"
13300
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13301
"shell.example.com, then::"
13302
msgstr ""
13303
13304
#: en/help_topics/urlspec.txt:32
13305
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13306
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13307
13308
#: en/help_topics/urlspec.txt:34
13309
msgid "would refer to ``/home/remote/myproject/trunk``."
13310
msgstr "refere-se a ``/home/remote/myproject/trunk``."
13311
13312
#: en/help_topics/urlspec.txt:36
13313
msgid ""
13314
"Many commands that accept URLs also accept location aliases too.\n"
13315
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13316
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1