/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6093.2.1 by Jonathan Riddell
add .pot file to archive
1
# SOME DESCRIPTIVE TITLE.
2
# Copyright (C) YEAR Canonical
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3
# This file is distributed under the same license as the brz package.
6093.2.1 by Jonathan Riddell
add .pot file to archive
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5
#
6
#, fuzzy
7
msgid ""
8
msgstr ""
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
9
"Project-Id-Version: brz\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
11
"POT-Creation-Date: 2019-01-14 01:26+0000\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
15
"Language: \n"
16
"MIME-Version: 1.0\n"
17
"Content-Type: text/plain; charset=CHARSET\n"
18
"Content-Transfer-Encoding: 8bit\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
7185.1.1 by Jelmer Vernooij
Update pot file.
21
#: breezy/add.py:95
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
22
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr ""
25
7185.1.1 by Jelmer Vernooij
Update pot file.
26
#: breezy/bisect.py:266
27
msgid "Find an interesting commit using a binary search."
28
msgstr ""
29
30
#: breezy/bisect.py:268
31
msgid ""
32
"Bisecting, in a nutshell, is a way to find the commit at which\n"
33
"some testable change was made, such as the introduction of a bug\n"
34
"or feature.  By identifying a version which did not have the\n"
35
"interesting change and a later version which did, a developer\n"
36
"can test for the presence of the change at various points in\n"
37
"the history, eventually ending up at the precise commit when\n"
38
"the change was first introduced."
39
msgstr ""
40
41
#: breezy/bisect.py:276
42
msgid ""
43
"This command uses subcommands to implement the search, each\n"
44
"of which changes the state of the bisection.  The\n"
45
"subcommands are:"
46
msgstr ""
47
48
#: breezy/bisect.py:280
49
msgid ""
50
"brz bisect start\n"
51
"    Start a bisect, possibly clearing out a previous bisect."
52
msgstr ""
53
54
#: breezy/bisect.py:283
55
msgid ""
56
"brz bisect yes [-r rev]\n"
57
"    The specified revision (or the current revision, if not given)\n"
58
"    has the characteristic we're looking for,"
59
msgstr ""
60
61
#: breezy/bisect.py:287
62
msgid ""
63
"brz bisect no [-r rev]\n"
64
"    The specified revision (or the current revision, if not given)\n"
65
"    does not have the characteristic we're looking for,"
66
msgstr ""
67
68
#: breezy/bisect.py:291
69
msgid ""
70
"brz bisect move -r rev\n"
71
"    Switch to a different revision manually.  Use if the bisect\n"
72
"    algorithm chooses a revision that is not suitable.  Try to\n"
73
"    move as little as possible."
74
msgstr ""
75
76
#: breezy/bisect.py:296
77
msgid ""
78
"brz bisect reset\n"
79
"    Clear out a bisection in progress."
80
msgstr ""
81
82
#: breezy/bisect.py:299
83
msgid ""
84
"brz bisect log [-o file]\n"
85
"    Output a log of the current bisection to standard output, or\n"
86
"    to the specified file."
87
msgstr ""
88
89
#: breezy/bisect.py:303
90
msgid ""
91
"brz bisect replay <logfile>\n"
92
"    Replay a previously-saved bisect log, forgetting any bisection\n"
93
"    that might be in progress."
94
msgstr ""
95
96
#: breezy/bisect.py:307
97
msgid ""
98
"brz bisect run <script>\n"
99
"    Bisect automatically using <script> to determine 'yes' or 'no'.\n"
100
"    <script> should exit with:\n"
101
"       0 for yes\n"
102
"       125 for unknown (like build failed so we could not test)\n"
103
"       anything else for no"
104
msgstr ""
105
106
# help of 'output' option of 'bisect' command
107
#: breezy/bisect.py:317
108
msgid "Write log to this file."
109
msgstr ""
110
111
#: breezy/branch.py:832
6138.4.4 by Jonathan Riddell
update bzr.pot
112
msgid "Unstacking"
113
msgstr ""
114
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
115
#: breezy/branch.py:2020
6138.4.4 by Jonathan Riddell
update bzr.pot
116
#, python-format
117
msgid "Pushed up to revision %d."
118
msgstr ""
119
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
120
#: breezy/branch.py:2022
6138.4.4 by Jonathan Riddell
update bzr.pot
121
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
122
msgid "%d tag updated."
123
msgid_plural "%d tags updated."
124
msgstr[0] ""
125
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
126
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
127
#: breezy/branch.py:2026
6138.4.4 by Jonathan Riddell
update bzr.pot
128
msgid "No new revisions or tags to push."
129
msgstr ""
130
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
131
#: breezy/branch.py:2028
6138.4.4 by Jonathan Riddell
update bzr.pot
132
msgid "No new revisions to push."
133
msgstr ""
134
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
135
#: breezy/branch.py:2048
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
136
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
137
msgid "checked branch {0} format {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
138
msgstr ""
139
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
140
#: breezy/branch.py:2051
6138.4.4 by Jonathan Riddell
update bzr.pot
141
#, python-format
142
msgid "found error:%s"
143
msgstr ""
144
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
145
#: breezy/builtins.py:259 breezy/builtins.py:3015 breezy/workingtree.py:243
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
146
#, python-format
147
msgid "Ignoring files outside view. View is %s"
148
msgstr ""
149
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
150
#: breezy/builtins.py:269
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
151
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
152
msgid "brz %s --revision takes exactly one revision identifier"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
153
msgstr ""
154
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
155
#: breezy/builtins.py:324
6093.2.1 by Jonathan Riddell
add .pot file to archive
156
msgid "Display status summary."
157
msgstr ""
158
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
159
#: breezy/builtins.py:326
6093.2.1 by Jonathan Riddell
add .pot file to archive
160
msgid ""
161
"This reports on versioned and unknown files, reporting them\n"
162
"grouped by state.  Possible states are:"
163
msgstr ""
164
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
165
#: breezy/builtins.py:329
6093.2.1 by Jonathan Riddell
add .pot file to archive
166
msgid ""
167
"added\n"
168
"    Versioned in the working copy but not in the previous revision."
169
msgstr ""
170
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
171
#: breezy/builtins.py:332
6093.2.1 by Jonathan Riddell
add .pot file to archive
172
msgid ""
173
"removed\n"
174
"    Versioned in the previous revision but removed or deleted\n"
175
"    in the working copy."
176
msgstr ""
177
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
178
#: breezy/builtins.py:336
6093.2.1 by Jonathan Riddell
add .pot file to archive
179
msgid ""
180
"renamed\n"
181
"    Path of this file changed from the previous revision;\n"
182
"    the text may also have changed.  This includes files whose\n"
183
"    parent directory was renamed."
184
msgstr ""
185
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
186
#: breezy/builtins.py:341
6093.2.1 by Jonathan Riddell
add .pot file to archive
187
msgid ""
188
"modified\n"
189
"    Text has changed since the previous revision."
190
msgstr ""
191
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
192
#: breezy/builtins.py:344
6093.2.1 by Jonathan Riddell
add .pot file to archive
193
msgid ""
194
"kind changed\n"
195
"    File kind has been changed (e.g. from file to directory)."
196
msgstr ""
197
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
198
#: breezy/builtins.py:347
6093.2.1 by Jonathan Riddell
add .pot file to archive
199
msgid ""
200
"unknown\n"
201
"    Not versioned and not matching an ignore pattern."
202
msgstr ""
203
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
204
#: breezy/builtins.py:350
6093.2.1 by Jonathan Riddell
add .pot file to archive
205
msgid ""
206
"Additionally for directories, symlinks and files with a changed\n"
207
"executable bit, Bazaar indicates their type using a trailing\n"
208
"character: '/', '@' or '*' respectively. These decorations can be\n"
209
"disabled using the '--no-classify' option."
210
msgstr ""
211
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
212
#: breezy/builtins.py:355
6093.2.1 by Jonathan Riddell
add .pot file to archive
213
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
214
"To see ignored files use 'brz ignored'.  For details on the\n"
215
"changes to file texts, use 'brz diff'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
216
msgstr ""
217
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
218
#: breezy/builtins.py:358
6093.2.1 by Jonathan Riddell
add .pot file to archive
219
msgid ""
220
"Note that --short or -S gives status flags for each item, similar\n"
221
"to Subversion's status command. To get output similar to svn -q,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
222
"use brz status -SV."
6093.2.1 by Jonathan Riddell
add .pot file to archive
223
msgstr ""
224
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
225
#: breezy/builtins.py:362
6093.2.1 by Jonathan Riddell
add .pot file to archive
226
msgid ""
227
"If no arguments are specified, the status of the entire working\n"
228
"directory is shown.  Otherwise, only the status of the specified\n"
229
"files or directories is reported.  If a directory is given, status\n"
230
"is reported for everything inside that directory."
231
msgstr ""
232
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
233
#: breezy/builtins.py:367
6093.2.1 by Jonathan Riddell
add .pot file to archive
234
msgid ""
235
"Before merges are committed, the pending merge tip revisions are\n"
236
"shown. To see all pending merge revisions, use the -v option.\n"
237
"To skip the display of pending merge information altogether, use\n"
238
"the no-pending option or specify a file/directory."
239
msgstr ""
240
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
241
#: breezy/builtins.py:372
6093.2.1 by Jonathan Riddell
add .pot file to archive
242
msgid ""
243
"To compare the working directory to a specific revision, pass a\n"
244
"single revision to the revision argument."
245
msgstr ""
246
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
247
#: breezy/builtins.py:375
6093.2.1 by Jonathan Riddell
add .pot file to archive
248
msgid ""
249
"To see which files have changed in a specific revision, or between\n"
250
"two revisions, pass a revision range to the revision argument.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
251
"This will produce the same results as calling 'brz diff --summarize'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
252
msgstr ""
253
254
# help of 'short' option of 'status' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
255
#: breezy/builtins.py:384
6093.2.1 by Jonathan Riddell
add .pot file to archive
256
msgid "Use short status indicators."
257
msgstr ""
258
259
# help of 'versioned' option of 'status' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
260
#: breezy/builtins.py:386
6093.2.1 by Jonathan Riddell
add .pot file to archive
261
msgid "Only show versioned files."
262
msgstr ""
263
264
# help of 'no-pending' option of 'status' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
265
#: breezy/builtins.py:388
6093.2.1 by Jonathan Riddell
add .pot file to archive
266
msgid "Don't show pending merges."
267
msgstr ""
268
269
# help of 'no-classify' option of 'status' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
270
#: breezy/builtins.py:390
6093.2.1 by Jonathan Riddell
add .pot file to archive
271
msgid "Do not mark object type using indicator."
272
msgstr ""
273
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
274
#: breezy/builtins.py:405
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
275
msgid "brz status --revision takes exactly one or two revision specifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
276
msgstr ""
277
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
278
#: breezy/builtins.py:449 breezy/builtins.py:5251
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
279
msgid "You can only supply one of revision_id or --revision"
280
msgstr ""
281
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
282
#: breezy/builtins.py:453 breezy/builtins.py:5254
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
283
msgid "You must supply either --revision or a revision_id"
284
msgstr ""
285
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
286
#: breezy/builtins.py:460
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
287
#, python-format
288
msgid "Repository %r does not support access to raw revision texts"
289
msgstr ""
290
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
291
#: breezy/builtins.py:471
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
292
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
293
msgid "The repository {0} contains no revision {1}."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
294
msgstr ""
295
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
296
#: breezy/builtins.py:478
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
297
msgid "You cannot specify a NULL revision."
298
msgstr ""
299
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
300
#: breezy/builtins.py:484
6093.2.1 by Jonathan Riddell
add .pot file to archive
301
msgid "Remove the working tree from a given branch/checkout."
302
msgstr ""
303
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
304
#: breezy/builtins.py:486
6093.2.1 by Jonathan Riddell
add .pot file to archive
305
msgid ""
306
"Since a lightweight checkout is little more than a working tree\n"
307
"this will refuse to run against one."
308
msgstr ""
309
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
310
#: breezy/builtins.py:489
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
311
msgid "To re-create the working tree, use \"brz checkout\"."
6093.2.1 by Jonathan Riddell
add .pot file to archive
312
msgstr ""
313
314
# help of 'force' option of 'remove-tree' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
315
#: breezy/builtins.py:495
6093.2.1 by Jonathan Riddell
add .pot file to archive
316
msgid "Remove the working tree even if it has uncommitted or shelved changes."
317
msgstr ""
318
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
319
#: breezy/builtins.py:510
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
320
msgid "No working tree to remove"
321
msgstr ""
322
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
323
#: breezy/builtins.py:513
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
324
msgid "You cannot remove the working tree of a remote path"
325
msgstr ""
326
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
327
#: breezy/builtins.py:523
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
328
msgid "You cannot remove the working tree from a lightweight checkout"
329
msgstr ""
330
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
331
#: breezy/builtins.py:564
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
332
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
333
"The tree does not appear to be corrupt. You probably want \"brz revert\" "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
334
"instead. Use \"--force\" if you are sure you want to reset the working tree."
335
msgstr ""
336
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
337
#: breezy/builtins.py:575
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
338
msgid ""
339
", the header appears corrupt, try passing -r -1 to set the state to the last "
340
"commit"
341
msgstr ""
342
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
343
#: breezy/builtins.py:580
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
344
#, python-brace-format
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
345
msgid "failed to reset the tree state{0}"
346
msgstr ""
347
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
348
#: breezy/builtins.py:584
6093.2.1 by Jonathan Riddell
add .pot file to archive
349
msgid "Show current revision number."
350
msgstr ""
351
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
352
#: breezy/builtins.py:586
6093.2.1 by Jonathan Riddell
add .pot file to archive
353
msgid "This is equal to the number of revisions on this branch."
354
msgstr ""
355
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
356
#: breezy/builtins.py:600
6252.1.1 by Vincent Ladeuil
Release 2.5b3
357
msgid "--tree and --revision can not be used together"
358
msgstr ""
359
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
360
#: breezy/builtins.py:616
6581.1.2 by Vincent Ladeuil
Update translation template.
361
msgid "Revision numbers only make sense for single revisions, not ranges"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
362
msgstr ""
363
6093.2.1 by Jonathan Riddell
add .pot file to archive
364
# help of 'tree' option of 'revno' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
365
#: breezy/builtins.py:639
6349.1.1 by Vincent Ladeuil
Release 2.5b4
366
msgid "Show revno of working tree."
6093.2.1 by Jonathan Riddell
add .pot file to archive
367
msgstr ""
368
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
369
#: breezy/builtins.py:688
6093.2.1 by Jonathan Riddell
add .pot file to archive
370
msgid "Add specified files or directories."
371
msgstr ""
372
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
373
#: breezy/builtins.py:690
6093.2.1 by Jonathan Riddell
add .pot file to archive
374
msgid ""
375
"In non-recursive mode, all the named items are added, regardless\n"
376
"of whether they were previously ignored.  A warning is given if\n"
377
"any of the named files are already versioned."
378
msgstr ""
379
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
380
#: breezy/builtins.py:694
6093.2.1 by Jonathan Riddell
add .pot file to archive
381
msgid ""
382
"In recursive mode (the default), files are treated the same way\n"
383
"but the behaviour for directories is different.  Directories that\n"
384
"are already versioned do not give a warning.  All directories,\n"
385
"whether already versioned or not, are searched for files or\n"
386
"subdirectories that are neither versioned or ignored, and these\n"
387
"are added.  This search proceeds recursively into versioned\n"
388
"directories.  If no names are given '.' is assumed."
389
msgstr ""
390
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
391
#: breezy/builtins.py:702
6252.1.1 by Vincent Ladeuil
Release 2.5b3
392
msgid ""
393
"A warning will be printed when nested trees are encountered,\n"
394
"unless they are explicitly ignored."
395
msgstr ""
396
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
397
#: breezy/builtins.py:705
6093.2.1 by Jonathan Riddell
add .pot file to archive
398
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
399
"Therefore simply saying 'brz add' will version all files that\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
400
"are currently unknown."
401
msgstr ""
402
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
403
#: breezy/builtins.py:708
6093.2.1 by Jonathan Riddell
add .pot file to archive
404
msgid ""
405
"Adding a file whose parent directory is not versioned will\n"
406
"implicitly add the parent, and so on up to the root. This means\n"
407
"you should never need to explicitly add a directory, they'll just\n"
408
"get added when you add a file in the directory."
409
msgstr ""
410
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
411
#: breezy/builtins.py:713
6093.2.1 by Jonathan Riddell
add .pot file to archive
412
msgid ""
413
"--dry-run will show which files would be added, but not actually\n"
414
"add them."
415
msgstr ""
416
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
417
#: breezy/builtins.py:716
6093.2.1 by Jonathan Riddell
add .pot file to archive
418
msgid ""
419
"--file-ids-from will try to use the file ids from the supplied path.\n"
420
"It looks up ids trying to find a matching parent directory with the\n"
421
"same filename, and then by pure path. This option is rarely needed\n"
422
"but can be useful when adding the same logical file into two\n"
423
"branches that will be merged later (without showing the two different\n"
424
"adds as a conflict). It is also useful when merging another project\n"
425
"into a subdirectory of this one."
426
msgstr ""
427
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
428
#: breezy/builtins.py:724
6093.2.1 by Jonathan Riddell
add .pot file to archive
429
msgid ""
430
"Any files matching patterns in the ignore list will not be added\n"
431
"unless they are explicitly mentioned."
432
msgstr ""
433
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
434
#: breezy/builtins.py:727
6093.2.1 by Jonathan Riddell
add .pot file to archive
435
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
436
"In recursive mode, files larger than the configuration option\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
437
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
438
"to file size."
439
msgstr ""
440
441
# help of 'no-recurse' option of 'add' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
442
#: breezy/builtins.py:734
6093.2.1 by Jonathan Riddell
add .pot file to archive
443
msgid "Don't recursively add the contents of directories."
444
msgstr ""
445
446
# help of 'file-ids-from' option of 'add' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
447
#: breezy/builtins.py:742
6093.2.1 by Jonathan Riddell
add .pot file to archive
448
msgid "Lookup file ids from this tree."
449
msgstr ""
450
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
451
#: breezy/builtins.py:779
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
452
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
453
msgid "ignored {0} matching \"{1}\"\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
454
msgstr ""
455
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
456
#: breezy/builtins.py:784
6093.2.1 by Jonathan Riddell
add .pot file to archive
457
msgid "Create a new versioned directory."
458
msgstr ""
459
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
460
#: breezy/builtins.py:786
6093.2.1 by Jonathan Riddell
add .pot file to archive
461
msgid "This is equivalent to creating the directory and then adding it."
462
msgstr ""
463
6437.2.2 by Vincent Ladeuil
Release 2.5b5
464
# help of 'parents' option of 'mkdir' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
465
#: breezy/builtins.py:793
6437.2.2 by Vincent Ladeuil
Release 2.5b5
466
msgid "No error if existing, make parent directories as needed."
467
msgstr ""
468
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
469
#: breezy/builtins.py:827
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
470
#, python-format
471
msgid "added %s\n"
472
msgstr ""
473
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
474
#: breezy/builtins.py:871
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
475
#, python-format
476
msgid "invalid kind %r specified"
477
msgstr ""
478
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
479
#: breezy/builtins.py:909
7185.1.1 by Jelmer Vernooij
Update pot file.
480
msgid "Copy a file."
481
msgstr ""
482
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
483
#: breezy/builtins.py:911
7185.1.1 by Jelmer Vernooij
Update pot file.
484
msgid "    brz cp SOURCE... DESTINATION"
485
msgstr ""
486
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
487
#: breezy/builtins.py:913
7185.1.1 by Jelmer Vernooij
Update pot file.
488
msgid ""
489
"If the last argument is a versioned directory, all the other names\n"
490
"are copied into it.  Otherwise, there must be exactly two arguments\n"
491
"and the file is copied to a new name."
492
msgstr ""
493
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
494
#: breezy/builtins.py:917
7185.1.1 by Jelmer Vernooij
Update pot file.
495
msgid ""
496
"Files cannot be copied between branches. Only files can be copied\n"
497
"at the moment."
498
msgstr ""
499
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
500
#: breezy/builtins.py:933 breezy/builtins.py:1026
7185.1.1 by Jelmer Vernooij
Update pot file.
501
msgid "missing file argument"
502
msgstr ""
503
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
504
#: breezy/builtins.py:939
7185.1.1 by Jelmer Vernooij
Update pot file.
505
msgid "can not copy root of branch"
506
msgstr ""
507
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
508
#: breezy/builtins.py:947
7185.1.1 by Jelmer Vernooij
Update pot file.
509
msgid "to copy multiple files the destination must be a versioned directory"
510
msgstr ""
511
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
512
#: breezy/builtins.py:961 breezy/builtins.py:977
7185.1.1 by Jelmer Vernooij
Update pot file.
513
#, python-format
514
msgid "Could not copy %s => %s: %s is not versioned."
515
msgstr ""
516
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
517
#: breezy/builtins.py:965
7185.1.1 by Jelmer Vernooij
Update pot file.
518
#, python-format
519
msgid "Could not copy %s => %s . %s is not versioned\\."
520
msgstr ""
521
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
522
#: breezy/builtins.py:969
7185.1.1 by Jelmer Vernooij
Update pot file.
523
#, python-format
524
msgid "Could not copy %s => %s . %s is a directory."
525
msgstr ""
526
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
527
#: breezy/builtins.py:981
7185.1.1 by Jelmer Vernooij
Update pot file.
528
#, python-format
529
msgid "Could not copy to %s: %s is not a directory."
530
msgstr ""
531
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
532
#: breezy/builtins.py:988
6093.2.1 by Jonathan Riddell
add .pot file to archive
533
msgid "Move or rename a file."
534
msgstr ""
535
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
536
#: breezy/builtins.py:990
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
537
msgid "    brz mv SOURCE... DESTINATION"
6093.2.1 by Jonathan Riddell
add .pot file to archive
538
msgstr ""
539
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
540
#: breezy/builtins.py:992
6093.2.1 by Jonathan Riddell
add .pot file to archive
541
msgid ""
542
"If the last argument is a versioned directory, all the other names\n"
543
"are moved into it.  Otherwise, there must be exactly two arguments\n"
544
"and the file is changed to a new name."
545
msgstr ""
546
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
547
#: breezy/builtins.py:996
6093.2.1 by Jonathan Riddell
add .pot file to archive
548
msgid ""
549
"If OLDNAME does not exist on the filesystem but is versioned and\n"
550
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
551
"assumes that the file has been manually moved and only updates\n"
552
"its internal inventory to reflect that change.\n"
553
"The same is valid when moving many SOURCE files to a DESTINATION."
554
msgstr ""
555
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
556
#: breezy/builtins.py:1002
6093.2.1 by Jonathan Riddell
add .pot file to archive
557
msgid "Files cannot be moved between branches."
558
msgstr ""
559
560
# help of 'after' option of 'mv' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
561
#: breezy/builtins.py:1009
6093.2.1 by Jonathan Riddell
add .pot file to archive
562
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
563
"Move only the brz identifier of the file, because the file has already been "
6093.2.1 by Jonathan Riddell
add .pot file to archive
564
"moved."
565
msgstr ""
566
567
# help of 'auto' option of 'mv' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
568
#: breezy/builtins.py:1011
6093.2.1 by Jonathan Riddell
add .pot file to archive
569
msgid "Automatically guess renames."
570
msgstr ""
571
572
# help of 'dry-run' option of 'mv' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
573
#: breezy/builtins.py:1013
6093.2.1 by Jonathan Riddell
add .pot file to archive
574
msgid "Avoid making changes when guessing renames."
575
msgstr ""
576
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
577
#: breezy/builtins.py:1022
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
578
msgid "--dry-run requires --auto."
579
msgstr ""
580
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
581
#: breezy/builtins.py:1032
6252.1.1 by Vincent Ladeuil
Release 2.5b3
582
msgid "can not move root of branch"
583
msgstr ""
584
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
585
#: breezy/builtins.py:1039
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
586
msgid "Only one path may be specified to --auto."
587
msgstr ""
588
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
589
#: breezy/builtins.py:1042
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
590
msgid "--after cannot be specified with --auto."
591
msgstr ""
592
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
593
#: breezy/builtins.py:1078
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
594
msgid "to mv multiple files the destination must be a versioned directory"
595
msgstr ""
596
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
597
#: breezy/builtins.py:1131
6093.2.1 by Jonathan Riddell
add .pot file to archive
598
msgid "Turn this branch into a mirror of another branch."
599
msgstr ""
600
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
601
#: breezy/builtins.py:1133
6093.2.1 by Jonathan Riddell
add .pot file to archive
602
msgid ""
603
"By default, this command only works on branches that have not diverged.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
604
"Branches are considered diverged if the destination branch's most recent\n"
605
"commit is one that has not been merged (directly or indirectly) into the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
606
"parent."
607
msgstr ""
608
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
609
#: breezy/builtins.py:1138
6093.2.1 by Jonathan Riddell
add .pot file to archive
610
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
611
"If branches have diverged, you can use 'brz merge' to integrate the changes\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
612
"from one into the other.  Once one branch has merged, the other should\n"
613
"be able to pull it again."
614
msgstr ""
615
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
616
#: breezy/builtins.py:1142
6093.2.1 by Jonathan Riddell
add .pot file to archive
617
msgid ""
618
"If you want to replace your local changes and just want your branch to\n"
619
"match the remote one, use pull --overwrite. This will work even if the two\n"
620
"branches have diverged."
621
msgstr ""
622
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
623
#: breezy/builtins.py:1146
6093.2.1 by Jonathan Riddell
add .pot file to archive
624
msgid ""
625
"If there is no default location set, the first pull will set it (use\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
626
"--no-remember to avoid setting it). After that, you can omit the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
627
"location to use the default.  To change the default, use --remember. The\n"
628
"value will only be saved if the remote location can be accessed."
629
msgstr ""
630
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
631
#: breezy/builtins.py:1151
6252.1.1 by Vincent Ladeuil
Release 2.5b3
632
msgid ""
633
"The --verbose option will display the revisions pulled using the log_format\n"
634
"configuration option. You can use a different format by overriding it with\n"
635
"-Olog_format=<other_format>."
636
msgstr ""
637
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
638
#: breezy/builtins.py:1155
6093.2.1 by Jonathan Riddell
add .pot file to archive
639
msgid ""
640
"Note: The location can be specified either in the form of a branch,\n"
641
"or in the form of a path to a file containing a merge directive generated\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
642
"with brz send."
6093.2.1 by Jonathan Riddell
add .pot file to archive
643
msgstr ""
644
645
# help of 'verbose' option of 'pull' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
646
#: breezy/builtins.py:1163
6093.2.1 by Jonathan Riddell
add .pot file to archive
647
msgid "Show logs of pulled revisions."
648
msgstr ""
649
650
# help of 'directory' option of 'pull' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
651
#: breezy/builtins.py:1165
6093.2.1 by Jonathan Riddell
add .pot file to archive
652
msgid ""
653
"Branch to pull into, rather than the one containing the working directory."
654
msgstr ""
655
656
# help of 'local' option of 'pull' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
657
#: breezy/builtins.py:1168
6093.2.1 by Jonathan Riddell
add .pot file to archive
658
msgid ""
659
"Perform a local pull in a bound branch.  Local pulls are not applied to the "
660
"master branch."
661
msgstr ""
662
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
663
#: breezy/builtins.py:1205
6581.1.2 by Vincent Ladeuil
Update translation template.
664
msgid "No working tree, ignoring --show-base"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
665
msgstr ""
666
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
667
#: breezy/builtins.py:1221
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
668
msgid "No pull location known or specified."
669
msgstr ""
670
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
671
#: breezy/builtins.py:1228
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
672
#, python-format
673
msgid "Using saved parent location: %s\n"
674
msgstr ""
675
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
676
#: breezy/builtins.py:1235 breezy/builtins.py:4449
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
677
msgid "Cannot use -r with merge directives or bundles"
678
msgstr ""
679
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
680
#: breezy/builtins.py:1278
6093.2.1 by Jonathan Riddell
add .pot file to archive
681
msgid "Update a mirror of this branch."
682
msgstr ""
683
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
684
#: breezy/builtins.py:1280
6093.2.1 by Jonathan Riddell
add .pot file to archive
685
msgid ""
686
"The target branch will not have its working tree populated because this\n"
687
"is both expensive, and is not supported on remote file systems."
688
msgstr ""
689
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
690
#: breezy/builtins.py:1283
6093.2.1 by Jonathan Riddell
add .pot file to archive
691
msgid ""
692
"Some smart servers or protocols *may* put the working tree in place in\n"
693
"the future."
694
msgstr ""
695
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
696
#: breezy/builtins.py:1286
6093.2.1 by Jonathan Riddell
add .pot file to archive
697
msgid ""
698
"This command only works on branches that have not diverged.  Branches are\n"
699
"considered diverged if the destination branch's most recent commit is one\n"
700
"that has not been merged (directly or indirectly) by the source branch."
701
msgstr ""
702
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
703
#: breezy/builtins.py:1290
6093.2.1 by Jonathan Riddell
add .pot file to archive
704
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
705
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
706
"the other branch completely, discarding its unmerged changes."
707
msgstr ""
708
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
709
#: breezy/builtins.py:1293
6093.2.1 by Jonathan Riddell
add .pot file to archive
710
msgid ""
711
"If you want to ensure you have the different changes in the other branch,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
712
"do a merge (see brz help merge) from the other branch, and commit that.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
713
"After that you will be able to do a push without '--overwrite'."
714
msgstr ""
715
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
716
#: breezy/builtins.py:1297
6093.2.1 by Jonathan Riddell
add .pot file to archive
717
msgid ""
718
"If there is no default push location set, the first push will set it (use\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
719
"--no-remember to avoid setting it).  After that, you can omit the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
720
"location to use the default.  To change the default, use --remember. The\n"
721
"value will only be saved if the remote location can be accessed."
722
msgstr ""
723
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
724
#: breezy/builtins.py:1302
6252.1.1 by Vincent Ladeuil
Release 2.5b3
725
msgid ""
726
"The --verbose option will display the revisions pushed using the log_format\n"
727
"configuration option. You can use a different format by overriding it with\n"
728
"-Olog_format=<other_format>."
729
msgstr ""
730
6437.2.2 by Vincent Ladeuil
Release 2.5b5
731
# help of 'directory' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
732
#: breezy/builtins.py:1313
6437.2.2 by Vincent Ladeuil
Release 2.5b5
733
msgid ""
734
"Branch to push from, rather than the one containing the working directory."
735
msgstr ""
736
6093.2.1 by Jonathan Riddell
add .pot file to archive
737
# help of 'use-existing-dir' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
738
#: breezy/builtins.py:1316
6093.2.1 by Jonathan Riddell
add .pot file to archive
739
msgid ""
740
"By default push will fail if the target directory exists, but does not "
741
"already have a control directory.  This flag will allow push to proceed."
742
msgstr ""
743
744
# help of 'stacked' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
745
#: breezy/builtins.py:1321
6093.2.1 by Jonathan Riddell
add .pot file to archive
746
msgid ""
747
"Create a stacked branch that references the public location of the parent "
748
"branch."
749
msgstr ""
750
751
# help of 'stacked-on' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
752
#: breezy/builtins.py:1324
6093.2.1 by Jonathan Riddell
add .pot file to archive
753
msgid ""
754
"Create a stacked branch that refers to another branch for the commit "
755
"history. Only the work not present in the referenced branch is included in "
756
"the branch created."
757
msgstr ""
758
6437.2.2 by Vincent Ladeuil
Release 2.5b5
759
# help of 'strict' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
760
#: breezy/builtins.py:1329
6437.2.2 by Vincent Ladeuil
Release 2.5b5
761
msgid ""
762
"Refuse to push if there are uncommitted changes in the working tree, --no-"
763
"strict disables the check."
764
msgstr ""
765
6093.2.1 by Jonathan Riddell
add .pot file to archive
766
# help of 'no-tree' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
767
#: breezy/builtins.py:1332
6093.2.1 by Jonathan Riddell
add .pot file to archive
768
msgid "Don't populate the working tree, even for protocols that support it."
769
msgstr ""
770
6535.1.1 by Vincent Ladeuil
Release 2.6b2
771
# help of 'overwrite-tags' option of 'pull' command
772
# help of 'overwrite-tags' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
773
#: breezy/builtins.py:1335
6535.1.1 by Vincent Ladeuil
Release 2.6b2
774
msgid "Overwrite tags only."
775
msgstr ""
776
7185.1.1 by Jelmer Vernooij
Update pot file.
777
# help of 'lossy' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
778
#: breezy/builtins.py:1336
7185.1.1 by Jelmer Vernooij
Update pot file.
779
msgid ""
780
"Allow lossy push, i.e. dropping metadata that can't be represented in the "
781
"target."
782
msgstr ""
783
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
784
#: breezy/builtins.py:1388
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
785
msgid "Could not determine branch to refer to."
786
msgstr ""
787
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
788
#: breezy/builtins.py:1397
6437.2.2 by Vincent Ladeuil
Release 2.5b5
789
#, python-format
790
msgid ""
791
"No push location known or specified. To push to the parent branch (at %s), "
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
792
"use 'brz push :parent'."
6437.2.2 by Vincent Ladeuil
Release 2.5b5
793
msgstr ""
794
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
795
#: breezy/builtins.py:1403
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
796
msgid "No push location known or specified."
797
msgstr ""
798
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
799
#: breezy/builtins.py:1407
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
800
#, python-format
801
msgid "Using saved push location: %s"
802
msgstr ""
803
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
804
#: breezy/builtins.py:1418
6093.2.1 by Jonathan Riddell
add .pot file to archive
805
msgid "Create a new branch that is a copy of an existing branch."
806
msgstr ""
807
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
808
#: breezy/builtins.py:1420
6093.2.1 by Jonathan Riddell
add .pot file to archive
809
msgid ""
810
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
811
"be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
812
"bar.\n"
813
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
814
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
815
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
816
"create ./foo-bar."
817
msgstr ""
818
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
819
#: breezy/builtins.py:1427
6093.2.1 by Jonathan Riddell
add .pot file to archive
820
msgid ""
821
"To retrieve the branch as of a particular revision, supply the --revision\n"
822
"parameter, as in \"branch foo/bar -r 5\"."
823
msgstr ""
824
825
# help of 'no-tree' option of 'branch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
826
#: breezy/builtins.py:1439
6093.2.1 by Jonathan Riddell
add .pot file to archive
827
msgid "Create a branch without a working-tree."
828
msgstr ""
829
830
# help of 'switch' option of 'branch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
831
#: breezy/builtins.py:1441
6093.2.1 by Jonathan Riddell
add .pot file to archive
832
msgid "Switch the checkout in the current directory to the new branch."
833
msgstr ""
834
835
# help of 'stacked' option of 'branch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
836
#: breezy/builtins.py:1444
6093.2.1 by Jonathan Riddell
add .pot file to archive
837
msgid ""
838
"Create a stacked branch referring to the source branch. The new branch will "
839
"depend on the availability of the source branch for all operations."
840
msgstr ""
841
842
# help of 'standalone' option of 'branch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
843
#: breezy/builtins.py:1448
6093.2.1 by Jonathan Riddell
add .pot file to archive
844
msgid "Do not use a shared repository, even if available."
845
msgstr ""
846
847
# help of 'use-existing-dir' option of 'branch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
848
#: breezy/builtins.py:1450
6093.2.1 by Jonathan Riddell
add .pot file to archive
849
msgid ""
850
"By default branch will fail if the target directory exists, but does not "
851
"already have a control directory.  This flag will allow branch to proceed."
852
msgstr ""
853
854
# help of 'bind' option of 'branch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
855
#: breezy/builtins.py:1455
6093.2.1 by Jonathan Riddell
add .pot file to archive
856
msgid "Bind new branch to from location."
857
msgstr ""
858
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
859
#: breezy/builtins.py:1492
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
860
#, python-format
861
msgid "Target directory \"%s\" already exists."
862
msgstr ""
863
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
864
#: breezy/builtins.py:1504
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
865
#, python-format
866
msgid "Parent of \"%s\" does not exist."
867
msgstr ""
868
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
869
#: breezy/builtins.py:1522
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
870
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
871
msgid "The branch {0} has no revision {1}."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
872
msgstr ""
873
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
874
#: breezy/builtins.py:1538 breezy/push.py:54
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
875
#, python-format
876
msgid "Created new stacked branch referring to %s."
877
msgstr ""
878
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
879
#: breezy/builtins.py:1544
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
880
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
881
msgid "Branched %d revision."
882
msgid_plural "Branched %d revisions."
883
msgstr[0] ""
884
msgstr[1] ""
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
885
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
886
#: breezy/builtins.py:1548 breezy/push.py:57
7185.1.1 by Jelmer Vernooij
Update pot file.
887
msgid "Created new branch."
888
msgstr ""
889
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
890
#: breezy/builtins.py:1553
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
891
#, python-format
892
msgid "New branch bound to %s"
893
msgstr ""
894
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
895
#: breezy/builtins.py:1558
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
896
#, python-format
897
msgid "Switched to branch: %s"
898
msgstr ""
899
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
900
#: breezy/builtins.py:1563
6093.2.1 by Jonathan Riddell
add .pot file to archive
901
msgid "List the branches available at the current location."
902
msgstr ""
903
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
904
#: breezy/builtins.py:1565
6252.1.1 by Vincent Ladeuil
Release 2.5b3
905
msgid ""
906
"This command will print the names of all the branches at the current\n"
907
"location."
908
msgstr ""
909
910
# help of 'recursive' option of 'branches' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
911
#: breezy/builtins.py:1572
6252.1.1 by Vincent Ladeuil
Release 2.5b3
912
msgid ""
913
"Recursively scan for branches rather than just looking in the specified "
914
"location."
915
msgstr ""
916
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
917
#: breezy/builtins.py:1601
6437.2.2 by Vincent Ladeuil
Release 2.5b5
918
msgid "(default)"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
919
msgstr ""
920
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
921
#: breezy/builtins.py:1613
6093.2.1 by Jonathan Riddell
add .pot file to archive
922
msgid "Create a new checkout of an existing branch."
923
msgstr ""
924
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
925
#: breezy/builtins.py:1615
6093.2.1 by Jonathan Riddell
add .pot file to archive
926
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
927
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree\n"
928
"for the branch found in '.'. This is useful if you have removed the working\n"
929
"tree or if it was never created - i.e. if you pushed the branch to its\n"
930
"current location using SFTP."
6093.2.1 by Jonathan Riddell
add .pot file to archive
931
msgstr ""
932
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
933
#: breezy/builtins.py:1620
6093.2.1 by Jonathan Riddell
add .pot file to archive
934
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
935
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION\n"
936
"will be used.  In other words, \"checkout ../foo/bar\" will attempt to "
937
"create\n"
938
"./bar.  If the BRANCH_LOCATION has no / or path separator embedded, the\n"
939
"TO_LOCATION is derived from the BRANCH_LOCATION by stripping a leading\n"
940
"scheme or drive identifier, if any. For example, \"checkout lp:foo-bar\" "
6093.2.1 by Jonathan Riddell
add .pot file to archive
941
"will\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
942
"attempt to create ./foo-bar."
6093.2.1 by Jonathan Riddell
add .pot file to archive
943
msgstr ""
944
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
945
#: breezy/builtins.py:1627
6093.2.1 by Jonathan Riddell
add .pot file to archive
946
msgid ""
947
"To retrieve the branch as of a particular revision, supply the --revision\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
948
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be\n"
949
"immediately out of date [so you cannot commit] but it may be useful (i.e.\n"
950
"to examine old code.)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
951
msgstr ""
952
953
# help of 'lightweight' option of 'checkout' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
954
#: breezy/builtins.py:1637
6093.2.1 by Jonathan Riddell
add .pot file to archive
955
msgid ""
956
"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
957
"the branch for every operation.  Normal checkouts can perform common "
958
"operations like diff and status without such access, and also support local "
959
"commits."
960
msgstr ""
961
962
# help of 'files-from' option of 'branch' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
963
# help of 'files-from' option of 'checkout' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
964
#: breezy/builtins.py:1644
6093.2.1 by Jonathan Riddell
add .pot file to archive
965
msgid "Get file contents from this tree."
966
msgstr ""
967
968
# help of 'hardlink' option of 'branch' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
969
# help of 'hardlink' option of 'checkout' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
970
#: breezy/builtins.py:1646
6093.2.1 by Jonathan Riddell
add .pot file to archive
971
msgid "Hard-link working tree files where possible."
972
msgstr ""
973
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
974
#: breezy/builtins.py:1686
6093.2.1 by Jonathan Riddell
add .pot file to archive
975
msgid ""
976
"Show list of renamed files.\n"
977
"    "
978
msgstr ""
979
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
980
#: breezy/builtins.py:1714
6252.1.1 by Vincent Ladeuil
Release 2.5b3
981
msgid "Update a working tree to a new revision."
982
msgstr ""
983
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
984
#: breezy/builtins.py:1716
6252.1.1 by Vincent Ladeuil
Release 2.5b3
985
msgid ""
986
"This will perform a merge of the destination revision (the tip of the\n"
987
"branch, or the specified revision) into the working tree, and then make\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
988
"that revision the basis revision for the working tree."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
989
msgstr ""
990
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
991
#: breezy/builtins.py:1720
6252.1.1 by Vincent Ladeuil
Release 2.5b3
992
msgid ""
993
"You can use this to visit an older revision, or to update a working tree\n"
994
"that is out of date from its branch."
995
msgstr ""
996
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
997
#: breezy/builtins.py:1723
6252.1.1 by Vincent Ladeuil
Release 2.5b3
998
msgid ""
999
"If there are any uncommitted changes in the tree, they will be carried\n"
1000
"across and remain as uncommitted changes after the update.  To discard\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1001
"these changes, use 'brz revert'.  The uncommitted changes may conflict\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1002
"with the changes brought in by the change in basis revision."
1003
msgstr ""
1004
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1005
#: breezy/builtins.py:1728
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1006
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1007
"If the tree's branch is bound to a master branch, brz will also update\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1008
"the branch from the master."
1009
msgstr ""
1010
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1011
#: breezy/builtins.py:1731
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1012
msgid ""
1013
"You cannot update just a single file or directory, because each Bazaar\n"
1014
"working tree has just a single basis revision.  If you want to restore a\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1015
"file that has been removed locally, use 'brz revert' instead of 'brz\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1016
"update'.  If you want to restore a file to its state in a previous\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1017
"revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1018
"out the old content of that file to a new location."
1019
msgstr ""
1020
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1021
#: breezy/builtins.py:1738
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1022
msgid ""
1023
"The 'dir' argument, if given, must be the location of the root of a\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1024
"working tree to update.  By default, the working tree that contains the\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1025
"current working directory is used."
1026
msgstr ""
1027
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1028
#: breezy/builtins.py:1754
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1029
msgid "brz update --revision takes exactly one revision"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1030
msgstr ""
1031
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1032
#: breezy/builtins.py:1762
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1033
msgid "brz update can only update a whole tree, not a file or subdirectory"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1034
msgstr ""
1035
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1036
#: breezy/builtins.py:1793
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1037
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
1038
msgid "Tree is up to date at revision {0} of branch {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1039
msgstr ""
1040
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1041
#: breezy/builtins.py:1809
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1042
#, python-format
1043
msgid ""
1044
"branch has no revision %s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1045
"brz update --revision only works for a revision in the branch history"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1046
msgstr ""
1047
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1048
#: breezy/builtins.py:1815
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1049
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
1050
msgid "Updated to revision {0} of branch {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1051
msgstr ""
1052
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1053
#: breezy/builtins.py:1819
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1054
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1055
"Your local commits will now show as pending merges with 'brz status', and "
1056
"can be committed with 'brz commit'."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1057
msgstr ""
1058
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1059
#: breezy/builtins.py:1828
6093.2.1 by Jonathan Riddell
add .pot file to archive
1060
msgid "Show information about a working tree, branch or repository."
1061
msgstr ""
1062
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1063
#: breezy/builtins.py:1830
6093.2.1 by Jonathan Riddell
add .pot file to archive
1064
msgid ""
1065
"This command will show all known locations and formats associated to the\n"
1066
"tree, branch or repository."
1067
msgstr ""
1068
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1069
#: breezy/builtins.py:1833
6093.2.1 by Jonathan Riddell
add .pot file to archive
1070
msgid ""
1071
"In verbose mode, statistical information is included with each report.\n"
1072
"To see extended statistic information, use a verbosity level of 2 or\n"
1073
"higher by specifying the verbose option multiple times, e.g. -vv."
1074
msgstr ""
1075
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1076
#: breezy/builtins.py:1837
6093.2.1 by Jonathan Riddell
add .pot file to archive
1077
msgid "Branches and working trees will also report any missing revisions."
1078
msgstr ""
1079
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1080
#: breezy/builtins.py:1839 breezy/builtins.py:3750 breezy/builtins.py:4917
1081
#: breezy/builtins.py:6519 breezy/plugins/fastimport/cmds.py:211
1082
#: breezy/plugins/fastimport/cmds.py:417 breezy/plugins/propose/cmds.py:274
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1083
msgid ":Examples:"
1084
msgstr ""
1085
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1086
#: breezy/builtins.py:1841
6093.2.1 by Jonathan Riddell
add .pot file to archive
1087
msgid "  Display information on the format and related locations:"
1088
msgstr ""
1089
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1090
#: breezy/builtins.py:1843
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1091
msgid "    brz info"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1092
msgstr ""
1093
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1094
#: breezy/builtins.py:1845
6093.2.1 by Jonathan Riddell
add .pot file to archive
1095
msgid ""
1096
"  Display the above together with extended format information and\n"
1097
"  basic statistics (like the number of files in the working tree and\n"
1098
"  number of revisions in the branch and repository):"
1099
msgstr ""
1100
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1101
#: breezy/builtins.py:1849
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1102
msgid "    brz info -v"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1103
msgstr ""
1104
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1105
#: breezy/builtins.py:1851
6093.2.1 by Jonathan Riddell
add .pot file to archive
1106
msgid "  Display the above together with number of committers to the branch:"
1107
msgstr ""
1108
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1109
#: breezy/builtins.py:1853
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1110
msgid "    brz info -vv"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1111
msgstr ""
1112
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1113
#: breezy/builtins.py:1872
6093.2.1 by Jonathan Riddell
add .pot file to archive
1114
msgid "Remove files or directories."
1115
msgstr ""
1116
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1117
#: breezy/builtins.py:1874
6093.2.1 by Jonathan Riddell
add .pot file to archive
1118
msgid ""
1119
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1120
"delete them if they can easily be recovered using revert otherwise they\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
1121
"will be backed up (adding an extension of the form .~#~). If no options or\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1122
"parameters are given Bazaar will scan for files that are being tracked by\n"
1123
"Bazaar but missing in your tree and stop tracking them for you."
1124
msgstr ""
1125
1126
# help of 'new' option of 'remove' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1127
#: breezy/builtins.py:1883
6093.2.1 by Jonathan Riddell
add .pot file to archive
1128
msgid "Only remove files that have never been committed."
1129
msgstr ""
1130
1131
# help of 'file-deletion-strategy' option of 'remove' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1132
#: breezy/builtins.py:1885
6093.2.1 by Jonathan Riddell
add .pot file to archive
1133
msgid "The file deletion mode to be used."
1134
msgstr ""
1135
1136
# title of 'file-deletion-strategy' option of 'remove' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1137
#: breezy/builtins.py:1886
6093.2.1 by Jonathan Riddell
add .pot file to archive
1138
msgid "Deletion Strategy"
1139
msgstr ""
1140
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1141
# help of 'file-deletion-strategy=safe' option of 'remove' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1142
#: breezy/builtins.py:1887
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1143
msgid "Backup changed files (default)."
1144
msgstr ""
1145
1146
# help of 'file-deletion-strategy=keep' option of 'remove' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1147
#: breezy/builtins.py:1888
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1148
msgid "Delete from brz but leave the working copy."
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1149
msgstr ""
1150
1151
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1152
#: breezy/builtins.py:1889
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1153
msgid "Don't backup changed files."
1154
msgstr ""
1155
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1156
#: breezy/builtins.py:1910
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1157
msgid "No matching files."
1158
msgstr ""
1159
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1160
#: breezy/builtins.py:1927
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1161
msgid "Reconcile brz metadata in a branch."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1162
msgstr ""
1163
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1164
#: breezy/builtins.py:1929
6093.2.1 by Jonathan Riddell
add .pot file to archive
1165
msgid ""
1166
"This can correct data mismatches that may have been caused by\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1167
"previous ghost operations or brz upgrades. You should only\n"
1168
"need to run this command if 'brz check' or a brz developer\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1169
"advises you to run it."
1170
msgstr ""
1171
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1172
#: breezy/builtins.py:1934
6093.2.1 by Jonathan Riddell
add .pot file to archive
1173
msgid ""
1174
"If a second branch is provided, cross-branch reconciliation is\n"
1175
"also attempted, which will check that data like the tree root\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1176
"id which was not present in very early brz versions is represented\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1177
"correctly in both branches."
1178
msgstr ""
1179
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1180
#: breezy/builtins.py:1939
6093.2.1 by Jonathan Riddell
add .pot file to archive
1181
msgid ""
1182
"At the same time it is run it may recompress data resulting in\n"
1183
"a potential saving in disk space or performance gain."
1184
msgstr ""
1185
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1186
#: breezy/builtins.py:1942
6093.2.1 by Jonathan Riddell
add .pot file to archive
1187
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1188
msgstr ""
1189
7185.1.1 by Jelmer Vernooij
Update pot file.
1190
# help of 'format=git-bare' option of 'init' command
1191
# help of 'format=git-bare' option of 'init-repository' command
1192
# help of 'format=git-bare' option of 'upgrade' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1193
#: breezy/builtins.py:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
7185.1.1 by Jelmer Vernooij
Update pot file.
1194
msgid "Bare GIT repository (no working tree)."
1195
msgstr ""
1196
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1197
# help of 'format=2a' option of 'init' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1198
# help of 'format=bzr' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1199
# help of 'format=default' option of 'init' command
1200
# help of 'format=2a' option of 'init-repository' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1201
# help of 'format=bzr' option of 'init-repository' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1202
# help of 'format=default' option of 'init-repository' command
1203
# help of 'format=2a' option of 'upgrade' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1204
# help of 'format=bzr' option of 'upgrade' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1205
# help of 'format=default' option of 'upgrade' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1206
#: breezy/builtins.py:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
7185.1.1 by Jelmer Vernooij
Update pot file.
1207
msgid "Format for the bzr 2.0 series.\n"
1208
msgstr ""
1209
1210
# help of 'format=git' option of 'init' command
1211
# help of 'format=git' option of 'init-repository' command
1212
# help of 'format=git' option of 'upgrade' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1213
#: breezy/builtins.py:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
7185.1.1 by Jelmer Vernooij
Update pot file.
1214
msgid "GIT repository."
1215
msgstr ""
1216
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1217
#: breezy/builtins.py:2010
6093.2.1 by Jonathan Riddell
add .pot file to archive
1218
msgid "Make a directory into a versioned branch."
1219
msgstr ""
1220
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1221
#: breezy/builtins.py:2012
6093.2.1 by Jonathan Riddell
add .pot file to archive
1222
msgid ""
1223
"Use this to create an empty branch, or before importing an\n"
1224
"existing project."
1225
msgstr ""
1226
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1227
#: breezy/builtins.py:2015
6093.2.1 by Jonathan Riddell
add .pot file to archive
1228
msgid ""
1229
"If there is a repository in a parent directory of the location, then\n"
1230
"the history of the branch will be stored in the repository.  Otherwise\n"
1231
"init creates a standalone branch which carries its own history\n"
1232
"in the .bzr directory."
1233
msgstr ""
1234
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1235
#: breezy/builtins.py:2020
6093.2.1 by Jonathan Riddell
add .pot file to archive
1236
msgid ""
1237
"If there is already a branch at the location but it has no working tree,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1238
"the tree can be populated with 'brz checkout'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1239
msgstr ""
1240
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1241
#: breezy/builtins.py:2023
6093.2.1 by Jonathan Riddell
add .pot file to archive
1242
msgid "Recipe for importing a tree of files::"
1243
msgstr ""
1244
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1245
#: breezy/builtins.py:2025
6093.2.1 by Jonathan Riddell
add .pot file to archive
1246
msgid ""
1247
"    cd ~/project\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1248
"    brz init\n"
1249
"    brz add .\n"
1250
"    brz status\n"
1251
"    brz commit -m \"imported project\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
1252
msgstr ""
1253
1254
# help of 'create-prefix' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1255
# help of 'create-prefix' option of 'push' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1256
#: breezy/builtins.py:2036
6093.2.1 by Jonathan Riddell
add .pot file to archive
1257
msgid "Create the path leading up to the branch if it does not already exist."
1258
msgstr ""
1259
1260
# help of 'format' option of 'init' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1261
#: breezy/builtins.py:2039
7185.1.1 by Jelmer Vernooij
Update pot file.
1262
msgid "Specify a format for this branch. See \"help formats\" for a full list."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1263
msgstr ""
1264
1265
# help of 'append-revisions-only' option of 'init' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1266
#: breezy/builtins.py:2048
6093.2.1 by Jonathan Riddell
add .pot file to archive
1267
msgid "Never change revnos or the existing log.  Append revisions to it only."
1268
msgstr ""
1269
1270
# help of 'no-tree' option of 'init' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1271
#: breezy/builtins.py:2051
6093.2.1 by Jonathan Riddell
add .pot file to archive
1272
msgid "Create a branch without a working tree."
1273
msgstr ""
1274
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1275
#: breezy/builtins.py:2072 breezy/push.py:112
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1276
#, python-format
1277
msgid ""
1278
"Parent directory of %s does not exist.\n"
1279
"You may supply --create-prefix to create all leading parent directories."
1280
msgstr ""
1281
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1282
#: breezy/builtins.py:2107
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1283
msgid ""
1284
"This branch format cannot be set to append-revisions-only.  Try --default."
1285
msgstr ""
1286
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1287
#: breezy/builtins.py:2118
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1288
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
1289
msgid "Created a {0} (format: {1})\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1290
msgstr ""
1291
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1292
#: breezy/builtins.py:2127
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1293
#, python-format
1294
msgid "Using shared repository: %s\n"
1295
msgstr ""
1296
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1297
#: breezy/builtins.py:2131
6093.2.1 by Jonathan Riddell
add .pot file to archive
1298
msgid "Create a shared repository for branches to share storage space."
1299
msgstr ""
1300
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1301
#: breezy/builtins.py:2133
6093.2.1 by Jonathan Riddell
add .pot file to archive
1302
msgid ""
1303
"New branches created under the repository directory will store their\n"
1304
"revisions in the repository, not in the branch directory.  For branches\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1305
"with shared history, this reduces the amount of storage needed and\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1306
"speeds up the creation of new branches."
1307
msgstr ""
1308
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1309
#: breezy/builtins.py:2138
6093.2.1 by Jonathan Riddell
add .pot file to archive
1310
msgid ""
1311
"If the --no-trees option is given then the branches in the repository\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1312
"will not have working trees by default.  They will still exist as\n"
1313
"directories on disk, but they will not have separate copies of the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1314
"files at a certain revision.  This can be useful for repositories that\n"
1315
"store branches which are interacted with through checkouts or remote\n"
1316
"branches, such as on a server."
1317
msgstr ""
1318
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1319
#: breezy/builtins.py:2145
6093.2.1 by Jonathan Riddell
add .pot file to archive
1320
msgid ""
1321
":Examples:\n"
1322
"    Create a shared repository holding just branches::"
1323
msgstr ""
1324
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1325
#: breezy/builtins.py:2148
6093.2.1 by Jonathan Riddell
add .pot file to archive
1326
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1327
"        brz init-repo --no-trees repo\n"
1328
"        brz init repo/trunk"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1329
msgstr ""
1330
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1331
#: breezy/builtins.py:2151
6093.2.1 by Jonathan Riddell
add .pot file to archive
1332
msgid "    Make a lightweight checkout elsewhere::"
1333
msgstr ""
1334
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1335
#: breezy/builtins.py:2153
6093.2.1 by Jonathan Riddell
add .pot file to archive
1336
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1337
"        brz checkout --lightweight repo/trunk trunk-checkout\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1338
"        cd trunk-checkout\n"
1339
"        (add files here)"
1340
msgstr ""
1341
1342
# help of 'format' option of 'init-repository' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1343
#: breezy/builtins.py:2161
6093.2.1 by Jonathan Riddell
add .pot file to archive
1344
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1345
"Specify a format for this repository. See \"brz help formats\" for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1346
msgstr ""
1347
1348
# title of 'format' option of 'init-repository' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1349
# title of 'format' option of 'fast-import' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1350
#: breezy/builtins.py:2167 breezy/plugins/fastimport/cmds.py:287
6093.2.1 by Jonathan Riddell
add .pot file to archive
1351
msgid "Repository format"
1352
msgstr ""
1353
1354
# help of 'no-trees' option of 'init-repository' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1355
#: breezy/builtins.py:2169
6093.2.1 by Jonathan Riddell
add .pot file to archive
1356
msgid "Branches in the repository will default to not having a working tree."
1357
msgstr ""
1358
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1359
#: breezy/builtins.py:2200
6093.2.1 by Jonathan Riddell
add .pot file to archive
1360
msgid "Show differences in the working tree, between revisions or branches."
1361
msgstr ""
1362
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1363
#: breezy/builtins.py:2202
6093.2.1 by Jonathan Riddell
add .pot file to archive
1364
msgid ""
1365
"If no arguments are given, all changes for the current tree are listed.\n"
1366
"If files are given, only the changes in those files are listed.\n"
1367
"Remote and multiple branches can be compared by using the --old and\n"
1368
"--new options. If not provided, the default for both is derived from\n"
1369
"the first argument, if any, or the current tree if no arguments are\n"
1370
"given."
1371
msgstr ""
1372
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1373
#: breezy/builtins.py:2209
6093.2.1 by Jonathan Riddell
add .pot file to archive
1374
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1375
"\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1376
"produces patches suitable for \"patch -p1\"."
1377
msgstr ""
1378
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1379
#: breezy/builtins.py:2212
6093.2.1 by Jonathan Riddell
add .pot file to archive
1380
msgid ""
1381
"Note that when using the -r argument with a range of revisions, the\n"
1382
"differences are computed between the two specified revisions.  That\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1383
"is, the command does not show the changes introduced by the first\n"
1384
"revision in the range.  This differs from the interpretation of\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1385
"revision ranges used by \"brz log\" which includes the first revision\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1386
"in the range."
1387
msgstr ""
1388
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1389
#: breezy/builtins.py:2219
6093.2.1 by Jonathan Riddell
add .pot file to archive
1390
msgid ""
1391
":Exit values:\n"
1392
"    1 - changed\n"
1393
"    2 - unrepresentable changes\n"
1394
"    3 - error\n"
1395
"    0 - no change"
1396
msgstr ""
1397
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1398
#: breezy/builtins.py:2225
6093.2.1 by Jonathan Riddell
add .pot file to archive
1399
msgid ""
1400
":Examples:\n"
1401
"    Shows the difference in the working tree versus the last commit::"
1402
msgstr ""
1403
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1404
#: breezy/builtins.py:2228
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1405
msgid "        brz diff"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1406
msgstr ""
1407
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1408
#: breezy/builtins.py:2230
6093.2.1 by Jonathan Riddell
add .pot file to archive
1409
msgid "    Difference between the working tree and revision 1::"
1410
msgstr ""
1411
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1412
#: breezy/builtins.py:2232
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1413
msgid "        brz diff -r1"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1414
msgstr ""
1415
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1416
#: breezy/builtins.py:2234
6093.2.1 by Jonathan Riddell
add .pot file to archive
1417
msgid "    Difference between revision 3 and revision 1::"
1418
msgstr ""
1419
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1420
#: breezy/builtins.py:2236
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1421
msgid "        brz diff -r1..3"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1422
msgstr ""
1423
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1424
#: breezy/builtins.py:2238
6093.2.1 by Jonathan Riddell
add .pot file to archive
1425
msgid "    Difference between revision 3 and revision 1 for branch xxx::"
1426
msgstr ""
1427
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1428
#: breezy/builtins.py:2240
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1429
msgid "        brz diff -r1..3 xxx"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1430
msgstr ""
1431
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1432
#: breezy/builtins.py:2242
6093.2.1 by Jonathan Riddell
add .pot file to archive
1433
msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
1434
msgstr ""
1435
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1436
#: breezy/builtins.py:2244
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1437
msgid "        brz diff -c2"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1438
msgstr ""
1439
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1440
#: breezy/builtins.py:2246
7185.1.1 by Jelmer Vernooij
Update pot file.
1441
msgid "    To see the changes introduced by revision X::"
1442
msgstr ""
1443
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1444
#: breezy/builtins.py:2248
7185.1.1 by Jelmer Vernooij
Update pot file.
1445
msgid "        brz diff -cX"
1446
msgstr ""
1447
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1448
#: breezy/builtins.py:2250
6093.2.1 by Jonathan Riddell
add .pot file to archive
1449
msgid ""
1450
"    Note that in the case of a merge, the -c option shows the changes\n"
1451
"    compared to the left hand parent. To see the changes against\n"
1452
"    another parent, use::"
1453
msgstr ""
1454
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1455
#: breezy/builtins.py:2254
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1456
msgid "        brz diff -r<chosen_parent>..X"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1457
msgstr ""
1458
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1459
#: breezy/builtins.py:2256
6093.2.1 by Jonathan Riddell
add .pot file to archive
1460
msgid ""
1461
"    The changes between the current revision and the previous revision\n"
1462
"    (equivalent to -c-1 and -r-2..-1)"
1463
msgstr ""
1464
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1465
#: breezy/builtins.py:2259
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1466
msgid "        brz diff -r-2.."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1467
msgstr ""
1468
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1469
#: breezy/builtins.py:2261
6093.2.1 by Jonathan Riddell
add .pot file to archive
1470
msgid "    Show just the differences for file NEWS::"
1471
msgstr ""
1472
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1473
#: breezy/builtins.py:2263
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1474
msgid "        brz diff NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1475
msgstr ""
1476
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1477
#: breezy/builtins.py:2265
6093.2.1 by Jonathan Riddell
add .pot file to archive
1478
msgid "    Show the differences in working tree xxx for file NEWS::"
1479
msgstr ""
1480
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1481
#: breezy/builtins.py:2267
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1482
msgid "        brz diff xxx/NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1483
msgstr ""
1484
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1485
#: breezy/builtins.py:2269
6093.2.1 by Jonathan Riddell
add .pot file to archive
1486
msgid "    Show the differences from branch xxx to this working tree:"
1487
msgstr ""
1488
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1489
#: breezy/builtins.py:2271
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1490
msgid "        brz diff --old xxx"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1491
msgstr ""
1492
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1493
#: breezy/builtins.py:2273
6093.2.1 by Jonathan Riddell
add .pot file to archive
1494
msgid "    Show the differences between two branches for file NEWS::"
1495
msgstr ""
1496
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1497
#: breezy/builtins.py:2275
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1498
msgid "        brz diff --old xxx --new yyy NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1499
msgstr ""
1500
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1501
#: breezy/builtins.py:2277
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1502
msgid "    Same as 'brz diff' but prefix paths with old/ and new/::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1503
msgstr ""
1504
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1505
#: breezy/builtins.py:2279
7185.1.1 by Jelmer Vernooij
Update pot file.
1506
msgid "        brz diff --prefix old/:new/"
1507
msgstr ""
1508
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1509
#: breezy/builtins.py:2281
7185.1.1 by Jelmer Vernooij
Update pot file.
1510
msgid "    Show the differences using a custom diff program with options::"
1511
msgstr ""
1512
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1513
#: breezy/builtins.py:2283
7185.1.1 by Jelmer Vernooij
Update pot file.
1514
msgid "        brz diff --using /usr/bin/diff --diff-options -wu"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1515
msgstr ""
1516
1517
# help of 'diff-options' option of 'diff' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1518
#: breezy/builtins.py:2289
6093.2.1 by Jonathan Riddell
add .pot file to archive
1519
msgid "Pass these options to the external diff program."
1520
msgstr ""
1521
1522
# help of 'prefix' option of 'diff' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1523
#: breezy/builtins.py:2292
6093.2.1 by Jonathan Riddell
add .pot file to archive
1524
msgid ""
1525
"Set prefixes added to old and new filenames, as two values separated by a "
1526
"colon. (eg \"old/:new/\")."
1527
msgstr ""
1528
1529
# help of 'old' option of 'diff' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1530
#: breezy/builtins.py:2295
6093.2.1 by Jonathan Riddell
add .pot file to archive
1531
msgid "Branch/tree to compare from."
1532
msgstr ""
1533
1534
# help of 'new' option of 'diff' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1535
#: breezy/builtins.py:2299
6093.2.1 by Jonathan Riddell
add .pot file to archive
1536
msgid "Branch/tree to compare to."
1537
msgstr ""
1538
1539
# help of 'using' option of 'diff' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1540
#: breezy/builtins.py:2305
6093.2.1 by Jonathan Riddell
add .pot file to archive
1541
msgid "Use this command to compare files."
1542
msgstr ""
1543
1544
# help of 'format' option of 'diff' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1545
#: breezy/builtins.py:2310
6093.2.1 by Jonathan Riddell
add .pot file to archive
1546
msgid "Diff format to use."
1547
msgstr ""
1548
1549
# title of 'format' option of 'diff' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1550
#: breezy/builtins.py:2312
6093.2.1 by Jonathan Riddell
add .pot file to archive
1551
msgid "Diff format"
1552
msgstr ""
1553
6581.1.2 by Vincent Ladeuil
Update translation template.
1554
# help of 'context' option of 'diff' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1555
#: breezy/builtins.py:2314
6581.1.2 by Vincent Ladeuil
Update translation template.
1556
msgid "How many lines of context to show."
1557
msgstr ""
1558
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1559
#: breezy/builtins.py:2339
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1560
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1561
msgstr ""
1562
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1563
#: breezy/builtins.py:2343
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1564
msgid "brz diff --revision takes exactly one or two revision specifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1565
msgstr ""
1566
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1567
#: breezy/builtins.py:2348 breezy/builtins.py:2744 breezy/builtins.py:2752
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1568
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
1569
msgid "{0} and {1} are mutually exclusive"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1570
msgstr ""
1571
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1572
#: breezy/builtins.py:2368
6093.2.1 by Jonathan Riddell
add .pot file to archive
1573
msgid ""
1574
"List files deleted in the working tree.\n"
1575
"    "
1576
msgstr ""
1577
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1578
#: breezy/builtins.py:2443
6581.1.2 by Vincent Ladeuil
Update translation template.
1579
msgid "Show the tree root directory."
1580
msgstr ""
1581
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1582
#: breezy/builtins.py:2445
6093.2.1 by Jonathan Riddell
add .pot file to archive
1583
msgid ""
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1584
"The root is the nearest enclosing directory with a control\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1585
"directory."
1586
msgstr ""
1587
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1588
#: breezy/builtins.py:2461
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1589
msgid "The limit argument must be an integer."
1590
msgstr ""
1591
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1592
#: breezy/builtins.py:2469
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1593
msgid "The levels argument must be an integer."
1594
msgstr ""
1595
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1596
#: breezy/builtins.py:2474
6581.1.2 by Vincent Ladeuil
Update translation template.
1597
msgid "Show historical log for a branch or subset of a branch."
1598
msgstr ""
1599
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1600
#: breezy/builtins.py:2476
6093.2.1 by Jonathan Riddell
add .pot file to archive
1601
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1602
"log is brz's default tool for exploring the history of a branch.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1603
"The branch to use is taken from the first parameter. If no parameters\n"
1604
"are given, the branch containing the working directory is logged.\n"
1605
"Here are some simple examples::"
1606
msgstr ""
1607
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1608
#: breezy/builtins.py:2481
6093.2.1 by Jonathan Riddell
add .pot file to archive
1609
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1610
"  brz log                       log the current branch\n"
1611
"  brz log foo.py                log a file in its branch\n"
1612
"  brz log http://server/branch  log a branch on a server"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1613
msgstr ""
1614
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1615
#: breezy/builtins.py:2485
6093.2.1 by Jonathan Riddell
add .pot file to archive
1616
msgid ""
1617
"The filtering, ordering and information shown for each revision can\n"
1618
"be controlled as explained below. By default, all revisions are\n"
1619
"shown sorted (topologically) so that newer revisions appear before\n"
1620
"older ones and descendants always appear before ancestors. If displayed,\n"
1621
"merged revisions are shown indented under the revision in which they\n"
1622
"were merged."
1623
msgstr ""
1624
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1625
#: breezy/builtins.py:2492
6581.1.2 by Vincent Ladeuil
Update translation template.
1626
msgid ":Output control:"
1627
msgstr ""
1628
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1629
#: breezy/builtins.py:2494
6093.2.1 by Jonathan Riddell
add .pot file to archive
1630
msgid ""
1631
"  The log format controls how information about each revision is\n"
1632
"  displayed. The standard log formats are called ``long``, ``short``\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1633
"  and ``line``. The default is long. See ``brz help log-formats``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1634
"  for more details on log formats."
1635
msgstr ""
1636
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1637
#: breezy/builtins.py:2499
6093.2.1 by Jonathan Riddell
add .pot file to archive
1638
msgid ""
1639
"  The following options can be used to control what information is\n"
1640
"  displayed::"
1641
msgstr ""
1642
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1643
#: breezy/builtins.py:2502
6093.2.1 by Jonathan Riddell
add .pot file to archive
1644
msgid ""
1645
"    -l N        display a maximum of N revisions\n"
1646
"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
1647
"    -v          display a status summary (delta) for each revision\n"
1648
"    -p          display a diff (patch) for each revision\n"
1649
"    --show-ids  display revision-ids (and file-ids), not just revnos"
1650
msgstr ""
1651
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1652
#: breezy/builtins.py:2508
6093.2.1 by Jonathan Riddell
add .pot file to archive
1653
msgid ""
1654
"  Note that the default number of levels to display is a function of the\n"
1655
"  log format. If the -n option is not used, the standard log formats show\n"
1656
"  just the top level (mainline)."
1657
msgstr ""
1658
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1659
#: breezy/builtins.py:2512
6093.2.1 by Jonathan Riddell
add .pot file to archive
1660
msgid ""
1661
"  Status summaries are shown using status flags like A, M, etc. To see\n"
1662
"  the changes explained using words like ``added`` and ``modified``\n"
1663
"  instead, use the -vv option."
1664
msgstr ""
1665
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1666
#: breezy/builtins.py:2516
6581.1.2 by Vincent Ladeuil
Update translation template.
1667
msgid ":Ordering control:"
1668
msgstr ""
1669
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1670
#: breezy/builtins.py:2518
6093.2.1 by Jonathan Riddell
add .pot file to archive
1671
msgid ""
1672
"  To display revisions from oldest to newest, use the --forward option.\n"
1673
"  In most cases, using this option will have little impact on the total\n"
1674
"  time taken to produce a log, though --forward does not incrementally\n"
1675
"  display revisions like --reverse does when it can."
1676
msgstr ""
1677
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1678
#: breezy/builtins.py:2523
6581.1.2 by Vincent Ladeuil
Update translation template.
1679
msgid ":Revision filtering:"
1680
msgstr ""
1681
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1682
#: breezy/builtins.py:2525
6093.2.1 by Jonathan Riddell
add .pot file to archive
1683
msgid ""
1684
"  The -r option can be used to specify what revision or range of revisions\n"
1685
"  to filter against. The various forms are shown below::"
1686
msgstr ""
1687
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1688
#: breezy/builtins.py:2528
6093.2.1 by Jonathan Riddell
add .pot file to archive
1689
msgid ""
1690
"    -rX      display revision X\n"
1691
"    -rX..    display revision X and later\n"
1692
"    -r..Y    display up to and including revision Y\n"
1693
"    -rX..Y   display from X to Y inclusive"
1694
msgstr ""
1695
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1696
#: breezy/builtins.py:2533
6093.2.1 by Jonathan Riddell
add .pot file to archive
1697
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1698
"  See ``brz help revisionspec`` for details on how to specify X and Y.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1699
"  Some common examples are given below::"
1700
msgstr ""
1701
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1702
#: breezy/builtins.py:2536
6093.2.1 by Jonathan Riddell
add .pot file to archive
1703
msgid ""
1704
"    -r-1                show just the tip\n"
1705
"    -r-10..             show the last 10 mainline revisions\n"
1706
"    -rsubmit:..         show what's new on this branch\n"
1707
"    -rancestor:path..   show changes since the common ancestor of this\n"
1708
"                        branch and the one at location path\n"
1709
"    -rdate:yesterday..  show changes since yesterday"
1710
msgstr ""
1711
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1712
#: breezy/builtins.py:2543
6093.2.1 by Jonathan Riddell
add .pot file to archive
1713
msgid ""
1714
"  When logging a range of revisions using -rX..Y, log starts at\n"
1715
"  revision Y and searches back in history through the primary\n"
1716
"  (\"left-hand\") parents until it finds X. When logging just the\n"
1717
"  top level (using -n1), an error is reported if X is not found\n"
1718
"  along the way. If multi-level logging is used (-n0), X may be\n"
1719
"  a nested merge revision and the log will be truncated accordingly."
1720
msgstr ""
1721
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1722
#: breezy/builtins.py:2550
6581.1.2 by Vincent Ladeuil
Update translation template.
1723
msgid ":Path filtering:"
1724
msgstr ""
1725
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1726
#: breezy/builtins.py:2552
6093.2.1 by Jonathan Riddell
add .pot file to archive
1727
msgid ""
1728
"  If parameters are given and the first one is not a branch, the log\n"
1729
"  will be filtered to show only those revisions that changed the\n"
1730
"  nominated files or directories."
1731
msgstr ""
1732
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1733
#: breezy/builtins.py:2556
6093.2.1 by Jonathan Riddell
add .pot file to archive
1734
msgid ""
1735
"  Filenames are interpreted within their historical context. To log a\n"
1736
"  deleted file, specify a revision range so that the file existed at\n"
1737
"  the end or start of the range."
1738
msgstr ""
1739
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1740
#: breezy/builtins.py:2560
6093.2.1 by Jonathan Riddell
add .pot file to archive
1741
msgid ""
1742
"  Historical context is also important when interpreting pathnames of\n"
1743
"  renamed files/directories. Consider the following example:"
1744
msgstr ""
1745
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1746
#: breezy/builtins.py:2563
6093.2.1 by Jonathan Riddell
add .pot file to archive
1747
msgid ""
1748
"  * revision 1: add tutorial.txt\n"
1749
"  * revision 2: modify tutorial.txt\n"
1750
"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1751
msgstr ""
1752
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1753
#: breezy/builtins.py:2567
6581.1.2 by Vincent Ladeuil
Update translation template.
1754
msgid "  In this case:"
1755
msgstr ""
1756
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1757
#: breezy/builtins.py:2569
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1758
msgid "  * ``brz log guide.txt`` will log the file added in revision 1"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1759
msgstr ""
1760
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1761
#: breezy/builtins.py:2571
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1762
msgid "  * ``brz log tutorial.txt`` will log the new file added in revision 3"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1763
msgstr ""
1764
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1765
#: breezy/builtins.py:2573
6093.2.1 by Jonathan Riddell
add .pot file to archive
1766
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1767
"  * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1768
"    the original file in revision 2."
1769
msgstr ""
1770
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1771
#: breezy/builtins.py:2576
6093.2.1 by Jonathan Riddell
add .pot file to archive
1772
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1773
"  * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1774
"    was no file called guide.txt in revision 2."
1775
msgstr ""
1776
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1777
#: breezy/builtins.py:2579
6093.2.1 by Jonathan Riddell
add .pot file to archive
1778
msgid ""
1779
"  Renames are always followed by log. By design, there is no need to\n"
1780
"  explicitly ask for this (and no way to stop logging a file back\n"
1781
"  until it was last renamed)."
1782
msgstr ""
1783
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1784
#: breezy/builtins.py:2583
6581.1.2 by Vincent Ladeuil
Update translation template.
1785
msgid ":Other filtering:"
1786
msgstr ""
1787
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1788
#: breezy/builtins.py:2585
6093.2.1 by Jonathan Riddell
add .pot file to archive
1789
msgid ""
1790
"  The --match option can be used for finding revisions that match a\n"
1791
"  regular expression in a commit message, committer, author or bug.\n"
1792
"  Specifying the option several times will match any of the supplied\n"
1793
"  expressions. --match-author, --match-bugs, --match-committer and\n"
1794
"  --match-message can be used to only match a specific field."
1795
msgstr ""
1796
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1797
#: breezy/builtins.py:2591
6581.1.2 by Vincent Ladeuil
Update translation template.
1798
msgid ":Tips & tricks:"
1799
msgstr ""
1800
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1801
#: breezy/builtins.py:2593
6093.2.1 by Jonathan Riddell
add .pot file to archive
1802
msgid ""
1803
"  GUI tools and IDEs are often better at exploring history than command\n"
1804
"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1805
"  bzr-explorer shell, or the Loggerhead web interface.  See the Bazaar\n"
1806
"  Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1807
"  <http://wiki.bazaar.canonical.com/IDEIntegration>."
1808
msgstr ""
1809
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1810
#: breezy/builtins.py:2599
7185.1.1 by Jelmer Vernooij
Update pot file.
1811
msgid "  You may find it useful to add the aliases below to ``breezy.conf``::"
1812
msgstr ""
1813
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1814
#: breezy/builtins.py:2601
6093.2.1 by Jonathan Riddell
add .pot file to archive
1815
msgid ""
1816
"    [ALIASES]\n"
1817
"    tip = log -r-1\n"
1818
"    top = log -l10 --line\n"
1819
"    show = log -v -p"
1820
msgstr ""
1821
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1822
#: breezy/builtins.py:2606
6093.2.1 by Jonathan Riddell
add .pot file to archive
1823
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1824
"  ``brz tip`` will then show the latest revision while ``brz top``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1825
"  will show the last 10 mainline revisions. To see the details of a\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1826
"  particular revision X,  ``brz show -rX``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1827
msgstr ""
1828
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1829
#: breezy/builtins.py:2610
6093.2.1 by Jonathan Riddell
add .pot file to archive
1830
msgid ""
1831
"  If you are interested in looking deeper into a particular merge X,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1832
"  use ``brz log -n0 -rX``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1833
msgstr ""
1834
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1835
#: breezy/builtins.py:2613
6093.2.1 by Jonathan Riddell
add .pot file to archive
1836
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1837
"  ``brz log -v`` on a branch with lots of history is currently\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1838
"  very slow. A fix for this issue is currently under development.\n"
1839
"  With or without that fix, it is recommended that a revision range\n"
1840
"  be given when using the -v option."
1841
msgstr ""
1842
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1843
#: breezy/builtins.py:2618
6093.2.1 by Jonathan Riddell
add .pot file to archive
1844
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1845
"  brz has a generic full-text matching plugin, brz-search, that can be\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1846
"  used to find revisions matching user names, commit messages, etc.\n"
1847
"  Among other features, this plugin can find all revisions containing\n"
1848
"  a list of words but not others."
1849
msgstr ""
1850
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1851
#: breezy/builtins.py:2623
6093.2.1 by Jonathan Riddell
add .pot file to archive
1852
msgid ""
1853
"  When exploring non-mainline history on large projects with deep\n"
1854
"  history, the performance of log can be greatly improved by installing\n"
1855
"  the historycache plugin. This plugin buffers historical information\n"
1856
"  trading disk space for faster speed."
1857
msgstr ""
1858
1859
# help of 'forward' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1860
#: breezy/builtins.py:2632
6093.2.1 by Jonathan Riddell
add .pot file to archive
1861
msgid "Show from oldest to newest."
1862
msgstr ""
1863
1864
# help of 'verbose' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1865
#: breezy/builtins.py:2635
6093.2.1 by Jonathan Riddell
add .pot file to archive
1866
msgid "Show files changed in each revision."
1867
msgstr ""
1868
1869
# help of 'change' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1870
#: breezy/builtins.py:2641
6093.2.1 by Jonathan Riddell
add .pot file to archive
1871
msgid "Show just the specified revision. See also \"help revisionspec\"."
1872
msgstr ""
1873
1874
# help of 'authors' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1875
#: breezy/builtins.py:2645
6093.2.1 by Jonathan Riddell
add .pot file to archive
1876
msgid "What names to list as authors - first, all or committer."
1877
msgstr ""
1878
1879
# title of 'authors' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1880
#: breezy/builtins.py:2646
6093.2.1 by Jonathan Riddell
add .pot file to archive
1881
msgid "Authors"
1882
msgstr ""
1883
1884
# help of 'levels' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1885
#: breezy/builtins.py:2652
6093.2.1 by Jonathan Riddell
add .pot file to archive
1886
msgid "Number of levels to display - 0 for all, 1 for flat."
1887
msgstr ""
1888
1889
# help of 'limit' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1890
#: breezy/builtins.py:2662
6093.2.1 by Jonathan Riddell
add .pot file to archive
1891
msgid "Limit the output to the first N revisions."
1892
msgstr ""
1893
1894
# help of 'show-diff' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1895
#: breezy/builtins.py:2667
6093.2.1 by Jonathan Riddell
add .pot file to archive
1896
msgid "Show changes made in each revision as a patch."
1897
msgstr ""
1898
6150.1.1 by Jonathan Riddell
update bzr.pot
1899
# help of 'include-merged' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1900
#: breezy/builtins.py:2669
6093.2.1 by Jonathan Riddell
add .pot file to archive
1901
msgid "Show merged revisions like --levels 0 does."
1902
msgstr ""
1903
6150.1.1 by Jonathan Riddell
update bzr.pot
1904
# help of 'omit-merges' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1905
#: breezy/builtins.py:2673
6150.1.1 by Jonathan Riddell
update bzr.pot
1906
msgid "Do not report commits with more than one parent."
1907
msgstr ""
1908
6093.2.1 by Jonathan Riddell
add .pot file to archive
1909
# help of 'exclude-common-ancestry' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1910
#: breezy/builtins.py:2675
6093.2.1 by Jonathan Riddell
add .pot file to archive
1911
msgid ""
1912
"Display only the revisions that are not part of both ancestries (require -"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1913
"rX..Y)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1914
msgstr ""
1915
1916
# help of 'signatures' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1917
#: breezy/builtins.py:2679
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1918
msgid "Show digital signature validity."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1919
msgstr ""
1920
1921
# help of 'match' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1922
#: breezy/builtins.py:2682
6093.2.1 by Jonathan Riddell
add .pot file to archive
1923
msgid "Show revisions whose properties match this expression."
1924
msgstr ""
1925
1926
# help of 'match-message' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1927
#: breezy/builtins.py:2686
6093.2.1 by Jonathan Riddell
add .pot file to archive
1928
msgid "Show revisions whose message matches this expression."
1929
msgstr ""
1930
1931
# help of 'match-committer' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1932
#: breezy/builtins.py:2690
6093.2.1 by Jonathan Riddell
add .pot file to archive
1933
msgid "Show revisions whose committer matches this expression."
1934
msgstr ""
1935
1936
# help of 'match-author' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1937
#: breezy/builtins.py:2694
6093.2.1 by Jonathan Riddell
add .pot file to archive
1938
msgid "Show revisions whose authors match this expression."
1939
msgstr ""
1940
1941
# help of 'match-bugs' option of 'log' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1942
#: breezy/builtins.py:2698
6093.2.1 by Jonathan Riddell
add .pot file to archive
1943
msgid "Show revisions whose bugs match this expression."
1944
msgstr ""
1945
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1946
#: breezy/builtins.py:2738
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1947
msgid "--exclude-common-ancestry requires -r with two revisions"
1948
msgstr ""
1949
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1950
#: breezy/builtins.py:2766
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1951
#, python-format
1952
msgid "Path unknown at end or start of revision range: %s"
1953
msgstr ""
1954
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1955
#: breezy/builtins.py:2884
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1956
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1957
msgid "brz %s doesn't accept two revisions in different branches."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1958
msgstr ""
1959
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1960
#: breezy/builtins.py:2900
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1961
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1962
msgid "brz %s --revision takes one or two values."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1963
msgstr ""
1964
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1965
#: breezy/builtins.py:2945
6093.2.1 by Jonathan Riddell
add .pot file to archive
1966
msgid ""
1967
"List files in a tree.\n"
1968
"    "
1969
msgstr ""
1970
1971
# help of 'recursive' option of 'ls' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1972
#: breezy/builtins.py:2954
6093.2.1 by Jonathan Riddell
add .pot file to archive
1973
msgid "Recurse into subdirectories."
1974
msgstr ""
1975
1976
# help of 'from-root' option of 'ls' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1977
#: breezy/builtins.py:2956
6093.2.1 by Jonathan Riddell
add .pot file to archive
1978
msgid "Print paths relative to the root of the branch."
1979
msgstr ""
1980
1981
# help of 'unknown' option of 'ls' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1982
#: breezy/builtins.py:2958
6093.2.1 by Jonathan Riddell
add .pot file to archive
1983
msgid "Print unknown files."
1984
msgstr ""
1985
1986
# help of 'versioned' option of 'ls' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1987
#: breezy/builtins.py:2959
6093.2.1 by Jonathan Riddell
add .pot file to archive
1988
msgid "Print versioned files."
1989
msgstr ""
1990
1991
# help of 'ignored' option of 'ls' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1992
#: breezy/builtins.py:2962
6093.2.1 by Jonathan Riddell
add .pot file to archive
1993
msgid "Print ignored files."
1994
msgstr ""
1995
1996
# help of 'kind' option of 'ls' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1997
#: breezy/builtins.py:2964
7185.1.1 by Jelmer Vernooij
Update pot file.
1998
msgid ""
1999
"List entries of a particular kind: file, directory, symlink, tree-reference."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2000
msgstr ""
2001
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2002
#: breezy/builtins.py:2979
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2003
msgid "invalid kind specified"
2004
msgstr ""
2005
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2006
#: breezy/builtins.py:2983
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2007
msgid "Cannot set both --verbose and --null"
2008
msgstr ""
2009
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2010
#: breezy/builtins.py:2992
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2011
msgid "cannot specify both --from-root and PATH"
2012
msgstr ""
2013
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2014
#: breezy/builtins.py:3079
6581.1.2 by Vincent Ladeuil
Update translation template.
2015
msgid "Ignore specified files or patterns."
2016
msgstr ""
2017
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2018
#: breezy/builtins.py:3081
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2019
msgid "See ``brz help patterns`` for details on the syntax of patterns."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2020
msgstr ""
2021
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2022
#: breezy/builtins.py:3083
6093.2.1 by Jonathan Riddell
add .pot file to archive
2023
msgid ""
2024
"If a .bzrignore file does not exist, the ignore command\n"
2025
"will create one and add the specified files or patterns to the newly\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
2026
"created file. The ignore command will also automatically add the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2027
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2028
"the use of the ignore command will require an explicit add command."
2029
msgstr ""
2030
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2031
#: breezy/builtins.py:3089
6093.2.1 by Jonathan Riddell
add .pot file to archive
2032
msgid ""
2033
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2034
"After adding, editing or deleting that file either indirectly by\n"
2035
"using this command or directly by using an editor, be sure to commit\n"
2036
"it."
2037
msgstr ""
2038
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2039
#: breezy/builtins.py:3094
6093.2.1 by Jonathan Riddell
add .pot file to archive
2040
msgid ""
2041
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2042
"the global ignore file can be found in the application data directory as\n"
2043
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2044
"Global ignores are not touched by this command. The global ignore file\n"
2045
"can be edited directly using an editor."
2046
msgstr ""
2047
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2048
#: breezy/builtins.py:3100
6093.2.1 by Jonathan Riddell
add .pot file to archive
2049
msgid ""
2050
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2051
"precedence over regular ignores.  Such exceptions are used to specify\n"
2052
"files that should be versioned which would otherwise be ignored."
2053
msgstr ""
2054
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2055
#: breezy/builtins.py:3104
6093.2.1 by Jonathan Riddell
add .pot file to archive
2056
msgid ""
2057
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2058
"precedence over the '!' exception patterns."
2059
msgstr ""
2060
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2061
#: breezy/builtins.py:3107
7185.1.1 by Jelmer Vernooij
Update pot file.
2062
msgid ":Notes:"
2063
msgstr ""
2064
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2065
#: breezy/builtins.py:3109
6093.2.1 by Jonathan Riddell
add .pot file to archive
2066
msgid ""
2067
"* Ignore patterns containing shell wildcards must be quoted from\n"
2068
"  the shell on Unix."
2069
msgstr ""
2070
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2071
#: breezy/builtins.py:3112
6093.2.1 by Jonathan Riddell
add .pot file to archive
2072
msgid ""
2073
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2074
"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
2075
msgstr ""
2076
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2077
#: breezy/builtins.py:3115
6093.2.1 by Jonathan Riddell
add .pot file to archive
2078
msgid ""
2079
":Examples:\n"
2080
"    Ignore the top level Makefile::"
2081
msgstr ""
2082
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2083
#: breezy/builtins.py:3118
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2084
msgid "        brz ignore ./Makefile"
6581.1.2 by Vincent Ladeuil
Update translation template.
2085
msgstr ""
2086
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2087
#: breezy/builtins.py:3120
6581.1.2 by Vincent Ladeuil
Update translation template.
2088
msgid "    Ignore .class files in all directories...::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2089
msgstr ""
2090
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2091
#: breezy/builtins.py:3122
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2092
msgid "        brz ignore \"*.class\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2093
msgstr ""
2094
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2095
#: breezy/builtins.py:3124
6581.1.2 by Vincent Ladeuil
Update translation template.
2096
msgid "    ...but do not ignore \"special.class\"::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2097
msgstr ""
2098
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2099
#: breezy/builtins.py:3126
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2100
msgid "        brz ignore \"!special.class\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2101
msgstr ""
2102
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2103
#: breezy/builtins.py:3128
6581.1.2 by Vincent Ladeuil
Update translation template.
2104
msgid "    Ignore files whose name begins with the \"#\" character::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2105
msgstr ""
2106
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2107
#: breezy/builtins.py:3130
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2108
msgid "        brz ignore \"RE:^#\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2109
msgstr ""
2110
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2111
#: breezy/builtins.py:3132 breezy/builtins.py:3136
6093.2.1 by Jonathan Riddell
add .pot file to archive
2112
msgid "    Ignore .o files under the lib directory::"
2113
msgstr ""
2114
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2115
#: breezy/builtins.py:3134
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2116
msgid "        brz ignore \"lib/**/*.o\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2117
msgstr ""
2118
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2119
#: breezy/builtins.py:3138
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2120
msgid "        brz ignore \"RE:lib/.*\\.o\""
6581.1.2 by Vincent Ladeuil
Update translation template.
2121
msgstr ""
2122
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2123
#: breezy/builtins.py:3140
6581.1.2 by Vincent Ladeuil
Update translation template.
2124
msgid "    Ignore everything but the \"debian\" toplevel directory::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2125
msgstr ""
2126
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2127
#: breezy/builtins.py:3142
7185.1.1 by Jelmer Vernooij
Update pot file.
2128
msgid "        brz ignore \"RE:(?!debian/).*\""
2129
msgstr ""
2130
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2131
#: breezy/builtins.py:3144
6093.2.1 by Jonathan Riddell
add .pot file to archive
2132
msgid ""
2133
"    Ignore everything except the \"local\" toplevel directory,\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
2134
"    but always ignore autosave files ending in ~, even under local/::"
2135
msgstr ""
2136
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2137
#: breezy/builtins.py:3147
7185.1.1 by Jelmer Vernooij
Update pot file.
2138
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2139
"        brz ignore \"*\"\n"
2140
"        brz ignore \"!./local\"\n"
2141
"        brz ignore \"!!*~\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2142
msgstr ""
2143
2144
# help of 'default-rules' option of 'ignore' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2145
#: breezy/builtins.py:3156
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2146
msgid "Display the default ignore rules that brz uses."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2147
msgstr ""
2148
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2149
#: breezy/builtins.py:3168
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2150
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2151
msgstr ""
2152
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2153
#: breezy/builtins.py:3179
6143.1.7 by Jonathan Riddell
update bzr.pot
2154
#, python-format
2155
msgid "Invalid ignore pattern found. %s"
2156
msgid_plural "Invalid ignore patterns found. %s"
2157
msgstr[0] ""
2158
msgstr[1] ""
2159
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2160
#: breezy/builtins.py:3188
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2161
msgid "NAME_PATTERN should not be an absolute path"
2162
msgstr ""
2163
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2164
#: breezy/builtins.py:3200
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2165
#, python-format
2166
msgid ""
2167
"Warning: the following files are version controlled and match your ignore "
2168
"pattern:\n"
2169
"%s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2170
"These files will continue to be version controlled unless you 'brz remove' "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2171
"them.\n"
2172
msgstr ""
2173
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2174
#: breezy/builtins.py:3207
6581.1.2 by Vincent Ladeuil
Update translation template.
2175
msgid "List ignored files and the patterns that matched them."
2176
msgstr ""
2177
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2178
#: breezy/builtins.py:3209
6093.2.1 by Jonathan Riddell
add .pot file to archive
2179
msgid ""
2180
"List all the ignored files and the ignore pattern that caused the file to\n"
2181
"be ignored."
2182
msgstr ""
2183
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2184
#: breezy/builtins.py:3212
6581.1.2 by Vincent Ladeuil
Update translation template.
2185
msgid "Alternatively, to list just the files::"
2186
msgstr ""
2187
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2188
#: breezy/builtins.py:3214
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2189
msgid "    brz ls --ignored"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2190
msgstr ""
2191
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2192
#: breezy/builtins.py:3248
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2193
#, python-format
2194
msgid "not a valid revision-number: %r"
2195
msgstr ""
2196
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2197
#: breezy/builtins.py:3256
6581.1.2 by Vincent Ladeuil
Update translation template.
2198
msgid "Export current or past revision to a destination directory or archive."
2199
msgstr ""
2200
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2201
#: breezy/builtins.py:3258
6581.1.2 by Vincent Ladeuil
Update translation template.
2202
msgid "If no revision is specified this exports the last committed revision."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2203
msgstr ""
2204
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2205
#: breezy/builtins.py:3260
6093.2.1 by Jonathan Riddell
add .pot file to archive
2206
msgid ""
2207
"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
2208
"given, try to find the format with the extension. If no extension\n"
2209
"is found exports to a directory (equivalent to --format=dir)."
2210
msgstr ""
2211
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2212
#: breezy/builtins.py:3264
6093.2.1 by Jonathan Riddell
add .pot file to archive
2213
msgid ""
2214
"If root is supplied, it will be used as the root directory inside\n"
2215
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2216
"to the exported filename. The root option has no effect for 'dir' format."
2217
msgstr ""
2218
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2219
#: breezy/builtins.py:3268
6093.2.1 by Jonathan Riddell
add .pot file to archive
2220
msgid ""
2221
"If branch is omitted then the branch containing the current working\n"
2222
"directory will be used."
2223
msgstr ""
2224
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2225
#: breezy/builtins.py:3271
6581.1.2 by Vincent Ladeuil
Update translation template.
2226
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2227
msgstr ""
2228
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2229
#: breezy/builtins.py:3273
6093.2.1 by Jonathan Riddell
add .pot file to archive
2230
msgid ""
2231
"  =================       =========================\n"
2232
"  Supported formats       Autodetected by extension\n"
2233
"  =================       =========================\n"
2234
"     dir                         (none)\n"
2235
"     tar                          .tar\n"
2236
"     tbz2                    .tar.bz2, .tbz2\n"
2237
"     tgz                      .tar.gz, .tgz\n"
2238
"     zip                          .zip\n"
2239
"  =================       ========================="
2240
msgstr ""
2241
2242
# help of 'format' option of 'export' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2243
#: breezy/builtins.py:3288
6093.2.1 by Jonathan Riddell
add .pot file to archive
2244
msgid "Type of file to export to."
2245
msgstr ""
2246
2247
# help of 'filters' option of 'export' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2248
#: breezy/builtins.py:3291
6093.2.1 by Jonathan Riddell
add .pot file to archive
2249
msgid "Apply content filters to export the convenient form."
2250
msgstr ""
2251
2252
# help of 'root' option of 'export' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2253
#: breezy/builtins.py:3295
6093.2.1 by Jonathan Riddell
add .pot file to archive
2254
msgid "Name of the root directory inside the exported file."
2255
msgstr ""
2256
2257
# help of 'per-file-timestamps' option of 'export' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2258
#: breezy/builtins.py:3297
6093.2.1 by Jonathan Riddell
add .pot file to archive
2259
msgid ""
2260
"Set modification time of files to that of the last revision in which it was "
2261
"changed."
2262
msgstr ""
2263
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2264
# help of 'uncommitted' option of 'export' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2265
#: breezy/builtins.py:3300
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2266
msgid "Export the working tree contents rather than that of the last revision."
2267
msgstr ""
2268
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2269
#: breezy/builtins.py:3320
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2270
msgid "--uncommitted requires a working tree"
2271
msgstr ""
2272
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2273
#: breezy/builtins.py:3348
6138.4.4 by Jonathan Riddell
update bzr.pot
2274
#, python-format
2275
msgid "Unsupported export format: %s"
2276
msgstr ""
2277
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2278
#: breezy/builtins.py:3352
6581.1.2 by Vincent Ladeuil
Update translation template.
2279
msgid "Write the contents of a file as of a given revision to standard output."
2280
msgstr ""
2281
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2282
#: breezy/builtins.py:3354
6581.1.2 by Vincent Ladeuil
Update translation template.
2283
msgid "If no revision is nominated, the last revision is used."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2284
msgstr ""
2285
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2286
#: breezy/builtins.py:3356
6093.2.1 by Jonathan Riddell
add .pot file to archive
2287
msgid ""
2288
"Note: Take care to redirect standard output when using this command on a\n"
2289
"binary file."
2290
msgstr ""
2291
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2292
# help of 'name-from-revision' option of 'cat' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2293
#: breezy/builtins.py:3363
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2294
msgid "The path name in the old tree."
2295
msgstr ""
2296
6093.2.1 by Jonathan Riddell
add .pot file to archive
2297
# help of 'filters' option of 'cat' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2298
#: breezy/builtins.py:3364
6093.2.1 by Jonathan Riddell
add .pot file to archive
2299
msgid "Apply content filters to display the convenience form."
2300
msgstr ""
2301
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2302
#: breezy/builtins.py:3375
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2303
msgid "brz cat --revision takes exactly one revision specifier"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2304
msgstr ""
2305
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2306
#: breezy/builtins.py:3395 breezy/builtins.py:3409
6138.2.6 by Jonathan Riddell
update bzr.pot
2307
msgid "{0!r} is not present in revision {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2308
msgstr ""
2309
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2310
#: breezy/builtins.py:3436
6581.1.2 by Vincent Ladeuil
Update translation template.
2311
msgid "Commit changes into a new revision."
2312
msgstr ""
2313
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2314
#: breezy/builtins.py:3438
6093.2.1 by Jonathan Riddell
add .pot file to archive
2315
msgid ""
2316
"An explanatory message needs to be given for each commit. This is\n"
2317
"often done by using the --message option (getting the message from the\n"
2318
"command line) or by using the --file option (getting the message from\n"
2319
"a file). If neither of these options is given, an editor is opened for\n"
2320
"the user to enter the message. To see the changed files in the\n"
2321
"boilerplate text loaded into the editor, use the --show-diff option."
2322
msgstr ""
2323
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2324
#: breezy/builtins.py:3445
6093.2.1 by Jonathan Riddell
add .pot file to archive
2325
msgid ""
2326
"By default, the entire tree is committed and the person doing the\n"
2327
"commit is assumed to be the author. These defaults can be overridden\n"
2328
"as explained below."
2329
msgstr ""
2330
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2331
#: breezy/builtins.py:3449
6581.1.2 by Vincent Ladeuil
Update translation template.
2332
msgid ":Selective commits:"
2333
msgstr ""
2334
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2335
#: breezy/builtins.py:3451
6093.2.1 by Jonathan Riddell
add .pot file to archive
2336
msgid ""
2337
"  If selected files are specified, only changes to those files are\n"
2338
"  committed.  If a directory is specified then the directory and\n"
2339
"  everything within it is committed."
2340
msgstr ""
2341
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2342
#: breezy/builtins.py:3455
6093.2.1 by Jonathan Riddell
add .pot file to archive
2343
msgid ""
2344
"  When excludes are given, they take precedence over selected files.\n"
2345
"  For example, to commit only changes within foo, but not changes\n"
2346
"  within foo/bar::"
2347
msgstr ""
2348
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2349
#: breezy/builtins.py:3459
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2350
msgid "    brz commit foo -x foo/bar"
6581.1.2 by Vincent Ladeuil
Update translation template.
2351
msgstr ""
2352
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2353
#: breezy/builtins.py:3461
6581.1.2 by Vincent Ladeuil
Update translation template.
2354
msgid "  A selective commit after a merge is not yet supported."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2355
msgstr ""
2356
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2357
#: breezy/builtins.py:3463
6581.1.2 by Vincent Ladeuil
Update translation template.
2358
msgid ":Custom authors:"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2359
msgstr ""
2360
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2361
#: breezy/builtins.py:3465
6093.2.1 by Jonathan Riddell
add .pot file to archive
2362
msgid ""
2363
"  If the author of the change is not the same person as the committer,\n"
2364
"  you can specify the author's name using the --author option. The\n"
2365
"  name should be in the same format as a committer-id, e.g.\n"
2366
"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2367
"  the change you can specify the option multiple times, once for each\n"
2368
"  author."
2369
msgstr ""
2370
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2371
#: breezy/builtins.py:3472
6581.1.2 by Vincent Ladeuil
Update translation template.
2372
msgid ":Checks:"
2373
msgstr ""
2374
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2375
#: breezy/builtins.py:3474
6093.2.1 by Jonathan Riddell
add .pot file to archive
2376
msgid ""
2377
"  A common mistake is to forget to add a new file or directory before\n"
2378
"  running the commit command. The --strict option checks for unknown\n"
2379
"  files and aborts the commit if any are found. More advanced pre-commit\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2380
"  checks can be implemented by defining hooks. See ``brz help hooks``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2381
"  for details."
2382
msgstr ""
2383
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2384
#: breezy/builtins.py:3480
6581.1.2 by Vincent Ladeuil
Update translation template.
2385
msgid ":Things to note:"
2386
msgstr ""
2387
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2388
#: breezy/builtins.py:3482
6093.2.1 by Jonathan Riddell
add .pot file to archive
2389
msgid ""
2390
"  If you accidentially commit the wrong changes or make a spelling\n"
2391
"  mistake in the commit message say, you can use the uncommit command\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2392
"  to undo it. See ``brz help uncommit`` for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2393
msgstr ""
2394
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2395
#: breezy/builtins.py:3486
6093.2.1 by Jonathan Riddell
add .pot file to archive
2396
msgid ""
2397
"  Hooks can also be configured to run after a commit. This allows you\n"
2398
"  to trigger updates to external systems like bug trackers. The --fixes\n"
2399
"  option can be used to record the association between a revision and\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2400
"  one or more bugs. See ``brz help bugs`` for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2401
msgstr ""
2402
2403
# help of 'exclude' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2404
#: breezy/builtins.py:3497
6093.2.1 by Jonathan Riddell
add .pot file to archive
2405
msgid "Do not consider changes made to a given path."
2406
msgstr ""
2407
2408
# help of 'message' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2409
#: breezy/builtins.py:3500
6093.2.1 by Jonathan Riddell
add .pot file to archive
2410
msgid "Description of the new revision."
2411
msgstr ""
2412
2413
# help of 'unchanged' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2414
#: breezy/builtins.py:3503
6093.2.1 by Jonathan Riddell
add .pot file to archive
2415
msgid "Commit even if nothing has changed."
2416
msgstr ""
2417
2418
# help of 'file' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2419
#: breezy/builtins.py:3507
6093.2.1 by Jonathan Riddell
add .pot file to archive
2420
msgid "Take commit message from this file."
2421
msgstr ""
2422
2423
# help of 'strict' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2424
#: breezy/builtins.py:3509
6093.2.1 by Jonathan Riddell
add .pot file to archive
2425
msgid "Refuse to commit if there are unknown files in the working tree."
2426
msgstr ""
2427
2428
# help of 'commit-time' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2429
#: breezy/builtins.py:3512
6093.2.1 by Jonathan Riddell
add .pot file to archive
2430
msgid ""
2431
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2432
"08:00:00 +0100'."
2433
msgstr ""
2434
7185.1.1 by Jelmer Vernooij
Update pot file.
2435
# help of 'bugs' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2436
#: breezy/builtins.py:3516
7185.1.1 by Jelmer Vernooij
Update pot file.
2437
msgid "Link to a related bug. (see \"brz help bugs\")."
2438
msgstr ""
2439
6093.2.1 by Jonathan Riddell
add .pot file to archive
2440
# help of 'fixes' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2441
#: breezy/builtins.py:3519
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2442
msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2443
msgstr ""
2444
2445
# help of 'author' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2446
#: breezy/builtins.py:3523
6093.2.1 by Jonathan Riddell
add .pot file to archive
2447
msgid "Set the author's name, if it's different from the committer."
2448
msgstr ""
2449
2450
# help of 'local' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2451
#: breezy/builtins.py:3526
6093.2.1 by Jonathan Riddell
add .pot file to archive
2452
msgid ""
2453
"Perform a local commit in a bound branch.  Local commits are not pushed to "
2454
"the master branch until a normal commit is performed."
2455
msgstr ""
2456
2457
# help of 'show-diff' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2458
#: breezy/builtins.py:3532
6093.2.1 by Jonathan Riddell
add .pot file to archive
2459
msgid ""
2460
"When no message is supplied, show the diff along with the status summary in "
2461
"the message editor."
2462
msgstr ""
2463
2464
# help of 'lossy' option of 'commit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2465
#: breezy/builtins.py:3535
6093.2.1 by Jonathan Riddell
add .pot file to archive
2466
msgid ""
2467
"When committing to a foreign version control system do not push data that "
2468
"can not be natively represented."
2469
msgstr ""
2470
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2471
#: breezy/builtins.py:3552
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2472
#, python-format
2473
msgid ""
2474
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2475
"default bug tracker using the `bugtracker` option.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2476
"See \"brz help bugs\" for more information on this feature. Commit refused."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2477
msgstr ""
2478
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2479
#: breezy/builtins.py:3561
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2480
#, python-format
2481
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2482
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2483
"for more information on this feature.\n"
2484
"Commit refused."
2485
msgstr ""
2486
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2487
#: breezy/builtins.py:3570
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2488
#, python-format
2489
msgid "Unrecognized bug %s. Commit refused."
2490
msgstr ""
2491
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2492
#: breezy/builtins.py:3573
6150.1.1 by Jonathan Riddell
update bzr.pot
2493
#, python-format
2494
msgid ""
2495
"%s\n"
2496
"Commit refused."
2497
msgstr ""
2498
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2499
#: breezy/builtins.py:3600
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2500
msgid "Could not parse --commit-time: "
2501
msgstr ""
2502
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2503
#: breezy/builtins.py:3644
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2504
msgid "please specify either --message or --file"
2505
msgstr ""
2506
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2507
#: breezy/builtins.py:3674
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2508
msgid "please specify a commit message with either --message or --file"
2509
msgstr ""
2510
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2511
#: breezy/builtins.py:3677
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2512
msgid ""
2513
"Empty commit message specified. Please specify a commit message with either "
2514
"--message or --file or leave a blank message with --message \"\"."
2515
msgstr ""
2516
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2517
#: breezy/builtins.py:3697
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2518
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2519
"No changes to commit. Please 'brz add' the files you want to commit, or use "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2520
"--unchanged to force an empty commit."
2521
msgstr ""
2522
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2523
#: breezy/builtins.py:3701
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2524
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2525
"Conflicts detected in working tree.  Use \"brz conflicts\" to list, \"brz "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2526
"resolve FILE\" to resolve."
2527
msgstr ""
2528
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2529
#: breezy/builtins.py:3705
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2530
msgid "Commit refused because there are unknown files in the working tree."
2531
msgstr ""
2532
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2533
#: breezy/builtins.py:3708
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2534
msgid ""
2535
"\n"
2536
"To commit to master branch, run update and then commit.\n"
2537
"You can also pass --local to commit to continue working disconnected."
2538
msgstr ""
2539
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2540
#: breezy/builtins.py:3716
6581.1.2 by Vincent Ladeuil
Update translation template.
2541
msgid ""
2542
"Validate working tree structure, branch consistency and repository history."
2543
msgstr ""
2544
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2545
#: breezy/builtins.py:3718
6093.2.1 by Jonathan Riddell
add .pot file to archive
2546
msgid ""
2547
"This command checks various invariants about branch and repository storage\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2548
"to detect data corruption or brz bugs."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2549
msgstr ""
2550
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2551
#: breezy/builtins.py:3721
6093.2.1 by Jonathan Riddell
add .pot file to archive
2552
msgid ""
2553
"The working tree and branch checks will only give output if a problem is\n"
2554
"detected. The output fields of the repository check are:"
2555
msgstr ""
2556
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2557
#: breezy/builtins.py:3724
6093.2.1 by Jonathan Riddell
add .pot file to archive
2558
msgid ""
2559
"revisions\n"
2560
"    This is just the number of revisions checked.  It doesn't\n"
2561
"    indicate a problem."
2562
msgstr ""
2563
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2564
#: breezy/builtins.py:3728
6093.2.1 by Jonathan Riddell
add .pot file to archive
2565
msgid ""
2566
"versionedfiles\n"
2567
"    This is just the number of versionedfiles checked.  It\n"
2568
"    doesn't indicate a problem."
2569
msgstr ""
2570
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2571
#: breezy/builtins.py:3732
6093.2.1 by Jonathan Riddell
add .pot file to archive
2572
msgid ""
2573
"unreferenced ancestors\n"
2574
"    Texts that are ancestors of other texts, but\n"
2575
"    are not properly referenced by the revision ancestry.  This is a\n"
2576
"    subtle problem that Bazaar can work around."
2577
msgstr ""
2578
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2579
#: breezy/builtins.py:3737
6093.2.1 by Jonathan Riddell
add .pot file to archive
2580
msgid ""
2581
"unique file texts\n"
2582
"    This is the total number of unique file contents\n"
2583
"    seen in the checked revisions.  It does not indicate a problem."
2584
msgstr ""
2585
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2586
#: breezy/builtins.py:3741
6093.2.1 by Jonathan Riddell
add .pot file to archive
2587
msgid ""
2588
"repeated file texts\n"
2589
"    This is the total number of repeated texts seen\n"
2590
"    in the checked revisions.  Texts can be repeated when their file\n"
2591
"    entries are modified, but the file contents are not.  It does not\n"
2592
"    indicate a problem."
2593
msgstr ""
2594
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2595
#: breezy/builtins.py:3747
6093.2.1 by Jonathan Riddell
add .pot file to archive
2596
msgid ""
2597
"If no restrictions are specified, all Bazaar data that is found at the "
2598
"given\n"
2599
"location will be checked."
2600
msgstr ""
2601
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2602
#: breezy/builtins.py:3752
6581.1.2 by Vincent Ladeuil
Update translation template.
2603
msgid "    Check the tree and branch at 'foo'::"
2604
msgstr ""
2605
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2606
#: breezy/builtins.py:3754
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2607
msgid "        brz check --tree --branch foo"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2608
msgstr ""
2609
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2610
#: breezy/builtins.py:3756
6581.1.2 by Vincent Ladeuil
Update translation template.
2611
msgid "    Check only the repository at 'bar'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2612
msgstr ""
2613
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2614
#: breezy/builtins.py:3758
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2615
msgid "        brz check --repo bar"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2616
msgstr ""
2617
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2618
#: breezy/builtins.py:3760
6581.1.2 by Vincent Ladeuil
Update translation template.
2619
msgid "    Check everything at 'baz'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2620
msgstr ""
2621
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2622
#: breezy/builtins.py:3762
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2623
msgid "        brz check baz"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2624
msgstr ""
2625
2626
# help of 'branch' option of 'check' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2627
#: breezy/builtins.py:3768
6093.2.1 by Jonathan Riddell
add .pot file to archive
2628
msgid "Check the branch related to the current directory."
2629
msgstr ""
2630
2631
# help of 'repo' option of 'check' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2632
#: breezy/builtins.py:3770
6093.2.1 by Jonathan Riddell
add .pot file to archive
2633
msgid "Check the repository related to the current directory."
2634
msgstr ""
2635
2636
# help of 'tree' option of 'check' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2637
#: breezy/builtins.py:3772
6093.2.1 by Jonathan Riddell
add .pot file to archive
2638
msgid "Check the working tree related to the current directory."
2639
msgstr ""
2640
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2641
#: breezy/builtins.py:3786
6581.1.2 by Vincent Ladeuil
Update translation template.
2642
msgid "Upgrade a repository, branch or working tree to a newer format."
2643
msgstr ""
2644
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2645
#: breezy/builtins.py:3788
6093.2.1 by Jonathan Riddell
add .pot file to archive
2646
msgid ""
2647
"When the default format has changed after a major new release of\n"
2648
"Bazaar, you may be informed during certain operations that you\n"
2649
"should upgrade. Upgrading to a newer format may improve performance\n"
2650
"or make new features available. It may however limit interoperability\n"
2651
"with older repositories or with older versions of Bazaar."
2652
msgstr ""
2653
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2654
#: breezy/builtins.py:3794
6093.2.1 by Jonathan Riddell
add .pot file to archive
2655
msgid ""
2656
"If you wish to upgrade to a particular format rather than the\n"
2657
"current default, that can be specified using the --format option.\n"
2658
"As a consequence, you can use the upgrade command this way to\n"
2659
"\"downgrade\" to an earlier format, though some conversions are\n"
2660
"a one way process (e.g. changing from the 1.x default to the\n"
2661
"2.x default) so downgrading is not always possible."
2662
msgstr ""
2663
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2664
#: breezy/builtins.py:3801
6093.2.1 by Jonathan Riddell
add .pot file to archive
2665
msgid ""
2666
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2667
"process (where # is a number). By default, this is left there on\n"
2668
"completion. If the conversion fails, delete the new .bzr directory\n"
2669
"and rename this one back in its place. Use the --clean option to ask\n"
2670
"for the backup.bzr directory to be removed on successful conversion.\n"
2671
"Alternatively, you can delete it by hand if everything looks good\n"
2672
"afterwards."
2673
msgstr ""
2674
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2675
#: breezy/builtins.py:3809
6093.2.1 by Jonathan Riddell
add .pot file to archive
2676
msgid ""
2677
"If the location given is a shared repository, dependent branches\n"
2678
"are also converted provided the repository converts successfully.\n"
2679
"If the conversion of a branch fails, remaining branches are still\n"
2680
"tried."
2681
msgstr ""
2682
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2683
#: breezy/builtins.py:3814
6093.2.1 by Jonathan Riddell
add .pot file to archive
2684
msgid ""
2685
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2686
"https://www.breezy-vcs.org/doc/en/upgrade-guide/."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2687
msgstr ""
2688
2689
# help of 'format' option of 'upgrade' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2690
#: breezy/builtins.py:3822
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2691
msgid "Upgrade to a specific format.  See \"brz help formats\" for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2692
msgstr ""
2693
2694
# title of 'format' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2695
# title of 'format' option of 'upgrade' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2696
#: breezy/builtins.py:3827
6093.2.1 by Jonathan Riddell
add .pot file to archive
2697
msgid "Branch format"
2698
msgstr ""
2699
2700
# help of 'clean' option of 'upgrade' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2701
#: breezy/builtins.py:3829
6093.2.1 by Jonathan Riddell
add .pot file to archive
2702
msgid "Remove the backup.bzr directory if successful."
2703
msgstr ""
2704
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2705
# help of 'dry-run' option of 'add' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2706
# help of 'dry-run' option of 'upgrade' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2707
#: breezy/builtins.py:3831
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2708
msgid "Show what would be done, but don't actually do anything."
2709
msgstr ""
2710
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2711
#: breezy/builtins.py:3846
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2712
msgid "Show or set brz user id."
6581.1.2 by Vincent Ladeuil
Update translation template.
2713
msgstr ""
2714
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2715
#: breezy/builtins.py:3848
6093.2.1 by Jonathan Riddell
add .pot file to archive
2716
msgid ""
2717
":Examples:\n"
2718
"    Show the email of the current user::"
2719
msgstr ""
2720
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2721
#: breezy/builtins.py:3851
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2722
msgid "        brz whoami --email"
6581.1.2 by Vincent Ladeuil
Update translation template.
2723
msgstr ""
2724
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2725
#: breezy/builtins.py:3853
6581.1.2 by Vincent Ladeuil
Update translation template.
2726
msgid "    Set the current user::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2727
msgstr ""
2728
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2729
#: breezy/builtins.py:3855
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2730
msgid "        brz whoami \"Frank Chu <fchu@example.com>\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2731
msgstr ""
2732
2733
# help of 'email' option of 'whoami' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2734
#: breezy/builtins.py:3859
6093.2.1 by Jonathan Riddell
add .pot file to archive
2735
msgid "Display email address only."
2736
msgstr ""
2737
2738
# help of 'branch' option of 'whoami' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2739
#: breezy/builtins.py:3861
6093.2.1 by Jonathan Riddell
add .pot file to archive
2740
msgid "Set identity for the current branch instead of globally."
2741
msgstr ""
2742
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2743
#: breezy/builtins.py:3887
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2744
msgid "--email can only be used to display existing identity"
2745
msgstr ""
2746
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2747
#: breezy/builtins.py:3911
6581.1.2 by Vincent Ladeuil
Update translation template.
2748
msgid "Print or set the branch nickname."
2749
msgstr ""
2750
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2751
#: breezy/builtins.py:3913
6093.2.1 by Jonathan Riddell
add .pot file to archive
2752
msgid ""
6504.1.1 by Vincent Ladeuil
Update translation template
2753
"If unset, the colocated branch name is used for colocated branches, and\n"
2754
"the branch directory name is used for other branches.  To print the\n"
2755
"current nickname, execute with no argument."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2756
msgstr ""
2757
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2758
#: breezy/builtins.py:3917
6093.2.1 by Jonathan Riddell
add .pot file to archive
2759
msgid ""
2760
"Bound branches use the nickname of its master branch unless it is set\n"
2761
"locally."
2762
msgstr ""
2763
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2764
#: breezy/builtins.py:3938
6581.1.2 by Vincent Ladeuil
Update translation template.
2765
msgid "Set/unset and display aliases."
2766
msgstr ""
2767
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2768
#: breezy/builtins.py:3940
6093.2.1 by Jonathan Riddell
add .pot file to archive
2769
msgid ""
2770
":Examples:\n"
2771
"    Show the current aliases::"
2772
msgstr ""
2773
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2774
#: breezy/builtins.py:3943
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2775
msgid "        brz alias"
6581.1.2 by Vincent Ladeuil
Update translation template.
2776
msgstr ""
2777
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2778
#: breezy/builtins.py:3945
6581.1.2 by Vincent Ladeuil
Update translation template.
2779
msgid "    Show the alias specified for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2780
msgstr ""
2781
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2782
#: breezy/builtins.py:3947
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2783
msgid "        brz alias ll"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2784
msgstr ""
2785
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2786
#: breezy/builtins.py:3949
6581.1.2 by Vincent Ladeuil
Update translation template.
2787
msgid "    Set an alias for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2788
msgstr ""
2789
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2790
#: breezy/builtins.py:3951
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2791
msgid "        brz alias ll=\"log --line -r-10..-1\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2792
msgstr ""
2793
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2794
#: breezy/builtins.py:3953
6581.1.2 by Vincent Ladeuil
Update translation template.
2795
msgid "    To remove an alias for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2796
msgstr ""
2797
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2798
#: breezy/builtins.py:3955
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2799
msgid "        brz alias --remove ll"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2800
msgstr ""
2801
2802
# help of 'remove' option of 'alias' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2803
#: breezy/builtins.py:3960
6093.2.1 by Jonathan Riddell
add .pot file to archive
2804
msgid "Remove the alias."
2805
msgstr ""
2806
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2807
#: breezy/builtins.py:3978
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2808
msgid "brz alias --remove expects an alias to remove."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2809
msgstr ""
2810
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2811
#: breezy/builtins.py:4169
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2812
msgid "subunit not available. subunit needs to be installed to use --subunit."
2813
msgstr ""
2814
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2815
#: breezy/builtins.py:4186
7185.1.1 by Jelmer Vernooij
Update pot file.
2816
msgid "subunit not available. subunit needs to be installed to use --subunit2."
2817
msgstr ""
2818
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2819
#: breezy/builtins.py:4195
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2820
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2821
"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2822
msgstr ""
2823
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2824
#: breezy/builtins.py:4242
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2825
msgid "Show version of brz."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2826
msgstr ""
2827
2828
# help of 'short' option of 'version' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2829
#: breezy/builtins.py:4246
6093.2.1 by Jonathan Riddell
add .pot file to archive
2830
msgid "Print just the version number."
2831
msgstr ""
2832
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2833
#: breezy/builtins.py:4265
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2834
msgid "It sure does!\n"
2835
msgstr ""
2836
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2837
#: breezy/builtins.py:4289
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2838
#, python-format
2839
msgid "merge base is revision %s\n"
2840
msgstr ""
2841
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2842
#: breezy/builtins.py:4294
6581.1.2 by Vincent Ladeuil
Update translation template.
2843
msgid "Perform a three-way merge."
2844
msgstr ""
2845
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2846
#: breezy/builtins.py:4296
6093.2.1 by Jonathan Riddell
add .pot file to archive
2847
msgid ""
2848
"The source of the merge can be specified either in the form of a branch,\n"
2849
"or in the form of a path to a file containing a merge directive generated\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2850
"with brz send. If neither is specified, the default is the upstream branch\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2851
"or the branch most recently merged using --remember.  The source of the\n"
2852
"merge may also be specified in the form of a path to a file in another\n"
2853
"branch:  in this case, only the modifications to that file are merged into\n"
2854
"the current working tree."
2855
msgstr ""
2856
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2857
#: breezy/builtins.py:4304
6093.2.1 by Jonathan Riddell
add .pot file to archive
2858
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2859
"When merging from a branch, by default brz will try to merge in all new\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2860
"work from the other branch, automatically determining an appropriate base\n"
2861
"revision.  If this fails, you may need to give an explicit base."
2862
msgstr ""
2863
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2864
#: breezy/builtins.py:4308
6093.2.1 by Jonathan Riddell
add .pot file to archive
2865
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2866
"To pick a different ending revision, pass \"--revision OTHER\".  brz will\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2867
"try to merge in all new work up to and including revision OTHER."
2868
msgstr ""
2869
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2870
#: breezy/builtins.py:4311
6093.2.1 by Jonathan Riddell
add .pot file to archive
2871
msgid ""
2872
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2873
"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
2874
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2875
"not already contain revision BASE, such a merge is commonly referred to as\n"
2876
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2877
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2878
"changes from the other branch is not stored in the commit."
2879
msgstr ""
2880
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2881
#: breezy/builtins.py:4319
6093.2.1 by Jonathan Riddell
add .pot file to archive
2882
msgid "Revision numbers are always relative to the source branch."
2883
msgstr ""
2884
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2885
#: breezy/builtins.py:4321 breezy/conflicts.py:54 breezy/conflicts.py:109
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2886
msgid ""
2887
"Merge will do its best to combine the changes in two branches, but there\n"
2888
"are some kinds of problems only a human can fix.  When it encounters those,\n"
2889
"it will mark a conflict.  A conflict means that you need to fix something,\n"
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
2890
"before you can commit."
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2891
msgstr ""
2892
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2893
#: breezy/builtins.py:4326
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2894
msgid "Use brz resolve when you have fixed a problem.  See also brz conflicts."
6581.1.2 by Vincent Ladeuil
Update translation template.
2895
msgstr ""
2896
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2897
#: breezy/builtins.py:4328
6093.2.1 by Jonathan Riddell
add .pot file to archive
2898
msgid ""
2899
"If there is no default branch set, the first merge will set it (use\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
2900
"--no-remember to avoid setting it). After that, you can omit the branch\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2901
"to use the default.  To change the default, use --remember. The value will\n"
2902
"only be saved if the remote location can be accessed."
2903
msgstr ""
2904
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2905
#: breezy/builtins.py:4333
6093.2.1 by Jonathan Riddell
add .pot file to archive
2906
msgid ""
2907
"The results of the merge are placed into the destination working\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2908
"directory, where they can be reviewed (with brz diff), tested, and then\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2909
"committed to record the result of the merge."
2910
msgstr ""
2911
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2912
#: breezy/builtins.py:4337
6093.2.1 by Jonathan Riddell
add .pot file to archive
2913
msgid ""
2914
"merge refuses to run if there are any uncommitted changes, unless\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
2915
"--force is given.  If --force is given, then the changes from the source\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2916
"will be merged with the current working tree, including any uncommitted\n"
2917
"changes in the tree.  The --force option can also be used to create a\n"
2918
"merge revision which has more than two parents."
2919
msgstr ""
2920
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2921
#: breezy/builtins.py:4343
6093.2.1 by Jonathan Riddell
add .pot file to archive
2922
msgid ""
2923
"If one would like to merge changes from the working tree of the other\n"
2924
"branch without merging any committed revisions, the --uncommitted option\n"
2925
"can be given."
2926
msgstr ""
2927
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2928
#: breezy/builtins.py:4347
6093.2.1 by Jonathan Riddell
add .pot file to archive
2929
msgid ""
2930
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2931
"you to apply each diff hunk and file change, similar to \"shelve\"."
2932
msgstr ""
2933
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2934
#: breezy/builtins.py:4350
6093.2.1 by Jonathan Riddell
add .pot file to archive
2935
msgid ""
2936
":Examples:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2937
"    To merge all new revisions from brz.dev::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2938
msgstr ""
2939
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2940
#: breezy/builtins.py:4353
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2941
msgid "        brz merge ../brz.dev"
6581.1.2 by Vincent Ladeuil
Update translation template.
2942
msgstr ""
2943
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2944
#: breezy/builtins.py:4355
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2945
msgid "    To merge changes up to and including revision 82 from brz.dev::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2946
msgstr ""
2947
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2948
#: breezy/builtins.py:4357
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2949
msgid "        brz merge -r 82 ../brz.dev"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2950
msgstr ""
2951
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2952
#: breezy/builtins.py:4359
6581.1.2 by Vincent Ladeuil
Update translation template.
2953
msgid "    To merge the changes introduced by 82, without previous changes::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2954
msgstr ""
2955
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2956
#: breezy/builtins.py:4361
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2957
msgid "        brz merge -r 81..82 ../brz.dev"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2958
msgstr ""
2959
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2960
#: breezy/builtins.py:4363
6581.1.2 by Vincent Ladeuil
Update translation template.
2961
msgid "    To apply a merge directive contained in /tmp/merge::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2962
msgstr ""
2963
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2964
#: breezy/builtins.py:4365
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2965
msgid "        brz merge /tmp/merge"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2966
msgstr ""
2967
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2968
#: breezy/builtins.py:4367
6093.2.1 by Jonathan Riddell
add .pot file to archive
2969
msgid ""
2970
"    To create a merge revision with three parents from two branches\n"
2971
"    feature1a and feature1b:"
2972
msgstr ""
2973
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2974
#: breezy/builtins.py:4370
6093.2.1 by Jonathan Riddell
add .pot file to archive
2975
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2976
"        brz merge ../feature1a\n"
2977
"        brz merge ../feature1b --force\n"
2978
"        brz commit -m 'revision with three parents'"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2979
msgstr ""
2980
2981
# help of 'force' option of 'merge' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2982
#: breezy/builtins.py:4382
6093.2.1 by Jonathan Riddell
add .pot file to archive
2983
msgid "Merge even if the destination tree has uncommitted changes."
2984
msgstr ""
2985
2986
# help of 'uncommitted' option of 'merge' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2987
#: breezy/builtins.py:4388
6093.2.1 by Jonathan Riddell
add .pot file to archive
2988
msgid ""
2989
"Apply uncommitted changes from a working copy, instead of branch changes."
2990
msgstr ""
2991
2992
# help of 'pull' option of 'merge' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2993
#: breezy/builtins.py:4390
6093.2.1 by Jonathan Riddell
add .pot file to archive
2994
msgid ""
2995
"If the destination is already completely merged into the source, pull from "
2996
"the source rather than merging.  When this happens, you do not need to "
2997
"commit the result."
2998
msgstr ""
2999
3000
# help of 'directory' option of 'merge' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3001
#: breezy/builtins.py:4395
6093.2.1 by Jonathan Riddell
add .pot file to archive
3002
msgid ""
3003
"Branch to merge into, rather than the one containing the working directory."
3004
msgstr ""
3005
3006
# help of 'preview' option of 'merge' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3007
#: breezy/builtins.py:4397
6093.2.1 by Jonathan Riddell
add .pot file to archive
3008
msgid "Instead of merging, show a diff of the merge."
3009
msgstr ""
3010
3011
# help of 'interactive' option of 'merge' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3012
#: breezy/builtins.py:4399
6093.2.1 by Jonathan Riddell
add .pot file to archive
3013
msgid "Select changes interactively."
3014
msgstr ""
3015
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3016
#: breezy/builtins.py:4422
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3017
msgid ""
3018
"Merging into empty branches not currently supported, https://bugs.launchpad."
7185.1.1 by Jelmer Vernooij
Update pot file.
3019
"net/bzr/+bug/308562"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3020
msgstr ""
3021
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3022
#: breezy/builtins.py:4444
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3023
msgid "Cannot use --uncommitted with bundles or merge directives."
3024
msgstr ""
3025
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3026
#: breezy/builtins.py:4455
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3027
msgid "Cannot use --uncommitted and --revision at the same time."
3028
msgstr ""
3029
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3030
#: breezy/builtins.py:4475
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3031
msgid "merger: "
3032
msgstr ""
3033
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3034
#: breezy/builtins.py:4477 breezy/bundle/apply_bundle.py:65
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3035
msgid "Nothing to do."
3036
msgstr ""
3037
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3038
#: breezy/builtins.py:4482
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3039
msgid "Cannot pull individual files"
3040
msgstr ""
3041
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3042
#: breezy/builtins.py:4490
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3043
msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3044
msgstr ""
3045
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3046
#: breezy/builtins.py:4548
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3047
#, python-format
3048
msgid "Show-base is not supported for this merge type. %s"
3049
msgstr ""
3050
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3051
#: breezy/builtins.py:4557
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3052
#, python-format
3053
msgid "Conflict reduction is not supported for merge type %s."
3054
msgstr ""
3055
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3056
#: breezy/builtins.py:4561
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3057
msgid "Cannot do conflict reduction and show base."
3058
msgstr ""
3059
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3060
#: breezy/builtins.py:4570
7185.1.1 by Jelmer Vernooij
Update pot file.
3061
msgid "Plan file merge unsupported: Merge type incompatible with tree formats."
3062
msgstr ""
3063
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3064
#: breezy/builtins.py:4681
6581.1.2 by Vincent Ladeuil
Update translation template.
3065
msgid "No location specified or remembered"
3066
msgstr ""
3067
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3068
#: breezy/builtins.py:4683
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3069
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
3070
msgid "{0} remembered {1} location {2}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3071
msgstr ""
3072
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3073
#: breezy/builtins.py:4689
6581.1.2 by Vincent Ladeuil
Update translation template.
3074
msgid "Redo a merge."
3075
msgstr ""
3076
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3077
#: breezy/builtins.py:4691
6093.2.1 by Jonathan Riddell
add .pot file to archive
3078
msgid ""
3079
"Use this if you want to try a different merge technique while resolving\n"
3080
"conflicts.  Some merge techniques are better than others, and remerge\n"
3081
"lets you try different ones on different files."
3082
msgstr ""
3083
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3084
#: breezy/builtins.py:4695
6093.2.1 by Jonathan Riddell
add .pot file to archive
3085
msgid ""
3086
"The options for remerge have the same meaning and defaults as the ones for\n"
3087
"merge.  The difference is that remerge can (only) be run when there is a\n"
3088
"pending merge, and it lets you specify particular files."
3089
msgstr ""
3090
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3091
#: breezy/builtins.py:4699
6093.2.1 by Jonathan Riddell
add .pot file to archive
3092
msgid ""
3093
":Examples:\n"
3094
"    Re-do the merge of all conflicted files, and show the base text in\n"
3095
"    conflict regions, in addition to the usual THIS and OTHER texts::"
3096
msgstr ""
3097
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3098
#: breezy/builtins.py:4703
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3099
msgid "        brz remerge --show-base"
6581.1.2 by Vincent Ladeuil
Update translation template.
3100
msgstr ""
3101
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3102
#: breezy/builtins.py:4705
6093.2.1 by Jonathan Riddell
add .pot file to archive
3103
msgid ""
3104
"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3105
"    additional processing to reduce the size of conflict regions::"
3106
msgstr ""
3107
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3108
#: breezy/builtins.py:4708
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3109
msgid "        brz remerge --merge-type weave --reprocess foobar"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3110
msgstr ""
3111
3112
# help of 'show-base' option of 'merge' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
3113
# help of 'show-base' option of 'pull' command
3114
# help of 'show-base' option of 'remerge' command
3115
# help of 'show-base' option of 'update' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3116
#: breezy/builtins.py:4715
6093.2.1 by Jonathan Riddell
add .pot file to archive
3117
msgid "Show base revision text in conflicts."
3118
msgstr ""
3119
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3120
#: breezy/builtins.py:4728
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3121
msgid ""
3122
"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
3123
"merges."
3124
msgstr ""
3125
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3126
#: breezy/builtins.py:4783
6581.1.2 by Vincent Ladeuil
Update translation template.
3127
msgid ""
3128
"Set files in the working tree back to the contents of a previous revision."
3129
msgstr ""
3130
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3131
#: breezy/builtins.py:4785
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3132
msgid ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
3133
"Giving a list of files will revert only those files.  Otherwise, all files\n"
3134
"will be reverted.  If the revision is not specified with '--revision', the\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3135
"working tree basis revision is used. A revert operation affects only the\n"
3136
"working tree, not any revision history like the branch and repository or\n"
3137
"the working tree basis revision."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3138
msgstr ""
3139
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3140
#: breezy/builtins.py:4791
6093.2.1 by Jonathan Riddell
add .pot file to archive
3141
msgid ""
3142
"To remove only some changes, without reverting to a prior version, use\n"
3143
"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3144
"will remove the changes introduced by the second last commit (-2), without\n"
3145
"affecting the changes introduced by the last commit (-1).  To remove\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3146
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3147
"To update the branch to a specific revision or the latest revision and\n"
3148
"update the working tree accordingly while preserving local changes, see the\n"
3149
"update command."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3150
msgstr ""
3151
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3152
#: breezy/builtins.py:4800
6093.2.1 by Jonathan Riddell
add .pot file to archive
3153
msgid ""
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3154
"Uncommitted changes to files that are reverted will be discarded.\n"
3155
"Howver, by default, any files that have been manually changed will be\n"
3156
"backed up first.  (Files changed only by merge are not backed up.)  Backup\n"
3157
"files have '.~#~' appended to their name, where # is a number."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3158
msgstr ""
3159
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3160
#: breezy/builtins.py:4805
6093.2.1 by Jonathan Riddell
add .pot file to archive
3161
msgid ""
3162
"When you provide files, you can use their current pathname or the pathname\n"
3163
"from the target revision.  So you can use revert to \"undelete\" a file by\n"
3164
"name.  If you name a directory, all the contents of that directory will be\n"
3165
"reverted."
3166
msgstr ""
3167
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3168
#: breezy/builtins.py:4810
6093.2.1 by Jonathan Riddell
add .pot file to archive
3169
msgid ""
3170
"If you have newly added files since the target revision, they will be\n"
3171
"removed.  If the files to be removed have been changed, backups will be\n"
3172
"created as above.  Directories containing unknown files will not be\n"
3173
"deleted."
3174
msgstr ""
3175
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3176
#: breezy/builtins.py:4815
6093.2.1 by Jonathan Riddell
add .pot file to archive
3177
msgid ""
3178
"The working tree contains a list of revisions that have been merged but\n"
3179
"not yet committed. These revisions will be included as additional parents\n"
3180
"of the next commit.  Normally, using revert clears that list as well as\n"
3181
"reverting the files.  If any files are specified, revert leaves the list\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3182
"of uncommitted merges alone and reverts only the files.  Use ``brz revert\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3183
".`` in the tree root to revert all files but keep the recorded merges,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3184
"and ``brz revert --forget-merges`` to clear the pending merge list without\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3185
"reverting any files."
3186
msgstr ""
3187
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3188
#: breezy/builtins.py:4824
6093.2.1 by Jonathan Riddell
add .pot file to archive
3189
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3190
"Using \"brz revert --forget-merges\", it is possible to apply all of the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3191
"changes from a branch in a single revision.  To do this, perform the merge\n"
3192
"as desired.  Then doing revert with the \"--forget-merges\" option will "
3193
"keep\n"
3194
"the content of the tree as it was, but it will clear the list of pending\n"
3195
"merges.  The next commit will then contain all of the changes that are\n"
3196
"present in the other branch, but without any other parent revisions.\n"
3197
"Because this technique forgets where these changes originated, it may\n"
3198
"cause additional conflicts on later merges involving the same source and\n"
3199
"target branches."
3200
msgstr ""
3201
3202
# help of 'no-backup' option of 'revert' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3203
#: breezy/builtins.py:4838
6093.2.1 by Jonathan Riddell
add .pot file to archive
3204
msgid "Do not save backups of reverted files."
3205
msgstr ""
3206
3207
# help of 'forget-merges' option of 'revert' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3208
#: breezy/builtins.py:4840
6093.2.1 by Jonathan Riddell
add .pot file to archive
3209
msgid "Remove pending merge marker, without changing any files."
3210
msgstr ""
3211
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3212
#: breezy/builtins.py:4871
6093.2.1 by Jonathan Riddell
add .pot file to archive
3213
msgid ""
3214
"Show help on a command or other topic.\n"
3215
"    "
3216
msgstr ""
3217
3218
# help of 'long' option of 'help' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3219
#: breezy/builtins.py:4876
6093.2.1 by Jonathan Riddell
add .pot file to archive
3220
msgid "Show help on all commands."
3221
msgstr ""
3222
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3223
#: breezy/builtins.py:4905
6581.1.2 by Vincent Ladeuil
Update translation template.
3224
msgid "Show unmerged/unpulled revisions between two branches."
3225
msgstr ""
3226
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3227
#: breezy/builtins.py:4907
6581.1.2 by Vincent Ladeuil
Update translation template.
3228
msgid "OTHER_BRANCH may be local or remote."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3229
msgstr ""
3230
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3231
#: breezy/builtins.py:4909
6093.2.1 by Jonathan Riddell
add .pot file to archive
3232
msgid ""
3233
"To filter on a range of revisions, you can use the command -r begin..end\n"
3234
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
3235
"also valid."
3236
msgstr ""
3237
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3238
#: breezy/builtins.py:4913
7185.1.1 by Jelmer Vernooij
Update pot file.
3239
msgid ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
3240
":Exit values:\n"
3241
"    1 - some missing revisions\n"
3242
"    0 - no missing revisions"
3243
msgstr ""
3244
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3245
#: breezy/builtins.py:4919
6093.2.1 by Jonathan Riddell
add .pot file to archive
3246
msgid ""
3247
"    Determine the missing revisions between this and the branch at the\n"
3248
"    remembered pull location::"
3249
msgstr ""
3250
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3251
#: breezy/builtins.py:4922
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3252
msgid "        brz missing"
6581.1.2 by Vincent Ladeuil
Update translation template.
3253
msgstr ""
3254
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3255
#: breezy/builtins.py:4924
6581.1.2 by Vincent Ladeuil
Update translation template.
3256
msgid "    Determine the missing revisions between this and another branch::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3257
msgstr ""
3258
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3259
#: breezy/builtins.py:4926
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3260
msgid "        brz missing http://server/branch"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3261
msgstr ""
3262
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3263
#: breezy/builtins.py:4928
6093.2.1 by Jonathan Riddell
add .pot file to archive
3264
msgid ""
3265
"    Determine the missing revisions up to a specific revision on the other\n"
3266
"    branch::"
3267
msgstr ""
3268
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3269
#: breezy/builtins.py:4931
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3270
msgid "        brz missing -r ..-10"
6581.1.2 by Vincent Ladeuil
Update translation template.
3271
msgstr ""
3272
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3273
#: breezy/builtins.py:4933
6093.2.1 by Jonathan Riddell
add .pot file to archive
3274
msgid ""
3275
"    Determine the missing revisions up to a specific revision on this\n"
3276
"    branch::"
3277
msgstr ""
3278
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3279
#: breezy/builtins.py:4936
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3280
msgid "        brz missing --my-revision ..-10"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3281
msgstr ""
3282
3283
# help of 'reverse' option of 'missing' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3284
#: breezy/builtins.py:4943
6093.2.1 by Jonathan Riddell
add .pot file to archive
3285
msgid "Reverse the order of revisions."
3286
msgstr ""
3287
3288
# help of 'mine-only' option of 'missing' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3289
#: breezy/builtins.py:4945
6093.2.1 by Jonathan Riddell
add .pot file to archive
3290
msgid "Display changes in the local branch only."
3291
msgstr ""
3292
3293
# help of 'this' option of 'missing' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3294
#: breezy/builtins.py:4946
6093.2.1 by Jonathan Riddell
add .pot file to archive
3295
msgid "Same as --mine-only."
3296
msgstr ""
3297
3298
# help of 'theirs-only' option of 'missing' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3299
#: breezy/builtins.py:4948
6093.2.1 by Jonathan Riddell
add .pot file to archive
3300
msgid "Display changes in the remote branch only."
3301
msgstr ""
3302
3303
# help of 'other' option of 'missing' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3304
#: breezy/builtins.py:4949
6093.2.1 by Jonathan Riddell
add .pot file to archive
3305
msgid "Same as --theirs-only."
3306
msgstr ""
3307
3308
# help of 'revision' option of 'missing' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3309
#: breezy/builtins.py:4954
6093.2.1 by Jonathan Riddell
add .pot file to archive
3310
msgid ""
3311
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3312
"details."
3313
msgstr ""
3314
3315
# help of 'my-revision' option of 'missing' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3316
#: breezy/builtins.py:4958
6093.2.1 by Jonathan Riddell
add .pot file to archive
3317
msgid ""
3318
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3319
"details."
3320
msgstr ""
3321
6150.1.1 by Jonathan Riddell
update bzr.pot
3322
# help of 'include-merged' option of 'missing' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3323
#: breezy/builtins.py:4961
6093.2.1 by Jonathan Riddell
add .pot file to archive
3324
msgid "Show all revisions in addition to the mainline ones."
3325
msgstr ""
3326
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3327
#: breezy/builtins.py:5002
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3328
msgid "No peer location known or specified."
3329
msgstr ""
3330
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3331
#: breezy/builtins.py:5006
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3332
#, python-brace-format
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3333
msgid "Using saved parent location: {0}\n"
3334
msgstr ""
3335
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3336
#: breezy/builtins.py:5039
6143.1.7 by Jonathan Riddell
update bzr.pot
3337
#, python-format
3338
msgid "You have %d extra revision:\n"
3339
msgid_plural "You have %d extra revisions:\n"
3340
msgstr[0] ""
3341
msgstr[1] ""
3342
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3343
#: breezy/builtins.py:5059
6143.1.7 by Jonathan Riddell
update bzr.pot
3344
#, python-format
3345
msgid "You are missing %d revision:\n"
3346
msgid_plural "You are missing %d revisions:\n"
3347
msgstr[0] ""
3348
msgstr[1] ""
3349
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3350
#: breezy/builtins.py:5074
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3351
msgid "This branch has no new revisions.\n"
3352
msgstr ""
3353
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3354
#: breezy/builtins.py:5077
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3355
msgid "Other branch has no new revisions.\n"
3356
msgstr ""
3357
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3358
#: breezy/builtins.py:5082
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3359
msgid "Branches are up to date.\n"
3360
msgstr ""
3361
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3362
#: breezy/builtins.py:5093
6581.1.2 by Vincent Ladeuil
Update translation template.
3363
msgid "Compress the data within a repository."
3364
msgstr ""
3365
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3366
#: breezy/builtins.py:5095
6093.2.1 by Jonathan Riddell
add .pot file to archive
3367
msgid ""
3368
"This operation compresses the data within a bazaar repository. As\n"
3369
"bazaar supports automatic packing of repository, this operation is\n"
3370
"normally not required to be done manually."
3371
msgstr ""
3372
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3373
#: breezy/builtins.py:5099
6093.2.1 by Jonathan Riddell
add .pot file to archive
3374
msgid ""
3375
"During the pack operation, bazaar takes a backup of existing repository\n"
3376
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3377
"automatically when it is safe to do so. To save disk space by removing\n"
3378
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3379
"used."
3380
msgstr ""
3381
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3382
#: breezy/builtins.py:5105
6093.2.1 by Jonathan Riddell
add .pot file to archive
3383
msgid ""
3384
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3385
"during or immediately after repacking, you may be left with a state\n"
3386
"where the deletion has been written to disk but the new packs have not\n"
3387
"been. In this case the repository may be unusable."
3388
msgstr ""
3389
3390
# help of 'clean-obsolete-packs' option of 'pack' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3391
#: breezy/builtins.py:5115
6093.2.1 by Jonathan Riddell
add .pot file to archive
3392
msgid "Delete obsolete packs to save disk space."
3393
msgstr ""
3394
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3395
#: breezy/builtins.py:5129
6581.1.2 by Vincent Ladeuil
Update translation template.
3396
msgid "List the installed plugins."
3397
msgstr ""
3398
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3399
#: breezy/builtins.py:5131
6093.2.1 by Jonathan Riddell
add .pot file to archive
3400
msgid ""
3401
"This command displays the list of installed plugins including\n"
3402
"version of plugin and a short description of each."
3403
msgstr ""
3404
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3405
#: breezy/builtins.py:5134
6581.1.2 by Vincent Ladeuil
Update translation template.
3406
msgid "--verbose shows the path where each plugin is located."
3407
msgstr ""
3408
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3409
#: breezy/builtins.py:5136
6093.2.1 by Jonathan Riddell
add .pot file to archive
3410
msgid ""
3411
"A plugin is an external component for Bazaar that extends the\n"
3412
"revision control system, by adding or replacing code in Bazaar.\n"
3413
"Plugins can do a variety of things, including overriding commands,\n"
3414
"adding new commands, providing additional network transports and\n"
3415
"customizing log output."
3416
msgstr ""
3417
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3418
#: breezy/builtins.py:5142
6093.2.1 by Jonathan Riddell
add .pot file to archive
3419
msgid ""
3420
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3421
"for further information on plugins including where to find them and how to\n"
3422
"install them. Instructions are also provided there on how to write new\n"
3423
"plugins using the Python programming language."
3424
msgstr ""
3425
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3426
#: breezy/builtins.py:5158
6093.2.1 by Jonathan Riddell
add .pot file to archive
3427
msgid "Show testament (signing-form) of a revision."
3428
msgstr ""
3429
3430
# help of 'long' option of 'testament' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3431
#: breezy/builtins.py:5161
6093.2.1 by Jonathan Riddell
add .pot file to archive
3432
msgid "Produce long-format testament."
3433
msgstr ""
3434
3435
# help of 'strict' option of 'testament' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3436
#: breezy/builtins.py:5163
6093.2.1 by Jonathan Riddell
add .pot file to archive
3437
msgid "Produce a strict-format testament."
3438
msgstr ""
3439
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3440
#: breezy/builtins.py:5191
6093.2.1 by Jonathan Riddell
add .pot file to archive
3441
msgid "Show the origin of each line in a file."
3442
msgstr ""
3443
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3444
#: breezy/builtins.py:5193
6093.2.1 by Jonathan Riddell
add .pot file to archive
3445
msgid ""
3446
"This prints out the given file with an annotation on the left side\n"
3447
"indicating which revision, author and date introduced the change."
3448
msgstr ""
3449
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3450
#: breezy/builtins.py:5196
6093.2.1 by Jonathan Riddell
add .pot file to archive
3451
msgid ""
3452
"If the origin is the same for a run of consecutive lines, it is\n"
3453
"shown only at the top, unless the --all option is given."
3454
msgstr ""
3455
3456
# help of 'all' option of 'annotate' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3457
#: breezy/builtins.py:5204
6093.2.1 by Jonathan Riddell
add .pot file to archive
3458
msgid "Show annotations on all lines."
3459
msgstr ""
3460
3461
# help of 'long' option of 'annotate' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3462
#: breezy/builtins.py:5205
6093.2.1 by Jonathan Riddell
add .pot file to archive
3463
msgid "Show commit date in annotations."
3464
msgstr ""
3465
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3466
#: breezy/builtins.py:5293
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3467
msgid "Cannot sign a range of non-revision-history revisions"
3468
msgstr ""
3469
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3470
#: breezy/builtins.py:5306
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3471
msgid "Please supply either one revision, or a range."
3472
msgstr ""
3473
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3474
#: breezy/builtins.py:5310
6093.2.1 by Jonathan Riddell
add .pot file to archive
3475
msgid ""
3476
"Convert the current branch into a checkout of the supplied branch.\n"
3477
"If no branch is supplied, rebind to the last bound location."
3478
msgstr ""
3479
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3480
#: breezy/builtins.py:5313
6093.2.1 by Jonathan Riddell
add .pot file to archive
3481
msgid ""
3482
"Once converted into a checkout, commits must succeed on the master branch\n"
3483
"before they will be applied to the local branch."
3484
msgstr ""
3485
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3486
#: breezy/builtins.py:5316
6093.2.1 by Jonathan Riddell
add .pot file to archive
3487
msgid ""
3488
"Bound branches use the nickname of its master branch unless it is set\n"
3489
"locally, in which case binding will update the local nickname to be\n"
3490
"that of the master."
3491
msgstr ""
3492
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3493
#: breezy/builtins.py:5332
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3494
msgid "No location supplied.  This format does not remember old locations."
3495
msgstr ""
3496
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3497
#: breezy/builtins.py:5338
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3498
msgid "Branch is already bound"
3499
msgstr ""
3500
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3501
#: breezy/builtins.py:5341
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3502
msgid "No location supplied and no previous location known"
3503
msgstr ""
3504
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3505
#: breezy/builtins.py:5348
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3506
msgid "These branches have diverged. Try merging, and then bind again."
3507
msgstr ""
3508
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3509
#: breezy/builtins.py:5355
6093.2.1 by Jonathan Riddell
add .pot file to archive
3510
msgid "Convert the current checkout into a regular branch."
3511
msgstr ""
3512
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3513
#: breezy/builtins.py:5357
6093.2.1 by Jonathan Riddell
add .pot file to archive
3514
msgid ""
3515
"After unbinding, the local branch is considered independent and subsequent\n"
3516
"commits will be local only."
3517
msgstr ""
3518
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3519
#: breezy/builtins.py:5368
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3520
msgid "Local branch is not bound"
3521
msgstr ""
3522
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3523
#: breezy/builtins.py:5372
6093.2.1 by Jonathan Riddell
add .pot file to archive
3524
msgid "Remove the last committed revision."
3525
msgstr ""
3526
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3527
#: breezy/builtins.py:5374
6093.2.1 by Jonathan Riddell
add .pot file to archive
3528
msgid ""
3529
"--verbose will print out what is being removed.\n"
3530
"--dry-run will go through all the motions, but not actually\n"
3531
"remove anything."
3532
msgstr ""
3533
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3534
#: breezy/builtins.py:5378
6093.2.1 by Jonathan Riddell
add .pot file to archive
3535
msgid ""
3536
"If --revision is specified, uncommit revisions to leave the branch at the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3537
"specified revision.  For example, \"brz uncommit -r 15\" will leave the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3538
"branch at revision 15."
3539
msgstr ""
3540
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3541
#: breezy/builtins.py:5382
6093.2.1 by Jonathan Riddell
add .pot file to archive
3542
msgid ""
3543
"Uncommit leaves the working tree ready for a new commit.  The only change\n"
3544
"it may make is to restore any pending merges that were present before\n"
3545
"the commit."
3546
msgstr ""
3547
3548
# help of 'dry-run' option of 'uncommit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3549
#: breezy/builtins.py:5393
6093.2.1 by Jonathan Riddell
add .pot file to archive
3550
msgid "Don't actually make changes."
3551
msgstr ""
3552
3553
# help of 'force' option of 'uncommit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3554
#: breezy/builtins.py:5394
6093.2.1 by Jonathan Riddell
add .pot file to archive
3555
msgid "Say yes to all questions."
3556
msgstr ""
3557
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
3558
# help of 'keep-tags' option of 'uncommit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3559
#: breezy/builtins.py:5396
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
3560
msgid "Keep tags that point to removed revisions."
3561
msgstr ""
3562
6093.2.1 by Jonathan Riddell
add .pot file to archive
3563
# help of 'local' option of 'uncommit' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3564
#: breezy/builtins.py:5398
6093.2.1 by Jonathan Riddell
add .pot file to archive
3565
msgid "Only remove the commits from the local branch when in a checkout."
3566
msgstr ""
3567
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3568
#: breezy/builtins.py:5447
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3569
msgid "No revisions to uncommit.\n"
3570
msgstr ""
3571
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3572
#: breezy/builtins.py:5462
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3573
msgid "Dry-run, pretending to remove the above revisions.\n"
3574
msgstr ""
3575
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3576
#: breezy/builtins.py:5466
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3577
msgid "The above revision(s) will be removed.\n"
3578
msgstr ""
3579
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3580
#: breezy/builtins.py:5470
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3581
msgid "Uncommit these revisions"
3582
msgstr ""
3583
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3584
#: breezy/builtins.py:5473
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3585
msgid "Canceled\n"
3586
msgstr ""
3587
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3588
#: breezy/builtins.py:5481
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3589
#, python-format
3590
msgid ""
3591
"You can restore the old tip by running:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3592
"  brz pull . -r revid:%s\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3593
msgstr ""
3594
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3595
#: breezy/builtins.py:5487
6093.2.1 by Jonathan Riddell
add .pot file to archive
3596
msgid "Break a dead lock."
3597
msgstr ""
3598
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3599
#: breezy/builtins.py:5489
6093.2.1 by Jonathan Riddell
add .pot file to archive
3600
msgid ""
3601
"This command breaks a lock on a repository, branch, working directory or\n"
3602
"config file."
3603
msgstr ""
3604
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3605
#: breezy/builtins.py:5492
6093.2.1 by Jonathan Riddell
add .pot file to archive
3606
msgid ""
3607
"CAUTION: Locks should only be broken when you are sure that the process\n"
3608
"holding the lock has been stopped."
3609
msgstr ""
3610
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3611
#: breezy/builtins.py:5495
6093.2.1 by Jonathan Riddell
add .pot file to archive
3612
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3613
"You can get information on what locks are open via the 'brz info\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3614
"[location]' command."
3615
msgstr ""
3616
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3617
#: breezy/builtins.py:5498
6093.2.1 by Jonathan Riddell
add .pot file to archive
3618
msgid ""
3619
":Examples:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3620
"    brz break-lock\n"
3621
"    brz break-lock brz+ssh://example.com/brz/foo\n"
3622
"    brz break-lock --conf ~/.bazaar"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3623
msgstr ""
3624
3625
# help of 'config' option of 'break-lock' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3626
#: breezy/builtins.py:5507
6093.2.1 by Jonathan Riddell
add .pot file to archive
3627
msgid "LOCATION is the directory where the config lock is."
3628
msgstr ""
3629
3630
# help of 'force' option of 'break-lock' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3631
#: breezy/builtins.py:5509
6093.2.1 by Jonathan Riddell
add .pot file to archive
3632
msgid "Do not ask for confirmation before breaking the lock."
3633
msgstr ""
3634
7185.1.1 by Jelmer Vernooij
Update pot file.
3635
# help of 'protocol=git' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3636
#: breezy/builtins.py:5544
7185.1.1 by Jelmer Vernooij
Update pot file.
3637
msgid "Git Smart server protocol over TCP. (default port: 9418)"
3638
msgstr ""
3639
3640
# help of 'protocol=git-receive-pack' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3641
#: breezy/builtins.py:5544
7185.1.1 by Jelmer Vernooij
Update pot file.
3642
msgid "Git Smart server receive pack command. (inetd mode only)"
3643
msgstr ""
3644
3645
# help of 'protocol=git-upload-pack' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3646
#: breezy/builtins.py:5544
7185.1.1 by Jelmer Vernooij
Update pot file.
3647
msgid "Git Smart server upload pack command. (inetd mode only)"
3648
msgstr ""
3649
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3650
# help of 'protocol=bzr' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3651
#: breezy/builtins.py:5544
6581.1.2 by Vincent Ladeuil
Update translation template.
3652
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3653
msgstr ""
3654
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3655
#: breezy/builtins.py:5545
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3656
msgid "Run the brz server."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3657
msgstr ""
3658
3659
# help of 'inet' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3660
#: breezy/builtins.py:5551
6093.2.1 by Jonathan Riddell
add .pot file to archive
3661
msgid "Serve on stdin/out for use from inetd or sshd."
3662
msgstr ""
3663
3664
# title of 'protocol' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3665
#: breezy/builtins.py:5552
6093.2.1 by Jonathan Riddell
add .pot file to archive
3666
msgid "protocol"
3667
msgstr ""
3668
3669
# help of 'protocol' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3670
#: breezy/builtins.py:5553
6093.2.1 by Jonathan Riddell
add .pot file to archive
3671
msgid "Protocol to serve."
3672
msgstr ""
3673
6504.1.1 by Vincent Ladeuil
Update translation template
3674
# help of 'listen' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3675
#: breezy/builtins.py:5558
6504.1.1 by Vincent Ladeuil
Update translation template
3676
msgid "Listen for connections on nominated address."
3677
msgstr ""
3678
6093.2.1 by Jonathan Riddell
add .pot file to archive
3679
# help of 'port' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3680
#: breezy/builtins.py:5561
6093.2.1 by Jonathan Riddell
add .pot file to archive
3681
msgid ""
6504.1.1 by Vincent Ladeuil
Update translation template
3682
"Listen for connections on nominated port.  Passing 0 as the port number will "
3683
"result in a dynamically allocated port.  The default port depends on the "
3684
"protocol."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3685
msgstr ""
3686
3687
# help of 'directory' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3688
#: breezy/builtins.py:5566
6093.2.1 by Jonathan Riddell
add .pot file to archive
3689
msgid "Serve contents of this directory."
3690
msgstr ""
3691
3692
# help of 'allow-writes' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3693
#: breezy/builtins.py:5568
6093.2.1 by Jonathan Riddell
add .pot file to archive
3694
msgid ""
3695
"By default the server is a readonly server.  Supplying --allow-writes "
3696
"enables write access to the contents of the served directory and below.  "
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3697
"Note that ``brz serve`` does not perform authentication, so unless some form "
6093.2.1 by Jonathan Riddell
add .pot file to archive
3698
"of external authentication is arranged supplying this option leads to global "
3699
"uncontrolled write access to your file system."
3700
msgstr ""
3701
6252.1.1 by Vincent Ladeuil
Release 2.5b3
3702
# help of 'client-timeout' option of 'serve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3703
#: breezy/builtins.py:5577
6252.1.1 by Vincent Ladeuil
Release 2.5b3
3704
msgid "Override the default idle client timeout (5min)."
3705
msgstr ""
3706
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3707
#: breezy/builtins.py:5595
6093.2.1 by Jonathan Riddell
add .pot file to archive
3708
msgid "Combine a tree into its containing tree."
3709
msgstr ""
3710
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3711
#: breezy/builtins.py:5597
6093.2.1 by Jonathan Riddell
add .pot file to archive
3712
msgid "This command requires the target tree to be in a rich-root format."
3713
msgstr ""
3714
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3715
#: breezy/builtins.py:5599
6093.2.1 by Jonathan Riddell
add .pot file to archive
3716
msgid ""
3717
"The TREE argument should be an independent tree, inside another tree, but\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3718
"not part of it.  (Such trees can be produced by \"brz split\", but also by\n"
3719
"running \"brz branch\" with the target inside a tree.)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3720
msgstr ""
3721
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3722
#: breezy/builtins.py:5603
6093.2.1 by Jonathan Riddell
add .pot file to archive
3723
msgid ""
3724
"The result is a combined tree, with the subtree no longer an independent\n"
3725
"part.  This is marked as a merge of the subtree into the containing tree,\n"
3726
"and all history is preserved."
3727
msgstr ""
3728
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3729
#: breezy/builtins.py:5622
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3730
#, python-format
3731
msgid ""
3732
"Can't join trees because %s doesn't support rich root data.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3733
"You can use brz upgrade on the repository."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3734
msgstr ""
3735
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3736
#: breezy/builtins.py:5632 breezy/builtins.py:5638
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3737
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
3738
msgid "Cannot join {0}.  {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3739
msgstr ""
3740
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3741
#: breezy/builtins.py:5642
6093.2.1 by Jonathan Riddell
add .pot file to archive
3742
msgid "Split a subdirectory of a tree into a separate tree."
3743
msgstr ""
3744
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3745
#: breezy/builtins.py:5644
6093.2.1 by Jonathan Riddell
add .pot file to archive
3746
msgid ""
3747
"This command will produce a target tree in a format that supports\n"
3748
"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
3749
"converted into earlier formats like 'dirstate-tags'."
3750
msgstr ""
3751
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3752
#: breezy/builtins.py:5648
6093.2.1 by Jonathan Riddell
add .pot file to archive
3753
msgid ""
3754
"The TREE argument should be a subdirectory of a working tree.  That\n"
3755
"subdirectory will be converted into an independent tree, with its own\n"
3756
"branch.  Commits in the top-level tree will not apply to the new subtree."
3757
msgstr ""
3758
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3759
#: breezy/builtins.py:5730
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3760
msgid "No submit branch specified or known"
3761
msgstr ""
3762
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3763
#: breezy/builtins.py:5740 breezy/send.py:109
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3764
msgid "No public branch specified or known"
3765
msgstr ""
3766
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3767
#: breezy/builtins.py:5745
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3768
msgid "brz merge-directive takes at most two one revision identifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3769
msgstr ""
3770
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3771
#: breezy/builtins.py:5754
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3772
msgid "No revisions to bundle."
3773
msgstr ""
3774
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3775
#: breezy/builtins.py:5773
6093.2.1 by Jonathan Riddell
add .pot file to archive
3776
msgid "Mail or create a merge-directive for submitting changes."
3777
msgstr ""
3778
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3779
#: breezy/builtins.py:5775
6093.2.1 by Jonathan Riddell
add .pot file to archive
3780
msgid "A merge directive provides many things needed for requesting merges:"
3781
msgstr ""
3782
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3783
#: breezy/builtins.py:5777
6093.2.1 by Jonathan Riddell
add .pot file to archive
3784
msgid "* A machine-readable description of the merge to perform"
3785
msgstr ""
3786
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3787
#: breezy/builtins.py:5779
6093.2.1 by Jonathan Riddell
add .pot file to archive
3788
msgid "* An optional patch that is a preview of the changes requested"
3789
msgstr ""
3790
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3791
#: breezy/builtins.py:5781
6093.2.1 by Jonathan Riddell
add .pot file to archive
3792
msgid ""
3793
"* An optional bundle of revision data, so that the changes can be applied\n"
3794
"  directly from the merge directive, without retrieving data from a\n"
3795
"  branch."
3796
msgstr ""
3797
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3798
#: breezy/builtins.py:5785
6093.2.1 by Jonathan Riddell
add .pot file to archive
3799
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3800
"`brz send` creates a compact data set that, when applied using brz\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
3801
"merge, has the same effect as merging from the source branch."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3802
msgstr ""
3803
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3804
#: breezy/builtins.py:5788
6093.2.1 by Jonathan Riddell
add .pot file to archive
3805
msgid ""
3806
"By default the merge directive is self-contained and can be applied to any\n"
3807
"branch containing submit_branch in its ancestory without needing access to\n"
3808
"the source branch."
3809
msgstr ""
3810
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3811
#: breezy/builtins.py:5792
6093.2.1 by Jonathan Riddell
add .pot file to archive
3812
msgid ""
3813
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3814
"revisions, but only a structured request to merge from the\n"
3815
"public_location.  In that case the public_branch is needed and it must be\n"
3816
"up-to-date and accessible to the recipient.  The public_branch is always\n"
3817
"included if known, so that people can check it later."
3818
msgstr ""
3819
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3820
#: breezy/builtins.py:5798
6093.2.1 by Jonathan Riddell
add .pot file to archive
3821
msgid ""
3822
"The submit branch defaults to the parent of the source branch, but can be\n"
3823
"overridden.  Both submit branch and public branch will be remembered in\n"
3824
"branch.conf the first time they are used for a particular branch.  The\n"
3825
"source branch defaults to that containing the working directory, but can\n"
3826
"be changed using --from."
3827
msgstr ""
3828
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3829
#: breezy/builtins.py:5804
6093.2.1 by Jonathan Riddell
add .pot file to archive
3830
msgid ""
3831
"Both the submit branch and the public branch follow the usual behavior with\n"
3832
"respect to --remember: If there is no default location set, the first send\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
3833
"will set it (use --no-remember to avoid setting it). After that, you can\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3834
"omit the location to use the default.  To change the default, use\n"
3835
"--remember. The value will only be saved if the location can be accessed."
3836
msgstr ""
3837
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3838
#: breezy/builtins.py:5810
6093.2.1 by Jonathan Riddell
add .pot file to archive
3839
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3840
"In order to calculate those changes, brz must analyse the submit branch.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3841
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3842
"If a public location is known for the submit_branch, that location is used\n"
3843
"in the merge directive."
3844
msgstr ""
3845
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3846
#: breezy/builtins.py:5815
6093.2.1 by Jonathan Riddell
add .pot file to archive
3847
msgid ""
3848
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3849
"given, in which case it is sent to a file."
3850
msgstr ""
3851
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3852
#: breezy/builtins.py:5818
6093.2.1 by Jonathan Riddell
add .pot file to archive
3853
msgid ""
3854
"Mail is sent using your preferred mail program.  This should be transparent\n"
3855
"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
3856
"If the preferred client can't be found (or used), your editor will be used."
3857
msgstr ""
3858
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3859
#: breezy/builtins.py:5822
6093.2.1 by Jonathan Riddell
add .pot file to archive
3860
msgid ""
3861
"To use a specific mail program, set the mail_client configuration option.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
3862
"Supported values for specific clients are \"claws\", \"evolution\", \"kmail"
3863
"\",\n"
3864
"\"mail.app\" (MacOS X's Mail.app), \"mutt\", and \"thunderbird\"; generic "
3865
"options\n"
3866
"are \"default\", \"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  "
3867
"Plugins\n"
3868
"may also add supported clients."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3869
msgstr ""
3870
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3871
#: breezy/builtins.py:5828
6093.2.1 by Jonathan Riddell
add .pot file to archive
3872
msgid ""
3873
"If mail is being sent, a to address is required.  This can be supplied\n"
3874
"either on the commandline, by setting the submit_to configuration\n"
3875
"option in the branch itself or the child_submit_to configuration option\n"
3876
"in the submit branch."
3877
msgstr ""
3878
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3879
#: breezy/builtins.py:5833
6093.2.1 by Jonathan Riddell
add .pot file to archive
3880
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3881
"The merge directives created by brz send may be applied using brz merge or\n"
3882
"brz pull by specifying a file containing a merge directive as the location."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3883
msgstr ""
3884
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3885
#: breezy/builtins.py:5836
6093.2.1 by Jonathan Riddell
add .pot file to archive
3886
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3887
"brz send makes extensive use of public locations to map local locations "
6093.2.1 by Jonathan Riddell
add .pot file to archive
3888
"into\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3889
"URLs that can be used by other people.  See `brz help configuration` to\n"
3890
"set them, and use `brz info` to display them."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3891
msgstr ""
3892
3893
# help of 'output' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3894
#: breezy/builtins.py:5860
6093.2.1 by Jonathan Riddell
add .pot file to archive
3895
msgid "Write merge directive to this file or directory; use - for stdout."
3896
msgstr ""
3897
3898
# help of 'strict' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3899
#: breezy/builtins.py:5864
6093.2.1 by Jonathan Riddell
add .pot file to archive
3900
msgid ""
3901
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3902
"strict disables the check."
3903
msgstr ""
3904
3905
# help of 'mail-to' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3906
#: breezy/builtins.py:5866
6093.2.1 by Jonathan Riddell
add .pot file to archive
3907
msgid "Mail the request to this address."
3908
msgstr ""
3909
3910
# help of 'body' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3911
#: breezy/builtins.py:5870
6093.2.1 by Jonathan Riddell
add .pot file to archive
3912
msgid "Body for the email."
3913
msgstr ""
3914
3915
# help of 'no-bundle' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3916
#: breezy/builtins.py:5917
6093.2.1 by Jonathan Riddell
add .pot file to archive
3917
msgid "Do not include a bundle in the merge directive."
3918
msgstr ""
3919
3920
# help of 'no-patch' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3921
#: breezy/builtins.py:5918
6093.2.1 by Jonathan Riddell
add .pot file to archive
3922
msgid "Do not include a preview patch in the merge directive."
3923
msgstr ""
3924
3925
# help of 'remember' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3926
#: breezy/builtins.py:5921
6093.2.1 by Jonathan Riddell
add .pot file to archive
3927
msgid "Remember submit and public branch."
3928
msgstr ""
3929
3930
# help of 'from' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3931
#: breezy/builtins.py:5923
6093.2.1 by Jonathan Riddell
add .pot file to archive
3932
msgid ""
3933
"Branch to generate the submission from, rather than the one containing the "
3934
"working directory."
3935
msgstr ""
3936
3937
# title of 'format' option of 'send' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
3938
# title of 'format' option of 'version-info' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3939
#: breezy/builtins.py:5933 breezy/cmd_version_info.py:77
6093.2.1 by Jonathan Riddell
add .pot file to archive
3940
msgid "format"
3941
msgstr ""
3942
3943
# help of 'format' option of 'send' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3944
#: breezy/builtins.py:5934
6093.2.1 by Jonathan Riddell
add .pot file to archive
3945
msgid "Use the specified output format."
3946
msgstr ""
3947
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3948
#: breezy/builtins.py:5956
6093.2.1 by Jonathan Riddell
add .pot file to archive
3949
msgid "Create, remove or modify a tag naming a revision."
3950
msgstr ""
3951
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3952
#: breezy/builtins.py:5958
6093.2.1 by Jonathan Riddell
add .pot file to archive
3953
msgid ""
3954
"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
3955
"(--revision) option can be given -rtag:X, where X is any previously\n"
3956
"created tag."
3957
msgstr ""
3958
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3959
#: breezy/builtins.py:5962
6093.2.1 by Jonathan Riddell
add .pot file to archive
3960
msgid ""
3961
"Tags are stored in the branch.  Tags are copied from one branch to another\n"
3962
"along when you branch, push, pull or merge."
3963
msgstr ""
3964
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3965
#: breezy/builtins.py:5965
6093.2.1 by Jonathan Riddell
add .pot file to archive
3966
msgid ""
3967
"It is an error to give a tag name that already exists unless you pass\n"
3968
"--force, in which case the tag is moved to point to the new revision."
3969
msgstr ""
3970
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3971
#: breezy/builtins.py:5968
6093.2.1 by Jonathan Riddell
add .pot file to archive
3972
msgid ""
3973
"To rename a tag (change the name but keep it on the same revsion), run "
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3974
"``brz\n"
3975
"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3976
msgstr ""
3977
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3978
#: breezy/builtins.py:5971
6093.2.1 by Jonathan Riddell
add .pot file to archive
3979
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
3980
"If no tag name is specified it will be determined through the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3981
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3982
"upstream releases by reading configure.ac. See ``brz help hooks`` for\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3983
"details."
3984
msgstr ""
3985
3986
# help of 'delete' option of 'tag' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3987
#: breezy/builtins.py:5981
6093.2.1 by Jonathan Riddell
add .pot file to archive
3988
msgid "Delete this tag rather than placing it."
3989
msgstr ""
3990
3991
# help of 'directory' option of 'tag' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3992
#: breezy/builtins.py:5984
6093.2.1 by Jonathan Riddell
add .pot file to archive
3993
msgid "Branch in which to place the tag."
3994
msgstr ""
3995
3996
# help of 'force' option of 'tag' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
3997
#: breezy/builtins.py:5986
6093.2.1 by Jonathan Riddell
add .pot file to archive
3998
msgid "Replace existing tags."
3999
msgstr ""
4000
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4001
#: breezy/builtins.py:6002
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4002
msgid "No tag specified to delete."
4003
msgstr ""
4004
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4005
#: breezy/builtins.py:6004
6504.1.1 by Vincent Ladeuil
Update translation template
4006
#, python-format
4007
msgid "Deleted tag %s."
4008
msgstr ""
4009
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4010
#: breezy/builtins.py:6009
6581.1.2 by Vincent Ladeuil
Update translation template.
4011
msgid "Tags can only be placed on a single revision, not on a range"
4012
msgstr ""
4013
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4014
#: breezy/builtins.py:6018
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4015
msgid "Please specify a tag name."
4016
msgstr ""
4017
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4018
#: breezy/builtins.py:6026
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4019
#, python-format
4020
msgid "Tag %s already exists for that revision."
4021
msgstr ""
4022
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4023
#: breezy/builtins.py:6030
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4024
#, python-format
4025
msgid "Created tag %s."
4026
msgstr ""
4027
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4028
#: breezy/builtins.py:6032
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4029
#, python-format
4030
msgid "Updated tag %s."
4031
msgstr ""
4032
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4033
#: breezy/builtins.py:6036
6093.2.1 by Jonathan Riddell
add .pot file to archive
4034
msgid "List tags."
4035
msgstr ""
4036
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4037
#: breezy/builtins.py:6038
6093.2.1 by Jonathan Riddell
add .pot file to archive
4038
msgid ""
4039
"This command shows a table of tag names and the revisions they reference."
4040
msgstr ""
4041
4042
# help of 'directory' option of 'tags' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4043
#: breezy/builtins.py:6044
6093.2.1 by Jonathan Riddell
add .pot file to archive
4044
msgid "Branch whose tags should be displayed."
4045
msgstr ""
4046
4047
# help of 'sort' option of 'tags' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4048
#: breezy/builtins.py:6046
6093.2.1 by Jonathan Riddell
add .pot file to archive
4049
msgid "Sort tags by different criteria."
4050
msgstr ""
4051
4052
# title of 'sort' option of 'tags' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4053
#: breezy/builtins.py:6046
6093.2.1 by Jonathan Riddell
add .pot file to archive
4054
msgid "Sorting"
4055
msgstr ""
4056
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4057
#: breezy/builtins.py:6116
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4058
msgid "Reconfigure the type of a brz directory."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4059
msgstr ""
4060
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4061
#: breezy/builtins.py:6118
6093.2.1 by Jonathan Riddell
add .pot file to archive
4062
msgid "A target configuration must be specified."
4063
msgstr ""
4064
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4065
#: breezy/builtins.py:6120
6093.2.1 by Jonathan Riddell
add .pot file to archive
4066
msgid ""
4067
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4068
"The order of preference is\n"
4069
"1. For a lightweight checkout, the current bound location.\n"
4070
"2. For branches that used to be checkouts, the previously-bound location.\n"
4071
"3. The push location.\n"
4072
"4. The parent location.\n"
4073
"If none of these is available, --bind-to must be specified."
4074
msgstr ""
4075
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4076
# title of 'tree_type' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4077
#: breezy/builtins.py:6134
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4078
msgid "Tree type"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4079
msgstr ""
4080
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4081
# help of 'tree_type' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4082
#: breezy/builtins.py:6135
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4083
msgid "The relation between branch and tree."
4084
msgstr ""
4085
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4086
# help of 'tree_type=branch' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4087
#: breezy/builtins.py:6137
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4088
msgid "Reconfigure to be an unbound branch with no working tree."
4089
msgstr ""
4090
4091
# help of 'tree_type=tree' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4092
#: breezy/builtins.py:6138
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4093
msgid "Reconfigure to be an unbound branch with a working tree."
4094
msgstr ""
4095
4096
# help of 'tree_type=checkout' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4097
#: breezy/builtins.py:6139
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4098
msgid "Reconfigure to be a bound branch with a working tree."
4099
msgstr ""
4100
4101
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4102
#: breezy/builtins.py:6140
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4103
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4104
msgstr ""
4105
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4106
# title of 'repository_type' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4107
#: breezy/builtins.py:6145
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4108
msgid "Repository type"
4109
msgstr ""
4110
4111
# help of 'repository_type' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4112
#: breezy/builtins.py:6146
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4113
msgid "Location fo the repository."
4114
msgstr ""
4115
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4116
# help of 'repository_type=standalone' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4117
#: breezy/builtins.py:6148
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4118
msgid ""
4119
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4120
msgstr ""
4121
4122
# help of 'repository_type=use-shared' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4123
#: breezy/builtins.py:6150
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4124
msgid "Reconfigure to use a shared repository."
4125
msgstr ""
4126
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4127
# title of 'repository_trees' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4128
#: breezy/builtins.py:6154
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4129
msgid "Trees in Repository"
4130
msgstr ""
4131
4132
# help of 'repository_trees' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4133
#: breezy/builtins.py:6155
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4134
msgid "Whether new branches in the repository have trees."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4135
msgstr ""
4136
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4137
# help of 'repository_trees=with-trees' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4138
#: breezy/builtins.py:6157
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4139
msgid "Reconfigure repository to create working trees on branches by default."
4140
msgstr ""
4141
4142
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4143
#: breezy/builtins.py:6159
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4144
msgid ""
4145
"Reconfigure repository to not create working trees on branches by default."
4146
msgstr ""
4147
6093.2.1 by Jonathan Riddell
add .pot file to archive
4148
# help of 'bind-to' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4149
#: breezy/builtins.py:6162
6093.2.1 by Jonathan Riddell
add .pot file to archive
4150
msgid "Branch to bind checkout to."
4151
msgstr ""
4152
4153
# help of 'force' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4154
#: breezy/builtins.py:6164
6093.2.1 by Jonathan Riddell
add .pot file to archive
4155
msgid "Perform reconfiguration even if local changes will be lost."
4156
msgstr ""
4157
4158
# help of 'stacked-on' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4159
#: breezy/builtins.py:6167
6093.2.1 by Jonathan Riddell
add .pot file to archive
4160
msgid "Reconfigure a branch to be stacked on another branch."
4161
msgstr ""
4162
4163
# help of 'unstacked' option of 'reconfigure' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4164
#: breezy/builtins.py:6171
6093.2.1 by Jonathan Riddell
add .pot file to archive
4165
msgid ""
4166
"Reconfigure a branch to be unstacked.  This may require copying substantial "
4167
"data into it."
4168
msgstr ""
4169
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4170
#: breezy/builtins.py:6182
6504.1.1 by Vincent Ladeuil
Update translation template
4171
msgid "Can't use both --stacked-on and --unstacked"
4172
msgstr ""
4173
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4174
#: breezy/builtins.py:6196
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4175
msgid "No target configuration specified"
4176
msgstr ""
4177
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4178
#: breezy/builtins.py:6231
6093.2.1 by Jonathan Riddell
add .pot file to archive
4179
msgid "Set the branch of a checkout and update."
4180
msgstr ""
4181
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4182
#: breezy/builtins.py:6233
6093.2.1 by Jonathan Riddell
add .pot file to archive
4183
msgid ""
4184
"For lightweight checkouts, this changes the branch being referenced.\n"
4185
"For heavyweight checkouts, this checks that there are no local commits\n"
4186
"versus the current bound branch, then it makes the local branch a mirror\n"
4187
"of the new location and binds to it."
4188
msgstr ""
4189
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4190
#: breezy/builtins.py:6238
6093.2.1 by Jonathan Riddell
add .pot file to archive
4191
msgid ""
4192
"In both cases, the working tree is updated and uncommitted changes\n"
4193
"are merged. The user can commit or revert these as they desire."
4194
msgstr ""
4195
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4196
#: breezy/builtins.py:6241
6093.2.1 by Jonathan Riddell
add .pot file to archive
4197
msgid "Pending merges need to be committed or reverted before using switch."
4198
msgstr ""
4199
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4200
#: breezy/builtins.py:6243
6093.2.1 by Jonathan Riddell
add .pot file to archive
4201
msgid ""
4202
"The path to the branch to switch to can be specified relative to the parent\n"
4203
"directory of the current branch. For example, if you are currently in a\n"
4204
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4205
"/path/to/newbranch."
4206
msgstr ""
4207
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4208
#: breezy/builtins.py:6248
6093.2.1 by Jonathan Riddell
add .pot file to archive
4209
msgid ""
4210
"Bound branches use the nickname of its master branch unless it is set\n"
4211
"locally, in which case switching will update the local nickname to be\n"
4212
"that of the master."
4213
msgstr ""
4214
4215
# help of 'force' option of 'switch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4216
#: breezy/builtins.py:6256
6093.2.1 by Jonathan Riddell
add .pot file to archive
4217
msgid "Switch even if local commits will be lost."
4218
msgstr ""
4219
4220
# help of 'create-branch' option of 'switch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4221
#: breezy/builtins.py:6259
6504.1.1 by Vincent Ladeuil
Update translation template
4222
msgid "Create the target branch from this one before switching to it."
4223
msgstr ""
4224
6581.1.2 by Vincent Ladeuil
Update translation template.
4225
# help of 'store' option of 'switch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4226
#: breezy/builtins.py:6262
6581.1.2 by Vincent Ladeuil
Update translation template.
4227
msgid "Store and restore uncommitted changes in the branch."
4228
msgstr ""
4229
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4230
#: breezy/builtins.py:6276
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4231
msgid "You must supply either a revision or a location"
4232
msgstr ""
4233
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4234
#: breezy/builtins.py:6289
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4235
msgid "cannot create branch without source branch"
4236
msgstr ""
4237
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4238
#: breezy/builtins.py:6315
7185.1.1 by Jelmer Vernooij
Update pot file.
4239
msgid ""
4240
"switching would create a branch reference loop. Use the \"bzr up\" command "
4241
"to switch to a different revision."
4242
msgstr ""
4243
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4244
#: breezy/builtins.py:6323
4245
#, python-format
4246
msgid "Switched to branch %s at %s"
4247
msgstr ""
4248
4249
#: breezy/builtins.py:6326
4250
#, python-format
4251
msgid "Switched to branch %s"
4252
msgstr ""
4253
4254
#: breezy/builtins.py:6328
4255
#, python-format
4256
msgid "Switched to branch at %s"
4257
msgstr ""
4258
4259
#: breezy/builtins.py:6333
6093.2.1 by Jonathan Riddell
add .pot file to archive
4260
msgid "Manage filtered views."
4261
msgstr ""
4262
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4263
#: breezy/builtins.py:6335
6093.2.1 by Jonathan Riddell
add .pot file to archive
4264
msgid ""
4265
"Views provide a mask over the tree so that users can focus on\n"
4266
"a subset of a tree when doing their work. After creating a view,\n"
4267
"commands that support a list of files - status, diff, commit, etc -\n"
4268
"effectively have that list of files implicitly given each time.\n"
4269
"An explicit list of files can still be given but those files\n"
4270
"must be within the current view."
4271
msgstr ""
4272
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4273
#: breezy/builtins.py:6342
6093.2.1 by Jonathan Riddell
add .pot file to archive
4274
msgid ""
4275
"In most cases, a view has a short life-span: it is created to make\n"
4276
"a selected change and is deleted once that change is committed.\n"
4277
"At other times, you may wish to create one or more named views\n"
4278
"and switch between them."
4279
msgstr ""
4280
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4281
#: breezy/builtins.py:6347
6093.2.1 by Jonathan Riddell
add .pot file to archive
4282
msgid ""
4283
"To disable the current view without deleting it, you can switch to\n"
4284
"the pseudo view called ``off``. This can be useful when you need\n"
4285
"to see the whole tree for an operation or two (e.g. merge) but\n"
4286
"want to switch back to your view after that."
4287
msgstr ""
4288
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4289
#: breezy/builtins.py:6352
6093.2.1 by Jonathan Riddell
add .pot file to archive
4290
msgid ""
4291
":Examples:\n"
4292
"  To define the current view::"
4293
msgstr ""
4294
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4295
#: breezy/builtins.py:6355
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4296
msgid "    brz view file1 dir1 ..."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4297
msgstr ""
4298
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4299
#: breezy/builtins.py:6357
6093.2.1 by Jonathan Riddell
add .pot file to archive
4300
msgid "  To list the current view::"
4301
msgstr ""
4302
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4303
#: breezy/builtins.py:6359
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4304
msgid "    brz view"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4305
msgstr ""
4306
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4307
#: breezy/builtins.py:6361
6093.2.1 by Jonathan Riddell
add .pot file to archive
4308
msgid "  To delete the current view::"
4309
msgstr ""
4310
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4311
#: breezy/builtins.py:6363
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4312
msgid "    brz view --delete"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4313
msgstr ""
4314
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4315
#: breezy/builtins.py:6365
6093.2.1 by Jonathan Riddell
add .pot file to archive
4316
msgid "  To disable the current view without deleting it::"
4317
msgstr ""
4318
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4319
#: breezy/builtins.py:6367
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4320
msgid "    brz view --switch off"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4321
msgstr ""
4322
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4323
#: breezy/builtins.py:6369
6093.2.1 by Jonathan Riddell
add .pot file to archive
4324
msgid "  To define a named view and switch to it::"
4325
msgstr ""
4326
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4327
#: breezy/builtins.py:6371
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4328
msgid "    brz view --name view-name file1 dir1 ..."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4329
msgstr ""
4330
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4331
#: breezy/builtins.py:6373
6093.2.1 by Jonathan Riddell
add .pot file to archive
4332
msgid "  To list a named view::"
4333
msgstr ""
4334
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4335
#: breezy/builtins.py:6375
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4336
msgid "    brz view --name view-name"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4337
msgstr ""
4338
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4339
#: breezy/builtins.py:6377
6093.2.1 by Jonathan Riddell
add .pot file to archive
4340
msgid "  To delete a named view::"
4341
msgstr ""
4342
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4343
#: breezy/builtins.py:6379
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4344
msgid "    brz view --name view-name --delete"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4345
msgstr ""
4346
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4347
#: breezy/builtins.py:6381
6093.2.1 by Jonathan Riddell
add .pot file to archive
4348
msgid "  To switch to a named view::"
4349
msgstr ""
4350
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4351
#: breezy/builtins.py:6383
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4352
msgid "    brz view --switch view-name"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4353
msgstr ""
4354
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4355
#: breezy/builtins.py:6385
6093.2.1 by Jonathan Riddell
add .pot file to archive
4356
msgid "  To list all views defined::"
4357
msgstr ""
4358
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4359
#: breezy/builtins.py:6387
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4360
msgid "    brz view --all"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4361
msgstr ""
4362
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4363
#: breezy/builtins.py:6389
6093.2.1 by Jonathan Riddell
add .pot file to archive
4364
msgid "  To delete all views::"
4365
msgstr ""
4366
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4367
#: breezy/builtins.py:6391
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4368
msgid "    brz view --delete --all"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4369
msgstr ""
4370
4371
# help of 'all' option of 'view' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4372
#: breezy/builtins.py:6398
6093.2.1 by Jonathan Riddell
add .pot file to archive
4373
msgid "Apply list or delete action to all views."
4374
msgstr ""
4375
4376
# help of 'delete' option of 'view' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4377
#: breezy/builtins.py:6401
6093.2.1 by Jonathan Riddell
add .pot file to archive
4378
msgid "Delete the view."
4379
msgstr ""
4380
4381
# help of 'name' option of 'view' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4382
#: breezy/builtins.py:6404
6093.2.1 by Jonathan Riddell
add .pot file to archive
4383
msgid "Name of the view to define, list or delete."
4384
msgstr ""
4385
4386
# help of 'switch' option of 'view' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4387
#: breezy/builtins.py:6408
6093.2.1 by Jonathan Riddell
add .pot file to archive
4388
msgid "Name of the view to switch to."
4389
msgstr ""
4390
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4391
#: breezy/builtins.py:6427
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4392
msgid "Both --delete and a file list specified"
4393
msgstr ""
4394
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4395
#: breezy/builtins.py:6430
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4396
msgid "Both --delete and --switch specified"
4397
msgstr ""
4398
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4399
#: breezy/builtins.py:6433
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4400
msgid "Deleted all views.\n"
4401
msgstr ""
4402
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4403
#: breezy/builtins.py:6436
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4404
msgid "No current view to delete"
4405
msgstr ""
4406
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4407
#: breezy/builtins.py:6439
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4408
#, python-format
4409
msgid "Deleted '%s' view.\n"
4410
msgstr ""
4411
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4412
#: breezy/builtins.py:6443
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4413
msgid "Both --switch and a file list specified"
4414
msgstr ""
4415
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4416
#: breezy/builtins.py:6446
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4417
msgid "Both --switch and --all specified"
4418
msgstr ""
4419
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4420
#: breezy/builtins.py:6450
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4421
msgid "No current view to disable"
4422
msgstr ""
4423
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4424
#: breezy/builtins.py:6452
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4425
#, python-format
4426
msgid "Disabled '%s' view.\n"
4427
msgstr ""
4428
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4429
#: breezy/builtins.py:6458 breezy/builtins.py:6481
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4430
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
4431
msgid "Using '{0}' view: {1}\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4432
msgstr ""
4433
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4434
#: breezy/builtins.py:6461
6504.1.1 by Vincent Ladeuil
Update translation template
4435
msgid "Views defined:\n"
4436
msgstr ""
4437
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4438
#: breezy/builtins.py:6470
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4439
msgid "No views defined.\n"
4440
msgstr ""
4441
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4442
#: breezy/builtins.py:6477
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4443
msgid "Cannot change the 'off' pseudo view"
4444
msgstr ""
4445
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4446
#: breezy/builtins.py:6486
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4447
msgid "No current view.\n"
4448
msgstr ""
4449
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4450
#: breezy/builtins.py:6490
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4451
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
4452
msgid "'{0}' view is: {1}\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4453
msgstr ""
4454
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4455
#: breezy/builtins.py:6510
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4456
msgid "    <no hooks installed>\n"
4457
msgstr ""
4458
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4459
#: breezy/builtins.py:6514
6093.2.1 by Jonathan Riddell
add .pot file to archive
4460
msgid "Remove a branch."
4461
msgstr ""
4462
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4463
#: breezy/builtins.py:6516
6093.2.1 by Jonathan Riddell
add .pot file to archive
4464
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
4465
"This will remove the branch from the specified location but\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4466
"will keep any working tree or repository in place."
4467
msgstr ""
4468
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4469
#: breezy/builtins.py:6521
6093.2.1 by Jonathan Riddell
add .pot file to archive
4470
msgid "  Remove the branch at repo/trunk::"
4471
msgstr ""
4472
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4473
#: breezy/builtins.py:6523
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4474
msgid "    brz remove-branch repo/trunk"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4475
msgstr ""
4476
6504.1.1 by Vincent Ladeuil
Update translation template
4477
# help of 'force' option of 'remove-branch' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4478
#: breezy/builtins.py:6530
6504.1.1 by Vincent Ladeuil
Update translation template
4479
msgid "Remove branch even if it is the active branch."
4480
msgstr ""
4481
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4482
#: breezy/builtins.py:6544
6504.1.1 by Vincent Ladeuil
Update translation template
4483
msgid "Branch is active. Use --force to remove it."
4484
msgstr ""
4485
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4486
# help of 'writer=plain' option of 'shelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4487
#: breezy/builtins.py:6548
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4488
msgid "Plaintext diff output."
4489
msgstr ""
4490
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4491
#: breezy/builtins.py:6549
6093.2.1 by Jonathan Riddell
add .pot file to archive
4492
msgid "Temporarily set aside some changes from the current tree."
4493
msgstr ""
4494
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4495
#: breezy/builtins.py:6551
6093.2.1 by Jonathan Riddell
add .pot file to archive
4496
msgid ""
4497
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4498
"ie. out of the way, until a later time when you can bring them back from\n"
4499
"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
4500
"your working tree, and so they aren't propagated along with your branch nor\n"
4501
"will they survive its deletion."
4502
msgstr ""
4503
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4504
#: breezy/builtins.py:6557
6093.2.1 by Jonathan Riddell
add .pot file to archive
4505
msgid "If shelve --list is specified, previously-shelved changes are listed."
4506
msgstr ""
4507
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4508
#: breezy/builtins.py:6559
6093.2.1 by Jonathan Riddell
add .pot file to archive
4509
msgid ""
4510
"Shelve is intended to help separate several sets of changes that have\n"
4511
"been inappropriately mingled.  If you just want to get rid of all changes\n"
4512
"and you don't need to restore them later, use revert.  If you want to\n"
4513
"shelve all text changes at once, use shelve --all."
4514
msgstr ""
4515
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4516
#: breezy/builtins.py:6564
6093.2.1 by Jonathan Riddell
add .pot file to archive
4517
msgid ""
4518
"If filenames are specified, only the changes to those files will be\n"
4519
"shelved. Other files will be left untouched."
4520
msgstr ""
4521
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4522
#: breezy/builtins.py:6567
6093.2.1 by Jonathan Riddell
add .pot file to archive
4523
msgid ""
4524
"If a revision is specified, changes since that revision will be shelved."
4525
msgstr ""
4526
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4527
#: breezy/builtins.py:6569
6093.2.1 by Jonathan Riddell
add .pot file to archive
4528
msgid ""
4529
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4530
"restore the most recently shelved changes."
4531
msgstr ""
4532
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4533
#: breezy/builtins.py:6572
6093.2.1 by Jonathan Riddell
add .pot file to archive
4534
msgid ""
4535
"For complicated changes, it is possible to edit the changes in a separate\n"
4536
"editor program to decide what the file remaining in the working copy\n"
4537
"should look like.  To do this, add the configuration option"
4538
msgstr ""
4539
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4540
#: breezy/builtins.py:6576
6093.2.1 by Jonathan Riddell
add .pot file to archive
4541
msgid "    change_editor = PROGRAM @new_path @old_path"
4542
msgstr ""
4543
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4544
#: breezy/builtins.py:6578
6093.2.1 by Jonathan Riddell
add .pot file to archive
4545
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
4546
"where @new_path is replaced with the path of the new version of the\n"
4547
"file and @old_path is replaced with the path of the old version of\n"
4548
"the file.  The PROGRAM should save the new file with the desired\n"
4549
"contents of the file in the working tree."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4550
msgstr ""
4551
4552
# help of 'all' option of 'shelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4553
#: breezy/builtins.py:6590
6093.2.1 by Jonathan Riddell
add .pot file to archive
4554
msgid "Shelve all changes."
4555
msgstr ""
4556
4557
# help of 'writer' option of 'shelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4558
#: breezy/builtins.py:6592
6093.2.1 by Jonathan Riddell
add .pot file to archive
4559
msgid "Method to use for writing diffs."
4560
msgstr ""
4561
4562
# title of 'writer' option of 'shelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4563
#: breezy/builtins.py:6592
6093.2.1 by Jonathan Riddell
add .pot file to archive
4564
msgid "writer"
4565
msgstr ""
4566
4567
# help of 'list' option of 'shelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4568
#: breezy/builtins.py:6596
6093.2.1 by Jonathan Riddell
add .pot file to archive
4569
msgid "List shelved changes."
4570
msgstr ""
4571
4572
# help of 'destroy' option of 'shelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4573
#: breezy/builtins.py:6598
6093.2.1 by Jonathan Riddell
add .pot file to archive
4574
msgid "Destroy removed changes instead of shelving them."
4575
msgstr ""
4576
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4577
#: breezy/builtins.py:6627
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4578
msgid "No shelved changes."
4579
msgstr ""
4580
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4581
#: breezy/builtins.py:6638
6093.2.1 by Jonathan Riddell
add .pot file to archive
4582
msgid "Restore shelved changes."
4583
msgstr ""
4584
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4585
#: breezy/builtins.py:6640
6093.2.1 by Jonathan Riddell
add .pot file to archive
4586
msgid ""
4587
"By default, the most recently shelved changes are restored. However if you\n"
4588
"specify a shelf by id those changes will be restored instead.  This works\n"
4589
"best when the changes don't depend on each other."
4590
msgstr ""
4591
4592
# help of 'action' option of 'unshelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4593
#: breezy/builtins.py:6649
6093.2.1 by Jonathan Riddell
add .pot file to archive
4594
msgid "The action to perform."
4595
msgstr ""
4596
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4597
# title of 'action' option of 'resolve' command
4598
# title of 'action' option of 'unshelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4599
#: breezy/builtins.py:6649 breezy/conflicts.py:707
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4600
msgid "action"
4601
msgstr ""
4602
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4603
# help of 'action=apply' option of 'unshelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4604
#: breezy/builtins.py:6651
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4605
msgid "Apply changes and remove from the shelf."
4606
msgstr ""
4607
4608
# help of 'action=dry-run' option of 'unshelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4609
#: breezy/builtins.py:6652
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4610
msgid "Show changes, but do not apply or remove them."
4611
msgstr ""
4612
4613
# help of 'action=preview' option of 'unshelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4614
#: breezy/builtins.py:6653
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4615
msgid ""
4616
"Instead of unshelving the changes, show the diff that would result from "
4617
"unshelving."
4618
msgstr ""
4619
4620
# help of 'action=delete-only' option of 'unshelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4621
#: breezy/builtins.py:6655
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4622
msgid "Delete changes without applying them."
4623
msgstr ""
4624
4625
# help of 'action=keep' option of 'unshelve' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4626
#: breezy/builtins.py:6656
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4627
msgid "Apply changes but don't delete them."
4628
msgstr ""
4629
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4630
#: breezy/builtins.py:6671
6093.2.1 by Jonathan Riddell
add .pot file to archive
4631
msgid "Remove unwanted files from working tree."
4632
msgstr ""
4633
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4634
#: breezy/builtins.py:6673
6093.2.1 by Jonathan Riddell
add .pot file to archive
4635
msgid ""
4636
"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
4637
"files are never deleted."
4638
msgstr ""
4639
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4640
#: breezy/builtins.py:6676
6093.2.1 by Jonathan Riddell
add .pot file to archive
4641
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4642
"Another class is 'detritus', which includes files emitted by brz during\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4643
"normal operations and selftests.  (The value of these files decreases with\n"
4644
"time.)"
4645
msgstr ""
4646
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4647
#: breezy/builtins.py:6680
6093.2.1 by Jonathan Riddell
add .pot file to archive
4648
msgid ""
4649
"If no options are specified, unknown files are deleted.  Otherwise, option\n"
4650
"flags are respected, and may be combined."
4651
msgstr ""
4652
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4653
#: breezy/builtins.py:6683
6093.2.1 by Jonathan Riddell
add .pot file to archive
4654
msgid "To check what clean-tree will do, use --dry-run."
4655
msgstr ""
4656
4657
# help of 'ignored' option of 'clean-tree' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4658
#: breezy/builtins.py:6686
6093.2.1 by Jonathan Riddell
add .pot file to archive
4659
msgid "Delete all ignored files."
4660
msgstr ""
4661
4662
# help of 'detritus' option of 'clean-tree' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4663
#: breezy/builtins.py:6687
6093.2.1 by Jonathan Riddell
add .pot file to archive
4664
msgid ""
4665
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4666
msgstr ""
4667
4668
# help of 'unknown' option of 'clean-tree' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4669
#: breezy/builtins.py:6690
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4670
msgid "Delete files unknown to brz (default)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4671
msgstr ""
4672
4673
# help of 'dry-run' option of 'clean-tree' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4674
#: breezy/builtins.py:6691
6093.2.1 by Jonathan Riddell
add .pot file to archive
4675
msgid "Show files to delete instead of deleting them."
4676
msgstr ""
4677
4678
# help of 'force' option of 'clean-tree' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4679
#: breezy/builtins.py:6693
6093.2.1 by Jonathan Riddell
add .pot file to archive
4680
msgid "Do not prompt before deleting."
4681
msgstr ""
4682
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4683
#: breezy/builtins.py:6772
7185.1.1 by Jelmer Vernooij
Update pot file.
4684
msgid "Import sources from a directory, tarball or zip file"
4685
msgstr ""
4686
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4687
#: breezy/builtins.py:6774
7185.1.1 by Jelmer Vernooij
Update pot file.
4688
msgid ""
4689
"This command will import a directory, tarball or zip file into a bzr\n"
4690
"tree, replacing any versioned files already present.  If a directory is\n"
4691
"specified, it is used as the target.  If the directory does not exist, or\n"
4692
"is not versioned, it is created."
4693
msgstr ""
4694
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4695
#: breezy/builtins.py:6779
7185.1.1 by Jelmer Vernooij
Update pot file.
4696
msgid "Tarballs may be gzip or bzip2 compressed.  This is autodetected."
4697
msgstr ""
4698
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4699
#: breezy/builtins.py:6781
7185.1.1 by Jelmer Vernooij
Update pot file.
4700
msgid ""
4701
"If the tarball or zip has a single root directory, that directory is\n"
4702
"stripped when extracting the tarball.  This is not done for directories."
4703
msgstr ""
4704
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4705
#: breezy/builtins.py:6793
7185.1.1 by Jelmer Vernooij
Update pot file.
4706
msgid "Hardlink matching files to another tree."
4707
msgstr ""
4708
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4709
#: breezy/builtins.py:6795
7185.1.1 by Jelmer Vernooij
Update pot file.
4710
msgid "Only files with identical content and execute bit will be linked."
4711
msgstr ""
4712
4713
#: breezy/bundle/__init__.py:61
6138.4.4 by Jonathan Riddell
update bzr.pot
4714
msgid "A directory cannot be a bundle"
4715
msgstr ""
4716
7185.1.1 by Jelmer Vernooij
Update pot file.
4717
#: breezy/bundle/apply_bundle.py:38
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4718
msgid "Install revisions"
4719
msgstr ""
4720
7185.1.1 by Jelmer Vernooij
Update pot file.
4721
#: breezy/bundle/commands.py:66
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4722
msgid "--verbose requires a merge directive"
4723
msgstr ""
4724
7185.1.1 by Jelmer Vernooij
Update pot file.
4725
#: breezy/bundle/commands.py:70
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4726
msgid "Bundle format not supported"
4727
msgstr ""
4728
7185.1.1 by Jelmer Vernooij
Update pot file.
4729
#: breezy/bundle/commands.py:80
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4730
msgid "Records\n"
4731
msgstr ""
4732
7185.1.1 by Jelmer Vernooij
Update pot file.
4733
#: breezy/bundle/commands.py:84
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4734
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4735
msgid "{0}: {1} ({2} multiparent)\n"
4736
msgstr ""
4737
7185.1.1 by Jelmer Vernooij
Update pot file.
4738
#: breezy/bundle/commands.py:86
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4739
#, python-format
4740
msgid "unique files: %d\n"
4741
msgstr ""
4742
7185.1.1 by Jelmer Vernooij
Update pot file.
4743
#: breezy/bundle/commands.py:95
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4744
msgid "Revisions\n"
4745
msgstr ""
4746
7185.1.1 by Jelmer Vernooij
Update pot file.
4747
#: breezy/bundle/commands.py:96
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4748
#, python-format
4749
msgid "nicks: %s\n"
4750
msgstr ""
4751
7185.1.1 by Jelmer Vernooij
Update pot file.
4752
#: breezy/bundle/commands.py:98
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4753
#, python-format
4754
msgid ""
4755
"committers: \n"
4756
"%s\n"
4757
msgstr ""
4758
7185.1.1 by Jelmer Vernooij
Update pot file.
4759
#: breezy/bundle/commands.py:107
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4760
msgid "Decoded contents\n"
4761
msgstr ""
4762
7185.1.1 by Jelmer Vernooij
Update pot file.
4763
#: breezy/bundle/serializer/v4.py:314
6138.4.4 by Jonathan Riddell
update bzr.pot
4764
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
4765
msgid "Bundling %d revision."
4766
msgid_plural "Bundling %d revisions."
4767
msgstr[0] ""
4768
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
4769
7185.1.1 by Jelmer Vernooij
Update pot file.
4770
#: breezy/bzr/bzrdir.py:504
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4771
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4772
msgid ""
6150.1.1 by Jonathan Riddell
update bzr.pot
4773
"making backup of {0}\n"
4774
"  to {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
4775
msgstr ""
4776
7185.1.1 by Jelmer Vernooij
Update pot file.
4777
#: breezy/bzr/bzrdir.py:525
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4778
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4779
msgid "renamed {0} to {1}"
4780
msgstr ""
4781
7185.1.1 by Jelmer Vernooij
Update pot file.
4782
#: breezy/bzr/bzrdir.py:1591
6138.4.4 by Jonathan Riddell
update bzr.pot
4783
#, python-format
4784
msgid ""
4785
"Source repository format does not support stacking, using format:\n"
4786
"  %s"
4787
msgstr ""
4788
7185.1.1 by Jelmer Vernooij
Update pot file.
4789
#: breezy/bzr/bzrdir.py:1611
6138.4.4 by Jonathan Riddell
update bzr.pot
4790
#, python-format
4791
msgid ""
4792
"Source branch format does not support stacking, using format:\n"
4793
"  %s"
4794
msgstr ""
4795
7185.1.1 by Jelmer Vernooij
Update pot file.
4796
#: breezy/bzr/bzrdir.py:1748
6138.4.4 by Jonathan Riddell
update bzr.pot
4797
msgid "starting repository conversion"
4798
msgstr ""
4799
7185.1.1 by Jelmer Vernooij
Update pot file.
4800
#: breezy/bzr/bzrdir.py:1875
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4801
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4802
msgid "Using default stacking branch {0} at {1}"
4803
msgstr ""
4804
7185.1.1 by Jelmer Vernooij
Update pot file.
4805
#: breezy/bzr/check.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
4806
msgid "check"
4807
msgstr ""
4808
7185.1.1 by Jelmer Vernooij
Update pot file.
4809
#: breezy/bzr/check.py:101
6138.4.4 by Jonathan Riddell
update bzr.pot
4810
msgid "checking revisions"
4811
msgstr ""
4812
7185.1.1 by Jelmer Vernooij
Update pot file.
4813
#: breezy/bzr/check.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
4814
msgid "checking commit contents"
4815
msgstr ""
4816
7185.1.1 by Jelmer Vernooij
Update pot file.
4817
#: breezy/bzr/check.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
4818
msgid "checking file graphs"
4819
msgstr ""
4820
7185.1.1 by Jelmer Vernooij
Update pot file.
4821
#: breezy/bzr/check.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
4822
msgid "checking branches and trees"
4823
msgstr ""
4824
7185.1.1 by Jelmer Vernooij
Update pot file.
4825
#: breezy/bzr/check.py:194
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4826
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4827
msgid "checked repository {0} format {1}"
4828
msgstr ""
4829
7185.1.1 by Jelmer Vernooij
Update pot file.
4830
#: breezy/bzr/check.py:197
6138.4.4 by Jonathan Riddell
update bzr.pot
4831
#, python-format
4832
msgid "%6d revisions"
4833
msgstr ""
4834
7185.1.1 by Jelmer Vernooij
Update pot file.
4835
#: breezy/bzr/check.py:198
6138.4.4 by Jonathan Riddell
update bzr.pot
4836
#, python-format
4837
msgid "%6d file-ids"
4838
msgstr ""
4839
7185.1.1 by Jelmer Vernooij
Update pot file.
4840
#: breezy/bzr/check.py:200
6138.4.4 by Jonathan Riddell
update bzr.pot
4841
#, python-format
4842
msgid "%6d unreferenced text versions"
4843
msgstr ""
4844
7185.1.1 by Jelmer Vernooij
Update pot file.
4845
#: breezy/bzr/check.py:204
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4846
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4847
msgid "unreferenced version: {{{0}}} in {1}"
4848
msgstr ""
4849
7185.1.1 by Jelmer Vernooij
Update pot file.
4850
#: breezy/bzr/check.py:207
6138.4.4 by Jonathan Riddell
update bzr.pot
4851
#, python-format
4852
msgid "%6d revisions are missing inventory_sha1"
4853
msgstr ""
4854
7185.1.1 by Jelmer Vernooij
Update pot file.
4855
#: breezy/bzr/check.py:210
6138.4.4 by Jonathan Riddell
update bzr.pot
4856
#, python-format
4857
msgid "%6d revisions are mentioned but not present"
4858
msgstr ""
4859
7185.1.1 by Jelmer Vernooij
Update pot file.
4860
#: breezy/bzr/check.py:213
6138.4.4 by Jonathan Riddell
update bzr.pot
4861
#, python-format
4862
msgid "%6d ghost revisions"
4863
msgstr ""
4864
7185.1.1 by Jelmer Vernooij
Update pot file.
4865
#: breezy/bzr/check.py:218
6138.4.4 by Jonathan Riddell
update bzr.pot
4866
#, python-format
4867
msgid "%6d revisions missing parents in ancestry"
4868
msgstr ""
4869
7185.1.1 by Jelmer Vernooij
Update pot file.
4870
#: breezy/bzr/check.py:222
6138.4.4 by Jonathan Riddell
update bzr.pot
4871
#, python-format
4872
msgid "      %s should be in the ancestry for:"
4873
msgstr ""
4874
7185.1.1 by Jelmer Vernooij
Update pot file.
4875
#: breezy/bzr/check.py:227
6138.4.4 by Jonathan Riddell
update bzr.pot
4876
#, python-format
4877
msgid "%6d inconsistent parents"
4878
msgstr ""
4879
7185.1.1 by Jelmer Vernooij
Update pot file.
4880
#: breezy/bzr/check.py:232
4881
#, python-brace-format
4882
msgid "      * {0} version {1} has parents ({2}) but should have ({3})"
6138.4.4 by Jonathan Riddell
update bzr.pot
4883
msgstr ""
4884
7185.1.1 by Jelmer Vernooij
Update pot file.
4885
#: breezy/bzr/check.py:239
6138.4.4 by Jonathan Riddell
update bzr.pot
4886
#, python-format
4887
msgid "%6d revisions have incorrect parents in the revision index"
4888
msgstr ""
4889
7185.1.1 by Jelmer Vernooij
Update pot file.
4890
#: breezy/bzr/check.py:245
4891
#, python-brace-format
4892
msgid "       {0} has wrong parents in index: ({1}) should be ({2})"
6138.4.4 by Jonathan Riddell
update bzr.pot
4893
msgstr ""
4894
7185.1.1 by Jelmer Vernooij
Update pot file.
4895
#: breezy/bzr/check.py:261
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4896
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4897
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4898
msgstr ""
4899
7185.1.1 by Jelmer Vernooij
Update pot file.
4900
#: breezy/bzr/check.py:290
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4901
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4902
msgid ""
4903
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4904
"{{{4}}}"
4905
msgstr ""
4906
7185.1.1 by Jelmer Vernooij
Update pot file.
4907
#: breezy/bzr/fetch.py:102
4908
msgid "Finding revisions"
4909
msgstr ""
4910
4911
#: breezy/bzr/fetch.py:107
4912
msgid "Fetching revisions"
4913
msgstr ""
4914
4915
#: breezy/bzr/groupcompress.py:1748
4916
#, python-format
4917
msgid "Insert claimed random_id=True, but then inserted %r two times"
4918
msgstr ""
4919
4920
#: breezy/bzr/knit.py:1835 breezy/bzr/knit.py:1873
4921
msgid "Walking content"
4922
msgstr ""
4923
4924
#: breezy/bzr/knit.py:3406
4925
msgid "annotating"
4926
msgstr ""
4927
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4928
#: breezy/bzr/reconcile.py:97
4929
msgid "Reading inventory data"
4930
msgstr ""
4931
4932
#: breezy/bzr/reconcile.py:117 breezy/bzr/reconcile.py:248
4933
msgid "Inventory ok."
4934
msgstr ""
4935
4936
#: breezy/bzr/reconcile.py:119 breezy/bzr/reconcile.py:250
4937
msgid "Backing up inventory"
4938
msgstr ""
4939
4940
#: breezy/bzr/reconcile.py:121
4941
msgid "Backup inventory created."
4942
msgstr ""
4943
4944
#: breezy/bzr/reconcile.py:137 breezy/bzr/reconcile.py:269
4945
msgid "Writing weave"
4946
msgstr ""
4947
4948
#: breezy/bzr/reconcile.py:140 breezy/bzr/reconcile.py:272
4949
msgid "Inventory regenerated."
4950
msgstr ""
4951
4952
#: breezy/bzr/reconcile.py:235 breezy/bzr/reconcile.py:237
4953
#: breezy/bzr/reconcile.py:240
4954
msgid "Reading indexes"
4955
msgstr ""
4956
4957
#: breezy/bzr/reconcile.py:244 breezy/bzr/reconcile.py:246
4958
msgid "Checking unused inventories"
4959
msgstr ""
4960
4961
#: breezy/bzr/reconcile.py:252
4962
msgid "Backup Inventory created"
4963
msgstr ""
4964
4965
#: breezy/bzr/reconcile.py:310
4966
msgid "Fixing text parents"
4967
msgstr ""
4968
4969
#: breezy/bzr/reconcile.py:463
4970
#, python-brace-format
4971
msgid "Fixing last revision info {0}  => {1}"
4972
msgstr ""
4973
4974
#: breezy/bzr/reconcile.py:470
4975
msgid "revision_history ok."
4976
msgstr ""
4977
7185.1.1 by Jelmer Vernooij
Update pot file.
4978
#: breezy/bzr/remote.py:1302
4979
#, python-format
4980
msgid "bzr: ERROR (ignored): %s"
4981
msgstr ""
4982
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4983
#: breezy/bzr/remote.py:2610
7185.1.1 by Jelmer Vernooij
Update pot file.
4984
msgid "Copying repository content as tarball..."
4985
msgstr ""
4986
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4987
#: breezy/bzr/smart/medium.py:739
7185.1.1 by Jelmer Vernooij
Update pot file.
4988
#, python-brace-format
4989
msgid "HPSS calls: {0} ({1} vfs) {2}"
4990
msgstr ""
4991
4992
#: breezy/bzr/smart/ping.py:33
4993
msgid "Pings a Bazaar smart server."
4994
msgstr ""
4995
4996
#: breezy/bzr/smart/ping.py:35
4997
msgid ""
4998
"This command sends a 'hello' request to the given location using the brz\n"
4999
"smart protocol, and reports the response."
5000
msgstr ""
5001
5002
#: breezy/bzr/smart/server.py:169
5003
msgid "Requested to stop gracefully"
5004
msgstr ""
5005
5006
#: breezy/bzr/smart/server.py:179
5007
#, python-format
5008
msgid "Waiting for %d client(s) to finish"
5009
msgstr ""
5010
5011
#: breezy/bzr/smart/server.py:185
5012
#, python-format
5013
msgid "Still waiting for %d client(s) to finish"
5014
msgstr ""
5015
5016
#: breezy/bzr/smart/server.py:219
5017
#, python-format
5018
msgid "listening socket error: %s"
5019
msgstr ""
5020
5021
#: breezy/bzr/smart/server.py:459
5022
#, python-format
5023
msgid "listening on port: %s"
5024
msgstr ""
5025
5026
#: breezy/bzr/vf_repository.py:786
5027
msgid "inventories"
5028
msgstr ""
5029
5030
#: breezy/bzr/vf_repository.py:812
5031
msgid "texts"
5032
msgstr ""
5033
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
5034
#: breezy/bzr/vf_repository.py:1325 breezy/bzr/vf_repository.py:1335
7185.1.1 by Jelmer Vernooij
Update pot file.
5035
msgid "Calculating text parents"
5036
msgstr ""
5037
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
5038
#: breezy/bzr/vf_repository.py:1413
7185.1.1 by Jelmer Vernooij
Update pot file.
5039
msgid "Fetch texts"
5040
msgstr ""
5041
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
5042
#: breezy/bzr/vf_repository.py:2293
7185.1.1 by Jelmer Vernooij
Update pot file.
5043
msgid "loading text store"
5044
msgstr ""
5045
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
5046
#: breezy/bzr/vf_repository.py:2300
7185.1.1 by Jelmer Vernooij
Update pot file.
5047
msgid "checking text graph"
5048
msgstr ""
5049
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
5050
#: breezy/bzr/vf_repository.py:2742 breezy/bzr/vf_repository.py:2756
5051
#: breezy/bzr/vf_repository.py:2868
7185.1.1 by Jelmer Vernooij
Update pot file.
5052
msgid "Transferring revisions"
5053
msgstr ""
5054
5055
#: breezy/check.py:64
6138.4.4 by Jonathan Riddell
update bzr.pot
5056
#, python-format
5057
msgid "Checking branch at '%s'."
5058
msgstr ""
5059
7185.1.1 by Jelmer Vernooij
Update pot file.
5060
#: breezy/check.py:84
6138.4.4 by Jonathan Riddell
update bzr.pot
5061
#, python-format
5062
msgid "Checking working tree at '%s'."
5063
msgstr ""
5064
7185.1.1 by Jelmer Vernooij
Update pot file.
5065
#: breezy/check.py:137 breezy/check.py:151
6138.4.4 by Jonathan Riddell
update bzr.pot
5066
msgid "No branch found at specified location."
5067
msgstr ""
5068
7185.1.1 by Jelmer Vernooij
Update pot file.
5069
#: breezy/check.py:139 breezy/check.py:149
6138.4.4 by Jonathan Riddell
update bzr.pot
5070
msgid "No working tree found at specified location."
5071
msgstr ""
5072
7185.1.1 by Jelmer Vernooij
Update pot file.
5073
#: breezy/check.py:142
6138.4.4 by Jonathan Riddell
update bzr.pot
5074
#, python-format
5075
msgid "Checking repository at '%s'."
5076
msgstr ""
5077
7185.1.1 by Jelmer Vernooij
Update pot file.
5078
#: breezy/check.py:153
6138.4.4 by Jonathan Riddell
update bzr.pot
5079
msgid "No repository found at specified location."
5080
msgstr ""
5081
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5082
#: breezy/clean_tree.py:63
6138.4.4 by Jonathan Riddell
update bzr.pot
5083
msgid "Nothing to delete."
5084
msgstr ""
5085
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5086
#: breezy/clean_tree.py:68
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5087
msgid "Are you sure you wish to delete these"
5088
msgstr ""
5089
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5090
#: breezy/clean_tree.py:70
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5091
msgid "Canceled"
5092
msgstr ""
5093
7185.1.1 by Jelmer Vernooij
Update pot file.
5094
#: breezy/clean_tree.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
5095
#, python-format
5096
msgid "unable to remove %s"
5097
msgstr ""
5098
7185.1.1 by Jelmer Vernooij
Update pot file.
5099
#: breezy/clean_tree.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
5100
msgid "deleting paths:"
5101
msgstr ""
5102
7185.1.1 by Jelmer Vernooij
Update pot file.
5103
#: breezy/clean_tree.py:123
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5104
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
5105
msgid "unable to remove \"{0}\": {1}."
6138.4.4 by Jonathan Riddell
update bzr.pot
5106
msgstr ""
5107
7185.1.1 by Jelmer Vernooij
Update pot file.
5108
#: breezy/clean_tree.py:128
6138.4.4 by Jonathan Riddell
update bzr.pot
5109
msgid "No files deleted."
5110
msgstr ""
5111
7185.1.1 by Jelmer Vernooij
Update pot file.
5112
#: breezy/cmd_version_info.py:49
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5113
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5114
msgid "No known version info format {0}. Supported types are: {1}"
5115
msgstr ""
5116
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5117
# help of 'format=custom' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5118
#: breezy/cmd_version_info.py:53
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5119
msgid "Version info in Custom template-based format."
5120
msgstr ""
5121
5122
# help of 'format=python' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5123
#: breezy/cmd_version_info.py:53
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5124
msgid "Version info in Python format."
5125
msgstr ""
5126
5127
# help of 'format=rio' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5128
#: breezy/cmd_version_info.py:53
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5129
msgid "Version info in RIO (simple text) format (default)."
5130
msgstr ""
5131
7185.1.1 by Jelmer Vernooij
Update pot file.
5132
#: breezy/cmd_version_info.py:54
6093.2.1 by Jonathan Riddell
add .pot file to archive
5133
msgid "Show version information about this tree."
5134
msgstr ""
5135
7185.1.1 by Jelmer Vernooij
Update pot file.
5136
#: breezy/cmd_version_info.py:56
6093.2.1 by Jonathan Riddell
add .pot file to archive
5137
msgid ""
5138
"You can use this command to add information about version into\n"
5139
"source code of an application. The output can be in one of the\n"
5140
"supported formats or in a custom format based on a template."
5141
msgstr ""
5142
7185.1.1 by Jelmer Vernooij
Update pot file.
5143
#: breezy/cmd_version_info.py:60 en/help_topics/configuration.txt:699
5144
#: en/help_topics/configuration.txt:725
6093.2.1 by Jonathan Riddell
add .pot file to archive
5145
msgid "For example::"
5146
msgstr ""
5147
7185.1.1 by Jelmer Vernooij
Update pot file.
5148
#: breezy/cmd_version_info.py:62
6093.2.1 by Jonathan Riddell
add .pot file to archive
5149
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5150
"  brz version-info --custom \\\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5151
"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5152
msgstr ""
5153
7185.1.1 by Jelmer Vernooij
Update pot file.
5154
#: breezy/cmd_version_info.py:65
6093.2.1 by Jonathan Riddell
add .pot file to archive
5155
msgid ""
5156
"will produce a C header file with formatted string containing the\n"
5157
"current revision number. Other supported variables in templates are:"
5158
msgstr ""
5159
7185.1.1 by Jelmer Vernooij
Update pot file.
5160
#: breezy/cmd_version_info.py:68
6093.2.1 by Jonathan Riddell
add .pot file to archive
5161
msgid ""
5162
"  * {date} - date of the last revision\n"
5163
"  * {build_date} - current date\n"
5164
"  * {revno} - revision number\n"
5165
"  * {revision_id} - revision id\n"
5166
"  * {branch_nick} - branch nickname\n"
5167
"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
5168
"              otherwise 1"
5169
msgstr ""
5170
5171
# help of 'format' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5172
#: breezy/cmd_version_info.py:78
6093.2.1 by Jonathan Riddell
add .pot file to archive
5173
msgid "Select the output format."
5174
msgstr ""
5175
5176
# help of 'all' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5177
#: breezy/cmd_version_info.py:82
6093.2.1 by Jonathan Riddell
add .pot file to archive
5178
msgid "Include all possible information."
5179
msgstr ""
5180
5181
# help of 'check-clean' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5182
#: breezy/cmd_version_info.py:83
6093.2.1 by Jonathan Riddell
add .pot file to archive
5183
msgid "Check if tree is clean."
5184
msgstr ""
5185
5186
# help of 'include-history' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5187
#: breezy/cmd_version_info.py:85
6093.2.1 by Jonathan Riddell
add .pot file to archive
5188
msgid "Include the revision-history."
5189
msgstr ""
5190
5191
# help of 'include-file-revisions' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5192
#: breezy/cmd_version_info.py:87
6093.2.1 by Jonathan Riddell
add .pot file to archive
5193
msgid "Include the last revision for each file."
5194
msgstr ""
5195
5196
# help of 'template' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5197
#: breezy/cmd_version_info.py:89
6093.2.1 by Jonathan Riddell
add .pot file to archive
5198
msgid "Template for the output."
5199
msgstr ""
5200
7185.1.1 by Jelmer Vernooij
Update pot file.
5201
#: breezy/cmd_version_info.py:103
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5202
msgid "brz version-info --revision takes exactly one revision specifier"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5203
msgstr ""
5204
7185.1.1 by Jelmer Vernooij
Update pot file.
5205
#: breezy/commands.py:307
5206
#, python-format
5207
msgid "unknown command \"%s\". Perhaps you meant \"%s\""
5208
msgstr ""
5209
5210
#: breezy/commands.py:309
6138.4.4 by Jonathan Riddell
update bzr.pot
5211
#, python-format
5212
msgid "unknown command \"%s\""
5213
msgstr ""
5214
7185.1.1 by Jelmer Vernooij
Update pot file.
5215
#: breezy/commands.py:560
6093.2.1 by Jonathan Riddell
add .pot file to archive
5216
msgid "No help for this command."
5217
msgstr ""
5218
7185.1.1 by Jelmer Vernooij
Update pot file.
5219
#: breezy/commands.py:573
6093.2.1 by Jonathan Riddell
add .pot file to archive
5220
#, python-format
5221
msgid ":Purpose: %s\n"
5222
msgstr ""
5223
7185.1.1 by Jelmer Vernooij
Update pot file.
5224
#: breezy/commands.py:575
6093.2.1 by Jonathan Riddell
add .pot file to archive
5225
#, python-format
5226
msgid ""
5227
":Usage:\n"
5228
"%s\n"
5229
msgstr ""
5230
7185.1.1 by Jelmer Vernooij
Update pot file.
5231
#: breezy/commands.py:577
6093.2.1 by Jonathan Riddell
add .pot file to archive
5232
#, python-format
5233
msgid ":Usage:   %s\n"
5234
msgstr ""
5235
7185.1.1 by Jelmer Vernooij
Update pot file.
5236
#: breezy/commands.py:597
6093.2.1 by Jonathan Riddell
add .pot file to archive
5237
#, python-format
5238
msgid ":Options:%s"
5239
msgstr ""
5240
7185.1.1 by Jelmer Vernooij
Update pot file.
5241
#: breezy/commands.py:608
6093.2.1 by Jonathan Riddell
add .pot file to archive
5242
#, python-format
5243
msgid ""
5244
":Description:\n"
5245
"  %s\n"
5246
"\n"
5247
msgstr ""
5248
7185.1.1 by Jelmer Vernooij
Update pot file.
5249
#: breezy/commands.py:618
6093.2.1 by Jonathan Riddell
add .pot file to archive
5250
#, python-format
5251
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5252
"See brz help %s for more details and examples.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5253
"\n"
5254
msgstr ""
5255
7185.1.1 by Jelmer Vernooij
Update pot file.
5256
#: breezy/commands.py:623
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5257
msgid ":Aliases:  "
5258
msgstr ""
5259
7185.1.1 by Jelmer Vernooij
Update pot file.
5260
#: breezy/commands.py:627
6093.2.1 by Jonathan Riddell
add .pot file to archive
5261
#, python-format
5262
msgid ":From:     plugin \"%s\"\n"
5263
msgstr ""
5264
7185.1.1 by Jelmer Vernooij
Update pot file.
5265
#: breezy/commands.py:639
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5266
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5267
msgid ":doc:`{0} <{1}-help>`"
5268
msgstr ""
5269
7185.1.1 by Jelmer Vernooij
Update pot file.
5270
#: breezy/commands.py:643
6093.2.1 by Jonathan Riddell
add .pot file to archive
5271
#, python-format
5272
msgid ":See also: %s"
5273
msgstr ""
5274
7185.1.1 by Jelmer Vernooij
Update pot file.
5275
#: breezy/commands.py:917
6138.4.4 by Jonathan Riddell
update bzr.pot
5276
msgid "Only ASCII permitted in option names"
5277
msgstr ""
5278
7185.1.1 by Jelmer Vernooij
Update pot file.
5279
#: breezy/commands.py:942 breezy/commands.py:950
6138.4.4 by Jonathan Riddell
update bzr.pot
5280
msgid "command {0!r} needs one or more {1}"
5281
msgstr ""
5282
7185.1.1 by Jelmer Vernooij
Update pot file.
5283
#: breezy/commands.py:959
6138.4.4 by Jonathan Riddell
update bzr.pot
5284
msgid "command {0!r} requires argument {1}"
5285
msgstr ""
5286
7185.1.1 by Jelmer Vernooij
Update pot file.
5287
#: breezy/commands.py:966
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5288
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5289
msgid "extra argument to command {0}: {1}"
5290
msgstr ""
5291
7185.1.1 by Jelmer Vernooij
Update pot file.
5292
#: breezy/commands.py:1038
6138.4.4 by Jonathan Riddell
update bzr.pot
5293
#, python-format
5294
msgid "Profile data written to \"%s\"."
5295
msgstr ""
5296
7185.1.1 by Jelmer Vernooij
Update pot file.
5297
#: breezy/commit.py:152 breezy/commit.py:727
6138.4.4 by Jonathan Riddell
update bzr.pot
5298
msgid "added"
5299
msgstr ""
5300
7185.1.1 by Jelmer Vernooij
Update pot file.
5301
#: breezy/commit.py:152 breezy/commit.py:737
6138.4.4 by Jonathan Riddell
update bzr.pot
5302
msgid "modified"
5303
msgstr ""
5304
7185.1.1 by Jelmer Vernooij
Update pot file.
5305
#: breezy/commit.py:158
6138.4.4 by Jonathan Riddell
update bzr.pot
5306
#, python-format
7185.1.1 by Jelmer Vernooij
Update pot file.
5307
msgid "Committing to: %s"
6138.4.4 by Jonathan Riddell
update bzr.pot
5308
msgstr ""
5309
7185.1.1 by Jelmer Vernooij
Update pot file.
5310
#: breezy/commit.py:162
6138.4.4 by Jonathan Riddell
update bzr.pot
5311
#, python-format
5312
msgid "Committed revision %d."
5313
msgstr ""
5314
7185.1.1 by Jelmer Vernooij
Update pot file.
5315
#: breezy/commit.py:171
6138.4.4 by Jonathan Riddell
update bzr.pot
5316
#, python-format
5317
msgid "deleted %s"
5318
msgstr ""
5319
7185.1.1 by Jelmer Vernooij
Update pot file.
5320
#: breezy/commit.py:174
6138.4.4 by Jonathan Riddell
update bzr.pot
5321
#, python-format
5322
msgid "missing %s"
5323
msgstr ""
5324
7185.1.1 by Jelmer Vernooij
Update pot file.
5325
#: breezy/commit.py:515
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5326
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5327
msgid ""
5328
"Conflicting tags in bound branch:\n"
5329
"{0}"
5330
msgstr ""
5331
7185.1.1 by Jelmer Vernooij
Update pot file.
5332
#: breezy/commit.py:729
6138.4.4 by Jonathan Riddell
update bzr.pot
5333
msgid "renamed"
5334
msgstr ""
5335
7185.1.1 by Jelmer Vernooij
Update pot file.
5336
#: breezy/commit.py:794
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5337
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5338
msgid "{0} [{1}] - Stage"
5339
msgstr ""
5340
7185.1.1 by Jelmer Vernooij
Update pot file.
5341
#: breezy/commit.py:797
6138.4.4 by Jonathan Riddell
update bzr.pot
5342
#, python-format
5343
msgid "%s - Stage"
5344
msgstr ""
5345
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5346
#: breezy/commit_signature_commands.py:34
6504.1.1 by Vincent Ladeuil
Update translation template
5347
msgid "Sign all commits by a given committer."
5348
msgstr ""
5349
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5350
#: breezy/commit_signature_commands.py:36
6093.2.1 by Jonathan Riddell
add .pot file to archive
5351
msgid ""
5352
"If location is not specified the local tree is used.\n"
5353
"If committer is not specified the default committer is used."
5354
msgstr ""
5355
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5356
#: breezy/commit_signature_commands.py:39
6093.2.1 by Jonathan Riddell
add .pot file to archive
5357
msgid "This does not sign commits that already have signatures."
5358
msgstr ""
5359
5360
# help of 'dry-run' option of 'sign-my-commits' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5361
#: breezy/commit_signature_commands.py:47
6093.2.1 by Jonathan Riddell
add .pot file to archive
5362
msgid ""
5363
"Don't actually sign anything, just print the revisions that would be signed."
5364
msgstr ""
5365
7185.1.1 by Jelmer Vernooij
Update pot file.
5366
#: breezy/commit_signature_commands.py:95
6504.1.1 by Vincent Ladeuil
Update translation template
5367
#, python-format
5368
msgid "Signed %d revision.\n"
5369
msgid_plural "Signed %d revisions.\n"
5370
msgstr[0] ""
5371
msgstr[1] ""
5372
7185.1.1 by Jelmer Vernooij
Update pot file.
5373
#: breezy/commit_signature_commands.py:100
6093.2.1 by Jonathan Riddell
add .pot file to archive
5374
msgid "Verify all commit signatures."
5375
msgstr ""
5376
7185.1.1 by Jelmer Vernooij
Update pot file.
5377
#: breezy/commit_signature_commands.py:102
6093.2.1 by Jonathan Riddell
add .pot file to archive
5378
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
5379
msgstr ""
5380
5381
# help of 'acceptable-keys' option of 'verify-signatures' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5382
#: breezy/commit_signature_commands.py:107
6093.2.1 by Jonathan Riddell
add .pot file to archive
5383
msgid ""
5384
"Comma separated list of GPG key patterns which are acceptable for "
5385
"verification."
5386
msgstr ""
5387
7185.1.1 by Jelmer Vernooij
Update pot file.
5388
#: breezy/commit_signature_commands.py:146
6138.4.4 by Jonathan Riddell
update bzr.pot
5389
msgid "Cannot verify a range of non-revision-history revisions"
5390
msgstr ""
5391
7185.1.1 by Jelmer Vernooij
Update pot file.
5392
#: breezy/commit_signature_commands.py:165
6093.2.1 by Jonathan Riddell
add .pot file to archive
5393
msgid "All commits signed with verifiable keys"
5394
msgstr ""
5395
7185.1.1 by Jelmer Vernooij
Update pot file.
5396
#: breezy/config.py:2509
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5397
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5398
msgid "{0} is not an SI unit."
5399
msgstr ""
5400
7185.1.1 by Jelmer Vernooij
Update pot file.
5401
#: breezy/config.py:3032
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5402
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5403
msgid ""
5404
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5405
"will be saved."
5406
msgstr ""
5407
7185.1.1 by Jelmer Vernooij
Update pot file.
5408
#: breezy/config.py:3177
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5409
#, python-format
5410
msgid "Invalid '%s', should be of the form 'name=value'"
5411
msgstr ""
5412
7185.1.1 by Jelmer Vernooij
Update pot file.
5413
#: breezy/config.py:4121
6093.2.1 by Jonathan Riddell
add .pot file to archive
5414
msgid "Display, set or remove a configuration option."
5415
msgstr ""
5416
7185.1.1 by Jelmer Vernooij
Update pot file.
5417
#: breezy/config.py:4123
6581.1.2 by Vincent Ladeuil
Update translation template.
5418
msgid "Display the active value for option NAME."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5419
msgstr ""
5420
7185.1.1 by Jelmer Vernooij
Update pot file.
5421
#: breezy/config.py:4125
6093.2.1 by Jonathan Riddell
add .pot file to archive
5422
msgid ""
5423
"If --all is specified, NAME is interpreted as a regular expression and all\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
5424
"matching options are displayed mentioning their scope and without resolving\n"
5425
"option references in the value). The active value that bzr will take into\n"
5426
"account is the first one displayed for each option."
5427
msgstr ""
5428
7185.1.1 by Jelmer Vernooij
Update pot file.
5429
#: breezy/config.py:4130
6581.1.2 by Vincent Ladeuil
Update translation template.
5430
msgid ""
5431
"If NAME is not given, --all .* is implied (all options are displayed for "
5432
"the\n"
5433
"current scope)."
5434
msgstr ""
5435
7185.1.1 by Jelmer Vernooij
Update pot file.
5436
#: breezy/config.py:4133
6581.1.2 by Vincent Ladeuil
Update translation template.
5437
msgid ""
5438
"Setting a value is achieved by using NAME=value without spaces. The value\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5439
"is set in the most relevant scope and can be checked by displaying the\n"
5440
"option again."
5441
msgstr ""
5442
7185.1.1 by Jelmer Vernooij
Update pot file.
5443
#: breezy/config.py:4137
6581.1.2 by Vincent Ladeuil
Update translation template.
5444
msgid "Removing a value is achieved by using --remove NAME."
5445
msgstr ""
5446
6093.2.1 by Jonathan Riddell
add .pot file to archive
5447
# help of 'scope' option of 'config' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5448
#: breezy/config.py:4147
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5449
msgid "Reduce the scope to the specified configuration file."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5450
msgstr ""
5451
5452
# help of 'all' option of 'config' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5453
#: breezy/config.py:4151
6093.2.1 by Jonathan Riddell
add .pot file to archive
5454
msgid "Display all the defined values for the matching options."
5455
msgstr ""
5456
5457
# help of 'remove' option of 'config' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5458
#: breezy/config.py:4153
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5459
msgid "Remove the option from the configuration file."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5460
msgstr ""
5461
7185.1.1 by Jelmer Vernooij
Update pot file.
5462
#: breezy/conflicts.py:52
6093.2.1 by Jonathan Riddell
add .pot file to archive
5463
msgid "List files with conflicts."
5464
msgstr ""
5465
7185.1.1 by Jelmer Vernooij
Update pot file.
5466
#: breezy/conflicts.py:59
6093.2.1 by Jonathan Riddell
add .pot file to archive
5467
msgid ""
5468
"Conflicts normally are listed as short, human-readable messages.  If --text\n"
5469
"is supplied, the pathnames of files with text conflicts are listed,\n"
5470
"instead.  (This is useful for editing all files with text conflicts.)"
5471
msgstr ""
5472
7185.1.1 by Jelmer Vernooij
Update pot file.
5473
#: breezy/conflicts.py:63
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5474
msgid "Use brz resolve when you have fixed a problem."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5475
msgstr ""
5476
5477
# help of 'text' option of 'conflicts' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5478
#: breezy/conflicts.py:68
6093.2.1 by Jonathan Riddell
add .pot file to archive
5479
msgid "List paths of files with text conflicts."
5480
msgstr ""
5481
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5482
# help of 'action=done' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5483
#: breezy/conflicts.py:87
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5484
msgid "Marks the conflict as resolved."
5485
msgstr ""
5486
5487
# help of 'action=take-this' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5488
#: breezy/conflicts.py:90
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5489
msgid "Resolve the conflict preserving the version in the working tree."
5490
msgstr ""
5491
5492
# help of 'action=take-other' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5493
#: breezy/conflicts.py:93
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5494
msgid "Resolve the conflict taking the merged version into account."
5495
msgstr ""
5496
6093.2.1 by Jonathan Riddell
add .pot file to archive
5497
# help of 'action' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5498
#: breezy/conflicts.py:101
6093.2.1 by Jonathan Riddell
add .pot file to archive
5499
msgid "How to resolve the conflict."
5500
msgstr ""
5501
7185.1.1 by Jelmer Vernooij
Update pot file.
5502
#: breezy/conflicts.py:107
6093.2.1 by Jonathan Riddell
add .pot file to archive
5503
msgid "Mark a conflict as resolved."
5504
msgstr ""
5505
7185.1.1 by Jelmer Vernooij
Update pot file.
5506
#: breezy/conflicts.py:114
6093.2.1 by Jonathan Riddell
add .pot file to archive
5507
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5508
"Once you have fixed a problem, use \"brz resolve\" to automatically mark\n"
5509
"text conflicts as fixed, \"brz resolve FILE\" to mark a specific conflict "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5510
"as\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5511
"resolved, or \"brz resolve --all\" to mark all conflicts as resolved."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5512
msgstr ""
5513
5514
# help of 'all' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5515
#: breezy/conflicts.py:122
6093.2.1 by Jonathan Riddell
add .pot file to archive
5516
msgid "Resolve all conflicts in this tree."
5517
msgstr ""
5518
7185.1.1 by Jelmer Vernooij
Update pot file.
5519
#: breezy/conflicts.py:130
6138.4.4 by Jonathan Riddell
update bzr.pot
5520
msgid "If --all is specified, no FILE may be provided"
5521
msgstr ""
5522
7185.1.1 by Jelmer Vernooij
Update pot file.
5523
#: breezy/conflicts.py:155
6138.4.4 by Jonathan Riddell
update bzr.pot
5524
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
5525
msgid "%d conflict auto-resolved."
5526
msgid_plural "%d conflicts auto-resolved."
5527
msgstr[0] ""
5528
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
5529
7185.1.1 by Jelmer Vernooij
Update pot file.
5530
#: breezy/conflicts.py:158
6138.4.4 by Jonathan Riddell
update bzr.pot
5531
msgid "Remaining conflicts:"
5532
msgstr ""
5533
7185.1.1 by Jelmer Vernooij
Update pot file.
5534
#: breezy/conflicts.py:163
6138.4.4 by Jonathan Riddell
update bzr.pot
5535
msgid "All conflicts resolved."
5536
msgstr ""
5537
7185.1.1 by Jelmer Vernooij
Update pot file.
5538
#: breezy/conflicts.py:172
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5539
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5540
msgid "{0} conflict resolved, {1} remaining"
5541
msgid_plural "{0} conflicts resolved, {1} remaining"
5542
msgstr[0] ""
5543
msgstr[1] ""
5544
7185.1.1 by Jelmer Vernooij
Update pot file.
5545
#: breezy/controldir.py:731
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5546
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5547
msgid "{0} is{1} redirected to {2}"
5548
msgstr ""
5549
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5550
#: breezy/diff.py:413
6138.4.4 by Jonathan Riddell
update bzr.pot
5551
#, python-format
5552
msgid "*** Ignoring files outside view. View is %s"
5553
msgstr ""
5554
7185.1.1 by Jelmer Vernooij
Update pot file.
5555
#: breezy/errors.py:167
5556
msgid ""
5557
"API %(api)s is not compatible; one of versions %(wanted)r is required, but "
5558
"current version is %(current)r."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5559
msgstr ""
5560
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5561
#: breezy/errors.py:178
6093.2.1 by Jonathan Riddell
add .pot file to archive
5562
msgid "The transport '%(transport)s' is only accessible within this process."
5563
msgstr ""
5564
7185.1.1 by Jelmer Vernooij
Update pot file.
5565
#: breezy/errors.py:196
6093.2.1 by Jonathan Riddell
add .pot file to archive
5566
msgid "Invalid revision number %(revno)s"
5567
msgstr ""
5568
7185.1.1 by Jelmer Vernooij
Update pot file.
5569
#: breezy/errors.py:205
6093.2.1 by Jonathan Riddell
add .pot file to archive
5570
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5571
msgstr ""
5572
7185.1.1 by Jelmer Vernooij
Update pot file.
5573
#: breezy/errors.py:216
6093.2.1 by Jonathan Riddell
add .pot file to archive
5574
msgid "Reserved revision-id {%(revision_id)s}"
5575
msgstr ""
5576
7185.1.1 by Jelmer Vernooij
Update pot file.
5577
#: breezy/errors.py:230
6093.2.1 by Jonathan Riddell
add .pot file to archive
5578
msgid "There is no public branch set for \"%(branch_url)s\"."
5579
msgstr ""
5580
7185.1.1 by Jelmer Vernooij
Update pot file.
5581
#: breezy/errors.py:240
6093.2.1 by Jonathan Riddell
add .pot file to archive
5582
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5583
msgstr ""
5584
7185.1.1 by Jelmer Vernooij
Update pot file.
5585
#: breezy/errors.py:250
6093.2.1 by Jonathan Riddell
add .pot file to archive
5586
msgid "The branch '%(branch)s' is not stacked."
5587
msgstr ""
5588
7185.1.1 by Jelmer Vernooij
Update pot file.
5589
#: breezy/errors.py:264
6093.2.1 by Jonathan Riddell
add .pot file to archive
5590
msgid "No WorkingTree exists for \"%(base)s\"."
5591
msgstr ""
5592
7185.1.1 by Jelmer Vernooij
Update pot file.
5593
#: breezy/errors.py:273
6093.2.1 by Jonathan Riddell
add .pot file to archive
5594
msgid "%(url)s is not a local path."
5595
msgstr ""
5596
7185.1.1 by Jelmer Vernooij
Update pot file.
5597
#: breezy/errors.py:301
6093.2.1 by Jonathan Riddell
add .pot file to archive
5598
msgid "%(not_locked)r is not write locked but needs to be."
5599
msgstr ""
5600
7185.1.1 by Jelmer Vernooij
Update pot file.
5601
#: breezy/errors.py:309
5602
msgid "Commit refused because there are unknown files in the tree"
5603
msgstr ""
5604
5605
#: breezy/errors.py:320
6093.2.1 by Jonathan Riddell
add .pot file to archive
5606
msgid "Generic path error: %(path)r%(extra)s)"
5607
msgstr ""
5608
7185.1.1 by Jelmer Vernooij
Update pot file.
5609
#: breezy/errors.py:333
6093.2.1 by Jonathan Riddell
add .pot file to archive
5610
msgid "No such file: %(path)r%(extra)s"
5611
msgstr ""
5612
7185.1.1 by Jelmer Vernooij
Update pot file.
5613
#: breezy/errors.py:338
6093.2.1 by Jonathan Riddell
add .pot file to archive
5614
msgid "File exists: %(path)r%(extra)s"
5615
msgstr ""
5616
7185.1.1 by Jelmer Vernooij
Update pot file.
5617
#: breezy/errors.py:344
6093.2.1 by Jonathan Riddell
add .pot file to archive
5618
msgid ""
5619
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5620
"after to tell brz about a rename that has already happened)%(extra)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5621
msgstr ""
5622
7185.1.1 by Jelmer Vernooij
Update pot file.
5623
#: breezy/errors.py:360
6093.2.1 by Jonathan Riddell
add .pot file to archive
5624
msgid "\"%(path)s\" is not a directory %(extra)s"
5625
msgstr ""
5626
7185.1.1 by Jelmer Vernooij
Update pot file.
5627
#: breezy/errors.py:365
6093.2.1 by Jonathan Riddell
add .pot file to archive
5628
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5629
msgstr ""
5630
7185.1.1 by Jelmer Vernooij
Update pot file.
5631
#: breezy/errors.py:370
6093.2.1 by Jonathan Riddell
add .pot file to archive
5632
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5633
msgstr ""
5634
7185.1.1 by Jelmer Vernooij
Update pot file.
5635
#: breezy/errors.py:375
6093.2.1 by Jonathan Riddell
add .pot file to archive
5636
msgid "Hard-linking \"%(path)s\" is not supported"
5637
msgstr ""
5638
7185.1.1 by Jelmer Vernooij
Update pot file.
5639
#: breezy/errors.py:390
6093.2.1 by Jonathan Riddell
add .pot file to archive
5640
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5641
msgstr ""
5642
7185.1.1 by Jelmer Vernooij
Update pot file.
5643
#: breezy/errors.py:395
6093.2.1 by Jonathan Riddell
add .pot file to archive
5644
msgid "Permission denied: \"%(path)s\"%(extra)s"
5645
msgstr ""
5646
7185.1.1 by Jelmer Vernooij
Update pot file.
5647
#: breezy/errors.py:412
6093.2.1 by Jonathan Riddell
add .pot file to archive
5648
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5649
msgstr ""
5650
7185.1.1 by Jelmer Vernooij
Update pot file.
5651
#: breezy/errors.py:420
6093.2.1 by Jonathan Riddell
add .pot file to archive
5652
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5653
msgstr ""
5654
7185.1.1 by Jelmer Vernooij
Update pot file.
5655
#: breezy/errors.py:430
6093.2.1 by Jonathan Riddell
add .pot file to archive
5656
msgid ""
5657
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5658
"need to upgrade the repository to permit branch stacking."
5659
msgstr ""
5660
7185.1.1 by Jelmer Vernooij
Update pot file.
5661
#: breezy/errors.py:441
6093.2.1 by Jonathan Riddell
add .pot file to archive
5662
msgid "Error reading from %(path)r."
5663
msgstr ""
5664
7185.1.1 by Jelmer Vernooij
Update pot file.
5665
#: breezy/errors.py:460
6093.2.1 by Jonathan Riddell
add .pot file to archive
5666
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5667
msgstr ""
5668
7185.1.1 by Jelmer Vernooij
Update pot file.
5669
#: breezy/errors.py:476
6093.2.1 by Jonathan Riddell
add .pot file to archive
5670
msgid "Path \"%(path)s\" is not unicode normalized"
5671
msgstr ""
5672
7185.1.1 by Jelmer Vernooij
Update pot file.
5673
#: breezy/errors.py:484
6093.2.1 by Jonathan Riddell
add .pot file to archive
5674
msgid "Not a branch: \"%(path)s\"%(detail)s."
5675
msgstr ""
5676
7185.1.1 by Jelmer Vernooij
Update pot file.
5677
#: breezy/errors.py:526
6093.2.1 by Jonathan Riddell
add .pot file to archive
5678
msgid "No submit branch available for branch \"%(path)s\""
5679
msgstr ""
5680
7185.1.1 by Jelmer Vernooij
Update pot file.
5681
#: breezy/errors.py:535
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5682
msgid "A control directory already exists: \"%(path)s\"."
5683
msgstr ""
5684
7185.1.1 by Jelmer Vernooij
Update pot file.
5685
#: breezy/errors.py:540
6093.2.1 by Jonathan Riddell
add .pot file to archive
5686
msgid "Already a branch: \"%(path)s\"."
5687
msgstr ""
5688
7185.1.1 by Jelmer Vernooij
Update pot file.
5689
#: breezy/errors.py:545
6504.1.1 by Vincent Ladeuil
Update translation template
5690
msgid "Invalid branch name: %(name)s"
5691
msgstr ""
5692
7185.1.1 by Jelmer Vernooij
Update pot file.
5693
#: breezy/errors.py:554
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5694
msgid "Parent branch already exists: \"%(path)s\"."
5695
msgstr ""
5696
7185.1.1 by Jelmer Vernooij
Update pot file.
5697
#: breezy/errors.py:560
6093.2.1 by Jonathan Riddell
add .pot file to archive
5698
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5699
"Directory contains a branch, but no working tree (use brz checkout if you "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5700
"wish to build a working tree): \"%(path)s\""
5701
msgstr ""
5702
7185.1.1 by Jelmer Vernooij
Update pot file.
5703
#: breezy/errors.py:565
6093.2.1 by Jonathan Riddell
add .pot file to archive
5704
msgid ""
5705
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5706
msgstr ""
5707
7185.1.1 by Jelmer Vernooij
Update pot file.
5708
#: breezy/errors.py:575
6093.2.1 by Jonathan Riddell
add .pot file to archive
5709
msgid "No repository present: \"%(path)s\""
5710
msgstr ""
5711
7185.1.1 by Jelmer Vernooij
Update pot file.
5712
#: breezy/errors.py:583
6093.2.1 by Jonathan Riddell
add .pot file to archive
5713
msgid ""
5714
"Unsupported branch format: %(format)s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5715
"Please run 'brz upgrade'"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5716
msgstr ""
5717
7185.1.1 by Jelmer Vernooij
Update pot file.
5718
#: breezy/errors.py:589
6093.2.1 by Jonathan Riddell
add .pot file to archive
5719
msgid "Unknown %(kind)s format: %(format)r"
5720
msgstr ""
5721
7185.1.1 by Jelmer Vernooij
Update pot file.
5722
#: breezy/errors.py:598
5723
msgid ""
5724
"Line ending corrupted for file: %(file)s; Maybe your files got corrupted in "
5725
"transport?"
5726
msgstr ""
5727
5728
#: breezy/errors.py:607
5729
msgid "Format %(format)s is not compatible with .bzr version %(controldir)s."
5730
msgstr ""
5731
5732
#: breezy/errors.py:617
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5733
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5734
msgstr ""
5735
7185.1.1 by Jelmer Vernooij
Update pot file.
5736
#: breezy/errors.py:632
6093.2.1 by Jonathan Riddell
add .pot file to archive
5737
msgid ""
5738
"%(target)s\n"
5739
"is not compatible with\n"
5740
"%(source)s\n"
5741
"%(details)s"
5742
msgstr ""
5743
7185.1.1 by Jelmer Vernooij
Update pot file.
5744
#: breezy/errors.py:648
6093.2.1 by Jonathan Riddell
add .pot file to archive
5745
msgid "Revision is not compatible with %(repo_format)s"
5746
msgstr ""
5747
7185.1.1 by Jelmer Vernooij
Update pot file.
5748
#: breezy/errors.py:658
6093.2.1 by Jonathan Riddell
add .pot file to archive
5749
msgid "%(context_info)s%(path)s is already versioned."
5750
msgstr ""
5751
7185.1.1 by Jelmer Vernooij
Update pot file.
5752
#: breezy/errors.py:679
6093.2.1 by Jonathan Riddell
add .pot file to archive
5753
msgid "%(context_info)s%(path)s is not versioned."
5754
msgstr ""
5755
7185.1.1 by Jelmer Vernooij
Update pot file.
5756
#: breezy/errors.py:700
6093.2.1 by Jonathan Riddell
add .pot file to archive
5757
msgid "Path(s) are not versioned: %(paths_as_string)s"
5758
msgstr ""
5759
7185.1.1 by Jelmer Vernooij
Update pot file.
5760
#: breezy/errors.py:711
6093.2.1 by Jonathan Riddell
add .pot file to archive
5761
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5762
msgstr ""
5763
7185.1.1 by Jelmer Vernooij
Update pot file.
5764
#: breezy/errors.py:730
6093.2.1 by Jonathan Riddell
add .pot file to archive
5765
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5766
msgstr ""
5767
7185.1.1 by Jelmer Vernooij
Update pot file.
5768
#: breezy/errors.py:738
6093.2.1 by Jonathan Riddell
add .pot file to archive
5769
msgid ""
5770
"Filename %(filename)r is not valid in your current filesystem encoding "
5771
"%(fs_encoding)s"
5772
msgstr ""
5773
7185.1.1 by Jelmer Vernooij
Update pot file.
5774
#: breezy/errors.py:749
6093.2.1 by Jonathan Riddell
add .pot file to archive
5775
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5776
msgstr ""
5777
7185.1.1 by Jelmer Vernooij
Update pot file.
5778
#: breezy/errors.py:767
6093.2.1 by Jonathan Riddell
add .pot file to archive
5779
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5780
msgstr ""
5781
7185.1.1 by Jelmer Vernooij
Update pot file.
5782
#: breezy/errors.py:806
6093.2.1 by Jonathan Riddell
add .pot file to archive
5783
msgid "Cannot lock %(lock)s: %(why)s"
5784
msgstr ""
5785
7185.1.1 by Jelmer Vernooij
Update pot file.
5786
#: breezy/errors.py:816
6093.2.1 by Jonathan Riddell
add .pot file to archive
5787
msgid ""
5788
"A transaction related operation was attempted after the transaction finished."
5789
msgstr ""
5790
7185.1.1 by Jelmer Vernooij
Update pot file.
5791
#: breezy/errors.py:843
6093.2.1 by Jonathan Riddell
add .pot file to archive
5792
msgid "Cannot lock: transport is read only: %(transport)s"
5793
msgstr ""
5794
7185.1.1 by Jelmer Vernooij
Update pot file.
5795
#: breezy/errors.py:851
6093.2.1 by Jonathan Riddell
add .pot file to archive
5796
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5797
msgstr ""
5798
7185.1.1 by Jelmer Vernooij
Update pot file.
5799
#: breezy/errors.py:862
6093.2.1 by Jonathan Riddell
add .pot file to archive
5800
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5801
msgstr ""
5802
7185.1.1 by Jelmer Vernooij
Update pot file.
5803
#: breezy/errors.py:873
6093.2.1 by Jonathan Riddell
add .pot file to archive
5804
msgid ""
5805
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5806
"%(holder)r, wanted to break %(target)r"
5807
msgstr ""
5808
7185.1.1 by Jelmer Vernooij
Update pot file.
5809
#: breezy/errors.py:885
6093.2.1 by Jonathan Riddell
add .pot file to archive
5810
msgid ""
5811
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5812
"Use 'brz break-lock' to clear it"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5813
msgstr ""
5814
7185.1.1 by Jelmer Vernooij
Update pot file.
5815
#: breezy/errors.py:898
6093.2.1 by Jonathan Riddell
add .pot file to archive
5816
msgid "Lock not held: %(lock)s"
5817
msgstr ""
5818
7185.1.1 by Jelmer Vernooij
Update pot file.
5819
#: breezy/errors.py:927
6093.2.1 by Jonathan Riddell
add .pot file to archive
5820
msgid "Upgrade URL cannot work with readonly URLs."
5821
msgstr ""
5822
7185.1.1 by Jelmer Vernooij
Update pot file.
5823
#: breezy/errors.py:932
6093.2.1 by Jonathan Riddell
add .pot file to archive
5824
msgid "The branch format %(format)s is already at the most recent format."
5825
msgstr ""
5826
7185.1.1 by Jelmer Vernooij
Update pot file.
5827
#: breezy/errors.py:950
6093.2.1 by Jonathan Riddell
add .pot file to archive
5828
msgid "Option --change does not accept revision ranges"
5829
msgstr ""
5830
7185.1.1 by Jelmer Vernooij
Update pot file.
5831
#: breezy/errors.py:955
6093.2.1 by Jonathan Riddell
add .pot file to archive
5832
msgid "No namespace registered for string: %(spec)r"
5833
msgstr ""
5834
7185.1.1 by Jelmer Vernooij
Update pot file.
5835
#: breezy/errors.py:974
6093.2.1 by Jonathan Riddell
add .pot file to archive
5836
msgid ""
5837
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5838
"%(extra)s"
5839
msgstr ""
5840
7185.1.1 by Jelmer Vernooij
Update pot file.
5841
#: breezy/errors.py:988
6093.2.1 by Jonathan Riddell
add .pot file to archive
5842
msgid ""
5843
"Operation denied because it would change the main history, which is not "
5844
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5845
msgstr ""
5846
7185.1.1 by Jelmer Vernooij
Update pot file.
5847
#: breezy/errors.py:999
6093.2.1 by Jonathan Riddell
add .pot file to archive
5848
msgid ""
5849
"These branches have diverged. Use the missing command to see how.\n"
5850
"Use the merge command to reconcile them."
5851
msgstr ""
5852
7185.1.1 by Jelmer Vernooij
Update pot file.
5853
#: breezy/errors.py:1019
6093.2.1 by Jonathan Riddell
add .pot file to archive
5854
msgid ""
5855
"Branches have no common ancestor, and no merge base revision was specified."
5856
msgstr ""
5857
7185.1.1 by Jelmer Vernooij
Update pot file.
5858
#: breezy/errors.py:1025
6093.2.1 by Jonathan Riddell
add .pot file to archive
5859
msgid ""
5860
"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
5861
msgstr ""
5862
7185.1.1 by Jelmer Vernooij
Update pot file.
5863
#: breezy/errors.py:1031
6093.2.1 by Jonathan Riddell
add .pot file to archive
5864
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5865
msgstr ""
5866
7185.1.1 by Jelmer Vernooij
Update pot file.
5867
#: breezy/errors.py:1040
6093.2.1 by Jonathan Riddell
add .pot file to archive
5868
msgid ""
5869
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5870
msgstr ""
5871
7185.1.1 by Jelmer Vernooij
Update pot file.
5872
#: breezy/errors.py:1049
6093.2.1 by Jonathan Riddell
add .pot file to archive
5873
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5874
msgstr ""
5875
7185.1.1 by Jelmer Vernooij
Update pot file.
5876
#: breezy/errors.py:1058
6093.2.1 by Jonathan Riddell
add .pot file to archive
5877
msgid "Branch %(branch)s has no commits."
5878
msgstr ""
5879
7185.1.1 by Jelmer Vernooij
Update pot file.
5880
#: breezy/errors.py:1075
6093.2.1 by Jonathan Riddell
add .pot file to archive
5881
msgid ""
5882
"Bound branch %(branch)s is out of date with master branch %(master)s."
5883
"%(extra_help)s"
5884
msgstr ""
5885
7185.1.1 by Jelmer Vernooij
Update pot file.
5886
#: breezy/errors.py:1087
6093.2.1 by Jonathan Riddell
add .pot file to archive
5887
msgid ""
5888
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5889
"bound to %(remote)s."
5890
msgstr ""
5891
7185.1.1 by Jelmer Vernooij
Update pot file.
5892
#: breezy/errors.py:1099
6093.2.1 by Jonathan Riddell
add .pot file to archive
5893
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5894
msgstr ""
5895
7185.1.1 by Jelmer Vernooij
Update pot file.
5896
#: breezy/errors.py:1108
6093.2.1 by Jonathan Riddell
add .pot file to archive
5897
msgid ""
5898
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5899
"%(error)s"
5900
msgstr ""
5901
7185.1.1 by Jelmer Vernooij
Update pot file.
5902
#: breezy/errors.py:1120
6093.2.1 by Jonathan Riddell
add .pot file to archive
5903
msgid "Versioned file error"
5904
msgstr ""
5905
7185.1.1 by Jelmer Vernooij
Update pot file.
5906
#: breezy/errors.py:1125
6093.2.1 by Jonathan Riddell
add .pot file to archive
5907
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5908
msgstr ""
5909
7185.1.1 by Jelmer Vernooij
Update pot file.
5910
#: breezy/errors.py:1135
6093.2.1 by Jonathan Riddell
add .pot file to archive
5911
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5912
msgstr ""
5913
7185.1.1 by Jelmer Vernooij
Update pot file.
5914
#: breezy/errors.py:1145
6093.2.1 by Jonathan Riddell
add .pot file to archive
5915
msgid "Text did not match its checksum: %(msg)s"
5916
msgstr ""
5917
7185.1.1 by Jelmer Vernooij
Update pot file.
5918
#: breezy/errors.py:1197
6093.2.1 by Jonathan Riddell
add .pot file to archive
5919
msgid "Export format %(format)r not supported"
5920
msgstr ""
5921
7185.1.1 by Jelmer Vernooij
Update pot file.
5922
#: breezy/errors.py:1206
6093.2.1 by Jonathan Riddell
add .pot file to archive
5923
msgid "Transport error: %(msg)s %(orig_error)s"
5924
msgstr ""
5925
7185.1.1 by Jelmer Vernooij
Update pot file.
5926
#: breezy/errors.py:1232
6093.2.1 by Jonathan Riddell
add .pot file to archive
5927
msgid "Generic bzr smart protocol error: %(details)s"
5928
msgstr ""
5929
7185.1.1 by Jelmer Vernooij
Update pot file.
5930
#: breezy/errors.py:1240
6093.2.1 by Jonathan Riddell
add .pot file to archive
5931
msgid "Received bad protocol version marker: %(marker)r"
5932
msgstr ""
5933
7185.1.1 by Jelmer Vernooij
Update pot file.
5934
#: breezy/errors.py:1272
6093.2.1 by Jonathan Riddell
add .pot file to archive
5935
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5936
msgstr ""
5937
7185.1.1 by Jelmer Vernooij
Update pot file.
5938
#: breezy/errors.py:1277
6093.2.1 by Jonathan Riddell
add .pot file to archive
5939
msgid "Connection error: %(msg)s %(orig_error)s"
5940
msgstr ""
5941
7185.1.1 by Jelmer Vernooij
Update pot file.
5942
#: breezy/errors.py:1282
6093.2.1 by Jonathan Riddell
add .pot file to archive
5943
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5944
msgstr ""
5945
7185.1.1 by Jelmer Vernooij
Update pot file.
5946
#: breezy/errors.py:1303
6093.2.1 by Jonathan Riddell
add .pot file to archive
5947
msgid "Connection closed: %(msg)s %(orig_error)s"
5948
msgstr ""
5949
7185.1.1 by Jelmer Vernooij
Update pot file.
5950
#: breezy/errors.py:1308
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5951
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5952
msgstr ""
5953
7185.1.1 by Jelmer Vernooij
Update pot file.
5954
#: breezy/errors.py:1313
6093.2.1 by Jonathan Riddell
add .pot file to archive
5955
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5956
msgstr ""
5957
7185.1.1 by Jelmer Vernooij
Update pot file.
5958
#: breezy/errors.py:1323
6093.2.1 by Jonathan Riddell
add .pot file to archive
5959
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5960
msgstr ""
5961
7185.1.1 by Jelmer Vernooij
Update pot file.
5962
#: breezy/errors.py:1338
6093.2.1 by Jonathan Riddell
add .pot file to archive
5963
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5964
msgstr ""
5965
7185.1.1 by Jelmer Vernooij
Update pot file.
5966
#: breezy/errors.py:1352
6093.2.1 by Jonathan Riddell
add .pot file to archive
5967
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5968
msgstr ""
5969
7185.1.1 by Jelmer Vernooij
Update pot file.
5970
#: breezy/errors.py:1360
6093.2.1 by Jonathan Riddell
add .pot file to archive
5971
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5972
msgstr ""
5973
7185.1.1 by Jelmer Vernooij
Update pot file.
5974
#: breezy/errors.py:1369
6093.2.1 by Jonathan Riddell
add .pot file to archive
5975
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5976
msgstr ""
5977
7185.1.1 by Jelmer Vernooij
Update pot file.
5978
#: breezy/errors.py:1383
6093.2.1 by Jonathan Riddell
add .pot file to archive
5979
msgid "Too many redirections"
5980
msgstr ""
5981
7185.1.1 by Jelmer Vernooij
Update pot file.
5982
#: breezy/errors.py:1388
6093.2.1 by Jonathan Riddell
add .pot file to archive
5983
msgid "Working tree has conflicts."
5984
msgstr ""
5985
7185.1.1 by Jelmer Vernooij
Update pot file.
5986
#: breezy/errors.py:1393
6093.2.1 by Jonathan Riddell
add .pot file to archive
5987
msgid "Unable to import library \"%(library)s\": %(error)s"
5988
msgstr ""
5989
7185.1.1 by Jelmer Vernooij
Update pot file.
5990
#: breezy/errors.py:1401
6093.2.1 by Jonathan Riddell
add .pot file to archive
5991
msgid ""
5992
"The working tree for %(basedir)s has changed since the last commit, but "
5993
"weave merge requires that it be unchanged"
5994
msgstr ""
5995
7185.1.1 by Jelmer Vernooij
Update pot file.
5996
#: breezy/errors.py:1411
6093.2.1 by Jonathan Riddell
add .pot file to archive
5997
msgid "Cycle in graph %(graph)r"
5998
msgstr ""
5999
7185.1.1 by Jelmer Vernooij
Update pot file.
6000
#: breezy/errors.py:1439
6093.2.1 by Jonathan Riddell
add .pot file to archive
6001
msgid "File %(filename)s is not conflicted."
6002
msgstr ""
6003
7185.1.1 by Jelmer Vernooij
Update pot file.
6004
#: breezy/errors.py:1461
6093.2.1 by Jonathan Riddell
add .pot file to archive
6005
msgid "No bundle was found in \"%(filename)s\"."
6006
msgstr ""
6007
7185.1.1 by Jelmer Vernooij
Update pot file.
6008
#: breezy/errors.py:1470
6093.2.1 by Jonathan Riddell
add .pot file to archive
6009
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6010
msgstr ""
6011
7185.1.1 by Jelmer Vernooij
Update pot file.
6012
#: breezy/errors.py:1480
6093.2.1 by Jonathan Riddell
add .pot file to archive
6013
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6014
msgstr ""
6015
7185.1.1 by Jelmer Vernooij
Update pot file.
6016
#: breezy/errors.py:1493
6093.2.1 by Jonathan Riddell
add .pot file to archive
6017
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6018
msgstr ""
6019
7185.1.1 by Jelmer Vernooij
Update pot file.
6020
#: breezy/errors.py:1503
6093.2.1 by Jonathan Riddell
add .pot file to archive
6021
msgid "Key %(key)s is already present in map"
6022
msgstr ""
6023
7185.1.1 by Jelmer Vernooij
Update pot file.
6024
#: breezy/errors.py:1508
6093.2.1 by Jonathan Riddell
add .pot file to archive
6025
msgid "The prefix %(prefix)s is in the help search path twice."
6026
msgstr ""
6027
7185.1.1 by Jelmer Vernooij
Update pot file.
6028
#: breezy/errors.py:1518
6093.2.1 by Jonathan Riddell
add .pot file to archive
6029
msgid ""
6030
"No final name for trans_id %(trans_id)r\n"
6031
"file-id: %(file_id)r\n"
6032
"root trans-id: %(root_trans_id)r\n"
6033
msgstr ""
6034
7185.1.1 by Jelmer Vernooij
Update pot file.
6035
#: breezy/errors.py:1550
6093.2.1 by Jonathan Riddell
add .pot file to archive
6036
msgid "Attempt to reuse a transform that has already been applied."
6037
msgstr ""
6038
7185.1.1 by Jelmer Vernooij
Update pot file.
6039
#: breezy/errors.py:1555
6093.2.1 by Jonathan Riddell
add .pot file to archive
6040
msgid "Moving the root directory is not supported at this time"
6041
msgstr ""
6042
7185.1.1 by Jelmer Vernooij
Update pot file.
6043
#: breezy/errors.py:1560
6093.2.1 by Jonathan Riddell
add .pot file to archive
6044
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6045
msgstr ""
6046
7185.1.1 by Jelmer Vernooij
Update pot file.
6047
#: breezy/errors.py:1571
6093.2.1 by Jonathan Riddell
add .pot file to archive
6048
msgid ""
6049
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6050
msgstr ""
6051
7185.1.1 by Jelmer Vernooij
Update pot file.
6052
#: breezy/errors.py:1607
6093.2.1 by Jonathan Riddell
add .pot file to archive
6053
msgid ""
6054
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6055
msgstr ""
6056
7185.1.1 by Jelmer Vernooij
Update pot file.
6057
#: breezy/errors.py:1637
6093.2.1 by Jonathan Riddell
add .pot file to archive
6058
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6059
msgstr ""
6060
7185.1.1 by Jelmer Vernooij
Update pot file.
6061
#: breezy/errors.py:1645
6093.2.1 by Jonathan Riddell
add .pot file to archive
6062
msgid "Nothing to merge."
6063
msgstr ""
6064
7185.1.1 by Jelmer Vernooij
Update pot file.
6065
#: breezy/errors.py:1650
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6066
msgid "Format %(format)s cannot be initialised by this version of brz."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6067
msgstr ""
6068
7185.1.1 by Jelmer Vernooij
Update pot file.
6069
#: breezy/errors.py:1659
6093.2.1 by Jonathan Riddell
add .pot file to archive
6070
msgid ""
6071
"Cannot convert from format %(from_format)s to format %(format)s.    "
6072
"%(problem)s"
6073
msgstr ""
6074
7185.1.1 by Jelmer Vernooij
Update pot file.
6075
#: breezy/errors.py:1671
6093.2.1 by Jonathan Riddell
add .pot file to archive
6076
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6077
msgstr ""
6078
7185.1.1 by Jelmer Vernooij
Update pot file.
6079
#: breezy/errors.py:1679
6093.2.1 by Jonathan Riddell
add .pot file to archive
6080
msgid "%(exe_name)s could not be found on this machine"
6081
msgstr ""
6082
7185.1.1 by Jelmer Vernooij
Update pot file.
6083
#: breezy/errors.py:1687
6093.2.1 by Jonathan Riddell
add .pot file to archive
6084
msgid "Diff is not installed on this machine: %(msg)s"
6085
msgstr ""
6086
7185.1.1 by Jelmer Vernooij
Update pot file.
6087
#: breezy/errors.py:1695
6093.2.1 by Jonathan Riddell
add .pot file to archive
6088
msgid "Diff3 is not installed on this machine."
6089
msgstr ""
6090
7185.1.1 by Jelmer Vernooij
Update pot file.
6091
#: breezy/errors.py:1701
6093.2.1 by Jonathan Riddell
add .pot file to archive
6092
msgid "The content being inserted is already present."
6093
msgstr ""
6094
7185.1.1 by Jelmer Vernooij
Update pot file.
6095
#: breezy/errors.py:1706
6093.2.1 by Jonathan Riddell
add .pot file to archive
6096
msgid ""
6097
"This tree contains left-over files from a failed operation.\n"
6098
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
6099
"to\n"
6100
"    keep, and delete it when you are done."
6101
msgstr ""
6102
7185.1.1 by Jelmer Vernooij
Update pot file.
6103
#: breezy/errors.py:1717
6093.2.1 by Jonathan Riddell
add .pot file to archive
6104
msgid ""
6105
"This tree contains left-over files from a failed operation.\n"
6106
"    Please examine %(pending_deletion)s to see if it contains any files you\n"
6107
"    wish to keep, and delete it when you are done."
6108
msgstr ""
6109
7185.1.1 by Jelmer Vernooij
Update pot file.
6110
#: breezy/errors.py:1727
6093.2.1 by Jonathan Riddell
add .pot file to archive
6111
msgid ""
6112
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6113
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
6114
"to\n"
6115
"    keep, and delete it when you are done."
6116
msgstr ""
6117
7185.1.1 by Jelmer Vernooij
Update pot file.
6118
#: breezy/errors.py:1738
6093.2.1 by Jonathan Riddell
add .pot file to archive
6119
msgid ""
6120
"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
6121
"examine %(pending_deletion)s to see if it contains any files you wish to "
6122
"keep, and delete it when you are done."
6123
msgstr ""
6124
7185.1.1 by Jelmer Vernooij
Update pot file.
6125
#: breezy/errors.py:1748
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6126
msgid "Working tree is out of date, please run 'brz update'.%(more)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6127
msgstr ""
6128
7185.1.1 by Jelmer Vernooij
Update pot file.
6129
#: breezy/errors.py:1762
6093.2.1 by Jonathan Riddell
add .pot file to archive
6130
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6131
msgstr ""
6132
7185.1.1 by Jelmer Vernooij
Update pot file.
6133
#: breezy/errors.py:1775
6093.2.1 by Jonathan Riddell
add .pot file to archive
6134
msgid "Error in merge modified format"
6135
msgstr ""
6136
7185.1.1 by Jelmer Vernooij
Update pot file.
6137
#: breezy/errors.py:1780
6093.2.1 by Jonathan Riddell
add .pot file to archive
6138
msgid "Format error in conflict listings"
6139
msgstr ""
6140
7185.1.1 by Jelmer Vernooij
Update pot file.
6141
#: breezy/errors.py:1784
6093.2.1 by Jonathan Riddell
add .pot file to archive
6142
msgid ""
6143
"An error has been detected in the repository %(repo_path)s.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6144
"Please run brz reconcile on this repository."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6145
msgstr ""
6146
7185.1.1 by Jelmer Vernooij
Update pot file.
6147
#: breezy/errors.py:1795
6093.2.1 by Jonathan Riddell
add .pot file to archive
6148
msgid ""
6149
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6150
"reason: %(reason)s"
6151
msgstr ""
6152
7185.1.1 by Jelmer Vernooij
Update pot file.
6153
#: breezy/errors.py:1808
6093.2.1 by Jonathan Riddell
add .pot file to archive
6154
msgid ""
6155
"An inconsistent delta was supplied: %(delta)r\n"
6156
"reason: %(reason)s"
6157
msgstr ""
6158
7185.1.1 by Jelmer Vernooij
Update pot file.
6159
#: breezy/errors.py:1820
6093.2.1 by Jonathan Riddell
add .pot file to archive
6160
msgid "To use this feature you must upgrade your branch at %(path)s."
6161
msgstr ""
6162
7185.1.1 by Jelmer Vernooij
Update pot file.
6163
#: breezy/errors.py:1829
6093.2.1 by Jonathan Riddell
add .pot file to archive
6164
msgid "To use this feature you must upgrade your repository at %(path)s."
6165
msgstr ""
6166
7185.1.1 by Jelmer Vernooij
Update pot file.
6167
#: breezy/errors.py:1834
6093.2.1 by Jonathan Riddell
add .pot file to archive
6168
msgid ""
6169
"To use this feature you must upgrade your branch at %(path)s to a format "
6170
"which supports rich roots."
6171
msgstr ""
6172
7185.1.1 by Jelmer Vernooij
Update pot file.
6173
#: breezy/errors.py:1840
6093.2.1 by Jonathan Riddell
add .pot file to archive
6174
msgid "Cannot perform local-only commits on unbound branches."
6175
msgstr ""
6176
7185.1.1 by Jelmer Vernooij
Update pot file.
6177
#: breezy/errors.py:1845
6093.2.1 by Jonathan Riddell
add .pot file to archive
6178
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6179
msgstr ""
6180
7185.1.1 by Jelmer Vernooij
Update pot file.
6181
#: breezy/errors.py:1870
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
6182
msgid "Ghost tags not supported by format %(format)r."
6183
msgstr ""
6184
7185.1.1 by Jelmer Vernooij
Update pot file.
6185
#: breezy/errors.py:1878
6093.2.1 by Jonathan Riddell
add .pot file to archive
6186
msgid "File is binary but should be text."
6187
msgstr ""
6188
7185.1.1 by Jelmer Vernooij
Update pot file.
6189
#: breezy/errors.py:1883
6093.2.1 by Jonathan Riddell
add .pot file to archive
6190
msgid "The path %(path)s is not permitted on this platform"
6191
msgstr ""
6192
7185.1.1 by Jelmer Vernooij
Update pot file.
6193
#: breezy/errors.py:1892
6093.2.1 by Jonathan Riddell
add .pot file to archive
6194
msgid ""
6195
"Testament did not match expected value.\n"
6196
"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6197
"       {%(measured)s}"
6198
msgstr ""
6199
7185.1.1 by Jelmer Vernooij
Update pot file.
6200
#: breezy/errors.py:1904
6093.2.1 by Jonathan Riddell
add .pot file to archive
6201
msgid "Not a bzr revision-bundle: %(text)r"
6202
msgstr ""
6203
7185.1.1 by Jelmer Vernooij
Update pot file.
6204
#: breezy/errors.py:1913
6093.2.1 by Jonathan Riddell
add .pot file to archive
6205
msgid "Bad bzr revision-bundle: %(text)r"
6206
msgstr ""
6207
7185.1.1 by Jelmer Vernooij
Update pot file.
6208
#: breezy/errors.py:1922
6093.2.1 by Jonathan Riddell
add .pot file to archive
6209
msgid "Malformed bzr revision-bundle header: %(text)r"
6210
msgstr ""
6211
7185.1.1 by Jelmer Vernooij
Update pot file.
6212
#: breezy/errors.py:1927
6093.2.1 by Jonathan Riddell
add .pot file to archive
6213
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6214
msgstr ""
6215
7185.1.1 by Jelmer Vernooij
Update pot file.
6216
#: breezy/errors.py:1932
6093.2.1 by Jonathan Riddell
add .pot file to archive
6217
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6218
msgstr ""
6219
7185.1.1 by Jelmer Vernooij
Update pot file.
6220
#: breezy/errors.py:1937
6093.2.1 by Jonathan Riddell
add .pot file to archive
6221
msgid "End of line marker was not \\n in bzr revision-bundle"
6222
msgstr ""
6223
7185.1.1 by Jelmer Vernooij
Update pot file.
6224
#: breezy/errors.py:1947
6093.2.1 by Jonathan Riddell
add .pot file to archive
6225
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6226
msgstr ""
6227
7185.1.1 by Jelmer Vernooij
Update pot file.
6228
#: breezy/errors.py:1957
6093.2.1 by Jonathan Riddell
add .pot file to archive
6229
msgid "Root class for inventory serialization errors"
6230
msgstr ""
6231
7185.1.1 by Jelmer Vernooij
Update pot file.
6232
#: breezy/errors.py:1961
6093.2.1 by Jonathan Riddell
add .pot file to archive
6233
msgid ""
6234
"The inventory was not in the expected format:\n"
6235
" %(msg)s"
6236
msgstr ""
6237
7185.1.1 by Jelmer Vernooij
Update pot file.
6238
#: breezy/errors.py:1970
6093.2.1 by Jonathan Riddell
add .pot file to archive
6239
msgid "This operation requires rich root data storage"
6240
msgstr ""
6241
7185.1.1 by Jelmer Vernooij
Update pot file.
6242
#: breezy/errors.py:1983
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6243
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6244
msgstr ""
6245
7185.1.1 by Jelmer Vernooij
Update pot file.
6246
#: breezy/errors.py:1992
6093.2.1 by Jonathan Riddell
add .pot file to archive
6247
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6248
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6249
"variable."
6250
msgstr ""
6251
7185.1.1 by Jelmer Vernooij
Update pot file.
6252
#: breezy/errors.py:1999
6093.2.1 by Jonathan Riddell
add .pot file to archive
6253
msgid ""
6254
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6255
"ghost at {%(ghost_revision_id)s}"
6256
msgstr ""
6257
7185.1.1 by Jelmer Vernooij
Update pot file.
6258
#: breezy/errors.py:2009
6093.2.1 by Jonathan Riddell
add .pot file to archive
6259
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6260
msgstr ""
6261
7185.1.1 by Jelmer Vernooij
Update pot file.
6262
#: breezy/errors.py:2061
6093.2.1 by Jonathan Riddell
add .pot file to archive
6263
msgid ""
6264
"A merge directive must provide either a bundle or a public branch location."
6265
msgstr ""
6266
7185.1.1 by Jelmer Vernooij
Update pot file.
6267
#: breezy/errors.py:2068
6093.2.1 by Jonathan Riddell
add .pot file to archive
6268
msgid "Bad merge directive payload %(start)r"
6269
msgstr ""
6270
7185.1.1 by Jelmer Vernooij
Update pot file.
6271
#: breezy/errors.py:2078
6093.2.1 by Jonathan Riddell
add .pot file to archive
6272
msgid "Preview patch does not match requested changes."
6273
msgstr ""
6274
7185.1.1 by Jelmer Vernooij
Update pot file.
6275
#: breezy/errors.py:2084
6093.2.1 by Jonathan Riddell
add .pot file to archive
6276
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6277
msgstr ""
6278
7185.1.1 by Jelmer Vernooij
Update pot file.
6279
#: breezy/errors.py:2094
6093.2.1 by Jonathan Riddell
add .pot file to archive
6280
msgid ""
6281
"Your branch does not have all of the revisions required in order to merge "
6282
"this merge directive and the target location specified in the merge "
6283
"directive is not a branch: %(location)s."
6284
msgstr ""
6285
7185.1.1 by Jelmer Vernooij
Update pot file.
6286
#: breezy/errors.py:2106
6093.2.1 by Jonathan Riddell
add .pot file to archive
6287
msgid "Unsupported entry kind %(kind)s"
6288
msgstr ""
6289
7185.1.1 by Jelmer Vernooij
Update pot file.
6290
#: breezy/errors.py:2114
6093.2.1 by Jonathan Riddell
add .pot file to archive
6291
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6292
msgstr ""
6293
7185.1.1 by Jelmer Vernooij
Update pot file.
6294
#: breezy/errors.py:2124
6093.2.1 by Jonathan Riddell
add .pot file to archive
6295
msgid "Subsume target %(other_tree)s needs to be upgraded."
6296
msgstr ""
6297
7185.1.1 by Jelmer Vernooij
Update pot file.
6298
#: breezy/errors.py:2132
6093.2.1 by Jonathan Riddell
add .pot file to archive
6299
msgid "No such tag: %(tag_name)s"
6300
msgstr ""
6301
7185.1.1 by Jelmer Vernooij
Update pot file.
6302
#: breezy/errors.py:2140
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6303
msgid "Tags not supported by %(branch)s; you may be able to use brz upgrade."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6304
msgstr ""
6305
7185.1.1 by Jelmer Vernooij
Update pot file.
6306
#: breezy/errors.py:2149
6093.2.1 by Jonathan Riddell
add .pot file to archive
6307
msgid "Tag %(tag_name)s already exists."
6308
msgstr ""
6309
7185.1.1 by Jelmer Vernooij
Update pot file.
6310
#: breezy/errors.py:2157
6093.2.1 by Jonathan Riddell
add .pot file to archive
6311
msgid "Could not understand response from smart server: %(response_tuple)r"
6312
msgstr ""
6313
7185.1.1 by Jelmer Vernooij
Update pot file.
6314
#: breezy/errors.py:2196
6093.2.1 by Jonathan Riddell
add .pot file to archive
6315
msgid "Server sent an unexpected error: %(error_tuple)r"
6316
msgstr ""
6317
7185.1.1 by Jelmer Vernooij
Update pot file.
6318
#: breezy/errors.py:2215
6093.2.1 by Jonathan Riddell
add .pot file to archive
6319
msgid "Unrecognised container format: %(container_format)r"
6320
msgstr ""
6321
7185.1.1 by Jelmer Vernooij
Update pot file.
6322
#: breezy/errors.py:2223
6093.2.1 by Jonathan Riddell
add .pot file to archive
6323
msgid "Unexpected end of container stream"
6324
msgstr ""
6325
7185.1.1 by Jelmer Vernooij
Update pot file.
6326
#: breezy/errors.py:2228
6093.2.1 by Jonathan Riddell
add .pot file to archive
6327
msgid "Unknown record type: %(record_type)r"
6328
msgstr ""
6329
7185.1.1 by Jelmer Vernooij
Update pot file.
6330
#: breezy/errors.py:2236
6093.2.1 by Jonathan Riddell
add .pot file to archive
6331
msgid "Invalid record: %(reason)s"
6332
msgstr ""
6333
7185.1.1 by Jelmer Vernooij
Update pot file.
6334
#: breezy/errors.py:2244
6093.2.1 by Jonathan Riddell
add .pot file to archive
6335
msgid "Container has data after end marker: %(excess)r"
6336
msgstr ""
6337
7185.1.1 by Jelmer Vernooij
Update pot file.
6338
#: breezy/errors.py:2252
6093.2.1 by Jonathan Riddell
add .pot file to archive
6339
msgid "Container has multiple records with the same name: %(name)s"
6340
msgstr ""
6341
7185.1.1 by Jelmer Vernooij
Update pot file.
6342
#: breezy/errors.py:2260
6093.2.1 by Jonathan Riddell
add .pot file to archive
6343
msgid "Corrupt or incompatible data stream: %(reason)s"
6344
msgstr ""
6345
7185.1.1 by Jelmer Vernooij
Update pot file.
6346
#: breezy/errors.py:2268
6093.2.1 by Jonathan Riddell
add .pot file to archive
6347
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6348
"Working tree \"%(display_url)s\" has uncommitted changes (See brz status)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6349
"%(more)s"
6350
msgstr ""
6351
7185.1.1 by Jelmer Vernooij
Update pot file.
6352
#: breezy/errors.py:2287
6093.2.1 by Jonathan Riddell
add .pot file to archive
6353
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
6354
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6355
msgstr ""
6356
7185.1.1 by Jelmer Vernooij
Update pot file.
6357
#: breezy/errors.py:2302
6581.1.2 by Vincent Ladeuil
Update translation template.
6358
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6359
"Working tree \"%(display_url)s\" has shelved changes (See brz shelve --list)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6360
"%(more)s"
6361
msgstr ""
6362
7185.1.1 by Jelmer Vernooij
Update pot file.
6363
#: breezy/errors.py:2308
6093.2.1 by Jonathan Riddell
add .pot file to archive
6364
msgid "Unable to create symlink %(path_str)son this platform"
6365
msgstr ""
6366
7185.1.1 by Jelmer Vernooij
Update pot file.
6367
#: breezy/errors.py:2323
6093.2.1 by Jonathan Riddell
add .pot file to archive
6368
msgid ""
6369
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6370
msgstr ""
6371
7185.1.1 by Jelmer Vernooij
Update pot file.
6372
#: breezy/errors.py:2335
6093.2.1 by Jonathan Riddell
add .pot file to archive
6373
msgid "The alias \"%(alias_name)s\" does not exist."
6374
msgstr ""
6375
7185.1.1 by Jelmer Vernooij
Update pot file.
6376
#: breezy/errors.py:2343
6093.2.1 by Jonathan Riddell
add .pot file to archive
6377
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6378
msgstr ""
6379
7185.1.1 by Jelmer Vernooij
Update pot file.
6380
#: breezy/errors.py:2356
6093.2.1 by Jonathan Riddell
add .pot file to archive
6381
msgid "Tip change rejected: %(msg)s"
6382
msgstr ""
6383
7185.1.1 by Jelmer Vernooij
Update pot file.
6384
#: breezy/errors.py:2364
6093.2.1 by Jonathan Riddell
add .pot file to archive
6385
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6386
msgstr ""
6387
7185.1.1 by Jelmer Vernooij
Update pot file.
6388
#: breezy/errors.py:2372
6093.2.1 by Jonathan Riddell
add .pot file to archive
6389
msgid "The user aborted the operation."
6390
msgstr ""
6391
7185.1.1 by Jelmer Vernooij
Update pot file.
6392
#: breezy/errors.py:2424
6393
msgid "%(controldir)r does not support co-located branches."
6394
msgstr ""
6395
6396
#: breezy/errors.py:2432
6093.2.1 by Jonathan Riddell
add .pot file to archive
6397
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6398
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `brz "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6399
"unbind` to fix."
6400
msgstr ""
6401
7185.1.1 by Jelmer Vernooij
Update pot file.
6402
#: breezy/errors.py:2441
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6403
msgid ""
6404
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6405
"format %(format)r"
6406
msgstr ""
6407
7185.1.1 by Jelmer Vernooij
Update pot file.
6408
#: breezy/errors.py:2453
6581.1.2 by Vincent Ladeuil
Update translation template.
6409
msgid ""
6410
"Cannot store uncommitted changes because this branch already stores "
6411
"uncommitted changes."
6412
msgstr ""
6413
7185.1.1 by Jelmer Vernooij
Update pot file.
6414
#: breezy/export_pot.py:255
6138.4.4 by Jonathan Riddell
update bzr.pot
6415
#, python-format
6416
msgid "Exporting messages from builtin command: %s"
6417
msgstr ""
6418
7185.1.1 by Jelmer Vernooij
Update pot file.
6419
#: breezy/export_pot.py:260
6420
#, python-format
6421
msgid "Plugin %s is not loaded"
6422
msgstr ""
6423
6424
#: breezy/export_pot.py:277
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6425
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
6426
msgid "Exporting messages from plugin command: {0} in {1}"
6427
msgstr ""
6428
7185.1.1 by Jelmer Vernooij
Update pot file.
6429
#: breezy/export_pot.py:298
6138.4.4 by Jonathan Riddell
update bzr.pot
6430
#, python-format
6431
msgid "Exporting message from error: %s"
6432
msgstr ""
6433
7185.1.1 by Jelmer Vernooij
Update pot file.
6434
#: breezy/git/commands.py:115
6435
#, python-format
6436
msgid "%r is not a git repository"
6437
msgstr ""
6438
6439
#: breezy/git/commands.py:128
6440
msgid "Target repository doesn't support rich roots"
6441
msgstr ""
6442
6443
#: breezy/git/commands.py:141
6444
msgid "creating branches"
6445
msgstr ""
6446
6447
#: breezy/git/commands.py:165
6448
msgid ""
6449
"Use 'bzr checkout' to create a working tree in the newly created branches."
6450
msgstr ""
6451
6452
#: breezy/git/commands.py:207
6453
#, python-format
6454
msgid "Object not found: %s"
6455
msgstr ""
6456
6457
#: breezy/git/commands.py:280
6458
msgid "error running patch"
6138.4.4 by Jonathan Riddell
update bzr.pot
6459
msgstr ""
6460
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6461
#: breezy/gpg.py:365
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6462
#, python-brace-format
6504.1.1 by Vincent Ladeuil
Update translation template
6463
msgid "No GnuPG key results for pattern: {0}"
6464
msgstr ""
6465
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6466
#: breezy/gpg.py:371
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6467
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6468
msgid "{0} commits with valid signatures"
6469
msgstr ""
6470
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6471
#: breezy/gpg.py:377
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6472
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6473
msgid "{0} commit with unknown key"
6474
msgid_plural "{0} commits with unknown keys"
6475
msgstr[0] ""
6476
msgstr[1] ""
6477
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6478
#: breezy/gpg.py:385
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6479
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6480
msgid "{0} commit not valid"
6481
msgid_plural "{0} commits not valid"
6482
msgstr[0] ""
6483
msgstr[1] ""
6484
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6485
#: breezy/gpg.py:393
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6486
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6487
msgid "{0} commit not signed"
6488
msgid_plural "{0} commits not signed"
6489
msgstr[0] ""
6490
msgstr[1] ""
6491
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6492
#: breezy/gpg.py:401
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6493
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6494
msgid "{0} commit with key now expired"
6495
msgid_plural "{0} commits with key now expired"
6496
msgstr[0] ""
6497
msgstr[1] ""
6498
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6499
#: breezy/gpg.py:421
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6500
#, python-brace-format
6504.1.1 by Vincent Ladeuil
Update translation template
6501
msgid "{0} commit by author {1} with key {2} now expired"
6502
msgid_plural "{0} commits by author {1} with key {2} now expired"
6503
msgstr[0] ""
6504
msgstr[1] ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
6505
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6506
#: breezy/gpg.py:437
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6507
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6508
msgid "{0} signed {1} commit"
6509
msgid_plural "{0} signed {1} commits"
6510
msgstr[0] ""
6511
msgstr[1] ""
6512
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6513
#: breezy/gpg.py:454 breezy/gpg.py:471
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6514
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6515
msgid "{0} commit by author {1}"
6516
msgid_plural "{0} commits by author {1}"
6517
msgstr[0] ""
6518
msgstr[1] ""
6519
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6520
#: breezy/gpg.py:486
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6521
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6522
msgid "Unknown key {0} signed {1} commit"
6523
msgid_plural "Unknown key {0} signed {1} commits"
6524
msgstr[0] ""
6525
msgstr[1] ""
6526
7185.1.1 by Jelmer Vernooij
Update pot file.
6527
#: breezy/hooks.py:320
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6528
#, python-format
6529
msgid "Introduced in: %s"
6530
msgstr ""
6531
7185.1.1 by Jelmer Vernooij
Update pot file.
6532
#: breezy/hooks.py:323
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6533
#, python-format
6534
msgid "Deprecated in: %s"
6535
msgstr ""
6536
7185.1.1 by Jelmer Vernooij
Update pot file.
6537
#: breezy/lock.py:546
6150.1.1 by Jonathan Riddell
update bzr.pot
6538
msgid "{0!r} was {1} locked again"
6138.4.4 by Jonathan Riddell
update bzr.pot
6539
msgstr ""
6540
7185.1.1 by Jelmer Vernooij
Update pot file.
6541
#: breezy/lockdir.py:322
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6542
#, python-format
6543
msgid "error removing pending lock: %s"
6544
msgstr ""
6545
7185.1.1 by Jelmer Vernooij
Update pot file.
6546
#: breezy/lockdir.py:614
6547
msgid "Unable to obtain"
6548
msgstr ""
6549
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6550
#: breezy/lockdir.py:616
7185.1.1 by Jelmer Vernooij
Update pot file.
6551
msgid "Lock owner changed for"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6552
msgstr ""
6553
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6554
#: breezy/lockdir.py:618
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6555
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6556
msgid "{0} lock {1} {2}."
6557
msgstr ""
6558
7185.1.1 by Jelmer Vernooij
Update pot file.
6559
#: breezy/lockdir.py:625
6560
#, python-format
6561
msgid "Will continue to try until %s, unless you press Ctrl-C."
6562
msgstr ""
6563
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6564
#: breezy/lockdir.py:627
7185.1.1 by Jelmer Vernooij
Update pot file.
6565
msgid "See \"brz help break-lock\" for more."
6566
msgstr ""
6567
6568
#: breezy/lockdir.py:737
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6569
#, python-format
6570
msgid ""
6571
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6572
msgstr ""
6573
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6574
#: breezy/log.py:424
7185.1.1 by Jelmer Vernooij
Update pot file.
6575
msgid "Further revision history missing."
6576
msgstr ""
6577
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6578
#: breezy/log.py:580
6138.4.4 by Jonathan Riddell
update bzr.pot
6579
msgid "--exclude-common-ancestry requires two different revisions"
6580
msgstr ""
6581
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6582
#: breezy/log.py:582
6138.4.4 by Jonathan Riddell
update bzr.pot
6583
#, python-format
6584
msgid "invalid direction %r"
6585
msgstr ""
6586
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6587
#: breezy/log.py:670
6138.4.4 by Jonathan Riddell
update bzr.pot
6588
msgid "Start revision not found in history of end revision."
6589
msgstr ""
6590
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6591
#: breezy/log.py:1118 breezy/log.py:1176
6138.4.4 by Jonathan Riddell
update bzr.pot
6592
msgid "Logging revision 0 is invalid."
6593
msgstr ""
6594
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6595
#: breezy/log.py:1121 breezy/log.py:1178
6138.4.4 by Jonathan Riddell
update bzr.pot
6596
msgid "Start revision must be older than the end revision."
6597
msgstr ""
6598
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6599
#: breezy/log.py:1875
6138.4.4 by Jonathan Riddell
update bzr.pot
6600
#, python-format
6601
msgid "unknown log formatter: %r"
6602
msgstr ""
6603
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6604
#: breezy/log.py:2173
6143.1.7 by Jonathan Riddell
update bzr.pot
6605
msgid "fixes bug"
6150.1.1 by Jonathan Riddell
update bzr.pot
6606
msgid_plural "fixes bugs"
6143.1.7 by Jonathan Riddell
update bzr.pot
6607
msgstr[0] ""
6608
msgstr[1] ""
6609
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6610
#: breezy/log.py:2176
7185.1.1 by Jelmer Vernooij
Update pot file.
6611
msgid "related bug"
6612
msgid_plural "related bugs"
6613
msgstr[0] ""
6614
msgstr[1] ""
6615
6616
#: breezy/merge.py:673
6138.4.4 by Jonathan Riddell
update bzr.pot
6617
msgid "All changes applied successfully."
6618
msgstr ""
6619
7185.1.1 by Jelmer Vernooij
Update pot file.
6620
#: breezy/merge.py:675
6138.4.4 by Jonathan Riddell
update bzr.pot
6621
#, python-format
6622
msgid "%d conflicts encountered."
6623
msgstr ""
6624
7185.1.1 by Jelmer Vernooij
Update pot file.
6625
#: breezy/merge.py:808 breezy/merge.py:1858
6138.4.4 by Jonathan Riddell
update bzr.pot
6626
msgid "Preparing file merge"
6627
msgstr ""
6628
7185.1.1 by Jelmer Vernooij
Update pot file.
6629
#: breezy/multiparent.py:437
6138.4.4 by Jonathan Riddell
update bzr.pot
6630
msgid "Importing revisions"
6631
msgstr ""
6632
6093.2.1 by Jonathan Riddell
add .pot file to archive
6633
# help of 'help' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6634
#: breezy/option.py:547
6093.2.1 by Jonathan Riddell
add .pot file to archive
6635
msgid "Show help message."
6636
msgstr ""
6637
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6638
# help of 'quiet' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6639
#: breezy/option.py:549
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6640
msgid "Only display errors and warnings."
6641
msgstr ""
6642
6093.2.1 by Jonathan Riddell
add .pot file to archive
6643
# help of 'usage' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6644
#: breezy/option.py:552
6093.2.1 by Jonathan Riddell
add .pot file to archive
6645
msgid "Show usage message and options."
6646
msgstr ""
6647
6648
# help of 'verbose' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6649
#: breezy/option.py:554
6093.2.1 by Jonathan Riddell
add .pot file to archive
6650
msgid "Display more information."
6651
msgstr ""
6652
6653
# help of 'change' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6654
#: breezy/option.py:562
6093.2.1 by Jonathan Riddell
add .pot file to archive
6655
msgid ""
6656
"Select changes introduced by the specified revision. See also \"help "
6657
"revisionspec\"."
6658
msgstr ""
6659
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6660
# help of 'directory' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6661
#: breezy/option.py:564
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6662
msgid "Branch to operate on, instead of working directory."
6663
msgstr ""
6664
6665
# help of 'log-format=long' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6666
#: breezy/option.py:566
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6667
msgid "Detailed log format."
6668
msgstr ""
6669
6670
# help of 'log-format=gnu-changelog' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6671
#: breezy/option.py:566
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6672
msgid "Format used by GNU ChangeLog files."
6673
msgstr ""
6674
6675
# help of 'log-format=line' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6676
#: breezy/option.py:566
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6677
msgid "Log format with one line per revision."
6678
msgstr ""
6679
6680
# help of 'log-format=short' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6681
#: breezy/option.py:566
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6682
msgid "Moderately short log format."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6683
msgstr ""
6684
6685
# help of 'log-format' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6686
#: breezy/option.py:566
6093.2.1 by Jonathan Riddell
add .pot file to archive
6687
msgid "Use specified log format."
6688
msgstr ""
6689
6690
# title of 'log-format' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6691
#: breezy/option.py:568
6093.2.1 by Jonathan Riddell
add .pot file to archive
6692
msgid "Log format"
6693
msgstr ""
6694
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6695
# help of 'merge-type=lca' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6696
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6697
msgid "LCA-newness merge."
6698
msgstr ""
6699
6700
# help of 'merge-type=diff3' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6701
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6702
msgid "Merge using external diff3."
6703
msgstr ""
6704
6705
# help of 'merge-type=merge3' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6706
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6707
msgid "Native diff3-style merge."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6708
msgstr ""
6709
6710
# help of 'merge-type' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6711
#: breezy/option.py:570
6093.2.1 by Jonathan Riddell
add .pot file to archive
6712
msgid "Select a particular merge algorithm."
6713
msgstr ""
6714
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6715
# help of 'merge-type=weave' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6716
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6717
msgid "Weave-based merge."
6718
msgstr ""
6719
6093.2.1 by Jonathan Riddell
add .pot file to archive
6720
# title of 'merge-type' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6721
#: breezy/option.py:572
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6722
msgid "Merge algorithm"
6723
msgstr ""
6724
6725
# help of 'message' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6726
#: breezy/option.py:575
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6727
msgid "Message string."
6728
msgstr ""
6729
6730
# help of 'null' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6731
#: breezy/option.py:577
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6732
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6733
msgstr ""
6734
6735
# help of 'overwrite' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6736
#: breezy/option.py:579
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6737
msgid "Ignore differences between branches and overwrite unconditionally."
6738
msgstr ""
6739
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6740
# help of 'remember' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6741
#: breezy/option.py:581
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6742
msgid "Remember the specified location as a default."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6743
msgstr ""
6744
6745
# help of 'reprocess' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6746
#: breezy/option.py:583
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6747
msgid "Reprocess to reduce spurious conflicts."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6748
msgstr ""
6749
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6750
# help of 'revision' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6751
#: breezy/option.py:587
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6752
msgid "See \"help revisionspec\" for details."
6753
msgstr ""
6754
6755
# help of 'show-ids' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6756
#: breezy/option.py:589
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6757
msgid "Show internal object ids."
6758
msgstr ""
6759
6760
# help of 'timezone' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6761
#: breezy/option.py:592
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6762
msgid "Display timezone as local, original, or utc."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6763
msgstr ""
6764
7185.1.1 by Jelmer Vernooij
Update pot file.
6765
#: breezy/osutils.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
6766
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6767
msgstr ""
6768
7185.1.1 by Jelmer Vernooij
Update pot file.
6769
#: breezy/osutils.py:234
6138.4.4 by Jonathan Riddell
update bzr.pot
6770
msgid "lstat/stat of ({0!r}): {1!r}"
6771
msgstr ""
6772
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6773
#: breezy/osutils.py:1054 breezy/osutils.py:1065
6138.4.4 by Jonathan Riddell
update bzr.pot
6774
#, python-format
6775
msgid "sorry, %r not allowed in path"
6776
msgstr ""
6777
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6778
#: breezy/osutils.py:1284
6138.4.4 by Jonathan Riddell
update bzr.pot
6779
#, python-format
6780
msgid "%r is too short to calculate a relative path"
6781
msgstr ""
6782
6093.2.1 by Jonathan Riddell
add .pot file to archive
6783
# help of 'plugin' option of 'bash-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
6784
#: breezy/plugins/bash_completion/bashcomp.py:419
6093.2.1 by Jonathan Riddell
add .pot file to archive
6785
msgid "Enable completions for the selected plugin (default: all plugins)"
6786
msgstr ""
6787
7185.1.1 by Jelmer Vernooij
Update pot file.
6788
#: breezy/plugins/bash_completion/bashcomp.py:420
6093.2.1 by Jonathan Riddell
add .pot file to archive
6789
msgid "Generate a shell function for bash command line completion."
6790
msgstr ""
6791
7185.1.1 by Jelmer Vernooij
Update pot file.
6792
#: breezy/plugins/bash_completion/bashcomp.py:422
6093.2.1 by Jonathan Riddell
add .pot file to archive
6793
msgid ""
6794
"This command generates a shell function which can be used by bash to\n"
6795
"automatically complete the currently typed command when the user presses\n"
6796
"the completion key (usually tab)."
6797
msgstr ""
6798
7185.1.1 by Jelmer Vernooij
Update pot file.
6799
#: breezy/plugins/bash_completion/bashcomp.py:426
6093.2.1 by Jonathan Riddell
add .pot file to archive
6800
msgid ""
6801
"Commonly used like this:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6802
"    eval \"`brz bash-completion`\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
6803
msgstr ""
6804
6805
# help of 'function-name' option of 'bash-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
6806
#: breezy/plugins/bash_completion/bashcomp.py:432
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6807
msgid "Name of the generated function (default: _brz)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6808
msgstr ""
6809
6810
# help of 'function-only' option of 'bash-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
6811
#: breezy/plugins/bash_completion/bashcomp.py:434
6093.2.1 by Jonathan Riddell
add .pot file to archive
6812
msgid "Generate only the shell function, don't enable it"
6813
msgstr ""
6814
7185.1.1 by Jelmer Vernooij
Update pot file.
6815
#: breezy/plugins/fastimport/cmds.py:79
6816
msgid "Backend for fast Bazaar data importers."
6817
msgstr ""
6818
6819
#: breezy/plugins/fastimport/cmds.py:81
6820
msgid ""
6821
"This command reads a mixed command/data stream and creates\n"
6822
"branches in a Bazaar repository accordingly. The preferred\n"
6823
"recipe is::"
6824
msgstr ""
6825
6826
#: breezy/plugins/fastimport/cmds.py:85
6827
msgid "  bzr fast-import project.fi project.bzr"
6828
msgstr ""
6829
6830
#: breezy/plugins/fastimport/cmds.py:87
6831
msgid ""
6832
"Numerous commands are provided for generating a fast-import file\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
6833
"to use as input.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
6834
"To specify standard input as the input stream, use a\n"
6835
"source name of '-' (instead of project.fi). If the source name\n"
6836
"ends in '.gz', it is assumed to be compressed in gzip format."
6837
msgstr ""
6838
6839
#: breezy/plugins/fastimport/cmds.py:93
6840
msgid ""
6841
"project.bzr will be created if it doesn't exist. If it exists\n"
6842
"already, it should be empty or be an existing Bazaar repository\n"
6843
"or branch. If not specified, the current directory is assumed."
6844
msgstr ""
6845
6846
#: breezy/plugins/fastimport/cmds.py:97
6847
msgid ""
6848
"fast-import will intelligently select the format to use when\n"
6849
"creating a repository or branch. If you are running Bazaar 1.17\n"
6850
"up to Bazaar 2.0, the default format for Bazaar 2.x (\"2a\") is used.\n"
6851
"Otherwise, the current default format (\"pack-0.92\" for Bazaar 1.x)\n"
6852
"is used. If you wish to specify a custom format, use the `--format`\n"
6853
"option."
6854
msgstr ""
6855
6856
#: breezy/plugins/fastimport/cmds.py:104 breezy/plugins/fastimport/cmds.py:176
6857
#: breezy/plugins/fastimport/cmds.py:190 breezy/plugins/fastimport/cmds.py:373
6858
msgid " .. note::"
6859
msgstr ""
6860
6861
#: breezy/plugins/fastimport/cmds.py:106
6862
msgid ""
6863
"    To maintain backwards compatibility, fast-import lets you\n"
6864
"    create the target repository or standalone branch yourself.\n"
6865
"    It is recommended though that you let fast-import create\n"
6866
"    these for you instead."
6867
msgstr ""
6868
6869
#: breezy/plugins/fastimport/cmds.py:111
6870
msgid ":Branch mapping rules:"
6871
msgstr ""
6872
6873
#: breezy/plugins/fastimport/cmds.py:113
6874
msgid " Git reference names are mapped to Bazaar branch names as follows:"
6875
msgstr ""
6876
6877
#: breezy/plugins/fastimport/cmds.py:115
6878
msgid ""
6879
" * refs/heads/foo is mapped to foo\n"
6880
" * refs/remotes/origin/foo is mapped to foo.remote\n"
6881
" * refs/tags/foo is mapped to foo.tag\n"
6882
" * */master is mapped to trunk, trunk.remote, etc.\n"
6883
" * */trunk is mapped to git-trunk, git-trunk.remote, etc."
6884
msgstr ""
6885
6886
#: breezy/plugins/fastimport/cmds.py:121
6887
msgid ":Branch creation rules:"
6888
msgstr ""
6889
6890
#: breezy/plugins/fastimport/cmds.py:123
6891
msgid ""
6892
" When a shared repository is created or found at the destination,\n"
6893
" branches are created inside it. In the simple case of a single\n"
6894
" branch (refs/heads/master) inside the input file, the branch is\n"
6895
" project.bzr/trunk."
6896
msgstr ""
6897
6898
#: breezy/plugins/fastimport/cmds.py:128
6899
msgid ""
6900
" When a standalone branch is found at the destination, the trunk\n"
6901
" is imported there and warnings are output about any other branches\n"
6902
" found in the input file."
6903
msgstr ""
6904
6905
#: breezy/plugins/fastimport/cmds.py:132
6906
msgid ""
6907
" When a branch in a shared repository is found at the destination,\n"
6908
" that branch is made the trunk and other branches, if any, are\n"
6909
" created in sister directories."
6910
msgstr ""
6911
6912
#: breezy/plugins/fastimport/cmds.py:136
6913
msgid ":Working tree updates:"
6914
msgstr ""
6915
6916
#: breezy/plugins/fastimport/cmds.py:138
6917
msgid ""
6918
" The working tree is generated for the trunk branch. If multiple\n"
6919
" branches are created, a message is output on completion explaining\n"
6920
" how to create the working trees for other branches."
6921
msgstr ""
6922
6923
#: breezy/plugins/fastimport/cmds.py:142
6924
msgid ":Custom exporters:"
6925
msgstr ""
6926
6927
#: breezy/plugins/fastimport/cmds.py:144
6928
msgid ""
6929
" The fast-export-from-xxx commands typically call more advanced\n"
6930
" xxx-fast-export scripts. You are welcome to use the advanced\n"
6931
" scripts if you prefer."
6932
msgstr ""
6933
6934
#: breezy/plugins/fastimport/cmds.py:148
6935
msgid ""
6936
" If you wish to write a custom exporter for your project, see\n"
6937
" http://bazaar-vcs.org/BzrFastImport for the detailed protocol\n"
6938
" specification. In many cases, exporters can be written quite\n"
6939
" quickly using whatever scripting/programming language you like."
6940
msgstr ""
6941
6942
#: breezy/plugins/fastimport/cmds.py:153
6943
msgid ":User mapping:"
6944
msgstr ""
6945
6946
#: breezy/plugins/fastimport/cmds.py:155
6947
msgid ""
6948
" Some source repositories store just the user name while Bazaar\n"
6949
" prefers a full email address. You can adjust user-ids while\n"
6950
" importing by using the --user-map option. The argument is a\n"
6951
" text file with lines in the format::"
6952
msgstr ""
6953
6954
#: breezy/plugins/fastimport/cmds.py:160
6955
msgid "   old-id = new-id"
6956
msgstr ""
6957
6958
#: breezy/plugins/fastimport/cmds.py:162
6959
msgid ""
6960
" Blank lines and lines beginning with # are ignored.\n"
6961
" If old-id has the special value '@', then users without an\n"
6962
" email address will get one created by using the matching new-id\n"
6963
" as the domain, unless a more explicit address is given for them.\n"
6964
" For example, given the user-map of::"
6965
msgstr ""
6966
6967
#: breezy/plugins/fastimport/cmds.py:168
6968
msgid ""
6969
"   @ = example.com\n"
6970
"   bill = William Jones <bill@example.com>"
6971
msgstr ""
6972
6973
#: breezy/plugins/fastimport/cmds.py:171
6974
msgid " then user-ids are mapped as follows::"
6975
msgstr ""
6976
6977
#: breezy/plugins/fastimport/cmds.py:173
6978
msgid ""
6979
"  maria => maria <maria@example.com>\n"
6980
"  bill => William Jones <bill@example.com>"
6981
msgstr ""
6982
6983
#: breezy/plugins/fastimport/cmds.py:178
6984
msgid ""
6985
"    User mapping is supported by both the fast-import and\n"
6986
"    fast-import-filter commands."
6987
msgstr ""
6988
6989
#: breezy/plugins/fastimport/cmds.py:181
6990
msgid ":Blob tracking:"
6991
msgstr ""
6992
6993
#: breezy/plugins/fastimport/cmds.py:183
6994
msgid ""
6995
" As some exporters (like git-fast-export) reuse blob data across\n"
6996
" commits, fast-import makes two passes over the input file by\n"
6997
" default. In the first pass, it collects data about what blobs are\n"
6998
" used when, along with some other statistics (e.g. total number of\n"
6999
" commits). In the second pass, it generates the repository and\n"
7000
" branches."
7001
msgstr ""
7002
7003
#: breezy/plugins/fastimport/cmds.py:192
7004
msgid ""
7005
"    The initial pass isn't done if the --info option is used\n"
7006
"    to explicitly pass in information about the input stream.\n"
7007
"    It also isn't done if the source is standard input. In the\n"
7008
"    latter case, memory consumption may be higher than otherwise\n"
7009
"    because some blobs may be kept in memory longer than necessary."
7010
msgstr ""
7011
7012
#: breezy/plugins/fastimport/cmds.py:198
7013
msgid ":Restarting an import:"
7014
msgstr ""
7015
7016
#: breezy/plugins/fastimport/cmds.py:200
7017
msgid ""
7018
" At checkpoints and on completion, the commit-id -> revision-id\n"
7019
" map is saved to a file called 'fastimport-id-map' in the control\n"
7020
" directory for the repository (e.g. .bzr/repository). If the import\n"
7021
" is interrupted or unexpectedly crashes, it can be started again\n"
7022
" and this file will be used to skip over already loaded revisions.\n"
7023
" As long as subsequent exports from the original source begin\n"
7024
" with exactly the same revisions, you can use this feature to\n"
7025
" maintain a mirror of a repository managed by a foreign tool.\n"
7026
" If and when Bazaar is used to manage the repository, this file\n"
7027
" can be safely deleted."
7028
msgstr ""
7029
7030
#: breezy/plugins/fastimport/cmds.py:213
7031
msgid " Import a Subversion repository into Bazaar::"
7032
msgstr ""
7033
7034
#: breezy/plugins/fastimport/cmds.py:215
7035
msgid ""
7036
"   svn-fast-export /svn/repo/path > project.fi\n"
7037
"   bzr fast-import project.fi project.bzr"
7038
msgstr ""
7039
7040
#: breezy/plugins/fastimport/cmds.py:218
7041
msgid " Import a CVS repository into Bazaar::"
7042
msgstr ""
7043
7044
#: breezy/plugins/fastimport/cmds.py:220
7045
msgid ""
7046
"   cvs2git /cvs/repo/path > project.fi\n"
7047
"   bzr fast-import project.fi project.bzr"
7048
msgstr ""
7049
7050
#: breezy/plugins/fastimport/cmds.py:223
7051
msgid " Import a Git repository into Bazaar::"
7052
msgstr ""
7053
7054
#: breezy/plugins/fastimport/cmds.py:225
7055
msgid ""
7056
"   cd /git/repo/path\n"
7057
"   git fast-export --all > project.fi\n"
7058
"   bzr fast-import project.fi project.bzr"
7059
msgstr ""
7060
7061
#: breezy/plugins/fastimport/cmds.py:229
7062
msgid " Import a Mercurial repository into Bazaar::"
7063
msgstr ""
7064
7065
#: breezy/plugins/fastimport/cmds.py:231
7066
msgid ""
7067
"   cd /hg/repo/path\n"
7068
"   hg fast-export > project.fi\n"
7069
"   bzr fast-import project.fi project.bzr"
7070
msgstr ""
7071
7072
#: breezy/plugins/fastimport/cmds.py:235
7073
msgid " Import a Darcs repository into Bazaar::"
7074
msgstr ""
7075
7076
#: breezy/plugins/fastimport/cmds.py:237
7077
msgid ""
7078
"   cd /darcs/repo/path\n"
7079
"   darcs-fast-export > project.fi\n"
7080
"   bzr fast-import project.fi project.bzr"
7081
msgstr ""
7082
7083
# help of 'user-map' option of 'fast-import' command
7084
#: breezy/plugins/fastimport/cmds.py:246
7085
msgid "Path to file containing a map of user-ids."
7086
msgstr ""
7087
7088
# help of 'info' option of 'fast-import' command
7089
#: breezy/plugins/fastimport/cmds.py:249
7090
msgid "Path to file containing caching hints."
7091
msgstr ""
7092
7093
# help of 'trees' option of 'fast-import' command
7094
#: breezy/plugins/fastimport/cmds.py:252
7095
msgid "Update all working trees, not just trunk's."
7096
msgstr ""
7097
7098
# help of 'count' option of 'fast-import' command
7099
#: breezy/plugins/fastimport/cmds.py:255
7100
msgid "Import this many revisions then exit."
7101
msgstr ""
7102
7103
# help of 'checkpoint' option of 'fast-import' command
7104
#: breezy/plugins/fastimport/cmds.py:258
7105
msgid "Checkpoint automatically every N revisions. The default is 10000."
7106
msgstr ""
7107
7108
# help of 'autopack' option of 'fast-import' command
7109
#: breezy/plugins/fastimport/cmds.py:262
7110
msgid "Pack every N checkpoints. The default is 4."
7111
msgstr ""
7112
7113
# help of 'inv-cache' option of 'fast-import' command
7114
#: breezy/plugins/fastimport/cmds.py:265
7115
msgid "Number of inventories to cache."
7116
msgstr ""
7117
7118
# help of 'mode' option of 'fast-import' command
7119
#: breezy/plugins/fastimport/cmds.py:268
7120
msgid "The import algorithm to use."
7121
msgstr ""
7122
7123
# title of 'mode' option of 'fast-import' command
7124
#: breezy/plugins/fastimport/cmds.py:269
7125
msgid "Import Algorithm"
7126
msgstr ""
7127
7128
# help of 'mode=default' option of 'fast-import' command
7129
#: breezy/plugins/fastimport/cmds.py:270
7130
msgid "Use the preferred algorithm (inventory deltas)."
7131
msgstr ""
7132
7133
# help of 'mode=experimental' option of 'fast-import' command
7134
#: breezy/plugins/fastimport/cmds.py:271
7135
msgid "Enable experimental features."
7136
msgstr ""
7137
7138
# help of 'format' option of 'fast-import' command
7139
#: breezy/plugins/fastimport/cmds.py:281
7140
msgid ""
7141
"Specify a format for the created repository. See \"bzr help formats\" for "
7142
"details."
7143
msgstr ""
7144
7145
#: breezy/plugins/fastimport/cmds.py:347
7146
msgid "Generate a fast-import stream from a Bazaar branch."
7147
msgstr ""
7148
7149
#: breezy/plugins/fastimport/cmds.py:349
7150
msgid ""
7151
"This program generates a stream from a Bazaar branch in fast-import\n"
7152
"format used by tools such as bzr fast-import, git-fast-import and\n"
7153
"hg-fast-import."
7154
msgstr ""
7155
7156
#: breezy/plugins/fastimport/cmds.py:353
7157
msgid ""
7158
"It takes two optional arguments: the source bzr branch to export and\n"
7159
"the destination to write the file to write the fastimport stream to."
7160
msgstr ""
7161
7162
#: breezy/plugins/fastimport/cmds.py:356
7163
msgid ""
7164
"If no source is specified, it will search for a branch in the\n"
7165
"current directory."
7166
msgstr ""
7167
7168
#: breezy/plugins/fastimport/cmds.py:359
7169
msgid ""
7170
"If no destination is given or the destination is '-', standard output\n"
7171
"is used. Otherwise, the destination is the name of a file. If the\n"
7172
"destination ends in '.gz', the output will be compressed into gzip\n"
7173
"format."
7174
msgstr ""
7175
7176
#: breezy/plugins/fastimport/cmds.py:364
7177
msgid ":Round-tripping:"
7178
msgstr ""
7179
7180
#: breezy/plugins/fastimport/cmds.py:366
7181
msgid ""
7182
" Recent versions of the fast-import specification support features\n"
7183
" that allow effective round-tripping most of the metadata in Bazaar\n"
7184
" branches. As such, fast-exporting a branch and fast-importing the data\n"
7185
" produced will create a new repository with roughly equivalent history, i."
7186
"e.\n"
7187
" \"bzr log -v -p --include-merges --forward\" on the old branch and\n"
7188
" new branch should produce similar, if not identical, results."
7189
msgstr ""
7190
7191
#: breezy/plugins/fastimport/cmds.py:375
7192
msgid ""
7193
"    Be aware that the new repository may appear to have similar history\n"
7194
"    but internally it is quite different with new revision-ids and\n"
7195
"    file-ids assigned. As a consequence, the ability to easily merge\n"
7196
"    with branches based on the old repository is lost. Depending on your\n"
7197
"    reasons for producing a new repository, this may or may not be an\n"
7198
"    issue."
7199
msgstr ""
7200
7201
#: breezy/plugins/fastimport/cmds.py:382
7202
msgid ":Interoperability:"
7203
msgstr ""
7204
7205
#: breezy/plugins/fastimport/cmds.py:384
7206
msgid ""
7207
" fast-export can use the following \"extended features\" to\n"
7208
" produce a richer data stream:"
7209
msgstr ""
7210
7211
#: breezy/plugins/fastimport/cmds.py:387
7212
msgid ""
7213
" * *multiple-authors* - if a commit has multiple authors (as commonly\n"
7214
"   occurs in pair-programming), all authors will be included in the\n"
7215
"   output, not just the first author"
7216
msgstr ""
7217
7218
#: breezy/plugins/fastimport/cmds.py:391
7219
msgid ""
7220
" * *commit-properties* - custom metadata per commit that Bazaar stores\n"
7221
"   in revision properties (e.g. branch-nick and bugs fixed by this\n"
7222
"   change) will be included in the output."
7223
msgstr ""
7224
7225
#: breezy/plugins/fastimport/cmds.py:395
7226
msgid ""
7227
" * *empty-directories* - directories, even the empty ones, will be\n"
7228
"   included in the output."
7229
msgstr ""
7230
7231
#: breezy/plugins/fastimport/cmds.py:398
7232
msgid ""
7233
" To disable these features and produce output acceptable to git 1.6,\n"
7234
" use the --plain option. To enable these features, use --no-plain.\n"
7235
" Currently, --plain is the default but that will change in the near\n"
7236
" future once the feature names and definitions are formally agreed\n"
7237
" to by the broader fast-import developer community."
7238
msgstr ""
7239
7240
#: breezy/plugins/fastimport/cmds.py:404
7241
msgid ""
7242
" Git has stricter naming rules for tags and fast-export --plain\n"
7243
" will skip tags which can't be imported into git. To replace characters\n"
7244
" unsupported in git with an underscore instead, specify\n"
7245
" --rewrite-tag-names."
7246
msgstr ""
7247
7248
#: breezy/plugins/fastimport/cmds.py:409
7249
msgid ":History truncation:"
7250
msgstr ""
7251
7252
#: breezy/plugins/fastimport/cmds.py:411
7253
msgid ""
7254
" It is sometimes convenient to simply truncate the revision history at a\n"
7255
" certain point.  The --baseline option, to be used in conjunction with -r,\n"
7256
" emits a baseline commit containing the state of the entire source tree at\n"
7257
" the first requested revision.  This allows a user to produce a tree\n"
7258
" identical to the original without munging multiple exports."
7259
msgstr ""
7260
7261
#: breezy/plugins/fastimport/cmds.py:419
7262
msgid " To produce data destined for import into Bazaar::"
7263
msgstr ""
7264
7265
#: breezy/plugins/fastimport/cmds.py:421
7266
msgid "   bzr fast-export --no-plain my-bzr-branch my.fi.gz"
7267
msgstr ""
7268
7269
#: breezy/plugins/fastimport/cmds.py:423
7270
msgid " To produce data destined for Git 1.6::"
7271
msgstr ""
7272
7273
#: breezy/plugins/fastimport/cmds.py:425
7274
msgid "   bzr fast-export --plain my-bzr-branch my.fi"
7275
msgstr ""
7276
7277
#: breezy/plugins/fastimport/cmds.py:427
7278
msgid ""
7279
" To import several unmerged but related branches into the same repository,\n"
7280
" use the --{export,import}-marks options, and specify a name for the git\n"
7281
" branch like this::"
7282
msgstr ""
7283
7284
#: breezy/plugins/fastimport/cmds.py:431
7285
msgid ""
7286
"   bzr fast-export --export-marks=marks.bzr project.dev |\n"
7287
"          GIT_DIR=project/.git git-fast-import --export-marks=marks.git"
7288
msgstr ""
7289
7290
#: breezy/plugins/fastimport/cmds.py:434
7291
msgid ""
7292
"   bzr fast-export --import-marks=marks.bzr -b other project.other |\n"
7293
"          GIT_DIR=project/.git git-fast-import --import-marks=marks.git"
7294
msgstr ""
7295
7296
#: breezy/plugins/fastimport/cmds.py:437
7297
msgid ""
7298
" If you get a \"Missing space after source\" error from git-fast-import,\n"
7299
" see the top of the commands.py module for a work-around."
7300
msgstr ""
7301
7302
#: breezy/plugins/fastimport/cmds.py:440
7303
msgid ""
7304
" Since bzr uses per-branch tags and git/hg use per-repo tags, the\n"
7305
" way bzr fast-export presently emits tags (unconditional reset &\n"
7306
" new ref) may result in clashes when several different branches\n"
7307
" are imported into single git/hg repo.  If this occurs, use the\n"
7308
" bzr fast-export option --no-tags during the export of one or more\n"
7309
" branches to avoid the issue."
7310
msgstr ""
7311
7312
# help of 'git-branch' option of 'fast-export' command
7313
#: breezy/plugins/fastimport/cmds.py:453
7314
msgid "Name of the git branch to create (default=master)."
7315
msgstr ""
7316
7317
# help of 'checkpoint' option of 'fast-export' command
7318
#: breezy/plugins/fastimport/cmds.py:456
7319
msgid "Checkpoint every N revisions (default=10000)."
7320
msgstr ""
7321
7322
# help of 'marks' option of 'fast-export' command
7323
#: breezy/plugins/fastimport/cmds.py:459
7324
msgid "Import marks from and export marks to file."
7325
msgstr ""
7326
7327
# help of 'import-marks' option of 'fast-export' command
7328
# help of 'import-marks' option of 'fast-import' command
7329
#: breezy/plugins/fastimport/cmds.py:462
7330
msgid "Import marks from file."
7331
msgstr ""
7332
7333
# help of 'export-marks' option of 'fast-export' command
7334
# help of 'export-marks' option of 'fast-import' command
7335
#: breezy/plugins/fastimport/cmds.py:465
7336
msgid "Export marks to file."
7337
msgstr ""
7338
7339
# help of 'plain' option of 'fast-export' command
7340
#: breezy/plugins/fastimport/cmds.py:468
7341
msgid "Exclude metadata to maximise interoperability."
7342
msgstr ""
7343
7344
# help of 'rewrite-tag-names' option of 'fast-export' command
7345
#: breezy/plugins/fastimport/cmds.py:471
7346
msgid "Replace characters invalid in git with '_' (plain mode only)."
7347
msgstr ""
7348
7349
# help of 'baseline' option of 'fast-export' command
7350
#: breezy/plugins/fastimport/cmds.py:475
7351
msgid "Export an 'absolute' baseline commit prior tothe first relative commit"
7352
msgstr ""
7353
7354
# help of 'no-tags' option of 'fast-export' command
7355
#: breezy/plugins/fastimport/cmds.py:479
7356
msgid "Don't export tags"
7357
msgstr ""
7358
7359
#: breezy/plugins/grep/cmds.py:83
6581.1.2 by Vincent Ladeuil
Update translation template.
7360
msgid "Print lines matching PATTERN for specified files and revisions."
7361
msgstr ""
7362
7185.1.1 by Jelmer Vernooij
Update pot file.
7363
#: breezy/plugins/grep/cmds.py:85
6581.1.2 by Vincent Ladeuil
Update translation template.
7364
msgid ""
7365
"This command searches the specified files and revisions for a given\n"
7366
"pattern.  The pattern is specified as a Python regular expressions[1]."
7367
msgstr ""
7368
7185.1.1 by Jelmer Vernooij
Update pot file.
7369
#: breezy/plugins/grep/cmds.py:88
6581.1.2 by Vincent Ladeuil
Update translation template.
7370
msgid ""
7371
"If the file name is not specified, the revisions starting with the\n"
7372
"current directory are searched recursively. If the revision number is\n"
7373
"not specified, the working copy is searched. To search the last committed\n"
7374
"revision, use the '-r -1' or '-r last:1' option."
7375
msgstr ""
7376
7185.1.1 by Jelmer Vernooij
Update pot file.
7377
#: breezy/plugins/grep/cmds.py:93
6581.1.2 by Vincent Ladeuil
Update translation template.
7378
msgid ""
7379
"Unversioned files are not searched unless explicitly specified on the\n"
7380
"command line. Unversioned directores are not searched."
7381
msgstr ""
7382
7185.1.1 by Jelmer Vernooij
Update pot file.
7383
#: breezy/plugins/grep/cmds.py:96
6581.1.2 by Vincent Ladeuil
Update translation template.
7384
msgid ""
7385
"When searching a pattern, the output is shown in the 'filepath:string'\n"
7386
"format. If a revision is explicitly searched, the output is shown as\n"
7387
"'filepath~N:string', where N is the revision number."
7388
msgstr ""
7389
7185.1.1 by Jelmer Vernooij
Update pot file.
7390
#: breezy/plugins/grep/cmds.py:100
6581.1.2 by Vincent Ladeuil
Update translation template.
7391
msgid ""
7392
"--include and --exclude options can be used to search only (or exclude\n"
7393
"from search) files with base name matches the specified Unix style GLOB\n"
7394
"pattern.  The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
7395
"to quote wildcard or backslash character literally. Note that the glob\n"
7396
"pattern is not a regular expression."
7397
msgstr ""
7398
7185.1.1 by Jelmer Vernooij
Update pot file.
7399
#: breezy/plugins/grep/cmds.py:106
6581.1.2 by Vincent Ladeuil
Update translation template.
7400
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
7401
msgstr ""
7402
7403
# help of 'color' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7404
#: breezy/plugins/grep/cmds.py:115
6581.1.2 by Vincent Ladeuil
Update translation template.
7405
msgid "Show match in color. WHEN is never, always or auto."
7406
msgstr ""
7407
7408
# help of 'diff' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7409
#: breezy/plugins/grep/cmds.py:117
6581.1.2 by Vincent Ladeuil
Update translation template.
7410
msgid "Grep for pattern in changeset for each revision."
7411
msgstr ""
7412
7413
# help of 'exclude' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7414
#: breezy/plugins/grep/cmds.py:119
6581.1.2 by Vincent Ladeuil
Update translation template.
7415
msgid "Skip files whose base name matches GLOB."
7416
msgstr ""
7417
7418
# help of 'include' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7419
#: breezy/plugins/grep/cmds.py:121
6581.1.2 by Vincent Ladeuil
Update translation template.
7420
msgid "Search only files whose base name matches GLOB."
7421
msgstr ""
7422
7423
# help of 'files-with-matches' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7424
#: breezy/plugins/grep/cmds.py:123
6581.1.2 by Vincent Ladeuil
Update translation template.
7425
msgid "Print only the name of each input file in which PATTERN is found."
7426
msgstr ""
7427
7428
# help of 'files-without-match' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7429
#: breezy/plugins/grep/cmds.py:126
6581.1.2 by Vincent Ladeuil
Update translation template.
7430
msgid "Print only the name of each input file in which PATTERN is not found."
7431
msgstr ""
7432
7433
# help of 'fixed-string' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7434
#: breezy/plugins/grep/cmds.py:129
6581.1.2 by Vincent Ladeuil
Update translation template.
7435
msgid "Interpret PATTERN is a single fixed string (not regex)."
7436
msgstr ""
7437
7438
# help of 'from-root' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7439
#: breezy/plugins/grep/cmds.py:131
6581.1.2 by Vincent Ladeuil
Update translation template.
7440
msgid ""
7441
"Search for pattern starting from the root of the branch. (implies --"
7442
"recursive)"
7443
msgstr ""
7444
7445
# help of 'ignore-case' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7446
#: breezy/plugins/grep/cmds.py:134
6581.1.2 by Vincent Ladeuil
Update translation template.
7447
msgid "ignore case distinctions while matching."
7448
msgstr ""
7449
7450
# help of 'levels' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7451
#: breezy/plugins/grep/cmds.py:136
6581.1.2 by Vincent Ladeuil
Update translation template.
7452
msgid ""
7453
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
7454
msgstr ""
7455
7456
# help of 'line-number' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7457
#: breezy/plugins/grep/cmds.py:141
6581.1.2 by Vincent Ladeuil
Update translation template.
7458
msgid "show 1-based line number."
7459
msgstr ""
7460
7461
# help of 'no-recursive' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7462
#: breezy/plugins/grep/cmds.py:143
6581.1.2 by Vincent Ladeuil
Update translation template.
7463
msgid "Don't recurse into subdirectories. (default is --recursive)"
7464
msgstr ""
7465
7466
# help of 'null' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7467
#: breezy/plugins/grep/cmds.py:145
6581.1.2 by Vincent Ladeuil
Update translation template.
7468
msgid ""
7469
"Write an ASCII NUL (\\0) separator between output lines rather than a "
7470
"newline."
7471
msgstr ""
7472
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7473
#: breezy/plugins/launchpad/account.py:66
6504.1.1 by Vincent Ladeuil
Update translation template
7474
msgid "Setting ssh/sftp usernames for launchpad.net."
7475
msgstr ""
7476
7185.1.1 by Jelmer Vernooij
Update pot file.
7477
#: breezy/plugins/launchpad/cmds.py:44
6093.2.1 by Jonathan Riddell
add .pot file to archive
7478
msgid "Open a Launchpad branch page in your web browser."
7479
msgstr ""
7480
7481
# help of 'dry-run' option of 'launchpad-open' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7482
#: breezy/plugins/launchpad/cmds.py:49
6093.2.1 by Jonathan Riddell
add .pot file to archive
7483
msgid "Do not actually open the browser. Just say the URL we would use."
7484
msgstr ""
7485
7185.1.1 by Jelmer Vernooij
Update pot file.
7486
#: breezy/plugins/launchpad/cmds.py:85
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7487
#, python-format
7488
msgid "Opening %s in web browser"
7489
msgstr ""
7490
7185.1.1 by Jelmer Vernooij
Update pot file.
7491
#: breezy/plugins/launchpad/cmds.py:93
6093.2.1 by Jonathan Riddell
add .pot file to archive
7492
msgid "Show or set the Launchpad user ID."
7493
msgstr ""
7494
7185.1.1 by Jelmer Vernooij
Update pot file.
7495
#: breezy/plugins/launchpad/cmds.py:95
6093.2.1 by Jonathan Riddell
add .pot file to archive
7496
msgid ""
7497
"When communicating with Launchpad, some commands need to know your\n"
7498
"Launchpad user ID.  This command can be used to set or show the\n"
7499
"user ID that Bazaar will use for such communication."
7500
msgstr ""
7501
7185.1.1 by Jelmer Vernooij
Update pot file.
7502
#: breezy/plugins/launchpad/cmds.py:99
6093.2.1 by Jonathan Riddell
add .pot file to archive
7503
msgid ""
7504
":Examples:\n"
7505
"  Show the Launchpad ID of the current user::"
7506
msgstr ""
7507
7185.1.1 by Jelmer Vernooij
Update pot file.
7508
#: breezy/plugins/launchpad/cmds.py:102
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7509
msgid "      brz launchpad-login"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7510
msgstr ""
7511
7185.1.1 by Jelmer Vernooij
Update pot file.
7512
#: breezy/plugins/launchpad/cmds.py:104
6093.2.1 by Jonathan Riddell
add .pot file to archive
7513
msgid "  Set the Launchpad ID of the current user to 'bob'::"
7514
msgstr ""
7515
7185.1.1 by Jelmer Vernooij
Update pot file.
7516
#: breezy/plugins/launchpad/cmds.py:106
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7517
msgid "      brz launchpad-login bob"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7518
msgstr ""
7519
7520
# help of 'no-check' option of 'launchpad-login' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7521
#: breezy/plugins/launchpad/cmds.py:113
6093.2.1 by Jonathan Riddell
add .pot file to archive
7522
msgid "Don't check that the user name is valid."
7523
msgstr ""
7524
7185.1.1 by Jelmer Vernooij
Update pot file.
7525
#: breezy/plugins/launchpad/cmds.py:128 breezy/plugins/launchpad/cmds.py:139
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7526
msgid "Launchpad user ID exists and has SSH keys.\n"
7527
msgstr ""
7528
7185.1.1 by Jelmer Vernooij
Update pot file.
7529
#: breezy/plugins/launchpad/cmds.py:131
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7530
msgid "No Launchpad user ID configured.\n"
7531
msgstr ""
7532
7185.1.1 by Jelmer Vernooij
Update pot file.
7533
#: breezy/plugins/launchpad/cmds.py:142
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7534
#, python-format
7535
msgid "Launchpad user ID set to '%s'.\n"
7536
msgstr ""
7537
7185.1.1 by Jelmer Vernooij
Update pot file.
7538
#: breezy/plugins/launchpad/cmds.py:147
7539
msgid "Unset the Launchpad user ID."
7540
msgstr ""
7541
7542
#: breezy/plugins/launchpad/cmds.py:149
7543
msgid ""
7544
"When communicating with Launchpad, some commands need to know your\n"
7545
"Launchpad user ID.  This command will log you out from Launchpad.\n"
7546
"This means that communication with Launchpad will happen over\n"
7547
"HTTPS, and will not require one of your SSH keys to be available."
7548
msgstr ""
7549
7550
#: breezy/plugins/launchpad/cmds.py:161
7551
msgid "Not logged into Launchpad.\n"
7552
msgstr ""
7553
7554
#: breezy/plugins/launchpad/cmds.py:166
7555
#, python-format
7556
msgid "Launchpad user ID %s logged out.\n"
7557
msgstr ""
7558
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7559
#: breezy/plugins/launchpad/cmds.py:236
6093.2.1 by Jonathan Riddell
add .pot file to archive
7560
msgid "Find the proposal to merge this revision."
7561
msgstr ""
7562
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7563
#: breezy/plugins/launchpad/cmds.py:238
6093.2.1 by Jonathan Riddell
add .pot file to archive
7564
msgid ""
7565
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
7566
"This works only if the if the merged_revno was recorded for the merge\n"
7567
"proposal.  The proposal(s) are opened in a web browser."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7568
msgstr ""
7569
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7570
#: breezy/plugins/launchpad/cmds.py:242
6093.2.1 by Jonathan Riddell
add .pot file to archive
7571
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
7572
"Only the revision specified is searched for.  To find the mainline\n"
7573
"revision that merged it into mainline, use the \"mainline\" revision spec."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7574
msgstr ""
7575
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7576
#: breezy/plugins/launchpad/cmds.py:245
6093.2.1 by Jonathan Riddell
add .pot file to archive
7577
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7578
msgstr ""
7579
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7580
#: breezy/plugins/launchpad/cmds.py:247
7581
msgid "  brz lp-find-proposal -r mainline:annotate:README:1"
7582
msgstr ""
7583
7185.1.1 by Jelmer Vernooij
Update pot file.
7584
#: breezy/plugins/launchpad/cmds.py:264
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7585
msgid "No review found."
7586
msgstr ""
7587
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7588
#: breezy/plugins/launchpad/cmds.py:265
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7589
#, python-format
7590
msgid "%d proposals(s) found."
7591
msgstr ""
7592
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7593
#: breezy/plugins/launchpad/cmds.py:274
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7594
msgid "Finding proposals"
7595
msgstr ""
7596
7185.1.1 by Jelmer Vernooij
Update pot file.
7597
#: breezy/plugins/launchpad/lp_api.py:240
7598
#: breezy/plugins/launchpad/lp_api.py:245
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7599
#, python-format
7600
msgid "%s is not registered on Launchpad"
7601
msgstr ""
7602
7185.1.1 by Jelmer Vernooij
Update pot file.
7603
#: breezy/plugins/launchpad/lp_api.py:255
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7604
#, python-format
7605
msgid "%s has no development focus."
7606
msgstr ""
7607
7185.1.1 by Jelmer Vernooij
Update pot file.
7608
#: breezy/plugins/launchpad/lp_api.py:260
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7609
#, python-format
7610
msgid "development focus %s has no branch."
7611
msgstr ""
7612
7185.1.1 by Jelmer Vernooij
Update pot file.
7613
#: breezy/plugins/launchpad/lp_api.py:265
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7614
#, python-format
7615
msgid "source package %s has no branch."
7616
msgstr ""
7617
7185.1.1 by Jelmer Vernooij
Update pot file.
7618
#: breezy/plugins/launchpad/lp_api.py:269
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7619
#, python-format
7620
msgid "%s has no associated product or source package."
7621
msgstr ""
7622
7185.1.1 by Jelmer Vernooij
Update pot file.
7623
#: breezy/plugins/launchpad/lp_api.py:280
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7624
#, python-format
7625
msgid "%s is already up-to-date."
7626
msgstr ""
7627
7185.1.1 by Jelmer Vernooij
Update pot file.
7628
#: breezy/plugins/launchpad/lp_api.py:287
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7629
#, python-format
7630
msgid "Pushing to %s"
7631
msgstr ""
7632
7185.1.1 by Jelmer Vernooij
Update pot file.
7633
#: breezy/plugins/launchpad/lp_directory.py:165
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7634
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7635
msgid ""
7636
"resolution for {0}\n"
7637
"  local: {1}\n"
7638
" remote: {2}"
7639
msgstr ""
7640
7185.1.1 by Jelmer Vernooij
Update pot file.
7641
#: breezy/plugins/launchpad/lp_propose.py:152
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7642
#: breezy/plugins/propose/cmds.py:197
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7643
#, python-format
7644
msgid "There is already a branch merge proposal: %s"
7645
msgstr ""
7646
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7647
#: breezy/plugins/propose/cmds.py:53
7648
msgid "Publish a derived branch."
7649
msgstr ""
7650
7651
#: breezy/plugins/propose/cmds.py:55
7652
msgid ""
7653
"Try to create a public copy of a local branch on a hosting site,\n"
7654
"derived from the specified base branch."
7655
msgstr ""
7656
7657
#: breezy/plugins/propose/cmds.py:58
7658
msgid ""
7659
"Reasonable defaults are picked for owner name, branch name and project\n"
7660
"name, but they can also be overridden from the command-line."
7661
msgstr ""
7662
7663
# help of 'owner' option of 'publish-derived' command
7664
#: breezy/plugins/propose/cmds.py:64
7665
msgid "Owner of the new remote branch."
7666
msgstr ""
7667
7668
# help of 'project' option of 'publish-derived' command
7669
#: breezy/plugins/propose/cmds.py:65
7670
msgid "Project name for the new remote branch."
7671
msgstr ""
7672
7673
# help of 'overwrite' option of 'publish-derived' command
7674
#: breezy/plugins/propose/cmds.py:70
7675
msgid "Overwrite existing commits."
7676
msgstr ""
7677
7678
#: breezy/plugins/propose/cmds.py:80
7679
#, python-format
7680
msgid "Using submit branch %s"
7681
msgstr ""
7682
7683
#: breezy/plugins/propose/cmds.py:83
7684
#, python-format
7685
msgid "Using parent branch %s"
7686
msgstr ""
7687
7688
#: breezy/plugins/propose/cmds.py:94
7689
#, python-format
7690
msgid "Pushed to %s"
7691
msgstr ""
7692
7693
#: breezy/plugins/propose/cmds.py:128
7694
msgid "Propose a branch for merging."
7695
msgstr ""
7696
7697
#: breezy/plugins/propose/cmds.py:130
7698
msgid ""
7699
"This command creates a merge proposal for the local\n"
7700
"branch to the target branch. The format of the merge\n"
7701
"proposal depends on the submit branch."
7702
msgstr ""
7703
7704
# title of 'hoster' option of 'propose-merge' command
7705
#: breezy/plugins/propose/cmds.py:138
7706
msgid "hoster"
7707
msgstr ""
7708
7709
# help of 'hoster' option of 'propose-merge' command
7710
#: breezy/plugins/propose/cmds.py:139
7711
msgid "Use the hoster."
7712
msgstr ""
7713
7714
# help of 'reviewers' option of 'propose-merge' command
7715
#: breezy/plugins/propose/cmds.py:142
7716
msgid "Requested reviewers."
7717
msgstr ""
7718
7719
# help of 'name' option of 'propose-merge' command
7720
# help of 'name' option of 'publish-derived' command
7721
#: breezy/plugins/propose/cmds.py:143
7722
msgid "Name of the new remote branch."
7723
msgstr ""
7724
7725
# help of 'description' option of 'propose-merge' command
7726
#: breezy/plugins/propose/cmds.py:144
7727
msgid "Description of the change."
7728
msgstr ""
7729
7730
# help of 'prerequisite' option of 'propose-merge' command
7731
#: breezy/plugins/propose/cmds.py:145
7732
msgid "Prerequisite branch."
7733
msgstr ""
7734
7735
# help of 'labels' option of 'propose-merge' command
7736
#: breezy/plugins/propose/cmds.py:147
7737
msgid "Labels to apply."
7738
msgstr ""
7739
7740
# help of 'no-allow-lossy' option of 'propose-merge' command
7741
# help of 'no-allow-lossy' option of 'publish-derived' command
7742
#: breezy/plugins/propose/cmds.py:149
7743
msgid "Allow fallback to lossy push, if necessary."
7744
msgstr ""
7745
7746
#: breezy/plugins/propose/cmds.py:166 breezy/plugins/propose/cmds.py:222
7747
msgid "No target location specified or remembered"
7748
msgstr ""
7749
7750
#: breezy/plugins/propose/cmds.py:178
7751
#, python-format
7752
msgid "Published branch to %s"
7753
msgstr ""
7754
7755
#: breezy/plugins/propose/cmds.py:198
7756
#, python-format
7757
msgid "Merge proposal created: %s"
7758
msgstr ""
7759
7760
#: breezy/plugins/propose/cmds.py:202
7761
msgid "Find a merge proposal."
7762
msgstr ""
7763
7764
#: breezy/plugins/propose/cmds.py:204
7765
msgid "    "
7766
msgstr ""
7767
7768
#: breezy/plugins/propose/cmds.py:227
7769
#, python-format
7770
msgid "Merge proposal: %s\n"
7771
msgstr ""
7772
7773
#: breezy/plugins/propose/cmds.py:231
7774
msgid "Log into GitHub."
7775
msgstr ""
7776
7777
#: breezy/plugins/propose/cmds.py:233
7778
msgid ""
7779
"When communicating with GitHub, some commands need to authenticate to\n"
7780
"GitHub."
7781
msgstr ""
7782
7783
#: breezy/plugins/propose/cmds.py:268
7784
msgid "Log into a GitLab instance."
7785
msgstr ""
7786
7787
#: breezy/plugins/propose/cmds.py:270
7788
msgid ""
7789
"This command takes a GitLab instance URL (e.g. https://gitlab.com)\n"
7790
"as well as a private token. Private tokens can be created via the\n"
7791
"web UI."
7792
msgstr ""
7793
7794
#: breezy/plugins/propose/cmds.py:276
7795
msgid "  Log into Debian's salsa:"
7796
msgstr ""
7797
7798
#: breezy/plugins/propose/cmds.py:278
7799
msgid "     brz gitlab-login https://salsa.debian.org if4Theis6Eich7aef0zo"
7800
msgstr ""
7801
7802
# help of 'name' option of 'gitlab-login' command
7803
#: breezy/plugins/propose/cmds.py:284
7804
msgid "Name for GitLab site in configuration."
7805
msgstr ""
7806
7807
# help of 'no-check' option of 'gitlab-login' command
7808
#: breezy/plugins/propose/cmds.py:287
7809
msgid "Don't check that the token is valid."
7810
msgstr ""
7811
7812
#: breezy/plugins/propose/github.py:177
7813
#, python-format
7814
msgid "Forking new repository %s from %s"
7815
msgstr ""
7816
7817
#: breezy/plugins/propose/github.py:180
7818
#, python-format
7819
msgid "Reusing existing repository %s"
7820
msgstr ""
7821
7822
#: breezy/plugins/stats/cmds.py:238
7185.1.1 by Jelmer Vernooij
Update pot file.
7823
msgid "Generate statistics for LOCATION."
7824
msgstr ""
7825
7826
# help of 'show-class' option of 'committer-statistics' command
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7827
#: breezy/plugins/stats/cmds.py:243
7185.1.1 by Jelmer Vernooij
Update pot file.
7828
msgid "Show the class of contributions."
7829
msgstr ""
7830
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7831
#: breezy/plugins/stats/cmds.py:383
7185.1.1 by Jelmer Vernooij
Update pot file.
7832
msgid "Determine credits for LOCATION."
7833
msgstr ""
7834
7835
#: breezy/plugins/upload/cmds.py:468
7836
msgid "Upload a working tree, as a whole or incrementally."
7837
msgstr ""
7838
7839
#: breezy/plugins/upload/cmds.py:470
7840
msgid ""
7841
"If no destination is specified use the last one used.\n"
7842
"If no revision is specified upload the changes since the last upload."
7843
msgstr ""
7844
7845
#: breezy/plugins/upload/cmds.py:473
7846
msgid "Changes include files added, renamed, modified or removed."
7847
msgstr ""
7848
7849
# help of 'full' option of 'upload' command
7850
#: breezy/plugins/upload/cmds.py:481
7851
msgid "Upload the full working tree."
7852
msgstr ""
7853
7854
# help of 'quiet' option of 'upload' command
7855
#: breezy/plugins/upload/cmds.py:482
7856
msgid "Do not output what is being done."
7857
msgstr ""
7858
7859
# help of 'directory' option of 'upload' command
7860
#: breezy/plugins/upload/cmds.py:485
7861
msgid ""
7862
"Branch to upload from, rather than the one containing the working directory."
7863
msgstr ""
7864
7865
# help of 'auto' option of 'upload' command
7866
#: breezy/plugins/upload/cmds.py:491
7867
msgid "Trigger an upload from this branch whenever the tip revision changes."
7868
msgstr ""
7869
7870
#: breezy/plugins/weave_fmt/bzrdir.py:243
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7871
msgid "pb parameter to convert() is deprecated"
7872
msgstr ""
7873
7185.1.1 by Jelmer Vernooij
Update pot file.
7874
#: breezy/plugins/weave_fmt/bzrdir.py:245
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7875
msgid "starting upgrade from format 4 to 5"
7876
msgstr ""
7877
7185.1.1 by Jelmer Vernooij
Update pot file.
7878
#: breezy/plugins/weave_fmt/bzrdir.py:254
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7879
msgid "note: upgrade may be faster if all store files are ungzipped first"
7880
msgstr ""
7881
7185.1.1 by Jelmer Vernooij
Update pot file.
7882
#: breezy/plugins/weave_fmt/bzrdir.py:283
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7883
msgid "converting revision"
7884
msgstr ""
7885
7185.1.1 by Jelmer Vernooij
Update pot file.
7886
#: breezy/plugins/weave_fmt/bzrdir.py:288
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7887
msgid "upgraded to weaves:"
7888
msgstr ""
7889
7185.1.1 by Jelmer Vernooij
Update pot file.
7890
#: breezy/plugins/weave_fmt/bzrdir.py:289
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7891
#, python-format
7892
msgid "%6d revisions and inventories"
7893
msgstr ""
7894
7185.1.1 by Jelmer Vernooij
Update pot file.
7895
#: breezy/plugins/weave_fmt/bzrdir.py:291
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7896
#, python-format
7897
msgid "%6d revisions not present"
7898
msgstr ""
7899
7185.1.1 by Jelmer Vernooij
Update pot file.
7900
#: breezy/plugins/weave_fmt/bzrdir.py:293
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7901
#, python-format
7902
msgid "%6d texts"
7903
msgstr ""
7904
7185.1.1 by Jelmer Vernooij
Update pot file.
7905
#: breezy/plugins/weave_fmt/bzrdir.py:330
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7906
msgid "writing weave"
7907
msgstr ""
7908
7185.1.1 by Jelmer Vernooij
Update pot file.
7909
#: breezy/plugins/weave_fmt/bzrdir.py:334
7910
#: breezy/plugins/weave_fmt/bzrdir.py:336
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7911
msgid "inventory"
7912
msgstr ""
7913
7185.1.1 by Jelmer Vernooij
Update pot file.
7914
#: breezy/plugins/weave_fmt/bzrdir.py:353
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7915
msgid "write revision"
7916
msgstr ""
7917
7185.1.1 by Jelmer Vernooij
Update pot file.
7918
#: breezy/plugins/weave_fmt/bzrdir.py:367
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7919
msgid "loading revision"
7920
msgstr ""
7921
7185.1.1 by Jelmer Vernooij
Update pot file.
7922
#: breezy/plugins/weave_fmt/bzrdir.py:372
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7923
#, python-format
7924
msgid "revision {%s} not present in branch; will be converted as a ghost"
7925
msgstr ""
7926
7185.1.1 by Jelmer Vernooij
Update pot file.
7927
#: breezy/plugins/weave_fmt/bzrdir.py:511
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7928
msgid "starting upgrade from format 5 to 6"
7929
msgstr ""
7930
7185.1.1 by Jelmer Vernooij
Update pot file.
7931
#: breezy/plugins/weave_fmt/bzrdir.py:519
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7932
#, python-format
7933
msgid "adding prefixes to %s"
7934
msgstr ""
7935
7185.1.1 by Jelmer Vernooij
Update pot file.
7936
#: breezy/plugins/weave_fmt/bzrdir.py:561
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7937
msgid "starting upgrade from format 6 to metadir"
7938
msgstr ""
7939
7185.1.1 by Jelmer Vernooij
Update pot file.
7940
#: breezy/plugins/weave_fmt/bzrdir.py:569
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7941
msgid "Removing ancestry.weave"
7942
msgstr ""
7943
7185.1.1 by Jelmer Vernooij
Update pot file.
7944
#: breezy/plugins/weave_fmt/bzrdir.py:574
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7945
msgid "Finding branch files"
7946
msgstr ""
7947
7185.1.1 by Jelmer Vernooij
Update pot file.
7948
#: breezy/plugins/weave_fmt/bzrdir.py:584
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7949
msgid "Upgrading repository"
7950
msgstr ""
7951
7185.1.1 by Jelmer Vernooij
Update pot file.
7952
#: breezy/plugins/weave_fmt/bzrdir.py:594
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7953
msgid "Upgrading branch"
7954
msgstr ""
7955
7185.1.1 by Jelmer Vernooij
Update pot file.
7956
#: breezy/plugins/weave_fmt/bzrdir.py:617
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7957
msgid "No working tree."
7958
msgstr ""
7959
7185.1.1 by Jelmer Vernooij
Update pot file.
7960
#: breezy/plugins/weave_fmt/bzrdir.py:624
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7961
msgid "Upgrading working tree"
7962
msgstr ""
7963
7185.1.1 by Jelmer Vernooij
Update pot file.
7964
#: breezy/plugins/weave_fmt/bzrdir.py:644
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7965
#, python-format
7966
msgid "Make %s lock"
7967
msgstr ""
7968
7185.1.1 by Jelmer Vernooij
Update pot file.
7969
#: breezy/plugins/weave_fmt/bzrdir.py:655
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7970
#, python-format
7971
msgid "Moving %s"
7972
msgstr ""
7973
7185.1.1 by Jelmer Vernooij
Update pot file.
7974
#: breezy/push.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
7975
#, python-format
7976
msgid ""
7977
"Target directory %s already contains a .bzr directory, but it is not valid."
7978
msgstr ""
7979
7185.1.1 by Jelmer Vernooij
Update pot file.
7980
#: breezy/push.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
7981
#, python-format
7982
msgid ""
7983
"Target directory %s already exists, but does not have a .bzr directory. "
7984
"Supply --use-existing-dir to push there anyway."
7985
msgstr ""
7986
7185.1.1 by Jelmer Vernooij
Update pot file.
7987
#: breezy/push.py:124
6138.4.4 by Jonathan Riddell
update bzr.pot
7988
#, python-format
7989
msgid "Too many redirections trying to make %s."
7990
msgstr ""
7991
7185.1.1 by Jelmer Vernooij
Update pot file.
7992
#: breezy/push.py:150
6138.4.4 by Jonathan Riddell
update bzr.pot
7993
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7994
"These branches have diverged.  See \"brz help diverged-branches\" for more "
6138.4.4 by Jonathan Riddell
update bzr.pot
7995
"information."
7996
msgstr ""
7997
7185.1.1 by Jelmer Vernooij
Update pot file.
7998
#: breezy/push.py:155
6138.4.4 by Jonathan Riddell
update bzr.pot
7999
#, python-format
8000
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8001
"It is not possible to losslessly push to %s. You may want to use --lossy."
6138.4.4 by Jonathan Riddell
update bzr.pot
8002
msgstr ""
8003
7185.1.1 by Jelmer Vernooij
Update pot file.
8004
#: breezy/push.py:161
6138.4.4 by Jonathan Riddell
update bzr.pot
8005
#, python-format
8006
msgid ""
8007
"At %s you have a valid .bzr control directory, but not a branch or "
8008
"repository. This is an unsupported configuration. Please move the target "
8009
"directory out of the way and try again."
8010
msgstr ""
8011
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8012
#: breezy/reconcile.py:87
6138.4.4 by Jonathan Riddell
update bzr.pot
8013
#, python-format
8014
msgid "Reconciling branch %s"
8015
msgstr ""
8016
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8017
#: breezy/reconcile.py:92
6138.4.4 by Jonathan Riddell
update bzr.pot
8018
#, python-format
8019
msgid "Reconciling repository %s"
8020
msgstr ""
8021
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8022
#: breezy/reconcile.py:94
6138.4.4 by Jonathan Riddell
update bzr.pot
8023
msgid "Reconciling repository"
8024
msgstr ""
8025
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8026
#: breezy/reconcile.py:100
6138.4.4 by Jonathan Riddell
update bzr.pot
8027
#, python-format
8028
msgid "%s cannot canonicalize CHKs."
8029
msgstr ""
8030
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8031
#: breezy/reconcile.py:106
6138.4.4 by Jonathan Riddell
update bzr.pot
8032
msgid "Reconcile aborted: revision index has inconsistent parents."
8033
msgstr ""
8034
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8035
#: breezy/reconcile.py:108
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8036
msgid "Run \"brz check\" for more details."
6138.4.4 by Jonathan Riddell
update bzr.pot
8037
msgstr ""
8038
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8039
#: breezy/reconcile.py:110
6138.4.4 by Jonathan Riddell
update bzr.pot
8040
msgid "Reconciliation complete."
8041
msgstr ""
8042
7185.1.1 by Jelmer Vernooij
Update pot file.
8043
#: breezy/reconfigure.py:127
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8044
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8045
msgid "{0} is now stacked on {1}\n"
8046
msgstr ""
8047
7185.1.1 by Jelmer Vernooij
Update pot file.
8048
#: breezy/reconfigure.py:142
6138.4.4 by Jonathan Riddell
update bzr.pot
8049
#, python-format
8050
msgid "%s is now not stacked\n"
8051
msgstr ""
8052
7185.1.1 by Jelmer Vernooij
Update pot file.
8053
#: breezy/rename_map.py:73
6138.4.4 by Jonathan Riddell
update bzr.pot
8054
msgid "Calculating hashes"
8055
msgstr ""
8056
7185.1.1 by Jelmer Vernooij
Update pot file.
8057
#: breezy/rename_map.py:108
6138.4.4 by Jonathan Riddell
update bzr.pot
8058
msgid "Determining hash hits"
8059
msgstr ""
8060
7185.1.1 by Jelmer Vernooij
Update pot file.
8061
#: breezy/rename_map.py:235
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8062
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8063
msgid "{0} => {1}"
8064
msgstr ""
8065
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8066
#: breezy/repository.py:286
7185.1.1 by Jelmer Vernooij
Update pot file.
8067
#, python-format
8068
msgid "brz: ERROR (ignored): %s"
8069
msgstr ""
8070
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8071
#: breezy/repository.py:1573
6138.4.4 by Jonathan Riddell
update bzr.pot
8072
msgid "Moving repository to repository.backup"
8073
msgstr ""
8074
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8075
#: breezy/repository.py:1581
6138.4.4 by Jonathan Riddell
update bzr.pot
8076
msgid "Creating new repository"
8077
msgstr ""
8078
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8079
#: breezy/repository.py:1586
6138.4.4 by Jonathan Riddell
update bzr.pot
8080
msgid "Copying content"
8081
msgstr ""
8082
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8083
#: breezy/repository.py:1590
6138.4.4 by Jonathan Riddell
update bzr.pot
8084
msgid "Deleting old repository content"
8085
msgstr ""
8086
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8087
#: breezy/repository.py:1592
6138.4.4 by Jonathan Riddell
update bzr.pot
8088
msgid "repository converted"
8089
msgstr ""
8090
7185.1.1 by Jelmer Vernooij
Update pot file.
8091
#: breezy/revisionspec.py:861
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8092
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
8093
msgid "Using {0} {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
8094
msgstr ""
8095
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8096
#: breezy/send.py:59
6138.4.4 by Jonathan Riddell
update bzr.pot
8097
#, python-format
8098
msgid "Mail client \"%s\" does not support specifying body"
8099
msgstr ""
8100
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8101
#: breezy/send.py:63
6138.4.4 by Jonathan Riddell
update bzr.pot
8102
msgid "--remember requires a branch to be specified."
8103
msgstr ""
8104
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8105
#: breezy/send.py:78
6138.4.4 by Jonathan Riddell
update bzr.pot
8106
msgid "No submit branch known or specified"
8107
msgstr ""
8108
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8109
#: breezy/send.py:81
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8110
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
8111
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6138.4.4 by Jonathan Riddell
update bzr.pot
8112
msgstr ""
8113
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8114
#: breezy/send.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
8115
#, python-format
8116
msgid "No such send format '%s'."
8117
msgstr ""
8118
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8119
#: breezy/send.py:115
6138.4.4 by Jonathan Riddell
update bzr.pot
8120
msgid "bzr send takes at most two one revision identifiers"
8121
msgstr ""
8122
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8123
#: breezy/send.py:128
6138.4.4 by Jonathan Riddell
update bzr.pot
8124
msgid "No revisions to submit."
8125
msgstr ""
8126
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8127
#: breezy/send.py:140
6138.4.4 by Jonathan Riddell
update bzr.pot
8128
msgid ""
8129
"- not supported for merge directives that use more than one output file."
8130
msgstr ""
8131
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8132
#: breezy/send.py:186
6138.4.4 by Jonathan Riddell
update bzr.pot
8133
msgid "Format 0.9 does not permit bundle with no patch"
8134
msgstr ""
8135
7185.1.1 by Jelmer Vernooij
Update pot file.
8136
#: breezy/shelf_ui.py:48
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8137
#, python-format
8138
msgid "Shelve adding file \"%(path)s\"?"
8139
msgstr ""
8140
7185.1.1 by Jelmer Vernooij
Update pot file.
8141
#: breezy/shelf_ui.py:49
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8142
msgid "Shelve binary changes?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8143
msgstr ""
8144
7185.1.1 by Jelmer Vernooij
Update pot file.
8145
#: breezy/shelf_ui.py:50
6143.1.7 by Jonathan Riddell
update bzr.pot
8146
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
8147
msgstr ""
8148
7185.1.1 by Jelmer Vernooij
Update pot file.
8149
#: breezy/shelf_ui.py:52
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8150
#, python-format
8151
msgid "Shelve removing file \"%(path)s\"?"
8152
msgstr ""
8153
7185.1.1 by Jelmer Vernooij
Update pot file.
8154
#: breezy/shelf_ui.py:53
6143.1.7 by Jonathan Riddell
update bzr.pot
8155
#, python-format
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8156
msgid "Shelve %d change(s)?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8157
msgstr ""
8158
7185.1.1 by Jelmer Vernooij
Update pot file.
8159
#: breezy/shelf_ui.py:54
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8160
msgid "Shelve?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8161
msgstr ""
8162
7185.1.1 by Jelmer Vernooij
Update pot file.
8163
#: breezy/shelf_ui.py:55
6143.1.7 by Jonathan Riddell
update bzr.pot
8164
#, python-format
8165
msgid ""
8166
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8167
msgstr ""
8168
7185.1.1 by Jelmer Vernooij
Update pot file.
8169
#: breezy/shelf_ui.py:57
6143.1.7 by Jonathan Riddell
update bzr.pot
8170
#, python-format
8171
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
8172
msgstr ""
8173
7185.1.1 by Jelmer Vernooij
Update pot file.
8174
#: breezy/shelf_ui.py:72
6138.4.4 by Jonathan Riddell
update bzr.pot
8175
#, python-format
8176
msgid "Changes shelved with id \"%d\"."
8177
msgstr ""
8178
7185.1.1 by Jelmer Vernooij
Update pot file.
8179
#: breezy/shelf_ui.py:76
6138.4.4 by Jonathan Riddell
update bzr.pot
8180
msgid "Selected changes destroyed."
8181
msgstr ""
8182
7185.1.1 by Jelmer Vernooij
Update pot file.
8183
#: breezy/shelf_ui.py:80
6138.4.4 by Jonathan Riddell
update bzr.pot
8184
msgid "Selected changes:"
8185
msgstr ""
8186
7185.1.1 by Jelmer Vernooij
Update pot file.
8187
#: breezy/shelf_ui.py:100
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8188
#, python-format
8189
msgid "Delete file \"%(path)s\"?"
8190
msgstr ""
8191
7185.1.1 by Jelmer Vernooij
Update pot file.
8192
#: breezy/shelf_ui.py:101
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8193
msgid "Apply binary changes?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8194
msgstr ""
8195
7185.1.1 by Jelmer Vernooij
Update pot file.
8196
#: breezy/shelf_ui.py:102
6143.1.7 by Jonathan Riddell
update bzr.pot
8197
#, python-format
8198
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
8199
msgstr ""
8200
7185.1.1 by Jelmer Vernooij
Update pot file.
8201
#: breezy/shelf_ui.py:104
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8202
#, python-format
8203
msgid "Add file \"%(path)s\"?"
8204
msgstr ""
8205
7185.1.1 by Jelmer Vernooij
Update pot file.
8206
#: breezy/shelf_ui.py:105
6143.1.7 by Jonathan Riddell
update bzr.pot
8207
#, python-format
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8208
msgid "Apply %d change(s)?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8209
msgstr ""
8210
7185.1.1 by Jelmer Vernooij
Update pot file.
8211
#: breezy/shelf_ui.py:106
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8212
msgid "Apply change?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8213
msgstr ""
8214
7185.1.1 by Jelmer Vernooij
Update pot file.
8215
#: breezy/shelf_ui.py:107
6143.1.7 by Jonathan Riddell
update bzr.pot
8216
#, python-format
8217
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
8218
msgstr ""
8219
7185.1.1 by Jelmer Vernooij
Update pot file.
8220
#: breezy/shelf_ui.py:109
6143.1.7 by Jonathan Riddell
update bzr.pot
8221
#, python-format
8222
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
8223
msgstr ""
8224
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8225
#: breezy/shelf_ui.py:409
6138.4.4 by Jonathan Riddell
update bzr.pot
8226
msgid "No changes are shelved."
8227
msgstr ""
8228
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8229
#: breezy/shelf_ui.py:467
6138.4.4 by Jonathan Riddell
update bzr.pot
8230
#, python-format
8231
msgid "Using changes with id \"%d\"."
8232
msgstr ""
8233
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8234
#: breezy/shelf_ui.py:472
6138.4.4 by Jonathan Riddell
update bzr.pot
8235
#, python-format
8236
msgid "Message: %s"
8237
msgstr ""
8238
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8239
#: breezy/shelf_ui.py:484
6138.4.4 by Jonathan Riddell
update bzr.pot
8240
#, python-format
8241
msgid "Deleted changes with id \"%d\"."
8242
msgstr ""
8243
7185.1.1 by Jelmer Vernooij
Update pot file.
8244
#: breezy/switch.py:71
6138.4.4 by Jonathan Riddell
update bzr.pot
8245
msgid "Pending merges must be committed or reverted before using switch."
8246
msgstr ""
8247
7185.1.1 by Jelmer Vernooij
Update pot file.
8248
#: breezy/switch.py:104
8249
#, python-format
8250
msgid "Tree is up to date at revision %d."
8251
msgstr ""
8252
8253
#: breezy/switch.py:112
8254
#, python-format
8255
msgid "Updated to revision %d."
8256
msgstr ""
8257
8258
#: breezy/switch.py:143
6138.4.4 by Jonathan Riddell
update bzr.pot
8259
msgid ""
8260
"Cannot switch as local commits found in the checkout. Commit these to the "
8261
"bound branch or use --force to throw them away."
8262
msgstr ""
8263
7185.1.1 by Jelmer Vernooij
Update pot file.
8264
#: breezy/switch.py:148
6138.4.4 by Jonathan Riddell
update bzr.pot
8265
#, python-format
8266
msgid ""
8267
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8268
"anyway, use --force."
8269
msgstr ""
8270
7185.1.1 by Jelmer Vernooij
Update pot file.
8271
#: breezy/switch.py:172
6138.4.4 by Jonathan Riddell
update bzr.pot
8272
msgid "Cannot switch a branch, only a checkout."
8273
msgstr ""
8274
7185.1.1 by Jelmer Vernooij
Update pot file.
8275
#: breezy/transform.py:1741 breezy/transform.py:1752 breezy/transform.py:1754
6138.4.4 by Jonathan Riddell
update bzr.pot
8276
msgid "Apply phase"
8277
msgstr ""
8278
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8279
#: breezy/transform.py:1777 breezy/transform.py:1840
6138.4.4 by Jonathan Riddell
update bzr.pot
8280
msgid "removing file"
8281
msgstr ""
8282
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8283
#: breezy/transform.py:1792 breezy/transform.py:1870
6138.4.4 by Jonathan Riddell
update bzr.pot
8284
msgid "adding file"
8285
msgstr ""
8286
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8287
#: breezy/transform.py:2612
6138.4.4 by Jonathan Riddell
update bzr.pot
8288
msgid "Building tree"
8289
msgstr ""
8290
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8291
#: breezy/transform.py:2705 breezy/transform.py:2726
6138.4.4 by Jonathan Riddell
update bzr.pot
8292
msgid "Adding file contents"
8293
msgstr ""
8294
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8295
#: breezy/transform.py:3027
6138.4.4 by Jonathan Riddell
update bzr.pot
8296
msgid "Resolution pass"
8297
msgstr ""
8298
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8299
#: breezy/tree.py:601
6138.4.4 by Jonathan Riddell
update bzr.pot
8300
msgid "*** {0} content-filter: {1} => {2!r}"
8301
msgstr ""
8302
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8303
#: breezy/upgrade.py:77
6138.4.4 by Jonathan Riddell
update bzr.pot
8304
#, python-format
8305
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
8306
msgstr ""
8307
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8308
#: breezy/upgrade.py:100
6138.4.4 by Jonathan Riddell
update bzr.pot
8309
#, python-format
8310
msgid "cannot upgrade from bzrdir format %s"
8311
msgstr ""
8312
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8313
#: breezy/upgrade.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
8314
#, python-format
8315
msgid "starting upgrade of %s"
8316
msgstr ""
8317
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8318
#: breezy/upgrade.py:110
6138.4.4 by Jonathan Riddell
update bzr.pot
8319
msgid "finished"
8320
msgstr ""
8321
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8322
#: breezy/upgrade.py:120
6138.4.4 by Jonathan Riddell
update bzr.pot
8323
msgid "Deleting backup.bzr"
8324
msgstr ""
8325
7185.1.1 by Jelmer Vernooij
Update pot file.
8326
#: breezy/upgrade.py:148
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8327
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8328
msgid ""
8329
"\n"
8330
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
8331
msgstr ""
8332
7185.1.1 by Jelmer Vernooij
Update pot file.
8333
#: breezy/upgrade.py:205
6138.4.4 by Jonathan Riddell
update bzr.pot
8334
#, python-format
8335
msgid "Found %d dependent branches - upgrading ..."
8336
msgstr ""
8337
7185.1.1 by Jelmer Vernooij
Update pot file.
8338
#: breezy/upgrade.py:275
6138.4.4 by Jonathan Riddell
update bzr.pot
8339
msgid "Upgrading bzrdirs"
8340
msgstr ""
8341
7185.1.1 by Jelmer Vernooij
Update pot file.
8342
#: breezy/upgrade.py:281
6138.4.4 by Jonathan Riddell
update bzr.pot
8343
#, python-format
8344
msgid "Upgrading %s"
8345
msgstr ""
8346
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8347
#: breezy/upgrade.py:283
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8348
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8349
msgid "Upgrading {0} {1} ..."
8350
msgstr ""
8351
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8352
#: breezy/upgrade.py:301
6138.4.4 by Jonathan Riddell
update bzr.pot
8353
msgid "Removing backup ..."
8354
msgstr ""
8355
7185.1.1 by Jelmer Vernooij
Update pot file.
8356
#: breezy/upgrade.py:306
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8357
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8358
msgid "failed to clean-up {0}: {1}"
8359
msgstr ""
8360
7185.1.1 by Jelmer Vernooij
Update pot file.
8361
#: breezy/win32utils.py:112
6138.4.4 by Jonathan Riddell
update bzr.pot
8362
msgid "Failed to GetProcessMemoryInfo()"
8363
msgstr ""
8364
7185.1.1 by Jelmer Vernooij
Update pot file.
8365
#: breezy/win32utils.py:133
6138.4.4 by Jonathan Riddell
update bzr.pot
8366
msgid "Cannot debug memory on win32 without ctypes or win32process"
8367
msgstr ""
8368
7185.1.1 by Jelmer Vernooij
Update pot file.
8369
#: breezy/win32utils.py:138
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8370
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
8371
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6138.4.4 by Jonathan Riddell
update bzr.pot
8372
msgstr ""
8373
7185.1.1 by Jelmer Vernooij
Update pot file.
8374
#: breezy/win32utils.py:146
6138.4.4 by Jonathan Riddell
update bzr.pot
8375
#, python-format
8376
msgid "WorkingSize       %8d KiB"
8377
msgstr ""
8378
7185.1.1 by Jelmer Vernooij
Update pot file.
8379
#: breezy/win32utils.py:148
6138.4.4 by Jonathan Riddell
update bzr.pot
8380
#, python-format
8381
msgid "PeakWorking       %8d KiB"
8382
msgstr ""
8383
7185.1.1 by Jelmer Vernooij
Update pot file.
8384
#: breezy/win32utils.py:150
6138.4.4 by Jonathan Riddell
update bzr.pot
8385
#, python-format
8386
msgid "PagefileUsage     %8d KiB"
8387
msgstr ""
8388
7185.1.1 by Jelmer Vernooij
Update pot file.
8389
#: breezy/win32utils.py:152
6138.4.4 by Jonathan Riddell
update bzr.pot
8390
#, python-format
8391
msgid "PeakPagefileUsage %8d KiB"
8392
msgstr ""
8393
7185.1.1 by Jelmer Vernooij
Update pot file.
8394
#: breezy/win32utils.py:154
6138.4.4 by Jonathan Riddell
update bzr.pot
8395
#, python-format
8396
msgid "PrivateUsage      %8d KiB"
8397
msgstr ""
8398
7185.1.1 by Jelmer Vernooij
Update pot file.
8399
#: breezy/win32utils.py:156
6138.4.4 by Jonathan Riddell
update bzr.pot
8400
#, python-format
8401
msgid "PageFaultCount    %8d"
8402
msgstr ""
8403
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8404
#: breezy/workingtree.py:1202
6138.4.4 by Jonathan Riddell
update bzr.pot
8405
msgid "Rerun update after fixing the conflicts."
8406
msgstr ""
8407
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8408
#: dummy/help_topics/authentication/summary.txt:1
8409
msgid "Information on configuring authentication"
8410
msgstr ""
8411
8412
#: dummy/help_topics/basic/detail.txt:1
8413
msgid ""
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8414
"Breezy 3.0b1 -- a free distributed version-control tool\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8415
"https://www.breezy-vcs.org/"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8416
msgstr ""
8417
8418
#: dummy/help_topics/basic/detail.txt:4
8419
msgid ""
8420
"Basic commands:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8421
"  brz init           makes this directory a versioned branch\n"
8422
"  brz branch         make a copy of another branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8423
msgstr ""
8424
8425
#: dummy/help_topics/basic/detail.txt:8
8426
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8427
"  brz add            make files or directories versioned\n"
8428
"  brz ignore         ignore a file or pattern\n"
8429
"  brz mv             move or rename a versioned file"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8430
msgstr ""
8431
8432
#: dummy/help_topics/basic/detail.txt:12
8433
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8434
"  brz status         summarize changes in working copy\n"
8435
"  brz diff           show detailed diffs"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8436
msgstr ""
8437
8438
#: dummy/help_topics/basic/detail.txt:15
8439
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8440
"  brz merge          pull in changes from another branch\n"
8441
"  brz commit         save some or all changes\n"
8442
"  brz send           send changes via email"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8443
msgstr ""
8444
8445
#: dummy/help_topics/basic/detail.txt:19
8446
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8447
"  brz log            show history of changes\n"
8448
"  brz check          validate storage"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8449
msgstr ""
8450
8451
#: dummy/help_topics/basic/detail.txt:22
8452
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8453
"  brz help init      more help on e.g. init command\n"
8454
"  brz help commands  list all commands\n"
8455
"  brz help topics    list all help topics\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8456
msgstr ""
8457
8458
#: dummy/help_topics/basic/summary.txt:1
8459
msgid "Basic commands"
8460
msgstr ""
8461
8462
#: dummy/help_topics/branches/detail.txt:1
8463
msgid "Branches"
8464
msgstr ""
8465
8466
#: dummy/help_topics/branches/detail.txt:3
8467
msgid ""
8468
"A branch consists of the state of a project, including all of its\n"
8469
"history. All branches have a repository associated (which is where the\n"
8470
"branch history is stored), but multiple branches may share the same\n"
8471
"repository (a shared repository). Branches can be copied and merged."
8472
msgstr ""
8473
8474
#: dummy/help_topics/branches/detail.txt:8
8475
msgid ""
8476
"In addition, one branch may be bound to another one.  Binding to another\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8477
"branch indicates that commits which happen in this branch must also\n"
8478
"happen in the other branch.  Breezy ensures consistency by not allowing\n"
8479
"commits when the two branches are out of date.  In order for a commit\n"
8480
"to succeed, it may be necessary to update the current branch using\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8481
"``brz update``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8482
msgstr ""
8483
8484
#: dummy/help_topics/branches/detail.txt:15
6437.2.2 by Vincent Ladeuil
Release 2.5b5
8485
#: dummy/help_topics/checkouts/detail.txt:66
8486
#: dummy/help_topics/repositories/detail.txt:36
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8487
msgid "Related commands::"
8488
msgstr ""
8489
8490
#: dummy/help_topics/branches/detail.txt:17
8491
msgid ""
8492
"  init    Change a directory into a versioned branch.\n"
8493
"  branch  Create a new branch that is a copy of an existing branch.\n"
8494
"  merge   Perform a three-way merge.\n"
8495
"  bind    Bind a branch to another one.\n"
8496
msgstr ""
8497
8498
#: dummy/help_topics/branches/summary.txt:1
8499
msgid "Information on what a branch is"
8500
msgstr ""
8501
8502
#: dummy/help_topics/bugs/summary.txt:1
8503
msgid "Bug tracker settings"
8504
msgstr ""
8505
8506
#: dummy/help_topics/checkouts/detail.txt:1
8507
msgid "Checkouts"
8508
msgstr ""
8509
8510
#: dummy/help_topics/checkouts/detail.txt:3
8511
msgid ""
8512
"Checkouts are source trees that are connected to a branch, so that when\n"
8513
"you commit in the source tree, the commit goes into that branch.  They\n"
8514
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8515
"Breezy's decentralized features until you want them. Using checkouts\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8516
"with shared repositories is very similar to working with SVN or CVS, but\n"
8517
"doesn't have the same restrictions.  And using checkouts still allows\n"
8518
"others working on the project to use whatever workflow they like."
8519
msgstr ""
8520
8521
#: dummy/help_topics/checkouts/detail.txt:11
8522
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8523
"A checkout is created with the brz checkout command (see \"help checkout"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8524
"\").\n"
8525
"You pass it a reference to another branch, and it will create a local copy\n"
8526
"for you that still contains a reference to the branch you created the\n"
8527
"checkout from (the master branch). Then if you make any commits they will "
8528
"be\n"
8529
"made on the other branch first. This creates an instant mirror of your work, "
8530
"or\n"
8531
"facilitates lockstep development, where each developer is working together,\n"
8532
"continuously integrating the changes of others."
8533
msgstr ""
8534
8535
#: dummy/help_topics/checkouts/detail.txt:19
8536
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8537
"However the checkout is still a first class branch in Breezy terms, so that\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8538
"you have the full history locally.  As you have a first class branch you "
8539
"can\n"
8540
"also commit locally if you want, for instance due to the temporary loss af "
8541
"a\n"
8542
"network connection. Use the --local option to commit to do this. All the "
8543
"local\n"
8544
"commits will then be made on the master branch the next time you do a non-"
8545
"local\n"
8546
"commit."
8547
msgstr ""
8548
8549
#: dummy/help_topics/checkouts/detail.txt:26
8550
msgid ""
8551
"If you are using a checkout from a shared branch you will periodically want "
8552
"to\n"
8553
"pull in all the changes made by others. This is done using the \"update\"\n"
8554
"command. The changes need to be applied before any non-local commit, but\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8555
"Breezy will tell you if there are any changes and suggest that you use this\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8556
"command when needed."
8557
msgstr ""
8558
8559
#: dummy/help_topics/checkouts/detail.txt:32
8560
msgid ""
8561
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8562
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8563
"SVN checkout in that it is not a first class branch, it mainly consists of "
8564
"the\n"
8565
"working tree. This means that any history operations must query the master\n"
8566
"branch, which could be slow if a network connection is involved. Also, as "
8567
"you\n"
8568
"don't have a local branch, then you cannot commit locally."
8569
msgstr ""
8570
8571
#: dummy/help_topics/checkouts/detail.txt:39
8572
msgid ""
8573
"Lightweight checkouts work best when you have fast reliable access to the\n"
8574
"master branch. This means that if the master branch is on the same disk or "
8575
"LAN\n"
8576
"a lightweight checkout will be faster than a heavyweight one for any "
8577
"commands\n"
8578
"that modify the revision history (as only one copy of the branch needs to\n"
8579
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8580
"that uses the history but does not change it, but if the master branch is "
8581
"on\n"
8582
"the same disk then there won't be a noticeable difference."
8583
msgstr ""
8584
8585
#: dummy/help_topics/checkouts/detail.txt:47
8586
msgid ""
8587
"Another possible use for a checkout is to use it with a treeless repository\n"
8588
"containing your branches, where you maintain only one working tree by\n"
8589
"switching the master branch that the checkout points to when you want to\n"
8590
"work on a different branch."
8591
msgstr ""
8592
8593
#: dummy/help_topics/checkouts/detail.txt:52
8594
msgid ""
8595
"Obviously to commit on a checkout you need to be able to write to the "
8596
"master\n"
8597
"branch. This means that the master branch must be accessible over a "
8598
"writeable\n"
8599
"protocol , such as sftp://, and that you have write permissions at the "
8600
"other\n"
8601
"end. Checkouts also work on the local file system, so that all that matters "
8602
"is\n"
8603
"file permissions."
8604
msgstr ""
8605
8606
#: dummy/help_topics/checkouts/detail.txt:58
8607
msgid ""
8608
"You can change the master of a checkout by using the \"switch\" command "
8609
"(see\n"
8610
"\"help switch\").  This will change the location that the commits are sent "
8611
"to.\n"
8612
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8613
"checkout. If you would like to convert your heavy checkout into a normal\n"
8614
"branch so that every commit is local, you can use the \"unbind\" command. To "
8615
"see\n"
8616
"whether or not a branch is bound or not you can use the \"info\" command. If "
8617
"the\n"
8618
"branch is bound it will tell you the location of the bound branch."
8619
msgstr ""
8620
8621
#: dummy/help_topics/checkouts/detail.txt:68
8622
msgid ""
8623
"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
8624
"              checkout\n"
8625
"  update      Pull any changes in the master branch in to your checkout\n"
8626
"  commit      Make a commit that is sent to the master branch. If you have\n"
8627
"              a heavy checkout then the --local option will commit to the\n"
8628
"              checkout without sending the commit to the master\n"
8629
"  switch      Change the master branch that the commits in the checkout "
8630
"will\n"
8631
"              be sent to\n"
8632
"  bind        Turn a standalone branch into a heavy checkout so that any\n"
8633
"              commits will be sent to the master branch\n"
8634
"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
8635
"              commits are only made locally\n"
8636
"  info        Displays whether a branch is bound or unbound. If the branch "
8637
"is\n"
8638
"              bound, then it will also display the location of the bound "
8639
"branch\n"
8640
msgstr ""
8641
8642
#: dummy/help_topics/checkouts/summary.txt:1
8643
msgid "Information on what a checkout is"
8644
msgstr ""
8645
8646
#: dummy/help_topics/configuration/summary.txt:1
8647
msgid "Details on the configuration settings available"
8648
msgstr ""
8649
8650
#: dummy/help_topics/conflict-types/summary.txt:1
8651
msgid "Types of conflicts and what to do about them"
8652
msgstr ""
8653
8654
#: dummy/help_topics/content-filters/summary.txt:1
8655
msgid "Conversion of content into/from working trees"
8656
msgstr ""
8657
8658
#: dummy/help_topics/criss-cross/detail.txt:1
8659
msgid "Criss-Cross"
8660
msgstr ""
8661
8662
#: dummy/help_topics/criss-cross/detail.txt:3
8663
msgid ""
8664
"A criss-cross in the branch history can cause the default merge technique\n"
8665
"to emit more conflicts than would normally be expected."
8666
msgstr ""
8667
8668
#: dummy/help_topics/criss-cross/detail.txt:6
8669
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8670
"In complex merge cases, ``brz merge --lca`` or ``brz merge --weave`` may "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8671
"give\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8672
"better results.  You may wish to ``brz revert`` the working tree and merge\n"
8673
"again.  Alternatively, use ``brz remerge`` on particular conflicted files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8674
msgstr ""
8675
8676
#: dummy/help_topics/criss-cross/detail.txt:10
8677
msgid ""
8678
"Criss-crosses occur in a branch's history if two branches merge the same "
8679
"thing\n"
8680
"and then merge one another, or if two branches merge one another at the "
8681
"same\n"
8682
"time.  They can be avoided by having each branch only merge from or into a\n"
8683
"designated central branch (a \"star topology\")."
8684
msgstr ""
8685
8686
#: dummy/help_topics/criss-cross/detail.txt:15
8687
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8688
"Criss-crosses cause problems because of the way merge works.  Breezy's "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8689
"default\n"
8690
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8691
"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
8692
"differences between THIS and OTHER are due to one side adding lines, or\n"
8693
"from another side removing lines."
8694
msgstr ""
8695
8696
#: dummy/help_topics/criss-cross/detail.txt:21
8697
msgid ""
8698
"Criss-crosses mean there is no good choice for a base.  Selecting the "
8699
"recent\n"
8700
"merge points could cause one side's changes to be silently discarded.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8701
"Selecting older merge points (which Breezy does) mean that extra conflicts\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8702
"are emitted."
8703
msgstr ""
8704
8705
#: dummy/help_topics/criss-cross/detail.txt:26
8706
msgid ""
8707
"The ``weave`` merge type is not affected by this problem because it uses\n"
8708
"line-origin detection instead of a basis revision to determine the cause of\n"
8709
"differences.\n"
8710
msgstr ""
8711
8712
#: dummy/help_topics/criss-cross/summary.txt:1
8713
msgid "Information on criss-cross merging"
8714
msgstr ""
8715
8716
#: dummy/help_topics/current-formats/summary.txt:1
8717
msgid "Current storage formats"
8718
msgstr ""
8719
8720
#: dummy/help_topics/debug-flags/summary.txt:1
8721
msgid "Options to show or record debug information"
8722
msgstr ""
8723
8724
#: dummy/help_topics/diverged-branches/summary.txt:1
8725
msgid "How to fix diverged branches"
8726
msgstr ""
8727
8728
#: dummy/help_topics/env-variables/summary.txt:1
8729
msgid "Environment variable names and values"
8730
msgstr ""
8731
8732
#: dummy/help_topics/eol/summary.txt:1
8733
msgid "Information on end-of-line handling"
8734
msgstr ""
8735
8736
#: dummy/help_topics/files/detail.txt:1
8737
msgid "Files"
8738
msgstr ""
8739
8740
#: dummy/help_topics/files/detail.txt:3
8741
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8742
":On Unix:   ~/.config/breezy/breezy.conf\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8743
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
7185.1.1 by Jelmer Vernooij
Update pot file.
8744
"\\Breezy\\\\2.0\\\\breezy.conf"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8745
msgstr ""
8746
8747
#: dummy/help_topics/files/detail.txt:6
8748
msgid ""
8749
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8750
"used to define general configuration that will be applied everywhere.\n"
8751
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8752
"commonly used options."
8753
msgstr ""
8754
8755
#: dummy/help_topics/files/detail.txt:11
8756
msgid "A typical config file might look something like::"
8757
msgstr ""
8758
8759
#: dummy/help_topics/files/detail.txt:13
8760
msgid ""
8761
"  [DEFAULT]\n"
8762
"  email=John Doe <jdoe@isp.com>"
8763
msgstr ""
8764
8765
#: dummy/help_topics/files/detail.txt:16
8766
msgid ""
8767
"  [ALIASES]\n"
8768
"  commit = commit --strict\n"
8769
"  log10 = log --short -r -10..-1\n"
8770
msgstr ""
8771
8772
#: dummy/help_topics/files/summary.txt:1
8773
msgid "Information on configuration and log files"
8774
msgstr ""
8775
8776
#: dummy/help_topics/formats/detail.txt:1
8777
msgid "Storage Formats"
8778
msgstr ""
8779
8780
#: dummy/help_topics/formats/detail.txt:3
8781
msgid ""
8782
"To ensure that older clients do not access data incorrectly,\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8783
"Breezy's policy is to introduce a new storage format whenever\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8784
"new features requiring new metadata are added. New storage\n"
8785
"formats may also be introduced to improve performance and\n"
8786
"scalability."
8787
msgstr ""
8788
8789
#: dummy/help_topics/formats/detail.txt:9
8790
msgid ""
8791
"The newest format, 2a, is highly recommended. If your\n"
8792
"project is not using 2a, then you should suggest to the\n"
8793
"project owner to upgrade."
8794
msgstr ""
8795
8796
#: dummy/help_topics/formats/detail.txt:13
8797
msgid ""
8798
"\n"
8799
".. note::"
8800
msgstr ""
8801
8802
#: dummy/help_topics/formats/detail.txt:16
8803
msgid ""
8804
"   Some of the older formats have two variants:\n"
8805
"   a plain one and a rich-root one. The latter include an additional\n"
8806
"   field about the root of the tree. There is no performance cost\n"
8807
"   for using a rich-root format but you cannot easily merge changes\n"
8808
"   from a rich-root format into a plain format. As a consequence,\n"
8809
"   moving a project to a rich-root format takes some co-ordination\n"
8810
"   in that all contributors need to upgrade their repositories\n"
8811
"   around the same time. 2a and all future formats will be\n"
8812
"   implicitly rich-root."
8813
msgstr ""
8814
8815
#: dummy/help_topics/formats/detail.txt:26
8816
msgid ""
8817
"See :doc:`current-formats-help` for the complete list of\n"
8818
"currently supported formats. See :doc:`other-formats-help` for\n"
8819
"descriptions of any available experimental and deprecated formats.\n"
8820
msgstr ""
8821
8822
#: dummy/help_topics/formats/summary.txt:1
8823
msgid "Information on choosing a storage format"
8824
msgstr ""
8825
7185.1.1 by Jelmer Vernooij
Update pot file.
8826
#: dummy/help_topics/git/detail.txt:1
8827
msgid "Using Bazaar with Git."
8828
msgstr ""
8829
8830
#: dummy/help_topics/git/detail.txt:3
8831
msgid ""
8832
"The bzr-git plugin provides support for using Bazaar with local and remote\n"
8833
"Git repositories, as just another format. You can clone, pull from and\n"
8834
"push to git repositories as you would with any native Bazaar branch."
8835
msgstr ""
8836
8837
#: dummy/help_topics/git/detail.txt:7
8838
msgid "The bzr-git plugin also adds three new bzr subcommands:"
8839
msgstr ""
8840
8841
#: dummy/help_topics/git/detail.txt:9
8842
msgid ""
8843
" * bzr git-objects: Extracts Git objects out of a Bazaar repository\n"
8844
" * bzr git-refs: Display Git refs from a Bazaar branch or repository\n"
8845
" * bzr git-import: Imports a local or remote Git repository to a set of "
8846
"Bazaar\n"
8847
"                   branches"
8848
msgstr ""
8849
8850
#: dummy/help_topics/git/detail.txt:14
8851
msgid ""
8852
"The 'git:' revision specifier can be used to find revisions by short or "
8853
"long\n"
8854
"GIT SHA1.\n"
8855
msgstr ""
8856
8857
#: dummy/help_topics/git/summary.txt:1
8858
msgid "Using Bazaar with Git"
8859
msgstr ""
8860
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8861
#: dummy/help_topics/global-options/detail.txt:1
8862
msgid "Global Options"
8863
msgstr ""
8864
8865
#: dummy/help_topics/global-options/detail.txt:3
8866
msgid ""
8867
"These options may be used with any command, and may appear in front of any\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8868
"command.  (e.g. ``brz --profile help``)."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8869
msgstr ""
8870
8871
#: dummy/help_topics/global-options/detail.txt:6
8872
msgid ""
8873
"--version      Print the version number. Must be supplied before the "
8874
"command.\n"
8875
"--no-aliases   Do not process command aliases when running this command.\n"
8876
"--builtin      Use the built-in version of a command, not the plugin "
8877
"version.\n"
8878
"               This does not suppress other plugin effects.\n"
8879
"--no-plugins   Do not process any plugins.\n"
8880
"--no-l10n      Do not translate messages.\n"
8881
"--concurrency  Number of processes that can be run concurrently (selftest)."
8882
msgstr ""
8883
8884
#: dummy/help_topics/global-options/detail.txt:14
8885
msgid ""
8886
"--profile      Profile execution using the hotshot profiler.\n"
8887
"--lsprof       Profile execution using the lsprof profiler.\n"
8888
"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
8889
"               results to a specified file.  If the filename ends with \".txt"
8890
"\",\n"
8891
"               text format will be used.  If the filename either starts "
8892
"with\n"
8893
"               \"callgrind.out\" or end with \".callgrind\", the output will "
8894
"be\n"
8895
"               formatted for use with KCacheGrind. Otherwise, the output\n"
8896
"               will be a pickle.\n"
8897
"--coverage     Generate line coverage report in the specified directory."
8898
msgstr ""
8899
8900
#: dummy/help_topics/global-options/detail.txt:24
8901
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8902
"-Oname=value   Override the ``name`` config option setting it to ``value`` "
8903
"for\n"
8904
"               the duration of the command.  This can be used multiple times "
8905
"if\n"
8906
"               several options need to be overridden."
8907
msgstr ""
8908
8909
#: dummy/help_topics/global-options/detail.txt:28
8910
msgid ""
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8911
"See https://www.breezy-vcs.org/developers/profiling.html for more\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8912
"information on profiling."
8913
msgstr ""
8914
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8915
#: dummy/help_topics/global-options/detail.txt:31
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8916
msgid ""
8917
"A number of debug flags are also available to assist troubleshooting and\n"
8918
"development.  See :doc:`debug-flags-help`.\n"
8919
msgstr ""
8920
8921
#: dummy/help_topics/global-options/summary.txt:1
7185.1.1 by Jelmer Vernooij
Update pot file.
8922
msgid "Options that control how Breezy runs"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8923
msgstr ""
8924
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8925
#: dummy/help_topics/glossary/summary.txt:1
8926
msgid "Glossary"
8927
msgstr ""
8928
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8929
#: dummy/help_topics/hooks/summary.txt:1
8930
msgid "Points at which custom processing can be added"
8931
msgstr ""
8932
8933
#: dummy/help_topics/launchpad/detail.txt:1
8934
msgid "Integration with Launchpad.net"
8935
msgstr ""
8936
8937
#: dummy/help_topics/launchpad/detail.txt:3
8938
msgid ""
8939
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8940
"specification tracking."
8941
msgstr ""
8942
8943
#: dummy/help_topics/launchpad/detail.txt:6
8944
msgid ""
8945
"The bzr client (through the plugin called 'launchpad') has special\n"
8946
"features to communicate with Launchpad:"
8947
msgstr ""
8948
8949
#: dummy/help_topics/launchpad/detail.txt:9
8950
msgid ""
8951
"    * The launchpad-login command tells Bazaar your Launchpad user name. "
8952
"This\n"
8953
"      is then used by the 'lp:' transport to download your branches using\n"
8954
"      bzr+ssh://."
8955
msgstr ""
8956
8957
#: dummy/help_topics/launchpad/detail.txt:13
8958
msgid ""
8959
"    * The 'lp:' transport uses Launchpad as a directory service: for "
8960
"example\n"
8961
"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8962
"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8963
"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8964
msgstr ""
8965
8966
#: dummy/help_topics/launchpad/detail.txt:18
8967
msgid ""
8968
"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8969
"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8970
"lp:12345'\n"
8971
"      will record a revision property that marks that revision as fixing\n"
8972
"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8973
"      automatically be linked to the bug report."
8974
msgstr ""
8975
8976
#: dummy/help_topics/launchpad/detail.txt:24
8977
msgid "For more information see http://help.launchpad.net/\n"
8978
msgstr ""
8979
8980
#: dummy/help_topics/launchpad/summary.txt:1
8981
msgid "Using Bazaar with Launchpad.net"
8982
msgstr ""
8983
8984
#: dummy/help_topics/location-alias/summary.txt:1
8985
msgid "Aliases for remembered locations"
8986
msgstr ""
8987
8988
#: dummy/help_topics/log-formats/summary.txt:1
8989
msgid "Details on the logging formats available"
8990
msgstr ""
8991
7185.1.1 by Jelmer Vernooij
Update pot file.
8992
#: dummy/help_topics/missing-extensions/summary.txt:1
8993
msgid "What to do when compiled extensions are missing"
8994
msgstr ""
8995
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8996
#: dummy/help_topics/other-formats/summary.txt:1
8997
msgid "Experimental and deprecated storage formats"
8998
msgstr ""
8999
9000
#: dummy/help_topics/patterns/summary.txt:1
9001
msgid "Information on the pattern syntax"
9002
msgstr ""
9003
9004
#: dummy/help_topics/repositories/detail.txt:1
9005
msgid "Repositories"
9006
msgstr ""
9007
9008
#: dummy/help_topics/repositories/detail.txt:3
9009
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9010
"Repositories in Breezy are where committed information is stored. There is\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9011
"a repository associated with every branch."
9012
msgstr ""
9013
9014
#: dummy/help_topics/repositories/detail.txt:6
9015
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9016
"Repositories are a form of database. Breezy will usually maintain this for\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9017
"good performance automatically, but in some situations (e.g. when doing\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9018
"very many commits in a short time period) you may want to ask brz to\n"
9019
"optimise the database indices. This can be done by the 'brz pack' command."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9020
msgstr ""
9021
9022
#: dummy/help_topics/repositories/detail.txt:11
9023
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9024
"By default just running 'brz init' will create a repository within the new\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9025
"branch but it is possible to create a shared repository which allows "
9026
"multiple\n"
9027
"branches to share their information in the same location. When a new branch "
9028
"is\n"
9029
"created it will first look to see if there is a containing shared repository "
9030
"it\n"
9031
"can use."
9032
msgstr ""
9033
9034
#: dummy/help_topics/repositories/detail.txt:17
9035
msgid ""
9036
"When two branches of the same project share a repository, there is\n"
9037
"generally a large space saving. For some operations (e.g. branching\n"
9038
"within the repository) this translates in to a large time saving."
9039
msgstr ""
9040
9041
#: dummy/help_topics/repositories/detail.txt:21
9042
msgid ""
9043
"To create a shared repository use the init-repository command (or the alias\n"
9044
"init-repo). This command takes the location of the repository to create. "
9045
"This\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9046
"means that 'brz init-repository repo' will create a directory named 'repo',\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9047
"which contains a shared repository. Any new branches that are created in "
9048
"this\n"
9049
"directory will then use it for storage."
9050
msgstr ""
9051
9052
#: dummy/help_topics/repositories/detail.txt:27
9053
msgid ""
9054
"It is a good idea to create a repository whenever you might create more\n"
9055
"than one branch of a project. This is true for both working areas where you\n"
9056
"are doing the development, and any server areas that you use for hosting\n"
9057
"projects. In the latter case, it is common to want branches without working\n"
9058
"trees. Since the files in the branch will not be edited directly there is "
9059
"no\n"
9060
"need to use up disk space for a working tree. To create a repository in "
9061
"which\n"
9062
"the branches will not have working trees pass the '--no-trees' option to\n"
9063
"'init-repository'."
9064
msgstr ""
9065
9066
#: dummy/help_topics/repositories/detail.txt:38
9067
msgid ""
9068
"  init-repository   Create a shared repository. Use --no-trees to create "
9069
"one\n"
9070
"                    in which new branches won't get a working tree.\n"
9071
msgstr ""
9072
9073
#: dummy/help_topics/repositories/summary.txt:1
9074
msgid "Basic information on shared repositories."
9075
msgstr ""
9076
9077
#: dummy/help_topics/revisionspec/summary.txt:1
9078
msgid "Explain how to use --revision"
9079
msgstr ""
9080
9081
#: dummy/help_topics/rules/summary.txt:1
9082
msgid "Information on defining rule-based preferences"
9083
msgstr ""
9084
9085
#: dummy/help_topics/standalone-trees/detail.txt:1
9086
msgid "Standalone Trees"
9087
msgstr ""
9088
9089
#: dummy/help_topics/standalone-trees/detail.txt:3
9090
msgid ""
9091
"A standalone tree is a working tree with an associated repository. It\n"
9092
"is an independently usable branch, with no dependencies on any other.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9093
"Creating a standalone tree (via brz init) is the quickest way to put\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9094
"an existing project under version control."
9095
msgstr ""
9096
9097
#: dummy/help_topics/standalone-trees/detail.txt:8
9098
msgid "Related Commands::"
9099
msgstr ""
9100
9101
#: dummy/help_topics/standalone-trees/detail.txt:10
9102
msgid "  init    Make a directory into a versioned branch.\n"
9103
msgstr ""
9104
9105
#: dummy/help_topics/standalone-trees/summary.txt:1
9106
msgid "Information on what a standalone tree is"
9107
msgstr ""
9108
9109
#: dummy/help_topics/standard-options/detail.txt:1
9110
msgid "Standard Options"
9111
msgstr ""
9112
9113
#: dummy/help_topics/standard-options/detail.txt:3
9114
msgid "Standard options are legal for all commands."
9115
msgstr ""
9116
9117
#: dummy/help_topics/standard-options/detail.txt:5
9118
msgid ""
9119
"--help, -h     Show help message.\n"
9120
"--verbose, -v  Display more information.\n"
9121
"--quiet, -q    Only display errors and warnings."
9122
msgstr ""
9123
9124
#: dummy/help_topics/standard-options/detail.txt:9
9125
msgid "Unlike global options, standard options can be used in aliases.\n"
9126
msgstr ""
9127
9128
#: dummy/help_topics/standard-options/summary.txt:1
9129
msgid "Options that can be used with any command"
9130
msgstr ""
9131
9132
#: dummy/help_topics/status-flags/detail.txt:1
9133
msgid "Status Flags"
9134
msgstr ""
9135
9136
#: dummy/help_topics/status-flags/detail.txt:3
9137
msgid ""
9138
"Status flags are used to summarise changes to the working tree in a concise\n"
9139
"manner.  They are in the form::"
9140
msgstr ""
9141
9142
#: dummy/help_topics/status-flags/detail.txt:6
9143
msgid "   xxx   <filename>"
9144
msgstr ""
9145
9146
#: dummy/help_topics/status-flags/detail.txt:8
9147
msgid "where the columns' meanings are as follows."
9148
msgstr ""
9149
9150
#: dummy/help_topics/status-flags/detail.txt:10
9151
msgid "Column 1 - versioning/renames::"
9152
msgstr ""
9153
9154
#: dummy/help_topics/status-flags/detail.txt:12
9155
msgid ""
9156
"  + File versioned\n"
9157
"  - File unversioned\n"
9158
"  R File renamed\n"
9159
"  ? File unknown\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9160
"  X File nonexistent (and unknown to brz)\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9161
"  C File has conflicts\n"
9162
"  P Entry for a pending merge (not a file)"
9163
msgstr ""
9164
9165
#: dummy/help_topics/status-flags/detail.txt:20
9166
msgid "Column 2 - contents::"
9167
msgstr ""
9168
9169
#: dummy/help_topics/status-flags/detail.txt:22
9170
msgid ""
9171
"  N File created\n"
9172
"  D File deleted\n"
9173
"  K File kind changed\n"
9174
"  M File modified"
9175
msgstr ""
9176
9177
#: dummy/help_topics/status-flags/detail.txt:27
9178
msgid "Column 3 - execute::"
9179
msgstr ""
9180
9181
#: dummy/help_topics/status-flags/detail.txt:29
9182
msgid "  * The execute bit was changed\n"
9183
msgstr ""
9184
9185
#: dummy/help_topics/status-flags/summary.txt:1
9186
msgid "Help on status flags"
9187
msgstr ""
9188
9189
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
9190
msgid "Branches Out of Sync"
9191
msgstr ""
9192
9193
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
9194
msgid ""
9195
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
9196
"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
9197
"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
9198
"have the same last revision as the new reference branch for the lightweight\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9199
"checkout, data could be lost, so Breezy refuses."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9200
msgstr ""
9201
9202
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
9203
msgid "How you deal with this depends on *why* the branches are out of sync."
9204
msgstr ""
9205
9206
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
9207
msgid ""
9208
"If you have a checkout and have done local commits, you can get back in "
9209
"sync\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9210
"by running \"brz update\" (and possibly \"brz commit\")."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9211
msgstr ""
9212
9213
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
9214
msgid ""
9215
"If you have a branch and the remote branch is out-of-date, you can push\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9216
"the local changes using \"brz push\".  If the local branch is out of date, "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9217
"you\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9218
"can do \"brz pull\".  If both branches have had changes, you can merge, "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9219
"commit\n"
9220
"and then push your changes.  If you decide that some of the changes aren't\n"
9221
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
9222
msgstr ""
9223
9224
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
9225
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
9226
msgstr ""
9227
9228
#: dummy/help_topics/topics/summary.txt:1
9229
msgid "Topics list"
9230
msgstr ""
9231
9232
#: dummy/help_topics/url-special-chars/summary.txt:1
9233
msgid "Special character handling in URLs"
9234
msgstr ""
9235
9236
#: dummy/help_topics/urlspec/summary.txt:1
9237
msgid "Supported transport protocols"
9238
msgstr ""
9239
9240
#: dummy/help_topics/working-trees/detail.txt:1
9241
msgid "Working Trees"
9242
msgstr ""
9243
9244
#: dummy/help_topics/working-trees/detail.txt:3
9245
msgid ""
9246
"A working tree is the contents of a branch placed on disk so that you can\n"
9247
"see the files and edit them. The working tree is where you make changes to "
9248
"a\n"
9249
"branch, and when you commit the current state of the working tree is the\n"
9250
"snapshot that is recorded in the commit."
9251
msgstr ""
9252
9253
#: dummy/help_topics/working-trees/detail.txt:8
9254
msgid ""
9255
"When you push a branch to a remote system, a working tree will not be\n"
9256
"created. If one is already present the files will not be updated. The\n"
9257
"branch information will be updated and the working tree will be marked\n"
9258
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
9259
"may be uncommitted changes or the update may cause content conflicts that "
9260
"are\n"
9261
"difficult to deal with remotely."
9262
msgstr ""
9263
9264
#: dummy/help_topics/working-trees/detail.txt:15
9265
msgid ""
9266
"If you have a branch with no working tree you can use the 'checkout' "
9267
"command\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9268
"to create a working tree. If you run 'brz checkout .' from the branch it "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9269
"will\n"
9270
"create the working tree. If the branch is updated remotely, you can update "
9271
"the\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9272
"working tree by running 'brz update' in that directory."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9273
msgstr ""
9274
9275
#: dummy/help_topics/working-trees/detail.txt:20
9276
msgid ""
9277
"If you have a branch with a working tree that you do not want the 'remove-"
9278
"tree'\n"
9279
"command will remove the tree if it is safe. This can be done to avoid the\n"
9280
"warning about the remote working tree not being updated when pushing to the\n"
9281
"branch. It can also be useful when working with a '--no-trees' repository\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9282
"(see 'brz help repositories')."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9283
msgstr ""
9284
9285
#: dummy/help_topics/working-trees/detail.txt:26
9286
msgid ""
9287
"If you want to have a working tree on a remote machine that you push to you\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9288
"can either run 'brz update' in the remote branch after each push, or use "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9289
"some\n"
9290
"other method to update the tree during the push. There is an 'rspush' "
9291
"plugin\n"
9292
"that will update the working tree using rsync as well as doing a push. "
9293
"There\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9294
"is also a 'push-and-update' plugin that automates running 'brz update' via "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9295
"SSH\n"
9296
"after each push."
9297
msgstr ""
9298
9299
#: dummy/help_topics/working-trees/detail.txt:33
9300
msgid "Useful commands::"
9301
msgstr ""
9302
9303
#: dummy/help_topics/working-trees/detail.txt:35
9304
msgid ""
9305
"  checkout     Create a working tree when a branch does not have one.\n"
9306
"  remove-tree  Removes the working tree from a branch when it is safe to do "
9307
"so.\n"
9308
"  update       When a working tree is out of sync with its associated "
9309
"branch\n"
9310
"               this will update the tree to match the branch.\n"
9311
msgstr ""
9312
9313
#: dummy/help_topics/working-trees/summary.txt:1
9314
msgid "Information on working trees"
9315
msgstr ""
9316
9317
#: en/help_topics/authentication.txt:1
9318
msgid ""
9319
"Authentication Settings\n"
9320
"======================="
9321
msgstr ""
9322
9323
#: en/help_topics/authentication.txt:4
9324
msgid ""
9325
"\n"
9326
"Intent\n"
9327
"------"
9328
msgstr ""
9329
9330
#: en/help_topics/authentication.txt:8
9331
msgid ""
9332
"Many different authentication policies can be described in the\n"
9333
"``authentication.conf`` file but a particular user should need only a few\n"
9334
"definitions to cover his needs without having to specify a user and a "
9335
"password\n"
9336
"for every branch he uses."
9337
msgstr ""
9338
9339
#: en/help_topics/authentication.txt:13
9340
msgid ""
9341
"The definitions found in this file are used to find the credentials to use "
9342
"for\n"
9343
"a given url. The same credentials can generally be used for as many branches "
9344
"as\n"
9345
"possible by grouping their declaration around the remote servers that need\n"
9346
"them. It's even possible to declare credentials that will be used by "
9347
"different\n"
9348
"servers."
9349
msgstr ""
9350
9351
#: en/help_topics/authentication.txt:19
9352
msgid ""
9353
"The intent is to make this file as small as possible to minimize maintenance."
9354
msgstr ""
9355
9356
#: en/help_topics/authentication.txt:21
9357
msgid ""
9358
"Once the relevant credentials are declared in this file you may use branch "
9359
"urls\n"
9360
"without embedding passwords (security hazard) or even users (enabling "
9361
"sharing\n"
9362
"of your urls with others)."
9363
msgstr ""
9364
9365
#: en/help_topics/authentication.txt:25
9366
msgid "Instead of using::"
9367
msgstr ""
9368
9369
#: en/help_topics/authentication.txt:27
7185.1.1 by Jelmer Vernooij
Update pot file.
9370
msgid "  brz branch sftp://joe:secret@host.com/path/to/my/branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9371
msgstr ""
9372
9373
#: en/help_topics/authentication.txt:29
9374
msgid "you simply use::"
9375
msgstr ""
9376
9377
#: en/help_topics/authentication.txt:31
7185.1.1 by Jelmer Vernooij
Update pot file.
9378
msgid "  brz branch sftp://host.com/path/to/my/branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9379
msgstr ""
9380
9381
#: en/help_topics/authentication.txt:33
9382
msgid "provided you have created the following ``authentication.conf`` file::"
9383
msgstr ""
9384
9385
#: en/help_topics/authentication.txt:35
9386
msgid ""
9387
"  [myprojects]\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9388
"  scheme=sftp\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9389
"  host=host.com\n"
9390
"  user=joe\n"
9391
"  password=secret\n"
9392
"  "
9393
msgstr ""
9394
9395
#: en/help_topics/authentication.txt:42
9396
msgid ""
9397
"Authentication definitions\n"
9398
"--------------------------"
9399
msgstr ""
9400
9401
#: en/help_topics/authentication.txt:45
9402
msgid ""
9403
"There are two kinds of authentication used by the various schemes supported "
9404
"by\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9405
"brz:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9406
msgstr ""
9407
9408
#: en/help_topics/authentication.txt:48
9409
msgid "1. user and password"
9410
msgstr ""
9411
9412
#: en/help_topics/authentication.txt:50
9413
msgid ""
9414
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9415
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9416
"ssh agents are a better, more secure solution. So we have chosen to not "
9417
"provide\n"
9418
"our own less secure method."
9419
msgstr ""
9420
9421
#: en/help_topics/authentication.txt:55
9422
msgid "2. user, realm and password"
9423
msgstr ""
9424
9425
#: en/help_topics/authentication.txt:57
9426
msgid ""
9427
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9428
"against a host. But, by using ``.htaccess`` files, for example, it is "
9429
"possible\n"
9430
"to define several (``user, realm, password``) for a given ``host``. So what "
9431
"is\n"
9432
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9433
"is\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9434
"not taken into account in the definitions, but will displayed if brz "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9435
"prompts\n"
9436
"you for a password."
9437
msgstr ""
9438
9439
#: en/help_topics/authentication.txt:64
9440
msgid ""
9441
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9442
"specifying the appropriate port."
9443
msgstr ""
9444
9445
#: en/help_topics/authentication.txt:67
9446
msgid ""
9447
"To take all schemes into account, the password will be deduced from a set "
9448
"of\n"
9449
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9450
"``user``,\n"
9451
"``password``)."
9452
msgstr ""
9453
9454
#: en/help_topics/authentication.txt:71
9455
msgid ""
9456
"  * ``scheme``: can be empty (meaning the rest of the definition can be "
9457
"used\n"
9458
"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9459
"``ssh``\n"
9460
"    should be used instead since this is the real scheme regarding\n"
9461
"    authentication,"
9462
msgstr ""
9463
9464
#: en/help_topics/authentication.txt:76
9465
msgid "  * ``host``: can be empty (to act as a default for any host),"
9466
msgstr ""
9467
9468
#: en/help_topics/authentication.txt:78
9469
msgid ""
9470
"  * ``port`` can be empty (useful when an host provides several servers for "
9471
"the\n"
9472
"    same scheme), only numerical values are allowed, this should be used "
9473
"only\n"
9474
"    when the server uses a port different than the scheme standard port,"
9475
msgstr ""
9476
9477
#: en/help_topics/authentication.txt:82
9478
msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
9479
msgstr ""
9480
9481
#: en/help_topics/authentication.txt:84
9482
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9483
"  * ``user``: can be empty (``bzr`` will default to python's\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9484
"    ``getpass.get_user()``),"
9485
msgstr ""
9486
9487
#: en/help_topics/authentication.txt:87
9488
msgid ""
9489
"  * ``password``: can be empty if you prefer to always be prompted for your\n"
9490
"    password."
9491
msgstr ""
9492
9493
#: en/help_topics/authentication.txt:90
9494
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9495
"Multiple definitions can be provided and, for a given URL, brz will select "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9496
"a\n"
9497
"(``user`` [, ``password``]) based on the following rules :"
9498
msgstr ""
9499
9500
#: en/help_topics/authentication.txt:93
9501
msgid " 1. the first match wins,"
9502
msgstr ""
9503
9504
#: en/help_topics/authentication.txt:95
9505
msgid " 2. empty fields match everything,"
9506
msgstr ""
9507
9508
#: en/help_topics/authentication.txt:97
9509
msgid ""
9510
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9511
msgstr ""
9512
9513
#: en/help_topics/authentication.txt:99
9514
msgid ""
9515
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9516
"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
9517
"net``\n"
9518
"    will not match ``bzr.sf.net``)."
9519
msgstr ""
9520
9521
#: en/help_topics/authentication.txt:103
9522
msgid ""
9523
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9524
msgstr ""
9525
9526
#: en/help_topics/authentication.txt:105
9527
msgid ""
9528
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9529
"above,\n"
9530
"    empty paths will match any provided path)."
9531
msgstr ""
9532
9533
#: en/help_topics/authentication.txt:110
9534
msgid ""
9535
"File format\n"
9536
"-----------"
9537
msgstr ""
9538
9539
#: en/help_topics/authentication.txt:113
9540
msgid ""
9541
"The general rules for :doc:`configuration files <configuration-help>`\n"
9542
"apply except for the variable policies."
9543
msgstr ""
9544
9545
#: en/help_topics/authentication.txt:116
9546
msgid "Each section describes an authentication definition."
9547
msgstr ""
9548
9549
#: en/help_topics/authentication.txt:118
9550
msgid ""
9551
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9552
"reserved\n"
9553
"and should appear as the *last* section."
9554
msgstr ""
9555
9556
#: en/help_topics/authentication.txt:121
9557
msgid "Each section should define:"
9558
msgstr ""
9559
9560
#: en/help_topics/authentication.txt:123
9561
msgid "* ``user``: the login to be used,"
9562
msgstr ""
9563
9564
#: en/help_topics/authentication.txt:125
9565
msgid "Each section could define:"
9566
msgstr ""
9567
9568
#: en/help_topics/authentication.txt:127
9569
msgid "* ``host``: the remote server,"
9570
msgstr ""
9571
9572
#: en/help_topics/authentication.txt:129
9573
msgid "* ``port``: the port the server is listening,"
9574
msgstr ""
9575
9576
#: en/help_topics/authentication.txt:131
9577
msgid "* ``path``: the branch location,"
9578
msgstr ""
9579
9580
#: en/help_topics/authentication.txt:133
9581
msgid "* ``password``: the password."
9582
msgstr ""
9583
9584
#: en/help_topics/authentication.txt:135
9585
msgid ""
9586
"\n"
9587
"Examples\n"
9588
"--------"
9589
msgstr ""
9590
9591
#: en/help_topics/authentication.txt:139
9592
msgid ""
9593
"\n"
9594
"Personal projects hosted outside\n"
9595
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9596
msgstr ""
9597
9598
#: en/help_topics/authentication.txt:143
9599
msgid ""
9600
"All connections are done with the same ``user`` (the remote one for which "
9601
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9602
"default brz one is not appropriate) and the password is always prompted "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9603
"with\n"
9604
"some exceptions::"
9605
msgstr ""
9606
9607
#: en/help_topics/authentication.txt:147
9608
msgid ""
9609
"        # Pet projects on hobby.net\n"
9610
"        [hobby]\n"
9611
"        host=r.hobby.net\n"
9612
"        user=jim\n"
9613
"        password=obvious1234\n"
9614
"        \n"
9615
"        # Home server\n"
9616
"        [home]\n"
9617
"        scheme=https\n"
9618
"        host=home.net\n"
9619
"        user=joe\n"
9620
"        password=1essobV10us\n"
9621
"        \n"
9622
"        [DEFAULT]\n"
9623
"        # Our local user is barbaz, on all remote sites we're known as "
9624
"foobar\n"
9625
"        user=foobar"
9626
msgstr ""
9627
9628
#: en/help_topics/authentication.txt:164
9629
msgid ""
9630
"\n"
9631
"Source hosting provider\n"
9632
"~~~~~~~~~~~~~~~~~~~~~~~"
9633
msgstr ""
9634
9635
#: en/help_topics/authentication.txt:168
9636
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9637
msgstr ""
9638
9639
#: en/help_topics/authentication.txt:170
9640
msgid ""
9641
"        [shpnet domain]\n"
9642
"        # we use sftp, but ssh is the scheme used for authentication\n"
9643
"        scheme=ssh\n"
9644
"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9645
"        host=.shp.net\n"
9646
"        user=joe\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9647
"        # brz doesn't support supplying a password for sftp,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9648
"        # consider using an ssh agent if you don't want to supply\n"
9649
"        # a password interactively. (pageant, ssh-agent, etc)"
9650
msgstr ""
9651
9652
#: en/help_topics/authentication.txt:180
9653
msgid ""
9654
"HTTPS, SFTP servers and their proxy\n"
9655
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9656
msgstr ""
9657
9658
#: en/help_topics/authentication.txt:183
9659
msgid ""
9660
"At company.com, the server hosting release and integration branches is "
9661
"behind a\n"
9662
"proxy, and the two branches use different authentication policies::"
9663
msgstr ""
9664
9665
#: en/help_topics/authentication.txt:186
9666
msgid ""
9667
"        [reference code]\n"
9668
"        scheme=https\n"
9669
"        host=dev.company.com\n"
9670
"        path=/dev\n"
9671
"        user=user1\n"
9672
"        password=pass1"
9673
msgstr ""
9674
9675
#: en/help_topics/authentication.txt:193
9676
msgid ""
9677
"        # development branches on dev server\n"
9678
"        [dev]\n"
9679
"        scheme=ssh # bzr+ssh and sftp are available here\n"
9680
"        host=dev.company.com\n"
9681
"        path=/dev/integration\n"
9682
"        user=user2\n"
9683
"        \n"
9684
"        # proxy\n"
9685
"        [proxy]\n"
9686
"        scheme=http\n"
9687
"        host=proxy.company.com\n"
9688
"        port=3128\n"
9689
"        user=proxyuser1\n"
9690
"        password=proxypass1"
9691
msgstr ""
9692
9693
#: en/help_topics/authentication.txt:208
9694
msgid ""
9695
"\n"
9696
"Planned enhancements\n"
9697
"--------------------"
9698
msgstr ""
9699
9700
#: en/help_topics/authentication.txt:212
9701
msgid ""
9702
"The following are not yet implemented but planned as parts of a work in\n"
9703
"progress:"
9704
msgstr ""
9705
9706
#: en/help_topics/authentication.txt:215
9707
msgid "* add a  ``password_encoding`` field allowing:"
9708
msgstr ""
9709
9710
#: en/help_topics/authentication.txt:217
9711
msgid ""
9712
"  - storing the passwords in various obfuscating encodings (base64 for one),"
9713
msgstr ""
9714
9715
#: en/help_topics/authentication.txt:219
9716
msgid "  - delegate password storage to plugins (.netrc for example)."
9717
msgstr ""
9718
9719
#: en/help_topics/authentication.txt:221
9720
msgid ""
9721
"* update the credentials when the user is prompted for user or password,"
9722
msgstr ""
9723
9724
#: en/help_topics/authentication.txt:223
9725
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9726
msgstr ""
9727
9728
#: en/help_topics/authentication.txt:225
9729
msgid ""
9730
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9731
"but\n"
9732
"ignored in the actual implementation.\n"
9733
msgstr ""
9734
9735
#: en/help_topics/bugs.txt:1
9736
msgid "Bug Tracker Settings"
9737
msgstr ""
9738
9739
#: en/help_topics/bugs.txt:3
9740
msgid ""
9741
"When making a commit, metadata about bugs fixed by that change can be\n"
9742
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9743
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9744
"(The only ``status`` value currently supported is ``fixed.``)"
9745
msgstr ""
9746
9747
#: en/help_topics/bugs.txt:8
9748
msgid ""
9749
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9750
"identifier\n"
9751
"rather than a full URL. This looks like::"
9752
msgstr ""
9753
9754
#: en/help_topics/bugs.txt:11
9755
msgid "    bzr commit --fixes <tracker>:<id>"
9756
msgstr ""
9757
6535.1.1 by Vincent Ladeuil
Release 2.6b2
9758
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9759
msgid "or::"
9760
msgstr ""
9761
9762
#: en/help_topics/bugs.txt:15
9763
msgid "    bzr commit --fixes <id>"
9764
msgstr ""
9765
9766
#: en/help_topics/bugs.txt:17
9767
msgid ""
9768
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9769
"the\n"
9770
"identifier for that bug within the bugtracker, usually the bug number.\n"
9771
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9772
"or global configuration is used."
9773
msgstr ""
9774
9775
#: en/help_topics/bugs.txt:22
9776
msgid ""
9777
"Bazaar knows about a few bug trackers that have many users. If\n"
9778
"you use one of these bug trackers then there is no setup required to\n"
9779
"use this feature, you just need to know the tracker identifier to use.\n"
9780
"These are the bugtrackers that are built in:"
9781
msgstr ""
9782
9783
#: en/help_topics/bugs.txt:27
9784
msgid ""
9785
"  ============================ ============ ============\n"
9786
"  URL                          Abbreviation Example\n"
9787
"  ============================ ============ ============\n"
9788
"  https://bugs.launchpad.net/  lp           lp:12345\n"
9789
"  http://bugs.debian.org/      deb          deb:12345\n"
9790
"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
9791
"  ============================ ============ ============"
9792
msgstr ""
9793
9794
#: en/help_topics/bugs.txt:35
9795
msgid ""
9796
"For the bug trackers not listed above configuration is required.\n"
9797
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9798
"is built in, along with a template mechanism for other bugtrackers with\n"
9799
"simple URL schemes. If your bug tracker can't be described by one\n"
9800
"of the schemes described below then you can write a plugin to support\n"
9801
"it."
9802
msgstr ""
9803
9804
#: en/help_topics/bugs.txt:42
9805
msgid ""
9806
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9807
"variable which contains the base URL of the bug tracker. These options\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9808
"can go into ``breezy.conf``, ``branch.conf`` or into a branch-specific\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9809
"configuration section in ``locations.conf``.  You can set up these values\n"
9810
"for each of the projects you work on."
9811
msgstr ""
9812
9813
#: en/help_topics/bugs.txt:48
9814
msgid ""
9815
"Note: As you provide a short name for each tracker, you can specify one or\n"
9816
"more bugs in one or more trackers at commit time if you wish."
9817
msgstr ""
9818
9819
#: en/help_topics/bugs.txt:51
9820
msgid ""
9821
"Launchpad\n"
9822
"---------"
9823
msgstr ""
9824
9825
#: en/help_topics/bugs.txt:54
9826
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9827
msgstr ""
9828
9829
#: en/help_topics/bugs.txt:56
9830
msgid ""
9831
"bugzilla_<tracker>_url\n"
9832
"----------------------"
9833
msgstr ""
9834
9835
#: en/help_topics/bugs.txt:59
9836
msgid ""
9837
"If present, the location of the Bugzilla bug tracker referred to by\n"
9838
"<tracker>. This option can then be used together with ``bzr commit\n"
9839
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9840
"example::"
9841
msgstr ""
9842
9843
#: en/help_topics/bugs.txt:64
9844
msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
9845
msgstr ""
9846
9847
#: en/help_topics/bugs.txt:66
9848
msgid ""
9849
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9850
"fixed."
9851
msgstr ""
9852
9853
#: en/help_topics/bugs.txt:69
9854
msgid ""
9855
"trac_<tracker>_url\n"
9856
"------------------"
9857
msgstr ""
9858
9859
#: en/help_topics/bugs.txt:72
9860
msgid ""
9861
"If present, the location of the Trac instance referred to by\n"
9862
"<tracker>. This option can then be used together with ``bzr commit\n"
9863
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9864
"example::"
9865
msgstr ""
9866
9867
#: en/help_topics/bugs.txt:77
9868
msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
9869
msgstr ""
9870
9871
#: en/help_topics/bugs.txt:79
9872
msgid ""
9873
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9874
"as\n"
9875
"fixed."
9876
msgstr ""
9877
9878
#: en/help_topics/bugs.txt:82
9879
msgid ""
9880
"bugtracker_<tracker>_url\n"
9881
"------------------------"
9882
msgstr ""
9883
9884
#: en/help_topics/bugs.txt:85
9885
msgid ""
9886
"If present, the location of a generic bug tracker instance referred to by\n"
9887
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9888
"which will be replaced by a specific bug ID. This option can then be used\n"
9889
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9890
"fixed by that commit. For example::"
9891
msgstr ""
9892
9893
#: en/help_topics/bugs.txt:91
9894
msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
9895
msgstr ""
9896
9897
#: en/help_topics/bugs.txt:93
9898
msgid ""
9899
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9900
"Roundup bug tracker as fixed, or::"
9901
msgstr ""
9902
9903
#: en/help_topics/bugs.txt:96
9904
msgid ""
9905
"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9906
msgstr ""
9907
9908
#: en/help_topics/bugs.txt:98
9909
msgid ""
9910
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9911
"RT bug tracker as fixed, or::"
9912
msgstr ""
9913
9914
#: en/help_topics/bugs.txt:101
9915
msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9916
msgstr ""
9917
9918
#: en/help_topics/bugs.txt:103
9919
msgid ""
9920
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9921
"HUDSON-1234\n"
9922
"in Hudson's JIRA bug tracker as fixed.\n"
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:1
9926
msgid ""
9927
"Configuration Settings\n"
9928
"======================="
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:4
9932
msgid ""
9933
"Environment settings\n"
9934
"---------------------"
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:7
9938
msgid ""
9939
"While most configuration is handled by configuration files, some options\n"
9940
"which may be semi-permanent can also be controlled through the environment."
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:10
9944
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9945
"BRZ_EMAIL\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9946
"~~~~~~~~~"
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:13
7185.1.1 by Jelmer Vernooij
Update pot file.
9950
msgid "Override the email id used by Breezy.  Typical format::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9951
msgstr ""
9952
9953
#: en/help_topics/configuration.txt:15
9954
msgid "  \"John Doe <jdoe@example.com>\""
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:17
9958
msgid "See also the ``email`` configuration option."
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:19
9962
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9963
"BRZ_PROGRESS_BAR\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9964
"~~~~~~~~~~~~~~~~"
9965
msgstr ""
9966
9967
#: en/help_topics/configuration.txt:22
9968
msgid ""
9969
"Override the progress display.  Possible values are \"none\" or \"text\".  "
9970
"If\n"
9971
"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
9972
"draws\n"
9973
"the ordinary command line progress bar."
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:26
9977
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9978
"BRZ_SIGQUIT_PDB\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9979
"~~~~~~~~~~~~~~~"
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:29
9983
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:31
9987
msgid ""
9988
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9989
"* 1 = Invoke breakin debugger (default)"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:34
9993
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9994
"BRZ_HOME\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9995
"~~~~~~~~"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:37
7185.1.1 by Jelmer Vernooij
Update pot file.
9999
msgid "Override the home directory used by Breezy."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:39
10003
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10004
"BRZ_SSH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10005
"~~~~~~~"
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:42
10009
msgid "Select a different SSH implementation."
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:44
10013
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10014
"BRZ_PDB\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10015
"~~~~~~~"
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:47
10019
msgid "Control whether to launch a debugger on error."
10020
msgstr ""
10021
10022
#: en/help_topics/configuration.txt:49
10023
msgid ""
10024
"* 0 = Standard behavior\n"
10025
"* 1 = Launch debugger"
10026
msgstr ""
10027
10028
#: en/help_topics/configuration.txt:52
10029
msgid ""
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
10030
"BZR_REMOTE_PATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10031
"~~~~~~~~~~~~~~~"
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:55
7185.1.1 by Jelmer Vernooij
Update pot file.
10035
msgid ""
10036
"Path to the Bazaar or Breezy executable to use when using the bzr+ssh "
10037
"protocol."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:57
10041
msgid "See also the ``bzr_remote_path`` configuration option."
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:59
10045
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10046
"BRZ_EDITOR\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10047
"~~~~~~~~~~"
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:62
7185.1.1 by Jelmer Vernooij
Update pot file.
10051
msgid "Path to the editor Breezy should use for commit messages, etc."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:64
10055
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10056
"BRZ_LOG\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10057
"~~~~~~~"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:67
10061
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10062
"Location of the Breezy log file. You can check the current location by\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10063
"running ``bzr version``."
10064
msgstr ""
10065
10066
#: en/help_topics/configuration.txt:70
10067
msgid ""
10068
"The log file contains debug information that is useful for diagnosing or\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10069
"reporting problems with Breezy."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10070
msgstr ""
10071
10072
#: en/help_topics/configuration.txt:73
10073
msgid ""
10074
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
10075
"will disable logging."
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:76
10079
msgid ""
10080
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10081
"BRZ_PLUGIN_PATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10082
"~~~~~~~~~~~~~~~"
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:80
10086
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10087
"The path to the plugins directory that Breezy should use.\n"
10088
"If not set, Breezy will search for plugins in:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:83
10092
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
10093
msgstr ""
10094
10095
#: en/help_topics/configuration.txt:85
7185.1.1 by Jelmer Vernooij
Update pot file.
10096
msgid "* the breezy directory (containing the ``core`` plugins),"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:87
10100
msgid ""
10101
"* the site specific plugin directory if applicable (containing\n"
10102
"  the ``site`` plugins)."
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:90
10106
msgid ""
10107
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
10108
"the way the plugin are searched. "
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:93
10112
msgid ""
10113
"As for the ``PATH`` variables, if multiple directories are\n"
10114
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
10115
"platform specific appropriate character (':' on Unix,\n"
10116
"';' on windows)"
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:98
10120
msgid ""
10121
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
10122
"in ``user``.  However it will continue to search in ``core`` and\n"
10123
"``site`` unless they are explicitly removed."
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:102
10127
msgid ""
10128
"If you need to change the order or remove one of these\n"
10129
"directories, you should use special values:"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:105
10133
msgid ""
10134
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
10135
"  path from the default values,"
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:108
10139
msgid ""
10140
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
10141
"  before the remaining default values (and also remove it from\n"
10142
"  the default values)."
10143
msgstr ""
10144
10145
#: en/help_topics/configuration.txt:112
10146
msgid ""
10147
"Note that the special values 'user', 'core' and 'site' should be\n"
10148
"used literally, they will be substituted by the corresponding,\n"
10149
"platform specific, values."
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:116
10153
msgid ""
10154
"The examples below use ':' as the separator, windows users\n"
10155
"should use ';'."
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:119
10159
msgid "Overriding the default user plugin directory::"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:121
10163
msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
10164
msgstr ""
10165
10166
#: en/help_topics/configuration.txt:123
10167
msgid "Disabling the site directory while retaining the user directory::"
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:125
10171
msgid "  BZR_PLUGIN_PATH='-site:+user'"
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:127
10175
msgid "Disabling all plugins (better achieved with --no-plugins)::"
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:129
10179
msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
10180
msgstr ""
10181
10182
#: en/help_topics/configuration.txt:131
10183
msgid "Overriding the default site plugin directory::"
10184
msgstr ""
10185
10186
#: en/help_topics/configuration.txt:133
10187
msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:135
10191
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10192
"BRZ_DISABLE_PLUGINS\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10193
"~~~~~~~~~~~~~~~~~~~"
10194
msgstr ""
10195
10196
#: en/help_topics/configuration.txt:138
10197
msgid ""
10198
"Under special circumstances (mostly when trying to diagnose a\n"
10199
"bug), it's better to disable a plugin (or several) rather than\n"
10200
"uninstalling them completely. Such plugins can be specified in\n"
10201
"the ``BZR_DISABLE_PLUGINS`` environment variable."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:143
10205
msgid ""
10206
"In that case, ``bzr`` will stop loading the specified plugins and\n"
10207
"will raise an import error if they are explicitly imported (by\n"
10208
"another plugin that depends on them for example)."
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:147
10212
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
10213
msgstr ""
10214
10215
#: en/help_topics/configuration.txt:149
10216
msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:151
10220
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10221
"BRZ_PLUGINS_AT\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10222
"~~~~~~~~~~~~~~"
10223
msgstr ""
10224
10225
#: en/help_topics/configuration.txt:154
10226
msgid ""
10227
"When adding a new feature or working on a bug in a plugin,\n"
10228
"developers often need to use a specific version of a given\n"
10229
"plugin. Since python requires that the directory containing the\n"
10230
"code is named like the plugin itself this make it impossible to\n"
10231
"use arbitrary directory names (using a two-level directory scheme\n"
10232
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
10233
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
10234
msgstr ""
10235
10236
#: en/help_topics/configuration.txt:162
10237
msgid ""
10238
"Plugins specified in this environment variable takes precedence\n"
10239
"over the ones in ``BZR_PLUGIN_PATH``."
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:165
10243
msgid ""
10244
"The variable specified a list of ``plugin_name@plugin path``,\n"
10245
"``plugin_name`` being the name of the plugin as it appears in\n"
10246
"python module paths, ``plugin_path`` being the path to the\n"
10247
"directory containing the plugin code itself\n"
10248
"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
10249
"separator, use ';' on windows."
10250
msgstr ""
10251
10252
#: en/help_topics/configuration.txt:172
10253
msgid ""
10254
"Example:\n"
10255
"~~~~~~~~"
10256
msgstr ""
10257
10258
#: en/help_topics/configuration.txt:175
10259
msgid ""
10260
"Using a specific version of ``myplugin``:\n"
10261
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:178
10265
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10266
"BRZPATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10267
"~~~~~~~"
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:181
7185.1.1 by Jelmer Vernooij
Update pot file.
10271
msgid "The path where Breezy should look for shell plugin external commands."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:183
10275
msgid ""
10276
"\n"
10277
"http_proxy, https_proxy\n"
10278
"~~~~~~~~~~~~~~~~~~~~~~~"
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:187
10282
msgid "Specifies the network proxy for outgoing connections, for example::"
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:189
10286
msgid ""
10287
"  http_proxy=http://proxy.example.com:3128/ \n"
10288
"  https_proxy=http://proxy.example.com:3128/"
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:192
10292
msgid ""
10293
"\n"
10294
"Configuration files\n"
10295
"-------------------"
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:196
10299
msgid ""
10300
"Location\n"
10301
"~~~~~~~~"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:199
10305
msgid ""
10306
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10307
"``C:\\Documents and Settings\\<username>\\Application Data\\Breezy\\2.0`` "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10308
"on\n"
10309
"Windows. (You can check the location for your system by using\n"
10310
"``bzr version``.)"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:204
10314
msgid "There are three primary configuration files in this location:"
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:206
7185.1.1 by Jelmer Vernooij
Update pot file.
10318
msgid "* ``breezy.conf`` describes default configuration options,"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:208
10322
msgid ""
10323
"* ``locations.conf`` describes configuration information for\n"
10324
"  specific branch locations,"
10325
msgstr ""
10326
10327
#: en/help_topics/configuration.txt:211
10328
msgid ""
10329
"* ``authentication.conf`` describes credential information for\n"
10330
"  remote servers."
10331
msgstr ""
10332
10333
#: en/help_topics/configuration.txt:214
10334
msgid ""
10335
"Each branch can also contain a configuration file that sets values specific\n"
10336
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10337
"the\n"
10338
"branch. This file is visible to all users of a branch, if you wish to "
10339
"override\n"
10340
"one of the values for a branch with a setting that is specific to you then "
10341
"you\n"
10342
"can do so in ``locations.conf``."
10343
msgstr ""
10344
10345
#: en/help_topics/configuration.txt:220
10346
msgid ""
10347
"General format\n"
10348
"~~~~~~~~~~~~~~"
10349
msgstr ""
10350
10351
#: en/help_topics/configuration.txt:223
10352
msgid ""
10353
"An ini file has three types of contructs: section headers, section\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10354
"options and comments."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10355
msgstr ""
10356
10357
#: en/help_topics/configuration.txt:226
10358
msgid ""
10359
"Comments\n"
10360
"^^^^^^^^"
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:229
10364
msgid ""
10365
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10366
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10367
"Breezy when parsing ini files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:233
10371
msgid ""
10372
"Section headers\n"
10373
"^^^^^^^^^^^^^^^"
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:236
10377
msgid ""
10378
"A section header is a word enclosed in brackets that starts at the begining\n"
10379
"of a line.  A typical section header looks like this::"
10380
msgstr ""
10381
10382
#: en/help_topics/configuration.txt:239
10383
msgid "    [DEFAULT]"
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:241
10387
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10388
"The only valid section headers for breezy.conf currently are [DEFAULT] and\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10389
"[ALIASES].  Section headers are case sensitive. The default section provides "
10390
"for\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10391
"setting options which can be overridden with the branch config file."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:245
10395
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10396
"For ``locations.conf``, the options from the section with the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10397
"longest matching section header are used to the exclusion of other\n"
10398
"potentially valid section headers. A section header uses the path for\n"
10399
"the branch as the section header. Some examples include::"
10400
msgstr ""
10401
10402
#: en/help_topics/configuration.txt:250
10403
msgid ""
10404
"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
10405
"    [/home/jdoe/branches/]"
10406
msgstr ""
10407
10408
#: en/help_topics/configuration.txt:253
10409
msgid ""
10410
"\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10411
"Section options\n"
10412
"^^^^^^^^^^^^^^^"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10413
msgstr ""
10414
10415
#: en/help_topics/configuration.txt:257
10416
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10417
"A section option resides within a section. A section option contains an\n"
10418
"option name, an equals sign and a value.  For example::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:260
10422
msgid ""
10423
"    email            = John Doe <jdoe@isp.com>\n"
10424
"    gpg_signing_key  = Amy Pond <amy@example.com>"
10425
msgstr ""
10426
10427
#: en/help_topics/configuration.txt:263
10428
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10429
"A option can reference other options by enclosing them in curly brackets::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10430
msgstr ""
10431
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10432
#: en/help_topics/configuration.txt:265
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10433
msgid ""
10434
"    my_branch_name = feature_x\n"
10435
"    my_server      = bzr+ssh://example.com\n"
10436
"    push_location   = {my_server}/project/{my_branch_name}"
10437
msgstr ""
10438
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10439
#: en/help_topics/configuration.txt:269
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10440
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10441
"Option policies\n"
10442
"^^^^^^^^^^^^^^^"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10443
msgstr ""
10444
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10445
#: en/help_topics/configuration.txt:272
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10446
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10447
"Options defined in a section affect the named directory or URL plus\n"
10448
"any locations they contain.  Policies can be used to change how an\n"
10449
"option value is interpreted for contained locations.  Currently\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10450
"there are three policies available:"
10451
msgstr ""
10452
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10453
#: en/help_topics/configuration.txt:277
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10454
msgid ""
10455
" none:\n"
10456
"   the value is interpreted the same for contained locations.  This is\n"
10457
"   the default behaviour.\n"
10458
" norecurse:\n"
10459
"   the value is only used for the exact location specified by the\n"
10460
"   section name.\n"
10461
" appendpath:\n"
10462
"   for contained locations, any additional path components are\n"
10463
"   appended to the value."
10464
msgstr ""
10465
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10466
#: en/help_topics/configuration.txt:287
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10467
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10468
"Policies are specified by keys with names of the form \"<option_name>:policy"
10469
"\".\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10470
"For example, to define the push location for a tree of branches, the\n"
10471
"following could be used::"
10472
msgstr ""
10473
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10474
#: en/help_topics/configuration.txt:291
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10475
msgid ""
10476
"  [/top/location]\n"
10477
"  push_location = sftp://example.com/location\n"
10478
"  push_location:policy = appendpath"
10479
msgstr ""
10480
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10481
#: en/help_topics/configuration.txt:295
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10482
msgid ""
10483
"With this configuration, the push location for ``/top/location/branch1``\n"
10484
"would be ``sftp://example.com/location/branch1``."
10485
msgstr ""
10486
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10487
#: en/help_topics/configuration.txt:298
10488
msgid ""
10489
"Section local options\n"
10490
"^^^^^^^^^^^^^^^^^^^^^"
10491
msgstr ""
10492
10493
#: en/help_topics/configuration.txt:301
10494
msgid ""
10495
"Some options are defined automatically inside a given section and can be\n"
10496
"refered to in this section only. "
10497
msgstr ""
10498
10499
#: en/help_topics/configuration.txt:304
10500
msgid "For example, the ``appendpath`` policy can be used like this::"
10501
msgstr ""
10502
10503
#: en/help_topics/configuration.txt:306
10504
msgid ""
10505
"  [/home/vila/src/bzr/bugs]\n"
10506
"  mypush = lp:~vila/bzr\n"
10507
"  mypush:policy=appendpath"
10508
msgstr ""
10509
10510
#: en/help_topics/configuration.txt:310
10511
msgid "Using ``relpath`` to achieve the same result is done like this::"
10512
msgstr ""
10513
10514
#: en/help_topics/configuration.txt:312
10515
msgid ""
10516
"  [/home/vila/src/bzr/bugs]\n"
10517
"  mypush = lp:~vila/bzr/{relpath}"
10518
msgstr ""
10519
10520
#: en/help_topics/configuration.txt:315
10521
msgid ""
10522
"In both cases, when used in a directory like\n"
10523
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10524
msgstr ""
10525
6437.2.2 by Vincent Ladeuil
Release 2.5b5
10526
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10527
msgid ""
10528
"   $ bzr config mypush\n"
10529
"   lp:~vila/bzr/832013-expand-in-stack"
10530
msgstr ""
10531
10532
#: en/help_topics/configuration.txt:321
6349.1.1 by Vincent Ladeuil
Release 2.5b4
10533
msgid "Another such option is ``basename`` which can be used like this::"
10534
msgstr ""
10535
10536
#: en/help_topics/configuration.txt:323
10537
msgid ""
10538
"  [/home/vila/src/bzr]\n"
10539
"  mypush = lp:~vila/bzr/{basename}"
10540
msgstr ""
10541
10542
#: en/help_topics/configuration.txt:326
10543
msgid ""
10544
"When used in a directory like\n"
10545
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10546
msgstr ""
10547
10548
#: en/help_topics/configuration.txt:332
10549
msgid ""
10550
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10551
"itself is defined as the relative path between the section name and the\n"
10552
"location it matches."
10553
msgstr ""
10554
10555
#: en/help_topics/configuration.txt:336
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10556
msgid ""
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10557
"Another such option is ``branchname``, which refers to the name of a "
10558
"colocated\n"
10559
"branch.  For non-colocated branches, it behaves like basename.  It can be "
10560
"used\n"
10561
"like this::"
10562
msgstr ""
10563
10564
#: en/help_topics/configuration.txt:340
10565
msgid ""
10566
"  [/home/vila/src/bzr/bugs]\n"
10567
"  mypush = lp:~vila/bzr/{branchname}"
10568
msgstr ""
10569
10570
#: en/help_topics/configuration.txt:343
10571
msgid ""
10572
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10573
"get::"
10574
msgstr ""
10575
10576
#: en/help_topics/configuration.txt:345
10577
msgid ""
10578
"  bzr config mypush\n"
10579
"  lp:~vila/bzr/832013-expand-in-stack"
10580
msgstr ""
10581
10582
#: en/help_topics/configuration.txt:348
10583
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10584
"When an option is local to a Section, it cannot be referred to from option\n"
10585
"values in any other section from the same ``Store`` nor from any other\n"
10586
"``Store``."
10587
msgstr ""
10588
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10589
#: en/help_topics/configuration.txt:352
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10590
msgid ""
10591
"\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10592
"The main configuration file, breezy.conf\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10593
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10594
msgstr ""
10595
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10596
#: en/help_topics/configuration.txt:356
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10597
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10598
"``breezy.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10599
"The default section contains the default\n"
10600
"configuration options for all branches. The default section can be\n"
10601
"overriden by providing a branch-specific section in ``locations.conf``."
10602
msgstr ""
10603
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10604
#: en/help_topics/configuration.txt:361
7185.1.1 by Jelmer Vernooij
Update pot file.
10605
msgid "A typical ``breezy.conf`` section often looks like the following::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10606
msgstr ""
10607
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10608
#: en/help_topics/configuration.txt:363
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10609
msgid ""
10610
"    [DEFAULT]\n"
10611
"    email             = John Doe <jdoe@isp.com>\n"
10612
"    editor            = /usr/bin/vim\n"
10613
"    create_signatures = when-required"
10614
msgstr ""
10615
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10616
#: en/help_topics/configuration.txt:368
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10617
msgid ""
10618
"\n"
10619
"The branch location configuration file, locations.conf\n"
10620
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10621
msgstr ""
10622
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10623
#: en/help_topics/configuration.txt:372
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10624
msgid ""
10625
"``locations.conf`` allows one to specify overriding settings for\n"
10626
"a specific branch. The format is almost identical to the default section in\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10627
"breezy.conf with one significant change: The section header, instead of "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10628
"saying\n"
10629
"default, will be the path to a branch that you wish to override a value\n"
10630
"for. The '?' and '*' wildcards are supported::"
10631
msgstr ""
10632
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10633
#: en/help_topics/configuration.txt:378
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10634
msgid ""
10635
"    [/home/jdoe/branches/nethack]\n"
10636
"    email = Nethack Admin <nethack@nethack.com>"
10637
msgstr ""
10638
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10639
#: en/help_topics/configuration.txt:381
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10640
msgid ""
10641
"    [http://hypothetical.site.com/branches/devel-branch]\n"
10642
"    create_signatures = always"
10643
msgstr ""
10644
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10645
#: en/help_topics/configuration.txt:384
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10646
msgid ""
10647
"The authentication configuration file, authentication.conf\n"
10648
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10649
msgstr ""
10650
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10651
#: en/help_topics/configuration.txt:387
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10652
msgid ""
10653
"``authentication.conf`` allows one to specify credentials for\n"
10654
"remote servers. This can be used for all the supported transports and any "
10655
"part\n"
10656
"of bzr that requires authentication (smtp for example)."
10657
msgstr ""
10658
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10659
#: en/help_topics/configuration.txt:391
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10660
msgid ""
10661
"The syntax of the file obeys the same rules as the others except for the\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10662
"option policies which don't apply."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10663
msgstr ""
10664
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10665
#: en/help_topics/configuration.txt:394
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10666
msgid ""
10667
"For more information on the possible uses of the authentication "
10668
"configuration\n"
10669
"file see :doc:`authentication-help`."
10670
msgstr ""
10671
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10672
#: en/help_topics/configuration.txt:397
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10673
msgid ""
10674
"\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10675
"Common options\n"
10676
"--------------"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10677
msgstr ""
10678
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10679
#: en/help_topics/configuration.txt:401
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10680
msgid ""
10681
"debug_flags\n"
10682
"~~~~~~~~~~~"
10683
msgstr ""
10684
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10685
#: en/help_topics/configuration.txt:404
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10686
msgid ""
10687
"A comma-separated list of debugging options to turn on.  The same values\n"
10688
"can be used as with the -D command-line option (see `help global-options`).\n"
10689
"For example::"
10690
msgstr ""
10691
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10692
#: en/help_topics/configuration.txt:408
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10693
msgid "    debug_flags = hpss"
10694
msgstr ""
10695
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10696
#: en/help_topics/configuration.txt:412
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10697
msgid "    debug_flags = hpss,evil"
10698
msgstr ""
10699
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10700
#: en/help_topics/configuration.txt:414
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10701
msgid ""
10702
"email\n"
10703
"~~~~~"
10704
msgstr ""
10705
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10706
#: en/help_topics/configuration.txt:417
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10707
msgid ""
10708
"The email address to use when committing a branch. Typically takes the form\n"
10709
"of::"
10710
msgstr ""
10711
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10712
#: en/help_topics/configuration.txt:420
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10713
msgid "    email = Full Name <account@hostname.tld>"
10714
msgstr ""
10715
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10716
#: en/help_topics/configuration.txt:422
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10717
msgid ""
10718
"editor\n"
10719
"~~~~~~"
10720
msgstr ""
10721
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10722
#: en/help_topics/configuration.txt:425
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10723
msgid ""
10724
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10725
"a commit message. This setting is trumped by the environment variable\n"
10726
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10727
"variables."
10728
msgstr ""
10729
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10730
#: en/help_topics/configuration.txt:430
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10731
msgid ""
10732
"log_format\n"
10733
"~~~~~~~~~~"
10734
msgstr ""
10735
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10736
#: en/help_topics/configuration.txt:433
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10737
msgid ""
10738
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10739
"and ``line``. Additional formats may be provided by plugins. The default\n"
10740
"value is ``long``."
10741
msgstr ""
10742
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10743
#: en/help_topics/configuration.txt:437
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10744
msgid ""
10745
"check_signatures\n"
10746
"~~~~~~~~~~~~~~~~"
10747
msgstr ""
10748
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10749
#: en/help_topics/configuration.txt:440
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10750
msgid ""
10751
"Reserved for future use.  These options will allow a policy for branches to\n"
10752
"require signatures."
10753
msgstr ""
10754
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10755
#: en/help_topics/configuration.txt:443
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10756
msgid ""
10757
"require\n"
10758
"    The gnupg signature for revisions must be present and must be valid."
10759
msgstr ""
10760
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10761
#: en/help_topics/configuration.txt:446
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10762
msgid ""
10763
"ignore\n"
10764
"    Do not check gnupg signatures of revisions."
10765
msgstr ""
10766
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10767
#: en/help_topics/configuration.txt:449
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10768
msgid ""
10769
"check-available\n"
10770
"    (default) If gnupg signatures for revisions are present, check them.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10771
"    Breezy will fail if it finds a bad signature, but will not fail if\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10772
"    no signature is present."
10773
msgstr ""
10774
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10775
#: en/help_topics/configuration.txt:454
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10776
msgid ""
10777
"create_signatures\n"
10778
"~~~~~~~~~~~~~~~~~"
10779
msgstr ""
10780
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10781
#: en/help_topics/configuration.txt:457
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10782
msgid ""
10783
"Defines the behaviour of signing revisions on commits.  By default bzr will "
10784
"not\n"
10785
"sign new commits."
10786
msgstr ""
10787
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10788
#: en/help_topics/configuration.txt:460
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10789
msgid ""
10790
"always\n"
10791
"    Sign every new revision that is committed.  If the signing fails then "
10792
"the\n"
10793
"    commit will not be made."
10794
msgstr ""
10795
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10796
#: en/help_topics/configuration.txt:464
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10797
msgid ""
10798
"when-required\n"
10799
"    Reserved for future use."
10800
msgstr ""
10801
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10802
#: en/help_topics/configuration.txt:467
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10803
msgid ""
10804
"never\n"
10805
"    Reserved for future use."
10806
msgstr ""
10807
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10808
#: en/help_topics/configuration.txt:470
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10809
msgid ""
10810
"In future it is planned that ``when-required`` will sign newly\n"
10811
"committed revisions only when the branch requires them.  ``never`` will "
10812
"refuse\n"
10813
"to sign newly committed revisions, even if the branch requires signatures."
10814
msgstr ""
10815
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10816
#: en/help_topics/configuration.txt:474
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10817
msgid ""
10818
"dirstate.fdatasync\n"
10819
"~~~~~~~~~~~~~~~~~~"
10820
msgstr ""
10821
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10822
#: en/help_topics/configuration.txt:477
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10823
msgid ""
10824
"If true (default), working tree metadata changes are flushed through the\n"
10825
"OS buffers to physical disk.  This is somewhat slower, but means data\n"
10826
"should not be lost if the machine crashes.  See also repository.fdatasync."
10827
msgstr ""
10828
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10829
#: en/help_topics/configuration.txt:481
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10830
msgid ""
10831
"gpg_signing_key\n"
10832
"~~~~~~~~~~~~~~~"
10833
msgstr ""
10834
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10835
#: en/help_topics/configuration.txt:484
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10836
msgid ""
10837
"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
10838
"address, key fingerprint or full key ID.  When unset or when set to\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10839
"\"default\" Breezy will use the user e-mail set with ``whoami``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10840
msgstr ""
10841
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10842
#: en/help_topics/configuration.txt:488
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10843
msgid ""
10844
"recurse\n"
10845
"~~~~~~~"
10846
msgstr ""
10847
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10848
#: en/help_topics/configuration.txt:491
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10849
msgid ""
10850
"Only useful in ``locations.conf``. Defines whether or not the\n"
10851
"configuration for this section applies to subdirectories:"
10852
msgstr ""
10853
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10854
#: en/help_topics/configuration.txt:494
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10855
msgid ""
10856
"true\n"
10857
"    (default) This section applies to subdirectories as well."
10858
msgstr ""
10859
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10860
#: en/help_topics/configuration.txt:497
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10861
msgid ""
10862
"false\n"
10863
"    This section only applies to the branch at this directory and not\n"
10864
"    branches below it."
10865
msgstr ""
10866
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10867
#: en/help_topics/configuration.txt:501
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10868
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10869
"bzr_remote_path\n"
10870
"~~~~~~~~~~~~~~~"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10871
msgstr ""
10872
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10873
#: en/help_topics/configuration.txt:504
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10874
msgid ""
10875
"(Default: \"bzr\").  The path to the command that should be used to run the "
10876
"smart\n"
10877
"server for bzr.  This value may only be specified in locations.conf, because:"
10878
msgstr ""
10879
7185.1.1 by Jelmer Vernooij
Update pot file.
10880
#: en/help_topics/configuration.txt:507
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10881
msgid ""
10882
"- it's needed before branch.conf is accessible\n"
10883
"- allowing remote branch.conf files to specify commands would be a security\n"
10884
"  risk"
10885
msgstr ""
10886
7185.1.1 by Jelmer Vernooij
Update pot file.
10887
#: en/help_topics/configuration.txt:511
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10888
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10889
msgstr ""
10890
7185.1.1 by Jelmer Vernooij
Update pot file.
10891
#: en/help_topics/configuration.txt:513
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10892
msgid ""
10893
"smtp_server\n"
10894
"~~~~~~~~~~~"
10895
msgstr ""
10896
7185.1.1 by Jelmer Vernooij
Update pot file.
10897
#: en/help_topics/configuration.txt:516
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10898
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10899
"(Default: \"localhost\"). SMTP server to use when Breezy needs to send\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10900
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10901
msgstr ""
10902
7185.1.1 by Jelmer Vernooij
Update pot file.
10903
#: en/help_topics/configuration.txt:519
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10904
msgid ""
10905
"smtp_username, smtp_password\n"
10906
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10907
msgstr ""
10908
7185.1.1 by Jelmer Vernooij
Update pot file.
10909
#: en/help_topics/configuration.txt:522
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10910
msgid ""
10911
"User and password to authenticate to the SMTP server. If smtp_username\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10912
"is set, and smtp_password is not, Breezy will prompt for a password.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10913
"These settings are only needed if the SMTP server requires authentication\n"
10914
"to send mail."
10915
msgstr ""
10916
7185.1.1 by Jelmer Vernooij
Update pot file.
10917
#: en/help_topics/configuration.txt:527
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10918
msgid ""
10919
"locks.steal_dead\n"
10920
"~~~~~~~~~~~~~~~~"
10921
msgstr ""
10922
7185.1.1 by Jelmer Vernooij
Update pot file.
10923
#: en/help_topics/configuration.txt:530
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10924
msgid ""
10925
"If set to true, bzr will automatically break locks held by processes from\n"
10926
"the same machine and user that are no longer alive.  Otherwise, it will\n"
10927
"print a message and you can break the lock manually, if you are satisfied\n"
10928
"the object is no longer in use."
10929
msgstr ""
10930
7185.1.1 by Jelmer Vernooij
Update pot file.
10931
#: en/help_topics/configuration.txt:535
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10932
msgid ""
10933
"mail_client\n"
10934
"~~~~~~~~~~~"
10935
msgstr ""
10936
7185.1.1 by Jelmer Vernooij
Update pot file.
10937
#: en/help_topics/configuration.txt:538
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10938
msgid ""
10939
"A mail client to use for sending merge requests.\n"
10940
"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
10941
"it\n"
10942
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10943
"``editor``."
10944
msgstr ""
10945
7185.1.1 by Jelmer Vernooij
Update pot file.
10946
#: en/help_topics/configuration.txt:543
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10947
msgid "Supported values for specific clients:"
10948
msgstr ""
10949
7185.1.1 by Jelmer Vernooij
Update pot file.
10950
#: en/help_topics/configuration.txt:545
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10951
msgid ""
10952
":claws: Use Claws.  This skips a dialog for attaching files.\n"
10953
":evolution: Use Evolution.\n"
10954
":kmail: Use KMail.\n"
10955
":mutt: Use Mutt.\n"
10956
":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
10957
"1.5,\n"
10958
"    this works around some bugs that xdg-email doesn't handle."
10959
msgstr ""
10960
7185.1.1 by Jelmer Vernooij
Update pot file.
10961
#: en/help_topics/configuration.txt:552
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10962
msgid "Supported generic values are:"
10963
msgstr ""
10964
7185.1.1 by Jelmer Vernooij
Update pot file.
10965
#: en/help_topics/configuration.txt:554
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10966
msgid ""
10967
":default: See above.\n"
10968
":editor: Use your editor to compose the merge request.  This also uses\n"
10969
"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10970
"    smtp_username and smtp_password.\n"
10971
":mapi: Use your preferred e-mail client on Windows.\n"
10972
":xdg-email: Use xdg-email to run your preferred mail program"
10973
msgstr ""
10974
7185.1.1 by Jelmer Vernooij
Update pot file.
10975
#: en/help_topics/configuration.txt:561
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10976
msgid ""
10977
"repository.fdatasync\n"
10978
"~~~~~~~~~~~~~~~~~~~~"
10979
msgstr ""
10980
7185.1.1 by Jelmer Vernooij
Update pot file.
10981
#: en/help_topics/configuration.txt:564
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10982
msgid ""
10983
"If true (default), repository changes are flushed through the OS buffers\n"
10984
"to physical disk.  This is somewhat slower, but means data should not be\n"
10985
"lost if the machine crashes.  See also dirstate.fdatasync."
10986
msgstr ""
10987
7185.1.1 by Jelmer Vernooij
Update pot file.
10988
#: en/help_topics/configuration.txt:568
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10989
msgid ""
10990
"submit_branch\n"
10991
"~~~~~~~~~~~~~"
10992
msgstr ""
10993
7185.1.1 by Jelmer Vernooij
Update pot file.
10994
#: en/help_topics/configuration.txt:571
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10995
msgid ""
10996
"The branch you intend to submit your current work to.  This is "
10997
"automatically\n"
10998
"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
10999
"This\n"
11000
"should usually be set on a per-branch or per-location basis."
11001
msgstr ""
11002
7185.1.1 by Jelmer Vernooij
Update pot file.
11003
#: en/help_topics/configuration.txt:575
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11004
msgid ""
11005
"public_branch\n"
11006
"~~~~~~~~~~~~~"
11007
msgstr ""
11008
7185.1.1 by Jelmer Vernooij
Update pot file.
11009
#: en/help_topics/configuration.txt:578
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11010
msgid ""
11011
"A publically-accessible version of this branch (implying that this version "
11012
"is\n"
11013
"not publically-accessible).  Used (and set) by ``bzr send``."
11014
msgstr ""
11015
7185.1.1 by Jelmer Vernooij
Update pot file.
11016
#: en/help_topics/configuration.txt:581
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11017
msgid ""
11018
"suppress_warnings\n"
11019
"~~~~~~~~~~~~~~~~~"
11020
msgstr ""
11021
7185.1.1 by Jelmer Vernooij
Update pot file.
11022
#: en/help_topics/configuration.txt:584
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11023
msgid ""
11024
"A list of strings, each string represent a warning that can be emitted by\n"
11025
"bzr. Mentioning a warning in this list tells bzr to not emit it."
11026
msgstr ""
11027
7185.1.1 by Jelmer Vernooij
Update pot file.
11028
#: en/help_topics/configuration.txt:587
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11029
msgid "Valid values:"
11030
msgstr ""
11031
7185.1.1 by Jelmer Vernooij
Update pot file.
11032
#: en/help_topics/configuration.txt:589
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11033
msgid ""
11034
"* ``format_deprecation``:\n"
11035
"    whether the format deprecation warning is shown on repositories that "
11036
"are\n"
11037
"    using deprecated formats."
11038
msgstr ""
11039
7185.1.1 by Jelmer Vernooij
Update pot file.
11040
#: en/help_topics/configuration.txt:593
11041
msgid ""
11042
"* ``insecure_permissions``:\n"
11043
"    whether a warning is shown if ``authentication.conf`` can be read\n"
11044
"    by other users."
11045
msgstr ""
11046
11047
#: en/help_topics/configuration.txt:597
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11048
msgid ""
11049
"default_format\n"
11050
"~~~~~~~~~~~~~~"
11051
msgstr ""
11052
7185.1.1 by Jelmer Vernooij
Update pot file.
11053
#: en/help_topics/configuration.txt:600
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11054
msgid ""
11055
"A format name for the default format used when creating branches.  See "
11056
"``bzr\n"
11057
"help formats`` for possible values."
11058
msgstr ""
11059
7185.1.1 by Jelmer Vernooij
Update pot file.
11060
#: en/help_topics/configuration.txt:603
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11061
msgid ""
11062
"\n"
11063
"Unicode options\n"
11064
"---------------"
11065
msgstr ""
11066
7185.1.1 by Jelmer Vernooij
Update pot file.
11067
#: en/help_topics/configuration.txt:607
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11068
msgid ""
11069
"output_encoding\n"
11070
"~~~~~~~~~~~~~~~"
11071
msgstr ""
11072
7185.1.1 by Jelmer Vernooij
Update pot file.
11073
#: en/help_topics/configuration.txt:610
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11074
msgid ""
11075
"A Python unicode encoding name for text output from bzr, such as log\n"
11076
"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
11077
"is the terminal encoding prefered by the operating system."
11078
msgstr ""
11079
7185.1.1 by Jelmer Vernooij
Update pot file.
11080
#: en/help_topics/configuration.txt:614
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11081
msgid ""
11082
"\n"
11083
"Branch type specific options\n"
11084
"----------------------------"
11085
msgstr ""
11086
7185.1.1 by Jelmer Vernooij
Update pot file.
11087
#: en/help_topics/configuration.txt:618
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11088
msgid ""
11089
"These options apply only to branches that use the ``dirstate-tags`` or\n"
11090
"later format.  They\n"
11091
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11092
"manually set in ``locations.conf`` or ``breezy.conf``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11093
msgstr ""
11094
7185.1.1 by Jelmer Vernooij
Update pot file.
11095
#: en/help_topics/configuration.txt:623
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11096
msgid ""
11097
"append_revisions_only\n"
11098
"~~~~~~~~~~~~~~~~~~~~~"
11099
msgstr ""
11100
7185.1.1 by Jelmer Vernooij
Update pot file.
11101
#: en/help_topics/configuration.txt:626
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11102
msgid ""
11103
"If set to \"True\" then revisions can only be appended to the log, not\n"
11104
"removed.  A branch with this setting enabled can only pull from another\n"
11105
"branch if the other branch's log is a longer version of its own.  This is\n"
11106
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
11107
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
11108
"compatibility with previous bzr versions (older than 2.2)."
11109
msgstr ""
11110
7185.1.1 by Jelmer Vernooij
Update pot file.
11111
#: en/help_topics/configuration.txt:633
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11112
msgid ""
11113
"parent_location\n"
11114
"~~~~~~~~~~~~~~~"
11115
msgstr ""
11116
7185.1.1 by Jelmer Vernooij
Update pot file.
11117
#: en/help_topics/configuration.txt:636
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11118
msgid ""
11119
"If present, the location of the default branch for pull or merge.  This "
11120
"option\n"
11121
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
11122
"--remember``."
11123
msgstr ""
11124
7185.1.1 by Jelmer Vernooij
Update pot file.
11125
#: en/help_topics/configuration.txt:640
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11126
msgid ""
11127
"push_location\n"
11128
"~~~~~~~~~~~~~"
11129
msgstr ""
11130
7185.1.1 by Jelmer Vernooij
Update pot file.
11131
#: en/help_topics/configuration.txt:643
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11132
msgid ""
11133
"If present, the location of the default branch for push.  This option\n"
11134
"is normally set by the first ``push`` or ``push --remember``."
11135
msgstr ""
11136
7185.1.1 by Jelmer Vernooij
Update pot file.
11137
#: en/help_topics/configuration.txt:646
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11138
msgid ""
11139
"push_strict\n"
11140
"~~~~~~~~~~~"
11141
msgstr ""
11142
7185.1.1 by Jelmer Vernooij
Update pot file.
11143
#: en/help_topics/configuration.txt:649
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11144
msgid ""
11145
"If present, defines the ``--strict`` option default value for checking\n"
11146
"uncommitted changes before pushing."
11147
msgstr ""
11148
7185.1.1 by Jelmer Vernooij
Update pot file.
11149
#: en/help_topics/configuration.txt:652
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11150
msgid ""
11151
"bound_location\n"
11152
"~~~~~~~~~~~~~~"
11153
msgstr ""
11154
7185.1.1 by Jelmer Vernooij
Update pot file.
11155
#: en/help_topics/configuration.txt:655
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11156
msgid ""
11157
"The location that commits should go to when acting as a checkout.\n"
11158
"This option is normally set by ``bind``."
11159
msgstr ""
11160
7185.1.1 by Jelmer Vernooij
Update pot file.
11161
#: en/help_topics/configuration.txt:658
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11162
msgid ""
11163
"bound\n"
11164
"~~~~~"
11165
msgstr ""
11166
7185.1.1 by Jelmer Vernooij
Update pot file.
11167
#: en/help_topics/configuration.txt:661
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11168
msgid ""
11169
"If set to \"True\", the branch should act as a checkout, and push each "
11170
"commit to\n"
11171
"the bound_location.  This option is normally set by ``bind``/``unbind``."
11172
msgstr ""
11173
7185.1.1 by Jelmer Vernooij
Update pot file.
11174
#: en/help_topics/configuration.txt:664
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11175
msgid ""
11176
"send_strict\n"
11177
"~~~~~~~~~~~"
11178
msgstr ""
11179
7185.1.1 by Jelmer Vernooij
Update pot file.
11180
#: en/help_topics/configuration.txt:667
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11181
msgid ""
11182
"If present, defines the ``--strict`` option default value for checking\n"
11183
"uncommitted changes before sending a merge directive."
11184
msgstr ""
11185
7185.1.1 by Jelmer Vernooij
Update pot file.
11186
#: en/help_topics/configuration.txt:670
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11187
msgid ""
11188
"add.maximum_file_size\n"
11189
"~~~~~~~~~~~~~~~~~~~~~"
11190
msgstr ""
11191
7185.1.1 by Jelmer Vernooij
Update pot file.
11192
#: en/help_topics/configuration.txt:673
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11193
msgid ""
11194
"Defines the maximum file size the command line \"add\" operation will allow\n"
11195
"in recursive mode, with files larger than this value being skipped. You "
11196
"may \n"
11197
"specify this value as an integer (in which case it is interpreted as "
11198
"bytes), \n"
11199
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
11200
"0 \n"
11201
"will disable skipping."
11202
msgstr ""
11203
7185.1.1 by Jelmer Vernooij
Update pot file.
11204
#: en/help_topics/configuration.txt:679
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11205
msgid ""
11206
"External Merge Tools\n"
11207
"--------------------"
11208
msgstr ""
11209
7185.1.1 by Jelmer Vernooij
Update pot file.
11210
#: en/help_topics/configuration.txt:682
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11211
msgid ""
11212
"bzr.mergetool.<name>\n"
11213
"~~~~~~~~~~~~~~~~~~~~"
11214
msgstr ""
11215
7185.1.1 by Jelmer Vernooij
Update pot file.
11216
#: en/help_topics/configuration.txt:685
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11217
msgid ""
11218
"Defines an external merge tool called <name> with the given command-line.\n"
11219
"Arguments containing spaces should be quoted using single or double quotes. "
11220
"The\n"
11221
"executable may omit its path if it can be found on the PATH."
11222
msgstr ""
11223
7185.1.1 by Jelmer Vernooij
Update pot file.
11224
#: en/help_topics/configuration.txt:689
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11225
msgid ""
11226
"The following markers can be used in the command-line to substitute "
11227
"filenames\n"
11228
"involved in the merge conflict::"
11229
msgstr ""
11230
7185.1.1 by Jelmer Vernooij
Update pot file.
11231
#: en/help_topics/configuration.txt:692
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11232
msgid ""
11233
"  {base}      file.BASE\n"
11234
"  {this}      file.THIS\n"
11235
"  {other}     file.OTHER\n"
11236
"  {result}    output file\n"
11237
"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
11238
"merge\n"
11239
"              succeeds."
11240
msgstr ""
11241
7185.1.1 by Jelmer Vernooij
Update pot file.
11242
#: en/help_topics/configuration.txt:701
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11243
msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11244
msgstr ""
11245
7185.1.1 by Jelmer Vernooij
Update pot file.
11246
#: en/help_topics/configuration.txt:703
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11247
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
11248
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
11249
"interpolation markers, trying to display the mergetool line results in the\n"
11250
"following problem::"
11251
msgstr ""
11252
7185.1.1 by Jelmer Vernooij
Update pot file.
11253
#: en/help_topics/configuration.txt:707
6581.1.2 by Vincent Ladeuil
Update translation template.
11254
msgid ""
11255
"\n"
11256
"  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
11257
"{result}'\n"
11258
"  $ bzr config bzr.mergetool.kdiff3\n"
11259
"  bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
11260
"{this} {other} -o {result}\"."
11261
msgstr ""
11262
7185.1.1 by Jelmer Vernooij
Update pot file.
11263
#: en/help_topics/configuration.txt:712
6581.1.2 by Vincent Ladeuil
Update translation template.
11264
msgid ""
11265
"To avoid this, ``config`` can be instructed not to try expanding variables::"
11266
msgstr ""
11267
7185.1.1 by Jelmer Vernooij
Update pot file.
11268
#: en/help_topics/configuration.txt:714
6581.1.2 by Vincent Ladeuil
Update translation template.
11269
msgid ""
11270
"  $ bzr config --all bzr.mergetool.kdiff3\n"
11271
"  branch:\n"
11272
"    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11273
msgstr ""
11274
7185.1.1 by Jelmer Vernooij
Update pot file.
11275
#: en/help_topics/configuration.txt:718
6581.1.2 by Vincent Ladeuil
Update translation template.
11276
msgid ""
11277
"\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11278
"bzr.default_mergetool\n"
11279
"~~~~~~~~~~~~~~~~~~~~~"
11280
msgstr ""
11281
7185.1.1 by Jelmer Vernooij
Update pot file.
11282
#: en/help_topics/configuration.txt:722
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11283
msgid ""
11284
"Specifies which external merge tool (as defined above) should be selected "
11285
"by\n"
11286
"default in tools such as ``bzr qconflicts``."
11287
msgstr ""
11288
7185.1.1 by Jelmer Vernooij
Update pot file.
11289
#: en/help_topics/configuration.txt:727
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11290
msgid "  bzr.default_mergetool = kdiff3\n"
11291
msgstr ""
11292
11293
#: en/help_topics/conflict-types.txt:1
11294
msgid ""
11295
"Conflict Types\n"
11296
"=============="
11297
msgstr ""
11298
11299
#: en/help_topics/conflict-types.txt:4
11300
msgid ""
11301
"Some operations, like merge, revert and pull, modify the contents of your\n"
11302
"working tree.  These modifications are programmatically generated, and so "
11303
"they\n"
11304
"may conflict with the current state of your working tree. "
11305
msgstr ""
11306
11307
#: en/help_topics/conflict-types.txt:8
11308
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11309
"When conflicts are present in your working tree (as shown by ``brz\n"
11310
"conflicts``), you should resolve them and then inform brz that the "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11311
"conflicts\n"
11312
"have been resolved."
11313
msgstr ""
11314
11315
#: en/help_topics/conflict-types.txt:12
11316
msgid ""
11317
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11318
"should resolve them is not the one responsible for their occurrence, as is "
11319
"the\n"
11320
"case when merging other people's work or because some conflicts are "
11321
"presented\n"
11322
"in a way that is not easy to understand."
11323
msgstr ""
11324
11325
#: en/help_topics/conflict-types.txt:17
11326
msgid ""
11327
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11328
"conflict if and only if there's an actual conceptual conflict in the source\n"
11329
"tree.  Because Bazaar doesn't understand the real meaning of the files "
11330
"being\n"
11331
"versioned, it can, when faced with ambiguities, fall short in either "
11332
"direction\n"
11333
"trying to resolve the conflict itself. Many kinds of changes can be "
11334
"combined\n"
11335
"programmatically, but sometimes only a human can determine the right thing "
11336
"to\n"
11337
"do."
11338
msgstr ""
11339
11340
#: en/help_topics/conflict-types.txt:25
11341
msgid ""
11342
"When Bazaar generates a conflict, it adds information into the working tree "
11343
"to\n"
11344
"present the conflicting versions, and it's up to you to find the correct\n"
11345
"resolution."
11346
msgstr ""
11347
11348
#: en/help_topics/conflict-types.txt:29
11349
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11350
msgstr ""
11351
11352
#: en/help_topics/conflict-types.txt:31
11353
msgid ""
11354
"1. Modify the working tree content so that the conflicted item is now in "
11355
"the\n"
11356
"   state you want to keep, then"
11357
msgstr ""
11358
11359
#: en/help_topics/conflict-types.txt:34
11360
msgid ""
11361
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11362
"   remaining generated information (``brz resolve <item>``)."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11363
msgstr ""
11364
11365
#: en/help_topics/conflict-types.txt:37
11366
msgid ""
11367
"For most conflict types, there are some obvious ways to modify the working\n"
11368
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11369
"itself already made a choice, when possible."
11370
msgstr ""
11371
11372
#: en/help_topics/conflict-types.txt:41
11373
msgid ""
11374
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11375
"different ways to resolve the conflict."
11376
msgstr ""
11377
11378
#: en/help_topics/conflict-types.txt:44
11379
msgid ""
11380
"Each type of conflict is explained below, and the action which must be done "
11381
"to\n"
11382
"resolve the conflict is outlined."
11383
msgstr ""
11384
11385
#: en/help_topics/conflict-types.txt:47
11386
msgid ""
11387
"Various actions are available depending on the kind of conflict, for some "
11388
"of\n"
11389
"these actions, Bazaar can provide some help. In the end you should at least\n"
11390
"inform Bazaar that you're done with the conflict with::"
11391
msgstr ""
11392
11393
#: en/help_topics/conflict-types.txt:51
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11394
msgid "  ``brz resolve FILE --action=done'"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11395
msgstr ""
11396
11397
#: en/help_topics/conflict-types.txt:53
11398
msgid ""
11399
"Note that this is the default action when a single file is involved so you "
11400
"can\n"
11401
"simply use::"
11402
msgstr ""
11403
11404
#: en/help_topics/conflict-types.txt:56
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11405
msgid "   ``brz resolve FILE``"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11406
msgstr ""
11407
11408
#: en/help_topics/conflict-types.txt:58
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11409
msgid "See ``brz help resolve`` for more details."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11410
msgstr ""
11411
11412
#: en/help_topics/conflict-types.txt:60
11413
msgid ""
11414
"Text conflicts\n"
11415
"--------------"
11416
msgstr ""
11417
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11418
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11419
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11420
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11421
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11422
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11423
msgid "Typical message::"
11424
msgstr ""
11425
11426
#: en/help_topics/conflict-types.txt:65
11427
msgid "  Text conflict in FILE"
11428
msgstr ""
11429
11430
#: en/help_topics/conflict-types.txt:67
11431
msgid ""
11432
"These are produced when a text merge cannot completely reconcile two sets "
11433
"of\n"
11434
"text changes.  Bazaar will emit files for each version with the extensions\n"
11435
"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
11436
"tree,\n"
11437
"i.e. the tree that you are merging changes into.  OTHER is the version that "
11438
"you\n"
11439
"are merging into the target.  BASE is an older version that is used as a "
11440
"basis\n"
11441
"for comparison."
11442
msgstr ""
11443
11444
#: en/help_topics/conflict-types.txt:74
11445
msgid ""
11446
"In the main copy of the file, Bazaar will include all the changes that it\n"
11447
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11448
"\"herringbone\" markers like ``<<<<<<<``."
11449
msgstr ""
11450
11451
#: en/help_topics/conflict-types.txt:78
11452
msgid ""
11453
"Say the initial text is \"The project leader released it.\", and THIS "
11454
"modifies it\n"
11455
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11456
"leader\n"
11457
"released Bazaar.\"  A conflict would look like this::"
11458
msgstr ""
11459
11460
#: en/help_topics/conflict-types.txt:82
11461
msgid ""
11462
"  <<<<<<< TREE\n"
11463
"  Martin Pool released it.\n"
11464
"  =======\n"
11465
"  The project leader released Bazaar.\n"
11466
"  >>>>>>> MERGE-SOURCE"
11467
msgstr ""
11468
11469
#: en/help_topics/conflict-types.txt:88
11470
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11471
msgstr ""
11472
11473
#: en/help_topics/conflict-types.txt:90
11474
msgid ""
11475
"You can handle text conflicts either by editing the main copy of the file,\n"
11476
"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
11477
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11478
"set of changes over the other (but see below when you encounter these\n"
11479
"cases).  More often, the two sets of changes must be intelligently combined."
11480
msgstr ""
11481
11482
#: en/help_topics/conflict-types.txt:96
11483
msgid ""
11484
"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
11485
"you are done editing, the file should look like it never had a conflict, and "
11486
"be\n"
11487
"ready to commit."
11488
msgstr ""
11489
11490
#: en/help_topics/conflict-types.txt:100
11491
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11492
"When you have resolved text conflicts, just run ``brz resolve --auto``, and\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11493
"Bazaar will auto-detect which conflicts you have resolved."
11494
msgstr ""
11495
11496
#: en/help_topics/conflict-types.txt:103
11497
msgid ""
11498
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11499
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11500
"working tree."
11501
msgstr ""
11502
11503
#: en/help_topics/conflict-types.txt:107
11504
msgid ""
11505
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11506
"When you want to pick one set of changes over the other, you can use ``brz\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11507
"resolve`` with one of the following actions:"
11508
msgstr ""
11509
11510
#: en/help_topics/conflict-types.txt:111
11511
msgid ""
11512
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11513
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11514
msgstr ""
11515
11516
#: en/help_topics/conflict-types.txt:114
11517
msgid ""
11518
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11519
"modifications will be taken into account."
11520
msgstr ""
11521
11522
#: en/help_topics/conflict-types.txt:117
11523
msgid ""
11524
"Content conflicts\n"
11525
"-----------------"
11526
msgstr ""
11527
11528
#: en/help_topics/conflict-types.txt:122
11529
msgid "  Contents conflict in FILE"
11530
msgstr ""
11531
11532
#: en/help_topics/conflict-types.txt:124
11533
msgid ""
11534
"This conflict happens when there are conflicting changes in the working "
11535
"tree\n"
11536
"and the merge source, but the conflicted items are not text files.  They "
11537
"may\n"
11538
"be binary files, or symlinks, or directories.  It can even happen with "
11539
"files\n"
11540
"that are deleted on one side, and modified on the other."
11541
msgstr ""
11542
11543
#: en/help_topics/conflict-types.txt:129
11544
msgid ""
11545
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
11546
"be\n"
11547
"regular files, symlinks or directories).  But it will not include a \"main "
11548
"copy\"\n"
11549
"of the file with herringbone conflict markers.  It will appear that the "
11550
"\"main\n"
11551
"copy\" has been renamed to THIS or OTHER."
11552
msgstr ""
11553
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11554
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11555
msgid ""
11556
"To resolve that kind of conflict, you should rebuild FILE from either "
11557
"version\n"
11558
"or a combination of both."
11559
msgstr ""
11560
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11561
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11562
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11563
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11564
#: en/help_topics/conflict-types.txt:361
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11565
msgid "``brz resolve`` recognizes the following actions:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11566
msgstr ""
11567
11568
#: en/help_topics/conflict-types.txt:139
11569
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11570
"* ``--action=take-this`` will issue ``brz mv FILE.THIS FILE``,\n"
11571
"* ``--action=take-other`` will issue ``brz mv FILE.OTHER FILE``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11572
"* ``--action=done`` will just mark the conflict as resolved."
11573
msgstr ""
11574
11575
#: en/help_topics/conflict-types.txt:143
11576
msgid ""
11577
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11578
"and\n"
11579
"``.OTHER`` files if they are still present in the working tree."
11580
msgstr ""
11581
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11582
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11583
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11584
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11585
#: en/help_topics/conflict-types.txt:369
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11586
msgid ""
11587
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11588
msgstr ""
11589
11590
#: en/help_topics/conflict-types.txt:148
11591
msgid ""
11592
"Tag conflicts\n"
11593
"-------------"
11594
msgstr ""
11595
11596
#: en/help_topics/conflict-types.txt:153
11597
msgid ""
11598
"  Conflicting tags:\n"
11599
"      version-0.1"
11600
msgstr ""
11601
11602
#: en/help_topics/conflict-types.txt:156
11603
msgid ""
11604
"When pulling from or pushing to another branch, Bazaar informs you about "
11605
"tags\n"
11606
"that conflict between the two branches; that is the same tag points to two\n"
11607
"different revisions.  You need not resolve these conflicts, but subsequent\n"
11608
"uses of pull or push will result in the same message."
11609
msgstr ""
11610
11611
#: en/help_topics/conflict-types.txt:161
11612
msgid ""
11613
"To resolve the conflict, you must apply the correct tags to either the "
11614
"target\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11615
"branch or the source branch as appropriate.  Use \"brz tags --show-ids -d\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11616
"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
11617
"target branch's tags match the source branch, then in the target branch do\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11618
"``brz tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11619
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11620
"source\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11621
"branch.  You need not call \"brz resolve\" after doing this.  To resolve in\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11622
"favor of the target branch, you need to similarly use ``tag --force`` in "
11623
"the\n"
11624
"source branch.  (Note that pulling or pushing using --overwrite will "
11625
"overwrite\n"
11626
"all tags as well.)"
11627
msgstr ""
11628
11629
#: en/help_topics/conflict-types.txt:172
11630
msgid ""
11631
"Duplicate paths\n"
11632
"---------------"
11633
msgstr ""
11634
11635
#: en/help_topics/conflict-types.txt:177
11636
msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
11637
msgstr ""
11638
11639
#: en/help_topics/conflict-types.txt:179
11640
msgid ""
11641
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11642
"already been used.  The existing file will be renamed to \"FILE.moved\".  "
11643
msgstr ""
11644
11645
#: en/help_topics/conflict-types.txt:187
11646
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11647
"* ``--action=take-this`` will issue ``brz rm FILE ; brz mv FILE.moved "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11648
"FILE``,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11649
"* ``--action=take-other`` will issue ``brz rm FILE.moved``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11650
"* ``--action=done`` will just mark the conflict as resolved."
11651
msgstr ""
11652
11653
#: en/help_topics/conflict-types.txt:191
11654
msgid ""
11655
"Note that you must get rid of FILE.moved before using ``--action=done``."
11656
msgstr ""
11657
11658
#: en/help_topics/conflict-types.txt:195
11659
msgid ""
11660
"Unversioned parent\n"
11661
"------------------"
11662
msgstr ""
11663
11664
#: en/help_topics/conflict-types.txt:200
11665
msgid "    Conflict because FILE is not versioned, but has versioned children."
11666
msgstr ""
11667
11668
#: en/help_topics/conflict-types.txt:202
11669
msgid ""
11670
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11671
"not\n"
11672
"versioned.  This happens when the directory has been deleted in the target,\n"
11673
"but has a new child in the source, or vice versa.  In this situation, "
11674
"Bazaar\n"
11675
"will version the parent directory as well.  Resolving this issue depends\n"
11676
"very much on the particular scenario.  You may wish to rename or delete "
11677
"either\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11678
"the file or the directory.  When you are satisfied, you can run \"brz "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11679
"resolve\n"
11680
"FILE\" to mark the conflict as resolved."
11681
msgstr ""
11682
11683
#: en/help_topics/conflict-types.txt:210
11684
msgid ""
11685
"Missing parent\n"
11686
"--------------"
11687
msgstr ""
11688
11689
#: en/help_topics/conflict-types.txt:215
11690
msgid "  Conflict adding files to FILE.  Created directory."
11691
msgstr ""
11692
11693
#: en/help_topics/conflict-types.txt:217
11694
msgid ""
11695
"This happens when a directory has been deleted in the target, but has new\n"
11696
"children in the source.  This is similar to the \"unversioned parent\" "
11697
"conflict,\n"
11698
"except that the parent directory does not *exist*, instead of just being\n"
11699
"unversioned.  In this situation, Bazaar will create the missing parent.\n"
11700
"Resolving this issue depends very much on the particular scenario."
11701
msgstr ""
11702
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11703
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11704
msgid ""
11705
"To resolve that kind of conflict, you should either remove or rename the\n"
11706
"children or the directory or a combination of both."
11707
msgstr ""
11708
11709
#: en/help_topics/conflict-types.txt:228
11710
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11711
"* ``--action=take-this`` will issue ``brz rm directory`` including the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11712
"  children,\n"
11713
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11714
"children\n"
11715
"  and restoring the directory,\n"
11716
"* ``--action=done`` will just mark the conflict as resolved."
11717
msgstr ""
11718
11719
#: en/help_topics/conflict-types.txt:236
11720
msgid ""
11721
"Deleting parent\n"
11722
"---------------"
11723
msgstr ""
11724
11725
#: en/help_topics/conflict-types.txt:241
11726
msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
11727
msgstr ""
11728
11729
#: en/help_topics/conflict-types.txt:243
11730
msgid ""
11731
"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
11732
"source, but has new children in the target (either because a directory\n"
11733
"deletion is merged or because the merge introduce new children).  Bazaar\n"
11734
"will retain the directory.  Resolving this issue depends very much on the\n"
11735
"particular scenario."
11736
msgstr ""
11737
11738
#: en/help_topics/conflict-types.txt:254
11739
msgid ""
11740
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11741
"directory,"
11742
msgstr ""
11743
11744
#: en/help_topics/conflict-types.txt:256
11745
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11746
"* ``--action=take-other`` will issue ``brz rm directory`` including the \n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11747
"  children,"
11748
msgstr ""
11749
11750
#: en/help_topics/conflict-types.txt:259
11751
msgid "* ``--action=done`` will just mark the conflict as resolved."
11752
msgstr ""
11753
11754
#: en/help_topics/conflict-types.txt:261
11755
msgid ""
11756
"Note that when merging a directory deletion, if unversioned files are\n"
11757
"present, they become potential orphans has they don't have a directory\n"
11758
"parent anymore."
11759
msgstr ""
11760
11761
#: en/help_topics/conflict-types.txt:265
11762
msgid ""
11763
"Handling such orphans, *before* the conflict is created, is controlled by\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11764
"setting the ``brz.transform.orphan_policy`` configuration option."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11765
msgstr ""
11766
11767
#: en/help_topics/conflict-types.txt:268
11768
msgid "There are two possible values for this option:"
11769
msgstr ""
11770
11771
#: en/help_topics/conflict-types.txt:270
11772
msgid ""
11773
"* ``conflict`` (the default): will leave the orphans in place and\n"
11774
"  generate a conflicts,"
11775
msgstr ""
11776
11777
#: en/help_topics/conflict-types.txt:273
11778
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11779
"* ``move``: will move the orphans to a ``brz-orphans`` directory at the "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11780
"root\n"
11781
"  of the working tree with names like ``<file>.~#~``."
11782
msgstr ""
11783
11784
#: en/help_topics/conflict-types.txt:278
11785
msgid ""
11786
"Path conflict\n"
11787
"-------------"
11788
msgstr ""
11789
11790
#: en/help_topics/conflict-types.txt:283
11791
msgid "  Path conflict: PATH1 / PATH2"
11792
msgstr ""
11793
11794
#: en/help_topics/conflict-types.txt:285
11795
msgid ""
11796
"This happens when the source and target have each modified the name or "
11797
"parent\n"
11798
"directory of a file.  Bazaar will use the path elements from the source."
11799
msgstr ""
11800
11801
#: en/help_topics/conflict-types.txt:288
11802
msgid ""
11803
"To resolve that kind of conflict, you just have to decide what name should "
11804
"be\n"
11805
"retained for the file involved."
11806
msgstr ""
11807
11808
#: en/help_topics/conflict-types.txt:293
11809
msgid ""
11810
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11811
"  issuing ``brz mv PATH2 PATH1``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11812
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11813
"``PATH2``,\n"
11814
"* ``--action=done`` will just mark the conflict as resolved."
11815
msgstr ""
11816
11817
#: en/help_topics/conflict-types.txt:300
11818
msgid ""
11819
"Parent loop\n"
11820
"-----------"
11821
msgstr ""
11822
11823
#: en/help_topics/conflict-types.txt:305
11824
msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
11825
msgstr ""
11826
11827
#: en/help_topics/conflict-types.txt:307
11828
msgid ""
11829
"This happens when the source and the target have each moved directories, so\n"
11830
"that, if the change could be applied, a directory would be contained by "
11831
"itself.\n"
11832
"For example::"
11833
msgstr ""
11834
11835
#: en/help_topics/conflict-types.txt:311
11836
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11837
"  $ brz init\n"
11838
"  $ brz mkdir white\n"
11839
"  $ brz mkdir black\n"
11840
"  $ brz commit -m \"BASE\"\n"
11841
"  $ brz branch . ../other\n"
11842
"  $ brz mv white black\n"
11843
"  $ brz commit -m \"THIS\"\n"
11844
"  $ brz mv ../other/black ../other/white\n"
11845
"  $ brz commit ../other -m \"OTHER\"\n"
11846
"  $ brz merge ../other"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11847
msgstr ""
11848
11849
#: en/help_topics/conflict-types.txt:322
11850
msgid ""
11851
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11852
"``black``.  To resolve that kind of conflict, you just have to decide what\n"
11853
"name should be retained for the directories involved."
11854
msgstr ""
11855
11856
#: en/help_topics/conflict-types.txt:328
11857
msgid ""
11858
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11859
"``white`` \n"
11860
"  in ``black``,\n"
11861
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11862
"   ``white`` by issuing ``brz mv black/white white ; brz mv black white``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11863
"* ``--action=done`` will just mark the conflict as resolved."
11864
msgstr ""
11865
11866
#: en/help_topics/conflict-types.txt:336
11867
msgid ""
11868
"Non-directory parent\n"
11869
"--------------------"
11870
msgstr ""
11871
11872
#: en/help_topics/conflict-types.txt:341
11873
msgid ""
11874
"  Conflict: foo.new is not a directory, but has files in it.\n"
11875
"  Created directory."
11876
msgstr ""
11877
11878
#: en/help_topics/conflict-types.txt:344
11879
msgid ""
11880
"This happens when one side has added files to a directory, and the other "
11881
"side\n"
11882
"has changed the directory into a file or symlink.  For example::"
11883
msgstr ""
11884
11885
#: en/help_topics/conflict-types.txt:347
11886
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11887
"  $ brz init\n"
11888
"  $ brz mkdir foo\n"
11889
"  $ brz commit -m \"BASE\"\n"
11890
"  $ brz branch . ../other\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11891
"  $ rmdir foo\n"
11892
"  $ touch foo\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11893
"  $ brz commit -m \"THIS\"\n"
11894
"  $ brz mkdir ../other/foo/bar\n"
11895
"  $ brz commit ../other -m \"OTHER\"\n"
11896
"  $ brz merge ../other"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11897
msgstr ""
11898
11899
#: en/help_topics/conflict-types.txt:358
11900
msgid ""
11901
"To resolve that kind of conflict, you have to decide what name should be\n"
11902
"retained for the file, directory or symlink involved."
11903
msgstr ""
11904
11905
#: en/help_topics/conflict-types.txt:363
11906
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11907
"* ``--action=take-this`` will issue ``brz rm --force foo.new`` and \n"
11908
"  ``brz add foo``,\n"
11909
"* ``--action=take-other`` will issue ``brz rm --force foo`` and \n"
11910
"  ``brz mv foo.new foo``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11911
"* ``--action=done`` will just mark the conflict as resolved."
11912
msgstr ""
11913
11914
#: en/help_topics/conflict-types.txt:371
11915
msgid ""
11916
"MalformedTransform\n"
11917
"------------------"
11918
msgstr ""
11919
11920
#: en/help_topics/conflict-types.txt:374
11921
msgid ""
11922
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11923
"exception.  This means that Bazaar encountered a filesystem conflict that it "
11924
"was\n"
11925
"unable to resolve.  This usually indicates a bug.  Please let us know if "
11926
"you\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11927
"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11928
msgstr ""
11929
11930
#: en/help_topics/content-filters.txt:1
11931
msgid ""
11932
"Content Filters\n"
11933
"==============="
11934
msgstr ""
11935
11936
#: en/help_topics/content-filters.txt:4
11937
msgid ""
11938
"Content formats\n"
11939
"---------------"
11940
msgstr ""
11941
11942
#: en/help_topics/content-filters.txt:7
11943
msgid ""
11944
"Bazaar's content filtering allows you to store files in a different\n"
11945
"format from the copy in your working tree.  This lets you, or your\n"
11946
"co-developers, use Windows development tools that expect CRLF files\n"
11947
"on projects that use other line-ending conventions. Among other things,\n"
11948
"content filters also let Unix developers more easily work on projects\n"
11949
"using Windows line-ending conventions, keyword expansion/compression,\n"
11950
"and trailing spaces on lines in text files to be implicitly stripped\n"
11951
"when committed."
11952
msgstr ""
11953
11954
#: en/help_topics/content-filters.txt:16
11955
msgid "To generalize, there are two content formats supported by Bazaar:"
11956
msgstr ""
11957
11958
#: en/help_topics/content-filters.txt:18
11959
msgid ""
11960
"* a canonical format - how files are stored internally\n"
11961
"* a convenience format - how files are created in a working tree."
11962
msgstr ""
11963
11964
#: en/help_topics/content-filters.txt:21
11965
msgid ""
11966
"\n"
11967
"Format conversion\n"
11968
"-----------------"
11969
msgstr ""
11970
11971
#: en/help_topics/content-filters.txt:25
11972
msgid ""
11973
"The conversion between these formats is done by content filters.\n"
11974
"A content filter has two parts:"
11975
msgstr ""
11976
11977
#: en/help_topics/content-filters.txt:28
11978
msgid ""
11979
"* a read converter - converts from convenience to canonical format\n"
11980
"* a write converter - converts from canonical to convenience format."
11981
msgstr ""
11982
11983
#: en/help_topics/content-filters.txt:31
11984
msgid ""
11985
"Many of these converters will provide *round-trip* conversion,\n"
11986
"i.e. applying the read converter followed by the write converter\n"
11987
"gives back the original content. However, others may provide an\n"
11988
"asymmetric conversion. For example, a read converter might strip\n"
11989
"trailing whitespace off lines in source code while the matching\n"
11990
"write converter might pass content through unchanged."
11991
msgstr ""
11992
11993
#: en/help_topics/content-filters.txt:38
11994
msgid ""
11995
"\n"
11996
"Enabling content filters\n"
11997
"------------------------"
11998
msgstr ""
11999
12000
#: en/help_topics/content-filters.txt:42
12001
msgid ""
12002
"Content filters are typically provided by plugins, so the first step\n"
12003
"in using them is to install the relevant plugins and read their\n"
12004
"documentation. Some plugins may be very specific about which files\n"
12005
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
12006
"In other cases, the plugin may leave it in the user's hands to\n"
12007
"define which files are to be filtered. This is typically done\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12008
"using rule-based preferences. See ``brz help rules`` for general\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12009
"information about defining these."
12010
msgstr ""
12011
12012
#: en/help_topics/content-filters.txt:51
12013
msgid ""
12014
"\n"
12015
"Impact on commands\n"
12016
"------------------"
12017
msgstr ""
12018
12019
#: en/help_topics/content-filters.txt:55
12020
msgid ""
12021
"Read converters are only applied to commands that read content from\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12022
"a working tree, e.g. status, diff and commit. For example, ``brz diff``\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12023
"will apply read converters to files in the working tree, then compare\n"
12024
"the results to the content last committed."
12025
msgstr ""
12026
12027
#: en/help_topics/content-filters.txt:60
12028
msgid ""
12029
"Write converters are only applied by commands that **create files in a\n"
12030
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12031
"canonical format of a file or tree, use ``brz cat`` or ``brz export``\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12032
"respectively."
12033
msgstr ""
12034
12035
#: en/help_topics/content-filters.txt:65
12036
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12037
"Note: ``brz commit`` does not implicitly apply write converters after\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12038
"comitting files. If this makes sense for a given plugin providing\n"
12039
"a content filter, the plugin can usually achieve this effect by using a\n"
12040
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
12041
"for more information on hooks."
12042
msgstr ""
12043
12044
#: en/help_topics/content-filters.txt:71
12045
msgid ""
12046
"\n"
12047
"Refreshing your working tree\n"
12048
"----------------------------"
12049
msgstr ""
12050
12051
#: en/help_topics/content-filters.txt:75
12052
msgid ""
12053
"For performance reasons, Bazaar caches the timestamps of files in\n"
12054
"a working tree, and assumes files are unchanged if their timestamps\n"
12055
"match the cached values. As a consequence, there are times when\n"
12056
"you may need to explicitly ask for content filtering to be reapplied\n"
12057
"in one or both directions, e.g. after installing or reconfiguring\n"
12058
"plugins providing it."
12059
msgstr ""
12060
12061
#: en/help_topics/content-filters.txt:82
12062
msgid "Here are some general guidelines for doing this:"
12063
msgstr ""
12064
12065
#: en/help_topics/content-filters.txt:84
12066
msgid ""
12067
" * To reapply read converters, ``touch`` files, i.e. update their\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12068
"   timestamp. Operations like ``brz status`` should then reapply the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12069
"   relevant read converters and compare the end result with the\n"
12070
"   canonical format."
12071
msgstr ""
12072
12073
#: en/help_topics/content-filters.txt:89
12074
msgid ""
12075
" * To reapply write converters, ensure there are no local changes,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12076
"   delete the relevant files and run ``brz revert`` on those files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12077
msgstr ""
12078
12079
#: en/help_topics/content-filters.txt:92
12080
msgid ""
12081
"Note: In the future, it is likely that additional options will be added\n"
12082
"to commands to make this refreshing process faster and safer.\n"
12083
msgstr ""
12084
12085
#: en/help_topics/current-formats.txt:1
12086
msgid "Current Storage Formats"
12087
msgstr ""
12088
12089
#: en/help_topics/current-formats.txt:3
12090
msgid ""
12091
":2a:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12092
"    (native) (default) Format for the bzr 2.0 series."
12093
msgstr ""
12094
12095
#: en/help_topics/current-formats.txt:6
12096
msgid ""
12097
":git:\n"
12098
"    GIT repository."
12099
msgstr ""
12100
12101
#: en/help_topics/current-formats.txt:9
12102
msgid ""
12103
":git-bare:\n"
12104
"    Bare GIT repository (no working tree)."
12105
msgstr ""
12106
12107
#: en/help_topics/current-formats.txt:12 en/help_topics/other-formats.txt:8
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12108
msgid ""
12109
"\n"
12110
"See :doc:`formats-help` for more about storage formats."
12111
msgstr ""
12112
12113
#: en/help_topics/debug-flags.txt:1
12114
msgid ""
12115
"Debug Flags\n"
12116
"==========="
12117
msgstr ""
12118
12119
#: en/help_topics/debug-flags.txt:4
12120
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12121
"These flags can be passed on the brz command line or (without the ``-D``\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12122
"prefix) put in the ``debug_flags`` variable in ``breezy.conf``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12123
msgstr ""
12124
12125
#: en/help_topics/debug-flags.txt:7
12126
msgid ""
12127
"-Dauth            Trace authentication sections used.\n"
12128
"-Dbytes           Print out how many bytes were transferred\n"
12129
"-Ddirstate        Trace dirstate activity (verbose!)\n"
12130
"-Derror           Instead of normal error handling, always print a "
12131
"traceback\n"
12132
"                  on error.\n"
12133
"-Devil            Capture call sites that do expensive or badly-scaling\n"
12134
"                  operations.\n"
12135
"-Dfetch           Trace history copying between repositories.\n"
12136
"-Dfilters         Emit information for debugging content filtering.\n"
12137
"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
12138
"fetch.\n"
12139
"-Dgraph           Trace graph traversal.\n"
12140
"-Dhashcache       Log every time a working file is read to determine its "
12141
"hash.\n"
12142
"-Dhooks           Trace hook execution.\n"
12143
"-Dhpss            Trace smart protocol requests and responses.\n"
12144
"-Dhpssdetail      More hpss details.\n"
12145
"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
12146
"-Dhttp            Trace http connections, requests and responses.\n"
12147
"-Dindex           Trace major index operations.\n"
12148
"-Dknit            Trace knit operations.\n"
12149
"-Dlock            Trace when lockdir locks are taken or released.\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
12150
"-Dnoretry         If a connection is reset, fail immediately rather than\n"
12151
"                  retrying the request.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12152
"-Dprogress        Trace progress bar operations.\n"
12153
"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
12154
"-Dmerge           Emit information for debugging merges.\n"
12155
"-Dno_apport       Don't use apport to report crashes.\n"
12156
"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
12157
"-Dpack            Emit information about pack operations.\n"
12158
"-Drelock          Emit a message every time a branch or repository object "
12159
"is\n"
12160
"                  unlocked then relocked the same way.\n"
12161
"-Dsftp            Trace SFTP internals.\n"
12162
"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
12163
"expected\n"
12164
"-Dstream          Trace fetch streams.\n"
12165
"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
12166
"portable\n"
12167
"                  manner.\n"
12168
"-Dunlock          Some errors during unlock are treated as warnings.\n"
12169
"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
12170
"-DIDS_always      Always use InterDifferingSerializer to fetch if "
12171
"appropriate\n"
12172
"                  for the format, even for non-local fetches.\n"
12173
msgstr ""
12174
12175
#: en/help_topics/diverged-branches.txt:1
12176
msgid ""
12177
"Diverged Branches\n"
12178
"================="
12179
msgstr ""
12180
12181
#: en/help_topics/diverged-branches.txt:4
12182
msgid ""
12183
"When Bazaar tries to push one branch onto another, it requires that the\n"
12184
"destination branch must be ready to receive the source branch.  If this "
12185
"isn't\n"
12186
"the case, then we say that the branches have ``diverged``.  Branches are\n"
12187
"considered diverged if the destination branch's most recent commit is one "
12188
"that\n"
12189
"has not been merged (directly or indirectly) by the source branch.  To "
12190
"recover\n"
12191
"from diverged branches, one must merge the missing revisions into the "
12192
"source\n"
12193
"branch."
12194
msgstr ""
12195
12196
#: en/help_topics/diverged-branches.txt:12
12197
msgid ""
12198
"This situation commonly arises when using a centralized workflow with local\n"
12199
"commits.  If someone else has committed new work to the mainline since your\n"
12200
"last pull and you have local commits that have not yet been pushed to the\n"
12201
"mainline, then your local branch and the mainline have diverged."
12202
msgstr ""
12203
12204
#: en/help_topics/diverged-branches.txt:17
12205
msgid ""
12206
"Discovering What Has Diverged\n"
12207
"-----------------------------"
12208
msgstr ""
12209
12210
#: en/help_topics/diverged-branches.txt:20
12211
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12212
"The ``brz missing`` command is used to find out what revisions are in "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12213
"another\n"
12214
"branch that are not present in the current branch, and vice-versa.  It shows "
12215
"a\n"
12216
"summary of  which extra revisions exist in each branch.  If you want to see "
12217
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12218
"precise effects of those revisions, you can use ``brz diff --"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12219
"old=other_branch``\n"
12220
"to show the differences between other_branch and your current branch."
12221
msgstr ""
12222
12223
#: en/help_topics/diverged-branches.txt:26
12224
msgid ""
12225
"A Solution\n"
12226
"----------"
12227
msgstr ""
12228
12229
#: en/help_topics/diverged-branches.txt:29
12230
msgid ""
12231
"The solution is to merge the revisions from the mainline into your local\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12232
"branch.  To do so, use ``brz merge`` to get the new revisions from the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12233
"mainline.  This merge may result in conflicts if the other developer's "
12234
"changes\n"
12235
"overlap with your changes.  These conflicts should be resolved before\n"
12236
"continuing. After any conflicts have been resolved, or even if there were "
12237
"no\n"
12238
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
12239
"to your local branch.  This requirement gives you an opportunity to test "
12240
"the\n"
12241
"resulting working tree for correctness, since the merged revisions could "
12242
"have\n"
12243
"made arbitrary changes.  After testing, you should commit the merge using\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12244
"``brz commit``.  This clears up the diverged branches situation.  Your "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12245
"local\n"
12246
"branch can now be pushed to the mainline.\n"
12247
msgstr ""
12248
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12249
#: en/help_topics/env-variables.txt:1
12250
msgid "Environment Variables"
12251
msgstr ""
12252
12253
#: en/help_topics/env-variables.txt:3
7185.1.1 by Jelmer Vernooij
Update pot file.
12254
msgid "See brz help configuration for more details."
6581.1.2 by Vincent Ladeuil
Update translation template.
12255
msgstr ""
12256
12257
#: en/help_topics/env-variables.txt:5
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12258
msgid ""
12259
"=================== "
12260
"===========================================================\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12261
"BRZPATH             Path where brz is to look for shell plugin external\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12262
"                    commands.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12263
"BRZ_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12264
"EMAIL               E-Mail address of the user.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12265
"BRZ_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12266
"EDITOR              Editor for editing commit messages.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12267
"BRZ_PLUGIN_PATH     Paths where brz should look for plugins.\n"
12268
"BRZ_DISABLE_PLUGINS Plugins that brz should not load.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12269
"BRZ_PLUGINS_AT      Plugins to load from a directory not in "
12270
"BRZ_PLUGIN_PATH.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12271
"BRZ_HOME            Directory holding breezy config dir. Overrides HOME.\n"
12272
"BRZ_HOME (Win32)    Directory holding breezy config dir. Overrides APPDATA "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12273
"and\n"
12274
"                    HOME.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12275
"BZR_REMOTE_PATH     Full name of remote 'brz' command (for brz+ssh:// "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12276
"URLs).\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12277
"BRZ_SSH             Path to SSH client, or one of paramiko, openssh, "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12278
"sshcorp,\n"
12279
"                    plink or lsh.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12280
"BRZ_LOG             Location of .brz.log (use '/dev/null' to suppress log).\n"
12281
"BRZ_LOG (Win32)     Location of .brz.log (use 'NUL' to suppress log).\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12282
"BRZ_COLUMNS         Override implicit terminal width.\n"
12283
"BRZ_CONCURRENCY     Number of processes that can be run concurrently "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12284
"(selftest)\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12285
"BRZ_PROGRESS_BAR    Override the progress display. Values are 'none' or "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12286
"'text'.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12287
"BRZ_PDB             Control whether to launch a debugger on error.\n"
12288
"BRZ_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12289
"                    breakin debugger.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12290
"BRZ_TEXTUI_INPUT    Force console input mode for prompts to line-based "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12291
"(instead\n"
12292
"                    of char-based).\n"
12293
"=================== "
12294
"===========================================================\n"
12295
msgstr ""
12296
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12297
#: en/help_topics/eol.txt:1
12298
msgid ""
12299
"End of Line Conversion\n"
12300
"======================"
12301
msgstr ""
12302
12303
#: en/help_topics/eol.txt:4
12304
msgid ""
12305
"EOL conversion is provided as a content filter where Bazaar internally\n"
12306
"stores a canonical format but outputs a convenience format. See\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12307
"``brz help content-filters`` for general information about using these."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12308
msgstr ""
12309
12310
#: en/help_topics/eol.txt:8
12311
msgid ""
12312
"Note: Content filtering is only supported in recently added formats,\n"
12313
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12314
"in a recent format. (Just setting the format on the repository\n"
12315
"is not enough.) If content filtering does not appear to be working, use\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12316
"'brz info -v' to confirm that the branch is using \"Working tree format 5\"\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12317
"or later."
12318
msgstr ""
12319
12320
#: en/help_topics/eol.txt:15
12321
msgid ""
12322
"EOL conversion needs to be enabled for selected file patterns using\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12323
"rules. See ``brz help rules`` for general information on defining rules.\n"
12324
"Currently, rules are only supported in $brz_HOME/.bazaar/rules (or\n"
12325
"%brz_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12326
"supported in a future verison of Bazaar."
12327
msgstr ""
12328
12329
#: en/help_topics/eol.txt:21
12330
msgid ""
12331
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12332
"(If a value is not set, ``exact`` is the default.)"
12333
msgstr ""
12334
12335
#: en/help_topics/eol.txt:24
12336
msgid ""
12337
" ========== ===================================== ======================\n"
12338
" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
12339
" ========== ===================================== ======================\n"
12340
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12341
" ---------- ------------------------------------- ----------------------\n"
12342
" ``lf``     ``lf``                                ``lf``\n"
12343
" ---------- ------------------------------------- ----------------------\n"
12344
" ``crlf``   ``crlf``                              ``lf``\n"
12345
" ---------- ------------------------------------- ----------------------\n"
12346
" ``exact``  No conversion                         Exactly as in file\n"
12347
" ========== ===================================== ======================"
12348
msgstr ""
12349
12350
#: en/help_topics/eol.txt:36
12351
msgid ""
12352
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12353
"byte is detected in the file."
12354
msgstr ""
12355
12356
#: en/help_topics/eol.txt:39
12357
msgid ""
12358
"For users working on a cross-platform project, here is a suggested rule\n"
12359
"to use as a starting point::"
12360
msgstr ""
12361
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12362
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12363
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12364
msgid ""
12365
"  [name *]\n"
12366
"  eol = native"
12367
msgstr ""
12368
12369
#: en/help_topics/eol.txt:45
12370
msgid ""
12371
"If you have binary files that do not contain a null byte though, be\n"
12372
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12373
"by giving more explicit patterns earlier in the rules file. For example::"
12374
msgstr ""
12375
12376
#: en/help_topics/eol.txt:49
12377
msgid ""
12378
"  [name *.png]\n"
12379
"  eol = exact"
12380
msgstr ""
12381
12382
#: en/help_topics/eol.txt:55
12383
msgid ""
12384
"If your working tree is on a network drive shared by users on different\n"
12385
"operating systems, you typically want to force certain conventions for\n"
12386
"certain files. In that way, if a file is created with the wrong line\n"
12387
"endings or line endings get mixed during editing, it gets committed\n"
12388
"correctly and gets checked out correctly. For example::"
12389
msgstr ""
12390
12391
#: en/help_topics/eol.txt:61
12392
msgid ""
12393
"  [name *.bat]\n"
12394
"  eol = crlf"
12395
msgstr ""
12396
12397
#: en/help_topics/eol.txt:64
12398
msgid ""
12399
"  [name *.sh]\n"
12400
"  eol = lf"
12401
msgstr ""
12402
12403
#: en/help_topics/eol.txt:70
12404
msgid ""
12405
"If you take the care to create files with their required endings, you can\n"
12406
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12407
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12408
"introducing mixed line endings will be corrected during commit for files\n"
12409
"with those settings."
12410
msgstr ""
12411
12412
#: en/help_topics/eol.txt:76
12413
msgid ""
12414
"If you have sample test data that deliberately has text files with mixed\n"
12415
"newline conventions, you can ask for those to be left alone like this::"
12416
msgstr ""
12417
12418
#: en/help_topics/eol.txt:79
12419
msgid ""
12420
"  [name test_data/]\n"
12421
"  eol = exact"
12422
msgstr ""
12423
12424
#: en/help_topics/eol.txt:85
12425
msgid ""
12426
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12427
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12428
"of content analysis to detect binary files for commands like ``diff``.\n"
12429
"In the future, a ``binary = true`` rule may be added but it is not\n"
12430
"supported yet.)"
12431
msgstr ""
12432
12433
#: en/help_topics/eol.txt:91
12434
msgid ""
12435
"If you have an existing repository with text files already stored using\n"
12436
"Windows newline conventions (``crlf``), then you may want to keep using "
12437
"that\n"
12438
"convention in the repository. Forcing certain files to this convention\n"
12439
"may also help users who do not have rules configured. To do this, set\n"
12440
"``eol`` to one of the values below."
12441
msgstr ""
12442
12443
#: en/help_topics/eol.txt:97
12444
msgid ""
12445
" ============================ ======================== "
12446
"======================\n"
12447
" Value                        Checkout end-of-lines as Commit end-of-lines "
12448
"as\n"
12449
" ============================ ======================== "
12450
"======================\n"
12451
" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
12452
"                              ``lf`` otherwise\n"
12453
" ---------------------------- ------------------------ "
12454
"----------------------\n"
12455
" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
12456
" ---------------------------- ------------------------ "
12457
"----------------------\n"
12458
" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
12459
" ============================ ======================== ======================"
12460
msgstr ""
12461
12462
#: en/help_topics/eol.txt:108
12463
msgid ""
12464
"For users working on an existing project that uses Windows newline\n"
12465
"conventions in their Bazaar repository, this rule is suggested as a\n"
12466
"starting point::"
12467
msgstr ""
12468
12469
#: en/help_topics/eol.txt:112
12470
msgid ""
12471
"  [name *]\n"
12472
"  eol = native-with-crlf-in-repo"
12473
msgstr ""
12474
12475
#: en/help_topics/eol.txt:115
12476
msgid ""
12477
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12478
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12479
"``crlf`` and ``exact``."
12480
msgstr ""
12481
12482
#: en/help_topics/eol.txt:119
12483
msgid ""
12484
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12485
"never reject files because a given line ending or mixed line endings\n"
12486
"are found. A precommit hook should be used if you wish to validate\n"
12487
"(and not just convert) content before committing.\n"
12488
msgstr ""
12489
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
12490
#: en/help_topics/glossary.txt:1
12491
msgid ""
12492
"Glossary\n"
12493
"========"
12494
msgstr ""
12495
12496
#: en/help_topics/glossary.txt:4
12497
msgid ".. glossary::"
12498
msgstr ""
12499
12500
#: en/help_topics/glossary.txt:6
12501
msgid ""
12502
"  ancestor\n"
12503
"    An ancestor is one of any of the revisions that this revision is based "
12504
"on.\n"
12505
"    The immediately prior revision has a special name, the\n"
12506
"    :term:`parent revision`."
12507
msgstr ""
12508
12509
#: en/help_topics/glossary.txt:11
12510
msgid ""
12511
"  ancestral parent\n"
12512
"    Any branch that has been merged by another branch and then committed\n"
12513
"    becomes that branches ancestral parent."
12514
msgstr ""
12515
12516
#: en/help_topics/glossary.txt:15
12517
msgid ""
12518
"  branch\n"
12519
"    a line of development. In the simplest of terms, a branch is the record "
12520
"of\n"
12521
"    all the commits that have been done. Every :term:`working tree` has a\n"
12522
"    branch, but it may be in a different location. The actual revisions\n"
12523
"    produced by the commits are stored in a repository, which is sometimes\n"
12524
"    shared with other\n"
12525
"    branches."
12526
msgstr ""
12527
12528
#: en/help_topics/glossary.txt:23
12529
msgid ""
12530
"    A frequent activity done by users within the working tree of a branch is "
12531
"to\n"
12532
"    merge another branch. In this way users can share changes between two\n"
12533
"    branches -- even if the branch is run by someone else."
12534
msgstr ""
12535
12536
#: en/help_topics/glossary.txt:27
12537
msgid ""
12538
"    Bazaar's default behavior is to put the repository, branch, and working\n"
12539
"    tree all in the same place. This combination is called a standalone "
12540
"tree.\n"
12541
"    If there is no tree, it is called a :term:`standalone branch`. If the\n"
12542
"    repository is shared with other branches, it is called a repository "
12543
"branch.\n"
12544
"    A working tree in a different location from its branch is called a\n"
12545
"    checkout."
12546
msgstr ""
12547
12548
#: en/help_topics/glossary.txt:34
12549
msgid ""
12550
"  branch, bound\n"
12551
"    A bound branch is a branch that does not commit a new revision until "
12552
"after\n"
12553
"    the revision has been applied to another branch and first."
12554
msgstr ""
12555
12556
#: en/help_topics/glossary.txt:38
12557
msgid "    A bound branch is a part of a :term:`heavyweight checkout`."
12558
msgstr ""
12559
12560
#: en/help_topics/glossary.txt:40
12561
msgid ""
12562
"  cherry-pick\n"
12563
"    A cherrypick is an operation in which the delta between two revisions "
12564
"is\n"
12565
"    applied to a working tree. The process is roughly similiar to generating "
12566
"a\n"
12567
"    diff between two revisions and applying it to a working tree."
12568
msgstr ""
12569
12570
#: en/help_topics/glossary.txt:45
12571
msgid ""
12572
"    A cherrypick is a merge in which a range of revisions are selected and\n"
12573
"    merged into a working tree . Performing a limited merge is different "
12574
"than a\n"
12575
"    normal merge because normal merges imply all missing revisions should "
12576
"be\n"
12577
"    merged. One of the results of cherrypicking is the creation of "
12578
"intransitive\n"
12579
"    ancestors, which are revisons that are missing one or more of their\n"
12580
"    ancestors."
12581
msgstr ""
12582
12583
#: en/help_topics/glossary.txt:52
12584
msgid ""
12585
"    A cherrypick in Bazaar is a bit more advanced than the cherrypick with "
12586
"some\n"
12587
"    other revision control systems, in that a three way merge is performed\n"
12588
"    rather than a strict delta between revisions."
12589
msgstr ""
12590
12591
#: en/help_topics/glossary.txt:56
12592
msgid ""
12593
"    The downside to cherrypicking is that Bazaar does not track "
12594
"cherrypicked\n"
12595
"    revisions, although this feature is firmly on the wish list."
12596
msgstr ""
12597
12598
#: en/help_topics/glossary.txt:59
12599
msgid ""
12600
"    A common use-case for cherrypicking is the back-porting of fixes from "
12601
"an\n"
12602
"    ongoing branch of development to stable release branches."
12603
msgstr ""
12604
12605
#: en/help_topics/glossary.txt:62
12606
msgid ""
12607
"  checkout\n"
12608
"    A checkout is essentially a working tree that is linked to a branch at "
12609
"a\n"
12610
"    different location."
12611
msgstr ""
12612
12613
#: en/help_topics/glossary.txt:66
12614
msgid ""
12615
"    Checkouts also have local branches, which function as a local cache. "
12616
"This\n"
12617
"    means that checkouts can be used effectively even with branches that "
12618
"are\n"
12619
"    accessed through the Internet. Normal checkouts are sometimes called\n"
12620
"    heavyweight checkouts to distinguish them from lightweight checkouts."
12621
msgstr ""
12622
12623
#: en/help_topics/glossary.txt:71
12624
msgid ""
12625
"    A lightweight checkout is a related construct that lacks the local "
12626
"branch.\n"
12627
"    Lightweight checkouts are smaller, but require fast access to the "
12628
"branch,\n"
12629
"    such as on a LAN or local hard disk."
12630
msgstr ""
12631
12632
#: en/help_topics/glossary.txt:75
12633
msgid ""
12634
"    Checkouts provide a location for people to hack on code and commit. Once "
12635
"a\n"
12636
"    user commits, the associated branch is updated with a new revision that\n"
12637
"    represents the changes for the commit."
12638
msgstr ""
12639
12640
#: en/help_topics/glossary.txt:79
12641
msgid ""
12642
"  dag\n"
12643
"    Directed Acyclic Graph. The graph of revisions where each revision is\n"
12644
"    connected to its parent revisions."
12645
msgstr ""
12646
12647
#: en/help_topics/glossary.txt:83
12648
msgid ""
12649
"  delta\n"
12650
"    A delta is defined as the changes between two revisions. Any RCS that "
12651
"has\n"
12652
"    revisions typically builds a delta in order to perform a diff"
12653
msgstr ""
12654
12655
#: en/help_topics/glossary.txt:87
12656
msgid ""
12657
"  merge\n"
12658
"    Merging is the process of applying all the changes that were introduced "
12659
"in\n"
12660
"    one branch into another branch, without applying any changes that are\n"
12661
"    already common to both branches. Sometimes a user will not want all of "
12662
"the\n"
12663
"    changes. For these cases, a user may instead prefer a cherrypick, which\n"
12664
"    gives the user the option to apply only those revisions that are wanted."
12665
msgstr ""
12666
12667
#: en/help_topics/glossary.txt:94
12668
msgid ""
12669
"    As well as altering the working tree, bzr's merge command will also get "
12670
"all\n"
12671
"    of the revisions that a branch has, and add metadata indicating that a\n"
12672
"    merge has been performed."
12673
msgstr ""
12674
12675
#: en/help_topics/glossary.txt:98
12676
msgid ""
12677
"  merge, criss-cross\n"
12678
"    A failed type of merge caused by two branches merging each other at the\n"
12679
"    same time."
12680
msgstr ""
12681
12682
#: en/help_topics/glossary.txt:102
12683
msgid ""
12684
"  nuclear launch codes\n"
12685
"    Nuclear launch codes are an example of data that has been committed to "
12686
"a\n"
12687
"    branch that must be removed at all costs. Imagine if one had access to "
12688
"the\n"
12689
"    launch codes for a nuclear warhead, accidentally committed them to a "
12690
"branch\n"
12691
"    and then pushed the branch to a public place."
12692
msgstr ""
12693
12694
#: en/help_topics/glossary.txt:108
12695
msgid ""
12696
"    In real world situations most people do not have access to nuclear\n"
12697
"    launchcodes. Users may have data such as passwords, proprietary code "
12698
"and\n"
12699
"    other sensitive data. Accidental release of this type of data is\n"
12700
"    potentially damaging to the branch owner -- perhaps damaging enough "
12701
"that\n"
12702
"    the developer may hope for a nuclear disaster!"
12703
msgstr ""
12704
12705
#: en/help_topics/glossary.txt:114
12706
msgid ""
12707
"    A user dealing with a nuclear launch code problem needs specific data "
12708
"in\n"
12709
"    the branch to be exised at all costs and in a rapid manner."
12710
msgstr ""
12711
12712
#: en/help_topics/glossary.txt:117
12713
msgid ""
12714
"  repository\n"
12715
"    A library of revisions for branches."
12716
msgstr ""
12717
12718
#: en/help_topics/glossary.txt:120
12719
msgid ""
12720
"  revision\n"
12721
"    A revision is one state of the code."
12722
msgstr ""
12723
12724
#: en/help_topics/glossary.txt:123
12725
msgid ""
12726
"    bzr is snapshot based, meaning that conceptually it stores the whole "
12727
"state\n"
12728
"    of the tree at each revision. This is in contrast to changeset based, "
12729
"where\n"
12730
"    a revision refers to just the changes that were made in that revision. "
12731
"I\n"
12732
"    said \"conceptually\", as internally bzr uses delta compression to "
12733
"reduce the\n"
12734
"    amount of data that it stores, and so may only record the changes in a\n"
12735
"    revision. However you must always think of a revision as referring to a\n"
12736
"    whole snapshot."
12737
msgstr ""
12738
12739
#: en/help_topics/glossary.txt:131
12740
msgid ""
12741
"    A revision also contains some metadata. In particular it stores the\n"
12742
"    committer, and the timestamp when the commit was made, the log message "
12743
"that\n"
12744
"    was given, and the nick of the branch on which the commit was made. It "
12745
"also\n"
12746
"    stores pointers to the parent revisions, i.e. the revision preceeding "
12747
"it,\n"
12748
"    and the tip revisions of any branches that were merged. Lastly it stores "
12749
"a\n"
12750
"    number of revision properties, these is extra information that can be\n"
12751
"    stored with the revision and is immutable, some uses of them are to "
12752
"store\n"
12753
"    the author of the patch if it wasn't the committer (when given using "
12754
"the\n"
12755
"    --author option of bzr commit), or to store information about the bugs\n"
12756
"    fixed in that revision if using the bug-tracker integration."
12757
msgstr ""
12758
12759
#: en/help_topics/glossary.txt:142
12760
msgid ""
12761
"    A revision also has a name, referred to as a revision id. This is a\n"
12762
"    globally unique identifier for the revision so that it can be referred "
12763
"to\n"
12764
"    without ambiguity. This means that two revisions are identical, if, and\n"
12765
"    only if, they have the same revision id."
12766
msgstr ""
12767
12768
#: en/help_topics/glossary.txt:147
12769
msgid ""
12770
"    A revision may also be referred to using a revision number, however this "
12771
"is\n"
12772
"    not a globally unique identifier, meaning that revision 14 of your "
12773
"branch\n"
12774
"    may not be the same as revision 14 of my branch, even if they are the "
12775
"same\n"
12776
"    project. The only way to know if they are the same revision is to "
12777
"compare\n"
12778
"    the revision ids. This means that when talking about a revision you "
12779
"must\n"
12780
"    either use it's revision id, or also explain which branch you are "
12781
"referring\n"
12782
"    to when you specify a revision number."
12783
msgstr ""
12784
12785
#: en/help_topics/glossary.txt:155
12786
msgid ""
12787
"    Tags point at a revision, and so they may also be used to when referring "
12788
"to\n"
12789
"    a commit, but again, two different branches may have the same tag name\n"
12790
"    pointing to two different revisions, and so you should also give the "
12791
"branch\n"
12792
"    to which you are referring when stating a tag name."
12793
msgstr ""
12794
12795
#: en/help_topics/glossary.txt:160
12796
msgid ""
12797
"  revision, ancestor\n"
12798
"    An ancestor is one of any of the revisions that this revision is based "
12799
"on.\n"
12800
"    The immediately prior revision has a special name, the parent revision."
12801
msgstr ""
12802
12803
#: en/help_topics/glossary.txt:164
12804
msgid ""
12805
"  revision, ghost\n"
12806
"    A ghost :term:`revision`, also called a ghost, is a revision that a\n"
12807
"    :term:`branch` knows about but does not have."
12808
msgstr ""
12809
12810
#: en/help_topics/glossary.txt:168
12811
msgid ""
12812
"    Ghost revisions can occur in unusual situations such as the migration "
12813
"of\n"
12814
"    branches from foreign revision control systems into Bazaar format."
12815
msgstr ""
12816
12817
#: en/help_topics/glossary.txt:171
12818
msgid ""
12819
"    Ghost revisions can be scary the first time that a user bumps into "
12820
"them.\n"
12821
"    Thankfully though, revision ghosts are just like real ghosts (such as "
12822
"they\n"
12823
"    are) in that their discorporeal existence typically causes little, if "
12824
"any,\n"
12825
"    harm."
12826
msgstr ""
12827
12828
#: en/help_topics/glossary.txt:176
12829
msgid ""
12830
"  revision, parent\n"
12831
"    The revision that comes immediately prior to this revision."
12832
msgstr ""
12833
12834
#: en/help_topics/glossary.txt:179
12835
msgid ""
12836
"  shared repository\n"
12837
"    A shared repository is similar to the traditional concept of a "
12838
"repository\n"
12839
"    in other VCSs like CVS and Subversion. For example, in Subversion you "
12840
"have\n"
12841
"    a remote repository, which is where all of the history is stored, and\n"
12842
"    locally you don't have any history information, only a checkout of the\n"
12843
"    working tree files. Note that \"Shared\" in this context means shared "
12844
"between\n"
12845
"    branches. It *may* be shared between people, but standalone branches\n"
12846
"    can also be shared between people."
12847
msgstr ""
12848
12849
#: en/help_topics/glossary.txt:188
12850
msgid ""
12851
"    In Breezy_ terms, a \"Shared Repository\" is a location where multiple\n"
12852
"    branches can **share** their revision history information. In order to\n"
12853
"    support decentralized workflows, it is possible for every branch to\n"
12854
"    store its own revision history information. But this is often\n"
12855
"    inefficient, since related branches share history, and they might as\n"
12856
"    well share the storage as well."
12857
msgstr ""
12858
12859
#: en/help_topics/glossary.txt:195
12860
msgid ""
12861
"  tag\n"
12862
"    A tag is a nickname for a particular :term:`revision`. The typical use "
12863
"is to mark a\n"
12864
"    release of the software so you can easily refer to it later."
12865
msgstr ""
12866
12867
#: en/help_topics/glossary.txt:199
12868
msgid ""
12869
"  working tree\n"
12870
"    A working tree is a directory with project files that a user can edit."
12871
msgstr ""
12872
12873
#: en/help_topics/glossary.txt:202
12874
msgid ""
12875
"    Unlike a normal directory, a working tree is associated with a\n"
12876
"    :term:`branch`. The working tree is the space in which commands such as\n"
12877
"    commit and revert operate.\n"
12878
msgstr ""
12879
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12880
#: en/help_topics/hooks.txt:1
12881
msgid ""
12882
"\n"
12883
"Hooks\n"
12884
"====="
12885
msgstr ""
12886
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12887
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12888
msgid ""
12889
"Introduction\n"
12890
"------------"
12891
msgstr ""
12892
12893
#: en/help_topics/hooks.txt:8
12894
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12895
msgstr ""
12896
12897
#: en/help_topics/hooks.txt:10
12898
msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
12899
msgstr ""
12900
12901
#: en/help_topics/hooks.txt:12
12902
msgid ""
12903
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12904
msgstr ""
12905
12906
#: en/help_topics/hooks.txt:14
12907
msgid ""
12908
"The class that contains each hook is given before the hooks it supplies. "
12909
"For\n"
12910
"instance, BranchHooks as the class is the hooks class for\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12911
"`breezy.branch.Branch.hooks`."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12912
msgstr ""
12913
12914
#: en/help_topics/hooks.txt:18
12915
msgid ""
12916
"Each description also indicates whether the hook runs on the client (the\n"
12917
"machine where bzr was invoked) or the server (the machine addressed by\n"
12918
"the branch URL).  These may be, but are not necessarily, the same machine."
12919
msgstr ""
12920
12921
#: en/help_topics/hooks.txt:22
12922
msgid ""
12923
"Plugins (including hooks) are run on the server if all of these is true:"
12924
msgstr ""
12925
12926
#: en/help_topics/hooks.txt:24
12927
msgid ""
12928
"  * The connection is via a smart server (accessed with a URL starting with\n"
12929
"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12930
"\"http://\"\n"
12931
"    URL when a smart server is available via HTTP)."
12932
msgstr ""
12933
12934
#: en/help_topics/hooks.txt:28
12935
msgid ""
12936
"  * The hook is either server specific or part of general infrastructure "
12937
"rather\n"
12938
"    than client specific code (such as commit)."
12939
msgstr ""
12940
12941
#: en/help_topics/hooks.txt:31
12942
msgid ""
12943
"\n"
12944
"BranchHooks\n"
12945
"-----------"
12946
msgstr ""
12947
12948
#: en/help_topics/hooks.txt:35
12949
msgid ""
12950
"automatic_tag_name\n"
12951
"~~~~~~~~~~~~~~~~~~"
12952
msgstr ""
12953
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12954
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
7185.1.1 by Jelmer Vernooij
Update pot file.
12955
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:315
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12956
msgid "Introduced in: 2.2"
12957
msgstr ""
12958
12959
#: en/help_topics/hooks.txt:40
12960
msgid ""
12961
"Called to determine an automatic tag name for a revision.\n"
12962
"automatic_tag_name is called with (branch, revision_id) and should\n"
12963
"return a tag name or None if no tag name could be determined. The\n"
12964
"first non-None tag name returned will be used."
12965
msgstr ""
12966
12967
#: en/help_topics/hooks.txt:45
12968
msgid ""
12969
"open\n"
12970
"~~~~"
12971
msgstr ""
12972
7185.1.1 by Jelmer Vernooij
Update pot file.
12973
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:346
12974
#: en/help_topics/hooks.txt:360
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12975
msgid "Introduced in: 1.8"
12976
msgstr ""
12977
12978
#: en/help_topics/hooks.txt:50
12979
msgid ""
12980
"Called with the Branch object that has been opened after a branch is\n"
12981
"opened."
12982
msgstr ""
12983
12984
#: en/help_topics/hooks.txt:53
12985
msgid ""
12986
"post_branch_init\n"
12987
"~~~~~~~~~~~~~~~~"
12988
msgstr ""
12989
12990
#: en/help_topics/hooks.txt:58
12991
msgid ""
12992
"Called after new branch initialization completes. post_branch_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12993
"called with a breezy.branch.BranchInitHookParams. Note that init,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12994
"branch and checkout (both heavyweight and lightweight) will all\n"
12995
"trigger this hook."
12996
msgstr ""
12997
12998
#: en/help_topics/hooks.txt:63
12999
msgid ""
13000
"post_change_branch_tip\n"
13001
"~~~~~~~~~~~~~~~~~~~~~~"
13002
msgstr ""
13003
7185.1.1 by Jelmer Vernooij
Update pot file.
13004
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:474
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13005
msgid "Introduced in: 1.4"
13006
msgstr ""
13007
13008
#: en/help_topics/hooks.txt:68
13009
msgid ""
13010
"Called in bzr client and server after a change to the tip of a branch\n"
13011
"is made. post_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13012
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13013
"uncommit will all trigger this hook."
13014
msgstr ""
13015
7185.1.1 by Jelmer Vernooij
Update pot file.
13016
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:445
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13017
msgid ""
13018
"post_commit\n"
13019
"~~~~~~~~~~~"
13020
msgstr ""
13021
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13022
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
13023
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13024
msgid "Introduced in: 0.15"
13025
msgstr ""
13026
13027
#: en/help_topics/hooks.txt:78
13028
msgid ""
13029
"Called in the bzr client after a commit has completed. post_commit is\n"
13030
"called with (local, master, old_revno, old_revid, new_revno,\n"
13031
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
13032
"branch."
13033
msgstr ""
13034
13035
#: en/help_topics/hooks.txt:83
13036
msgid ""
13037
"post_pull\n"
13038
"~~~~~~~~~"
13039
msgstr ""
13040
13041
#: en/help_topics/hooks.txt:88
13042
msgid ""
13043
"Called after a pull operation completes. post_pull is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13044
"breezy.branch.PullResult object and only runs in the bzr client."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13045
msgstr ""
13046
13047
#: en/help_topics/hooks.txt:91
13048
msgid ""
13049
"post_push\n"
13050
"~~~~~~~~~"
13051
msgstr ""
13052
13053
#: en/help_topics/hooks.txt:96
13054
msgid ""
13055
"Called after a push operation completes. post_push is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13056
"breezy.branch.BranchPushResult object and only runs in the bzr client."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13057
msgstr ""
13058
13059
#: en/help_topics/hooks.txt:99
13060
msgid ""
13061
"post_switch\n"
13062
"~~~~~~~~~~~"
13063
msgstr ""
13064
13065
#: en/help_topics/hooks.txt:104
13066
msgid ""
13067
"Called after a checkout switches branch. post_switch is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13068
"breezy.branch.SwitchHookParams."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13069
msgstr ""
13070
13071
#: en/help_topics/hooks.txt:107
13072
msgid ""
13073
"post_uncommit\n"
13074
"~~~~~~~~~~~~~"
13075
msgstr ""
13076
13077
#: en/help_topics/hooks.txt:112
13078
msgid ""
13079
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
13080
"called with (local, master, old_revno, old_revid, new_revno,\n"
13081
"new_revid) where local is the local branch or None, master is the\n"
13082
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
13083
"of None."
13084
msgstr ""
13085
13086
#: en/help_topics/hooks.txt:118
13087
msgid ""
13088
"pre_change_branch_tip\n"
13089
"~~~~~~~~~~~~~~~~~~~~~"
13090
msgstr ""
13091
13092
#: en/help_topics/hooks.txt:121
13093
msgid "Introduced in: 1.6"
13094
msgstr ""
13095
13096
#: en/help_topics/hooks.txt:123
13097
msgid ""
13098
"Called in bzr client and server before a change to the tip of a branch\n"
13099
"is made. pre_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13100
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13101
"uncommit will all trigger this hook."
13102
msgstr ""
13103
13104
#: en/help_topics/hooks.txt:128
13105
msgid ""
13106
"pre_commit\n"
13107
"~~~~~~~~~~"
13108
msgstr ""
13109
13110
#: en/help_topics/hooks.txt:131
13111
msgid "Introduced in: 0.91"
13112
msgstr ""
13113
13114
#: en/help_topics/hooks.txt:133
13115
msgid ""
13116
"Called after a commit is calculated but before it is completed.\n"
13117
"pre_commit is called with (local, master, old_revno, old_revid,\n"
13118
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
13119
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
13120
"TreeDelta object describing changes from the basis revision. hooks\n"
13121
"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
13122
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
13123
"tree."
13124
msgstr ""
13125
13126
#: en/help_topics/hooks.txt:142
13127
msgid ""
13128
"transform_fallback_location\n"
13129
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
13130
msgstr ""
13131
6504.1.1 by Vincent Ladeuil
Update translation template
13132
#: en/help_topics/hooks.txt:145
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13133
msgid "Introduced in: 1.9"
13134
msgstr ""
13135
6504.1.1 by Vincent Ladeuil
Update translation template
13136
#: en/help_topics/hooks.txt:147
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13137
msgid ""
13138
"Called when a stacked branch is activating its fallback locations.\n"
13139
"transform_fallback_location is called with (branch, url), and should\n"
13140
"return a new url. Returning the same url allows it to be used as-is,\n"
13141
"returning a different one can be used to cause the branch to stack on\n"
13142
"a closer copy of that fallback_location. Note that the branch cannot\n"
13143
"have history accessing methods called on it during this hook because\n"
13144
"the fallback locations have not been activated. When there are\n"
13145
"multiple hooks installed for transform_fallback_location, all are\n"
13146
"called with the url returned from the previous hook.The order is\n"
13147
"however undefined."
13148
msgstr ""
13149
6504.1.1 by Vincent Ladeuil
Update translation template
13150
#: en/help_topics/hooks.txt:158
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13151
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
13152
"SmartClientHooks\n"
13153
"----------------"
13154
msgstr ""
13155
13156
#: en/help_topics/hooks.txt:161
13157
msgid ""
13158
"call\n"
13159
"~~~~"
13160
msgstr ""
13161
13162
#: en/help_topics/hooks.txt:164
13163
msgid "Introduced in: unknown"
13164
msgstr ""
13165
13166
#: en/help_topics/hooks.txt:166
13167
msgid ""
13168
"Called when the smart client is submitting a request to the smart\n"
13169
"server. Called with a breezy.bzr.smart.client.CallHookParams object.\n"
13170
"Streaming request bodies, and responses, are not accessible."
13171
msgstr ""
13172
13173
#: en/help_topics/hooks.txt:170
13174
msgid ""
13175
"SmartServerHooks\n"
13176
"----------------"
13177
msgstr ""
13178
13179
#: en/help_topics/hooks.txt:173
13180
msgid ""
13181
"server_exception\n"
13182
"~~~~~~~~~~~~~~~~"
13183
msgstr ""
13184
13185
#: en/help_topics/hooks.txt:176 en/help_topics/hooks.txt:274
13186
#: en/help_topics/hooks.txt:282 en/help_topics/hooks.txt:289
13187
#: en/help_topics/hooks.txt:297 en/help_topics/hooks.txt:304
13188
#: en/help_topics/hooks.txt:426
13189
msgid "Introduced in: 2.4"
13190
msgstr ""
13191
13192
#: en/help_topics/hooks.txt:178
13193
msgid ""
13194
"Called by the bzr server when an exception occurs. server_exception is\n"
13195
"called with the sys.exc_info() tuple return true for the hook if the\n"
13196
"exception has been handled, in which case the server will exit\n"
13197
"normally."
13198
msgstr ""
13199
13200
#: en/help_topics/hooks.txt:183
13201
msgid ""
13202
"server_started\n"
13203
"~~~~~~~~~~~~~~"
13204
msgstr ""
13205
13206
#: en/help_topics/hooks.txt:186 en/help_topics/hooks.txt:205
13207
msgid "Introduced in: 0.16"
13208
msgstr ""
13209
13210
#: en/help_topics/hooks.txt:188
13211
msgid ""
13212
"Called by the bzr server when it starts serving a directory.\n"
13213
"server_started is called with (backing urls, public url), where\n"
13214
"backing_url is a list of URLs giving the server-specific directory\n"
13215
"locations, and public_url is the public URL for the directory being\n"
13216
"served."
13217
msgstr ""
13218
13219
#: en/help_topics/hooks.txt:194
13220
msgid ""
13221
"server_started_ex\n"
13222
"~~~~~~~~~~~~~~~~~"
13223
msgstr ""
13224
13225
#: en/help_topics/hooks.txt:197 en/help_topics/hooks.txt:226
13226
#: en/help_topics/hooks.txt:238 en/help_topics/hooks.txt:247
13227
msgid "Introduced in: 1.17"
13228
msgstr ""
13229
13230
#: en/help_topics/hooks.txt:199
13231
msgid ""
13232
"Called by the bzr server when it starts serving a directory.\n"
13233
"server_started is called with (backing_urls, server_obj)."
13234
msgstr ""
13235
13236
#: en/help_topics/hooks.txt:202
13237
msgid ""
13238
"server_stopped\n"
13239
"~~~~~~~~~~~~~~"
13240
msgstr ""
13241
13242
#: en/help_topics/hooks.txt:207
13243
msgid ""
13244
"Called by the bzr server when it stops serving a directory.\n"
13245
"server_stopped is called with the same parameters as the\n"
13246
"server_started hook: (backing_urls, public_url)."
13247
msgstr ""
13248
13249
#: en/help_topics/hooks.txt:211
13250
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13251
"CommandHooks\n"
13252
"------------"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13253
msgstr ""
13254
7185.1.1 by Jelmer Vernooij
Update pot file.
13255
#: en/help_topics/hooks.txt:214
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13256
msgid ""
13257
"extend_command\n"
13258
"~~~~~~~~~~~~~~"
13259
msgstr ""
13260
7185.1.1 by Jelmer Vernooij
Update pot file.
13261
#: en/help_topics/hooks.txt:217
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13262
msgid "Introduced in: 1.13"
13263
msgstr ""
13264
7185.1.1 by Jelmer Vernooij
Update pot file.
13265
#: en/help_topics/hooks.txt:219
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13266
msgid ""
13267
"Called after creating a command object to allow modifications such as\n"
13268
"adding or removing options, docs etc. Called with the new\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13269
"breezy.commands.Command object."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13270
msgstr ""
13271
7185.1.1 by Jelmer Vernooij
Update pot file.
13272
#: en/help_topics/hooks.txt:223
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13273
msgid ""
13274
"get_command\n"
13275
"~~~~~~~~~~~"
13276
msgstr ""
13277
7185.1.1 by Jelmer Vernooij
Update pot file.
13278
#: en/help_topics/hooks.txt:228
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13279
msgid ""
13280
"Called when creating a single command. Called with (cmd_or_None,\n"
13281
"command_name). get_command should either return the cmd_or_None\n"
13282
"parameter, or a replacement Command object that should be used for the\n"
13283
"command. Note that the Command.hooks hooks are core infrastructure.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13284
"Many users will prefer to use breezy.commands.register_command or\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13285
"plugin_cmds.register_lazy."
13286
msgstr ""
13287
7185.1.1 by Jelmer Vernooij
Update pot file.
13288
#: en/help_topics/hooks.txt:235
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13289
msgid ""
13290
"get_missing_command\n"
13291
"~~~~~~~~~~~~~~~~~~~"
13292
msgstr ""
13293
7185.1.1 by Jelmer Vernooij
Update pot file.
13294
#: en/help_topics/hooks.txt:240
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13295
msgid ""
13296
"Called when creating a single command if no command could be found.\n"
13297
"Called with (command_name). get_missing_command should either return\n"
13298
"None, or a Command object to be used for the command."
13299
msgstr ""
13300
7185.1.1 by Jelmer Vernooij
Update pot file.
13301
#: en/help_topics/hooks.txt:244
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13302
msgid ""
13303
"list_commands\n"
13304
"~~~~~~~~~~~~~"
13305
msgstr ""
13306
7185.1.1 by Jelmer Vernooij
Update pot file.
13307
#: en/help_topics/hooks.txt:249
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13308
msgid ""
13309
"Called when enumerating commands. Called with a set of cmd_name\n"
13310
"strings for all the commands found so far. This set  is safe to mutate\n"
13311
"- e.g. to remove a command. list_commands should return the updated\n"
13312
"set of command names."
13313
msgstr ""
13314
7185.1.1 by Jelmer Vernooij
Update pot file.
13315
#: en/help_topics/hooks.txt:254
6504.1.1 by Vincent Ladeuil
Update translation template
13316
msgid ""
13317
"post_command\n"
13318
"~~~~~~~~~~~~"
13319
msgstr ""
13320
7185.1.1 by Jelmer Vernooij
Update pot file.
13321
#: en/help_topics/hooks.txt:257 en/help_topics/hooks.txt:264
6504.1.1 by Vincent Ladeuil
Update translation template
13322
msgid "Introduced in: 2.6"
13323
msgstr ""
13324
7185.1.1 by Jelmer Vernooij
Update pot file.
13325
#: en/help_topics/hooks.txt:259
6504.1.1 by Vincent Ladeuil
Update translation template
13326
msgid "Called after executing a command. Called with the command object."
13327
msgstr ""
13328
7185.1.1 by Jelmer Vernooij
Update pot file.
13329
#: en/help_topics/hooks.txt:261
6504.1.1 by Vincent Ladeuil
Update translation template
13330
msgid ""
13331
"pre_command\n"
13332
"~~~~~~~~~~~"
13333
msgstr ""
13334
7185.1.1 by Jelmer Vernooij
Update pot file.
13335
#: en/help_topics/hooks.txt:266
6504.1.1 by Vincent Ladeuil
Update translation template
13336
msgid "Called prior to executing a command. Called with the command object."
13337
msgstr ""
13338
7185.1.1 by Jelmer Vernooij
Update pot file.
13339
#: en/help_topics/hooks.txt:268
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13340
msgid ""
13341
"_ConfigHooks\n"
13342
"------------"
13343
msgstr ""
13344
7185.1.1 by Jelmer Vernooij
Update pot file.
13345
#: en/help_topics/hooks.txt:271
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13346
msgid ""
13347
"get\n"
13348
"~~~"
13349
msgstr ""
13350
7185.1.1 by Jelmer Vernooij
Update pot file.
13351
#: en/help_topics/hooks.txt:276
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13352
msgid ""
13353
"Invoked when a config option is read. The signature is (stack, name,\n"
13354
"value)."
13355
msgstr ""
13356
7185.1.1 by Jelmer Vernooij
Update pot file.
13357
#: en/help_topics/hooks.txt:279
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13358
msgid ""
13359
"load\n"
13360
"~~~~"
13361
msgstr ""
13362
7185.1.1 by Jelmer Vernooij
Update pot file.
13363
#: en/help_topics/hooks.txt:284
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13364
msgid "Invoked when a config store is loaded. The signature is (store)."
13365
msgstr ""
13366
7185.1.1 by Jelmer Vernooij
Update pot file.
13367
#: en/help_topics/hooks.txt:286
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13368
msgid ""
13369
"remove\n"
13370
"~~~~~~"
13371
msgstr ""
13372
7185.1.1 by Jelmer Vernooij
Update pot file.
13373
#: en/help_topics/hooks.txt:291
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13374
msgid ""
13375
"Invoked when a config option is removed. The signature is (stack,\n"
13376
"name)."
13377
msgstr ""
13378
7185.1.1 by Jelmer Vernooij
Update pot file.
13379
#: en/help_topics/hooks.txt:294
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13380
msgid ""
13381
"save\n"
13382
"~~~~"
13383
msgstr ""
13384
7185.1.1 by Jelmer Vernooij
Update pot file.
13385
#: en/help_topics/hooks.txt:299
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13386
msgid "Invoked when a config store is saved. The signature is (store)."
13387
msgstr ""
13388
7185.1.1 by Jelmer Vernooij
Update pot file.
13389
#: en/help_topics/hooks.txt:301
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13390
msgid ""
13391
"set\n"
13392
"~~~"
13393
msgstr ""
13394
7185.1.1 by Jelmer Vernooij
Update pot file.
13395
#: en/help_topics/hooks.txt:306
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13396
msgid ""
13397
"Invoked when a config option is set. The signature is (stack, name,\n"
13398
"value)."
13399
msgstr ""
13400
7185.1.1 by Jelmer Vernooij
Update pot file.
13401
#: en/help_topics/hooks.txt:309
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13402
msgid ""
13403
"ControlDirHooks\n"
13404
"---------------"
13405
msgstr ""
13406
7185.1.1 by Jelmer Vernooij
Update pot file.
13407
#: en/help_topics/hooks.txt:312
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13408
msgid ""
13409
"post_repo_init\n"
13410
"~~~~~~~~~~~~~~"
13411
msgstr ""
13412
7185.1.1 by Jelmer Vernooij
Update pot file.
13413
#: en/help_topics/hooks.txt:317
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13414
msgid ""
13415
"Invoked after a repository has been initialized. post_repo_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13416
"called with a breezy.controldir.RepoInitHookParams."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13417
msgstr ""
13418
7185.1.1 by Jelmer Vernooij
Update pot file.
13419
#: en/help_topics/hooks.txt:320
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13420
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13421
"pre_open\n"
13422
"~~~~~~~~"
13423
msgstr ""
13424
7185.1.1 by Jelmer Vernooij
Update pot file.
13425
#: en/help_topics/hooks.txt:323
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13426
msgid "Introduced in: 1.14"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13427
msgstr ""
13428
7185.1.1 by Jelmer Vernooij
Update pot file.
13429
#: en/help_topics/hooks.txt:325
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13430
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13431
"Invoked before attempting to open a ControlDir with the transport that\n"
13432
"the open will use."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13433
msgstr ""
13434
7185.1.1 by Jelmer Vernooij
Update pot file.
13435
#: en/help_topics/hooks.txt:328
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13436
msgid ""
13437
"InfoHooks\n"
13438
"---------"
13439
msgstr ""
13440
7185.1.1 by Jelmer Vernooij
Update pot file.
13441
#: en/help_topics/hooks.txt:331
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13442
msgid ""
13443
"repository\n"
13444
"~~~~~~~~~~"
13445
msgstr ""
13446
7185.1.1 by Jelmer Vernooij
Update pot file.
13447
#: en/help_topics/hooks.txt:334 en/help_topics/hooks.txt:353
6504.1.1 by Vincent Ladeuil
Update translation template
13448
#: en/help_topics/hooks.txt:524
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13449
msgid "Introduced in: 1.15"
13450
msgstr ""
13451
7185.1.1 by Jelmer Vernooij
Update pot file.
13452
#: en/help_topics/hooks.txt:336
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13453
msgid ""
13454
"Invoked when displaying the statistics for a repository. repository is\n"
13455
"called with a statistics dictionary as returned by the repository and\n"
13456
"a file-like object to write to."
13457
msgstr ""
13458
7185.1.1 by Jelmer Vernooij
Update pot file.
13459
#: en/help_topics/hooks.txt:340
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13460
msgid ""
13461
"LockHooks\n"
13462
"---------"
13463
msgstr ""
13464
7185.1.1 by Jelmer Vernooij
Update pot file.
13465
#: en/help_topics/hooks.txt:343
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13466
msgid ""
13467
"lock_acquired\n"
13468
"~~~~~~~~~~~~~"
13469
msgstr ""
13470
7185.1.1 by Jelmer Vernooij
Update pot file.
13471
#: en/help_topics/hooks.txt:348
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13472
msgid "Called with a breezy.lock.LockResult when a physical lock is acquired."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13473
msgstr ""
13474
7185.1.1 by Jelmer Vernooij
Update pot file.
13475
#: en/help_topics/hooks.txt:350
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13476
msgid ""
13477
"lock_broken\n"
13478
"~~~~~~~~~~~"
13479
msgstr ""
13480
7185.1.1 by Jelmer Vernooij
Update pot file.
13481
#: en/help_topics/hooks.txt:355
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13482
msgid "Called with a breezy.lock.LockResult when a physical lock is broken."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13483
msgstr ""
13484
7185.1.1 by Jelmer Vernooij
Update pot file.
13485
#: en/help_topics/hooks.txt:357
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13486
msgid ""
13487
"lock_released\n"
13488
"~~~~~~~~~~~~~"
13489
msgstr ""
13490
7185.1.1 by Jelmer Vernooij
Update pot file.
13491
#: en/help_topics/hooks.txt:362
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13492
msgid "Called with a breezy.lock.LockResult when a physical lock is released."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13493
msgstr ""
13494
7185.1.1 by Jelmer Vernooij
Update pot file.
13495
#: en/help_topics/hooks.txt:364
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13496
msgid ""
13497
"MergeHooks\n"
13498
"----------"
13499
msgstr ""
13500
7185.1.1 by Jelmer Vernooij
Update pot file.
13501
#: en/help_topics/hooks.txt:367
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13502
msgid ""
13503
"merge_file_content\n"
13504
"~~~~~~~~~~~~~~~~~~"
13505
msgstr ""
13506
7185.1.1 by Jelmer Vernooij
Update pot file.
13507
#: en/help_topics/hooks.txt:370
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13508
msgid "Introduced in: 2.1"
13509
msgstr ""
13510
7185.1.1 by Jelmer Vernooij
Update pot file.
13511
#: en/help_topics/hooks.txt:372
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13512
msgid ""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13513
"Called with a breezy.merge.Merger object to create a per file merge\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13514
"object when starting a merge. Should return either None or a subclass\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13515
"of ``breezy.merge.AbstractPerFileMerger``. Such objects will then be\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13516
"called per file that needs to be merged (including when one side has\n"
13517
"deleted the file and the other has changed it). See the\n"
13518
"AbstractPerFileMerger API docs for details on how it is used by merge."
13519
msgstr ""
13520
7185.1.1 by Jelmer Vernooij
Update pot file.
13521
#: en/help_topics/hooks.txt:379
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13522
msgid ""
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13523
"post_merge\n"
13524
"~~~~~~~~~~"
13525
msgstr ""
13526
7185.1.1 by Jelmer Vernooij
Update pot file.
13527
#: en/help_topics/hooks.txt:382 en/help_topics/hooks.txt:390
13528
#: en/help_topics/hooks.txt:440 en/help_topics/hooks.txt:458
13529
#: en/help_topics/hooks.txt:466 en/help_topics/hooks.txt:512
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13530
msgid "Introduced in: 2.5"
13531
msgstr ""
13532
7185.1.1 by Jelmer Vernooij
Update pot file.
13533
#: en/help_topics/hooks.txt:384
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13534
msgid ""
13535
"Called after a merge. Receives a Merger object as the single argument.\n"
13536
"The return value is ignored."
13537
msgstr ""
13538
7185.1.1 by Jelmer Vernooij
Update pot file.
13539
#: en/help_topics/hooks.txt:387
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13540
msgid ""
13541
"pre_merge\n"
13542
"~~~~~~~~~"
13543
msgstr ""
13544
7185.1.1 by Jelmer Vernooij
Update pot file.
13545
#: en/help_topics/hooks.txt:392
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13546
msgid ""
13547
"Called before a merge. Receives a Merger object as the single\n"
13548
"argument."
13549
msgstr ""
13550
7185.1.1 by Jelmer Vernooij
Update pot file.
13551
#: en/help_topics/hooks.txt:395
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13552
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13553
"MergeDirectiveHooks\n"
13554
"-------------------"
13555
msgstr ""
13556
7185.1.1 by Jelmer Vernooij
Update pot file.
13557
#: en/help_topics/hooks.txt:398
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13558
msgid ""
13559
"merge_request_body\n"
13560
"~~~~~~~~~~~~~~~~~~"
13561
msgstr ""
13562
7185.1.1 by Jelmer Vernooij
Update pot file.
13563
#: en/help_topics/hooks.txt:401
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13564
msgid "Introduced in: 1.15.0"
13565
msgstr ""
13566
7185.1.1 by Jelmer Vernooij
Update pot file.
13567
#: en/help_topics/hooks.txt:403
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13568
msgid ""
13569
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
13570
"request.  Callbacks must return a body.  If more than one callback is\n"
13571
"registered, the output of one callback is provided to the next."
13572
msgstr ""
13573
7185.1.1 by Jelmer Vernooij
Update pot file.
13574
#: en/help_topics/hooks.txt:407
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13575
msgid ""
13576
"MessageEditorHooks\n"
13577
"------------------"
13578
msgstr ""
13579
7185.1.1 by Jelmer Vernooij
Update pot file.
13580
#: en/help_topics/hooks.txt:410
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13581
msgid ""
13582
"commit_message_template\n"
13583
"~~~~~~~~~~~~~~~~~~~~~~~"
13584
msgstr ""
13585
7185.1.1 by Jelmer Vernooij
Update pot file.
13586
#: en/help_topics/hooks.txt:413
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13587
msgid "Introduced in: 1.10"
13588
msgstr ""
13589
7185.1.1 by Jelmer Vernooij
Update pot file.
13590
#: en/help_topics/hooks.txt:415
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13591
msgid ""
13592
"Called when a commit message is being generated.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13593
"commit_message_template is called with the breezy.commit.Commit object\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13594
"and the message that is known so far. commit_message_template must\n"
13595
"return a new message to use (which could be the same as it was given).\n"
13596
"When there are multiple hooks registered for commit_message_template,\n"
13597
"they are chained with the result from the first passed into the\n"
13598
"second, and so on."
13599
msgstr ""
13600
7185.1.1 by Jelmer Vernooij
Update pot file.
13601
#: en/help_topics/hooks.txt:423
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13602
msgid ""
13603
"set_commit_message\n"
13604
"~~~~~~~~~~~~~~~~~~"
13605
msgstr ""
13606
7185.1.1 by Jelmer Vernooij
Update pot file.
13607
#: en/help_topics/hooks.txt:428
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13608
msgid ""
13609
"Set a fixed commit message. set_commit_message is called with the\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13610
"breezy.commit.Commit object (so you can also change e.g. revision\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13611
"properties by editing commit.builder._revprops) and the message so\n"
13612
"far. set_commit_message must return the message to use or None if it\n"
13613
"should use the message editor as normal."
13614
msgstr ""
13615
7185.1.1 by Jelmer Vernooij
Update pot file.
13616
#: en/help_topics/hooks.txt:434
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13617
msgid ""
13618
"MutableTreeHooks\n"
13619
"----------------"
13620
msgstr ""
13621
7185.1.1 by Jelmer Vernooij
Update pot file.
13622
#: en/help_topics/hooks.txt:437
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13623
msgid ""
13624
"post_build_tree\n"
13625
"~~~~~~~~~~~~~~~"
13626
msgstr ""
13627
7185.1.1 by Jelmer Vernooij
Update pot file.
13628
#: en/help_topics/hooks.txt:442
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13629
msgid ""
13630
"Called after a completely new tree is built. The hook is called with\n"
13631
"the tree as its only argument."
13632
msgstr ""
13633
7185.1.1 by Jelmer Vernooij
Update pot file.
13634
#: en/help_topics/hooks.txt:448
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13635
msgid "Introduced in: 2.0"
13636
msgstr ""
13637
7185.1.1 by Jelmer Vernooij
Update pot file.
13638
#: en/help_topics/hooks.txt:450
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13639
msgid ""
13640
"Called after a commit is performed on a tree. The hook is called with\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13641
"a breezy.mutabletree.PostCommitHookParams object. The mutable tree the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13642
"commit was performed on is available via the mutable_tree attribute of\n"
13643
"that object."
13644
msgstr ""
13645
7185.1.1 by Jelmer Vernooij
Update pot file.
13646
#: en/help_topics/hooks.txt:455
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13647
msgid ""
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13648
"post_transform\n"
13649
"~~~~~~~~~~~~~~"
13650
msgstr ""
13651
7185.1.1 by Jelmer Vernooij
Update pot file.
13652
#: en/help_topics/hooks.txt:460
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13653
msgid ""
13654
"Called after a tree transform has been performed on a tree. The hook\n"
13655
"is called with the tree that is being transformed and the transform."
13656
msgstr ""
13657
7185.1.1 by Jelmer Vernooij
Update pot file.
13658
#: en/help_topics/hooks.txt:463
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13659
msgid ""
13660
"pre_transform\n"
13661
"~~~~~~~~~~~~~"
13662
msgstr ""
13663
7185.1.1 by Jelmer Vernooij
Update pot file.
13664
#: en/help_topics/hooks.txt:468
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13665
msgid ""
13666
"Called before a tree transform on this tree. The hook is called with\n"
13667
"the tree that is being transformed and the transform."
13668
msgstr ""
13669
7185.1.1 by Jelmer Vernooij
Update pot file.
13670
#: en/help_topics/hooks.txt:471
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13671
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13672
"start_commit\n"
13673
"~~~~~~~~~~~~"
13674
msgstr ""
13675
7185.1.1 by Jelmer Vernooij
Update pot file.
13676
#: en/help_topics/hooks.txt:476
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13677
msgid ""
13678
"Called before a commit is performed on a tree. The start commit hook\n"
13679
"is able to change the tree before the commit takes place. start_commit\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13680
"is called with the breezy.mutabletree.MutableTree that the commit is\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13681
"being performed on."
13682
msgstr ""
13683
6504.1.1 by Vincent Ladeuil
Update translation template
13684
#: en/help_topics/hooks.txt:481
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13685
msgid ""
13686
"StatusHooks\n"
13687
"-----------"
13688
msgstr ""
13689
6504.1.1 by Vincent Ladeuil
Update translation template
13690
#: en/help_topics/hooks.txt:484
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13691
msgid ""
13692
"post_status\n"
13693
"~~~~~~~~~~~"
13694
msgstr ""
13695
6504.1.1 by Vincent Ladeuil
Update translation template
13696
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13697
msgid "Introduced in: 2.3"
13698
msgstr ""
13699
6504.1.1 by Vincent Ladeuil
Update translation template
13700
#: en/help_topics/hooks.txt:489
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13701
msgid ""
13702
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13703
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13704
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13705
"correspond to the command line options specified by the user for the\n"
13706
"status command. to_file is the output stream for writing."
13707
msgstr ""
13708
6504.1.1 by Vincent Ladeuil
Update translation template
13709
#: en/help_topics/hooks.txt:495
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13710
msgid ""
13711
"pre_status\n"
13712
"~~~~~~~~~~"
13713
msgstr ""
13714
6504.1.1 by Vincent Ladeuil
Update translation template
13715
#: en/help_topics/hooks.txt:500
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13716
msgid ""
13717
"Called with argument StatusHookParams before Bazaar displays the\n"
13718
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13719
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13720
"correspond to the command line options specified by the user for the\n"
13721
"status command. to_file is the output stream for writing."
13722
msgstr ""
13723
6504.1.1 by Vincent Ladeuil
Update translation template
13724
#: en/help_topics/hooks.txt:506
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13725
msgid ""
13726
"TransportHooks\n"
13727
"--------------"
13728
msgstr ""
13729
6504.1.1 by Vincent Ladeuil
Update translation template
13730
#: en/help_topics/hooks.txt:509
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13731
msgid ""
13732
"post_connect\n"
13733
"~~~~~~~~~~~~"
13734
msgstr ""
13735
6504.1.1 by Vincent Ladeuil
Update translation template
13736
#: en/help_topics/hooks.txt:514
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13737
msgid ""
13738
"Called after a new connection is established or a reconnect occurs.\n"
13739
"The sole argument passed is either the connected transport or smart\n"
13740
"medium instance."
13741
msgstr ""
13742
6504.1.1 by Vincent Ladeuil
Update translation template
13743
#: en/help_topics/hooks.txt:518
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13744
msgid ""
13745
"RioVersionInfoBuilderHooks\n"
13746
"--------------------------"
13747
msgstr ""
13748
6504.1.1 by Vincent Ladeuil
Update translation template
13749
#: en/help_topics/hooks.txt:521
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13750
msgid ""
13751
"revision\n"
13752
"~~~~~~~~"
13753
msgstr ""
13754
6504.1.1 by Vincent Ladeuil
Update translation template
13755
#: en/help_topics/hooks.txt:526
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13756
msgid ""
13757
"Invoked when adding information about a revision to the RIO stanza\n"
13758
"that is printed. revision is called with a revision object and a RIO\n"
13759
"stanza.\n"
13760
msgstr ""
13761
13762
#: en/help_topics/location-alias.txt:1
13763
msgid ""
13764
"Location aliases\n"
13765
"================"
13766
msgstr ""
13767
13768
#: en/help_topics/location-alias.txt:4
13769
msgid ""
13770
"Bazaar defines several aliases for locations associated with a branch.  "
13771
"These\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13772
"can be used with most commands that expect a location, such as `brz push`."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13773
msgstr ""
13774
13775
#: en/help_topics/location-alias.txt:7
13776
msgid "The aliases are::"
13777
msgstr ""
13778
13779
#: en/help_topics/location-alias.txt:9
13780
msgid ""
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13781
"  :bound     The branch this branch is bound to, for bound branches.\n"
13782
"  :parent    The parent of this branch.\n"
13783
"  :public    The public location of this branch.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13784
"  :push      The saved location used for `brz push` with no arguments.\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13785
"  :submit    The submit branch for this branch.\n"
13786
"  :this      This branch."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13787
msgstr ""
13788
13789
#: en/help_topics/location-alias.txt:16
13790
msgid "For example, to push to the parent location::"
13791
msgstr ""
13792
13793
#: en/help_topics/location-alias.txt:18
7185.1.1 by Jelmer Vernooij
Update pot file.
13794
msgid "    brz push :parent\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13795
msgstr ""
13796
13797
#: en/help_topics/log-formats.txt:1
13798
msgid ""
13799
"Log Formats\n"
13800
"==========="
13801
msgstr ""
13802
13803
#: en/help_topics/log-formats.txt:4
13804
msgid ""
13805
"A log format controls how information about each revision is displayed.\n"
13806
"The standard log formats are compared below::"
13807
msgstr ""
13808
13809
#: en/help_topics/log-formats.txt:7
13810
msgid ""
13811
"  Feature                 long           short         line\n"
13812
"  ----------------------  -------------  ------------  -------------------\n"
13813
"  design goal             detailed view  concise view  1 revision per line\n"
13814
"  committer               name+email     name only     name only\n"
13815
"  author                  name+email     -             -\n"
13816
"  date-time format        full           date only     date only\n"
13817
"  commit message          full           full          top line\n"
13818
"  tags                    yes            yes           yes\n"
13819
"  merges indicator        -              yes           -\n"
13820
"  status/delta            optional       optional      -\n"
13821
"  diff/patch              optional       optional      -\n"
13822
"  revision-id             optional       optional      -\n"
13823
"  branch nick             yes            -             -\n"
13824
"  foreign vcs properties  yes            yes           -\n"
13825
"  preferred levels        all            1             1\n"
13826
"  digital signature       optional       -             -"
13827
msgstr ""
13828
13829
#: en/help_topics/log-formats.txt:24
13830
msgid ""
13831
"The default format is ``long``. To change this, define the ``log_format``\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13832
"setting in the ``[DEFAULT]`` section of ``breezy.conf`` like this (say)::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13833
msgstr ""
13834
13835
#: en/help_topics/log-formats.txt:27
13836
msgid ""
13837
"  [DEFAULT]\n"
13838
"  log_format = short"
13839
msgstr ""
13840
13841
#: en/help_topics/log-formats.txt:30
13842
msgid ""
13843
"Alternatively, to change the log format used for a given query, use the\n"
13844
"--long, --short or --line options."
13845
msgstr ""
13846
13847
#: en/help_topics/log-formats.txt:33
13848
msgid ""
13849
"If one of the standard log formats does not meet your needs, additional\n"
13850
"formats can be provided by plugins.\n"
13851
msgstr ""
13852
7185.1.1 by Jelmer Vernooij
Update pot file.
13853
#: en/help_topics/missing-extensions.txt:1
13854
msgid ""
13855
"Missing Extensions\n"
13856
"=================="
13857
msgstr ""
13858
13859
#: en/help_topics/missing-extensions.txt:4
13860
msgid ""
13861
"Breezy gives a warning if it failed to load some compiled extensions. (See\n"
13862
"http://bazaarvcs.wordpress.com/2009/09/17/extension-warnings/ for "
13863
"background.)"
13864
msgstr ""
13865
13866
#: en/help_topics/missing-extensions.txt:7
13867
msgid ""
13868
"This may indicate either that there's been a problem installing or "
13869
"packaging\n"
13870
"Breezy, or it may just be a case where you don't want to use the compiled\n"
13871
"extensions."
13872
msgstr ""
13873
13874
#: en/help_topics/missing-extensions.txt:11
13875
msgid ""
13876
"1. If you installed Breezy from an official binary package or a "
13877
"distribution\n"
13878
"and you're seeing this warning, please report a bug."
13879
msgstr ""
13880
13881
#: en/help_topics/missing-extensions.txt:14
13882
msgid ""
13883
"2. If you're running Breezy from a source tree or tarball, please run 'make' "
13884
"in\n"
13885
"that directory to compile the extensions. You should do this every time you\n"
13886
"update the tree. To do this you will need some build dependencies installed\n"
13887
"including make, a C compiler, and the Python header files."
13888
msgstr ""
13889
13890
#: en/help_topics/missing-extensions.txt:19
13891
msgid ""
13892
"3. If you can't or don't want to build the extensions, add this line to\n"
13893
"breezy.conf (whose location is shown by 'brz --version')::"
13894
msgstr ""
13895
13896
#: en/help_topics/missing-extensions.txt:22
13897
msgid "  suppress_warnings=missing_extensions"
13898
msgstr ""
13899
13900
#: en/help_topics/missing-extensions.txt:24
13901
msgid "Breezy will work normally but some operations may be slower."
13902
msgstr ""
13903
13904
#: en/help_topics/missing-extensions.txt:26
13905
msgid "The specific modules that failed, and why, are listed in .brz.log.\n"
13906
msgstr ""
13907
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13908
#: en/help_topics/other-formats.txt:1
13909
msgid "Other Storage Formats"
13910
msgstr ""
13911
13912
#: en/help_topics/other-formats.txt:3
7185.1.1 by Jelmer Vernooij
Update pot file.
13913
msgid "No experimental formats are available."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13914
msgstr ""
13915
13916
#: en/help_topics/other-formats.txt:5
13917
msgid ""
13918
"\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13919
"No deprecated formats are available."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13920
msgstr ""
13921
13922
#: en/help_topics/patterns.txt:1
13923
msgid ""
13924
"Patterns\n"
13925
"========"
13926
msgstr ""
13927
13928
#: en/help_topics/patterns.txt:4
13929
msgid ""
13930
"Bazaar uses patterns to match files at various times. For example,\n"
13931
"the ``add`` command skips over files that match ignore patterns\n"
13932
"and preferences can be associated with files using rule patterns.\n"
13933
"The pattern syntax is described below."
13934
msgstr ""
13935
13936
#: en/help_topics/patterns.txt:9
13937
msgid ""
13938
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13939
"slash or is a regular expression, it is compared to the whole path\n"
13940
"from the branch root. Otherwise, it is compared to only the last\n"
13941
"component of the path. To match a file only in the root directory,\n"
13942
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13943
msgstr ""
13944
13945
#: en/help_topics/patterns.txt:15
13946
msgid "Patterns may include globbing wildcards such as::"
13947
msgstr ""
13948
13949
#: en/help_topics/patterns.txt:17
13950
msgid ""
13951
"  ? - Matches any single character except '/'\n"
13952
"  * - Matches 0 or more characters except '/'\n"
13953
"  /**/ - Matches 0 or more directories in a path\n"
13954
"  [a-z] - Matches a single character from within a group of characters"
13955
msgstr ""
13956
13957
#: en/help_topics/patterns.txt:22
13958
msgid ""
13959
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13960
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13961
"expression.  Regular expression patterns may not include named or\n"
13962
"numbered groups."
13963
msgstr ""
13964
13965
#: en/help_topics/patterns.txt:27
13966
msgid ""
13967
"Case insensitive ignore patterns can be specified with regular expressions\n"
13968
"by using the ``i`` (for ignore case) flag in the pattern."
13969
msgstr ""
13970
13971
#: en/help_topics/patterns.txt:30
13972
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
13973
msgstr ""
13974
13975
#: en/help_topics/patterns.txt:32
13976
msgid "  RE:(?i)foo"
13977
msgstr ""
13978
13979
#: en/help_topics/patterns.txt:34
13980
msgid ""
13981
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13982
"matched by that pattern will not be ignored."
13983
msgstr ""
13984
13985
#: en/help_topics/patterns.txt:37
13986
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
13987
msgstr ""
13988
13989
#: en/help_topics/revisionspec.txt:1
13990
msgid "Revision Identifiers"
13991
msgstr ""
13992
13993
#: en/help_topics/revisionspec.txt:3
13994
msgid ""
13995
"A revision identifier refers to a specific state of a branch's history.  It\n"
13996
"can be expressed in several ways.  It can begin with a keyword to\n"
13997
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13998
"'before:yesterday' and 'submit:'."
13999
msgstr ""
14000
14001
#: en/help_topics/revisionspec.txt:8
14002
msgid ""
14003
"Alternately, it can be given without a keyword, in which case it will be\n"
14004
"checked as a revision number, a tag, a revision id, a date specification, or "
14005
"a\n"
14006
"branch specification, in that order.  For example, 'date:today' could be\n"
14007
"written as simply 'today', though if you have a tag called 'today' that "
14008
"will\n"
14009
"be found first."
14010
msgstr ""
14011
14012
#: en/help_topics/revisionspec.txt:14
14013
msgid ""
14014
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
14015
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
14016
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
14017
"or\n"
14018
"spaces around the '..')."
14019
msgstr ""
14020
14021
#: en/help_topics/revisionspec.txt:19
14022
msgid ""
14023
"Ranges are interpreted differently by different commands. To the \"log\" "
14024
"command,\n"
14025
"a range is a sequence of log messages, but to the \"diff\" command, the "
14026
"range\n"
14027
"denotes a change between revisions (and not a sequence of changes).  In\n"
14028
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
14029
"consider it\n"
14030
"to be open-ended, that is, they include one end but not the other.  For "
14031
"example:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14032
"\"brz log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14033
"3649,\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14034
"while \"brz diff -r 3647..3649\" includes the changes done in revisions 3648 "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14035
"and\n"
14036
"3649, but not 3647."
14037
msgstr ""
14038
14039
#: en/help_topics/revisionspec.txt:28
14040
msgid "The keywords used as revision selection methods are the following:"
14041
msgstr ""
14042
14043
#: en/help_topics/revisionspec.txt:30
14044
msgid ""
14045
":revid:\n"
14046
"\tSelects a revision using the revision id.\n"
14047
":submit:\n"
14048
"\tSelects a common ancestor with the submit branch.\n"
14049
":ancestor:\n"
14050
"\tSelects a common ancestor with a second branch.\n"
14051
":date:\n"
14052
"\tSelects a revision on the basis of a datestamp.\n"
14053
":branch:\n"
14054
"\tSelects the last revision of a specified branch.\n"
14055
":tag:\n"
14056
"\tSelects a revision identified by a tag name.\n"
14057
":revno:\n"
14058
"\tSelects a revision using a number.\n"
14059
":before:\n"
14060
"\tSelects the parent of the revision specified.\n"
14061
":annotate:\n"
14062
"\tSelect the revision that last modified the specified line.\n"
14063
":mainline:\n"
14064
"\tSelect mainline revision that merged the specified revision.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14065
":git:\n"
14066
"\tSelects a revision using a Git revision sha1.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14067
":last:\n"
14068
"\tSelects the nth revision from the end."
14069
msgstr ""
14070
7185.1.1 by Jelmer Vernooij
Update pot file.
14071
#: en/help_topics/revisionspec.txt:55
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14072
msgid "In addition, plugins can provide other keywords."
14073
msgstr ""
14074
7185.1.1 by Jelmer Vernooij
Update pot file.
14075
#: en/help_topics/revisionspec.txt:57
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14076
msgid "A detailed description of each keyword is given below."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14077
msgstr ""
14078
7185.1.1 by Jelmer Vernooij
Update pot file.
14079
#: en/help_topics/revisionspec.txt:59
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14080
msgid ":revid:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14081
msgstr ""
14082
7185.1.1 by Jelmer Vernooij
Update pot file.
14083
#: en/help_topics/revisionspec.txt:61
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14084
msgid ""
14085
"    Supply a specific revision id, that can be used to specify any\n"
14086
"    revision id in the ancestry of the branch.\n"
14087
"    Including merges, and pending merges.\n"
14088
"    Examples::"
14089
msgstr ""
14090
7185.1.1 by Jelmer Vernooij
Update pot file.
14091
#: en/help_topics/revisionspec.txt:66
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14092
msgid ""
14093
"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
14094
msgstr ""
14095
7185.1.1 by Jelmer Vernooij
Update pot file.
14096
#: en/help_topics/revisionspec.txt:68
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14097
msgid ":submit:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14098
msgstr ""
14099
7185.1.1 by Jelmer Vernooij
Update pot file.
14100
#: en/help_topics/revisionspec.txt:70
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14101
msgid ""
14102
"    Diffing against this shows all the changes that were made in this "
14103
"branch,\n"
14104
"    and is a good predictor of what merge will do.  The submit branch is\n"
14105
"    used by the bundle and merge directive commands.  If no submit branch\n"
14106
"    is specified, the parent branch is used instead."
14107
msgstr ""
14108
7185.1.1 by Jelmer Vernooij
Update pot file.
14109
#: en/help_topics/revisionspec.txt:75 en/help_topics/revisionspec.txt:87
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14110
msgid ""
14111
"    The common ancestor is the last revision that existed in both\n"
14112
"    branches. Usually this is the branch point, but it could also be\n"
14113
"    a revision that was merged."
14114
msgstr ""
14115
7185.1.1 by Jelmer Vernooij
Update pot file.
14116
#: en/help_topics/revisionspec.txt:79 en/help_topics/revisionspec.txt:95
14117
#: en/help_topics/revisionspec.txt:111 en/help_topics/revisionspec.txt:121
14118
#: en/help_topics/revisionspec.txt:155
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14119
msgid "    Examples::"
14120
msgstr ""
14121
7185.1.1 by Jelmer Vernooij
Update pot file.
14122
#: en/help_topics/revisionspec.txt:81
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14123
msgid "      $ bzr diff -r submit:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14124
msgstr ""
14125
7185.1.1 by Jelmer Vernooij
Update pot file.
14126
#: en/help_topics/revisionspec.txt:83
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14127
msgid ":ancestor:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14128
msgstr ""
14129
7185.1.1 by Jelmer Vernooij
Update pot file.
14130
#: en/help_topics/revisionspec.txt:85
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14131
msgid "    Supply the path to a branch to select the common ancestor."
14132
msgstr ""
14133
7185.1.1 by Jelmer Vernooij
Update pot file.
14134
#: en/help_topics/revisionspec.txt:91
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14135
msgid ""
14136
"    This is frequently used with 'diff' to return all of the changes\n"
14137
"    that your branch introduces, while excluding the changes that you\n"
14138
"    have not merged from the remote branch."
14139
msgstr ""
14140
7185.1.1 by Jelmer Vernooij
Update pot file.
14141
#: en/help_topics/revisionspec.txt:97
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14142
msgid ""
14143
"      ancestor:/path/to/branch\n"
14144
"      $ bzr diff -r ancestor:../../mainline/branch"
14145
msgstr ""
14146
7185.1.1 by Jelmer Vernooij
Update pot file.
14147
#: en/help_topics/revisionspec.txt:100
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14148
msgid ":date:"
14149
msgstr ""
14150
7185.1.1 by Jelmer Vernooij
Update pot file.
14151
#: en/help_topics/revisionspec.txt:102
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14152
msgid ""
14153
"    Supply a datestamp to select the first revision that matches the date.\n"
14154
"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
14155
"    Matches the first entry after a given date (either at midnight or\n"
14156
"    at a specified time)."
14157
msgstr ""
14158
7185.1.1 by Jelmer Vernooij
Update pot file.
14159
#: en/help_topics/revisionspec.txt:107
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14160
msgid "    One way to display all the changes since yesterday would be::"
14161
msgstr ""
14162
7185.1.1 by Jelmer Vernooij
Update pot file.
14163
#: en/help_topics/revisionspec.txt:109
14164
msgid "        brz log -r date:yesterday.."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14165
msgstr ""
14166
7185.1.1 by Jelmer Vernooij
Update pot file.
14167
#: en/help_topics/revisionspec.txt:113
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14168
msgid ""
14169
"      date:yesterday            -> select the first revision since "
14170
"yesterday\n"
14171
"      date:2006-08-14,17:10:14  -> select the first revision after\n"
14172
"                                   August 14th, 2006 at 5:10pm."
14173
msgstr ""
14174
7185.1.1 by Jelmer Vernooij
Update pot file.
14175
#: en/help_topics/revisionspec.txt:117
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14176
msgid ":branch:"
14177
msgstr ""
14178
7185.1.1 by Jelmer Vernooij
Update pot file.
14179
#: en/help_topics/revisionspec.txt:119
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14180
msgid "    Supply the path to a branch to select its last revision."
14181
msgstr ""
14182
7185.1.1 by Jelmer Vernooij
Update pot file.
14183
#: en/help_topics/revisionspec.txt:123
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14184
msgid "      branch:/path/to/branch"
14185
msgstr ""
14186
7185.1.1 by Jelmer Vernooij
Update pot file.
14187
#: en/help_topics/revisionspec.txt:125
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14188
msgid ":tag:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14189
msgstr ""
14190
7185.1.1 by Jelmer Vernooij
Update pot file.
14191
#: en/help_topics/revisionspec.txt:127
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14192
msgid "    Tags are stored in the branch and created by the 'tag' command."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14193
msgstr ""
14194
7185.1.1 by Jelmer Vernooij
Update pot file.
14195
#: en/help_topics/revisionspec.txt:129
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14196
msgid ":revno:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14197
msgstr ""
14198
7185.1.1 by Jelmer Vernooij
Update pot file.
14199
#: en/help_topics/revisionspec.txt:131
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14200
msgid ""
14201
"    Use an integer to specify a revision in the history of the branch.\n"
14202
"    Optionally a branch can be specified.  A negative number will count\n"
14203
"    from the end of the branch (-1 is the last revision, -2 the previous\n"
14204
"    one). If the negative number is larger than the branch's history, the\n"
14205
"    first revision is returned.\n"
14206
"    Examples::"
14207
msgstr ""
14208
7185.1.1 by Jelmer Vernooij
Update pot file.
14209
#: en/help_topics/revisionspec.txt:138
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14210
msgid ""
14211
"      revno:1                   -> return the first revision of this branch\n"
14212
"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
14213
"                                   the branch '/path/to/branch'\n"
14214
"      revno:-1                  -> The last revision in a branch.\n"
14215
"      -2:http://other/branch    -> The second to last revision in the\n"
14216
"                                   remote branch.\n"
14217
"      -1000000                  -> Most likely the first revision, unless\n"
14218
"                                   your history is very long."
14219
msgstr ""
14220
7185.1.1 by Jelmer Vernooij
Update pot file.
14221
#: en/help_topics/revisionspec.txt:147
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14222
msgid ":before:"
14223
msgstr ""
14224
7185.1.1 by Jelmer Vernooij
Update pot file.
14225
#: en/help_topics/revisionspec.txt:149
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14226
msgid ""
14227
"    Supply any revision spec to return the parent of that revision.  This "
14228
"is\n"
14229
"    mostly useful when inspecting revisions that are not in the revision "
14230
"history\n"
14231
"    of a branch."
14232
msgstr ""
14233
7185.1.1 by Jelmer Vernooij
Update pot file.
14234
#: en/help_topics/revisionspec.txt:153
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14235
msgid ""
14236
"    It is an error to request the parent of the null revision (before:0)."
14237
msgstr ""
14238
7185.1.1 by Jelmer Vernooij
Update pot file.
14239
#: en/help_topics/revisionspec.txt:157
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14240
msgid ""
14241
"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
14242
"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
14243
"                                            aaaa@bbbb-1234567890\n"
14244
"      bzr diff -r before:1913..1913\n"
14245
"            -> Find the changes between revision 1913 and its parent "
14246
"(1912).\n"
14247
"               (What changes did revision 1913 introduce).\n"
14248
"               This is equivalent to:  bzr diff -c 1913"
14249
msgstr ""
14250
7185.1.1 by Jelmer Vernooij
Update pot file.
14251
#: en/help_topics/revisionspec.txt:165
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14252
msgid ":annotate:"
14253
msgstr ""
14254
7185.1.1 by Jelmer Vernooij
Update pot file.
14255
#: en/help_topics/revisionspec.txt:167
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14256
msgid ""
14257
"    Select the revision that last modified the specified line.  Line is\n"
14258
"    specified as path:number.  Path is a relative path to the file.  "
14259
"Numbers\n"
14260
"    start at 1, and are relative to the current version, not the last-\n"
14261
"    committed version of the file."
14262
msgstr ""
14263
7185.1.1 by Jelmer Vernooij
Update pot file.
14264
#: en/help_topics/revisionspec.txt:172
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14265
msgid ":mainline:"
14266
msgstr ""
14267
7185.1.1 by Jelmer Vernooij
Update pot file.
14268
#: en/help_topics/revisionspec.txt:174
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14269
msgid ""
14270
"    Select the revision that merged the specified revision into mainline."
14271
msgstr ""
14272
7185.1.1 by Jelmer Vernooij
Update pot file.
14273
#: en/help_topics/revisionspec.txt:176
14274
msgid ":git:"
14275
msgstr ""
14276
14277
#: en/help_topics/revisionspec.txt:178
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14278
msgid ":last:"
14279
msgstr ""
14280
7185.1.1 by Jelmer Vernooij
Update pot file.
14281
#: en/help_topics/revisionspec.txt:180
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14282
msgid ""
14283
"    Supply a positive number to get the nth revision from the end.\n"
14284
"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
14285
"    Examples::"
14286
msgstr ""
14287
7185.1.1 by Jelmer Vernooij
Update pot file.
14288
#: en/help_topics/revisionspec.txt:184
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14289
msgid ""
14290
"      last:1        -> return the last revision\n"
14291
"      last:3        -> return the revision 2 before the end.\n"
14292
msgstr ""
14293
14294
#: en/help_topics/rules.txt:1
14295
msgid ""
14296
"Rules\n"
14297
"====="
14298
msgstr ""
14299
14300
#: en/help_topics/rules.txt:7
14301
msgid ""
14302
"Rules are defined in ini file format where the sections are file glob\n"
14303
"patterns and the contents of each section are the preferences for files\n"
14304
"matching that pattern(s). For example::"
14305
msgstr ""
14306
14307
#: en/help_topics/rules.txt:11
14308
msgid ""
14309
"    [name *.bat]\n"
14310
"    eol = native"
14311
msgstr ""
14312
14313
#: en/help_topics/rules.txt:14
14314
msgid ""
14315
"    [name *.html *.xml]\n"
14316
"    keywords = xml_escape"
14317
msgstr ""
14318
14319
#: en/help_topics/rules.txt:17
14320
msgid ""
14321
"Preferences like these are useful for commands and plugins wishing to\n"
14322
"provide custom behaviour for selected files.  For more information on \n"
14323
"end of line conversion see :doc:`eol-help`.\n"
14324
"Keyword support is provided by the `keywords plugin\n"
14325
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
14326
msgstr ""
14327
14328
#: en/help_topics/rules.txt:23
14329
msgid ""
14330
"Files\n"
14331
"-----"
14332
msgstr ""
14333
14334
#: en/help_topics/rules.txt:26
14335
msgid ""
14336
"Default rules for all branches are defined in the optional file\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14337
"``BRZ_HOME/rules``. "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14338
msgstr ""
14339
14340
#: en/help_topics/rules.txt:29
14341
msgid ""
14342
"Rule Patterns\n"
14343
"-------------"
14344
msgstr ""
14345
14346
#: en/help_topics/rules.txt:32
14347
msgid ""
14348
"Patterns are ordered and searching stops as soon as one matches.\n"
14349
"As a consequence, more explicit patterns should be placed towards\n"
14350
"the top of the file. Rule patterns use exactly the same conventions\n"
14351
"as ignore patterns. See :doc:`patterns-help` for details."
14352
msgstr ""
14353
14354
#: en/help_topics/rules.txt:37
14355
msgid ".. note::"
14356
msgstr ""
14357
14358
#: en/help_topics/rules.txt:39
14359
msgid ""
14360
"   Patterns containing square brackets or spaces should be\n"
14361
"   surrounded in quotes to ensure they are correctly parsed.\n"
14362
msgstr ""
14363
14364
#: en/help_topics/topics.txt:1
14365
msgid ""
14366
"authentication       Information on configuring authentication\n"
14367
"basic                Basic commands\n"
14368
"branches             Information on what a branch is\n"
14369
"bugs                 Bug tracker settings\n"
14370
"checkouts            Information on what a checkout is\n"
14371
"configuration        Details on the configuration settings available\n"
14372
"conflict-types       Types of conflicts and what to do about them\n"
14373
"content-filters      Conversion of content into/from working trees\n"
14374
"criss-cross          Information on criss-cross merging\n"
14375
"current-formats      Current storage formats\n"
14376
"debug-flags          Options to show or record debug information\n"
14377
"diverged-branches    How to fix diverged branches\n"
14378
"env-variables        Environment variable names and values\n"
14379
"eol                  Information on end-of-line handling\n"
14380
"files                Information on configuration and log files\n"
14381
"formats              Information on choosing a storage format\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14382
"git                  Using Bazaar with Git\n"
14383
"global-options       Options that control how Breezy runs\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
14384
"glossary             Glossary\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14385
"hooks                Points at which custom processing can be added\n"
14386
"launchpad            Using Bazaar with Launchpad.net\n"
14387
"location-alias       Aliases for remembered locations\n"
14388
"log-formats          Details on the logging formats available\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14389
"missing-extensions   What to do when compiled extensions are missing\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14390
"other-formats        Experimental and deprecated storage formats\n"
14391
"patterns             Information on the pattern syntax\n"
14392
"repositories         Basic information on shared repositories.\n"
14393
"revisionspec         Explain how to use --revision\n"
14394
"rules                Information on defining rule-based preferences\n"
14395
"standalone-trees     Information on what a standalone tree is\n"
14396
"standard-options     Options that can be used with any command\n"
14397
"status-flags         Help on status flags\n"
14398
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
14399
"topics               Topics list\n"
14400
"url-special-chars    Special character handling in URLs\n"
14401
"urlspec              Supported transport protocols\n"
14402
"working-trees        Information on working trees\n"
14403
msgstr ""
14404
14405
#: en/help_topics/url-special-chars.txt:1
14406
msgid ""
14407
"Special character handling in URLs\n"
14408
"=================================="
14409
msgstr ""
14410
14411
#: en/help_topics/url-special-chars.txt:4
14412
msgid "Bazaar allows locations to be specified in multiple ways, either:"
14413
msgstr ""
14414
14415
#: en/help_topics/url-special-chars.txt:6
14416
msgid " * Fully qualified URLs"
14417
msgstr ""
14418
14419
#: en/help_topics/url-special-chars.txt:8
14420
msgid " * File system paths, relative or absolute"
14421
msgstr ""
14422
14423
#: en/help_topics/url-special-chars.txt:10
14424
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14425
"Internally brz treats all locations as URLs. For any file system paths\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14426
"that are specified it will automatically determine the appropriate URL\n"
14427
"representation, and escape special characters where necessary."
14428
msgstr ""
14429
14430
#: en/help_topics/url-special-chars.txt:14
14431
msgid ""
14432
"There are a few characters which have special meaning in URLs and need "
14433
"careful\n"
14434
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
14435
"value in URLs. Any non-ASCII characters in a file path will automatically "
14436
"be\n"
14437
"urlencoded when the path is converted to a URL."
14438
msgstr ""
14439
14440
#: en/help_topics/url-special-chars.txt:19
14441
msgid ""
14442
"URLs represent non-ASCII characters in an encoding defined by the server, "
14443
"but\n"
14444
"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
14445
"be\n"
14446
"generous in what it accepts as a URL and to print them in a way that\n"
14447
"will be readable."
14448
msgstr ""
14449
14450
#: en/help_topics/url-special-chars.txt:24
14451
msgid ""
14452
"For example, if you have a directory named '/tmp/%2False' these are all "
14453
"valid\n"
14454
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
14455
"slash)::"
14456
msgstr ""
14457
14458
#: en/help_topics/url-special-chars.txt:27
14459
msgid ""
14460
"  cd /tmp\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14461
"  brz log /tmp/%2False\n"
14462
"  brz log %2False\n"
14463
"  brz log file:///tmp/%252False\n"
14464
"  brz log file://localhost/tmp/%252False\n"
14465
"  brz log file:%252False"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14466
msgstr ""
14467
14468
#: en/help_topics/url-special-chars.txt:34
14469
msgid "These are valid but do not refer to the same file::"
14470
msgstr ""
14471
14472
#: en/help_topics/url-special-chars.txt:36
14473
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14474
"  brz log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
14475
"  brz log %252False (refers to a file called /tmp/%252False)"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14476
msgstr ""
14477
14478
#: en/help_topics/url-special-chars.txt:39
14479
msgid ""
14480
"Comma also has special meaning in URLs, because it denotes `segment "
14481
"parameters`_"
14482
msgstr ""
14483
14484
#: en/help_topics/url-special-chars.txt:41
14485
msgid ""
14486
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
14487
msgstr ""
14488
14489
#: en/help_topics/url-special-chars.txt:43
14490
msgid ""
14491
"Comma is also special in any file system paths that are specified. To use a "
14492
"literal\n"
14493
"comma in a file system path, specify a URL and URL encode the comma::"
14494
msgstr ""
14495
14496
#: en/help_topics/url-special-chars.txt:46
14497
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14498
"  brz log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14499
"\" set to \"bla\"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14500
"  brz log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
14501
"  brz log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14502
"\" set to \"bla\"\n"
14503
msgstr ""
14504
14505
#: en/help_topics/urlspec.txt:1
14506
msgid "URL Identifiers"
14507
msgstr ""
14508
14509
#: en/help_topics/urlspec.txt:3
14510
msgid "Supported URL prefixes::"
14511
msgstr ""
14512
14513
#: en/help_topics/urlspec.txt:5
14514
msgid ""
14515
"  bzr://              Fast access using the Bazaar smart server.\n"
14516
"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
14517
"  file://             Access using the standard filesystem (default)\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14518
"  git://              Access using the Git smart server protocol.\n"
14519
"  git+ssh://          Access using the Git smart server protocol over SSH.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14520
"  http://             Read-only access of branches exported on the web.\n"
14521
"  https://            Read-only access of branches exported on the web using "
14522
"SSL.\n"
14523
"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
14524
msgstr ""
14525
14526
#: en/help_topics/urlspec.txt:14
14527
msgid "Supported modifiers::"
14528
msgstr ""
14529
14530
#: en/help_topics/urlspec.txt:16
14531
msgid "  gio+                Access using any GIO supported protocols."
14532
msgstr ""
14533
14534
#: en/help_topics/urlspec.txt:18
7185.1.1 by Jelmer Vernooij
Update pot file.
14535
msgid "Breezy supports all of the standard parts within the URL::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14536
msgstr ""
14537
14538
#: en/help_topics/urlspec.txt:20
14539
msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
14540
msgstr ""
14541
14542
#: en/help_topics/urlspec.txt:22
14543
msgid "allowing URLs such as::"
14544
msgstr ""
14545
14546
#: en/help_topics/urlspec.txt:24
7185.1.1 by Jelmer Vernooij
Update pot file.
14547
msgid "  http://brzuser:BadPass@brz.example.com:8080/brz/trunk"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14548
msgstr ""
14549
14550
#: en/help_topics/urlspec.txt:26
14551
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
14552
"For brz+ssh:// and sftp:// URLs, Breezy also supports paths that begin\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14553
"with '~' as meaning that the rest of the path should be interpreted\n"
14554
"relative to the remote user's home directory.  For example if the user\n"
14555
"``remote`` has a  home directory of ``/home/remote`` on the server\n"
14556
"shell.example.com, then::"
14557
msgstr ""
14558
14559
#: en/help_topics/urlspec.txt:32
7185.1.1 by Jelmer Vernooij
Update pot file.
14560
msgid "  brz+ssh://remote@shell.example.com/~/myproject/trunk"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14561
msgstr ""
14562
14563
#: en/help_topics/urlspec.txt:34
14564
msgid "would refer to ``/home/remote/myproject/trunk``."
14565
msgstr ""
14566
14567
#: en/help_topics/urlspec.txt:36
14568
msgid ""
14569
"Many commands that accept URLs also accept location aliases too.\n"
14570
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
14571
msgstr ""