/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"
7185.1.1 by Jelmer Vernooij
Update pot file.
11
"POT-Creation-Date: 2018-11-17 19:23+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
7185.1.1 by Jelmer Vernooij
Update pot file.
115
#: breezy/branch.py:2021
6138.4.4 by Jonathan Riddell
update bzr.pot
116
#, python-format
117
msgid "Pushed up to revision %d."
118
msgstr ""
119
7185.1.1 by Jelmer Vernooij
Update pot file.
120
#: breezy/branch.py:2023
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
7185.1.1 by Jelmer Vernooij
Update pot file.
127
#: breezy/branch.py:2027
6138.4.4 by Jonathan Riddell
update bzr.pot
128
msgid "No new revisions or tags to push."
129
msgstr ""
130
7185.1.1 by Jelmer Vernooij
Update pot file.
131
#: breezy/branch.py:2029
6138.4.4 by Jonathan Riddell
update bzr.pot
132
msgid "No new revisions to push."
133
msgstr ""
134
7185.1.1 by Jelmer Vernooij
Update pot file.
135
#: breezy/branch.py:2049
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
7185.1.1 by Jelmer Vernooij
Update pot file.
140
#: breezy/branch.py:2052
6138.4.4 by Jonathan Riddell
update bzr.pot
141
#, python-format
142
msgid "found error:%s"
143
msgstr ""
144
7185.1.1 by Jelmer Vernooij
Update pot file.
145
#: breezy/builtins.py:258 breezy/builtins.py:3058 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
7185.1.1 by Jelmer Vernooij
Update pot file.
150
#: breezy/builtins.py:268
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
7185.1.1 by Jelmer Vernooij
Update pot file.
155
#: breezy/builtins.py:323
6093.2.1 by Jonathan Riddell
add .pot file to archive
156
msgid "Display status summary."
157
msgstr ""
158
7185.1.1 by Jelmer Vernooij
Update pot file.
159
#: breezy/builtins.py:325
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
7185.1.1 by Jelmer Vernooij
Update pot file.
165
#: breezy/builtins.py:328
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
7185.1.1 by Jelmer Vernooij
Update pot file.
171
#: breezy/builtins.py:331
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
7185.1.1 by Jelmer Vernooij
Update pot file.
178
#: breezy/builtins.py:335
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
7185.1.1 by Jelmer Vernooij
Update pot file.
186
#: breezy/builtins.py:340
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
7185.1.1 by Jelmer Vernooij
Update pot file.
192
#: breezy/builtins.py:343
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
7185.1.1 by Jelmer Vernooij
Update pot file.
198
#: breezy/builtins.py:346
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
7185.1.1 by Jelmer Vernooij
Update pot file.
204
#: breezy/builtins.py:349
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
7185.1.1 by Jelmer Vernooij
Update pot file.
212
#: breezy/builtins.py:354
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
7185.1.1 by Jelmer Vernooij
Update pot file.
218
#: breezy/builtins.py:357
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
7185.1.1 by Jelmer Vernooij
Update pot file.
225
#: breezy/builtins.py:361
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
7185.1.1 by Jelmer Vernooij
Update pot file.
233
#: breezy/builtins.py:366
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
7185.1.1 by Jelmer Vernooij
Update pot file.
241
#: breezy/builtins.py:371
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
7185.1.1 by Jelmer Vernooij
Update pot file.
247
#: breezy/builtins.py:374
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
7185.1.1 by Jelmer Vernooij
Update pot file.
255
#: breezy/builtins.py:383
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
7185.1.1 by Jelmer Vernooij
Update pot file.
260
#: breezy/builtins.py:385
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
7185.1.1 by Jelmer Vernooij
Update pot file.
265
#: breezy/builtins.py:387
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
7185.1.1 by Jelmer Vernooij
Update pot file.
270
#: breezy/builtins.py:389
6093.2.1 by Jonathan Riddell
add .pot file to archive
271
msgid "Do not mark object type using indicator."
272
msgstr ""
273
7185.1.1 by Jelmer Vernooij
Update pot file.
274
#: breezy/builtins.py:404
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
7185.1.1 by Jelmer Vernooij
Update pot file.
278
#: breezy/builtins.py:448 breezy/builtins.py:5298
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
7185.1.1 by Jelmer Vernooij
Update pot file.
282
#: breezy/builtins.py:452 breezy/builtins.py:5301
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
7185.1.1 by Jelmer Vernooij
Update pot file.
286
#: breezy/builtins.py:459
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
7185.1.1 by Jelmer Vernooij
Update pot file.
291
#: breezy/builtins.py:470
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
7185.1.1 by Jelmer Vernooij
Update pot file.
296
#: breezy/builtins.py:477
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
297
msgid "You cannot specify a NULL revision."
298
msgstr ""
299
7185.1.1 by Jelmer Vernooij
Update pot file.
300
#: breezy/builtins.py:483
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
7185.1.1 by Jelmer Vernooij
Update pot file.
304
#: breezy/builtins.py:485
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
7185.1.1 by Jelmer Vernooij
Update pot file.
310
#: breezy/builtins.py:488
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
7185.1.1 by Jelmer Vernooij
Update pot file.
315
#: breezy/builtins.py:494
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
7185.1.1 by Jelmer Vernooij
Update pot file.
319
#: breezy/builtins.py:509
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
320
msgid "No working tree to remove"
321
msgstr ""
322
7185.1.1 by Jelmer Vernooij
Update pot file.
323
#: breezy/builtins.py:512
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
7185.1.1 by Jelmer Vernooij
Update pot file.
327
#: breezy/builtins.py:522
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
7185.1.1 by Jelmer Vernooij
Update pot file.
331
#: breezy/builtins.py:563
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
7185.1.1 by Jelmer Vernooij
Update pot file.
337
#: breezy/builtins.py:574
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
7185.1.1 by Jelmer Vernooij
Update pot file.
343
#: breezy/builtins.py:579
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
7185.1.1 by Jelmer Vernooij
Update pot file.
348
#: breezy/builtins.py:583
6093.2.1 by Jonathan Riddell
add .pot file to archive
349
msgid "Show current revision number."
350
msgstr ""
351
7185.1.1 by Jelmer Vernooij
Update pot file.
352
#: breezy/builtins.py:585
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
7185.1.1 by Jelmer Vernooij
Update pot file.
356
#: breezy/builtins.py:599
6252.1.1 by Vincent Ladeuil
Release 2.5b3
357
msgid "--tree and --revision can not be used together"
358
msgstr ""
359
7185.1.1 by Jelmer Vernooij
Update pot file.
360
#: breezy/builtins.py:615
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
7185.1.1 by Jelmer Vernooij
Update pot file.
365
#: breezy/builtins.py:638
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
7185.1.1 by Jelmer Vernooij
Update pot file.
369
#: breezy/builtins.py:687
6093.2.1 by Jonathan Riddell
add .pot file to archive
370
msgid "Add specified files or directories."
371
msgstr ""
372
7185.1.1 by Jelmer Vernooij
Update pot file.
373
#: breezy/builtins.py:689
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
7185.1.1 by Jelmer Vernooij
Update pot file.
380
#: breezy/builtins.py:693
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
7185.1.1 by Jelmer Vernooij
Update pot file.
391
#: breezy/builtins.py:701
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
7185.1.1 by Jelmer Vernooij
Update pot file.
397
#: breezy/builtins.py:704
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
7185.1.1 by Jelmer Vernooij
Update pot file.
403
#: breezy/builtins.py:707
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
7185.1.1 by Jelmer Vernooij
Update pot file.
411
#: breezy/builtins.py:712
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
7185.1.1 by Jelmer Vernooij
Update pot file.
417
#: breezy/builtins.py:715
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
7185.1.1 by Jelmer Vernooij
Update pot file.
428
#: breezy/builtins.py:723
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
7185.1.1 by Jelmer Vernooij
Update pot file.
434
#: breezy/builtins.py:726
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
7185.1.1 by Jelmer Vernooij
Update pot file.
442
#: breezy/builtins.py:733
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
7185.1.1 by Jelmer Vernooij
Update pot file.
447
#: breezy/builtins.py:741
6093.2.1 by Jonathan Riddell
add .pot file to archive
448
msgid "Lookup file ids from this tree."
449
msgstr ""
450
7185.1.1 by Jelmer Vernooij
Update pot file.
451
#: breezy/builtins.py:778
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
7185.1.1 by Jelmer Vernooij
Update pot file.
456
#: breezy/builtins.py:783
6093.2.1 by Jonathan Riddell
add .pot file to archive
457
msgid "Create a new versioned directory."
458
msgstr ""
459
7185.1.1 by Jelmer Vernooij
Update pot file.
460
#: breezy/builtins.py:785
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
7185.1.1 by Jelmer Vernooij
Update pot file.
465
#: breezy/builtins.py:792
6437.2.2 by Vincent Ladeuil
Release 2.5b5
466
msgid "No error if existing, make parent directories as needed."
467
msgstr ""
468
7185.1.1 by Jelmer Vernooij
Update pot file.
469
#: breezy/builtins.py:826
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
470
#, python-format
471
msgid "added %s\n"
472
msgstr ""
473
7185.1.1 by Jelmer Vernooij
Update pot file.
474
#: breezy/builtins.py:870
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
7185.1.1 by Jelmer Vernooij
Update pot file.
479
#: breezy/builtins.py:908
480
msgid "Copy a file."
481
msgstr ""
482
483
#: breezy/builtins.py:910
484
msgid "    brz cp SOURCE... DESTINATION"
485
msgstr ""
486
487
#: breezy/builtins.py:912
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
494
#: breezy/builtins.py:916
495
msgid ""
496
"Files cannot be copied between branches. Only files can be copied\n"
497
"at the moment."
498
msgstr ""
499
500
#: breezy/builtins.py:932 breezy/builtins.py:1025
501
msgid "missing file argument"
502
msgstr ""
503
504
#: breezy/builtins.py:938
505
msgid "can not copy root of branch"
506
msgstr ""
507
508
#: breezy/builtins.py:946
509
msgid "to copy multiple files the destination must be a versioned directory"
510
msgstr ""
511
512
#: breezy/builtins.py:960 breezy/builtins.py:976
513
#, python-format
514
msgid "Could not copy %s => %s: %s is not versioned."
515
msgstr ""
516
517
#: breezy/builtins.py:964
518
#, python-format
519
msgid "Could not copy %s => %s . %s is not versioned\\."
520
msgstr ""
521
522
#: breezy/builtins.py:968
523
#, python-format
524
msgid "Could not copy %s => %s . %s is a directory."
525
msgstr ""
526
527
#: breezy/builtins.py:980
528
#, python-format
529
msgid "Could not copy to %s: %s is not a directory."
530
msgstr ""
531
532
#: breezy/builtins.py:987
6093.2.1 by Jonathan Riddell
add .pot file to archive
533
msgid "Move or rename a file."
534
msgstr ""
535
7185.1.1 by Jelmer Vernooij
Update pot file.
536
#: breezy/builtins.py:989
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
7185.1.1 by Jelmer Vernooij
Update pot file.
540
#: breezy/builtins.py:991
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
7185.1.1 by Jelmer Vernooij
Update pot file.
547
#: breezy/builtins.py:995
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
7185.1.1 by Jelmer Vernooij
Update pot file.
556
#: breezy/builtins.py:1001
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
7185.1.1 by Jelmer Vernooij
Update pot file.
561
#: breezy/builtins.py:1008
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
7185.1.1 by Jelmer Vernooij
Update pot file.
568
#: breezy/builtins.py:1010
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
7185.1.1 by Jelmer Vernooij
Update pot file.
573
#: breezy/builtins.py:1012
6093.2.1 by Jonathan Riddell
add .pot file to archive
574
msgid "Avoid making changes when guessing renames."
575
msgstr ""
576
7185.1.1 by Jelmer Vernooij
Update pot file.
577
#: breezy/builtins.py:1021
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
578
msgid "--dry-run requires --auto."
579
msgstr ""
580
7185.1.1 by Jelmer Vernooij
Update pot file.
581
#: breezy/builtins.py:1031
6252.1.1 by Vincent Ladeuil
Release 2.5b3
582
msgid "can not move root of branch"
583
msgstr ""
584
7185.1.1 by Jelmer Vernooij
Update pot file.
585
#: breezy/builtins.py:1038
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
7185.1.1 by Jelmer Vernooij
Update pot file.
589
#: breezy/builtins.py:1041
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
590
msgid "--after cannot be specified with --auto."
591
msgstr ""
592
7185.1.1 by Jelmer Vernooij
Update pot file.
593
#: breezy/builtins.py:1077
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
7185.1.1 by Jelmer Vernooij
Update pot file.
597
#: breezy/builtins.py:1130
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
7185.1.1 by Jelmer Vernooij
Update pot file.
601
#: breezy/builtins.py:1132
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
7185.1.1 by Jelmer Vernooij
Update pot file.
609
#: breezy/builtins.py:1137
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
7185.1.1 by Jelmer Vernooij
Update pot file.
616
#: breezy/builtins.py:1141
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
7185.1.1 by Jelmer Vernooij
Update pot file.
623
#: breezy/builtins.py:1145
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
7185.1.1 by Jelmer Vernooij
Update pot file.
631
#: breezy/builtins.py:1150
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
7185.1.1 by Jelmer Vernooij
Update pot file.
638
#: breezy/builtins.py:1154
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
7185.1.1 by Jelmer Vernooij
Update pot file.
646
#: breezy/builtins.py:1162
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
7185.1.1 by Jelmer Vernooij
Update pot file.
651
#: breezy/builtins.py:1164
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
7185.1.1 by Jelmer Vernooij
Update pot file.
657
#: breezy/builtins.py:1167
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
7185.1.1 by Jelmer Vernooij
Update pot file.
663
#: breezy/builtins.py:1204
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
7185.1.1 by Jelmer Vernooij
Update pot file.
667
#: breezy/builtins.py:1220
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
668
msgid "No pull location known or specified."
669
msgstr ""
670
7185.1.1 by Jelmer Vernooij
Update pot file.
671
#: breezy/builtins.py:1227
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
7185.1.1 by Jelmer Vernooij
Update pot file.
676
#: breezy/builtins.py:1234 breezy/builtins.py:4494
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
7185.1.1 by Jelmer Vernooij
Update pot file.
680
#: breezy/builtins.py:1277
6093.2.1 by Jonathan Riddell
add .pot file to archive
681
msgid "Update a mirror of this branch."
682
msgstr ""
683
7185.1.1 by Jelmer Vernooij
Update pot file.
684
#: breezy/builtins.py:1279
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
7185.1.1 by Jelmer Vernooij
Update pot file.
690
#: breezy/builtins.py:1282
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
7185.1.1 by Jelmer Vernooij
Update pot file.
696
#: breezy/builtins.py:1285
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
7185.1.1 by Jelmer Vernooij
Update pot file.
703
#: breezy/builtins.py:1289
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
7185.1.1 by Jelmer Vernooij
Update pot file.
709
#: breezy/builtins.py:1292
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
7185.1.1 by Jelmer Vernooij
Update pot file.
716
#: breezy/builtins.py:1296
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
7185.1.1 by Jelmer Vernooij
Update pot file.
724
#: breezy/builtins.py:1301
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
7185.1.1 by Jelmer Vernooij
Update pot file.
732
#: breezy/builtins.py:1312
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
7185.1.1 by Jelmer Vernooij
Update pot file.
738
#: breezy/builtins.py:1315
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
7185.1.1 by Jelmer Vernooij
Update pot file.
745
#: breezy/builtins.py:1320
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
7185.1.1 by Jelmer Vernooij
Update pot file.
752
#: breezy/builtins.py:1323
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
7185.1.1 by Jelmer Vernooij
Update pot file.
760
#: breezy/builtins.py:1328
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
7185.1.1 by Jelmer Vernooij
Update pot file.
767
#: breezy/builtins.py:1331
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
7185.1.1 by Jelmer Vernooij
Update pot file.
773
#: breezy/builtins.py:1334
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
778
#: breezy/builtins.py:1335
779
msgid ""
780
"Allow lossy push, i.e. dropping metadata that can't be represented in the "
781
"target."
782
msgstr ""
783
784
#: breezy/builtins.py:1387
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
7185.1.1 by Jelmer Vernooij
Update pot file.
788
#: breezy/builtins.py:1396
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
7185.1.1 by Jelmer Vernooij
Update pot file.
795
#: breezy/builtins.py:1402
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
796
msgid "No push location known or specified."
797
msgstr ""
798
7185.1.1 by Jelmer Vernooij
Update pot file.
799
#: breezy/builtins.py:1406
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
7185.1.1 by Jelmer Vernooij
Update pot file.
804
#: breezy/builtins.py:1417
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
7185.1.1 by Jelmer Vernooij
Update pot file.
808
#: breezy/builtins.py:1419
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
7185.1.1 by Jelmer Vernooij
Update pot file.
819
#: breezy/builtins.py:1426
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
7185.1.1 by Jelmer Vernooij
Update pot file.
826
#: breezy/builtins.py:1438
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
7185.1.1 by Jelmer Vernooij
Update pot file.
831
#: breezy/builtins.py:1440
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
7185.1.1 by Jelmer Vernooij
Update pot file.
836
#: breezy/builtins.py:1443
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
7185.1.1 by Jelmer Vernooij
Update pot file.
843
#: breezy/builtins.py:1447
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
7185.1.1 by Jelmer Vernooij
Update pot file.
848
#: breezy/builtins.py:1449
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
7185.1.1 by Jelmer Vernooij
Update pot file.
855
#: breezy/builtins.py:1454
6093.2.1 by Jonathan Riddell
add .pot file to archive
856
msgid "Bind new branch to from location."
857
msgstr ""
858
7185.1.1 by Jelmer Vernooij
Update pot file.
859
#: breezy/builtins.py:1491
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
7185.1.1 by Jelmer Vernooij
Update pot file.
864
#: breezy/builtins.py:1503
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
7185.1.1 by Jelmer Vernooij
Update pot file.
869
#: breezy/builtins.py:1521
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
7185.1.1 by Jelmer Vernooij
Update pot file.
874
#: breezy/builtins.py:1537 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
7185.1.1 by Jelmer Vernooij
Update pot file.
879
#: breezy/builtins.py:1543
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
7185.1.1 by Jelmer Vernooij
Update pot file.
886
#: breezy/builtins.py:1547 breezy/push.py:57
887
msgid "Created new branch."
888
msgstr ""
889
890
#: breezy/builtins.py:1552
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
7185.1.1 by Jelmer Vernooij
Update pot file.
895
#: breezy/builtins.py:1557 breezy/builtins.py:6368
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
7185.1.1 by Jelmer Vernooij
Update pot file.
900
#: breezy/builtins.py:1562
6093.2.1 by Jonathan Riddell
add .pot file to archive
901
msgid "List the branches available at the current location."
902
msgstr ""
903
7185.1.1 by Jelmer Vernooij
Update pot file.
904
#: breezy/builtins.py:1564
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
7185.1.1 by Jelmer Vernooij
Update pot file.
911
#: breezy/builtins.py:1571
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
7185.1.1 by Jelmer Vernooij
Update pot file.
917
#: breezy/builtins.py:1600
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
7185.1.1 by Jelmer Vernooij
Update pot file.
921
#: breezy/builtins.py:1612
6093.2.1 by Jonathan Riddell
add .pot file to archive
922
msgid "Create a new checkout of an existing branch."
923
msgstr ""
924
7185.1.1 by Jelmer Vernooij
Update pot file.
925
#: breezy/builtins.py:1614
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
7185.1.1 by Jelmer Vernooij
Update pot file.
933
#: breezy/builtins.py:1619
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
7185.1.1 by Jelmer Vernooij
Update pot file.
945
#: breezy/builtins.py:1626
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
7185.1.1 by Jelmer Vernooij
Update pot file.
954
#: breezy/builtins.py:1636
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
7185.1.1 by Jelmer Vernooij
Update pot file.
964
#: breezy/builtins.py:1643
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
7185.1.1 by Jelmer Vernooij
Update pot file.
970
#: breezy/builtins.py:1645
6093.2.1 by Jonathan Riddell
add .pot file to archive
971
msgid "Hard-link working tree files where possible."
972
msgstr ""
973
7185.1.1 by Jelmer Vernooij
Update pot file.
974
#: breezy/builtins.py:1685
6093.2.1 by Jonathan Riddell
add .pot file to archive
975
msgid ""
976
"Show list of renamed files.\n"
977
"    "
978
msgstr ""
979
7185.1.1 by Jelmer Vernooij
Update pot file.
980
#: breezy/builtins.py:1713
6252.1.1 by Vincent Ladeuil
Release 2.5b3
981
msgid "Update a working tree to a new revision."
982
msgstr ""
983
7185.1.1 by Jelmer Vernooij
Update pot file.
984
#: breezy/builtins.py:1715
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
7185.1.1 by Jelmer Vernooij
Update pot file.
991
#: breezy/builtins.py:1719
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
7185.1.1 by Jelmer Vernooij
Update pot file.
997
#: breezy/builtins.py:1722
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1005
#: breezy/builtins.py:1727
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1011
#: breezy/builtins.py:1730
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1021
#: breezy/builtins.py:1737
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1028
#: breezy/builtins.py:1753
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1032
#: breezy/builtins.py:1761
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1036
#: breezy/builtins.py:1792
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1041
#: breezy/builtins.py:1808
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1048
#: breezy/builtins.py:1814
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1053
#: breezy/builtins.py:1818
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1059
#: breezy/builtins.py:1827
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1063
#: breezy/builtins.py:1829
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1069
#: breezy/builtins.py:1832
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1076
#: breezy/builtins.py:1836
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1080
#: breezy/builtins.py:1838 breezy/builtins.py:3795 breezy/builtins.py:4962
1081
#: breezy/builtins.py:6559 breezy/plugins/fastimport/cmds.py:211
1082
#: breezy/plugins/fastimport/cmds.py:417
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1083
msgid ":Examples:"
1084
msgstr ""
1085
7185.1.1 by Jelmer Vernooij
Update pot file.
1086
#: breezy/builtins.py:1840
6093.2.1 by Jonathan Riddell
add .pot file to archive
1087
msgid "  Display information on the format and related locations:"
1088
msgstr ""
1089
7185.1.1 by Jelmer Vernooij
Update pot file.
1090
#: breezy/builtins.py:1842
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1094
#: breezy/builtins.py:1844
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1101
#: breezy/builtins.py:1848
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1105
#: breezy/builtins.py:1850
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1109
#: breezy/builtins.py:1852
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1113
#: breezy/builtins.py:1871
6093.2.1 by Jonathan Riddell
add .pot file to archive
1114
msgid "Remove files or directories."
1115
msgstr ""
1116
7185.1.1 by Jelmer Vernooij
Update pot file.
1117
#: breezy/builtins.py:1873
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1127
#: breezy/builtins.py:1882
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1132
#: breezy/builtins.py:1884
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1137
#: breezy/builtins.py:1885
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1142
#: breezy/builtins.py:1886
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1147
#: breezy/builtins.py:1887
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1152
#: breezy/builtins.py:1888
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1153
msgid "Don't backup changed files."
1154
msgstr ""
1155
7185.1.1 by Jelmer Vernooij
Update pot file.
1156
#: breezy/builtins.py:1909
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1157
msgid "No matching files."
1158
msgstr ""
1159
7185.1.1 by Jelmer Vernooij
Update pot file.
1160
#: breezy/builtins.py:1970
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1164
#: breezy/builtins.py:1972
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1172
#: breezy/builtins.py:1977
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1180
#: breezy/builtins.py:1982
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1186
#: breezy/builtins.py:1985
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
1193
#: breezy/builtins.py:2052 breezy/builtins.py:2173 breezy/builtins.py:3830
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1206
#: breezy/builtins.py:2052 breezy/builtins.py:2173 breezy/builtins.py:3830
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
1213
#: breezy/builtins.py:2052 breezy/builtins.py:2173 breezy/builtins.py:3830
1214
msgid "GIT repository."
1215
msgstr ""
1216
1217
#: breezy/builtins.py:2053
6093.2.1 by Jonathan Riddell
add .pot file to archive
1218
msgid "Make a directory into a versioned branch."
1219
msgstr ""
1220
7185.1.1 by Jelmer Vernooij
Update pot file.
1221
#: breezy/builtins.py:2055
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1227
#: breezy/builtins.py:2058
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1235
#: breezy/builtins.py:2063
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1241
#: breezy/builtins.py:2066
6093.2.1 by Jonathan Riddell
add .pot file to archive
1242
msgid "Recipe for importing a tree of files::"
1243
msgstr ""
1244
7185.1.1 by Jelmer Vernooij
Update pot file.
1245
#: breezy/builtins.py:2068
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1256
#: breezy/builtins.py:2079
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1261
#: breezy/builtins.py:2082
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1266
#: breezy/builtins.py:2091
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1271
#: breezy/builtins.py:2094
6093.2.1 by Jonathan Riddell
add .pot file to archive
1272
msgid "Create a branch without a working tree."
1273
msgstr ""
1274
7185.1.1 by Jelmer Vernooij
Update pot file.
1275
#: breezy/builtins.py:2115 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
7185.1.1 by Jelmer Vernooij
Update pot file.
1282
#: breezy/builtins.py:2150
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1287
#: breezy/builtins.py:2161
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1292
#: breezy/builtins.py:2170
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1297
#: breezy/builtins.py:2174
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1301
#: breezy/builtins.py:2176
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1309
#: breezy/builtins.py:2181
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1319
#: breezy/builtins.py:2188
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1325
#: breezy/builtins.py:2191
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1331
#: breezy/builtins.py:2194
6093.2.1 by Jonathan Riddell
add .pot file to archive
1332
msgid "    Make a lightweight checkout elsewhere::"
1333
msgstr ""
1334
7185.1.1 by Jelmer Vernooij
Update pot file.
1335
#: breezy/builtins.py:2196
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1343
#: breezy/builtins.py:2204
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
1350
#: breezy/builtins.py:2210 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
7185.1.1 by Jelmer Vernooij
Update pot file.
1355
#: breezy/builtins.py:2212
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1359
#: breezy/builtins.py:2243
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1363
#: breezy/builtins.py:2245
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1373
#: breezy/builtins.py:2252
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1379
#: breezy/builtins.py:2255
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1389
#: breezy/builtins.py:2262
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1398
#: breezy/builtins.py:2268
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1404
#: breezy/builtins.py:2271
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1408
#: breezy/builtins.py:2273
6093.2.1 by Jonathan Riddell
add .pot file to archive
1409
msgid "    Difference between the working tree and revision 1::"
1410
msgstr ""
1411
7185.1.1 by Jelmer Vernooij
Update pot file.
1412
#: breezy/builtins.py:2275
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1416
#: breezy/builtins.py:2277
6093.2.1 by Jonathan Riddell
add .pot file to archive
1417
msgid "    Difference between revision 3 and revision 1::"
1418
msgstr ""
1419
7185.1.1 by Jelmer Vernooij
Update pot file.
1420
#: breezy/builtins.py:2279
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1424
#: breezy/builtins.py:2281
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1428
#: breezy/builtins.py:2283
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1432
#: breezy/builtins.py:2285
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1436
#: breezy/builtins.py:2287
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1440
#: breezy/builtins.py:2289
1441
msgid "    To see the changes introduced by revision X::"
1442
msgstr ""
1443
1444
#: breezy/builtins.py:2291
1445
msgid "        brz diff -cX"
1446
msgstr ""
1447
1448
#: breezy/builtins.py:2293
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1455
#: breezy/builtins.py:2297
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1459
#: breezy/builtins.py:2299
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1465
#: breezy/builtins.py:2302
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1469
#: breezy/builtins.py:2304
6093.2.1 by Jonathan Riddell
add .pot file to archive
1470
msgid "    Show just the differences for file NEWS::"
1471
msgstr ""
1472
7185.1.1 by Jelmer Vernooij
Update pot file.
1473
#: breezy/builtins.py:2306
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1477
#: breezy/builtins.py:2308
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1481
#: breezy/builtins.py:2310
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1485
#: breezy/builtins.py:2312
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1489
#: breezy/builtins.py:2314
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1493
#: breezy/builtins.py:2316
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1497
#: breezy/builtins.py:2318
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1501
#: breezy/builtins.py:2320
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1505
#: breezy/builtins.py:2322
1506
msgid "        brz diff --prefix old/:new/"
1507
msgstr ""
1508
1509
#: breezy/builtins.py:2324
1510
msgid "    Show the differences using a custom diff program with options::"
1511
msgstr ""
1512
1513
#: breezy/builtins.py:2326
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1518
#: breezy/builtins.py:2332
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1523
#: breezy/builtins.py:2335
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1530
#: breezy/builtins.py:2338
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1535
#: breezy/builtins.py:2342
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1540
#: breezy/builtins.py:2348
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1545
#: breezy/builtins.py:2353
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1550
#: breezy/builtins.py:2355
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1555
#: breezy/builtins.py:2357
6581.1.2 by Vincent Ladeuil
Update translation template.
1556
msgid "How many lines of context to show."
1557
msgstr ""
1558
7185.1.1 by Jelmer Vernooij
Update pot file.
1559
#: breezy/builtins.py:2382
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1563
#: breezy/builtins.py:2386
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1567
#: breezy/builtins.py:2391 breezy/builtins.py:2787 breezy/builtins.py:2795
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1572
#: breezy/builtins.py:2411
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1578
#: breezy/builtins.py:2486
6581.1.2 by Vincent Ladeuil
Update translation template.
1579
msgid "Show the tree root directory."
1580
msgstr ""
1581
7185.1.1 by Jelmer Vernooij
Update pot file.
1582
#: breezy/builtins.py:2488
6093.2.1 by Jonathan Riddell
add .pot file to archive
1583
msgid ""
1584
"The root is the nearest enclosing directory with a .bzr control\n"
1585
"directory."
1586
msgstr ""
1587
7185.1.1 by Jelmer Vernooij
Update pot file.
1588
#: breezy/builtins.py:2504
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1592
#: breezy/builtins.py:2512
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1596
#: breezy/builtins.py:2517
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1600
#: breezy/builtins.py:2519
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1608
#: breezy/builtins.py:2524
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1615
#: breezy/builtins.py:2528
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1625
#: breezy/builtins.py:2535
6581.1.2 by Vincent Ladeuil
Update translation template.
1626
msgid ":Output control:"
1627
msgstr ""
1628
7185.1.1 by Jelmer Vernooij
Update pot file.
1629
#: breezy/builtins.py:2537
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1637
#: breezy/builtins.py:2542
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1643
#: breezy/builtins.py:2545
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1652
#: breezy/builtins.py:2551
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1659
#: breezy/builtins.py:2555
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1666
#: breezy/builtins.py:2559
6581.1.2 by Vincent Ladeuil
Update translation template.
1667
msgid ":Ordering control:"
1668
msgstr ""
1669
7185.1.1 by Jelmer Vernooij
Update pot file.
1670
#: breezy/builtins.py:2561
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1678
#: breezy/builtins.py:2566
6581.1.2 by Vincent Ladeuil
Update translation template.
1679
msgid ":Revision filtering:"
1680
msgstr ""
1681
7185.1.1 by Jelmer Vernooij
Update pot file.
1682
#: breezy/builtins.py:2568
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1688
#: breezy/builtins.py:2571
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1696
#: breezy/builtins.py:2576
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1702
#: breezy/builtins.py:2579
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1712
#: breezy/builtins.py:2586
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1722
#: breezy/builtins.py:2593
6581.1.2 by Vincent Ladeuil
Update translation template.
1723
msgid ":Path filtering:"
1724
msgstr ""
1725
7185.1.1 by Jelmer Vernooij
Update pot file.
1726
#: breezy/builtins.py:2595
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1733
#: breezy/builtins.py:2599
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1740
#: breezy/builtins.py:2603
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1746
#: breezy/builtins.py:2606
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1753
#: breezy/builtins.py:2610
6581.1.2 by Vincent Ladeuil
Update translation template.
1754
msgid "  In this case:"
1755
msgstr ""
1756
7185.1.1 by Jelmer Vernooij
Update pot file.
1757
#: breezy/builtins.py:2612
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1761
#: breezy/builtins.py:2614
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1765
#: breezy/builtins.py:2616
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1771
#: breezy/builtins.py:2619
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1777
#: breezy/builtins.py:2622
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1784
#: breezy/builtins.py:2626
6581.1.2 by Vincent Ladeuil
Update translation template.
1785
msgid ":Other filtering:"
1786
msgstr ""
1787
7185.1.1 by Jelmer Vernooij
Update pot file.
1788
#: breezy/builtins.py:2628
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1797
#: breezy/builtins.py:2634
6581.1.2 by Vincent Ladeuil
Update translation template.
1798
msgid ":Tips & tricks:"
1799
msgstr ""
1800
7185.1.1 by Jelmer Vernooij
Update pot file.
1801
#: breezy/builtins.py:2636
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
1810
#: breezy/builtins.py:2642
1811
msgid "  You may find it useful to add the aliases below to ``breezy.conf``::"
1812
msgstr ""
1813
1814
#: breezy/builtins.py:2644
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1822
#: breezy/builtins.py:2649
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1829
#: breezy/builtins.py:2653
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1835
#: breezy/builtins.py:2656
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1843
#: breezy/builtins.py:2661
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1851
#: breezy/builtins.py:2666
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1860
#: breezy/builtins.py:2675
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1865
#: breezy/builtins.py:2678
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1870
#: breezy/builtins.py:2684
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1875
#: breezy/builtins.py:2688
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1880
#: breezy/builtins.py:2689
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1885
#: breezy/builtins.py:2695
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1890
#: breezy/builtins.py:2705
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1895
#: breezy/builtins.py:2710
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1900
#: breezy/builtins.py:2712
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1905
#: breezy/builtins.py:2716
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1910
#: breezy/builtins.py:2718
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1917
#: breezy/builtins.py:2722
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1922
#: breezy/builtins.py:2725
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1927
#: breezy/builtins.py:2729
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1932
#: breezy/builtins.py:2733
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1937
#: breezy/builtins.py:2737
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1942
#: breezy/builtins.py:2741
6093.2.1 by Jonathan Riddell
add .pot file to archive
1943
msgid "Show revisions whose bugs match this expression."
1944
msgstr ""
1945
7185.1.1 by Jelmer Vernooij
Update pot file.
1946
#: breezy/builtins.py:2781
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1950
#: breezy/builtins.py:2809
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1955
#: breezy/builtins.py:2927
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1960
#: breezy/builtins.py:2943
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1965
#: breezy/builtins.py:2988
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1972
#: breezy/builtins.py:2997
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1977
#: breezy/builtins.py:2999
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1982
#: breezy/builtins.py:3001
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1987
#: breezy/builtins.py:3002
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1992
#: breezy/builtins.py:3005
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
7185.1.1 by Jelmer Vernooij
Update pot file.
1997
#: breezy/builtins.py:3007
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2002
#: breezy/builtins.py:3022
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2003
msgid "invalid kind specified"
2004
msgstr ""
2005
7185.1.1 by Jelmer Vernooij
Update pot file.
2006
#: breezy/builtins.py:3026
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2007
msgid "Cannot set both --verbose and --null"
2008
msgstr ""
2009
7185.1.1 by Jelmer Vernooij
Update pot file.
2010
#: breezy/builtins.py:3035
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2014
#: breezy/builtins.py:3122
6581.1.2 by Vincent Ladeuil
Update translation template.
2015
msgid "Ignore specified files or patterns."
2016
msgstr ""
2017
7185.1.1 by Jelmer Vernooij
Update pot file.
2018
#: breezy/builtins.py:3124
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2022
#: breezy/builtins.py:3126
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2031
#: breezy/builtins.py:3132
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2039
#: breezy/builtins.py:3137
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2048
#: breezy/builtins.py:3143
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2055
#: breezy/builtins.py:3147
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2061
#: breezy/builtins.py:3150
2062
msgid ":Notes:"
2063
msgstr ""
2064
2065
#: breezy/builtins.py:3152
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2071
#: breezy/builtins.py:3155
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2077
#: breezy/builtins.py:3158
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2083
#: breezy/builtins.py:3161
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2087
#: breezy/builtins.py:3163
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2091
#: breezy/builtins.py:3165
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2095
#: breezy/builtins.py:3167
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2099
#: breezy/builtins.py:3169
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2103
#: breezy/builtins.py:3171
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2107
#: breezy/builtins.py:3173
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2111
#: breezy/builtins.py:3175 breezy/builtins.py:3179
6093.2.1 by Jonathan Riddell
add .pot file to archive
2112
msgid "    Ignore .o files under the lib directory::"
2113
msgstr ""
2114
7185.1.1 by Jelmer Vernooij
Update pot file.
2115
#: breezy/builtins.py:3177
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2119
#: breezy/builtins.py:3181
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2123
#: breezy/builtins.py:3183
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2127
#: breezy/builtins.py:3185
2128
msgid "        brz ignore \"RE:(?!debian/).*\""
2129
msgstr ""
2130
2131
#: breezy/builtins.py:3187
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
2137
#: breezy/builtins.py:3190
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2145
#: breezy/builtins.py:3199
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2149
#: breezy/builtins.py:3211
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2153
#: breezy/builtins.py:3222
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2160
#: breezy/builtins.py:3231
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2164
#: breezy/builtins.py:3244
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2174
#: breezy/builtins.py:3251
6581.1.2 by Vincent Ladeuil
Update translation template.
2175
msgid "List ignored files and the patterns that matched them."
2176
msgstr ""
2177
7185.1.1 by Jelmer Vernooij
Update pot file.
2178
#: breezy/builtins.py:3253
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2184
#: breezy/builtins.py:3256
6581.1.2 by Vincent Ladeuil
Update translation template.
2185
msgid "Alternatively, to list just the files::"
2186
msgstr ""
2187
7185.1.1 by Jelmer Vernooij
Update pot file.
2188
#: breezy/builtins.py:3258
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2192
#: breezy/builtins.py:3292
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2197
#: breezy/builtins.py:3300
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2201
#: breezy/builtins.py:3302
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2205
#: breezy/builtins.py:3304
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2212
#: breezy/builtins.py:3308
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2219
#: breezy/builtins.py:3312
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2225
#: breezy/builtins.py:3315
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2229
#: breezy/builtins.py:3317
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2243
#: breezy/builtins.py:3332
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2248
#: breezy/builtins.py:3335
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2253
#: breezy/builtins.py:3339
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2258
#: breezy/builtins.py:3341
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2265
#: breezy/builtins.py:3344
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2269
#: breezy/builtins.py:3364
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2270
msgid "--uncommitted requires a working tree"
2271
msgstr ""
2272
7185.1.1 by Jelmer Vernooij
Update pot file.
2273
#: breezy/builtins.py:3392
6138.4.4 by Jonathan Riddell
update bzr.pot
2274
#, python-format
2275
msgid "Unsupported export format: %s"
2276
msgstr ""
2277
7185.1.1 by Jelmer Vernooij
Update pot file.
2278
#: breezy/builtins.py:3396
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2282
#: breezy/builtins.py:3398
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2286
#: breezy/builtins.py:3400
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2293
#: breezy/builtins.py:3407
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2298
#: breezy/builtins.py:3408
6093.2.1 by Jonathan Riddell
add .pot file to archive
2299
msgid "Apply content filters to display the convenience form."
2300
msgstr ""
2301
7185.1.1 by Jelmer Vernooij
Update pot file.
2302
#: breezy/builtins.py:3419
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2306
#: breezy/builtins.py:3445 breezy/builtins.py:3457
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2310
#: breezy/builtins.py:3481
6581.1.2 by Vincent Ladeuil
Update translation template.
2311
msgid "Commit changes into a new revision."
2312
msgstr ""
2313
7185.1.1 by Jelmer Vernooij
Update pot file.
2314
#: breezy/builtins.py:3483
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2324
#: breezy/builtins.py:3490
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2331
#: breezy/builtins.py:3494
6581.1.2 by Vincent Ladeuil
Update translation template.
2332
msgid ":Selective commits:"
2333
msgstr ""
2334
7185.1.1 by Jelmer Vernooij
Update pot file.
2335
#: breezy/builtins.py:3496
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2342
#: breezy/builtins.py:3500
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2349
#: breezy/builtins.py:3504
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2353
#: breezy/builtins.py:3506
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2357
#: breezy/builtins.py:3508
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2361
#: breezy/builtins.py:3510
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2371
#: breezy/builtins.py:3517
6581.1.2 by Vincent Ladeuil
Update translation template.
2372
msgid ":Checks:"
2373
msgstr ""
2374
7185.1.1 by Jelmer Vernooij
Update pot file.
2375
#: breezy/builtins.py:3519
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2384
#: breezy/builtins.py:3525
6581.1.2 by Vincent Ladeuil
Update translation template.
2385
msgid ":Things to note:"
2386
msgstr ""
2387
7185.1.1 by Jelmer Vernooij
Update pot file.
2388
#: breezy/builtins.py:3527
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2395
#: breezy/builtins.py:3531
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2404
#: breezy/builtins.py:3542
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2409
#: breezy/builtins.py:3545
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2414
#: breezy/builtins.py:3548
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2419
#: breezy/builtins.py:3552
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2424
#: breezy/builtins.py:3554
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2429
#: breezy/builtins.py:3557
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
2436
#: breezy/builtins.py:3561
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2441
#: breezy/builtins.py:3564
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2446
#: breezy/builtins.py:3568
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2451
#: breezy/builtins.py:3571
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2458
#: breezy/builtins.py:3577
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2465
#: breezy/builtins.py:3580
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2471
#: breezy/builtins.py:3597
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2479
#: breezy/builtins.py:3606
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2487
#: breezy/builtins.py:3615
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2492
#: breezy/builtins.py:3618
6150.1.1 by Jonathan Riddell
update bzr.pot
2493
#, python-format
2494
msgid ""
2495
"%s\n"
2496
"Commit refused."
2497
msgstr ""
2498
7185.1.1 by Jelmer Vernooij
Update pot file.
2499
#: breezy/builtins.py:3645
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2500
msgid "Could not parse --commit-time: "
2501
msgstr ""
2502
7185.1.1 by Jelmer Vernooij
Update pot file.
2503
#: breezy/builtins.py:3689
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2504
msgid "please specify either --message or --file"
2505
msgstr ""
2506
7185.1.1 by Jelmer Vernooij
Update pot file.
2507
#: breezy/builtins.py:3719
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2511
#: breezy/builtins.py:3722
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2517
#: breezy/builtins.py:3742
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2523
#: breezy/builtins.py:3746
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2529
#: breezy/builtins.py:3750
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2533
#: breezy/builtins.py:3753
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2540
#: breezy/builtins.py:3761
6581.1.2 by Vincent Ladeuil
Update translation template.
2541
msgid ""
2542
"Validate working tree structure, branch consistency and repository history."
2543
msgstr ""
2544
7185.1.1 by Jelmer Vernooij
Update pot file.
2545
#: breezy/builtins.py:3763
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2551
#: breezy/builtins.py:3766
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2557
#: breezy/builtins.py:3769
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2564
#: breezy/builtins.py:3773
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2571
#: breezy/builtins.py:3777
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2579
#: breezy/builtins.py:3782
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2586
#: breezy/builtins.py:3786
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2595
#: breezy/builtins.py:3792
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2602
#: breezy/builtins.py:3797
6581.1.2 by Vincent Ladeuil
Update translation template.
2603
msgid "    Check the tree and branch at 'foo'::"
2604
msgstr ""
2605
7185.1.1 by Jelmer Vernooij
Update pot file.
2606
#: breezy/builtins.py:3799
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2610
#: breezy/builtins.py:3801
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2614
#: breezy/builtins.py:3803
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2618
#: breezy/builtins.py:3805
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2622
#: breezy/builtins.py:3807
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2627
#: breezy/builtins.py:3813
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2632
#: breezy/builtins.py:3815
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2637
#: breezy/builtins.py:3817
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2641
#: breezy/builtins.py:3831
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2645
#: breezy/builtins.py:3833
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2654
#: breezy/builtins.py:3839
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2664
#: breezy/builtins.py:3846
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2675
#: breezy/builtins.py:3854
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2683
#: breezy/builtins.py:3859
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"
2686
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2687
msgstr ""
2688
2689
# help of 'format' option of 'upgrade' command
7185.1.1 by Jelmer Vernooij
Update pot file.
2690
#: breezy/builtins.py:3867
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2696
#: breezy/builtins.py:3872
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2701
#: breezy/builtins.py:3874
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2707
#: breezy/builtins.py:3876
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2711
#: breezy/builtins.py:3891
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2715
#: breezy/builtins.py:3893
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2721
#: breezy/builtins.py:3896
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2725
#: breezy/builtins.py:3898
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2729
#: breezy/builtins.py:3900
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2734
#: breezy/builtins.py:3904
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2739
#: breezy/builtins.py:3906
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2743
#: breezy/builtins.py:3932
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2747
#: breezy/builtins.py:3956
6581.1.2 by Vincent Ladeuil
Update translation template.
2748
msgid "Print or set the branch nickname."
2749
msgstr ""
2750
7185.1.1 by Jelmer Vernooij
Update pot file.
2751
#: breezy/builtins.py:3958
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2758
#: breezy/builtins.py:3962
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2764
#: breezy/builtins.py:3983
6581.1.2 by Vincent Ladeuil
Update translation template.
2765
msgid "Set/unset and display aliases."
2766
msgstr ""
2767
7185.1.1 by Jelmer Vernooij
Update pot file.
2768
#: breezy/builtins.py:3985
6093.2.1 by Jonathan Riddell
add .pot file to archive
2769
msgid ""
2770
":Examples:\n"
2771
"    Show the current aliases::"
2772
msgstr ""
2773
7185.1.1 by Jelmer Vernooij
Update pot file.
2774
#: breezy/builtins.py:3988
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2778
#: breezy/builtins.py:3990
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2782
#: breezy/builtins.py:3992
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2786
#: breezy/builtins.py:3994
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2790
#: breezy/builtins.py:3996
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2794
#: breezy/builtins.py:3998
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2798
#: breezy/builtins.py:4000
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2803
#: breezy/builtins.py:4005
6093.2.1 by Jonathan Riddell
add .pot file to archive
2804
msgid "Remove the alias."
2805
msgstr ""
2806
7185.1.1 by Jelmer Vernooij
Update pot file.
2807
#: breezy/builtins.py:4023
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2811
#: breezy/builtins.py:4214
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2815
#: breezy/builtins.py:4231
2816
msgid "subunit not available. subunit needs to be installed to use --subunit2."
2817
msgstr ""
2818
2819
#: breezy/builtins.py:4240
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2824
#: breezy/builtins.py:4287
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2829
#: breezy/builtins.py:4291
6093.2.1 by Jonathan Riddell
add .pot file to archive
2830
msgid "Print just the version number."
2831
msgstr ""
2832
7185.1.1 by Jelmer Vernooij
Update pot file.
2833
#: breezy/builtins.py:4310
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2834
msgid "It sure does!\n"
2835
msgstr ""
2836
7185.1.1 by Jelmer Vernooij
Update pot file.
2837
#: breezy/builtins.py:4334
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2842
#: breezy/builtins.py:4339
6581.1.2 by Vincent Ladeuil
Update translation template.
2843
msgid "Perform a three-way merge."
2844
msgstr ""
2845
7185.1.1 by Jelmer Vernooij
Update pot file.
2846
#: breezy/builtins.py:4341
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2857
#: breezy/builtins.py:4349
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2864
#: breezy/builtins.py:4353
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2870
#: breezy/builtins.py:4356
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2881
#: breezy/builtins.py:4364
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2885
#: breezy/builtins.py:4366 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
7185.1.1 by Jelmer Vernooij
Update pot file.
2893
#: breezy/builtins.py:4371
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2897
#: breezy/builtins.py:4373
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2905
#: breezy/builtins.py:4378
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2912
#: breezy/builtins.py:4382
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2921
#: breezy/builtins.py:4388
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2928
#: breezy/builtins.py:4392
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2934
#: breezy/builtins.py:4395
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2940
#: breezy/builtins.py:4398
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2944
#: breezy/builtins.py:4400
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2948
#: breezy/builtins.py:4402
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2952
#: breezy/builtins.py:4404
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2956
#: breezy/builtins.py:4406
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2960
#: breezy/builtins.py:4408
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2964
#: breezy/builtins.py:4410
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2968
#: breezy/builtins.py:4412
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2974
#: breezy/builtins.py:4415
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2982
#: breezy/builtins.py:4427
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2987
#: breezy/builtins.py:4433
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
7185.1.1 by Jelmer Vernooij
Update pot file.
2993
#: breezy/builtins.py:4435
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3001
#: breezy/builtins.py:4440
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3007
#: breezy/builtins.py:4442
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3012
#: breezy/builtins.py:4444
6093.2.1 by Jonathan Riddell
add .pot file to archive
3013
msgid "Select changes interactively."
3014
msgstr ""
3015
7185.1.1 by Jelmer Vernooij
Update pot file.
3016
#: breezy/builtins.py:4467
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3022
#: breezy/builtins.py:4489
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3026
#: breezy/builtins.py:4500
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3030
#: breezy/builtins.py:4520
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3031
msgid "merger: "
3032
msgstr ""
3033
7185.1.1 by Jelmer Vernooij
Update pot file.
3034
#: breezy/builtins.py:4522 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
7185.1.1 by Jelmer Vernooij
Update pot file.
3038
#: breezy/builtins.py:4527
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3039
msgid "Cannot pull individual files"
3040
msgstr ""
3041
7185.1.1 by Jelmer Vernooij
Update pot file.
3042
#: breezy/builtins.py:4535
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3046
#: breezy/builtins.py:4593
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3051
#: breezy/builtins.py:4602
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3056
#: breezy/builtins.py:4606
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3060
#: breezy/builtins.py:4615
3061
msgid "Plan file merge unsupported: Merge type incompatible with tree formats."
3062
msgstr ""
3063
3064
#: breezy/builtins.py:4726
6581.1.2 by Vincent Ladeuil
Update translation template.
3065
msgid "No location specified or remembered"
3066
msgstr ""
3067
7185.1.1 by Jelmer Vernooij
Update pot file.
3068
#: breezy/builtins.py:4728
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3073
#: breezy/builtins.py:4734
6581.1.2 by Vincent Ladeuil
Update translation template.
3074
msgid "Redo a merge."
3075
msgstr ""
3076
7185.1.1 by Jelmer Vernooij
Update pot file.
3077
#: breezy/builtins.py:4736
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3084
#: breezy/builtins.py:4740
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3091
#: breezy/builtins.py:4744
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3098
#: breezy/builtins.py:4748
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3102
#: breezy/builtins.py:4750
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3108
#: breezy/builtins.py:4753
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3116
#: breezy/builtins.py:4760
6093.2.1 by Jonathan Riddell
add .pot file to archive
3117
msgid "Show base revision text in conflicts."
3118
msgstr ""
3119
7185.1.1 by Jelmer Vernooij
Update pot file.
3120
#: breezy/builtins.py:4773
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3126
#: breezy/builtins.py:4828
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3131
#: breezy/builtins.py:4830
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3140
#: breezy/builtins.py:4836
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3152
#: breezy/builtins.py:4845
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3160
#: breezy/builtins.py:4850
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3168
#: breezy/builtins.py:4855
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3176
#: breezy/builtins.py:4860
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3188
#: breezy/builtins.py:4869
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3203
#: breezy/builtins.py:4883
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3208
#: breezy/builtins.py:4885
6093.2.1 by Jonathan Riddell
add .pot file to archive
3209
msgid "Remove pending merge marker, without changing any files."
3210
msgstr ""
3211
7185.1.1 by Jelmer Vernooij
Update pot file.
3212
#: breezy/builtins.py:4916
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3219
#: breezy/builtins.py:4921
6093.2.1 by Jonathan Riddell
add .pot file to archive
3220
msgid "Show help on all commands."
3221
msgstr ""
3222
7185.1.1 by Jelmer Vernooij
Update pot file.
3223
#: breezy/builtins.py:4950
6581.1.2 by Vincent Ladeuil
Update translation template.
3224
msgid "Show unmerged/unpulled revisions between two branches."
3225
msgstr ""
3226
7185.1.1 by Jelmer Vernooij
Update pot file.
3227
#: breezy/builtins.py:4952
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3231
#: breezy/builtins.py:4954
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
3238
#: breezy/builtins.py:4958
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3245
#: breezy/builtins.py:4964
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3251
#: breezy/builtins.py:4967
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3255
#: breezy/builtins.py:4969
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3259
#: breezy/builtins.py:4971
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3263
#: breezy/builtins.py:4973
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3269
#: breezy/builtins.py:4976
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3273
#: breezy/builtins.py:4978
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3279
#: breezy/builtins.py:4981
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3284
#: breezy/builtins.py:4988
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3289
#: breezy/builtins.py:4990
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3294
#: breezy/builtins.py:4991
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3299
#: breezy/builtins.py:4993
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3304
#: breezy/builtins.py:4994
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3309
#: breezy/builtins.py:4999
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3316
#: breezy/builtins.py:5003
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3323
#: breezy/builtins.py:5006
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3327
#: breezy/builtins.py:5047
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3328
msgid "No peer location known or specified."
3329
msgstr ""
3330
7185.1.1 by Jelmer Vernooij
Update pot file.
3331
#: breezy/builtins.py:5051
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3336
#: breezy/builtins.py:5084
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3343
#: breezy/builtins.py:5104
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3350
#: breezy/builtins.py:5119
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3354
#: breezy/builtins.py:5122
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3358
#: breezy/builtins.py:5127
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3359
msgid "Branches are up to date.\n"
3360
msgstr ""
3361
7185.1.1 by Jelmer Vernooij
Update pot file.
3362
#: breezy/builtins.py:5138
6581.1.2 by Vincent Ladeuil
Update translation template.
3363
msgid "Compress the data within a repository."
3364
msgstr ""
3365
7185.1.1 by Jelmer Vernooij
Update pot file.
3366
#: breezy/builtins.py:5140
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3373
#: breezy/builtins.py:5144
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3382
#: breezy/builtins.py:5150
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3391
#: breezy/builtins.py:5160
6093.2.1 by Jonathan Riddell
add .pot file to archive
3392
msgid "Delete obsolete packs to save disk space."
3393
msgstr ""
3394
7185.1.1 by Jelmer Vernooij
Update pot file.
3395
#: breezy/builtins.py:5174
6581.1.2 by Vincent Ladeuil
Update translation template.
3396
msgid "List the installed plugins."
3397
msgstr ""
3398
7185.1.1 by Jelmer Vernooij
Update pot file.
3399
#: breezy/builtins.py:5176
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3405
#: breezy/builtins.py:5179
6581.1.2 by Vincent Ladeuil
Update translation template.
3406
msgid "--verbose shows the path where each plugin is located."
3407
msgstr ""
3408
7185.1.1 by Jelmer Vernooij
Update pot file.
3409
#: breezy/builtins.py:5181
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3418
#: breezy/builtins.py:5187
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3426
#: breezy/builtins.py:5203
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3431
#: breezy/builtins.py:5206
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3436
#: breezy/builtins.py:5208
6093.2.1 by Jonathan Riddell
add .pot file to archive
3437
msgid "Produce a strict-format testament."
3438
msgstr ""
3439
7185.1.1 by Jelmer Vernooij
Update pot file.
3440
#: breezy/builtins.py:5236
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3444
#: breezy/builtins.py:5238
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3450
#: breezy/builtins.py:5241
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3457
#: breezy/builtins.py:5249
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3462
#: breezy/builtins.py:5250
6093.2.1 by Jonathan Riddell
add .pot file to archive
3463
msgid "Show commit date in annotations."
3464
msgstr ""
3465
7185.1.1 by Jelmer Vernooij
Update pot file.
3466
#: breezy/builtins.py:5340
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3470
#: breezy/builtins.py:5353
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3474
#: breezy/builtins.py:5357
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3480
#: breezy/builtins.py:5360
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3486
#: breezy/builtins.py:5363
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3493
#: breezy/builtins.py:5379
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3497
#: breezy/builtins.py:5385
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3498
msgid "Branch is already bound"
3499
msgstr ""
3500
7185.1.1 by Jelmer Vernooij
Update pot file.
3501
#: breezy/builtins.py:5388
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3505
#: breezy/builtins.py:5395
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3509
#: breezy/builtins.py:5402
6093.2.1 by Jonathan Riddell
add .pot file to archive
3510
msgid "Convert the current checkout into a regular branch."
3511
msgstr ""
3512
7185.1.1 by Jelmer Vernooij
Update pot file.
3513
#: breezy/builtins.py:5404
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3519
#: breezy/builtins.py:5415
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3520
msgid "Local branch is not bound"
3521
msgstr ""
3522
7185.1.1 by Jelmer Vernooij
Update pot file.
3523
#: breezy/builtins.py:5419
6093.2.1 by Jonathan Riddell
add .pot file to archive
3524
msgid "Remove the last committed revision."
3525
msgstr ""
3526
7185.1.1 by Jelmer Vernooij
Update pot file.
3527
#: breezy/builtins.py:5421
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3534
#: breezy/builtins.py:5425
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3541
#: breezy/builtins.py:5429
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3549
#: breezy/builtins.py:5440
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3554
#: breezy/builtins.py:5441
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3559
#: breezy/builtins.py:5443
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3564
#: breezy/builtins.py:5445
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3568
#: breezy/builtins.py:5494
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3569
msgid "No revisions to uncommit.\n"
3570
msgstr ""
3571
7185.1.1 by Jelmer Vernooij
Update pot file.
3572
#: breezy/builtins.py:5509
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3576
#: breezy/builtins.py:5513
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3580
#: breezy/builtins.py:5517
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3581
msgid "Uncommit these revisions"
3582
msgstr ""
3583
7185.1.1 by Jelmer Vernooij
Update pot file.
3584
#: breezy/builtins.py:5520
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3585
msgid "Canceled\n"
3586
msgstr ""
3587
7185.1.1 by Jelmer Vernooij
Update pot file.
3588
#: breezy/builtins.py:5528
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3595
#: breezy/builtins.py:5534
6093.2.1 by Jonathan Riddell
add .pot file to archive
3596
msgid "Break a dead lock."
3597
msgstr ""
3598
7185.1.1 by Jelmer Vernooij
Update pot file.
3599
#: breezy/builtins.py:5536
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3605
#: breezy/builtins.py:5539
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3611
#: breezy/builtins.py:5542
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3617
#: breezy/builtins.py:5545
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3626
#: breezy/builtins.py:5554
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3631
#: breezy/builtins.py:5556
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
3636
#: breezy/builtins.py:5591
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
3641
#: breezy/builtins.py:5591
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
3646
#: breezy/builtins.py:5591
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3651
#: breezy/builtins.py:5591
6581.1.2 by Vincent Ladeuil
Update translation template.
3652
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3653
msgstr ""
3654
7185.1.1 by Jelmer Vernooij
Update pot file.
3655
#: breezy/builtins.py:5592
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3660
#: breezy/builtins.py:5598
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3665
#: breezy/builtins.py:5599
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3670
#: breezy/builtins.py:5600
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3675
#: breezy/builtins.py:5605
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3680
#: breezy/builtins.py:5608
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3688
#: breezy/builtins.py:5613
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3693
#: breezy/builtins.py:5615
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3703
#: breezy/builtins.py:5624
6252.1.1 by Vincent Ladeuil
Release 2.5b3
3704
msgid "Override the default idle client timeout (5min)."
3705
msgstr ""
3706
7185.1.1 by Jelmer Vernooij
Update pot file.
3707
#: breezy/builtins.py:5642
6093.2.1 by Jonathan Riddell
add .pot file to archive
3708
msgid "Combine a tree into its containing tree."
3709
msgstr ""
3710
7185.1.1 by Jelmer Vernooij
Update pot file.
3711
#: breezy/builtins.py:5644
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3715
#: breezy/builtins.py:5646
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3722
#: breezy/builtins.py:5650
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3729
#: breezy/builtins.py:5669
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3736
#: breezy/builtins.py:5679 breezy/builtins.py:5685
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3741
#: breezy/builtins.py:5689
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3745
#: breezy/builtins.py:5691
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3752
#: breezy/builtins.py:5695
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3759
#: breezy/builtins.py:5777
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3760
msgid "No submit branch specified or known"
3761
msgstr ""
3762
7185.1.1 by Jelmer Vernooij
Update pot file.
3763
#: breezy/builtins.py:5787 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
7185.1.1 by Jelmer Vernooij
Update pot file.
3767
#: breezy/builtins.py:5792
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3771
#: breezy/builtins.py:5801
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3772
msgid "No revisions to bundle."
3773
msgstr ""
3774
7185.1.1 by Jelmer Vernooij
Update pot file.
3775
#: breezy/builtins.py:5820
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3779
#: breezy/builtins.py:5822
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3783
#: breezy/builtins.py:5824
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3787
#: breezy/builtins.py:5826
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3791
#: breezy/builtins.py:5828
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3798
#: breezy/builtins.py:5832
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3804
#: breezy/builtins.py:5835
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3811
#: breezy/builtins.py:5839
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3820
#: breezy/builtins.py:5845
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3829
#: breezy/builtins.py:5851
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3838
#: breezy/builtins.py:5857
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3846
#: breezy/builtins.py:5862
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3852
#: breezy/builtins.py:5865
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3859
#: breezy/builtins.py:5869
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3871
#: breezy/builtins.py:5875
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3879
#: breezy/builtins.py:5880
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3885
#: breezy/builtins.py:5883
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3894
#: breezy/builtins.py:5907
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3899
#: breezy/builtins.py:5911
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3906
#: breezy/builtins.py:5913
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3911
#: breezy/builtins.py:5917
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3916
#: breezy/builtins.py:5964
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3921
#: breezy/builtins.py:5965
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3926
#: breezy/builtins.py:5968
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3931
#: breezy/builtins.py:5970
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3939
#: breezy/builtins.py:5980 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
7185.1.1 by Jelmer Vernooij
Update pot file.
3944
#: breezy/builtins.py:5981
6093.2.1 by Jonathan Riddell
add .pot file to archive
3945
msgid "Use the specified output format."
3946
msgstr ""
3947
7185.1.1 by Jelmer Vernooij
Update pot file.
3948
#: breezy/builtins.py:6003
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3952
#: breezy/builtins.py:6005
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3959
#: breezy/builtins.py:6009
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3965
#: breezy/builtins.py:6012
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3971
#: breezy/builtins.py:6015
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3978
#: breezy/builtins.py:6018
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3987
#: breezy/builtins.py:6028
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3992
#: breezy/builtins.py:6031
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
7185.1.1 by Jelmer Vernooij
Update pot file.
3997
#: breezy/builtins.py:6033
6093.2.1 by Jonathan Riddell
add .pot file to archive
3998
msgid "Replace existing tags."
3999
msgstr ""
4000
7185.1.1 by Jelmer Vernooij
Update pot file.
4001
#: breezy/builtins.py:6049
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4002
msgid "No tag specified to delete."
4003
msgstr ""
4004
7185.1.1 by Jelmer Vernooij
Update pot file.
4005
#: breezy/builtins.py:6051
6504.1.1 by Vincent Ladeuil
Update translation template
4006
#, python-format
4007
msgid "Deleted tag %s."
4008
msgstr ""
4009
7185.1.1 by Jelmer Vernooij
Update pot file.
4010
#: breezy/builtins.py:6056
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4014
#: breezy/builtins.py:6065
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4015
msgid "Please specify a tag name."
4016
msgstr ""
4017
7185.1.1 by Jelmer Vernooij
Update pot file.
4018
#: breezy/builtins.py:6073
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4023
#: breezy/builtins.py:6077
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4024
#, python-format
4025
msgid "Created tag %s."
4026
msgstr ""
4027
7185.1.1 by Jelmer Vernooij
Update pot file.
4028
#: breezy/builtins.py:6079
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4029
#, python-format
4030
msgid "Updated tag %s."
4031
msgstr ""
4032
7185.1.1 by Jelmer Vernooij
Update pot file.
4033
#: breezy/builtins.py:6083
6093.2.1 by Jonathan Riddell
add .pot file to archive
4034
msgid "List tags."
4035
msgstr ""
4036
7185.1.1 by Jelmer Vernooij
Update pot file.
4037
#: breezy/builtins.py:6085
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4043
#: breezy/builtins.py:6091
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4048
#: breezy/builtins.py:6093
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4053
#: breezy/builtins.py:6093
6093.2.1 by Jonathan Riddell
add .pot file to archive
4054
msgid "Sorting"
4055
msgstr ""
4056
7185.1.1 by Jelmer Vernooij
Update pot file.
4057
#: breezy/builtins.py:6163
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4061
#: breezy/builtins.py:6165
6093.2.1 by Jonathan Riddell
add .pot file to archive
4062
msgid "A target configuration must be specified."
4063
msgstr ""
4064
7185.1.1 by Jelmer Vernooij
Update pot file.
4065
#: breezy/builtins.py:6167
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4077
#: breezy/builtins.py:6181
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4082
#: breezy/builtins.py:6182
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4087
#: breezy/builtins.py:6184
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4092
#: breezy/builtins.py:6185
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4097
#: breezy/builtins.py:6186
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4102
#: breezy/builtins.py:6187
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4107
#: breezy/builtins.py:6192
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4112
#: breezy/builtins.py:6193
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4117
#: breezy/builtins.py:6195
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4123
#: breezy/builtins.py:6197
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4128
#: breezy/builtins.py:6201
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4133
#: breezy/builtins.py:6202
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4138
#: breezy/builtins.py:6204
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4143
#: breezy/builtins.py:6206
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4149
#: breezy/builtins.py:6209
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4154
#: breezy/builtins.py:6211
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4159
#: breezy/builtins.py:6214
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4164
#: breezy/builtins.py:6218
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4170
#: breezy/builtins.py:6229
6504.1.1 by Vincent Ladeuil
Update translation template
4171
msgid "Can't use both --stacked-on and --unstacked"
4172
msgstr ""
4173
7185.1.1 by Jelmer Vernooij
Update pot file.
4174
#: breezy/builtins.py:6243
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4175
msgid "No target configuration specified"
4176
msgstr ""
4177
7185.1.1 by Jelmer Vernooij
Update pot file.
4178
#: breezy/builtins.py:6278
6093.2.1 by Jonathan Riddell
add .pot file to archive
4179
msgid "Set the branch of a checkout and update."
4180
msgstr ""
4181
7185.1.1 by Jelmer Vernooij
Update pot file.
4182
#: breezy/builtins.py:6280
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4190
#: breezy/builtins.py:6285
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4196
#: breezy/builtins.py:6288
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4200
#: breezy/builtins.py:6290
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4208
#: breezy/builtins.py:6295
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4216
#: breezy/builtins.py:6303
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4221
#: breezy/builtins.py:6306
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4226
#: breezy/builtins.py:6309
6581.1.2 by Vincent Ladeuil
Update translation template.
4227
msgid "Store and restore uncommitted changes in the branch."
4228
msgstr ""
4229
7185.1.1 by Jelmer Vernooij
Update pot file.
4230
#: breezy/builtins.py:6323
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
7185.1.1 by Jelmer Vernooij
Update pot file.
4234
#: breezy/builtins.py:6336
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4235
msgid "cannot create branch without source branch"
4236
msgstr ""
4237
7185.1.1 by Jelmer Vernooij
Update pot file.
4238
#: breezy/builtins.py:6362
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
4244
#: breezy/builtins.py:6373
6093.2.1 by Jonathan Riddell
add .pot file to archive
4245
msgid "Manage filtered views."
4246
msgstr ""
4247
7185.1.1 by Jelmer Vernooij
Update pot file.
4248
#: breezy/builtins.py:6375
6093.2.1 by Jonathan Riddell
add .pot file to archive
4249
msgid ""
4250
"Views provide a mask over the tree so that users can focus on\n"
4251
"a subset of a tree when doing their work. After creating a view,\n"
4252
"commands that support a list of files - status, diff, commit, etc -\n"
4253
"effectively have that list of files implicitly given each time.\n"
4254
"An explicit list of files can still be given but those files\n"
4255
"must be within the current view."
4256
msgstr ""
4257
7185.1.1 by Jelmer Vernooij
Update pot file.
4258
#: breezy/builtins.py:6382
6093.2.1 by Jonathan Riddell
add .pot file to archive
4259
msgid ""
4260
"In most cases, a view has a short life-span: it is created to make\n"
4261
"a selected change and is deleted once that change is committed.\n"
4262
"At other times, you may wish to create one or more named views\n"
4263
"and switch between them."
4264
msgstr ""
4265
7185.1.1 by Jelmer Vernooij
Update pot file.
4266
#: breezy/builtins.py:6387
6093.2.1 by Jonathan Riddell
add .pot file to archive
4267
msgid ""
4268
"To disable the current view without deleting it, you can switch to\n"
4269
"the pseudo view called ``off``. This can be useful when you need\n"
4270
"to see the whole tree for an operation or two (e.g. merge) but\n"
4271
"want to switch back to your view after that."
4272
msgstr ""
4273
7185.1.1 by Jelmer Vernooij
Update pot file.
4274
#: breezy/builtins.py:6392
6093.2.1 by Jonathan Riddell
add .pot file to archive
4275
msgid ""
4276
":Examples:\n"
4277
"  To define the current view::"
4278
msgstr ""
4279
7185.1.1 by Jelmer Vernooij
Update pot file.
4280
#: breezy/builtins.py:6395
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4281
msgid "    brz view file1 dir1 ..."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4282
msgstr ""
4283
7185.1.1 by Jelmer Vernooij
Update pot file.
4284
#: breezy/builtins.py:6397
6093.2.1 by Jonathan Riddell
add .pot file to archive
4285
msgid "  To list the current view::"
4286
msgstr ""
4287
7185.1.1 by Jelmer Vernooij
Update pot file.
4288
#: breezy/builtins.py:6399
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4289
msgid "    brz view"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4290
msgstr ""
4291
7185.1.1 by Jelmer Vernooij
Update pot file.
4292
#: breezy/builtins.py:6401
6093.2.1 by Jonathan Riddell
add .pot file to archive
4293
msgid "  To delete the current view::"
4294
msgstr ""
4295
7185.1.1 by Jelmer Vernooij
Update pot file.
4296
#: breezy/builtins.py:6403
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4297
msgid "    brz view --delete"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4298
msgstr ""
4299
7185.1.1 by Jelmer Vernooij
Update pot file.
4300
#: breezy/builtins.py:6405
6093.2.1 by Jonathan Riddell
add .pot file to archive
4301
msgid "  To disable the current view without deleting it::"
4302
msgstr ""
4303
7185.1.1 by Jelmer Vernooij
Update pot file.
4304
#: breezy/builtins.py:6407
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4305
msgid "    brz view --switch off"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4306
msgstr ""
4307
7185.1.1 by Jelmer Vernooij
Update pot file.
4308
#: breezy/builtins.py:6409
6093.2.1 by Jonathan Riddell
add .pot file to archive
4309
msgid "  To define a named view and switch to it::"
4310
msgstr ""
4311
7185.1.1 by Jelmer Vernooij
Update pot file.
4312
#: breezy/builtins.py:6411
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4313
msgid "    brz view --name view-name file1 dir1 ..."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4314
msgstr ""
4315
7185.1.1 by Jelmer Vernooij
Update pot file.
4316
#: breezy/builtins.py:6413
6093.2.1 by Jonathan Riddell
add .pot file to archive
4317
msgid "  To list a named view::"
4318
msgstr ""
4319
7185.1.1 by Jelmer Vernooij
Update pot file.
4320
#: breezy/builtins.py:6415
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4321
msgid "    brz view --name view-name"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4322
msgstr ""
4323
7185.1.1 by Jelmer Vernooij
Update pot file.
4324
#: breezy/builtins.py:6417
6093.2.1 by Jonathan Riddell
add .pot file to archive
4325
msgid "  To delete a named view::"
4326
msgstr ""
4327
7185.1.1 by Jelmer Vernooij
Update pot file.
4328
#: breezy/builtins.py:6419
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4329
msgid "    brz view --name view-name --delete"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4330
msgstr ""
4331
7185.1.1 by Jelmer Vernooij
Update pot file.
4332
#: breezy/builtins.py:6421
6093.2.1 by Jonathan Riddell
add .pot file to archive
4333
msgid "  To switch to a named view::"
4334
msgstr ""
4335
7185.1.1 by Jelmer Vernooij
Update pot file.
4336
#: breezy/builtins.py:6423
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4337
msgid "    brz view --switch view-name"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4338
msgstr ""
4339
7185.1.1 by Jelmer Vernooij
Update pot file.
4340
#: breezy/builtins.py:6425
6093.2.1 by Jonathan Riddell
add .pot file to archive
4341
msgid "  To list all views defined::"
4342
msgstr ""
4343
7185.1.1 by Jelmer Vernooij
Update pot file.
4344
#: breezy/builtins.py:6427
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4345
msgid "    brz view --all"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4346
msgstr ""
4347
7185.1.1 by Jelmer Vernooij
Update pot file.
4348
#: breezy/builtins.py:6429
6093.2.1 by Jonathan Riddell
add .pot file to archive
4349
msgid "  To delete all views::"
4350
msgstr ""
4351
7185.1.1 by Jelmer Vernooij
Update pot file.
4352
#: breezy/builtins.py:6431
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4353
msgid "    brz view --delete --all"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4354
msgstr ""
4355
4356
# help of 'all' option of 'view' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4357
#: breezy/builtins.py:6438
6093.2.1 by Jonathan Riddell
add .pot file to archive
4358
msgid "Apply list or delete action to all views."
4359
msgstr ""
4360
4361
# help of 'delete' option of 'view' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4362
#: breezy/builtins.py:6441
6093.2.1 by Jonathan Riddell
add .pot file to archive
4363
msgid "Delete the view."
4364
msgstr ""
4365
4366
# help of 'name' option of 'view' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4367
#: breezy/builtins.py:6444
6093.2.1 by Jonathan Riddell
add .pot file to archive
4368
msgid "Name of the view to define, list or delete."
4369
msgstr ""
4370
4371
# help of 'switch' option of 'view' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4372
#: breezy/builtins.py:6448
6093.2.1 by Jonathan Riddell
add .pot file to archive
4373
msgid "Name of the view to switch to."
4374
msgstr ""
4375
7185.1.1 by Jelmer Vernooij
Update pot file.
4376
#: breezy/builtins.py:6467
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4377
msgid "Both --delete and a file list specified"
4378
msgstr ""
4379
7185.1.1 by Jelmer Vernooij
Update pot file.
4380
#: breezy/builtins.py:6470
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4381
msgid "Both --delete and --switch specified"
4382
msgstr ""
4383
7185.1.1 by Jelmer Vernooij
Update pot file.
4384
#: breezy/builtins.py:6473
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4385
msgid "Deleted all views.\n"
4386
msgstr ""
4387
7185.1.1 by Jelmer Vernooij
Update pot file.
4388
#: breezy/builtins.py:6476
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4389
msgid "No current view to delete"
4390
msgstr ""
4391
7185.1.1 by Jelmer Vernooij
Update pot file.
4392
#: breezy/builtins.py:6479
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4393
#, python-format
4394
msgid "Deleted '%s' view.\n"
4395
msgstr ""
4396
7185.1.1 by Jelmer Vernooij
Update pot file.
4397
#: breezy/builtins.py:6483
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4398
msgid "Both --switch and a file list specified"
4399
msgstr ""
4400
7185.1.1 by Jelmer Vernooij
Update pot file.
4401
#: breezy/builtins.py:6486
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4402
msgid "Both --switch and --all specified"
4403
msgstr ""
4404
7185.1.1 by Jelmer Vernooij
Update pot file.
4405
#: breezy/builtins.py:6490
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4406
msgid "No current view to disable"
4407
msgstr ""
4408
7185.1.1 by Jelmer Vernooij
Update pot file.
4409
#: breezy/builtins.py:6492
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4410
#, python-format
4411
msgid "Disabled '%s' view.\n"
4412
msgstr ""
4413
7185.1.1 by Jelmer Vernooij
Update pot file.
4414
#: breezy/builtins.py:6498 breezy/builtins.py:6521
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4415
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
4416
msgid "Using '{0}' view: {1}\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4417
msgstr ""
4418
7185.1.1 by Jelmer Vernooij
Update pot file.
4419
#: breezy/builtins.py:6501
6504.1.1 by Vincent Ladeuil
Update translation template
4420
msgid "Views defined:\n"
4421
msgstr ""
4422
7185.1.1 by Jelmer Vernooij
Update pot file.
4423
#: breezy/builtins.py:6510
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4424
msgid "No views defined.\n"
4425
msgstr ""
4426
7185.1.1 by Jelmer Vernooij
Update pot file.
4427
#: breezy/builtins.py:6517
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4428
msgid "Cannot change the 'off' pseudo view"
4429
msgstr ""
4430
7185.1.1 by Jelmer Vernooij
Update pot file.
4431
#: breezy/builtins.py:6526
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4432
msgid "No current view.\n"
4433
msgstr ""
4434
7185.1.1 by Jelmer Vernooij
Update pot file.
4435
#: breezy/builtins.py:6530
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4436
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
4437
msgid "'{0}' view is: {1}\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4438
msgstr ""
4439
7185.1.1 by Jelmer Vernooij
Update pot file.
4440
#: breezy/builtins.py:6550
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4441
msgid "    <no hooks installed>\n"
4442
msgstr ""
4443
7185.1.1 by Jelmer Vernooij
Update pot file.
4444
#: breezy/builtins.py:6554
6093.2.1 by Jonathan Riddell
add .pot file to archive
4445
msgid "Remove a branch."
4446
msgstr ""
4447
7185.1.1 by Jelmer Vernooij
Update pot file.
4448
#: breezy/builtins.py:6556
6093.2.1 by Jonathan Riddell
add .pot file to archive
4449
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
4450
"This will remove the branch from the specified location but\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4451
"will keep any working tree or repository in place."
4452
msgstr ""
4453
7185.1.1 by Jelmer Vernooij
Update pot file.
4454
#: breezy/builtins.py:6561
6093.2.1 by Jonathan Riddell
add .pot file to archive
4455
msgid "  Remove the branch at repo/trunk::"
4456
msgstr ""
4457
7185.1.1 by Jelmer Vernooij
Update pot file.
4458
#: breezy/builtins.py:6563
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4459
msgid "    brz remove-branch repo/trunk"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4460
msgstr ""
4461
6504.1.1 by Vincent Ladeuil
Update translation template
4462
# help of 'force' option of 'remove-branch' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4463
#: breezy/builtins.py:6570
6504.1.1 by Vincent Ladeuil
Update translation template
4464
msgid "Remove branch even if it is the active branch."
4465
msgstr ""
4466
7185.1.1 by Jelmer Vernooij
Update pot file.
4467
#: breezy/builtins.py:6584
6504.1.1 by Vincent Ladeuil
Update translation template
4468
msgid "Branch is active. Use --force to remove it."
4469
msgstr ""
4470
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4471
# help of 'writer=plain' option of 'shelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4472
#: breezy/builtins.py:6588
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4473
msgid "Plaintext diff output."
4474
msgstr ""
4475
7185.1.1 by Jelmer Vernooij
Update pot file.
4476
#: breezy/builtins.py:6589
6093.2.1 by Jonathan Riddell
add .pot file to archive
4477
msgid "Temporarily set aside some changes from the current tree."
4478
msgstr ""
4479
7185.1.1 by Jelmer Vernooij
Update pot file.
4480
#: breezy/builtins.py:6591
6093.2.1 by Jonathan Riddell
add .pot file to archive
4481
msgid ""
4482
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4483
"ie. out of the way, until a later time when you can bring them back from\n"
4484
"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
4485
"your working tree, and so they aren't propagated along with your branch nor\n"
4486
"will they survive its deletion."
4487
msgstr ""
4488
7185.1.1 by Jelmer Vernooij
Update pot file.
4489
#: breezy/builtins.py:6597
6093.2.1 by Jonathan Riddell
add .pot file to archive
4490
msgid "If shelve --list is specified, previously-shelved changes are listed."
4491
msgstr ""
4492
7185.1.1 by Jelmer Vernooij
Update pot file.
4493
#: breezy/builtins.py:6599
6093.2.1 by Jonathan Riddell
add .pot file to archive
4494
msgid ""
4495
"Shelve is intended to help separate several sets of changes that have\n"
4496
"been inappropriately mingled.  If you just want to get rid of all changes\n"
4497
"and you don't need to restore them later, use revert.  If you want to\n"
4498
"shelve all text changes at once, use shelve --all."
4499
msgstr ""
4500
7185.1.1 by Jelmer Vernooij
Update pot file.
4501
#: breezy/builtins.py:6604
6093.2.1 by Jonathan Riddell
add .pot file to archive
4502
msgid ""
4503
"If filenames are specified, only the changes to those files will be\n"
4504
"shelved. Other files will be left untouched."
4505
msgstr ""
4506
7185.1.1 by Jelmer Vernooij
Update pot file.
4507
#: breezy/builtins.py:6607
6093.2.1 by Jonathan Riddell
add .pot file to archive
4508
msgid ""
4509
"If a revision is specified, changes since that revision will be shelved."
4510
msgstr ""
4511
7185.1.1 by Jelmer Vernooij
Update pot file.
4512
#: breezy/builtins.py:6609
6093.2.1 by Jonathan Riddell
add .pot file to archive
4513
msgid ""
4514
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4515
"restore the most recently shelved changes."
4516
msgstr ""
4517
7185.1.1 by Jelmer Vernooij
Update pot file.
4518
#: breezy/builtins.py:6612
6093.2.1 by Jonathan Riddell
add .pot file to archive
4519
msgid ""
4520
"For complicated changes, it is possible to edit the changes in a separate\n"
4521
"editor program to decide what the file remaining in the working copy\n"
4522
"should look like.  To do this, add the configuration option"
4523
msgstr ""
4524
7185.1.1 by Jelmer Vernooij
Update pot file.
4525
#: breezy/builtins.py:6616
6093.2.1 by Jonathan Riddell
add .pot file to archive
4526
msgid "    change_editor = PROGRAM @new_path @old_path"
4527
msgstr ""
4528
7185.1.1 by Jelmer Vernooij
Update pot file.
4529
#: breezy/builtins.py:6618
6093.2.1 by Jonathan Riddell
add .pot file to archive
4530
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
4531
"where @new_path is replaced with the path of the new version of the\n"
4532
"file and @old_path is replaced with the path of the old version of\n"
4533
"the file.  The PROGRAM should save the new file with the desired\n"
4534
"contents of the file in the working tree."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4535
msgstr ""
4536
4537
# help of 'all' option of 'shelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4538
#: breezy/builtins.py:6630
6093.2.1 by Jonathan Riddell
add .pot file to archive
4539
msgid "Shelve all changes."
4540
msgstr ""
4541
4542
# help of 'writer' option of 'shelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4543
#: breezy/builtins.py:6632
6093.2.1 by Jonathan Riddell
add .pot file to archive
4544
msgid "Method to use for writing diffs."
4545
msgstr ""
4546
4547
# title of 'writer' option of 'shelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4548
#: breezy/builtins.py:6632
6093.2.1 by Jonathan Riddell
add .pot file to archive
4549
msgid "writer"
4550
msgstr ""
4551
4552
# help of 'list' option of 'shelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4553
#: breezy/builtins.py:6636
6093.2.1 by Jonathan Riddell
add .pot file to archive
4554
msgid "List shelved changes."
4555
msgstr ""
4556
4557
# help of 'destroy' option of 'shelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4558
#: breezy/builtins.py:6638
6093.2.1 by Jonathan Riddell
add .pot file to archive
4559
msgid "Destroy removed changes instead of shelving them."
4560
msgstr ""
4561
7185.1.1 by Jelmer Vernooij
Update pot file.
4562
#: breezy/builtins.py:6667
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4563
msgid "No shelved changes."
4564
msgstr ""
4565
7185.1.1 by Jelmer Vernooij
Update pot file.
4566
#: breezy/builtins.py:6678
6093.2.1 by Jonathan Riddell
add .pot file to archive
4567
msgid "Restore shelved changes."
4568
msgstr ""
4569
7185.1.1 by Jelmer Vernooij
Update pot file.
4570
#: breezy/builtins.py:6680
6093.2.1 by Jonathan Riddell
add .pot file to archive
4571
msgid ""
4572
"By default, the most recently shelved changes are restored. However if you\n"
4573
"specify a shelf by id those changes will be restored instead.  This works\n"
4574
"best when the changes don't depend on each other."
4575
msgstr ""
4576
4577
# help of 'action' option of 'unshelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4578
#: breezy/builtins.py:6689
6093.2.1 by Jonathan Riddell
add .pot file to archive
4579
msgid "The action to perform."
4580
msgstr ""
4581
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4582
# title of 'action' option of 'resolve' command
4583
# title of 'action' option of 'unshelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4584
#: breezy/builtins.py:6689 breezy/conflicts.py:707
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4585
msgid "action"
4586
msgstr ""
4587
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4588
# help of 'action=apply' option of 'unshelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4589
#: breezy/builtins.py:6691
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4590
msgid "Apply changes and remove from the shelf."
4591
msgstr ""
4592
4593
# help of 'action=dry-run' option of 'unshelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4594
#: breezy/builtins.py:6692
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4595
msgid "Show changes, but do not apply or remove them."
4596
msgstr ""
4597
4598
# help of 'action=preview' option of 'unshelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4599
#: breezy/builtins.py:6693
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4600
msgid ""
4601
"Instead of unshelving the changes, show the diff that would result from "
4602
"unshelving."
4603
msgstr ""
4604
4605
# help of 'action=delete-only' option of 'unshelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4606
#: breezy/builtins.py:6695
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4607
msgid "Delete changes without applying them."
4608
msgstr ""
4609
4610
# help of 'action=keep' option of 'unshelve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4611
#: breezy/builtins.py:6696
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4612
msgid "Apply changes but don't delete them."
4613
msgstr ""
4614
7185.1.1 by Jelmer Vernooij
Update pot file.
4615
#: breezy/builtins.py:6711
6093.2.1 by Jonathan Riddell
add .pot file to archive
4616
msgid "Remove unwanted files from working tree."
4617
msgstr ""
4618
7185.1.1 by Jelmer Vernooij
Update pot file.
4619
#: breezy/builtins.py:6713
6093.2.1 by Jonathan Riddell
add .pot file to archive
4620
msgid ""
4621
"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
4622
"files are never deleted."
4623
msgstr ""
4624
7185.1.1 by Jelmer Vernooij
Update pot file.
4625
#: breezy/builtins.py:6716
6093.2.1 by Jonathan Riddell
add .pot file to archive
4626
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4627
"Another class is 'detritus', which includes files emitted by brz during\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4628
"normal operations and selftests.  (The value of these files decreases with\n"
4629
"time.)"
4630
msgstr ""
4631
7185.1.1 by Jelmer Vernooij
Update pot file.
4632
#: breezy/builtins.py:6720
6093.2.1 by Jonathan Riddell
add .pot file to archive
4633
msgid ""
4634
"If no options are specified, unknown files are deleted.  Otherwise, option\n"
4635
"flags are respected, and may be combined."
4636
msgstr ""
4637
7185.1.1 by Jelmer Vernooij
Update pot file.
4638
#: breezy/builtins.py:6723
6093.2.1 by Jonathan Riddell
add .pot file to archive
4639
msgid "To check what clean-tree will do, use --dry-run."
4640
msgstr ""
4641
4642
# help of 'ignored' option of 'clean-tree' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4643
#: breezy/builtins.py:6726
6093.2.1 by Jonathan Riddell
add .pot file to archive
4644
msgid "Delete all ignored files."
4645
msgstr ""
4646
4647
# help of 'detritus' option of 'clean-tree' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4648
#: breezy/builtins.py:6727
6093.2.1 by Jonathan Riddell
add .pot file to archive
4649
msgid ""
4650
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4651
msgstr ""
4652
4653
# help of 'unknown' option of 'clean-tree' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4654
#: breezy/builtins.py:6730
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4655
msgid "Delete files unknown to brz (default)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4656
msgstr ""
4657
4658
# help of 'dry-run' option of 'clean-tree' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4659
#: breezy/builtins.py:6731
6093.2.1 by Jonathan Riddell
add .pot file to archive
4660
msgid "Show files to delete instead of deleting them."
4661
msgstr ""
4662
4663
# help of 'force' option of 'clean-tree' command
7185.1.1 by Jelmer Vernooij
Update pot file.
4664
#: breezy/builtins.py:6733
6093.2.1 by Jonathan Riddell
add .pot file to archive
4665
msgid "Do not prompt before deleting."
4666
msgstr ""
4667
7185.1.1 by Jelmer Vernooij
Update pot file.
4668
#: breezy/builtins.py:6812
4669
msgid "Import sources from a directory, tarball or zip file"
4670
msgstr ""
4671
4672
#: breezy/builtins.py:6814
4673
msgid ""
4674
"This command will import a directory, tarball or zip file into a bzr\n"
4675
"tree, replacing any versioned files already present.  If a directory is\n"
4676
"specified, it is used as the target.  If the directory does not exist, or\n"
4677
"is not versioned, it is created."
4678
msgstr ""
4679
4680
#: breezy/builtins.py:6819
4681
msgid "Tarballs may be gzip or bzip2 compressed.  This is autodetected."
4682
msgstr ""
4683
4684
#: breezy/builtins.py:6821
4685
msgid ""
4686
"If the tarball or zip has a single root directory, that directory is\n"
4687
"stripped when extracting the tarball.  This is not done for directories."
4688
msgstr ""
4689
4690
#: breezy/builtins.py:6833
4691
msgid "Hardlink matching files to another tree."
4692
msgstr ""
4693
4694
#: breezy/builtins.py:6835
4695
msgid "Only files with identical content and execute bit will be linked."
4696
msgstr ""
4697
4698
#: breezy/bundle/__init__.py:61
6138.4.4 by Jonathan Riddell
update bzr.pot
4699
msgid "A directory cannot be a bundle"
4700
msgstr ""
4701
7185.1.1 by Jelmer Vernooij
Update pot file.
4702
#: breezy/bundle/apply_bundle.py:38
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4703
msgid "Install revisions"
4704
msgstr ""
4705
7185.1.1 by Jelmer Vernooij
Update pot file.
4706
#: breezy/bundle/commands.py:66
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4707
msgid "--verbose requires a merge directive"
4708
msgstr ""
4709
7185.1.1 by Jelmer Vernooij
Update pot file.
4710
#: breezy/bundle/commands.py:70
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4711
msgid "Bundle format not supported"
4712
msgstr ""
4713
7185.1.1 by Jelmer Vernooij
Update pot file.
4714
#: breezy/bundle/commands.py:80
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4715
msgid "Records\n"
4716
msgstr ""
4717
7185.1.1 by Jelmer Vernooij
Update pot file.
4718
#: breezy/bundle/commands.py:84
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4719
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4720
msgid "{0}: {1} ({2} multiparent)\n"
4721
msgstr ""
4722
7185.1.1 by Jelmer Vernooij
Update pot file.
4723
#: breezy/bundle/commands.py:86
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4724
#, python-format
4725
msgid "unique files: %d\n"
4726
msgstr ""
4727
7185.1.1 by Jelmer Vernooij
Update pot file.
4728
#: breezy/bundle/commands.py:95
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4729
msgid "Revisions\n"
4730
msgstr ""
4731
7185.1.1 by Jelmer Vernooij
Update pot file.
4732
#: breezy/bundle/commands.py:96
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4733
#, python-format
4734
msgid "nicks: %s\n"
4735
msgstr ""
4736
7185.1.1 by Jelmer Vernooij
Update pot file.
4737
#: breezy/bundle/commands.py:98
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4738
#, python-format
4739
msgid ""
4740
"committers: \n"
4741
"%s\n"
4742
msgstr ""
4743
7185.1.1 by Jelmer Vernooij
Update pot file.
4744
#: breezy/bundle/commands.py:107
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4745
msgid "Decoded contents\n"
4746
msgstr ""
4747
7185.1.1 by Jelmer Vernooij
Update pot file.
4748
#: breezy/bundle/serializer/v4.py:314
6138.4.4 by Jonathan Riddell
update bzr.pot
4749
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
4750
msgid "Bundling %d revision."
4751
msgid_plural "Bundling %d revisions."
4752
msgstr[0] ""
4753
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
4754
7185.1.1 by Jelmer Vernooij
Update pot file.
4755
#: breezy/bzr/bzrdir.py:504
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4756
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4757
msgid ""
6150.1.1 by Jonathan Riddell
update bzr.pot
4758
"making backup of {0}\n"
4759
"  to {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
4760
msgstr ""
4761
7185.1.1 by Jelmer Vernooij
Update pot file.
4762
#: breezy/bzr/bzrdir.py:525
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4763
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4764
msgid "renamed {0} to {1}"
4765
msgstr ""
4766
7185.1.1 by Jelmer Vernooij
Update pot file.
4767
#: breezy/bzr/bzrdir.py:1591
6138.4.4 by Jonathan Riddell
update bzr.pot
4768
#, python-format
4769
msgid ""
4770
"Source repository format does not support stacking, using format:\n"
4771
"  %s"
4772
msgstr ""
4773
7185.1.1 by Jelmer Vernooij
Update pot file.
4774
#: breezy/bzr/bzrdir.py:1611
6138.4.4 by Jonathan Riddell
update bzr.pot
4775
#, python-format
4776
msgid ""
4777
"Source branch format does not support stacking, using format:\n"
4778
"  %s"
4779
msgstr ""
4780
7185.1.1 by Jelmer Vernooij
Update pot file.
4781
#: breezy/bzr/bzrdir.py:1748
6138.4.4 by Jonathan Riddell
update bzr.pot
4782
msgid "starting repository conversion"
4783
msgstr ""
4784
7185.1.1 by Jelmer Vernooij
Update pot file.
4785
#: breezy/bzr/bzrdir.py:1875
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4786
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4787
msgid "Using default stacking branch {0} at {1}"
4788
msgstr ""
4789
7185.1.1 by Jelmer Vernooij
Update pot file.
4790
#: breezy/bzr/check.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
4791
msgid "check"
4792
msgstr ""
4793
7185.1.1 by Jelmer Vernooij
Update pot file.
4794
#: breezy/bzr/check.py:101
6138.4.4 by Jonathan Riddell
update bzr.pot
4795
msgid "checking revisions"
4796
msgstr ""
4797
7185.1.1 by Jelmer Vernooij
Update pot file.
4798
#: breezy/bzr/check.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
4799
msgid "checking commit contents"
4800
msgstr ""
4801
7185.1.1 by Jelmer Vernooij
Update pot file.
4802
#: breezy/bzr/check.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
4803
msgid "checking file graphs"
4804
msgstr ""
4805
7185.1.1 by Jelmer Vernooij
Update pot file.
4806
#: breezy/bzr/check.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
4807
msgid "checking branches and trees"
4808
msgstr ""
4809
7185.1.1 by Jelmer Vernooij
Update pot file.
4810
#: breezy/bzr/check.py:194
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4811
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4812
msgid "checked repository {0} format {1}"
4813
msgstr ""
4814
7185.1.1 by Jelmer Vernooij
Update pot file.
4815
#: breezy/bzr/check.py:197
6138.4.4 by Jonathan Riddell
update bzr.pot
4816
#, python-format
4817
msgid "%6d revisions"
4818
msgstr ""
4819
7185.1.1 by Jelmer Vernooij
Update pot file.
4820
#: breezy/bzr/check.py:198
6138.4.4 by Jonathan Riddell
update bzr.pot
4821
#, python-format
4822
msgid "%6d file-ids"
4823
msgstr ""
4824
7185.1.1 by Jelmer Vernooij
Update pot file.
4825
#: breezy/bzr/check.py:200
6138.4.4 by Jonathan Riddell
update bzr.pot
4826
#, python-format
4827
msgid "%6d unreferenced text versions"
4828
msgstr ""
4829
7185.1.1 by Jelmer Vernooij
Update pot file.
4830
#: breezy/bzr/check.py:204
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4831
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4832
msgid "unreferenced version: {{{0}}} in {1}"
4833
msgstr ""
4834
7185.1.1 by Jelmer Vernooij
Update pot file.
4835
#: breezy/bzr/check.py:207
6138.4.4 by Jonathan Riddell
update bzr.pot
4836
#, python-format
4837
msgid "%6d revisions are missing inventory_sha1"
4838
msgstr ""
4839
7185.1.1 by Jelmer Vernooij
Update pot file.
4840
#: breezy/bzr/check.py:210
6138.4.4 by Jonathan Riddell
update bzr.pot
4841
#, python-format
4842
msgid "%6d revisions are mentioned but not present"
4843
msgstr ""
4844
7185.1.1 by Jelmer Vernooij
Update pot file.
4845
#: breezy/bzr/check.py:213
6138.4.4 by Jonathan Riddell
update bzr.pot
4846
#, python-format
4847
msgid "%6d ghost revisions"
4848
msgstr ""
4849
7185.1.1 by Jelmer Vernooij
Update pot file.
4850
#: breezy/bzr/check.py:218
6138.4.4 by Jonathan Riddell
update bzr.pot
4851
#, python-format
4852
msgid "%6d revisions missing parents in ancestry"
4853
msgstr ""
4854
7185.1.1 by Jelmer Vernooij
Update pot file.
4855
#: breezy/bzr/check.py:222
6138.4.4 by Jonathan Riddell
update bzr.pot
4856
#, python-format
4857
msgid "      %s should be in the ancestry for:"
4858
msgstr ""
4859
7185.1.1 by Jelmer Vernooij
Update pot file.
4860
#: breezy/bzr/check.py:227
6138.4.4 by Jonathan Riddell
update bzr.pot
4861
#, python-format
4862
msgid "%6d inconsistent parents"
4863
msgstr ""
4864
7185.1.1 by Jelmer Vernooij
Update pot file.
4865
#: breezy/bzr/check.py:232
4866
#, python-brace-format
4867
msgid "      * {0} version {1} has parents ({2}) but should have ({3})"
6138.4.4 by Jonathan Riddell
update bzr.pot
4868
msgstr ""
4869
7185.1.1 by Jelmer Vernooij
Update pot file.
4870
#: breezy/bzr/check.py:239
6138.4.4 by Jonathan Riddell
update bzr.pot
4871
#, python-format
4872
msgid "%6d revisions have incorrect parents in the revision index"
4873
msgstr ""
4874
7185.1.1 by Jelmer Vernooij
Update pot file.
4875
#: breezy/bzr/check.py:245
4876
#, python-brace-format
4877
msgid "       {0} has wrong parents in index: ({1}) should be ({2})"
6138.4.4 by Jonathan Riddell
update bzr.pot
4878
msgstr ""
4879
7185.1.1 by Jelmer Vernooij
Update pot file.
4880
#: breezy/bzr/check.py:261
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4881
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4882
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4883
msgstr ""
4884
7185.1.1 by Jelmer Vernooij
Update pot file.
4885
#: breezy/bzr/check.py:290
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4886
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4887
msgid ""
4888
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4889
"{{{4}}}"
4890
msgstr ""
4891
7185.1.1 by Jelmer Vernooij
Update pot file.
4892
#: breezy/bzr/fetch.py:102
4893
msgid "Finding revisions"
4894
msgstr ""
4895
4896
#: breezy/bzr/fetch.py:107
4897
msgid "Fetching revisions"
4898
msgstr ""
4899
4900
#: breezy/bzr/groupcompress.py:1748
4901
#, python-format
4902
msgid "Insert claimed random_id=True, but then inserted %r two times"
4903
msgstr ""
4904
4905
#: breezy/bzr/knit.py:1835 breezy/bzr/knit.py:1873
4906
msgid "Walking content"
4907
msgstr ""
4908
4909
#: breezy/bzr/knit.py:3406
4910
msgid "annotating"
4911
msgstr ""
4912
4913
#: breezy/bzr/remote.py:1302
4914
#, python-format
4915
msgid "bzr: ERROR (ignored): %s"
4916
msgstr ""
4917
4918
#: breezy/bzr/remote.py:2607
4919
msgid "Copying repository content as tarball..."
4920
msgstr ""
4921
4922
#: breezy/bzr/smart/medium.py:735
4923
#, python-brace-format
4924
msgid "HPSS calls: {0} ({1} vfs) {2}"
4925
msgstr ""
4926
4927
#: breezy/bzr/smart/ping.py:33
4928
msgid "Pings a Bazaar smart server."
4929
msgstr ""
4930
4931
#: breezy/bzr/smart/ping.py:35
4932
msgid ""
4933
"This command sends a 'hello' request to the given location using the brz\n"
4934
"smart protocol, and reports the response."
4935
msgstr ""
4936
4937
#: breezy/bzr/smart/server.py:169
4938
msgid "Requested to stop gracefully"
4939
msgstr ""
4940
4941
#: breezy/bzr/smart/server.py:179
4942
#, python-format
4943
msgid "Waiting for %d client(s) to finish"
4944
msgstr ""
4945
4946
#: breezy/bzr/smart/server.py:185
4947
#, python-format
4948
msgid "Still waiting for %d client(s) to finish"
4949
msgstr ""
4950
4951
#: breezy/bzr/smart/server.py:219
4952
#, python-format
4953
msgid "listening socket error: %s"
4954
msgstr ""
4955
4956
#: breezy/bzr/smart/server.py:459
4957
#, python-format
4958
msgid "listening on port: %s"
4959
msgstr ""
4960
4961
#: breezy/bzr/vf_repository.py:786
4962
msgid "inventories"
4963
msgstr ""
4964
4965
#: breezy/bzr/vf_repository.py:812
4966
msgid "texts"
4967
msgstr ""
4968
4969
#: breezy/bzr/vf_repository.py:1292 breezy/bzr/vf_repository.py:1302
4970
msgid "Calculating text parents"
4971
msgstr ""
4972
4973
#: breezy/bzr/vf_repository.py:1380
4974
msgid "Fetch texts"
4975
msgstr ""
4976
4977
#: breezy/bzr/vf_repository.py:2253
4978
msgid "loading text store"
4979
msgstr ""
4980
4981
#: breezy/bzr/vf_repository.py:2260
4982
msgid "checking text graph"
4983
msgstr ""
4984
4985
#: breezy/bzr/vf_repository.py:2702 breezy/bzr/vf_repository.py:2716
4986
#: breezy/bzr/vf_repository.py:2828
4987
msgid "Transferring revisions"
4988
msgstr ""
4989
4990
#: breezy/check.py:64
6138.4.4 by Jonathan Riddell
update bzr.pot
4991
#, python-format
4992
msgid "Checking branch at '%s'."
4993
msgstr ""
4994
7185.1.1 by Jelmer Vernooij
Update pot file.
4995
#: breezy/check.py:84
6138.4.4 by Jonathan Riddell
update bzr.pot
4996
#, python-format
4997
msgid "Checking working tree at '%s'."
4998
msgstr ""
4999
7185.1.1 by Jelmer Vernooij
Update pot file.
5000
#: breezy/check.py:137 breezy/check.py:151
6138.4.4 by Jonathan Riddell
update bzr.pot
5001
msgid "No branch found at specified location."
5002
msgstr ""
5003
7185.1.1 by Jelmer Vernooij
Update pot file.
5004
#: breezy/check.py:139 breezy/check.py:149
6138.4.4 by Jonathan Riddell
update bzr.pot
5005
msgid "No working tree found at specified location."
5006
msgstr ""
5007
7185.1.1 by Jelmer Vernooij
Update pot file.
5008
#: breezy/check.py:142
6138.4.4 by Jonathan Riddell
update bzr.pot
5009
#, python-format
5010
msgid "Checking repository at '%s'."
5011
msgstr ""
5012
7185.1.1 by Jelmer Vernooij
Update pot file.
5013
#: breezy/check.py:153
6138.4.4 by Jonathan Riddell
update bzr.pot
5014
msgid "No repository found at specified location."
5015
msgstr ""
5016
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5017
#: breezy/clean_tree.py:63
6138.4.4 by Jonathan Riddell
update bzr.pot
5018
msgid "Nothing to delete."
5019
msgstr ""
5020
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5021
#: breezy/clean_tree.py:68
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5022
msgid "Are you sure you wish to delete these"
5023
msgstr ""
5024
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5025
#: breezy/clean_tree.py:70
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5026
msgid "Canceled"
5027
msgstr ""
5028
7185.1.1 by Jelmer Vernooij
Update pot file.
5029
#: breezy/clean_tree.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
5030
#, python-format
5031
msgid "unable to remove %s"
5032
msgstr ""
5033
7185.1.1 by Jelmer Vernooij
Update pot file.
5034
#: breezy/clean_tree.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
5035
msgid "deleting paths:"
5036
msgstr ""
5037
7185.1.1 by Jelmer Vernooij
Update pot file.
5038
#: breezy/clean_tree.py:123
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5039
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
5040
msgid "unable to remove \"{0}\": {1}."
6138.4.4 by Jonathan Riddell
update bzr.pot
5041
msgstr ""
5042
7185.1.1 by Jelmer Vernooij
Update pot file.
5043
#: breezy/clean_tree.py:128
6138.4.4 by Jonathan Riddell
update bzr.pot
5044
msgid "No files deleted."
5045
msgstr ""
5046
7185.1.1 by Jelmer Vernooij
Update pot file.
5047
#: breezy/cmd_version_info.py:49
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5048
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5049
msgid "No known version info format {0}. Supported types are: {1}"
5050
msgstr ""
5051
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5052
# help of 'format=custom' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5053
#: breezy/cmd_version_info.py:53
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5054
msgid "Version info in Custom template-based format."
5055
msgstr ""
5056
5057
# help of 'format=python' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5058
#: breezy/cmd_version_info.py:53
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5059
msgid "Version info in Python format."
5060
msgstr ""
5061
5062
# help of 'format=rio' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5063
#: breezy/cmd_version_info.py:53
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5064
msgid "Version info in RIO (simple text) format (default)."
5065
msgstr ""
5066
7185.1.1 by Jelmer Vernooij
Update pot file.
5067
#: breezy/cmd_version_info.py:54
6093.2.1 by Jonathan Riddell
add .pot file to archive
5068
msgid "Show version information about this tree."
5069
msgstr ""
5070
7185.1.1 by Jelmer Vernooij
Update pot file.
5071
#: breezy/cmd_version_info.py:56
6093.2.1 by Jonathan Riddell
add .pot file to archive
5072
msgid ""
5073
"You can use this command to add information about version into\n"
5074
"source code of an application. The output can be in one of the\n"
5075
"supported formats or in a custom format based on a template."
5076
msgstr ""
5077
7185.1.1 by Jelmer Vernooij
Update pot file.
5078
#: breezy/cmd_version_info.py:60 en/help_topics/configuration.txt:699
5079
#: en/help_topics/configuration.txt:725
6093.2.1 by Jonathan Riddell
add .pot file to archive
5080
msgid "For example::"
5081
msgstr ""
5082
7185.1.1 by Jelmer Vernooij
Update pot file.
5083
#: breezy/cmd_version_info.py:62
6093.2.1 by Jonathan Riddell
add .pot file to archive
5084
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5085
"  brz version-info --custom \\\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5086
"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5087
msgstr ""
5088
7185.1.1 by Jelmer Vernooij
Update pot file.
5089
#: breezy/cmd_version_info.py:65
6093.2.1 by Jonathan Riddell
add .pot file to archive
5090
msgid ""
5091
"will produce a C header file with formatted string containing the\n"
5092
"current revision number. Other supported variables in templates are:"
5093
msgstr ""
5094
7185.1.1 by Jelmer Vernooij
Update pot file.
5095
#: breezy/cmd_version_info.py:68
6093.2.1 by Jonathan Riddell
add .pot file to archive
5096
msgid ""
5097
"  * {date} - date of the last revision\n"
5098
"  * {build_date} - current date\n"
5099
"  * {revno} - revision number\n"
5100
"  * {revision_id} - revision id\n"
5101
"  * {branch_nick} - branch nickname\n"
5102
"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
5103
"              otherwise 1"
5104
msgstr ""
5105
5106
# help of 'format' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5107
#: breezy/cmd_version_info.py:78
6093.2.1 by Jonathan Riddell
add .pot file to archive
5108
msgid "Select the output format."
5109
msgstr ""
5110
5111
# help of 'all' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5112
#: breezy/cmd_version_info.py:82
6093.2.1 by Jonathan Riddell
add .pot file to archive
5113
msgid "Include all possible information."
5114
msgstr ""
5115
5116
# help of 'check-clean' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5117
#: breezy/cmd_version_info.py:83
6093.2.1 by Jonathan Riddell
add .pot file to archive
5118
msgid "Check if tree is clean."
5119
msgstr ""
5120
5121
# help of 'include-history' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5122
#: breezy/cmd_version_info.py:85
6093.2.1 by Jonathan Riddell
add .pot file to archive
5123
msgid "Include the revision-history."
5124
msgstr ""
5125
5126
# help of 'include-file-revisions' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5127
#: breezy/cmd_version_info.py:87
6093.2.1 by Jonathan Riddell
add .pot file to archive
5128
msgid "Include the last revision for each file."
5129
msgstr ""
5130
5131
# help of 'template' option of 'version-info' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5132
#: breezy/cmd_version_info.py:89
6093.2.1 by Jonathan Riddell
add .pot file to archive
5133
msgid "Template for the output."
5134
msgstr ""
5135
7185.1.1 by Jelmer Vernooij
Update pot file.
5136
#: breezy/cmd_version_info.py:103
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5137
msgid "brz version-info --revision takes exactly one revision specifier"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5138
msgstr ""
5139
7185.1.1 by Jelmer Vernooij
Update pot file.
5140
#: breezy/commands.py:307
5141
#, python-format
5142
msgid "unknown command \"%s\". Perhaps you meant \"%s\""
5143
msgstr ""
5144
5145
#: breezy/commands.py:309
6138.4.4 by Jonathan Riddell
update bzr.pot
5146
#, python-format
5147
msgid "unknown command \"%s\""
5148
msgstr ""
5149
7185.1.1 by Jelmer Vernooij
Update pot file.
5150
#: breezy/commands.py:560
6093.2.1 by Jonathan Riddell
add .pot file to archive
5151
msgid "No help for this command."
5152
msgstr ""
5153
7185.1.1 by Jelmer Vernooij
Update pot file.
5154
#: breezy/commands.py:573
6093.2.1 by Jonathan Riddell
add .pot file to archive
5155
#, python-format
5156
msgid ":Purpose: %s\n"
5157
msgstr ""
5158
7185.1.1 by Jelmer Vernooij
Update pot file.
5159
#: breezy/commands.py:575
6093.2.1 by Jonathan Riddell
add .pot file to archive
5160
#, python-format
5161
msgid ""
5162
":Usage:\n"
5163
"%s\n"
5164
msgstr ""
5165
7185.1.1 by Jelmer Vernooij
Update pot file.
5166
#: breezy/commands.py:577
6093.2.1 by Jonathan Riddell
add .pot file to archive
5167
#, python-format
5168
msgid ":Usage:   %s\n"
5169
msgstr ""
5170
7185.1.1 by Jelmer Vernooij
Update pot file.
5171
#: breezy/commands.py:597
6093.2.1 by Jonathan Riddell
add .pot file to archive
5172
#, python-format
5173
msgid ":Options:%s"
5174
msgstr ""
5175
7185.1.1 by Jelmer Vernooij
Update pot file.
5176
#: breezy/commands.py:608
6093.2.1 by Jonathan Riddell
add .pot file to archive
5177
#, python-format
5178
msgid ""
5179
":Description:\n"
5180
"  %s\n"
5181
"\n"
5182
msgstr ""
5183
7185.1.1 by Jelmer Vernooij
Update pot file.
5184
#: breezy/commands.py:618
6093.2.1 by Jonathan Riddell
add .pot file to archive
5185
#, python-format
5186
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5187
"See brz help %s for more details and examples.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5188
"\n"
5189
msgstr ""
5190
7185.1.1 by Jelmer Vernooij
Update pot file.
5191
#: breezy/commands.py:623
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5192
msgid ":Aliases:  "
5193
msgstr ""
5194
7185.1.1 by Jelmer Vernooij
Update pot file.
5195
#: breezy/commands.py:627
6093.2.1 by Jonathan Riddell
add .pot file to archive
5196
#, python-format
5197
msgid ":From:     plugin \"%s\"\n"
5198
msgstr ""
5199
7185.1.1 by Jelmer Vernooij
Update pot file.
5200
#: breezy/commands.py:639
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5201
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5202
msgid ":doc:`{0} <{1}-help>`"
5203
msgstr ""
5204
7185.1.1 by Jelmer Vernooij
Update pot file.
5205
#: breezy/commands.py:643
6093.2.1 by Jonathan Riddell
add .pot file to archive
5206
#, python-format
5207
msgid ":See also: %s"
5208
msgstr ""
5209
7185.1.1 by Jelmer Vernooij
Update pot file.
5210
#: breezy/commands.py:917
6138.4.4 by Jonathan Riddell
update bzr.pot
5211
msgid "Only ASCII permitted in option names"
5212
msgstr ""
5213
7185.1.1 by Jelmer Vernooij
Update pot file.
5214
#: breezy/commands.py:942 breezy/commands.py:950
6138.4.4 by Jonathan Riddell
update bzr.pot
5215
msgid "command {0!r} needs one or more {1}"
5216
msgstr ""
5217
7185.1.1 by Jelmer Vernooij
Update pot file.
5218
#: breezy/commands.py:959
6138.4.4 by Jonathan Riddell
update bzr.pot
5219
msgid "command {0!r} requires argument {1}"
5220
msgstr ""
5221
7185.1.1 by Jelmer Vernooij
Update pot file.
5222
#: breezy/commands.py:966
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5223
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5224
msgid "extra argument to command {0}: {1}"
5225
msgstr ""
5226
7185.1.1 by Jelmer Vernooij
Update pot file.
5227
#: breezy/commands.py:1038
6138.4.4 by Jonathan Riddell
update bzr.pot
5228
#, python-format
5229
msgid "Profile data written to \"%s\"."
5230
msgstr ""
5231
7185.1.1 by Jelmer Vernooij
Update pot file.
5232
#: breezy/commit.py:152 breezy/commit.py:727
6138.4.4 by Jonathan Riddell
update bzr.pot
5233
msgid "added"
5234
msgstr ""
5235
7185.1.1 by Jelmer Vernooij
Update pot file.
5236
#: breezy/commit.py:152 breezy/commit.py:737
6138.4.4 by Jonathan Riddell
update bzr.pot
5237
msgid "modified"
5238
msgstr ""
5239
7185.1.1 by Jelmer Vernooij
Update pot file.
5240
#: breezy/commit.py:158
6138.4.4 by Jonathan Riddell
update bzr.pot
5241
#, python-format
7185.1.1 by Jelmer Vernooij
Update pot file.
5242
msgid "Committing to: %s"
6138.4.4 by Jonathan Riddell
update bzr.pot
5243
msgstr ""
5244
7185.1.1 by Jelmer Vernooij
Update pot file.
5245
#: breezy/commit.py:162
6138.4.4 by Jonathan Riddell
update bzr.pot
5246
#, python-format
5247
msgid "Committed revision %d."
5248
msgstr ""
5249
7185.1.1 by Jelmer Vernooij
Update pot file.
5250
#: breezy/commit.py:171
6138.4.4 by Jonathan Riddell
update bzr.pot
5251
#, python-format
5252
msgid "deleted %s"
5253
msgstr ""
5254
7185.1.1 by Jelmer Vernooij
Update pot file.
5255
#: breezy/commit.py:174
6138.4.4 by Jonathan Riddell
update bzr.pot
5256
#, python-format
5257
msgid "missing %s"
5258
msgstr ""
5259
7185.1.1 by Jelmer Vernooij
Update pot file.
5260
#: breezy/commit.py:515
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5261
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5262
msgid ""
5263
"Conflicting tags in bound branch:\n"
5264
"{0}"
5265
msgstr ""
5266
7185.1.1 by Jelmer Vernooij
Update pot file.
5267
#: breezy/commit.py:729
6138.4.4 by Jonathan Riddell
update bzr.pot
5268
msgid "renamed"
5269
msgstr ""
5270
7185.1.1 by Jelmer Vernooij
Update pot file.
5271
#: breezy/commit.py:794
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5272
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5273
msgid "{0} [{1}] - Stage"
5274
msgstr ""
5275
7185.1.1 by Jelmer Vernooij
Update pot file.
5276
#: breezy/commit.py:797
6138.4.4 by Jonathan Riddell
update bzr.pot
5277
#, python-format
5278
msgid "%s - Stage"
5279
msgstr ""
5280
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5281
#: breezy/commit_signature_commands.py:34
6504.1.1 by Vincent Ladeuil
Update translation template
5282
msgid "Sign all commits by a given committer."
5283
msgstr ""
5284
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5285
#: breezy/commit_signature_commands.py:36
6093.2.1 by Jonathan Riddell
add .pot file to archive
5286
msgid ""
5287
"If location is not specified the local tree is used.\n"
5288
"If committer is not specified the default committer is used."
5289
msgstr ""
5290
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5291
#: breezy/commit_signature_commands.py:39
6093.2.1 by Jonathan Riddell
add .pot file to archive
5292
msgid "This does not sign commits that already have signatures."
5293
msgstr ""
5294
5295
# help of 'dry-run' option of 'sign-my-commits' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5296
#: breezy/commit_signature_commands.py:47
6093.2.1 by Jonathan Riddell
add .pot file to archive
5297
msgid ""
5298
"Don't actually sign anything, just print the revisions that would be signed."
5299
msgstr ""
5300
7185.1.1 by Jelmer Vernooij
Update pot file.
5301
#: breezy/commit_signature_commands.py:95
6504.1.1 by Vincent Ladeuil
Update translation template
5302
#, python-format
5303
msgid "Signed %d revision.\n"
5304
msgid_plural "Signed %d revisions.\n"
5305
msgstr[0] ""
5306
msgstr[1] ""
5307
7185.1.1 by Jelmer Vernooij
Update pot file.
5308
#: breezy/commit_signature_commands.py:100
6093.2.1 by Jonathan Riddell
add .pot file to archive
5309
msgid "Verify all commit signatures."
5310
msgstr ""
5311
7185.1.1 by Jelmer Vernooij
Update pot file.
5312
#: breezy/commit_signature_commands.py:102
6093.2.1 by Jonathan Riddell
add .pot file to archive
5313
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
5314
msgstr ""
5315
5316
# help of 'acceptable-keys' option of 'verify-signatures' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5317
#: breezy/commit_signature_commands.py:107
6093.2.1 by Jonathan Riddell
add .pot file to archive
5318
msgid ""
5319
"Comma separated list of GPG key patterns which are acceptable for "
5320
"verification."
5321
msgstr ""
5322
7185.1.1 by Jelmer Vernooij
Update pot file.
5323
#: breezy/commit_signature_commands.py:146
6138.4.4 by Jonathan Riddell
update bzr.pot
5324
msgid "Cannot verify a range of non-revision-history revisions"
5325
msgstr ""
5326
7185.1.1 by Jelmer Vernooij
Update pot file.
5327
#: breezy/commit_signature_commands.py:165
6093.2.1 by Jonathan Riddell
add .pot file to archive
5328
msgid "All commits signed with verifiable keys"
5329
msgstr ""
5330
7185.1.1 by Jelmer Vernooij
Update pot file.
5331
#: breezy/config.py:2509
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5332
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5333
msgid "{0} is not an SI unit."
5334
msgstr ""
5335
7185.1.1 by Jelmer Vernooij
Update pot file.
5336
#: breezy/config.py:3032
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5337
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5338
msgid ""
5339
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5340
"will be saved."
5341
msgstr ""
5342
7185.1.1 by Jelmer Vernooij
Update pot file.
5343
#: breezy/config.py:3177
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5344
#, python-format
5345
msgid "Invalid '%s', should be of the form 'name=value'"
5346
msgstr ""
5347
7185.1.1 by Jelmer Vernooij
Update pot file.
5348
#: breezy/config.py:4121
6093.2.1 by Jonathan Riddell
add .pot file to archive
5349
msgid "Display, set or remove a configuration option."
5350
msgstr ""
5351
7185.1.1 by Jelmer Vernooij
Update pot file.
5352
#: breezy/config.py:4123
6581.1.2 by Vincent Ladeuil
Update translation template.
5353
msgid "Display the active value for option NAME."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5354
msgstr ""
5355
7185.1.1 by Jelmer Vernooij
Update pot file.
5356
#: breezy/config.py:4125
6093.2.1 by Jonathan Riddell
add .pot file to archive
5357
msgid ""
5358
"If --all is specified, NAME is interpreted as a regular expression and all\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
5359
"matching options are displayed mentioning their scope and without resolving\n"
5360
"option references in the value). The active value that bzr will take into\n"
5361
"account is the first one displayed for each option."
5362
msgstr ""
5363
7185.1.1 by Jelmer Vernooij
Update pot file.
5364
#: breezy/config.py:4130
6581.1.2 by Vincent Ladeuil
Update translation template.
5365
msgid ""
5366
"If NAME is not given, --all .* is implied (all options are displayed for "
5367
"the\n"
5368
"current scope)."
5369
msgstr ""
5370
7185.1.1 by Jelmer Vernooij
Update pot file.
5371
#: breezy/config.py:4133
6581.1.2 by Vincent Ladeuil
Update translation template.
5372
msgid ""
5373
"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
5374
"is set in the most relevant scope and can be checked by displaying the\n"
5375
"option again."
5376
msgstr ""
5377
7185.1.1 by Jelmer Vernooij
Update pot file.
5378
#: breezy/config.py:4137
6581.1.2 by Vincent Ladeuil
Update translation template.
5379
msgid "Removing a value is achieved by using --remove NAME."
5380
msgstr ""
5381
6093.2.1 by Jonathan Riddell
add .pot file to archive
5382
# help of 'scope' option of 'config' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5383
#: breezy/config.py:4147
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5384
msgid "Reduce the scope to the specified configuration file."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5385
msgstr ""
5386
5387
# help of 'all' option of 'config' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5388
#: breezy/config.py:4151
6093.2.1 by Jonathan Riddell
add .pot file to archive
5389
msgid "Display all the defined values for the matching options."
5390
msgstr ""
5391
5392
# help of 'remove' option of 'config' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5393
#: breezy/config.py:4153
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5394
msgid "Remove the option from the configuration file."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5395
msgstr ""
5396
7185.1.1 by Jelmer Vernooij
Update pot file.
5397
#: breezy/conflicts.py:52
6093.2.1 by Jonathan Riddell
add .pot file to archive
5398
msgid "List files with conflicts."
5399
msgstr ""
5400
7185.1.1 by Jelmer Vernooij
Update pot file.
5401
#: breezy/conflicts.py:59
6093.2.1 by Jonathan Riddell
add .pot file to archive
5402
msgid ""
5403
"Conflicts normally are listed as short, human-readable messages.  If --text\n"
5404
"is supplied, the pathnames of files with text conflicts are listed,\n"
5405
"instead.  (This is useful for editing all files with text conflicts.)"
5406
msgstr ""
5407
7185.1.1 by Jelmer Vernooij
Update pot file.
5408
#: breezy/conflicts.py:63
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5409
msgid "Use brz resolve when you have fixed a problem."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5410
msgstr ""
5411
5412
# help of 'text' option of 'conflicts' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5413
#: breezy/conflicts.py:68
6093.2.1 by Jonathan Riddell
add .pot file to archive
5414
msgid "List paths of files with text conflicts."
5415
msgstr ""
5416
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5417
# help of 'action=done' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5418
#: breezy/conflicts.py:87
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5419
msgid "Marks the conflict as resolved."
5420
msgstr ""
5421
5422
# help of 'action=take-this' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5423
#: breezy/conflicts.py:90
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5424
msgid "Resolve the conflict preserving the version in the working tree."
5425
msgstr ""
5426
5427
# help of 'action=take-other' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5428
#: breezy/conflicts.py:93
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5429
msgid "Resolve the conflict taking the merged version into account."
5430
msgstr ""
5431
6093.2.1 by Jonathan Riddell
add .pot file to archive
5432
# help of 'action' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5433
#: breezy/conflicts.py:101
6093.2.1 by Jonathan Riddell
add .pot file to archive
5434
msgid "How to resolve the conflict."
5435
msgstr ""
5436
7185.1.1 by Jelmer Vernooij
Update pot file.
5437
#: breezy/conflicts.py:107
6093.2.1 by Jonathan Riddell
add .pot file to archive
5438
msgid "Mark a conflict as resolved."
5439
msgstr ""
5440
7185.1.1 by Jelmer Vernooij
Update pot file.
5441
#: breezy/conflicts.py:114
6093.2.1 by Jonathan Riddell
add .pot file to archive
5442
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5443
"Once you have fixed a problem, use \"brz resolve\" to automatically mark\n"
5444
"text conflicts as fixed, \"brz resolve FILE\" to mark a specific conflict "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5445
"as\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5446
"resolved, or \"brz resolve --all\" to mark all conflicts as resolved."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5447
msgstr ""
5448
5449
# help of 'all' option of 'resolve' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5450
#: breezy/conflicts.py:122
6093.2.1 by Jonathan Riddell
add .pot file to archive
5451
msgid "Resolve all conflicts in this tree."
5452
msgstr ""
5453
7185.1.1 by Jelmer Vernooij
Update pot file.
5454
#: breezy/conflicts.py:130
6138.4.4 by Jonathan Riddell
update bzr.pot
5455
msgid "If --all is specified, no FILE may be provided"
5456
msgstr ""
5457
7185.1.1 by Jelmer Vernooij
Update pot file.
5458
#: breezy/conflicts.py:155
6138.4.4 by Jonathan Riddell
update bzr.pot
5459
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
5460
msgid "%d conflict auto-resolved."
5461
msgid_plural "%d conflicts auto-resolved."
5462
msgstr[0] ""
5463
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
5464
7185.1.1 by Jelmer Vernooij
Update pot file.
5465
#: breezy/conflicts.py:158
6138.4.4 by Jonathan Riddell
update bzr.pot
5466
msgid "Remaining conflicts:"
5467
msgstr ""
5468
7185.1.1 by Jelmer Vernooij
Update pot file.
5469
#: breezy/conflicts.py:163
6138.4.4 by Jonathan Riddell
update bzr.pot
5470
msgid "All conflicts resolved."
5471
msgstr ""
5472
7185.1.1 by Jelmer Vernooij
Update pot file.
5473
#: breezy/conflicts.py:172
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5474
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5475
msgid "{0} conflict resolved, {1} remaining"
5476
msgid_plural "{0} conflicts resolved, {1} remaining"
5477
msgstr[0] ""
5478
msgstr[1] ""
5479
7185.1.1 by Jelmer Vernooij
Update pot file.
5480
#: breezy/controldir.py:731
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5481
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5482
msgid "{0} is{1} redirected to {2}"
5483
msgstr ""
5484
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5485
#: breezy/diff.py:413
6138.4.4 by Jonathan Riddell
update bzr.pot
5486
#, python-format
5487
msgid "*** Ignoring files outside view. View is %s"
5488
msgstr ""
5489
7185.1.1 by Jelmer Vernooij
Update pot file.
5490
#: breezy/errors.py:167
5491
msgid ""
5492
"API %(api)s is not compatible; one of versions %(wanted)r is required, but "
5493
"current version is %(current)r."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5494
msgstr ""
5495
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5496
#: breezy/errors.py:178
6093.2.1 by Jonathan Riddell
add .pot file to archive
5497
msgid "The transport '%(transport)s' is only accessible within this process."
5498
msgstr ""
5499
7185.1.1 by Jelmer Vernooij
Update pot file.
5500
#: breezy/errors.py:196
6093.2.1 by Jonathan Riddell
add .pot file to archive
5501
msgid "Invalid revision number %(revno)s"
5502
msgstr ""
5503
7185.1.1 by Jelmer Vernooij
Update pot file.
5504
#: breezy/errors.py:205
6093.2.1 by Jonathan Riddell
add .pot file to archive
5505
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5506
msgstr ""
5507
7185.1.1 by Jelmer Vernooij
Update pot file.
5508
#: breezy/errors.py:216
6093.2.1 by Jonathan Riddell
add .pot file to archive
5509
msgid "Reserved revision-id {%(revision_id)s}"
5510
msgstr ""
5511
7185.1.1 by Jelmer Vernooij
Update pot file.
5512
#: breezy/errors.py:230
6093.2.1 by Jonathan Riddell
add .pot file to archive
5513
msgid "There is no public branch set for \"%(branch_url)s\"."
5514
msgstr ""
5515
7185.1.1 by Jelmer Vernooij
Update pot file.
5516
#: breezy/errors.py:240
6093.2.1 by Jonathan Riddell
add .pot file to archive
5517
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5518
msgstr ""
5519
7185.1.1 by Jelmer Vernooij
Update pot file.
5520
#: breezy/errors.py:250
6093.2.1 by Jonathan Riddell
add .pot file to archive
5521
msgid "The branch '%(branch)s' is not stacked."
5522
msgstr ""
5523
7185.1.1 by Jelmer Vernooij
Update pot file.
5524
#: breezy/errors.py:264
6093.2.1 by Jonathan Riddell
add .pot file to archive
5525
msgid "No WorkingTree exists for \"%(base)s\"."
5526
msgstr ""
5527
7185.1.1 by Jelmer Vernooij
Update pot file.
5528
#: breezy/errors.py:273
6093.2.1 by Jonathan Riddell
add .pot file to archive
5529
msgid "%(url)s is not a local path."
5530
msgstr ""
5531
7185.1.1 by Jelmer Vernooij
Update pot file.
5532
#: breezy/errors.py:301
6093.2.1 by Jonathan Riddell
add .pot file to archive
5533
msgid "%(not_locked)r is not write locked but needs to be."
5534
msgstr ""
5535
7185.1.1 by Jelmer Vernooij
Update pot file.
5536
#: breezy/errors.py:309
5537
msgid "Commit refused because there are unknown files in the tree"
5538
msgstr ""
5539
5540
#: breezy/errors.py:320
6093.2.1 by Jonathan Riddell
add .pot file to archive
5541
msgid "Generic path error: %(path)r%(extra)s)"
5542
msgstr ""
5543
7185.1.1 by Jelmer Vernooij
Update pot file.
5544
#: breezy/errors.py:333
6093.2.1 by Jonathan Riddell
add .pot file to archive
5545
msgid "No such file: %(path)r%(extra)s"
5546
msgstr ""
5547
7185.1.1 by Jelmer Vernooij
Update pot file.
5548
#: breezy/errors.py:338
6093.2.1 by Jonathan Riddell
add .pot file to archive
5549
msgid "File exists: %(path)r%(extra)s"
5550
msgstr ""
5551
7185.1.1 by Jelmer Vernooij
Update pot file.
5552
#: breezy/errors.py:344
6093.2.1 by Jonathan Riddell
add .pot file to archive
5553
msgid ""
5554
"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.
5555
"after to tell brz about a rename that has already happened)%(extra)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5556
msgstr ""
5557
7185.1.1 by Jelmer Vernooij
Update pot file.
5558
#: breezy/errors.py:360
6093.2.1 by Jonathan Riddell
add .pot file to archive
5559
msgid "\"%(path)s\" is not a directory %(extra)s"
5560
msgstr ""
5561
7185.1.1 by Jelmer Vernooij
Update pot file.
5562
#: breezy/errors.py:365
6093.2.1 by Jonathan Riddell
add .pot file to archive
5563
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5564
msgstr ""
5565
7185.1.1 by Jelmer Vernooij
Update pot file.
5566
#: breezy/errors.py:370
6093.2.1 by Jonathan Riddell
add .pot file to archive
5567
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5568
msgstr ""
5569
7185.1.1 by Jelmer Vernooij
Update pot file.
5570
#: breezy/errors.py:375
6093.2.1 by Jonathan Riddell
add .pot file to archive
5571
msgid "Hard-linking \"%(path)s\" is not supported"
5572
msgstr ""
5573
7185.1.1 by Jelmer Vernooij
Update pot file.
5574
#: breezy/errors.py:390
6093.2.1 by Jonathan Riddell
add .pot file to archive
5575
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5576
msgstr ""
5577
7185.1.1 by Jelmer Vernooij
Update pot file.
5578
#: breezy/errors.py:395
6093.2.1 by Jonathan Riddell
add .pot file to archive
5579
msgid "Permission denied: \"%(path)s\"%(extra)s"
5580
msgstr ""
5581
7185.1.1 by Jelmer Vernooij
Update pot file.
5582
#: breezy/errors.py:412
6093.2.1 by Jonathan Riddell
add .pot file to archive
5583
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5584
msgstr ""
5585
7185.1.1 by Jelmer Vernooij
Update pot file.
5586
#: breezy/errors.py:420
6093.2.1 by Jonathan Riddell
add .pot file to archive
5587
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5588
msgstr ""
5589
7185.1.1 by Jelmer Vernooij
Update pot file.
5590
#: breezy/errors.py:430
6093.2.1 by Jonathan Riddell
add .pot file to archive
5591
msgid ""
5592
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5593
"need to upgrade the repository to permit branch stacking."
5594
msgstr ""
5595
7185.1.1 by Jelmer Vernooij
Update pot file.
5596
#: breezy/errors.py:441
6093.2.1 by Jonathan Riddell
add .pot file to archive
5597
msgid "Error reading from %(path)r."
5598
msgstr ""
5599
7185.1.1 by Jelmer Vernooij
Update pot file.
5600
#: breezy/errors.py:460
6093.2.1 by Jonathan Riddell
add .pot file to archive
5601
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5602
msgstr ""
5603
7185.1.1 by Jelmer Vernooij
Update pot file.
5604
#: breezy/errors.py:476
6093.2.1 by Jonathan Riddell
add .pot file to archive
5605
msgid "Path \"%(path)s\" is not unicode normalized"
5606
msgstr ""
5607
7185.1.1 by Jelmer Vernooij
Update pot file.
5608
#: breezy/errors.py:484
6093.2.1 by Jonathan Riddell
add .pot file to archive
5609
msgid "Not a branch: \"%(path)s\"%(detail)s."
5610
msgstr ""
5611
7185.1.1 by Jelmer Vernooij
Update pot file.
5612
#: breezy/errors.py:526
6093.2.1 by Jonathan Riddell
add .pot file to archive
5613
msgid "No submit branch available for branch \"%(path)s\""
5614
msgstr ""
5615
7185.1.1 by Jelmer Vernooij
Update pot file.
5616
#: breezy/errors.py:535
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5617
msgid "A control directory already exists: \"%(path)s\"."
5618
msgstr ""
5619
7185.1.1 by Jelmer Vernooij
Update pot file.
5620
#: breezy/errors.py:540
6093.2.1 by Jonathan Riddell
add .pot file to archive
5621
msgid "Already a branch: \"%(path)s\"."
5622
msgstr ""
5623
7185.1.1 by Jelmer Vernooij
Update pot file.
5624
#: breezy/errors.py:545
6504.1.1 by Vincent Ladeuil
Update translation template
5625
msgid "Invalid branch name: %(name)s"
5626
msgstr ""
5627
7185.1.1 by Jelmer Vernooij
Update pot file.
5628
#: breezy/errors.py:554
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5629
msgid "Parent branch already exists: \"%(path)s\"."
5630
msgstr ""
5631
7185.1.1 by Jelmer Vernooij
Update pot file.
5632
#: breezy/errors.py:560
6093.2.1 by Jonathan Riddell
add .pot file to archive
5633
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5634
"Directory contains a branch, but no working tree (use brz checkout if you "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5635
"wish to build a working tree): \"%(path)s\""
5636
msgstr ""
5637
7185.1.1 by Jelmer Vernooij
Update pot file.
5638
#: breezy/errors.py:565
6093.2.1 by Jonathan Riddell
add .pot file to archive
5639
msgid ""
5640
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5641
msgstr ""
5642
7185.1.1 by Jelmer Vernooij
Update pot file.
5643
#: breezy/errors.py:575
6093.2.1 by Jonathan Riddell
add .pot file to archive
5644
msgid "No repository present: \"%(path)s\""
5645
msgstr ""
5646
7185.1.1 by Jelmer Vernooij
Update pot file.
5647
#: breezy/errors.py:583
6093.2.1 by Jonathan Riddell
add .pot file to archive
5648
msgid ""
5649
"Unsupported branch format: %(format)s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5650
"Please run 'brz upgrade'"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5651
msgstr ""
5652
7185.1.1 by Jelmer Vernooij
Update pot file.
5653
#: breezy/errors.py:589
6093.2.1 by Jonathan Riddell
add .pot file to archive
5654
msgid "Unknown %(kind)s format: %(format)r"
5655
msgstr ""
5656
7185.1.1 by Jelmer Vernooij
Update pot file.
5657
#: breezy/errors.py:598
5658
msgid ""
5659
"Line ending corrupted for file: %(file)s; Maybe your files got corrupted in "
5660
"transport?"
5661
msgstr ""
5662
5663
#: breezy/errors.py:607
5664
msgid "Format %(format)s is not compatible with .bzr version %(controldir)s."
5665
msgstr ""
5666
5667
#: breezy/errors.py:617
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5668
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5669
msgstr ""
5670
7185.1.1 by Jelmer Vernooij
Update pot file.
5671
#: breezy/errors.py:632
6093.2.1 by Jonathan Riddell
add .pot file to archive
5672
msgid ""
5673
"%(target)s\n"
5674
"is not compatible with\n"
5675
"%(source)s\n"
5676
"%(details)s"
5677
msgstr ""
5678
7185.1.1 by Jelmer Vernooij
Update pot file.
5679
#: breezy/errors.py:648
6093.2.1 by Jonathan Riddell
add .pot file to archive
5680
msgid "Revision is not compatible with %(repo_format)s"
5681
msgstr ""
5682
7185.1.1 by Jelmer Vernooij
Update pot file.
5683
#: breezy/errors.py:658
6093.2.1 by Jonathan Riddell
add .pot file to archive
5684
msgid "%(context_info)s%(path)s is already versioned."
5685
msgstr ""
5686
7185.1.1 by Jelmer Vernooij
Update pot file.
5687
#: breezy/errors.py:679
6093.2.1 by Jonathan Riddell
add .pot file to archive
5688
msgid "%(context_info)s%(path)s is not versioned."
5689
msgstr ""
5690
7185.1.1 by Jelmer Vernooij
Update pot file.
5691
#: breezy/errors.py:700
6093.2.1 by Jonathan Riddell
add .pot file to archive
5692
msgid "Path(s) are not versioned: %(paths_as_string)s"
5693
msgstr ""
5694
7185.1.1 by Jelmer Vernooij
Update pot file.
5695
#: breezy/errors.py:711
6093.2.1 by Jonathan Riddell
add .pot file to archive
5696
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5697
msgstr ""
5698
7185.1.1 by Jelmer Vernooij
Update pot file.
5699
#: breezy/errors.py:730
6093.2.1 by Jonathan Riddell
add .pot file to archive
5700
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5701
msgstr ""
5702
7185.1.1 by Jelmer Vernooij
Update pot file.
5703
#: breezy/errors.py:738
6093.2.1 by Jonathan Riddell
add .pot file to archive
5704
msgid ""
5705
"Filename %(filename)r is not valid in your current filesystem encoding "
5706
"%(fs_encoding)s"
5707
msgstr ""
5708
7185.1.1 by Jelmer Vernooij
Update pot file.
5709
#: breezy/errors.py:749
6093.2.1 by Jonathan Riddell
add .pot file to archive
5710
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5711
msgstr ""
5712
7185.1.1 by Jelmer Vernooij
Update pot file.
5713
#: breezy/errors.py:767
6093.2.1 by Jonathan Riddell
add .pot file to archive
5714
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5715
msgstr ""
5716
7185.1.1 by Jelmer Vernooij
Update pot file.
5717
#: breezy/errors.py:806
6093.2.1 by Jonathan Riddell
add .pot file to archive
5718
msgid "Cannot lock %(lock)s: %(why)s"
5719
msgstr ""
5720
7185.1.1 by Jelmer Vernooij
Update pot file.
5721
#: breezy/errors.py:816
6093.2.1 by Jonathan Riddell
add .pot file to archive
5722
msgid ""
5723
"A transaction related operation was attempted after the transaction finished."
5724
msgstr ""
5725
7185.1.1 by Jelmer Vernooij
Update pot file.
5726
#: breezy/errors.py:843
6093.2.1 by Jonathan Riddell
add .pot file to archive
5727
msgid "Cannot lock: transport is read only: %(transport)s"
5728
msgstr ""
5729
7185.1.1 by Jelmer Vernooij
Update pot file.
5730
#: breezy/errors.py:851
6093.2.1 by Jonathan Riddell
add .pot file to archive
5731
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5732
msgstr ""
5733
7185.1.1 by Jelmer Vernooij
Update pot file.
5734
#: breezy/errors.py:862
6093.2.1 by Jonathan Riddell
add .pot file to archive
5735
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5736
msgstr ""
5737
7185.1.1 by Jelmer Vernooij
Update pot file.
5738
#: breezy/errors.py:873
6093.2.1 by Jonathan Riddell
add .pot file to archive
5739
msgid ""
5740
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5741
"%(holder)r, wanted to break %(target)r"
5742
msgstr ""
5743
7185.1.1 by Jelmer Vernooij
Update pot file.
5744
#: breezy/errors.py:885
6093.2.1 by Jonathan Riddell
add .pot file to archive
5745
msgid ""
5746
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5747
"Use 'brz break-lock' to clear it"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5748
msgstr ""
5749
7185.1.1 by Jelmer Vernooij
Update pot file.
5750
#: breezy/errors.py:898
6093.2.1 by Jonathan Riddell
add .pot file to archive
5751
msgid "Lock not held: %(lock)s"
5752
msgstr ""
5753
7185.1.1 by Jelmer Vernooij
Update pot file.
5754
#: breezy/errors.py:927
6093.2.1 by Jonathan Riddell
add .pot file to archive
5755
msgid "Upgrade URL cannot work with readonly URLs."
5756
msgstr ""
5757
7185.1.1 by Jelmer Vernooij
Update pot file.
5758
#: breezy/errors.py:932
6093.2.1 by Jonathan Riddell
add .pot file to archive
5759
msgid "The branch format %(format)s is already at the most recent format."
5760
msgstr ""
5761
7185.1.1 by Jelmer Vernooij
Update pot file.
5762
#: breezy/errors.py:950
6093.2.1 by Jonathan Riddell
add .pot file to archive
5763
msgid "Option --change does not accept revision ranges"
5764
msgstr ""
5765
7185.1.1 by Jelmer Vernooij
Update pot file.
5766
#: breezy/errors.py:955
6093.2.1 by Jonathan Riddell
add .pot file to archive
5767
msgid "No namespace registered for string: %(spec)r"
5768
msgstr ""
5769
7185.1.1 by Jelmer Vernooij
Update pot file.
5770
#: breezy/errors.py:974
6093.2.1 by Jonathan Riddell
add .pot file to archive
5771
msgid ""
5772
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5773
"%(extra)s"
5774
msgstr ""
5775
7185.1.1 by Jelmer Vernooij
Update pot file.
5776
#: breezy/errors.py:988
6093.2.1 by Jonathan Riddell
add .pot file to archive
5777
msgid ""
5778
"Operation denied because it would change the main history, which is not "
5779
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5780
msgstr ""
5781
7185.1.1 by Jelmer Vernooij
Update pot file.
5782
#: breezy/errors.py:999
6093.2.1 by Jonathan Riddell
add .pot file to archive
5783
msgid ""
5784
"These branches have diverged. Use the missing command to see how.\n"
5785
"Use the merge command to reconcile them."
5786
msgstr ""
5787
7185.1.1 by Jelmer Vernooij
Update pot file.
5788
#: breezy/errors.py:1019
6093.2.1 by Jonathan Riddell
add .pot file to archive
5789
msgid ""
5790
"Branches have no common ancestor, and no merge base revision was specified."
5791
msgstr ""
5792
7185.1.1 by Jelmer Vernooij
Update pot file.
5793
#: breezy/errors.py:1025
6093.2.1 by Jonathan Riddell
add .pot file to archive
5794
msgid ""
5795
"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
5796
msgstr ""
5797
7185.1.1 by Jelmer Vernooij
Update pot file.
5798
#: breezy/errors.py:1031
6093.2.1 by Jonathan Riddell
add .pot file to archive
5799
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5800
msgstr ""
5801
7185.1.1 by Jelmer Vernooij
Update pot file.
5802
#: breezy/errors.py:1040
6093.2.1 by Jonathan Riddell
add .pot file to archive
5803
msgid ""
5804
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5805
msgstr ""
5806
7185.1.1 by Jelmer Vernooij
Update pot file.
5807
#: breezy/errors.py:1049
6093.2.1 by Jonathan Riddell
add .pot file to archive
5808
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5809
msgstr ""
5810
7185.1.1 by Jelmer Vernooij
Update pot file.
5811
#: breezy/errors.py:1058
6093.2.1 by Jonathan Riddell
add .pot file to archive
5812
msgid "Branch %(branch)s has no commits."
5813
msgstr ""
5814
7185.1.1 by Jelmer Vernooij
Update pot file.
5815
#: breezy/errors.py:1075
6093.2.1 by Jonathan Riddell
add .pot file to archive
5816
msgid ""
5817
"Bound branch %(branch)s is out of date with master branch %(master)s."
5818
"%(extra_help)s"
5819
msgstr ""
5820
7185.1.1 by Jelmer Vernooij
Update pot file.
5821
#: breezy/errors.py:1087
6093.2.1 by Jonathan Riddell
add .pot file to archive
5822
msgid ""
5823
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5824
"bound to %(remote)s."
5825
msgstr ""
5826
7185.1.1 by Jelmer Vernooij
Update pot file.
5827
#: breezy/errors.py:1099
6093.2.1 by Jonathan Riddell
add .pot file to archive
5828
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5829
msgstr ""
5830
7185.1.1 by Jelmer Vernooij
Update pot file.
5831
#: breezy/errors.py:1108
6093.2.1 by Jonathan Riddell
add .pot file to archive
5832
msgid ""
5833
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5834
"%(error)s"
5835
msgstr ""
5836
7185.1.1 by Jelmer Vernooij
Update pot file.
5837
#: breezy/errors.py:1120
6093.2.1 by Jonathan Riddell
add .pot file to archive
5838
msgid "Versioned file error"
5839
msgstr ""
5840
7185.1.1 by Jelmer Vernooij
Update pot file.
5841
#: breezy/errors.py:1125
6093.2.1 by Jonathan Riddell
add .pot file to archive
5842
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5843
msgstr ""
5844
7185.1.1 by Jelmer Vernooij
Update pot file.
5845
#: breezy/errors.py:1135
6093.2.1 by Jonathan Riddell
add .pot file to archive
5846
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5847
msgstr ""
5848
7185.1.1 by Jelmer Vernooij
Update pot file.
5849
#: breezy/errors.py:1145
6093.2.1 by Jonathan Riddell
add .pot file to archive
5850
msgid "Text did not match its checksum: %(msg)s"
5851
msgstr ""
5852
7185.1.1 by Jelmer Vernooij
Update pot file.
5853
#: breezy/errors.py:1197
6093.2.1 by Jonathan Riddell
add .pot file to archive
5854
msgid "Export format %(format)r not supported"
5855
msgstr ""
5856
7185.1.1 by Jelmer Vernooij
Update pot file.
5857
#: breezy/errors.py:1206
6093.2.1 by Jonathan Riddell
add .pot file to archive
5858
msgid "Transport error: %(msg)s %(orig_error)s"
5859
msgstr ""
5860
7185.1.1 by Jelmer Vernooij
Update pot file.
5861
#: breezy/errors.py:1232
6093.2.1 by Jonathan Riddell
add .pot file to archive
5862
msgid "Generic bzr smart protocol error: %(details)s"
5863
msgstr ""
5864
7185.1.1 by Jelmer Vernooij
Update pot file.
5865
#: breezy/errors.py:1240
6093.2.1 by Jonathan Riddell
add .pot file to archive
5866
msgid "Received bad protocol version marker: %(marker)r"
5867
msgstr ""
5868
7185.1.1 by Jelmer Vernooij
Update pot file.
5869
#: breezy/errors.py:1272
6093.2.1 by Jonathan Riddell
add .pot file to archive
5870
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5871
msgstr ""
5872
7185.1.1 by Jelmer Vernooij
Update pot file.
5873
#: breezy/errors.py:1277
6093.2.1 by Jonathan Riddell
add .pot file to archive
5874
msgid "Connection error: %(msg)s %(orig_error)s"
5875
msgstr ""
5876
7185.1.1 by Jelmer Vernooij
Update pot file.
5877
#: breezy/errors.py:1282
6093.2.1 by Jonathan Riddell
add .pot file to archive
5878
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5879
msgstr ""
5880
7185.1.1 by Jelmer Vernooij
Update pot file.
5881
#: breezy/errors.py:1303
6093.2.1 by Jonathan Riddell
add .pot file to archive
5882
msgid "Connection closed: %(msg)s %(orig_error)s"
5883
msgstr ""
5884
7185.1.1 by Jelmer Vernooij
Update pot file.
5885
#: breezy/errors.py:1308
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5886
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5887
msgstr ""
5888
7185.1.1 by Jelmer Vernooij
Update pot file.
5889
#: breezy/errors.py:1313
6093.2.1 by Jonathan Riddell
add .pot file to archive
5890
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5891
msgstr ""
5892
7185.1.1 by Jelmer Vernooij
Update pot file.
5893
#: breezy/errors.py:1323
6093.2.1 by Jonathan Riddell
add .pot file to archive
5894
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5895
msgstr ""
5896
7185.1.1 by Jelmer Vernooij
Update pot file.
5897
#: breezy/errors.py:1338
6093.2.1 by Jonathan Riddell
add .pot file to archive
5898
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5899
msgstr ""
5900
7185.1.1 by Jelmer Vernooij
Update pot file.
5901
#: breezy/errors.py:1352
6093.2.1 by Jonathan Riddell
add .pot file to archive
5902
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5903
msgstr ""
5904
7185.1.1 by Jelmer Vernooij
Update pot file.
5905
#: breezy/errors.py:1360
6093.2.1 by Jonathan Riddell
add .pot file to archive
5906
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5907
msgstr ""
5908
7185.1.1 by Jelmer Vernooij
Update pot file.
5909
#: breezy/errors.py:1369
6093.2.1 by Jonathan Riddell
add .pot file to archive
5910
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5911
msgstr ""
5912
7185.1.1 by Jelmer Vernooij
Update pot file.
5913
#: breezy/errors.py:1383
6093.2.1 by Jonathan Riddell
add .pot file to archive
5914
msgid "Too many redirections"
5915
msgstr ""
5916
7185.1.1 by Jelmer Vernooij
Update pot file.
5917
#: breezy/errors.py:1388
6093.2.1 by Jonathan Riddell
add .pot file to archive
5918
msgid "Working tree has conflicts."
5919
msgstr ""
5920
7185.1.1 by Jelmer Vernooij
Update pot file.
5921
#: breezy/errors.py:1393
6093.2.1 by Jonathan Riddell
add .pot file to archive
5922
msgid "Unable to import library \"%(library)s\": %(error)s"
5923
msgstr ""
5924
7185.1.1 by Jelmer Vernooij
Update pot file.
5925
#: breezy/errors.py:1401
6093.2.1 by Jonathan Riddell
add .pot file to archive
5926
msgid ""
5927
"The working tree for %(basedir)s has changed since the last commit, but "
5928
"weave merge requires that it be unchanged"
5929
msgstr ""
5930
7185.1.1 by Jelmer Vernooij
Update pot file.
5931
#: breezy/errors.py:1411
6093.2.1 by Jonathan Riddell
add .pot file to archive
5932
msgid "Cycle in graph %(graph)r"
5933
msgstr ""
5934
7185.1.1 by Jelmer Vernooij
Update pot file.
5935
#: breezy/errors.py:1439
6093.2.1 by Jonathan Riddell
add .pot file to archive
5936
msgid "File %(filename)s is not conflicted."
5937
msgstr ""
5938
7185.1.1 by Jelmer Vernooij
Update pot file.
5939
#: breezy/errors.py:1461
6093.2.1 by Jonathan Riddell
add .pot file to archive
5940
msgid "No bundle was found in \"%(filename)s\"."
5941
msgstr ""
5942
7185.1.1 by Jelmer Vernooij
Update pot file.
5943
#: breezy/errors.py:1470
6093.2.1 by Jonathan Riddell
add .pot file to archive
5944
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5945
msgstr ""
5946
7185.1.1 by Jelmer Vernooij
Update pot file.
5947
#: breezy/errors.py:1480
6093.2.1 by Jonathan Riddell
add .pot file to archive
5948
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5949
msgstr ""
5950
7185.1.1 by Jelmer Vernooij
Update pot file.
5951
#: breezy/errors.py:1493
6093.2.1 by Jonathan Riddell
add .pot file to archive
5952
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5953
msgstr ""
5954
7185.1.1 by Jelmer Vernooij
Update pot file.
5955
#: breezy/errors.py:1503
6093.2.1 by Jonathan Riddell
add .pot file to archive
5956
msgid "Key %(key)s is already present in map"
5957
msgstr ""
5958
7185.1.1 by Jelmer Vernooij
Update pot file.
5959
#: breezy/errors.py:1508
6093.2.1 by Jonathan Riddell
add .pot file to archive
5960
msgid "The prefix %(prefix)s is in the help search path twice."
5961
msgstr ""
5962
7185.1.1 by Jelmer Vernooij
Update pot file.
5963
#: breezy/errors.py:1518
6093.2.1 by Jonathan Riddell
add .pot file to archive
5964
msgid ""
5965
"No final name for trans_id %(trans_id)r\n"
5966
"file-id: %(file_id)r\n"
5967
"root trans-id: %(root_trans_id)r\n"
5968
msgstr ""
5969
7185.1.1 by Jelmer Vernooij
Update pot file.
5970
#: breezy/errors.py:1550
6093.2.1 by Jonathan Riddell
add .pot file to archive
5971
msgid "Attempt to reuse a transform that has already been applied."
5972
msgstr ""
5973
7185.1.1 by Jelmer Vernooij
Update pot file.
5974
#: breezy/errors.py:1555
6093.2.1 by Jonathan Riddell
add .pot file to archive
5975
msgid "Moving the root directory is not supported at this time"
5976
msgstr ""
5977
7185.1.1 by Jelmer Vernooij
Update pot file.
5978
#: breezy/errors.py:1560
6093.2.1 by Jonathan Riddell
add .pot file to archive
5979
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5980
msgstr ""
5981
7185.1.1 by Jelmer Vernooij
Update pot file.
5982
#: breezy/errors.py:1571
6093.2.1 by Jonathan Riddell
add .pot file to archive
5983
msgid ""
5984
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5985
msgstr ""
5986
7185.1.1 by Jelmer Vernooij
Update pot file.
5987
#: breezy/errors.py:1607
6093.2.1 by Jonathan Riddell
add .pot file to archive
5988
msgid ""
5989
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5990
msgstr ""
5991
7185.1.1 by Jelmer Vernooij
Update pot file.
5992
#: breezy/errors.py:1637
6093.2.1 by Jonathan Riddell
add .pot file to archive
5993
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5994
msgstr ""
5995
7185.1.1 by Jelmer Vernooij
Update pot file.
5996
#: breezy/errors.py:1645
6093.2.1 by Jonathan Riddell
add .pot file to archive
5997
msgid "Nothing to merge."
5998
msgstr ""
5999
7185.1.1 by Jelmer Vernooij
Update pot file.
6000
#: breezy/errors.py:1650
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6001
msgid "Format %(format)s cannot be initialised by this version of brz."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6002
msgstr ""
6003
7185.1.1 by Jelmer Vernooij
Update pot file.
6004
#: breezy/errors.py:1659
6093.2.1 by Jonathan Riddell
add .pot file to archive
6005
msgid ""
6006
"Cannot convert from format %(from_format)s to format %(format)s.    "
6007
"%(problem)s"
6008
msgstr ""
6009
7185.1.1 by Jelmer Vernooij
Update pot file.
6010
#: breezy/errors.py:1671
6093.2.1 by Jonathan Riddell
add .pot file to archive
6011
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6012
msgstr ""
6013
7185.1.1 by Jelmer Vernooij
Update pot file.
6014
#: breezy/errors.py:1679
6093.2.1 by Jonathan Riddell
add .pot file to archive
6015
msgid "%(exe_name)s could not be found on this machine"
6016
msgstr ""
6017
7185.1.1 by Jelmer Vernooij
Update pot file.
6018
#: breezy/errors.py:1687
6093.2.1 by Jonathan Riddell
add .pot file to archive
6019
msgid "Diff is not installed on this machine: %(msg)s"
6020
msgstr ""
6021
7185.1.1 by Jelmer Vernooij
Update pot file.
6022
#: breezy/errors.py:1695
6093.2.1 by Jonathan Riddell
add .pot file to archive
6023
msgid "Diff3 is not installed on this machine."
6024
msgstr ""
6025
7185.1.1 by Jelmer Vernooij
Update pot file.
6026
#: breezy/errors.py:1701
6093.2.1 by Jonathan Riddell
add .pot file to archive
6027
msgid "The content being inserted is already present."
6028
msgstr ""
6029
7185.1.1 by Jelmer Vernooij
Update pot file.
6030
#: breezy/errors.py:1706
6093.2.1 by Jonathan Riddell
add .pot file to archive
6031
msgid ""
6032
"This tree contains left-over files from a failed operation.\n"
6033
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
6034
"to\n"
6035
"    keep, and delete it when you are done."
6036
msgstr ""
6037
7185.1.1 by Jelmer Vernooij
Update pot file.
6038
#: breezy/errors.py:1717
6093.2.1 by Jonathan Riddell
add .pot file to archive
6039
msgid ""
6040
"This tree contains left-over files from a failed operation.\n"
6041
"    Please examine %(pending_deletion)s to see if it contains any files you\n"
6042
"    wish to keep, and delete it when you are done."
6043
msgstr ""
6044
7185.1.1 by Jelmer Vernooij
Update pot file.
6045
#: breezy/errors.py:1727
6093.2.1 by Jonathan Riddell
add .pot file to archive
6046
msgid ""
6047
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6048
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
6049
"to\n"
6050
"    keep, and delete it when you are done."
6051
msgstr ""
6052
7185.1.1 by Jelmer Vernooij
Update pot file.
6053
#: breezy/errors.py:1738
6093.2.1 by Jonathan Riddell
add .pot file to archive
6054
msgid ""
6055
"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
6056
"examine %(pending_deletion)s to see if it contains any files you wish to "
6057
"keep, and delete it when you are done."
6058
msgstr ""
6059
7185.1.1 by Jelmer Vernooij
Update pot file.
6060
#: breezy/errors.py:1748
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6061
msgid "Working tree is out of date, please run 'brz update'.%(more)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6062
msgstr ""
6063
7185.1.1 by Jelmer Vernooij
Update pot file.
6064
#: breezy/errors.py:1762
6093.2.1 by Jonathan Riddell
add .pot file to archive
6065
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6066
msgstr ""
6067
7185.1.1 by Jelmer Vernooij
Update pot file.
6068
#: breezy/errors.py:1775
6093.2.1 by Jonathan Riddell
add .pot file to archive
6069
msgid "Error in merge modified format"
6070
msgstr ""
6071
7185.1.1 by Jelmer Vernooij
Update pot file.
6072
#: breezy/errors.py:1780
6093.2.1 by Jonathan Riddell
add .pot file to archive
6073
msgid "Format error in conflict listings"
6074
msgstr ""
6075
7185.1.1 by Jelmer Vernooij
Update pot file.
6076
#: breezy/errors.py:1784
6093.2.1 by Jonathan Riddell
add .pot file to archive
6077
msgid ""
6078
"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.
6079
"Please run brz reconcile on this repository."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6080
msgstr ""
6081
7185.1.1 by Jelmer Vernooij
Update pot file.
6082
#: breezy/errors.py:1795
6093.2.1 by Jonathan Riddell
add .pot file to archive
6083
msgid ""
6084
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6085
"reason: %(reason)s"
6086
msgstr ""
6087
7185.1.1 by Jelmer Vernooij
Update pot file.
6088
#: breezy/errors.py:1808
6093.2.1 by Jonathan Riddell
add .pot file to archive
6089
msgid ""
6090
"An inconsistent delta was supplied: %(delta)r\n"
6091
"reason: %(reason)s"
6092
msgstr ""
6093
7185.1.1 by Jelmer Vernooij
Update pot file.
6094
#: breezy/errors.py:1820
6093.2.1 by Jonathan Riddell
add .pot file to archive
6095
msgid "To use this feature you must upgrade your branch at %(path)s."
6096
msgstr ""
6097
7185.1.1 by Jelmer Vernooij
Update pot file.
6098
#: breezy/errors.py:1829
6093.2.1 by Jonathan Riddell
add .pot file to archive
6099
msgid "To use this feature you must upgrade your repository at %(path)s."
6100
msgstr ""
6101
7185.1.1 by Jelmer Vernooij
Update pot file.
6102
#: breezy/errors.py:1834
6093.2.1 by Jonathan Riddell
add .pot file to archive
6103
msgid ""
6104
"To use this feature you must upgrade your branch at %(path)s to a format "
6105
"which supports rich roots."
6106
msgstr ""
6107
7185.1.1 by Jelmer Vernooij
Update pot file.
6108
#: breezy/errors.py:1840
6093.2.1 by Jonathan Riddell
add .pot file to archive
6109
msgid "Cannot perform local-only commits on unbound branches."
6110
msgstr ""
6111
7185.1.1 by Jelmer Vernooij
Update pot file.
6112
#: breezy/errors.py:1845
6093.2.1 by Jonathan Riddell
add .pot file to archive
6113
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6114
msgstr ""
6115
7185.1.1 by Jelmer Vernooij
Update pot file.
6116
#: breezy/errors.py:1870
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
6117
msgid "Ghost tags not supported by format %(format)r."
6118
msgstr ""
6119
7185.1.1 by Jelmer Vernooij
Update pot file.
6120
#: breezy/errors.py:1878
6093.2.1 by Jonathan Riddell
add .pot file to archive
6121
msgid "File is binary but should be text."
6122
msgstr ""
6123
7185.1.1 by Jelmer Vernooij
Update pot file.
6124
#: breezy/errors.py:1883
6093.2.1 by Jonathan Riddell
add .pot file to archive
6125
msgid "The path %(path)s is not permitted on this platform"
6126
msgstr ""
6127
7185.1.1 by Jelmer Vernooij
Update pot file.
6128
#: breezy/errors.py:1892
6093.2.1 by Jonathan Riddell
add .pot file to archive
6129
msgid ""
6130
"Testament did not match expected value.\n"
6131
"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6132
"       {%(measured)s}"
6133
msgstr ""
6134
7185.1.1 by Jelmer Vernooij
Update pot file.
6135
#: breezy/errors.py:1904
6093.2.1 by Jonathan Riddell
add .pot file to archive
6136
msgid "Not a bzr revision-bundle: %(text)r"
6137
msgstr ""
6138
7185.1.1 by Jelmer Vernooij
Update pot file.
6139
#: breezy/errors.py:1913
6093.2.1 by Jonathan Riddell
add .pot file to archive
6140
msgid "Bad bzr revision-bundle: %(text)r"
6141
msgstr ""
6142
7185.1.1 by Jelmer Vernooij
Update pot file.
6143
#: breezy/errors.py:1922
6093.2.1 by Jonathan Riddell
add .pot file to archive
6144
msgid "Malformed bzr revision-bundle header: %(text)r"
6145
msgstr ""
6146
7185.1.1 by Jelmer Vernooij
Update pot file.
6147
#: breezy/errors.py:1927
6093.2.1 by Jonathan Riddell
add .pot file to archive
6148
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6149
msgstr ""
6150
7185.1.1 by Jelmer Vernooij
Update pot file.
6151
#: breezy/errors.py:1932
6093.2.1 by Jonathan Riddell
add .pot file to archive
6152
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6153
msgstr ""
6154
7185.1.1 by Jelmer Vernooij
Update pot file.
6155
#: breezy/errors.py:1937
6093.2.1 by Jonathan Riddell
add .pot file to archive
6156
msgid "End of line marker was not \\n in bzr revision-bundle"
6157
msgstr ""
6158
7185.1.1 by Jelmer Vernooij
Update pot file.
6159
#: breezy/errors.py:1947
6093.2.1 by Jonathan Riddell
add .pot file to archive
6160
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6161
msgstr ""
6162
7185.1.1 by Jelmer Vernooij
Update pot file.
6163
#: breezy/errors.py:1957
6093.2.1 by Jonathan Riddell
add .pot file to archive
6164
msgid "Root class for inventory serialization errors"
6165
msgstr ""
6166
7185.1.1 by Jelmer Vernooij
Update pot file.
6167
#: breezy/errors.py:1961
6093.2.1 by Jonathan Riddell
add .pot file to archive
6168
msgid ""
6169
"The inventory was not in the expected format:\n"
6170
" %(msg)s"
6171
msgstr ""
6172
7185.1.1 by Jelmer Vernooij
Update pot file.
6173
#: breezy/errors.py:1970
6093.2.1 by Jonathan Riddell
add .pot file to archive
6174
msgid "This operation requires rich root data storage"
6175
msgstr ""
6176
7185.1.1 by Jelmer Vernooij
Update pot file.
6177
#: breezy/errors.py:1983
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6178
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6179
msgstr ""
6180
7185.1.1 by Jelmer Vernooij
Update pot file.
6181
#: breezy/errors.py:1992
6093.2.1 by Jonathan Riddell
add .pot file to archive
6182
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6183
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6184
"variable."
6185
msgstr ""
6186
7185.1.1 by Jelmer Vernooij
Update pot file.
6187
#: breezy/errors.py:1999
6093.2.1 by Jonathan Riddell
add .pot file to archive
6188
msgid ""
6189
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6190
"ghost at {%(ghost_revision_id)s}"
6191
msgstr ""
6192
7185.1.1 by Jelmer Vernooij
Update pot file.
6193
#: breezy/errors.py:2009
6093.2.1 by Jonathan Riddell
add .pot file to archive
6194
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6195
msgstr ""
6196
7185.1.1 by Jelmer Vernooij
Update pot file.
6197
#: breezy/errors.py:2061
6093.2.1 by Jonathan Riddell
add .pot file to archive
6198
msgid ""
6199
"A merge directive must provide either a bundle or a public branch location."
6200
msgstr ""
6201
7185.1.1 by Jelmer Vernooij
Update pot file.
6202
#: breezy/errors.py:2068
6093.2.1 by Jonathan Riddell
add .pot file to archive
6203
msgid "Bad merge directive payload %(start)r"
6204
msgstr ""
6205
7185.1.1 by Jelmer Vernooij
Update pot file.
6206
#: breezy/errors.py:2078
6093.2.1 by Jonathan Riddell
add .pot file to archive
6207
msgid "Preview patch does not match requested changes."
6208
msgstr ""
6209
7185.1.1 by Jelmer Vernooij
Update pot file.
6210
#: breezy/errors.py:2084
6093.2.1 by Jonathan Riddell
add .pot file to archive
6211
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6212
msgstr ""
6213
7185.1.1 by Jelmer Vernooij
Update pot file.
6214
#: breezy/errors.py:2094
6093.2.1 by Jonathan Riddell
add .pot file to archive
6215
msgid ""
6216
"Your branch does not have all of the revisions required in order to merge "
6217
"this merge directive and the target location specified in the merge "
6218
"directive is not a branch: %(location)s."
6219
msgstr ""
6220
7185.1.1 by Jelmer Vernooij
Update pot file.
6221
#: breezy/errors.py:2106
6093.2.1 by Jonathan Riddell
add .pot file to archive
6222
msgid "Unsupported entry kind %(kind)s"
6223
msgstr ""
6224
7185.1.1 by Jelmer Vernooij
Update pot file.
6225
#: breezy/errors.py:2114
6093.2.1 by Jonathan Riddell
add .pot file to archive
6226
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6227
msgstr ""
6228
7185.1.1 by Jelmer Vernooij
Update pot file.
6229
#: breezy/errors.py:2124
6093.2.1 by Jonathan Riddell
add .pot file to archive
6230
msgid "Subsume target %(other_tree)s needs to be upgraded."
6231
msgstr ""
6232
7185.1.1 by Jelmer Vernooij
Update pot file.
6233
#: breezy/errors.py:2132
6093.2.1 by Jonathan Riddell
add .pot file to archive
6234
msgid "No such tag: %(tag_name)s"
6235
msgstr ""
6236
7185.1.1 by Jelmer Vernooij
Update pot file.
6237
#: breezy/errors.py:2140
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6238
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
6239
msgstr ""
6240
7185.1.1 by Jelmer Vernooij
Update pot file.
6241
#: breezy/errors.py:2149
6093.2.1 by Jonathan Riddell
add .pot file to archive
6242
msgid "Tag %(tag_name)s already exists."
6243
msgstr ""
6244
7185.1.1 by Jelmer Vernooij
Update pot file.
6245
#: breezy/errors.py:2157
6093.2.1 by Jonathan Riddell
add .pot file to archive
6246
msgid "Could not understand response from smart server: %(response_tuple)r"
6247
msgstr ""
6248
7185.1.1 by Jelmer Vernooij
Update pot file.
6249
#: breezy/errors.py:2196
6093.2.1 by Jonathan Riddell
add .pot file to archive
6250
msgid "Server sent an unexpected error: %(error_tuple)r"
6251
msgstr ""
6252
7185.1.1 by Jelmer Vernooij
Update pot file.
6253
#: breezy/errors.py:2215
6093.2.1 by Jonathan Riddell
add .pot file to archive
6254
msgid "Unrecognised container format: %(container_format)r"
6255
msgstr ""
6256
7185.1.1 by Jelmer Vernooij
Update pot file.
6257
#: breezy/errors.py:2223
6093.2.1 by Jonathan Riddell
add .pot file to archive
6258
msgid "Unexpected end of container stream"
6259
msgstr ""
6260
7185.1.1 by Jelmer Vernooij
Update pot file.
6261
#: breezy/errors.py:2228
6093.2.1 by Jonathan Riddell
add .pot file to archive
6262
msgid "Unknown record type: %(record_type)r"
6263
msgstr ""
6264
7185.1.1 by Jelmer Vernooij
Update pot file.
6265
#: breezy/errors.py:2236
6093.2.1 by Jonathan Riddell
add .pot file to archive
6266
msgid "Invalid record: %(reason)s"
6267
msgstr ""
6268
7185.1.1 by Jelmer Vernooij
Update pot file.
6269
#: breezy/errors.py:2244
6093.2.1 by Jonathan Riddell
add .pot file to archive
6270
msgid "Container has data after end marker: %(excess)r"
6271
msgstr ""
6272
7185.1.1 by Jelmer Vernooij
Update pot file.
6273
#: breezy/errors.py:2252
6093.2.1 by Jonathan Riddell
add .pot file to archive
6274
msgid "Container has multiple records with the same name: %(name)s"
6275
msgstr ""
6276
7185.1.1 by Jelmer Vernooij
Update pot file.
6277
#: breezy/errors.py:2260
6093.2.1 by Jonathan Riddell
add .pot file to archive
6278
msgid "Corrupt or incompatible data stream: %(reason)s"
6279
msgstr ""
6280
7185.1.1 by Jelmer Vernooij
Update pot file.
6281
#: breezy/errors.py:2268
6093.2.1 by Jonathan Riddell
add .pot file to archive
6282
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6283
"Working tree \"%(display_url)s\" has uncommitted changes (See brz status)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6284
"%(more)s"
6285
msgstr ""
6286
7185.1.1 by Jelmer Vernooij
Update pot file.
6287
#: breezy/errors.py:2287
6093.2.1 by Jonathan Riddell
add .pot file to archive
6288
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
6289
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6290
msgstr ""
6291
7185.1.1 by Jelmer Vernooij
Update pot file.
6292
#: breezy/errors.py:2302
6581.1.2 by Vincent Ladeuil
Update translation template.
6293
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6294
"Working tree \"%(display_url)s\" has shelved changes (See brz shelve --list)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6295
"%(more)s"
6296
msgstr ""
6297
7185.1.1 by Jelmer Vernooij
Update pot file.
6298
#: breezy/errors.py:2308
6093.2.1 by Jonathan Riddell
add .pot file to archive
6299
msgid "Unable to create symlink %(path_str)son this platform"
6300
msgstr ""
6301
7185.1.1 by Jelmer Vernooij
Update pot file.
6302
#: breezy/errors.py:2323
6093.2.1 by Jonathan Riddell
add .pot file to archive
6303
msgid ""
6304
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6305
msgstr ""
6306
7185.1.1 by Jelmer Vernooij
Update pot file.
6307
#: breezy/errors.py:2335
6093.2.1 by Jonathan Riddell
add .pot file to archive
6308
msgid "The alias \"%(alias_name)s\" does not exist."
6309
msgstr ""
6310
7185.1.1 by Jelmer Vernooij
Update pot file.
6311
#: breezy/errors.py:2343
6093.2.1 by Jonathan Riddell
add .pot file to archive
6312
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6313
msgstr ""
6314
7185.1.1 by Jelmer Vernooij
Update pot file.
6315
#: breezy/errors.py:2356
6093.2.1 by Jonathan Riddell
add .pot file to archive
6316
msgid "Tip change rejected: %(msg)s"
6317
msgstr ""
6318
7185.1.1 by Jelmer Vernooij
Update pot file.
6319
#: breezy/errors.py:2364
6093.2.1 by Jonathan Riddell
add .pot file to archive
6320
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6321
msgstr ""
6322
7185.1.1 by Jelmer Vernooij
Update pot file.
6323
#: breezy/errors.py:2372
6093.2.1 by Jonathan Riddell
add .pot file to archive
6324
msgid "The user aborted the operation."
6325
msgstr ""
6326
7185.1.1 by Jelmer Vernooij
Update pot file.
6327
#: breezy/errors.py:2424
6328
msgid "%(controldir)r does not support co-located branches."
6329
msgstr ""
6330
6331
#: breezy/errors.py:2432
6093.2.1 by Jonathan Riddell
add .pot file to archive
6332
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6333
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `brz "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6334
"unbind` to fix."
6335
msgstr ""
6336
7185.1.1 by Jelmer Vernooij
Update pot file.
6337
#: breezy/errors.py:2441
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6338
msgid ""
6339
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6340
"format %(format)r"
6341
msgstr ""
6342
7185.1.1 by Jelmer Vernooij
Update pot file.
6343
#: breezy/errors.py:2453
6581.1.2 by Vincent Ladeuil
Update translation template.
6344
msgid ""
6345
"Cannot store uncommitted changes because this branch already stores "
6346
"uncommitted changes."
6347
msgstr ""
6348
7185.1.1 by Jelmer Vernooij
Update pot file.
6349
#: breezy/export_pot.py:255
6138.4.4 by Jonathan Riddell
update bzr.pot
6350
#, python-format
6351
msgid "Exporting messages from builtin command: %s"
6352
msgstr ""
6353
7185.1.1 by Jelmer Vernooij
Update pot file.
6354
#: breezy/export_pot.py:260
6355
#, python-format
6356
msgid "Plugin %s is not loaded"
6357
msgstr ""
6358
6359
#: breezy/export_pot.py:277
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6360
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
6361
msgid "Exporting messages from plugin command: {0} in {1}"
6362
msgstr ""
6363
7185.1.1 by Jelmer Vernooij
Update pot file.
6364
#: breezy/export_pot.py:298
6138.4.4 by Jonathan Riddell
update bzr.pot
6365
#, python-format
6366
msgid "Exporting message from error: %s"
6367
msgstr ""
6368
7185.1.1 by Jelmer Vernooij
Update pot file.
6369
#: breezy/git/commands.py:115
6370
#, python-format
6371
msgid "%r is not a git repository"
6372
msgstr ""
6373
6374
#: breezy/git/commands.py:128
6375
msgid "Target repository doesn't support rich roots"
6376
msgstr ""
6377
6378
#: breezy/git/commands.py:141
6379
msgid "creating branches"
6380
msgstr ""
6381
6382
#: breezy/git/commands.py:165
6383
msgid ""
6384
"Use 'bzr checkout' to create a working tree in the newly created branches."
6385
msgstr ""
6386
6387
#: breezy/git/commands.py:207
6388
#, python-format
6389
msgid "Object not found: %s"
6390
msgstr ""
6391
6392
#: breezy/git/commands.py:280
6393
msgid "error running patch"
6138.4.4 by Jonathan Riddell
update bzr.pot
6394
msgstr ""
6395
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6396
#: breezy/gpg.py:358
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6397
#, python-brace-format
6504.1.1 by Vincent Ladeuil
Update translation template
6398
msgid "No GnuPG key results for pattern: {0}"
6399
msgstr ""
6400
7185.1.1 by Jelmer Vernooij
Update pot file.
6401
#: breezy/gpg.py:364
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6402
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6403
msgid "{0} commits with valid signatures"
6404
msgstr ""
6405
7185.1.1 by Jelmer Vernooij
Update pot file.
6406
#: breezy/gpg.py:370
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6407
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6408
msgid "{0} commit with unknown key"
6409
msgid_plural "{0} commits with unknown keys"
6410
msgstr[0] ""
6411
msgstr[1] ""
6412
7185.1.1 by Jelmer Vernooij
Update pot file.
6413
#: breezy/gpg.py:378
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6414
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6415
msgid "{0} commit not valid"
6416
msgid_plural "{0} commits not valid"
6417
msgstr[0] ""
6418
msgstr[1] ""
6419
7185.1.1 by Jelmer Vernooij
Update pot file.
6420
#: breezy/gpg.py:386
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6421
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6422
msgid "{0} commit not signed"
6423
msgid_plural "{0} commits not signed"
6424
msgstr[0] ""
6425
msgstr[1] ""
6426
7185.1.1 by Jelmer Vernooij
Update pot file.
6427
#: breezy/gpg.py:394
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6428
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6429
msgid "{0} commit with key now expired"
6430
msgid_plural "{0} commits with key now expired"
6431
msgstr[0] ""
6432
msgstr[1] ""
6433
7185.1.1 by Jelmer Vernooij
Update pot file.
6434
#: breezy/gpg.py:414
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6435
#, python-brace-format
6504.1.1 by Vincent Ladeuil
Update translation template
6436
msgid "{0} commit by author {1} with key {2} now expired"
6437
msgid_plural "{0} commits by author {1} with key {2} now expired"
6438
msgstr[0] ""
6439
msgstr[1] ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
6440
7185.1.1 by Jelmer Vernooij
Update pot file.
6441
#: breezy/gpg.py:430
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6442
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6443
msgid "{0} signed {1} commit"
6444
msgid_plural "{0} signed {1} commits"
6445
msgstr[0] ""
6446
msgstr[1] ""
6447
7185.1.1 by Jelmer Vernooij
Update pot file.
6448
#: breezy/gpg.py:447 breezy/gpg.py:464
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6449
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6450
msgid "{0} commit by author {1}"
6451
msgid_plural "{0} commits by author {1}"
6452
msgstr[0] ""
6453
msgstr[1] ""
6454
7185.1.1 by Jelmer Vernooij
Update pot file.
6455
#: breezy/gpg.py:479
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6456
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6457
msgid "Unknown key {0} signed {1} commit"
6458
msgid_plural "Unknown key {0} signed {1} commits"
6459
msgstr[0] ""
6460
msgstr[1] ""
6461
7185.1.1 by Jelmer Vernooij
Update pot file.
6462
#: breezy/hooks.py:320
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6463
#, python-format
6464
msgid "Introduced in: %s"
6465
msgstr ""
6466
7185.1.1 by Jelmer Vernooij
Update pot file.
6467
#: breezy/hooks.py:323
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6468
#, python-format
6469
msgid "Deprecated in: %s"
6470
msgstr ""
6471
7185.1.1 by Jelmer Vernooij
Update pot file.
6472
#: breezy/lock.py:546
6150.1.1 by Jonathan Riddell
update bzr.pot
6473
msgid "{0!r} was {1} locked again"
6138.4.4 by Jonathan Riddell
update bzr.pot
6474
msgstr ""
6475
7185.1.1 by Jelmer Vernooij
Update pot file.
6476
#: breezy/lockdir.py:322
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6477
#, python-format
6478
msgid "error removing pending lock: %s"
6479
msgstr ""
6480
7185.1.1 by Jelmer Vernooij
Update pot file.
6481
#: breezy/lockdir.py:614
6482
msgid "Unable to obtain"
6483
msgstr ""
6484
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6485
#: breezy/lockdir.py:616
7185.1.1 by Jelmer Vernooij
Update pot file.
6486
msgid "Lock owner changed for"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6487
msgstr ""
6488
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6489
#: breezy/lockdir.py:618
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6490
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6491
msgid "{0} lock {1} {2}."
6492
msgstr ""
6493
7185.1.1 by Jelmer Vernooij
Update pot file.
6494
#: breezy/lockdir.py:625
6495
#, python-format
6496
msgid "Will continue to try until %s, unless you press Ctrl-C."
6497
msgstr ""
6498
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6499
#: breezy/lockdir.py:627
7185.1.1 by Jelmer Vernooij
Update pot file.
6500
msgid "See \"brz help break-lock\" for more."
6501
msgstr ""
6502
6503
#: breezy/lockdir.py:737
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6504
#, python-format
6505
msgid ""
6506
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6507
msgstr ""
6508
7185.1.1 by Jelmer Vernooij
Update pot file.
6509
#: breezy/log.py:423
6510
msgid "Further revision history missing."
6511
msgstr ""
6512
6513
#: breezy/log.py:579
6138.4.4 by Jonathan Riddell
update bzr.pot
6514
msgid "--exclude-common-ancestry requires two different revisions"
6515
msgstr ""
6516
7185.1.1 by Jelmer Vernooij
Update pot file.
6517
#: breezy/log.py:581
6138.4.4 by Jonathan Riddell
update bzr.pot
6518
#, python-format
6519
msgid "invalid direction %r"
6520
msgstr ""
6521
7185.1.1 by Jelmer Vernooij
Update pot file.
6522
#: breezy/log.py:669
6138.4.4 by Jonathan Riddell
update bzr.pot
6523
msgid "Start revision not found in history of end revision."
6524
msgstr ""
6525
7185.1.1 by Jelmer Vernooij
Update pot file.
6526
#: breezy/log.py:1117 breezy/log.py:1175
6138.4.4 by Jonathan Riddell
update bzr.pot
6527
msgid "Logging revision 0 is invalid."
6528
msgstr ""
6529
7185.1.1 by Jelmer Vernooij
Update pot file.
6530
#: breezy/log.py:1120 breezy/log.py:1177
6138.4.4 by Jonathan Riddell
update bzr.pot
6531
msgid "Start revision must be older than the end revision."
6532
msgstr ""
6533
7185.1.1 by Jelmer Vernooij
Update pot file.
6534
#: breezy/log.py:1870
6138.4.4 by Jonathan Riddell
update bzr.pot
6535
#, python-format
6536
msgid "unknown log formatter: %r"
6537
msgstr ""
6538
7185.1.1 by Jelmer Vernooij
Update pot file.
6539
#: breezy/log.py:2168
6143.1.7 by Jonathan Riddell
update bzr.pot
6540
msgid "fixes bug"
6150.1.1 by Jonathan Riddell
update bzr.pot
6541
msgid_plural "fixes bugs"
6143.1.7 by Jonathan Riddell
update bzr.pot
6542
msgstr[0] ""
6543
msgstr[1] ""
6544
7185.1.1 by Jelmer Vernooij
Update pot file.
6545
#: breezy/log.py:2171
6546
msgid "related bug"
6547
msgid_plural "related bugs"
6548
msgstr[0] ""
6549
msgstr[1] ""
6550
6551
#: breezy/merge.py:673
6138.4.4 by Jonathan Riddell
update bzr.pot
6552
msgid "All changes applied successfully."
6553
msgstr ""
6554
7185.1.1 by Jelmer Vernooij
Update pot file.
6555
#: breezy/merge.py:675
6138.4.4 by Jonathan Riddell
update bzr.pot
6556
#, python-format
6557
msgid "%d conflicts encountered."
6558
msgstr ""
6559
7185.1.1 by Jelmer Vernooij
Update pot file.
6560
#: breezy/merge.py:808 breezy/merge.py:1858
6138.4.4 by Jonathan Riddell
update bzr.pot
6561
msgid "Preparing file merge"
6562
msgstr ""
6563
7185.1.1 by Jelmer Vernooij
Update pot file.
6564
#: breezy/multiparent.py:437
6138.4.4 by Jonathan Riddell
update bzr.pot
6565
msgid "Importing revisions"
6566
msgstr ""
6567
6093.2.1 by Jonathan Riddell
add .pot file to archive
6568
# help of 'help' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6569
#: breezy/option.py:547
6093.2.1 by Jonathan Riddell
add .pot file to archive
6570
msgid "Show help message."
6571
msgstr ""
6572
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6573
# help of 'quiet' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6574
#: breezy/option.py:549
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6575
msgid "Only display errors and warnings."
6576
msgstr ""
6577
6093.2.1 by Jonathan Riddell
add .pot file to archive
6578
# help of 'usage' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6579
#: breezy/option.py:552
6093.2.1 by Jonathan Riddell
add .pot file to archive
6580
msgid "Show usage message and options."
6581
msgstr ""
6582
6583
# help of 'verbose' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6584
#: breezy/option.py:554
6093.2.1 by Jonathan Riddell
add .pot file to archive
6585
msgid "Display more information."
6586
msgstr ""
6587
6588
# help of 'change' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6589
#: breezy/option.py:562
6093.2.1 by Jonathan Riddell
add .pot file to archive
6590
msgid ""
6591
"Select changes introduced by the specified revision. See also \"help "
6592
"revisionspec\"."
6593
msgstr ""
6594
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6595
# help of 'directory' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6596
#: breezy/option.py:564
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6597
msgid "Branch to operate on, instead of working directory."
6598
msgstr ""
6599
6600
# help of 'log-format=long' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6601
#: breezy/option.py:566
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6602
msgid "Detailed log format."
6603
msgstr ""
6604
6605
# help of 'log-format=gnu-changelog' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6606
#: breezy/option.py:566
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6607
msgid "Format used by GNU ChangeLog files."
6608
msgstr ""
6609
6610
# help of 'log-format=line' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6611
#: breezy/option.py:566
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6612
msgid "Log format with one line per revision."
6613
msgstr ""
6614
6615
# help of 'log-format=short' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6616
#: breezy/option.py:566
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6617
msgid "Moderately short log format."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6618
msgstr ""
6619
6620
# help of 'log-format' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6621
#: breezy/option.py:566
6093.2.1 by Jonathan Riddell
add .pot file to archive
6622
msgid "Use specified log format."
6623
msgstr ""
6624
6625
# title of 'log-format' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6626
#: breezy/option.py:568
6093.2.1 by Jonathan Riddell
add .pot file to archive
6627
msgid "Log format"
6628
msgstr ""
6629
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6630
# help of 'merge-type=lca' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6631
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6632
msgid "LCA-newness merge."
6633
msgstr ""
6634
6635
# help of 'merge-type=diff3' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6636
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6637
msgid "Merge using external diff3."
6638
msgstr ""
6639
6640
# help of 'merge-type=merge3' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6641
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6642
msgid "Native diff3-style merge."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6643
msgstr ""
6644
6645
# help of 'merge-type' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6646
#: breezy/option.py:570
6093.2.1 by Jonathan Riddell
add .pot file to archive
6647
msgid "Select a particular merge algorithm."
6648
msgstr ""
6649
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6650
# help of 'merge-type=weave' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6651
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6652
msgid "Weave-based merge."
6653
msgstr ""
6654
6093.2.1 by Jonathan Riddell
add .pot file to archive
6655
# title of 'merge-type' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6656
#: breezy/option.py:572
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6657
msgid "Merge algorithm"
6658
msgstr ""
6659
6660
# help of 'message' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6661
#: breezy/option.py:575
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6662
msgid "Message string."
6663
msgstr ""
6664
6665
# help of 'null' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6666
#: breezy/option.py:577
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6667
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6668
msgstr ""
6669
6670
# help of 'overwrite' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6671
#: breezy/option.py:579
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6672
msgid "Ignore differences between branches and overwrite unconditionally."
6673
msgstr ""
6674
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6675
# help of 'remember' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6676
#: breezy/option.py:581
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6677
msgid "Remember the specified location as a default."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6678
msgstr ""
6679
6680
# help of 'reprocess' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6681
#: breezy/option.py:583
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6682
msgid "Reprocess to reduce spurious conflicts."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6683
msgstr ""
6684
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6685
# help of 'revision' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6686
#: breezy/option.py:587
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6687
msgid "See \"help revisionspec\" for details."
6688
msgstr ""
6689
6690
# help of 'show-ids' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6691
#: breezy/option.py:589
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6692
msgid "Show internal object ids."
6693
msgstr ""
6694
6695
# help of 'timezone' option
7185.1.1 by Jelmer Vernooij
Update pot file.
6696
#: breezy/option.py:592
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6697
msgid "Display timezone as local, original, or utc."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6698
msgstr ""
6699
7185.1.1 by Jelmer Vernooij
Update pot file.
6700
#: breezy/osutils.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
6701
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6702
msgstr ""
6703
7185.1.1 by Jelmer Vernooij
Update pot file.
6704
#: breezy/osutils.py:234
6138.4.4 by Jonathan Riddell
update bzr.pot
6705
msgid "lstat/stat of ({0!r}): {1!r}"
6706
msgstr ""
6707
7185.1.1 by Jelmer Vernooij
Update pot file.
6708
#: breezy/osutils.py:1048 breezy/osutils.py:1059
6138.4.4 by Jonathan Riddell
update bzr.pot
6709
#, python-format
6710
msgid "sorry, %r not allowed in path"
6711
msgstr ""
6712
7185.1.1 by Jelmer Vernooij
Update pot file.
6713
#: breezy/osutils.py:1278
6138.4.4 by Jonathan Riddell
update bzr.pot
6714
#, python-format
6715
msgid "%r is too short to calculate a relative path"
6716
msgstr ""
6717
6093.2.1 by Jonathan Riddell
add .pot file to archive
6718
# help of 'plugin' option of 'bash-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
6719
#: breezy/plugins/bash_completion/bashcomp.py:419
6093.2.1 by Jonathan Riddell
add .pot file to archive
6720
msgid "Enable completions for the selected plugin (default: all plugins)"
6721
msgstr ""
6722
7185.1.1 by Jelmer Vernooij
Update pot file.
6723
#: breezy/plugins/bash_completion/bashcomp.py:420
6093.2.1 by Jonathan Riddell
add .pot file to archive
6724
msgid "Generate a shell function for bash command line completion."
6725
msgstr ""
6726
7185.1.1 by Jelmer Vernooij
Update pot file.
6727
#: breezy/plugins/bash_completion/bashcomp.py:422
6093.2.1 by Jonathan Riddell
add .pot file to archive
6728
msgid ""
6729
"This command generates a shell function which can be used by bash to\n"
6730
"automatically complete the currently typed command when the user presses\n"
6731
"the completion key (usually tab)."
6732
msgstr ""
6733
7185.1.1 by Jelmer Vernooij
Update pot file.
6734
#: breezy/plugins/bash_completion/bashcomp.py:426
6093.2.1 by Jonathan Riddell
add .pot file to archive
6735
msgid ""
6736
"Commonly used like this:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6737
"    eval \"`brz bash-completion`\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
6738
msgstr ""
6739
6740
# help of 'function-name' option of 'bash-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
6741
#: breezy/plugins/bash_completion/bashcomp.py:432
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6742
msgid "Name of the generated function (default: _brz)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6743
msgstr ""
6744
6745
# help of 'function-only' option of 'bash-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
6746
#: breezy/plugins/bash_completion/bashcomp.py:434
6093.2.1 by Jonathan Riddell
add .pot file to archive
6747
msgid "Generate only the shell function, don't enable it"
6748
msgstr ""
6749
7185.1.1 by Jelmer Vernooij
Update pot file.
6750
#: breezy/plugins/fastimport/cmds.py:79
6751
msgid "Backend for fast Bazaar data importers."
6752
msgstr ""
6753
6754
#: breezy/plugins/fastimport/cmds.py:81
6755
msgid ""
6756
"This command reads a mixed command/data stream and creates\n"
6757
"branches in a Bazaar repository accordingly. The preferred\n"
6758
"recipe is::"
6759
msgstr ""
6760
6761
#: breezy/plugins/fastimport/cmds.py:85
6762
msgid "  bzr fast-import project.fi project.bzr"
6763
msgstr ""
6764
6765
#: breezy/plugins/fastimport/cmds.py:87
6766
msgid ""
6767
"Numerous commands are provided for generating a fast-import file\n"
6768
"to use as input. \n"
6769
"To specify standard input as the input stream, use a\n"
6770
"source name of '-' (instead of project.fi). If the source name\n"
6771
"ends in '.gz', it is assumed to be compressed in gzip format."
6772
msgstr ""
6773
6774
#: breezy/plugins/fastimport/cmds.py:93
6775
msgid ""
6776
"project.bzr will be created if it doesn't exist. If it exists\n"
6777
"already, it should be empty or be an existing Bazaar repository\n"
6778
"or branch. If not specified, the current directory is assumed."
6779
msgstr ""
6780
6781
#: breezy/plugins/fastimport/cmds.py:97
6782
msgid ""
6783
"fast-import will intelligently select the format to use when\n"
6784
"creating a repository or branch. If you are running Bazaar 1.17\n"
6785
"up to Bazaar 2.0, the default format for Bazaar 2.x (\"2a\") is used.\n"
6786
"Otherwise, the current default format (\"pack-0.92\" for Bazaar 1.x)\n"
6787
"is used. If you wish to specify a custom format, use the `--format`\n"
6788
"option."
6789
msgstr ""
6790
6791
#: breezy/plugins/fastimport/cmds.py:104 breezy/plugins/fastimport/cmds.py:176
6792
#: breezy/plugins/fastimport/cmds.py:190 breezy/plugins/fastimport/cmds.py:373
6793
msgid " .. note::"
6794
msgstr ""
6795
6796
#: breezy/plugins/fastimport/cmds.py:106
6797
msgid ""
6798
"    To maintain backwards compatibility, fast-import lets you\n"
6799
"    create the target repository or standalone branch yourself.\n"
6800
"    It is recommended though that you let fast-import create\n"
6801
"    these for you instead."
6802
msgstr ""
6803
6804
#: breezy/plugins/fastimport/cmds.py:111
6805
msgid ":Branch mapping rules:"
6806
msgstr ""
6807
6808
#: breezy/plugins/fastimport/cmds.py:113
6809
msgid " Git reference names are mapped to Bazaar branch names as follows:"
6810
msgstr ""
6811
6812
#: breezy/plugins/fastimport/cmds.py:115
6813
msgid ""
6814
" * refs/heads/foo is mapped to foo\n"
6815
" * refs/remotes/origin/foo is mapped to foo.remote\n"
6816
" * refs/tags/foo is mapped to foo.tag\n"
6817
" * */master is mapped to trunk, trunk.remote, etc.\n"
6818
" * */trunk is mapped to git-trunk, git-trunk.remote, etc."
6819
msgstr ""
6820
6821
#: breezy/plugins/fastimport/cmds.py:121
6822
msgid ":Branch creation rules:"
6823
msgstr ""
6824
6825
#: breezy/plugins/fastimport/cmds.py:123
6826
msgid ""
6827
" When a shared repository is created or found at the destination,\n"
6828
" branches are created inside it. In the simple case of a single\n"
6829
" branch (refs/heads/master) inside the input file, the branch is\n"
6830
" project.bzr/trunk."
6831
msgstr ""
6832
6833
#: breezy/plugins/fastimport/cmds.py:128
6834
msgid ""
6835
" When a standalone branch is found at the destination, the trunk\n"
6836
" is imported there and warnings are output about any other branches\n"
6837
" found in the input file."
6838
msgstr ""
6839
6840
#: breezy/plugins/fastimport/cmds.py:132
6841
msgid ""
6842
" When a branch in a shared repository is found at the destination,\n"
6843
" that branch is made the trunk and other branches, if any, are\n"
6844
" created in sister directories."
6845
msgstr ""
6846
6847
#: breezy/plugins/fastimport/cmds.py:136
6848
msgid ":Working tree updates:"
6849
msgstr ""
6850
6851
#: breezy/plugins/fastimport/cmds.py:138
6852
msgid ""
6853
" The working tree is generated for the trunk branch. If multiple\n"
6854
" branches are created, a message is output on completion explaining\n"
6855
" how to create the working trees for other branches."
6856
msgstr ""
6857
6858
#: breezy/plugins/fastimport/cmds.py:142
6859
msgid ":Custom exporters:"
6860
msgstr ""
6861
6862
#: breezy/plugins/fastimport/cmds.py:144
6863
msgid ""
6864
" The fast-export-from-xxx commands typically call more advanced\n"
6865
" xxx-fast-export scripts. You are welcome to use the advanced\n"
6866
" scripts if you prefer."
6867
msgstr ""
6868
6869
#: breezy/plugins/fastimport/cmds.py:148
6870
msgid ""
6871
" If you wish to write a custom exporter for your project, see\n"
6872
" http://bazaar-vcs.org/BzrFastImport for the detailed protocol\n"
6873
" specification. In many cases, exporters can be written quite\n"
6874
" quickly using whatever scripting/programming language you like."
6875
msgstr ""
6876
6877
#: breezy/plugins/fastimport/cmds.py:153
6878
msgid ":User mapping:"
6879
msgstr ""
6880
6881
#: breezy/plugins/fastimport/cmds.py:155
6882
msgid ""
6883
" Some source repositories store just the user name while Bazaar\n"
6884
" prefers a full email address. You can adjust user-ids while\n"
6885
" importing by using the --user-map option. The argument is a\n"
6886
" text file with lines in the format::"
6887
msgstr ""
6888
6889
#: breezy/plugins/fastimport/cmds.py:160
6890
msgid "   old-id = new-id"
6891
msgstr ""
6892
6893
#: breezy/plugins/fastimport/cmds.py:162
6894
msgid ""
6895
" Blank lines and lines beginning with # are ignored.\n"
6896
" If old-id has the special value '@', then users without an\n"
6897
" email address will get one created by using the matching new-id\n"
6898
" as the domain, unless a more explicit address is given for them.\n"
6899
" For example, given the user-map of::"
6900
msgstr ""
6901
6902
#: breezy/plugins/fastimport/cmds.py:168
6903
msgid ""
6904
"   @ = example.com\n"
6905
"   bill = William Jones <bill@example.com>"
6906
msgstr ""
6907
6908
#: breezy/plugins/fastimport/cmds.py:171
6909
msgid " then user-ids are mapped as follows::"
6910
msgstr ""
6911
6912
#: breezy/plugins/fastimport/cmds.py:173
6913
msgid ""
6914
"  maria => maria <maria@example.com>\n"
6915
"  bill => William Jones <bill@example.com>"
6916
msgstr ""
6917
6918
#: breezy/plugins/fastimport/cmds.py:178
6919
msgid ""
6920
"    User mapping is supported by both the fast-import and\n"
6921
"    fast-import-filter commands."
6922
msgstr ""
6923
6924
#: breezy/plugins/fastimport/cmds.py:181
6925
msgid ":Blob tracking:"
6926
msgstr ""
6927
6928
#: breezy/plugins/fastimport/cmds.py:183
6929
msgid ""
6930
" As some exporters (like git-fast-export) reuse blob data across\n"
6931
" commits, fast-import makes two passes over the input file by\n"
6932
" default. In the first pass, it collects data about what blobs are\n"
6933
" used when, along with some other statistics (e.g. total number of\n"
6934
" commits). In the second pass, it generates the repository and\n"
6935
" branches."
6936
msgstr ""
6937
6938
#: breezy/plugins/fastimport/cmds.py:192
6939
msgid ""
6940
"    The initial pass isn't done if the --info option is used\n"
6941
"    to explicitly pass in information about the input stream.\n"
6942
"    It also isn't done if the source is standard input. In the\n"
6943
"    latter case, memory consumption may be higher than otherwise\n"
6944
"    because some blobs may be kept in memory longer than necessary."
6945
msgstr ""
6946
6947
#: breezy/plugins/fastimport/cmds.py:198
6948
msgid ":Restarting an import:"
6949
msgstr ""
6950
6951
#: breezy/plugins/fastimport/cmds.py:200
6952
msgid ""
6953
" At checkpoints and on completion, the commit-id -> revision-id\n"
6954
" map is saved to a file called 'fastimport-id-map' in the control\n"
6955
" directory for the repository (e.g. .bzr/repository). If the import\n"
6956
" is interrupted or unexpectedly crashes, it can be started again\n"
6957
" and this file will be used to skip over already loaded revisions.\n"
6958
" As long as subsequent exports from the original source begin\n"
6959
" with exactly the same revisions, you can use this feature to\n"
6960
" maintain a mirror of a repository managed by a foreign tool.\n"
6961
" If and when Bazaar is used to manage the repository, this file\n"
6962
" can be safely deleted."
6963
msgstr ""
6964
6965
#: breezy/plugins/fastimport/cmds.py:213
6966
msgid " Import a Subversion repository into Bazaar::"
6967
msgstr ""
6968
6969
#: breezy/plugins/fastimport/cmds.py:215
6970
msgid ""
6971
"   svn-fast-export /svn/repo/path > project.fi\n"
6972
"   bzr fast-import project.fi project.bzr"
6973
msgstr ""
6974
6975
#: breezy/plugins/fastimport/cmds.py:218
6976
msgid " Import a CVS repository into Bazaar::"
6977
msgstr ""
6978
6979
#: breezy/plugins/fastimport/cmds.py:220
6980
msgid ""
6981
"   cvs2git /cvs/repo/path > project.fi\n"
6982
"   bzr fast-import project.fi project.bzr"
6983
msgstr ""
6984
6985
#: breezy/plugins/fastimport/cmds.py:223
6986
msgid " Import a Git repository into Bazaar::"
6987
msgstr ""
6988
6989
#: breezy/plugins/fastimport/cmds.py:225
6990
msgid ""
6991
"   cd /git/repo/path\n"
6992
"   git fast-export --all > project.fi\n"
6993
"   bzr fast-import project.fi project.bzr"
6994
msgstr ""
6995
6996
#: breezy/plugins/fastimport/cmds.py:229
6997
msgid " Import a Mercurial repository into Bazaar::"
6998
msgstr ""
6999
7000
#: breezy/plugins/fastimport/cmds.py:231
7001
msgid ""
7002
"   cd /hg/repo/path\n"
7003
"   hg fast-export > project.fi\n"
7004
"   bzr fast-import project.fi project.bzr"
7005
msgstr ""
7006
7007
#: breezy/plugins/fastimport/cmds.py:235
7008
msgid " Import a Darcs repository into Bazaar::"
7009
msgstr ""
7010
7011
#: breezy/plugins/fastimport/cmds.py:237
7012
msgid ""
7013
"   cd /darcs/repo/path\n"
7014
"   darcs-fast-export > project.fi\n"
7015
"   bzr fast-import project.fi project.bzr"
7016
msgstr ""
7017
7018
# help of 'user-map' option of 'fast-import' command
7019
#: breezy/plugins/fastimport/cmds.py:246
7020
msgid "Path to file containing a map of user-ids."
7021
msgstr ""
7022
7023
# help of 'info' option of 'fast-import' command
7024
#: breezy/plugins/fastimport/cmds.py:249
7025
msgid "Path to file containing caching hints."
7026
msgstr ""
7027
7028
# help of 'trees' option of 'fast-import' command
7029
#: breezy/plugins/fastimport/cmds.py:252
7030
msgid "Update all working trees, not just trunk's."
7031
msgstr ""
7032
7033
# help of 'count' option of 'fast-import' command
7034
#: breezy/plugins/fastimport/cmds.py:255
7035
msgid "Import this many revisions then exit."
7036
msgstr ""
7037
7038
# help of 'checkpoint' option of 'fast-import' command
7039
#: breezy/plugins/fastimport/cmds.py:258
7040
msgid "Checkpoint automatically every N revisions. The default is 10000."
7041
msgstr ""
7042
7043
# help of 'autopack' option of 'fast-import' command
7044
#: breezy/plugins/fastimport/cmds.py:262
7045
msgid "Pack every N checkpoints. The default is 4."
7046
msgstr ""
7047
7048
# help of 'inv-cache' option of 'fast-import' command
7049
#: breezy/plugins/fastimport/cmds.py:265
7050
msgid "Number of inventories to cache."
7051
msgstr ""
7052
7053
# help of 'mode' option of 'fast-import' command
7054
#: breezy/plugins/fastimport/cmds.py:268
7055
msgid "The import algorithm to use."
7056
msgstr ""
7057
7058
# title of 'mode' option of 'fast-import' command
7059
#: breezy/plugins/fastimport/cmds.py:269
7060
msgid "Import Algorithm"
7061
msgstr ""
7062
7063
# help of 'mode=default' option of 'fast-import' command
7064
#: breezy/plugins/fastimport/cmds.py:270
7065
msgid "Use the preferred algorithm (inventory deltas)."
7066
msgstr ""
7067
7068
# help of 'mode=experimental' option of 'fast-import' command
7069
#: breezy/plugins/fastimport/cmds.py:271
7070
msgid "Enable experimental features."
7071
msgstr ""
7072
7073
# help of 'format' option of 'fast-import' command
7074
#: breezy/plugins/fastimport/cmds.py:281
7075
msgid ""
7076
"Specify a format for the created repository. See \"bzr help formats\" for "
7077
"details."
7078
msgstr ""
7079
7080
#: breezy/plugins/fastimport/cmds.py:347
7081
msgid "Generate a fast-import stream from a Bazaar branch."
7082
msgstr ""
7083
7084
#: breezy/plugins/fastimport/cmds.py:349
7085
msgid ""
7086
"This program generates a stream from a Bazaar branch in fast-import\n"
7087
"format used by tools such as bzr fast-import, git-fast-import and\n"
7088
"hg-fast-import."
7089
msgstr ""
7090
7091
#: breezy/plugins/fastimport/cmds.py:353
7092
msgid ""
7093
"It takes two optional arguments: the source bzr branch to export and\n"
7094
"the destination to write the file to write the fastimport stream to."
7095
msgstr ""
7096
7097
#: breezy/plugins/fastimport/cmds.py:356
7098
msgid ""
7099
"If no source is specified, it will search for a branch in the\n"
7100
"current directory."
7101
msgstr ""
7102
7103
#: breezy/plugins/fastimport/cmds.py:359
7104
msgid ""
7105
"If no destination is given or the destination is '-', standard output\n"
7106
"is used. Otherwise, the destination is the name of a file. If the\n"
7107
"destination ends in '.gz', the output will be compressed into gzip\n"
7108
"format."
7109
msgstr ""
7110
7111
#: breezy/plugins/fastimport/cmds.py:364
7112
msgid ":Round-tripping:"
7113
msgstr ""
7114
7115
#: breezy/plugins/fastimport/cmds.py:366
7116
msgid ""
7117
" Recent versions of the fast-import specification support features\n"
7118
" that allow effective round-tripping most of the metadata in Bazaar\n"
7119
" branches. As such, fast-exporting a branch and fast-importing the data\n"
7120
" produced will create a new repository with roughly equivalent history, i."
7121
"e.\n"
7122
" \"bzr log -v -p --include-merges --forward\" on the old branch and\n"
7123
" new branch should produce similar, if not identical, results."
7124
msgstr ""
7125
7126
#: breezy/plugins/fastimport/cmds.py:375
7127
msgid ""
7128
"    Be aware that the new repository may appear to have similar history\n"
7129
"    but internally it is quite different with new revision-ids and\n"
7130
"    file-ids assigned. As a consequence, the ability to easily merge\n"
7131
"    with branches based on the old repository is lost. Depending on your\n"
7132
"    reasons for producing a new repository, this may or may not be an\n"
7133
"    issue."
7134
msgstr ""
7135
7136
#: breezy/plugins/fastimport/cmds.py:382
7137
msgid ":Interoperability:"
7138
msgstr ""
7139
7140
#: breezy/plugins/fastimport/cmds.py:384
7141
msgid ""
7142
" fast-export can use the following \"extended features\" to\n"
7143
" produce a richer data stream:"
7144
msgstr ""
7145
7146
#: breezy/plugins/fastimport/cmds.py:387
7147
msgid ""
7148
" * *multiple-authors* - if a commit has multiple authors (as commonly\n"
7149
"   occurs in pair-programming), all authors will be included in the\n"
7150
"   output, not just the first author"
7151
msgstr ""
7152
7153
#: breezy/plugins/fastimport/cmds.py:391
7154
msgid ""
7155
" * *commit-properties* - custom metadata per commit that Bazaar stores\n"
7156
"   in revision properties (e.g. branch-nick and bugs fixed by this\n"
7157
"   change) will be included in the output."
7158
msgstr ""
7159
7160
#: breezy/plugins/fastimport/cmds.py:395
7161
msgid ""
7162
" * *empty-directories* - directories, even the empty ones, will be\n"
7163
"   included in the output."
7164
msgstr ""
7165
7166
#: breezy/plugins/fastimport/cmds.py:398
7167
msgid ""
7168
" To disable these features and produce output acceptable to git 1.6,\n"
7169
" use the --plain option. To enable these features, use --no-plain.\n"
7170
" Currently, --plain is the default but that will change in the near\n"
7171
" future once the feature names and definitions are formally agreed\n"
7172
" to by the broader fast-import developer community."
7173
msgstr ""
7174
7175
#: breezy/plugins/fastimport/cmds.py:404
7176
msgid ""
7177
" Git has stricter naming rules for tags and fast-export --plain\n"
7178
" will skip tags which can't be imported into git. To replace characters\n"
7179
" unsupported in git with an underscore instead, specify\n"
7180
" --rewrite-tag-names."
7181
msgstr ""
7182
7183
#: breezy/plugins/fastimport/cmds.py:409
7184
msgid ":History truncation:"
7185
msgstr ""
7186
7187
#: breezy/plugins/fastimport/cmds.py:411
7188
msgid ""
7189
" It is sometimes convenient to simply truncate the revision history at a\n"
7190
" certain point.  The --baseline option, to be used in conjunction with -r,\n"
7191
" emits a baseline commit containing the state of the entire source tree at\n"
7192
" the first requested revision.  This allows a user to produce a tree\n"
7193
" identical to the original without munging multiple exports."
7194
msgstr ""
7195
7196
#: breezy/plugins/fastimport/cmds.py:419
7197
msgid " To produce data destined for import into Bazaar::"
7198
msgstr ""
7199
7200
#: breezy/plugins/fastimport/cmds.py:421
7201
msgid "   bzr fast-export --no-plain my-bzr-branch my.fi.gz"
7202
msgstr ""
7203
7204
#: breezy/plugins/fastimport/cmds.py:423
7205
msgid " To produce data destined for Git 1.6::"
7206
msgstr ""
7207
7208
#: breezy/plugins/fastimport/cmds.py:425
7209
msgid "   bzr fast-export --plain my-bzr-branch my.fi"
7210
msgstr ""
7211
7212
#: breezy/plugins/fastimport/cmds.py:427
7213
msgid ""
7214
" To import several unmerged but related branches into the same repository,\n"
7215
" use the --{export,import}-marks options, and specify a name for the git\n"
7216
" branch like this::"
7217
msgstr ""
7218
7219
#: breezy/plugins/fastimport/cmds.py:431
7220
msgid ""
7221
"   bzr fast-export --export-marks=marks.bzr project.dev |\n"
7222
"          GIT_DIR=project/.git git-fast-import --export-marks=marks.git"
7223
msgstr ""
7224
7225
#: breezy/plugins/fastimport/cmds.py:434
7226
msgid ""
7227
"   bzr fast-export --import-marks=marks.bzr -b other project.other |\n"
7228
"          GIT_DIR=project/.git git-fast-import --import-marks=marks.git"
7229
msgstr ""
7230
7231
#: breezy/plugins/fastimport/cmds.py:437
7232
msgid ""
7233
" If you get a \"Missing space after source\" error from git-fast-import,\n"
7234
" see the top of the commands.py module for a work-around."
7235
msgstr ""
7236
7237
#: breezy/plugins/fastimport/cmds.py:440
7238
msgid ""
7239
" Since bzr uses per-branch tags and git/hg use per-repo tags, the\n"
7240
" way bzr fast-export presently emits tags (unconditional reset &\n"
7241
" new ref) may result in clashes when several different branches\n"
7242
" are imported into single git/hg repo.  If this occurs, use the\n"
7243
" bzr fast-export option --no-tags during the export of one or more\n"
7244
" branches to avoid the issue."
7245
msgstr ""
7246
7247
# help of 'git-branch' option of 'fast-export' command
7248
#: breezy/plugins/fastimport/cmds.py:453
7249
msgid "Name of the git branch to create (default=master)."
7250
msgstr ""
7251
7252
# help of 'checkpoint' option of 'fast-export' command
7253
#: breezy/plugins/fastimport/cmds.py:456
7254
msgid "Checkpoint every N revisions (default=10000)."
7255
msgstr ""
7256
7257
# help of 'marks' option of 'fast-export' command
7258
#: breezy/plugins/fastimport/cmds.py:459
7259
msgid "Import marks from and export marks to file."
7260
msgstr ""
7261
7262
# help of 'import-marks' option of 'fast-export' command
7263
# help of 'import-marks' option of 'fast-import' command
7264
#: breezy/plugins/fastimport/cmds.py:462
7265
msgid "Import marks from file."
7266
msgstr ""
7267
7268
# help of 'export-marks' option of 'fast-export' command
7269
# help of 'export-marks' option of 'fast-import' command
7270
#: breezy/plugins/fastimport/cmds.py:465
7271
msgid "Export marks to file."
7272
msgstr ""
7273
7274
# help of 'plain' option of 'fast-export' command
7275
#: breezy/plugins/fastimport/cmds.py:468
7276
msgid "Exclude metadata to maximise interoperability."
7277
msgstr ""
7278
7279
# help of 'rewrite-tag-names' option of 'fast-export' command
7280
#: breezy/plugins/fastimport/cmds.py:471
7281
msgid "Replace characters invalid in git with '_' (plain mode only)."
7282
msgstr ""
7283
7284
# help of 'baseline' option of 'fast-export' command
7285
#: breezy/plugins/fastimport/cmds.py:475
7286
msgid "Export an 'absolute' baseline commit prior tothe first relative commit"
7287
msgstr ""
7288
7289
# help of 'no-tags' option of 'fast-export' command
7290
#: breezy/plugins/fastimport/cmds.py:479
7291
msgid "Don't export tags"
7292
msgstr ""
7293
7294
#: breezy/plugins/grep/cmds.py:83
6581.1.2 by Vincent Ladeuil
Update translation template.
7295
msgid "Print lines matching PATTERN for specified files and revisions."
7296
msgstr ""
7297
7185.1.1 by Jelmer Vernooij
Update pot file.
7298
#: breezy/plugins/grep/cmds.py:85
6581.1.2 by Vincent Ladeuil
Update translation template.
7299
msgid ""
7300
"This command searches the specified files and revisions for a given\n"
7301
"pattern.  The pattern is specified as a Python regular expressions[1]."
7302
msgstr ""
7303
7185.1.1 by Jelmer Vernooij
Update pot file.
7304
#: breezy/plugins/grep/cmds.py:88
6581.1.2 by Vincent Ladeuil
Update translation template.
7305
msgid ""
7306
"If the file name is not specified, the revisions starting with the\n"
7307
"current directory are searched recursively. If the revision number is\n"
7308
"not specified, the working copy is searched. To search the last committed\n"
7309
"revision, use the '-r -1' or '-r last:1' option."
7310
msgstr ""
7311
7185.1.1 by Jelmer Vernooij
Update pot file.
7312
#: breezy/plugins/grep/cmds.py:93
6581.1.2 by Vincent Ladeuil
Update translation template.
7313
msgid ""
7314
"Unversioned files are not searched unless explicitly specified on the\n"
7315
"command line. Unversioned directores are not searched."
7316
msgstr ""
7317
7185.1.1 by Jelmer Vernooij
Update pot file.
7318
#: breezy/plugins/grep/cmds.py:96
6581.1.2 by Vincent Ladeuil
Update translation template.
7319
msgid ""
7320
"When searching a pattern, the output is shown in the 'filepath:string'\n"
7321
"format. If a revision is explicitly searched, the output is shown as\n"
7322
"'filepath~N:string', where N is the revision number."
7323
msgstr ""
7324
7185.1.1 by Jelmer Vernooij
Update pot file.
7325
#: breezy/plugins/grep/cmds.py:100
6581.1.2 by Vincent Ladeuil
Update translation template.
7326
msgid ""
7327
"--include and --exclude options can be used to search only (or exclude\n"
7328
"from search) files with base name matches the specified Unix style GLOB\n"
7329
"pattern.  The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
7330
"to quote wildcard or backslash character literally. Note that the glob\n"
7331
"pattern is not a regular expression."
7332
msgstr ""
7333
7185.1.1 by Jelmer Vernooij
Update pot file.
7334
#: breezy/plugins/grep/cmds.py:106
6581.1.2 by Vincent Ladeuil
Update translation template.
7335
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
7336
msgstr ""
7337
7338
# help of 'color' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7339
#: breezy/plugins/grep/cmds.py:115
6581.1.2 by Vincent Ladeuil
Update translation template.
7340
msgid "Show match in color. WHEN is never, always or auto."
7341
msgstr ""
7342
7343
# help of 'diff' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7344
#: breezy/plugins/grep/cmds.py:117
6581.1.2 by Vincent Ladeuil
Update translation template.
7345
msgid "Grep for pattern in changeset for each revision."
7346
msgstr ""
7347
7348
# help of 'exclude' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7349
#: breezy/plugins/grep/cmds.py:119
6581.1.2 by Vincent Ladeuil
Update translation template.
7350
msgid "Skip files whose base name matches GLOB."
7351
msgstr ""
7352
7353
# help of 'include' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7354
#: breezy/plugins/grep/cmds.py:121
6581.1.2 by Vincent Ladeuil
Update translation template.
7355
msgid "Search only files whose base name matches GLOB."
7356
msgstr ""
7357
7358
# help of 'files-with-matches' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7359
#: breezy/plugins/grep/cmds.py:123
6581.1.2 by Vincent Ladeuil
Update translation template.
7360
msgid "Print only the name of each input file in which PATTERN is found."
7361
msgstr ""
7362
7363
# help of 'files-without-match' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7364
#: breezy/plugins/grep/cmds.py:126
6581.1.2 by Vincent Ladeuil
Update translation template.
7365
msgid "Print only the name of each input file in which PATTERN is not found."
7366
msgstr ""
7367
7368
# help of 'fixed-string' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7369
#: breezy/plugins/grep/cmds.py:129
6581.1.2 by Vincent Ladeuil
Update translation template.
7370
msgid "Interpret PATTERN is a single fixed string (not regex)."
7371
msgstr ""
7372
7373
# help of 'from-root' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7374
#: breezy/plugins/grep/cmds.py:131
6581.1.2 by Vincent Ladeuil
Update translation template.
7375
msgid ""
7376
"Search for pattern starting from the root of the branch. (implies --"
7377
"recursive)"
7378
msgstr ""
7379
7380
# help of 'ignore-case' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7381
#: breezy/plugins/grep/cmds.py:134
6581.1.2 by Vincent Ladeuil
Update translation template.
7382
msgid "ignore case distinctions while matching."
7383
msgstr ""
7384
7385
# help of 'levels' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7386
#: breezy/plugins/grep/cmds.py:136
6581.1.2 by Vincent Ladeuil
Update translation template.
7387
msgid ""
7388
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
7389
msgstr ""
7390
7391
# help of 'line-number' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7392
#: breezy/plugins/grep/cmds.py:141
6581.1.2 by Vincent Ladeuil
Update translation template.
7393
msgid "show 1-based line number."
7394
msgstr ""
7395
7396
# help of 'no-recursive' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7397
#: breezy/plugins/grep/cmds.py:143
6581.1.2 by Vincent Ladeuil
Update translation template.
7398
msgid "Don't recurse into subdirectories. (default is --recursive)"
7399
msgstr ""
7400
7401
# help of 'null' option of 'grep' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7402
#: breezy/plugins/grep/cmds.py:145
6581.1.2 by Vincent Ladeuil
Update translation template.
7403
msgid ""
7404
"Write an ASCII NUL (\\0) separator between output lines rather than a "
7405
"newline."
7406
msgstr ""
7407
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7408
#: breezy/plugins/launchpad/account.py:66
6504.1.1 by Vincent Ladeuil
Update translation template
7409
msgid "Setting ssh/sftp usernames for launchpad.net."
7410
msgstr ""
7411
7185.1.1 by Jelmer Vernooij
Update pot file.
7412
#: breezy/plugins/launchpad/cmds.py:44
6093.2.1 by Jonathan Riddell
add .pot file to archive
7413
msgid "Open a Launchpad branch page in your web browser."
7414
msgstr ""
7415
7416
# help of 'dry-run' option of 'launchpad-open' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7417
#: breezy/plugins/launchpad/cmds.py:49
6093.2.1 by Jonathan Riddell
add .pot file to archive
7418
msgid "Do not actually open the browser. Just say the URL we would use."
7419
msgstr ""
7420
7185.1.1 by Jelmer Vernooij
Update pot file.
7421
#: breezy/plugins/launchpad/cmds.py:85
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7422
#, python-format
7423
msgid "Opening %s in web browser"
7424
msgstr ""
7425
7185.1.1 by Jelmer Vernooij
Update pot file.
7426
#: breezy/plugins/launchpad/cmds.py:93
6093.2.1 by Jonathan Riddell
add .pot file to archive
7427
msgid "Show or set the Launchpad user ID."
7428
msgstr ""
7429
7185.1.1 by Jelmer Vernooij
Update pot file.
7430
#: breezy/plugins/launchpad/cmds.py:95
6093.2.1 by Jonathan Riddell
add .pot file to archive
7431
msgid ""
7432
"When communicating with Launchpad, some commands need to know your\n"
7433
"Launchpad user ID.  This command can be used to set or show the\n"
7434
"user ID that Bazaar will use for such communication."
7435
msgstr ""
7436
7185.1.1 by Jelmer Vernooij
Update pot file.
7437
#: breezy/plugins/launchpad/cmds.py:99
6093.2.1 by Jonathan Riddell
add .pot file to archive
7438
msgid ""
7439
":Examples:\n"
7440
"  Show the Launchpad ID of the current user::"
7441
msgstr ""
7442
7185.1.1 by Jelmer Vernooij
Update pot file.
7443
#: breezy/plugins/launchpad/cmds.py:102
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7444
msgid "      brz launchpad-login"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7445
msgstr ""
7446
7185.1.1 by Jelmer Vernooij
Update pot file.
7447
#: breezy/plugins/launchpad/cmds.py:104
6093.2.1 by Jonathan Riddell
add .pot file to archive
7448
msgid "  Set the Launchpad ID of the current user to 'bob'::"
7449
msgstr ""
7450
7185.1.1 by Jelmer Vernooij
Update pot file.
7451
#: breezy/plugins/launchpad/cmds.py:106
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7452
msgid "      brz launchpad-login bob"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7453
msgstr ""
7454
7455
# help of 'no-check' option of 'launchpad-login' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7456
#: breezy/plugins/launchpad/cmds.py:113
6093.2.1 by Jonathan Riddell
add .pot file to archive
7457
msgid "Don't check that the user name is valid."
7458
msgstr ""
7459
7185.1.1 by Jelmer Vernooij
Update pot file.
7460
#: breezy/plugins/launchpad/cmds.py:128 breezy/plugins/launchpad/cmds.py:139
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7461
msgid "Launchpad user ID exists and has SSH keys.\n"
7462
msgstr ""
7463
7185.1.1 by Jelmer Vernooij
Update pot file.
7464
#: breezy/plugins/launchpad/cmds.py:131
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7465
msgid "No Launchpad user ID configured.\n"
7466
msgstr ""
7467
7185.1.1 by Jelmer Vernooij
Update pot file.
7468
#: breezy/plugins/launchpad/cmds.py:142
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7469
#, python-format
7470
msgid "Launchpad user ID set to '%s'.\n"
7471
msgstr ""
7472
7185.1.1 by Jelmer Vernooij
Update pot file.
7473
#: breezy/plugins/launchpad/cmds.py:147
7474
msgid "Unset the Launchpad user ID."
7475
msgstr ""
7476
7477
#: breezy/plugins/launchpad/cmds.py:149
7478
msgid ""
7479
"When communicating with Launchpad, some commands need to know your\n"
7480
"Launchpad user ID.  This command will log you out from Launchpad.\n"
7481
"This means that communication with Launchpad will happen over\n"
7482
"HTTPS, and will not require one of your SSH keys to be available."
7483
msgstr ""
7484
7485
#: breezy/plugins/launchpad/cmds.py:161
7486
msgid "Not logged into Launchpad.\n"
7487
msgstr ""
7488
7489
#: breezy/plugins/launchpad/cmds.py:166
7490
#, python-format
7491
msgid "Launchpad user ID %s logged out.\n"
7492
msgstr ""
7493
7494
#: breezy/plugins/launchpad/cmds.py:172
6093.2.1 by Jonathan Riddell
add .pot file to archive
7495
msgid "Ask Launchpad to mirror a branch now."
7496
msgstr ""
7497
7185.1.1 by Jelmer Vernooij
Update pot file.
7498
#: breezy/plugins/launchpad/cmds.py:189
6093.2.1 by Jonathan Riddell
add .pot file to archive
7499
msgid "Propose merging a branch on Launchpad."
7500
msgstr ""
7501
7185.1.1 by Jelmer Vernooij
Update pot file.
7502
#: breezy/plugins/launchpad/cmds.py:191
6093.2.1 by Jonathan Riddell
add .pot file to archive
7503
msgid ""
7504
"This will open your usual editor to provide the initial comment.  When it\n"
7505
"has created the proposal, it will open it in your default web browser."
7506
msgstr ""
7507
7185.1.1 by Jelmer Vernooij
Update pot file.
7508
#: breezy/plugins/launchpad/cmds.py:194
6093.2.1 by Jonathan Riddell
add .pot file to archive
7509
msgid ""
7510
"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
7511
"is not supplied, the remembered submit branch will be used.  If no submit\n"
7512
"branch is remembered, the development focus will be used."
7513
msgstr ""
7514
7185.1.1 by Jelmer Vernooij
Update pot file.
7515
#: breezy/plugins/launchpad/cmds.py:198
6093.2.1 by Jonathan Riddell
add .pot file to archive
7516
msgid ""
7517
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7518
"the merge proposal.  This can be overriden by specifying --review (-R).\n"
7519
"The parameter the launchpad account name of the desired reviewer.  This\n"
7520
"may optionally be followed by '=' and the review type.  For example:"
7521
msgstr ""
7522
7185.1.1 by Jelmer Vernooij
Update pot file.
7523
#: breezy/plugins/launchpad/cmds.py:203
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7524
msgid "  brz lp-propose-merge --review jrandom --review review-team=qa"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7525
msgstr ""
7526
7185.1.1 by Jelmer Vernooij
Update pot file.
7527
#: breezy/plugins/launchpad/cmds.py:205
6093.2.1 by Jonathan Riddell
add .pot file to archive
7528
msgid ""
7529
"This will propose a merge,  request \"jrandom\" to perform a review of\n"
7530
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7531
msgstr ""
7532
7533
# help of 'staging' option of 'lp-propose-merge' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7534
#: breezy/plugins/launchpad/cmds.py:210
6093.2.1 by Jonathan Riddell
add .pot file to archive
7535
msgid "Propose the merge on staging."
7536
msgstr ""
7537
7538
# help of 'message' option of 'lp-propose-merge' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7539
#: breezy/plugins/launchpad/cmds.py:212
6093.2.1 by Jonathan Riddell
add .pot file to archive
7540
msgid "Commit message."
7541
msgstr ""
7542
7543
# help of 'approve' option of 'lp-propose-merge' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7544
#: breezy/plugins/launchpad/cmds.py:214
6581.1.2 by Vincent Ladeuil
Update translation template.
7545
msgid ""
7546
"Mark the proposal as approved immediately, setting the approved revision to "
7547
"tip."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7548
msgstr ""
7549
6504.1.1 by Vincent Ladeuil
Update translation template
7550
# help of 'fixes' option of 'lp-propose-merge' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7551
#: breezy/plugins/launchpad/cmds.py:216
6504.1.1 by Vincent Ladeuil
Update translation template
7552
msgid "The bug this proposal fixes."
7553
msgstr ""
7554
6093.2.1 by Jonathan Riddell
add .pot file to archive
7555
# help of 'review' option of 'lp-propose-merge' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7556
#: breezy/plugins/launchpad/cmds.py:218
6093.2.1 by Jonathan Riddell
add .pot file to archive
7557
msgid "Requested reviewer and optional type."
7558
msgstr ""
7559
7185.1.1 by Jelmer Vernooij
Update pot file.
7560
#: breezy/plugins/launchpad/cmds.py:253
6093.2.1 by Jonathan Riddell
add .pot file to archive
7561
msgid "Find the proposal to merge this revision."
7562
msgstr ""
7563
7185.1.1 by Jelmer Vernooij
Update pot file.
7564
#: breezy/plugins/launchpad/cmds.py:255
6093.2.1 by Jonathan Riddell
add .pot file to archive
7565
msgid ""
7566
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
7567
"This works only if the if the merged_revno was recorded for the merge\n"
7568
"proposal.  The proposal(s) are opened in a web browser."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7569
msgstr ""
7570
7185.1.1 by Jelmer Vernooij
Update pot file.
7571
#: breezy/plugins/launchpad/cmds.py:259
6093.2.1 by Jonathan Riddell
add .pot file to archive
7572
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
7573
"Only the revision specified is searched for.  To find the mainline\n"
7574
"revision that merged it into mainline, use the \"mainline\" revision spec."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7575
msgstr ""
7576
7185.1.1 by Jelmer Vernooij
Update pot file.
7577
#: breezy/plugins/launchpad/cmds.py:262
6093.2.1 by Jonathan Riddell
add .pot file to archive
7578
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7579
msgstr ""
7580
7185.1.1 by Jelmer Vernooij
Update pot file.
7581
#: breezy/plugins/launchpad/cmds.py:264
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7582
msgid "  brz lp-find-proposal -r mainline:annotate:README:1"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7583
msgstr ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
7584
7185.1.1 by Jelmer Vernooij
Update pot file.
7585
#: breezy/plugins/launchpad/cmds.py:281
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7586
msgid "No review found."
7587
msgstr ""
7588
7185.1.1 by Jelmer Vernooij
Update pot file.
7589
#: breezy/plugins/launchpad/cmds.py:282
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7590
#, python-format
7591
msgid "%d proposals(s) found."
7592
msgstr ""
7593
7185.1.1 by Jelmer Vernooij
Update pot file.
7594
#: breezy/plugins/launchpad/cmds.py:291
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7595
msgid "Finding proposals"
7596
msgstr ""
7597
7185.1.1 by Jelmer Vernooij
Update pot file.
7598
#: breezy/plugins/launchpad/lp_api.py:240
7599
#: breezy/plugins/launchpad/lp_api.py:245
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7600
#, python-format
7601
msgid "%s is not registered on Launchpad"
7602
msgstr ""
7603
7185.1.1 by Jelmer Vernooij
Update pot file.
7604
#: breezy/plugins/launchpad/lp_api.py:255
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7605
#, python-format
7606
msgid "%s has no development focus."
7607
msgstr ""
7608
7185.1.1 by Jelmer Vernooij
Update pot file.
7609
#: breezy/plugins/launchpad/lp_api.py:260
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7610
#, python-format
7611
msgid "development focus %s has no branch."
7612
msgstr ""
7613
7185.1.1 by Jelmer Vernooij
Update pot file.
7614
#: breezy/plugins/launchpad/lp_api.py:265
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7615
#, python-format
7616
msgid "source package %s has no branch."
7617
msgstr ""
7618
7185.1.1 by Jelmer Vernooij
Update pot file.
7619
#: breezy/plugins/launchpad/lp_api.py:269
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7620
#, python-format
7621
msgid "%s has no associated product or source package."
7622
msgstr ""
7623
7185.1.1 by Jelmer Vernooij
Update pot file.
7624
#: breezy/plugins/launchpad/lp_api.py:280
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7625
#, python-format
7626
msgid "%s is already up-to-date."
7627
msgstr ""
7628
7185.1.1 by Jelmer Vernooij
Update pot file.
7629
#: breezy/plugins/launchpad/lp_api.py:287
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7630
#, python-format
7631
msgid "Pushing to %s"
7632
msgstr ""
7633
7185.1.1 by Jelmer Vernooij
Update pot file.
7634
#: breezy/plugins/launchpad/lp_directory.py:165
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7635
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7636
msgid ""
7637
"resolution for {0}\n"
7638
"  local: {1}\n"
7639
" remote: {2}"
7640
msgstr ""
7641
7185.1.1 by Jelmer Vernooij
Update pot file.
7642
#: breezy/plugins/launchpad/lp_propose.py:152
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
7185.1.1 by Jelmer Vernooij
Update pot file.
7647
#: breezy/plugins/stats/cmds.py:236
7648
msgid "Generate statistics for LOCATION."
7649
msgstr ""
7650
7651
# help of 'show-class' option of 'committer-statistics' command
7652
#: breezy/plugins/stats/cmds.py:241
7653
msgid "Show the class of contributions."
7654
msgstr ""
7655
7656
#: breezy/plugins/stats/cmds.py:276
7657
msgid "Figure out the ancestor graph for LOCATION"
7658
msgstr ""
7659
7660
#: breezy/plugins/stats/cmds.py:379
7661
msgid "Determine credits for LOCATION."
7662
msgstr ""
7663
7664
#: breezy/plugins/upload/cmds.py:468
7665
msgid "Upload a working tree, as a whole or incrementally."
7666
msgstr ""
7667
7668
#: breezy/plugins/upload/cmds.py:470
7669
msgid ""
7670
"If no destination is specified use the last one used.\n"
7671
"If no revision is specified upload the changes since the last upload."
7672
msgstr ""
7673
7674
#: breezy/plugins/upload/cmds.py:473
7675
msgid "Changes include files added, renamed, modified or removed."
7676
msgstr ""
7677
7678
# help of 'full' option of 'upload' command
7679
#: breezy/plugins/upload/cmds.py:481
7680
msgid "Upload the full working tree."
7681
msgstr ""
7682
7683
# help of 'quiet' option of 'upload' command
7684
#: breezy/plugins/upload/cmds.py:482
7685
msgid "Do not output what is being done."
7686
msgstr ""
7687
7688
# help of 'directory' option of 'upload' command
7689
#: breezy/plugins/upload/cmds.py:485
7690
msgid ""
7691
"Branch to upload from, rather than the one containing the working directory."
7692
msgstr ""
7693
7694
# help of 'auto' option of 'upload' command
7695
#: breezy/plugins/upload/cmds.py:491
7696
msgid "Trigger an upload from this branch whenever the tip revision changes."
7697
msgstr ""
7698
7699
#: breezy/plugins/weave_fmt/bzrdir.py:243
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7700
msgid "pb parameter to convert() is deprecated"
7701
msgstr ""
7702
7185.1.1 by Jelmer Vernooij
Update pot file.
7703
#: breezy/plugins/weave_fmt/bzrdir.py:245
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7704
msgid "starting upgrade from format 4 to 5"
7705
msgstr ""
7706
7185.1.1 by Jelmer Vernooij
Update pot file.
7707
#: breezy/plugins/weave_fmt/bzrdir.py:254
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7708
msgid "note: upgrade may be faster if all store files are ungzipped first"
7709
msgstr ""
7710
7185.1.1 by Jelmer Vernooij
Update pot file.
7711
#: breezy/plugins/weave_fmt/bzrdir.py:283
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7712
msgid "converting revision"
7713
msgstr ""
7714
7185.1.1 by Jelmer Vernooij
Update pot file.
7715
#: breezy/plugins/weave_fmt/bzrdir.py:288
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7716
msgid "upgraded to weaves:"
7717
msgstr ""
7718
7185.1.1 by Jelmer Vernooij
Update pot file.
7719
#: breezy/plugins/weave_fmt/bzrdir.py:289
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7720
#, python-format
7721
msgid "%6d revisions and inventories"
7722
msgstr ""
7723
7185.1.1 by Jelmer Vernooij
Update pot file.
7724
#: breezy/plugins/weave_fmt/bzrdir.py:291
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7725
#, python-format
7726
msgid "%6d revisions not present"
7727
msgstr ""
7728
7185.1.1 by Jelmer Vernooij
Update pot file.
7729
#: breezy/plugins/weave_fmt/bzrdir.py:293
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7730
#, python-format
7731
msgid "%6d texts"
7732
msgstr ""
7733
7185.1.1 by Jelmer Vernooij
Update pot file.
7734
#: breezy/plugins/weave_fmt/bzrdir.py:330
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7735
msgid "writing weave"
7736
msgstr ""
7737
7185.1.1 by Jelmer Vernooij
Update pot file.
7738
#: breezy/plugins/weave_fmt/bzrdir.py:334
7739
#: breezy/plugins/weave_fmt/bzrdir.py:336
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7740
msgid "inventory"
7741
msgstr ""
7742
7185.1.1 by Jelmer Vernooij
Update pot file.
7743
#: breezy/plugins/weave_fmt/bzrdir.py:353
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7744
msgid "write revision"
7745
msgstr ""
7746
7185.1.1 by Jelmer Vernooij
Update pot file.
7747
#: breezy/plugins/weave_fmt/bzrdir.py:367
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7748
msgid "loading revision"
7749
msgstr ""
7750
7185.1.1 by Jelmer Vernooij
Update pot file.
7751
#: breezy/plugins/weave_fmt/bzrdir.py:372
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7752
#, python-format
7753
msgid "revision {%s} not present in branch; will be converted as a ghost"
7754
msgstr ""
7755
7185.1.1 by Jelmer Vernooij
Update pot file.
7756
#: breezy/plugins/weave_fmt/bzrdir.py:511
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7757
msgid "starting upgrade from format 5 to 6"
7758
msgstr ""
7759
7185.1.1 by Jelmer Vernooij
Update pot file.
7760
#: breezy/plugins/weave_fmt/bzrdir.py:519
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7761
#, python-format
7762
msgid "adding prefixes to %s"
7763
msgstr ""
7764
7185.1.1 by Jelmer Vernooij
Update pot file.
7765
#: breezy/plugins/weave_fmt/bzrdir.py:561
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7766
msgid "starting upgrade from format 6 to metadir"
7767
msgstr ""
7768
7185.1.1 by Jelmer Vernooij
Update pot file.
7769
#: breezy/plugins/weave_fmt/bzrdir.py:569
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7770
msgid "Removing ancestry.weave"
7771
msgstr ""
7772
7185.1.1 by Jelmer Vernooij
Update pot file.
7773
#: breezy/plugins/weave_fmt/bzrdir.py:574
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7774
msgid "Finding branch files"
7775
msgstr ""
7776
7185.1.1 by Jelmer Vernooij
Update pot file.
7777
#: breezy/plugins/weave_fmt/bzrdir.py:584
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7778
msgid "Upgrading repository"
7779
msgstr ""
7780
7185.1.1 by Jelmer Vernooij
Update pot file.
7781
#: breezy/plugins/weave_fmt/bzrdir.py:594
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7782
msgid "Upgrading branch"
7783
msgstr ""
7784
7185.1.1 by Jelmer Vernooij
Update pot file.
7785
#: breezy/plugins/weave_fmt/bzrdir.py:617
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7786
msgid "No working tree."
7787
msgstr ""
7788
7185.1.1 by Jelmer Vernooij
Update pot file.
7789
#: breezy/plugins/weave_fmt/bzrdir.py:624
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7790
msgid "Upgrading working tree"
7791
msgstr ""
7792
7185.1.1 by Jelmer Vernooij
Update pot file.
7793
#: breezy/plugins/weave_fmt/bzrdir.py:644
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7794
#, python-format
7795
msgid "Make %s lock"
7796
msgstr ""
7797
7185.1.1 by Jelmer Vernooij
Update pot file.
7798
#: breezy/plugins/weave_fmt/bzrdir.py:655
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7799
#, python-format
7800
msgid "Moving %s"
7801
msgstr ""
7802
7185.1.1 by Jelmer Vernooij
Update pot file.
7803
#: breezy/push.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
7804
#, python-format
7805
msgid ""
7806
"Target directory %s already contains a .bzr directory, but it is not valid."
7807
msgstr ""
7808
7185.1.1 by Jelmer Vernooij
Update pot file.
7809
#: breezy/push.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
7810
#, python-format
7811
msgid ""
7812
"Target directory %s already exists, but does not have a .bzr directory. "
7813
"Supply --use-existing-dir to push there anyway."
7814
msgstr ""
7815
7185.1.1 by Jelmer Vernooij
Update pot file.
7816
#: breezy/push.py:124
6138.4.4 by Jonathan Riddell
update bzr.pot
7817
#, python-format
7818
msgid "Too many redirections trying to make %s."
7819
msgstr ""
7820
7185.1.1 by Jelmer Vernooij
Update pot file.
7821
#: breezy/push.py:150
6138.4.4 by Jonathan Riddell
update bzr.pot
7822
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7823
"These branches have diverged.  See \"brz help diverged-branches\" for more "
6138.4.4 by Jonathan Riddell
update bzr.pot
7824
"information."
7825
msgstr ""
7826
7185.1.1 by Jelmer Vernooij
Update pot file.
7827
#: breezy/push.py:155
6138.4.4 by Jonathan Riddell
update bzr.pot
7828
#, python-format
7829
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
7830
"It is not possible to losslessly push to %s. You may want to use --lossy."
6138.4.4 by Jonathan Riddell
update bzr.pot
7831
msgstr ""
7832
7185.1.1 by Jelmer Vernooij
Update pot file.
7833
#: breezy/push.py:161
6138.4.4 by Jonathan Riddell
update bzr.pot
7834
#, python-format
7835
msgid ""
7836
"At %s you have a valid .bzr control directory, but not a branch or "
7837
"repository. This is an unsupported configuration. Please move the target "
7838
"directory out of the way and try again."
7839
msgstr ""
7840
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7841
#: breezy/reconcile.py:97
6138.4.4 by Jonathan Riddell
update bzr.pot
7842
#, python-format
7843
msgid "Reconciling branch %s"
7844
msgstr ""
7845
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7846
#: breezy/reconcile.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
7847
#, python-format
7848
msgid "Reconciling repository %s"
7849
msgstr ""
7850
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7851
#: breezy/reconcile.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
7852
msgid "Reconciling repository"
7853
msgstr ""
7854
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7855
#: breezy/reconcile.py:111
6138.4.4 by Jonathan Riddell
update bzr.pot
7856
#, python-format
7857
msgid "%s cannot canonicalize CHKs."
7858
msgstr ""
7859
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7860
#: breezy/reconcile.py:119
6138.4.4 by Jonathan Riddell
update bzr.pot
7861
msgid "Reconcile aborted: revision index has inconsistent parents."
7862
msgstr ""
7863
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7864
#: breezy/reconcile.py:121
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7865
msgid "Run \"brz check\" for more details."
6138.4.4 by Jonathan Riddell
update bzr.pot
7866
msgstr ""
7867
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7868
#: breezy/reconcile.py:123
6138.4.4 by Jonathan Riddell
update bzr.pot
7869
msgid "Reconciliation complete."
7870
msgstr ""
7871
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7872
#: breezy/reconcile.py:166
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7873
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
7874
msgid "Fixing last revision info {0}  => {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
7875
msgstr ""
7876
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7877
#: breezy/reconcile.py:173
6138.4.4 by Jonathan Riddell
update bzr.pot
7878
msgid "revision_history ok."
7879
msgstr ""
7880
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7881
#: breezy/reconcile.py:234
6138.4.4 by Jonathan Riddell
update bzr.pot
7882
msgid "Reading inventory data"
7883
msgstr ""
7884
7185.1.1 by Jelmer Vernooij
Update pot file.
7885
#: breezy/reconcile.py:254 breezy/reconcile.py:385
6138.4.4 by Jonathan Riddell
update bzr.pot
7886
msgid "Inventory ok."
7887
msgstr ""
7888
7185.1.1 by Jelmer Vernooij
Update pot file.
7889
#: breezy/reconcile.py:256 breezy/reconcile.py:387
6138.4.4 by Jonathan Riddell
update bzr.pot
7890
msgid "Backing up inventory"
7891
msgstr ""
7892
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7893
#: breezy/reconcile.py:258
6138.4.4 by Jonathan Riddell
update bzr.pot
7894
msgid "Backup inventory created."
7895
msgstr ""
7896
7185.1.1 by Jelmer Vernooij
Update pot file.
7897
#: breezy/reconcile.py:274 breezy/reconcile.py:406
6138.4.4 by Jonathan Riddell
update bzr.pot
7898
msgid "Writing weave"
7899
msgstr ""
7900
7185.1.1 by Jelmer Vernooij
Update pot file.
7901
#: breezy/reconcile.py:277 breezy/reconcile.py:409
6138.4.4 by Jonathan Riddell
update bzr.pot
7902
msgid "Inventory regenerated."
7903
msgstr ""
7904
7185.1.1 by Jelmer Vernooij
Update pot file.
7905
#: breezy/reconcile.py:372 breezy/reconcile.py:374 breezy/reconcile.py:377
6138.4.4 by Jonathan Riddell
update bzr.pot
7906
msgid "Reading indexes"
7907
msgstr ""
7908
7185.1.1 by Jelmer Vernooij
Update pot file.
7909
#: breezy/reconcile.py:381 breezy/reconcile.py:383
6138.4.4 by Jonathan Riddell
update bzr.pot
7910
msgid "Checking unused inventories"
7911
msgstr ""
7912
7185.1.1 by Jelmer Vernooij
Update pot file.
7913
#: breezy/reconcile.py:389
6138.4.4 by Jonathan Riddell
update bzr.pot
7914
msgid "Backup Inventory created"
7915
msgstr ""
7916
7185.1.1 by Jelmer Vernooij
Update pot file.
7917
#: breezy/reconcile.py:447
6138.4.4 by Jonathan Riddell
update bzr.pot
7918
msgid "Fixing text parents"
7919
msgstr ""
7920
7185.1.1 by Jelmer Vernooij
Update pot file.
7921
#: breezy/reconfigure.py:127
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7922
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
7923
msgid "{0} is now stacked on {1}\n"
7924
msgstr ""
7925
7185.1.1 by Jelmer Vernooij
Update pot file.
7926
#: breezy/reconfigure.py:142
6138.4.4 by Jonathan Riddell
update bzr.pot
7927
#, python-format
7928
msgid "%s is now not stacked\n"
7929
msgstr ""
7930
7185.1.1 by Jelmer Vernooij
Update pot file.
7931
#: breezy/rename_map.py:73
6138.4.4 by Jonathan Riddell
update bzr.pot
7932
msgid "Calculating hashes"
7933
msgstr ""
7934
7185.1.1 by Jelmer Vernooij
Update pot file.
7935
#: breezy/rename_map.py:108
6138.4.4 by Jonathan Riddell
update bzr.pot
7936
msgid "Determining hash hits"
7937
msgstr ""
7938
7185.1.1 by Jelmer Vernooij
Update pot file.
7939
#: breezy/rename_map.py:235
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7940
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
7941
msgid "{0} => {1}"
7942
msgstr ""
7943
7185.1.1 by Jelmer Vernooij
Update pot file.
7944
#: breezy/repository.py:287
7945
#, python-format
7946
msgid "brz: ERROR (ignored): %s"
7947
msgstr ""
7948
7949
#: breezy/repository.py:1595
6138.4.4 by Jonathan Riddell
update bzr.pot
7950
msgid "Moving repository to repository.backup"
7951
msgstr ""
7952
7185.1.1 by Jelmer Vernooij
Update pot file.
7953
#: breezy/repository.py:1603
6138.4.4 by Jonathan Riddell
update bzr.pot
7954
msgid "Creating new repository"
7955
msgstr ""
7956
7185.1.1 by Jelmer Vernooij
Update pot file.
7957
#: breezy/repository.py:1608
6138.4.4 by Jonathan Riddell
update bzr.pot
7958
msgid "Copying content"
7959
msgstr ""
7960
7185.1.1 by Jelmer Vernooij
Update pot file.
7961
#: breezy/repository.py:1612
6138.4.4 by Jonathan Riddell
update bzr.pot
7962
msgid "Deleting old repository content"
7963
msgstr ""
7964
7185.1.1 by Jelmer Vernooij
Update pot file.
7965
#: breezy/repository.py:1614
6138.4.4 by Jonathan Riddell
update bzr.pot
7966
msgid "repository converted"
7967
msgstr ""
7968
7185.1.1 by Jelmer Vernooij
Update pot file.
7969
#: breezy/revisionspec.py:861
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7970
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
7971
msgid "Using {0} {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
7972
msgstr ""
7973
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7974
#: breezy/send.py:59
6138.4.4 by Jonathan Riddell
update bzr.pot
7975
#, python-format
7976
msgid "Mail client \"%s\" does not support specifying body"
7977
msgstr ""
7978
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7979
#: breezy/send.py:63
6138.4.4 by Jonathan Riddell
update bzr.pot
7980
msgid "--remember requires a branch to be specified."
7981
msgstr ""
7982
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7983
#: breezy/send.py:78
6138.4.4 by Jonathan Riddell
update bzr.pot
7984
msgid "No submit branch known or specified"
7985
msgstr ""
7986
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7987
#: breezy/send.py:81
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7988
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
7989
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6138.4.4 by Jonathan Riddell
update bzr.pot
7990
msgstr ""
7991
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7992
#: breezy/send.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
7993
#, python-format
7994
msgid "No such send format '%s'."
7995
msgstr ""
7996
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7997
#: breezy/send.py:115
6138.4.4 by Jonathan Riddell
update bzr.pot
7998
msgid "bzr send takes at most two one revision identifiers"
7999
msgstr ""
8000
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8001
#: breezy/send.py:128
6138.4.4 by Jonathan Riddell
update bzr.pot
8002
msgid "No revisions to submit."
8003
msgstr ""
8004
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8005
#: breezy/send.py:140
6138.4.4 by Jonathan Riddell
update bzr.pot
8006
msgid ""
8007
"- not supported for merge directives that use more than one output file."
8008
msgstr ""
8009
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8010
#: breezy/send.py:186
6138.4.4 by Jonathan Riddell
update bzr.pot
8011
msgid "Format 0.9 does not permit bundle with no patch"
8012
msgstr ""
8013
7185.1.1 by Jelmer Vernooij
Update pot file.
8014
#: breezy/shelf_ui.py:48
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8015
#, python-format
8016
msgid "Shelve adding file \"%(path)s\"?"
8017
msgstr ""
8018
7185.1.1 by Jelmer Vernooij
Update pot file.
8019
#: breezy/shelf_ui.py:49
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8020
msgid "Shelve binary changes?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8021
msgstr ""
8022
7185.1.1 by Jelmer Vernooij
Update pot file.
8023
#: breezy/shelf_ui.py:50
6143.1.7 by Jonathan Riddell
update bzr.pot
8024
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
8025
msgstr ""
8026
7185.1.1 by Jelmer Vernooij
Update pot file.
8027
#: breezy/shelf_ui.py:52
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8028
#, python-format
8029
msgid "Shelve removing file \"%(path)s\"?"
8030
msgstr ""
8031
7185.1.1 by Jelmer Vernooij
Update pot file.
8032
#: breezy/shelf_ui.py:53
6143.1.7 by Jonathan Riddell
update bzr.pot
8033
#, python-format
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8034
msgid "Shelve %d change(s)?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8035
msgstr ""
8036
7185.1.1 by Jelmer Vernooij
Update pot file.
8037
#: breezy/shelf_ui.py:54
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8038
msgid "Shelve?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8039
msgstr ""
8040
7185.1.1 by Jelmer Vernooij
Update pot file.
8041
#: breezy/shelf_ui.py:55
6143.1.7 by Jonathan Riddell
update bzr.pot
8042
#, python-format
8043
msgid ""
8044
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8045
msgstr ""
8046
7185.1.1 by Jelmer Vernooij
Update pot file.
8047
#: breezy/shelf_ui.py:57
6143.1.7 by Jonathan Riddell
update bzr.pot
8048
#, python-format
8049
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
8050
msgstr ""
8051
7185.1.1 by Jelmer Vernooij
Update pot file.
8052
#: breezy/shelf_ui.py:72
6138.4.4 by Jonathan Riddell
update bzr.pot
8053
#, python-format
8054
msgid "Changes shelved with id \"%d\"."
8055
msgstr ""
8056
7185.1.1 by Jelmer Vernooij
Update pot file.
8057
#: breezy/shelf_ui.py:76
6138.4.4 by Jonathan Riddell
update bzr.pot
8058
msgid "Selected changes destroyed."
8059
msgstr ""
8060
7185.1.1 by Jelmer Vernooij
Update pot file.
8061
#: breezy/shelf_ui.py:80
6138.4.4 by Jonathan Riddell
update bzr.pot
8062
msgid "Selected changes:"
8063
msgstr ""
8064
7185.1.1 by Jelmer Vernooij
Update pot file.
8065
#: breezy/shelf_ui.py:100
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8066
#, python-format
8067
msgid "Delete file \"%(path)s\"?"
8068
msgstr ""
8069
7185.1.1 by Jelmer Vernooij
Update pot file.
8070
#: breezy/shelf_ui.py:101
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8071
msgid "Apply binary changes?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8072
msgstr ""
8073
7185.1.1 by Jelmer Vernooij
Update pot file.
8074
#: breezy/shelf_ui.py:102
6143.1.7 by Jonathan Riddell
update bzr.pot
8075
#, python-format
8076
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
8077
msgstr ""
8078
7185.1.1 by Jelmer Vernooij
Update pot file.
8079
#: breezy/shelf_ui.py:104
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8080
#, python-format
8081
msgid "Add file \"%(path)s\"?"
8082
msgstr ""
8083
7185.1.1 by Jelmer Vernooij
Update pot file.
8084
#: breezy/shelf_ui.py:105
6143.1.7 by Jonathan Riddell
update bzr.pot
8085
#, python-format
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8086
msgid "Apply %d change(s)?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8087
msgstr ""
8088
7185.1.1 by Jelmer Vernooij
Update pot file.
8089
#: breezy/shelf_ui.py:106
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8090
msgid "Apply change?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8091
msgstr ""
8092
7185.1.1 by Jelmer Vernooij
Update pot file.
8093
#: breezy/shelf_ui.py:107
6143.1.7 by Jonathan Riddell
update bzr.pot
8094
#, python-format
8095
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
8096
msgstr ""
8097
7185.1.1 by Jelmer Vernooij
Update pot file.
8098
#: breezy/shelf_ui.py:109
6143.1.7 by Jonathan Riddell
update bzr.pot
8099
#, python-format
8100
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
8101
msgstr ""
8102
7185.1.1 by Jelmer Vernooij
Update pot file.
8103
#: breezy/shelf_ui.py:410
6138.4.4 by Jonathan Riddell
update bzr.pot
8104
msgid "No changes are shelved."
8105
msgstr ""
8106
7185.1.1 by Jelmer Vernooij
Update pot file.
8107
#: breezy/shelf_ui.py:468
6138.4.4 by Jonathan Riddell
update bzr.pot
8108
#, python-format
8109
msgid "Using changes with id \"%d\"."
8110
msgstr ""
8111
7185.1.1 by Jelmer Vernooij
Update pot file.
8112
#: breezy/shelf_ui.py:473
6138.4.4 by Jonathan Riddell
update bzr.pot
8113
#, python-format
8114
msgid "Message: %s"
8115
msgstr ""
8116
7185.1.1 by Jelmer Vernooij
Update pot file.
8117
#: breezy/shelf_ui.py:485
6138.4.4 by Jonathan Riddell
update bzr.pot
8118
#, python-format
8119
msgid "Deleted changes with id \"%d\"."
8120
msgstr ""
8121
7185.1.1 by Jelmer Vernooij
Update pot file.
8122
#: breezy/switch.py:71
6138.4.4 by Jonathan Riddell
update bzr.pot
8123
msgid "Pending merges must be committed or reverted before using switch."
8124
msgstr ""
8125
7185.1.1 by Jelmer Vernooij
Update pot file.
8126
#: breezy/switch.py:104
8127
#, python-format
8128
msgid "Tree is up to date at revision %d."
8129
msgstr ""
8130
8131
#: breezy/switch.py:112
8132
#, python-format
8133
msgid "Updated to revision %d."
8134
msgstr ""
8135
8136
#: breezy/switch.py:143
6138.4.4 by Jonathan Riddell
update bzr.pot
8137
msgid ""
8138
"Cannot switch as local commits found in the checkout. Commit these to the "
8139
"bound branch or use --force to throw them away."
8140
msgstr ""
8141
7185.1.1 by Jelmer Vernooij
Update pot file.
8142
#: breezy/switch.py:148
6138.4.4 by Jonathan Riddell
update bzr.pot
8143
#, python-format
8144
msgid ""
8145
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8146
"anyway, use --force."
8147
msgstr ""
8148
7185.1.1 by Jelmer Vernooij
Update pot file.
8149
#: breezy/switch.py:172
6138.4.4 by Jonathan Riddell
update bzr.pot
8150
msgid "Cannot switch a branch, only a checkout."
8151
msgstr ""
8152
7185.1.1 by Jelmer Vernooij
Update pot file.
8153
#: breezy/transform.py:1741 breezy/transform.py:1752 breezy/transform.py:1754
6138.4.4 by Jonathan Riddell
update bzr.pot
8154
msgid "Apply phase"
8155
msgstr ""
8156
7185.1.1 by Jelmer Vernooij
Update pot file.
8157
#: breezy/transform.py:1777 breezy/transform.py:1841
6138.4.4 by Jonathan Riddell
update bzr.pot
8158
msgid "removing file"
8159
msgstr ""
8160
7185.1.1 by Jelmer Vernooij
Update pot file.
8161
#: breezy/transform.py:1792 breezy/transform.py:1871
6138.4.4 by Jonathan Riddell
update bzr.pot
8162
msgid "adding file"
8163
msgstr ""
8164
7185.1.1 by Jelmer Vernooij
Update pot file.
8165
#: breezy/transform.py:2614
6138.4.4 by Jonathan Riddell
update bzr.pot
8166
msgid "Building tree"
8167
msgstr ""
8168
7185.1.1 by Jelmer Vernooij
Update pot file.
8169
#: breezy/transform.py:2707 breezy/transform.py:2728
6138.4.4 by Jonathan Riddell
update bzr.pot
8170
msgid "Adding file contents"
8171
msgstr ""
8172
7185.1.1 by Jelmer Vernooij
Update pot file.
8173
#: breezy/transform.py:3029
6138.4.4 by Jonathan Riddell
update bzr.pot
8174
msgid "Resolution pass"
8175
msgstr ""
8176
7185.1.1 by Jelmer Vernooij
Update pot file.
8177
#: breezy/tree.py:587
6138.4.4 by Jonathan Riddell
update bzr.pot
8178
msgid "*** {0} content-filter: {1} => {2!r}"
8179
msgstr ""
8180
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8181
#: breezy/upgrade.py:77
6138.4.4 by Jonathan Riddell
update bzr.pot
8182
#, python-format
8183
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
8184
msgstr ""
8185
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8186
#: breezy/upgrade.py:100
6138.4.4 by Jonathan Riddell
update bzr.pot
8187
#, python-format
8188
msgid "cannot upgrade from bzrdir format %s"
8189
msgstr ""
8190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8191
#: breezy/upgrade.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
8192
#, python-format
8193
msgid "starting upgrade of %s"
8194
msgstr ""
8195
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8196
#: breezy/upgrade.py:110
6138.4.4 by Jonathan Riddell
update bzr.pot
8197
msgid "finished"
8198
msgstr ""
8199
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8200
#: breezy/upgrade.py:120
6138.4.4 by Jonathan Riddell
update bzr.pot
8201
msgid "Deleting backup.bzr"
8202
msgstr ""
8203
7185.1.1 by Jelmer Vernooij
Update pot file.
8204
#: breezy/upgrade.py:148
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8205
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8206
msgid ""
8207
"\n"
8208
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
8209
msgstr ""
8210
7185.1.1 by Jelmer Vernooij
Update pot file.
8211
#: breezy/upgrade.py:205
6138.4.4 by Jonathan Riddell
update bzr.pot
8212
#, python-format
8213
msgid "Found %d dependent branches - upgrading ..."
8214
msgstr ""
8215
7185.1.1 by Jelmer Vernooij
Update pot file.
8216
#: breezy/upgrade.py:275
6138.4.4 by Jonathan Riddell
update bzr.pot
8217
msgid "Upgrading bzrdirs"
8218
msgstr ""
8219
7185.1.1 by Jelmer Vernooij
Update pot file.
8220
#: breezy/upgrade.py:281
6138.4.4 by Jonathan Riddell
update bzr.pot
8221
#, python-format
8222
msgid "Upgrading %s"
8223
msgstr ""
8224
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8225
#: breezy/upgrade.py:283
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8226
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8227
msgid "Upgrading {0} {1} ..."
8228
msgstr ""
8229
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8230
#: breezy/upgrade.py:301
6138.4.4 by Jonathan Riddell
update bzr.pot
8231
msgid "Removing backup ..."
8232
msgstr ""
8233
7185.1.1 by Jelmer Vernooij
Update pot file.
8234
#: breezy/upgrade.py:306
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8235
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8236
msgid "failed to clean-up {0}: {1}"
8237
msgstr ""
8238
7185.1.1 by Jelmer Vernooij
Update pot file.
8239
#: breezy/win32utils.py:112
6138.4.4 by Jonathan Riddell
update bzr.pot
8240
msgid "Failed to GetProcessMemoryInfo()"
8241
msgstr ""
8242
7185.1.1 by Jelmer Vernooij
Update pot file.
8243
#: breezy/win32utils.py:133
6138.4.4 by Jonathan Riddell
update bzr.pot
8244
msgid "Cannot debug memory on win32 without ctypes or win32process"
8245
msgstr ""
8246
7185.1.1 by Jelmer Vernooij
Update pot file.
8247
#: breezy/win32utils.py:138
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8248
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
8249
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6138.4.4 by Jonathan Riddell
update bzr.pot
8250
msgstr ""
8251
7185.1.1 by Jelmer Vernooij
Update pot file.
8252
#: breezy/win32utils.py:146
6138.4.4 by Jonathan Riddell
update bzr.pot
8253
#, python-format
8254
msgid "WorkingSize       %8d KiB"
8255
msgstr ""
8256
7185.1.1 by Jelmer Vernooij
Update pot file.
8257
#: breezy/win32utils.py:148
6138.4.4 by Jonathan Riddell
update bzr.pot
8258
#, python-format
8259
msgid "PeakWorking       %8d KiB"
8260
msgstr ""
8261
7185.1.1 by Jelmer Vernooij
Update pot file.
8262
#: breezy/win32utils.py:150
6138.4.4 by Jonathan Riddell
update bzr.pot
8263
#, python-format
8264
msgid "PagefileUsage     %8d KiB"
8265
msgstr ""
8266
7185.1.1 by Jelmer Vernooij
Update pot file.
8267
#: breezy/win32utils.py:152
6138.4.4 by Jonathan Riddell
update bzr.pot
8268
#, python-format
8269
msgid "PeakPagefileUsage %8d KiB"
8270
msgstr ""
8271
7185.1.1 by Jelmer Vernooij
Update pot file.
8272
#: breezy/win32utils.py:154
6138.4.4 by Jonathan Riddell
update bzr.pot
8273
#, python-format
8274
msgid "PrivateUsage      %8d KiB"
8275
msgstr ""
8276
7185.1.1 by Jelmer Vernooij
Update pot file.
8277
#: breezy/win32utils.py:156
6138.4.4 by Jonathan Riddell
update bzr.pot
8278
#, python-format
8279
msgid "PageFaultCount    %8d"
8280
msgstr ""
8281
7185.1.1 by Jelmer Vernooij
Update pot file.
8282
#: breezy/workingtree.py:1201
6138.4.4 by Jonathan Riddell
update bzr.pot
8283
msgid "Rerun update after fixing the conflicts."
8284
msgstr ""
8285
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8286
#: dummy/help_topics/authentication/summary.txt:1
8287
msgid "Information on configuring authentication"
8288
msgstr ""
8289
8290
#: dummy/help_topics/basic/detail.txt:1
8291
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8292
"Breezy 3.0a2 -- a free distributed version-control tool\n"
8293
"https://www.breezy-vcs.org/"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8294
msgstr ""
8295
8296
#: dummy/help_topics/basic/detail.txt:4
8297
msgid ""
8298
"Basic commands:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8299
"  brz init           makes this directory a versioned branch\n"
8300
"  brz branch         make a copy of another branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8301
msgstr ""
8302
8303
#: dummy/help_topics/basic/detail.txt:8
8304
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8305
"  brz add            make files or directories versioned\n"
8306
"  brz ignore         ignore a file or pattern\n"
8307
"  brz mv             move or rename a versioned file"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8308
msgstr ""
8309
8310
#: dummy/help_topics/basic/detail.txt:12
8311
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8312
"  brz status         summarize changes in working copy\n"
8313
"  brz diff           show detailed diffs"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8314
msgstr ""
8315
8316
#: dummy/help_topics/basic/detail.txt:15
8317
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8318
"  brz merge          pull in changes from another branch\n"
8319
"  brz commit         save some or all changes\n"
8320
"  brz send           send changes via email"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8321
msgstr ""
8322
8323
#: dummy/help_topics/basic/detail.txt:19
8324
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8325
"  brz log            show history of changes\n"
8326
"  brz check          validate storage"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8327
msgstr ""
8328
8329
#: dummy/help_topics/basic/detail.txt:22
8330
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8331
"  brz help init      more help on e.g. init command\n"
8332
"  brz help commands  list all commands\n"
8333
"  brz help topics    list all help topics\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8334
msgstr ""
8335
8336
#: dummy/help_topics/basic/summary.txt:1
8337
msgid "Basic commands"
8338
msgstr ""
8339
8340
#: dummy/help_topics/branches/detail.txt:1
8341
msgid "Branches"
8342
msgstr ""
8343
8344
#: dummy/help_topics/branches/detail.txt:3
8345
msgid ""
8346
"A branch consists of the state of a project, including all of its\n"
8347
"history. All branches have a repository associated (which is where the\n"
8348
"branch history is stored), but multiple branches may share the same\n"
8349
"repository (a shared repository). Branches can be copied and merged."
8350
msgstr ""
8351
8352
#: dummy/help_topics/branches/detail.txt:8
8353
msgid ""
8354
"In addition, one branch may be bound to another one.  Binding to another\n"
8355
"branch indicates that commits which happen in this branch must also \n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8356
"happen in the other branch.  Breezy ensures consistency by not allowing \n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8357
"commits when the two branches are out of date.  In order for a commit \n"
8358
"to succeed, it may be necessary to update the current branch using \n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8359
"``brz update``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8360
msgstr ""
8361
8362
#: dummy/help_topics/branches/detail.txt:15
6437.2.2 by Vincent Ladeuil
Release 2.5b5
8363
#: dummy/help_topics/checkouts/detail.txt:66
8364
#: dummy/help_topics/repositories/detail.txt:36
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8365
msgid "Related commands::"
8366
msgstr ""
8367
8368
#: dummy/help_topics/branches/detail.txt:17
8369
msgid ""
8370
"  init    Change a directory into a versioned branch.\n"
8371
"  branch  Create a new branch that is a copy of an existing branch.\n"
8372
"  merge   Perform a three-way merge.\n"
8373
"  bind    Bind a branch to another one.\n"
8374
msgstr ""
8375
8376
#: dummy/help_topics/branches/summary.txt:1
8377
msgid "Information on what a branch is"
8378
msgstr ""
8379
8380
#: dummy/help_topics/bugs/summary.txt:1
8381
msgid "Bug tracker settings"
8382
msgstr ""
8383
8384
#: dummy/help_topics/checkouts/detail.txt:1
8385
msgid "Checkouts"
8386
msgstr ""
8387
8388
#: dummy/help_topics/checkouts/detail.txt:3
8389
msgid ""
8390
"Checkouts are source trees that are connected to a branch, so that when\n"
8391
"you commit in the source tree, the commit goes into that branch.  They\n"
8392
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8393
"Breezy's decentralized features until you want them. Using checkouts\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8394
"with shared repositories is very similar to working with SVN or CVS, but\n"
8395
"doesn't have the same restrictions.  And using checkouts still allows\n"
8396
"others working on the project to use whatever workflow they like."
8397
msgstr ""
8398
8399
#: dummy/help_topics/checkouts/detail.txt:11
8400
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8401
"A checkout is created with the brz checkout command (see \"help checkout"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8402
"\").\n"
8403
"You pass it a reference to another branch, and it will create a local copy\n"
8404
"for you that still contains a reference to the branch you created the\n"
8405
"checkout from (the master branch). Then if you make any commits they will "
8406
"be\n"
8407
"made on the other branch first. This creates an instant mirror of your work, "
8408
"or\n"
8409
"facilitates lockstep development, where each developer is working together,\n"
8410
"continuously integrating the changes of others."
8411
msgstr ""
8412
8413
#: dummy/help_topics/checkouts/detail.txt:19
8414
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8415
"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
8416
"you have the full history locally.  As you have a first class branch you "
8417
"can\n"
8418
"also commit locally if you want, for instance due to the temporary loss af "
8419
"a\n"
8420
"network connection. Use the --local option to commit to do this. All the "
8421
"local\n"
8422
"commits will then be made on the master branch the next time you do a non-"
8423
"local\n"
8424
"commit."
8425
msgstr ""
8426
8427
#: dummy/help_topics/checkouts/detail.txt:26
8428
msgid ""
8429
"If you are using a checkout from a shared branch you will periodically want "
8430
"to\n"
8431
"pull in all the changes made by others. This is done using the \"update\"\n"
8432
"command. The changes need to be applied before any non-local commit, but\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8433
"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
8434
"command when needed."
8435
msgstr ""
8436
8437
#: dummy/help_topics/checkouts/detail.txt:32
8438
msgid ""
8439
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8440
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8441
"SVN checkout in that it is not a first class branch, it mainly consists of "
8442
"the\n"
8443
"working tree. This means that any history operations must query the master\n"
8444
"branch, which could be slow if a network connection is involved. Also, as "
8445
"you\n"
8446
"don't have a local branch, then you cannot commit locally."
8447
msgstr ""
8448
8449
#: dummy/help_topics/checkouts/detail.txt:39
8450
msgid ""
8451
"Lightweight checkouts work best when you have fast reliable access to the\n"
8452
"master branch. This means that if the master branch is on the same disk or "
8453
"LAN\n"
8454
"a lightweight checkout will be faster than a heavyweight one for any "
8455
"commands\n"
8456
"that modify the revision history (as only one copy of the branch needs to\n"
8457
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8458
"that uses the history but does not change it, but if the master branch is "
8459
"on\n"
8460
"the same disk then there won't be a noticeable difference."
8461
msgstr ""
8462
8463
#: dummy/help_topics/checkouts/detail.txt:47
8464
msgid ""
8465
"Another possible use for a checkout is to use it with a treeless repository\n"
8466
"containing your branches, where you maintain only one working tree by\n"
8467
"switching the master branch that the checkout points to when you want to\n"
8468
"work on a different branch."
8469
msgstr ""
8470
8471
#: dummy/help_topics/checkouts/detail.txt:52
8472
msgid ""
8473
"Obviously to commit on a checkout you need to be able to write to the "
8474
"master\n"
8475
"branch. This means that the master branch must be accessible over a "
8476
"writeable\n"
8477
"protocol , such as sftp://, and that you have write permissions at the "
8478
"other\n"
8479
"end. Checkouts also work on the local file system, so that all that matters "
8480
"is\n"
8481
"file permissions."
8482
msgstr ""
8483
8484
#: dummy/help_topics/checkouts/detail.txt:58
8485
msgid ""
8486
"You can change the master of a checkout by using the \"switch\" command "
8487
"(see\n"
8488
"\"help switch\").  This will change the location that the commits are sent "
8489
"to.\n"
8490
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8491
"checkout. If you would like to convert your heavy checkout into a normal\n"
8492
"branch so that every commit is local, you can use the \"unbind\" command. To "
8493
"see\n"
8494
"whether or not a branch is bound or not you can use the \"info\" command. If "
8495
"the\n"
8496
"branch is bound it will tell you the location of the bound branch."
8497
msgstr ""
8498
8499
#: dummy/help_topics/checkouts/detail.txt:68
8500
msgid ""
8501
"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
8502
"              checkout\n"
8503
"  update      Pull any changes in the master branch in to your checkout\n"
8504
"  commit      Make a commit that is sent to the master branch. If you have\n"
8505
"              a heavy checkout then the --local option will commit to the\n"
8506
"              checkout without sending the commit to the master\n"
8507
"  switch      Change the master branch that the commits in the checkout "
8508
"will\n"
8509
"              be sent to\n"
8510
"  bind        Turn a standalone branch into a heavy checkout so that any\n"
8511
"              commits will be sent to the master branch\n"
8512
"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
8513
"              commits are only made locally\n"
8514
"  info        Displays whether a branch is bound or unbound. If the branch "
8515
"is\n"
8516
"              bound, then it will also display the location of the bound "
8517
"branch\n"
8518
msgstr ""
8519
8520
#: dummy/help_topics/checkouts/summary.txt:1
8521
msgid "Information on what a checkout is"
8522
msgstr ""
8523
8524
#: dummy/help_topics/configuration/summary.txt:1
8525
msgid "Details on the configuration settings available"
8526
msgstr ""
8527
8528
#: dummy/help_topics/conflict-types/summary.txt:1
8529
msgid "Types of conflicts and what to do about them"
8530
msgstr ""
8531
8532
#: dummy/help_topics/content-filters/summary.txt:1
8533
msgid "Conversion of content into/from working trees"
8534
msgstr ""
8535
8536
#: dummy/help_topics/criss-cross/detail.txt:1
8537
msgid "Criss-Cross"
8538
msgstr ""
8539
8540
#: dummy/help_topics/criss-cross/detail.txt:3
8541
msgid ""
8542
"A criss-cross in the branch history can cause the default merge technique\n"
8543
"to emit more conflicts than would normally be expected."
8544
msgstr ""
8545
8546
#: dummy/help_topics/criss-cross/detail.txt:6
8547
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8548
"In complex merge cases, ``brz merge --lca`` or ``brz merge --weave`` may "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8549
"give\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8550
"better results.  You may wish to ``brz revert`` the working tree and merge\n"
8551
"again.  Alternatively, use ``brz remerge`` on particular conflicted files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8552
msgstr ""
8553
8554
#: dummy/help_topics/criss-cross/detail.txt:10
8555
msgid ""
8556
"Criss-crosses occur in a branch's history if two branches merge the same "
8557
"thing\n"
8558
"and then merge one another, or if two branches merge one another at the "
8559
"same\n"
8560
"time.  They can be avoided by having each branch only merge from or into a\n"
8561
"designated central branch (a \"star topology\")."
8562
msgstr ""
8563
8564
#: dummy/help_topics/criss-cross/detail.txt:15
8565
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8566
"Criss-crosses cause problems because of the way merge works.  Breezy's "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8567
"default\n"
8568
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8569
"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
8570
"differences between THIS and OTHER are due to one side adding lines, or\n"
8571
"from another side removing lines."
8572
msgstr ""
8573
8574
#: dummy/help_topics/criss-cross/detail.txt:21
8575
msgid ""
8576
"Criss-crosses mean there is no good choice for a base.  Selecting the "
8577
"recent\n"
8578
"merge points could cause one side's changes to be silently discarded.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8579
"Selecting older merge points (which Breezy does) mean that extra conflicts\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8580
"are emitted."
8581
msgstr ""
8582
8583
#: dummy/help_topics/criss-cross/detail.txt:26
8584
msgid ""
8585
"The ``weave`` merge type is not affected by this problem because it uses\n"
8586
"line-origin detection instead of a basis revision to determine the cause of\n"
8587
"differences.\n"
8588
msgstr ""
8589
8590
#: dummy/help_topics/criss-cross/summary.txt:1
8591
msgid "Information on criss-cross merging"
8592
msgstr ""
8593
8594
#: dummy/help_topics/current-formats/summary.txt:1
8595
msgid "Current storage formats"
8596
msgstr ""
8597
8598
#: dummy/help_topics/debug-flags/summary.txt:1
8599
msgid "Options to show or record debug information"
8600
msgstr ""
8601
8602
#: dummy/help_topics/diverged-branches/summary.txt:1
8603
msgid "How to fix diverged branches"
8604
msgstr ""
8605
8606
#: dummy/help_topics/env-variables/summary.txt:1
8607
msgid "Environment variable names and values"
8608
msgstr ""
8609
8610
#: dummy/help_topics/eol/summary.txt:1
8611
msgid "Information on end-of-line handling"
8612
msgstr ""
8613
8614
#: dummy/help_topics/files/detail.txt:1
8615
msgid "Files"
8616
msgstr ""
8617
8618
#: dummy/help_topics/files/detail.txt:3
8619
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8620
":On Unix:   ~/.config/breezy/breezy.conf\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8621
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
7185.1.1 by Jelmer Vernooij
Update pot file.
8622
"\\Breezy\\\\2.0\\\\breezy.conf"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8623
msgstr ""
8624
8625
#: dummy/help_topics/files/detail.txt:6
8626
msgid ""
8627
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8628
"used to define general configuration that will be applied everywhere.\n"
8629
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8630
"commonly used options."
8631
msgstr ""
8632
8633
#: dummy/help_topics/files/detail.txt:11
8634
msgid "A typical config file might look something like::"
8635
msgstr ""
8636
8637
#: dummy/help_topics/files/detail.txt:13
8638
msgid ""
8639
"  [DEFAULT]\n"
8640
"  email=John Doe <jdoe@isp.com>"
8641
msgstr ""
8642
8643
#: dummy/help_topics/files/detail.txt:16
8644
msgid ""
8645
"  [ALIASES]\n"
8646
"  commit = commit --strict\n"
8647
"  log10 = log --short -r -10..-1\n"
8648
msgstr ""
8649
8650
#: dummy/help_topics/files/summary.txt:1
8651
msgid "Information on configuration and log files"
8652
msgstr ""
8653
8654
#: dummy/help_topics/formats/detail.txt:1
8655
msgid "Storage Formats"
8656
msgstr ""
8657
8658
#: dummy/help_topics/formats/detail.txt:3
8659
msgid ""
8660
"To ensure that older clients do not access data incorrectly,\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8661
"Breezy's policy is to introduce a new storage format whenever\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8662
"new features requiring new metadata are added. New storage\n"
8663
"formats may also be introduced to improve performance and\n"
8664
"scalability."
8665
msgstr ""
8666
8667
#: dummy/help_topics/formats/detail.txt:9
8668
msgid ""
8669
"The newest format, 2a, is highly recommended. If your\n"
8670
"project is not using 2a, then you should suggest to the\n"
8671
"project owner to upgrade."
8672
msgstr ""
8673
8674
#: dummy/help_topics/formats/detail.txt:13
8675
msgid ""
8676
"\n"
8677
".. note::"
8678
msgstr ""
8679
8680
#: dummy/help_topics/formats/detail.txt:16
8681
msgid ""
8682
"   Some of the older formats have two variants:\n"
8683
"   a plain one and a rich-root one. The latter include an additional\n"
8684
"   field about the root of the tree. There is no performance cost\n"
8685
"   for using a rich-root format but you cannot easily merge changes\n"
8686
"   from a rich-root format into a plain format. As a consequence,\n"
8687
"   moving a project to a rich-root format takes some co-ordination\n"
8688
"   in that all contributors need to upgrade their repositories\n"
8689
"   around the same time. 2a and all future formats will be\n"
8690
"   implicitly rich-root."
8691
msgstr ""
8692
8693
#: dummy/help_topics/formats/detail.txt:26
8694
msgid ""
8695
"See :doc:`current-formats-help` for the complete list of\n"
8696
"currently supported formats. See :doc:`other-formats-help` for\n"
8697
"descriptions of any available experimental and deprecated formats.\n"
8698
msgstr ""
8699
8700
#: dummy/help_topics/formats/summary.txt:1
8701
msgid "Information on choosing a storage format"
8702
msgstr ""
8703
7185.1.1 by Jelmer Vernooij
Update pot file.
8704
#: dummy/help_topics/git/detail.txt:1
8705
msgid "Using Bazaar with Git."
8706
msgstr ""
8707
8708
#: dummy/help_topics/git/detail.txt:3
8709
msgid ""
8710
"The bzr-git plugin provides support for using Bazaar with local and remote\n"
8711
"Git repositories, as just another format. You can clone, pull from and\n"
8712
"push to git repositories as you would with any native Bazaar branch."
8713
msgstr ""
8714
8715
#: dummy/help_topics/git/detail.txt:7
8716
msgid "The bzr-git plugin also adds three new bzr subcommands:"
8717
msgstr ""
8718
8719
#: dummy/help_topics/git/detail.txt:9
8720
msgid ""
8721
" * bzr git-objects: Extracts Git objects out of a Bazaar repository\n"
8722
" * bzr git-refs: Display Git refs from a Bazaar branch or repository\n"
8723
" * bzr git-import: Imports a local or remote Git repository to a set of "
8724
"Bazaar\n"
8725
"                   branches"
8726
msgstr ""
8727
8728
#: dummy/help_topics/git/detail.txt:14
8729
msgid ""
8730
"The 'git:' revision specifier can be used to find revisions by short or "
8731
"long\n"
8732
"GIT SHA1.\n"
8733
msgstr ""
8734
8735
#: dummy/help_topics/git/summary.txt:1
8736
msgid "Using Bazaar with Git"
8737
msgstr ""
8738
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8739
#: dummy/help_topics/global-options/detail.txt:1
8740
msgid "Global Options"
8741
msgstr ""
8742
8743
#: dummy/help_topics/global-options/detail.txt:3
8744
msgid ""
8745
"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.
8746
"command.  (e.g. ``brz --profile help``)."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8747
msgstr ""
8748
8749
#: dummy/help_topics/global-options/detail.txt:6
8750
msgid ""
8751
"--version      Print the version number. Must be supplied before the "
8752
"command.\n"
8753
"--no-aliases   Do not process command aliases when running this command.\n"
8754
"--builtin      Use the built-in version of a command, not the plugin "
8755
"version.\n"
8756
"               This does not suppress other plugin effects.\n"
8757
"--no-plugins   Do not process any plugins.\n"
8758
"--no-l10n      Do not translate messages.\n"
8759
"--concurrency  Number of processes that can be run concurrently (selftest)."
8760
msgstr ""
8761
8762
#: dummy/help_topics/global-options/detail.txt:14
8763
msgid ""
8764
"--profile      Profile execution using the hotshot profiler.\n"
8765
"--lsprof       Profile execution using the lsprof profiler.\n"
8766
"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
8767
"               results to a specified file.  If the filename ends with \".txt"
8768
"\",\n"
8769
"               text format will be used.  If the filename either starts "
8770
"with\n"
8771
"               \"callgrind.out\" or end with \".callgrind\", the output will "
8772
"be\n"
8773
"               formatted for use with KCacheGrind. Otherwise, the output\n"
8774
"               will be a pickle.\n"
8775
"--coverage     Generate line coverage report in the specified directory."
8776
msgstr ""
8777
8778
#: dummy/help_topics/global-options/detail.txt:24
8779
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8780
"-Oname=value   Override the ``name`` config option setting it to ``value`` "
8781
"for\n"
8782
"               the duration of the command.  This can be used multiple times "
8783
"if\n"
8784
"               several options need to be overridden."
8785
msgstr ""
8786
8787
#: dummy/help_topics/global-options/detail.txt:28
8788
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8789
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8790
"information on profiling."
8791
msgstr ""
8792
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8793
#: dummy/help_topics/global-options/detail.txt:31
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8794
msgid ""
8795
"A number of debug flags are also available to assist troubleshooting and\n"
8796
"development.  See :doc:`debug-flags-help`.\n"
8797
msgstr ""
8798
8799
#: dummy/help_topics/global-options/summary.txt:1
7185.1.1 by Jelmer Vernooij
Update pot file.
8800
msgid "Options that control how Breezy runs"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8801
msgstr ""
8802
8803
#: dummy/help_topics/hooks/summary.txt:1
8804
msgid "Points at which custom processing can be added"
8805
msgstr ""
8806
8807
#: dummy/help_topics/launchpad/detail.txt:1
8808
msgid "Integration with Launchpad.net"
8809
msgstr ""
8810
8811
#: dummy/help_topics/launchpad/detail.txt:3
8812
msgid ""
8813
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8814
"specification tracking."
8815
msgstr ""
8816
8817
#: dummy/help_topics/launchpad/detail.txt:6
8818
msgid ""
8819
"The bzr client (through the plugin called 'launchpad') has special\n"
8820
"features to communicate with Launchpad:"
8821
msgstr ""
8822
8823
#: dummy/help_topics/launchpad/detail.txt:9
8824
msgid ""
8825
"    * The launchpad-login command tells Bazaar your Launchpad user name. "
8826
"This\n"
8827
"      is then used by the 'lp:' transport to download your branches using\n"
8828
"      bzr+ssh://."
8829
msgstr ""
8830
8831
#: dummy/help_topics/launchpad/detail.txt:13
8832
msgid ""
8833
"    * The 'lp:' transport uses Launchpad as a directory service: for "
8834
"example\n"
8835
"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8836
"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8837
"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8838
msgstr ""
8839
8840
#: dummy/help_topics/launchpad/detail.txt:18
8841
msgid ""
8842
"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8843
"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8844
"lp:12345'\n"
8845
"      will record a revision property that marks that revision as fixing\n"
8846
"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8847
"      automatically be linked to the bug report."
8848
msgstr ""
8849
8850
#: dummy/help_topics/launchpad/detail.txt:24
8851
msgid "For more information see http://help.launchpad.net/\n"
8852
msgstr ""
8853
8854
#: dummy/help_topics/launchpad/summary.txt:1
8855
msgid "Using Bazaar with Launchpad.net"
8856
msgstr ""
8857
8858
#: dummy/help_topics/location-alias/summary.txt:1
8859
msgid "Aliases for remembered locations"
8860
msgstr ""
8861
8862
#: dummy/help_topics/log-formats/summary.txt:1
8863
msgid "Details on the logging formats available"
8864
msgstr ""
8865
7185.1.1 by Jelmer Vernooij
Update pot file.
8866
#: dummy/help_topics/missing-extensions/summary.txt:1
8867
msgid "What to do when compiled extensions are missing"
8868
msgstr ""
8869
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8870
#: dummy/help_topics/other-formats/summary.txt:1
8871
msgid "Experimental and deprecated storage formats"
8872
msgstr ""
8873
8874
#: dummy/help_topics/patterns/summary.txt:1
8875
msgid "Information on the pattern syntax"
8876
msgstr ""
8877
8878
#: dummy/help_topics/repositories/detail.txt:1
8879
msgid "Repositories"
8880
msgstr ""
8881
8882
#: dummy/help_topics/repositories/detail.txt:3
8883
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8884
"Repositories in Breezy are where committed information is stored. There is\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8885
"a repository associated with every branch."
8886
msgstr ""
8887
8888
#: dummy/help_topics/repositories/detail.txt:6
8889
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8890
"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
8891
"good performance automatically, but in some situations (e.g. when doing\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8892
"very many commits in a short time period) you may want to ask brz to\n"
8893
"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
8894
msgstr ""
8895
8896
#: dummy/help_topics/repositories/detail.txt:11
8897
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8898
"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
8899
"branch but it is possible to create a shared repository which allows "
8900
"multiple\n"
8901
"branches to share their information in the same location. When a new branch "
8902
"is\n"
8903
"created it will first look to see if there is a containing shared repository "
8904
"it\n"
8905
"can use."
8906
msgstr ""
8907
8908
#: dummy/help_topics/repositories/detail.txt:17
8909
msgid ""
8910
"When two branches of the same project share a repository, there is\n"
8911
"generally a large space saving. For some operations (e.g. branching\n"
8912
"within the repository) this translates in to a large time saving."
8913
msgstr ""
8914
8915
#: dummy/help_topics/repositories/detail.txt:21
8916
msgid ""
8917
"To create a shared repository use the init-repository command (or the alias\n"
8918
"init-repo). This command takes the location of the repository to create. "
8919
"This\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8920
"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
8921
"which contains a shared repository. Any new branches that are created in "
8922
"this\n"
8923
"directory will then use it for storage."
8924
msgstr ""
8925
8926
#: dummy/help_topics/repositories/detail.txt:27
8927
msgid ""
8928
"It is a good idea to create a repository whenever you might create more\n"
8929
"than one branch of a project. This is true for both working areas where you\n"
8930
"are doing the development, and any server areas that you use for hosting\n"
8931
"projects. In the latter case, it is common to want branches without working\n"
8932
"trees. Since the files in the branch will not be edited directly there is "
8933
"no\n"
8934
"need to use up disk space for a working tree. To create a repository in "
8935
"which\n"
8936
"the branches will not have working trees pass the '--no-trees' option to\n"
8937
"'init-repository'."
8938
msgstr ""
8939
8940
#: dummy/help_topics/repositories/detail.txt:38
8941
msgid ""
8942
"  init-repository   Create a shared repository. Use --no-trees to create "
8943
"one\n"
8944
"                    in which new branches won't get a working tree.\n"
8945
msgstr ""
8946
8947
#: dummy/help_topics/repositories/summary.txt:1
8948
msgid "Basic information on shared repositories."
8949
msgstr ""
8950
8951
#: dummy/help_topics/revisionspec/summary.txt:1
8952
msgid "Explain how to use --revision"
8953
msgstr ""
8954
8955
#: dummy/help_topics/rules/summary.txt:1
8956
msgid "Information on defining rule-based preferences"
8957
msgstr ""
8958
8959
#: dummy/help_topics/standalone-trees/detail.txt:1
8960
msgid "Standalone Trees"
8961
msgstr ""
8962
8963
#: dummy/help_topics/standalone-trees/detail.txt:3
8964
msgid ""
8965
"A standalone tree is a working tree with an associated repository. It\n"
8966
"is an independently usable branch, with no dependencies on any other.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8967
"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
8968
"an existing project under version control."
8969
msgstr ""
8970
8971
#: dummy/help_topics/standalone-trees/detail.txt:8
8972
msgid "Related Commands::"
8973
msgstr ""
8974
8975
#: dummy/help_topics/standalone-trees/detail.txt:10
8976
msgid "  init    Make a directory into a versioned branch.\n"
8977
msgstr ""
8978
8979
#: dummy/help_topics/standalone-trees/summary.txt:1
8980
msgid "Information on what a standalone tree is"
8981
msgstr ""
8982
8983
#: dummy/help_topics/standard-options/detail.txt:1
8984
msgid "Standard Options"
8985
msgstr ""
8986
8987
#: dummy/help_topics/standard-options/detail.txt:3
8988
msgid "Standard options are legal for all commands."
8989
msgstr ""
8990
8991
#: dummy/help_topics/standard-options/detail.txt:5
8992
msgid ""
8993
"--help, -h     Show help message.\n"
8994
"--verbose, -v  Display more information.\n"
8995
"--quiet, -q    Only display errors and warnings."
8996
msgstr ""
8997
8998
#: dummy/help_topics/standard-options/detail.txt:9
8999
msgid "Unlike global options, standard options can be used in aliases.\n"
9000
msgstr ""
9001
9002
#: dummy/help_topics/standard-options/summary.txt:1
9003
msgid "Options that can be used with any command"
9004
msgstr ""
9005
9006
#: dummy/help_topics/status-flags/detail.txt:1
9007
msgid "Status Flags"
9008
msgstr ""
9009
9010
#: dummy/help_topics/status-flags/detail.txt:3
9011
msgid ""
9012
"Status flags are used to summarise changes to the working tree in a concise\n"
9013
"manner.  They are in the form::"
9014
msgstr ""
9015
9016
#: dummy/help_topics/status-flags/detail.txt:6
9017
msgid "   xxx   <filename>"
9018
msgstr ""
9019
9020
#: dummy/help_topics/status-flags/detail.txt:8
9021
msgid "where the columns' meanings are as follows."
9022
msgstr ""
9023
9024
#: dummy/help_topics/status-flags/detail.txt:10
9025
msgid "Column 1 - versioning/renames::"
9026
msgstr ""
9027
9028
#: dummy/help_topics/status-flags/detail.txt:12
9029
msgid ""
9030
"  + File versioned\n"
9031
"  - File unversioned\n"
9032
"  R File renamed\n"
9033
"  ? File unknown\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9034
"  X File nonexistent (and unknown to brz)\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9035
"  C File has conflicts\n"
9036
"  P Entry for a pending merge (not a file)"
9037
msgstr ""
9038
9039
#: dummy/help_topics/status-flags/detail.txt:20
9040
msgid "Column 2 - contents::"
9041
msgstr ""
9042
9043
#: dummy/help_topics/status-flags/detail.txt:22
9044
msgid ""
9045
"  N File created\n"
9046
"  D File deleted\n"
9047
"  K File kind changed\n"
9048
"  M File modified"
9049
msgstr ""
9050
9051
#: dummy/help_topics/status-flags/detail.txt:27
9052
msgid "Column 3 - execute::"
9053
msgstr ""
9054
9055
#: dummy/help_topics/status-flags/detail.txt:29
9056
msgid "  * The execute bit was changed\n"
9057
msgstr ""
9058
9059
#: dummy/help_topics/status-flags/summary.txt:1
9060
msgid "Help on status flags"
9061
msgstr ""
9062
9063
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
9064
msgid "Branches Out of Sync"
9065
msgstr ""
9066
9067
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
9068
msgid ""
9069
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
9070
"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
9071
"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
9072
"have the same last revision as the new reference branch for the lightweight\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9073
"checkout, data could be lost, so Breezy refuses."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9074
msgstr ""
9075
9076
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
9077
msgid "How you deal with this depends on *why* the branches are out of sync."
9078
msgstr ""
9079
9080
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
9081
msgid ""
9082
"If you have a checkout and have done local commits, you can get back in "
9083
"sync\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9084
"by running \"brz update\" (and possibly \"brz commit\")."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9085
msgstr ""
9086
9087
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
9088
msgid ""
9089
"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.
9090
"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
9091
"you\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9092
"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
9093
"commit\n"
9094
"and then push your changes.  If you decide that some of the changes aren't\n"
9095
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
9096
msgstr ""
9097
9098
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
9099
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
9100
msgstr ""
9101
9102
#: dummy/help_topics/topics/summary.txt:1
9103
msgid "Topics list"
9104
msgstr ""
9105
9106
#: dummy/help_topics/url-special-chars/summary.txt:1
9107
msgid "Special character handling in URLs"
9108
msgstr ""
9109
9110
#: dummy/help_topics/urlspec/summary.txt:1
9111
msgid "Supported transport protocols"
9112
msgstr ""
9113
9114
#: dummy/help_topics/working-trees/detail.txt:1
9115
msgid "Working Trees"
9116
msgstr ""
9117
9118
#: dummy/help_topics/working-trees/detail.txt:3
9119
msgid ""
9120
"A working tree is the contents of a branch placed on disk so that you can\n"
9121
"see the files and edit them. The working tree is where you make changes to "
9122
"a\n"
9123
"branch, and when you commit the current state of the working tree is the\n"
9124
"snapshot that is recorded in the commit."
9125
msgstr ""
9126
9127
#: dummy/help_topics/working-trees/detail.txt:8
9128
msgid ""
9129
"When you push a branch to a remote system, a working tree will not be\n"
9130
"created. If one is already present the files will not be updated. The\n"
9131
"branch information will be updated and the working tree will be marked\n"
9132
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
9133
"may be uncommitted changes or the update may cause content conflicts that "
9134
"are\n"
9135
"difficult to deal with remotely."
9136
msgstr ""
9137
9138
#: dummy/help_topics/working-trees/detail.txt:15
9139
msgid ""
9140
"If you have a branch with no working tree you can use the 'checkout' "
9141
"command\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9142
"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
9143
"will\n"
9144
"create the working tree. If the branch is updated remotely, you can update "
9145
"the\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9146
"working tree by running 'brz update' in that directory."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9147
msgstr ""
9148
9149
#: dummy/help_topics/working-trees/detail.txt:20
9150
msgid ""
9151
"If you have a branch with a working tree that you do not want the 'remove-"
9152
"tree'\n"
9153
"command will remove the tree if it is safe. This can be done to avoid the\n"
9154
"warning about the remote working tree not being updated when pushing to the\n"
9155
"branch. It can also be useful when working with a '--no-trees' repository\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9156
"(see 'brz help repositories')."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9157
msgstr ""
9158
9159
#: dummy/help_topics/working-trees/detail.txt:26
9160
msgid ""
9161
"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.
9162
"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
9163
"some\n"
9164
"other method to update the tree during the push. There is an 'rspush' "
9165
"plugin\n"
9166
"that will update the working tree using rsync as well as doing a push. "
9167
"There\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9168
"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
9169
"SSH\n"
9170
"after each push."
9171
msgstr ""
9172
9173
#: dummy/help_topics/working-trees/detail.txt:33
9174
msgid "Useful commands::"
9175
msgstr ""
9176
9177
#: dummy/help_topics/working-trees/detail.txt:35
9178
msgid ""
9179
"  checkout     Create a working tree when a branch does not have one.\n"
9180
"  remove-tree  Removes the working tree from a branch when it is safe to do "
9181
"so.\n"
9182
"  update       When a working tree is out of sync with its associated "
9183
"branch\n"
9184
"               this will update the tree to match the branch.\n"
9185
msgstr ""
9186
9187
#: dummy/help_topics/working-trees/summary.txt:1
9188
msgid "Information on working trees"
9189
msgstr ""
9190
9191
#: en/help_topics/authentication.txt:1
9192
msgid ""
9193
"Authentication Settings\n"
9194
"======================="
9195
msgstr ""
9196
9197
#: en/help_topics/authentication.txt:4
9198
msgid ""
9199
"\n"
9200
"Intent\n"
9201
"------"
9202
msgstr ""
9203
9204
#: en/help_topics/authentication.txt:8
9205
msgid ""
9206
"Many different authentication policies can be described in the\n"
9207
"``authentication.conf`` file but a particular user should need only a few\n"
9208
"definitions to cover his needs without having to specify a user and a "
9209
"password\n"
9210
"for every branch he uses."
9211
msgstr ""
9212
9213
#: en/help_topics/authentication.txt:13
9214
msgid ""
9215
"The definitions found in this file are used to find the credentials to use "
9216
"for\n"
9217
"a given url. The same credentials can generally be used for as many branches "
9218
"as\n"
9219
"possible by grouping their declaration around the remote servers that need\n"
9220
"them. It's even possible to declare credentials that will be used by "
9221
"different\n"
9222
"servers."
9223
msgstr ""
9224
9225
#: en/help_topics/authentication.txt:19
9226
msgid ""
9227
"The intent is to make this file as small as possible to minimize maintenance."
9228
msgstr ""
9229
9230
#: en/help_topics/authentication.txt:21
9231
msgid ""
9232
"Once the relevant credentials are declared in this file you may use branch "
9233
"urls\n"
9234
"without embedding passwords (security hazard) or even users (enabling "
9235
"sharing\n"
9236
"of your urls with others)."
9237
msgstr ""
9238
9239
#: en/help_topics/authentication.txt:25
9240
msgid "Instead of using::"
9241
msgstr ""
9242
9243
#: en/help_topics/authentication.txt:27
7185.1.1 by Jelmer Vernooij
Update pot file.
9244
msgid "  brz branch sftp://joe:secret@host.com/path/to/my/branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9245
msgstr ""
9246
9247
#: en/help_topics/authentication.txt:29
9248
msgid "you simply use::"
9249
msgstr ""
9250
9251
#: en/help_topics/authentication.txt:31
7185.1.1 by Jelmer Vernooij
Update pot file.
9252
msgid "  brz branch sftp://host.com/path/to/my/branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9253
msgstr ""
9254
9255
#: en/help_topics/authentication.txt:33
9256
msgid "provided you have created the following ``authentication.conf`` file::"
9257
msgstr ""
9258
9259
#: en/help_topics/authentication.txt:35
9260
msgid ""
9261
"  [myprojects]\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9262
"  scheme=sftp\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9263
"  host=host.com\n"
9264
"  user=joe\n"
9265
"  password=secret\n"
9266
"  "
9267
msgstr ""
9268
9269
#: en/help_topics/authentication.txt:42
9270
msgid ""
9271
"Authentication definitions\n"
9272
"--------------------------"
9273
msgstr ""
9274
9275
#: en/help_topics/authentication.txt:45
9276
msgid ""
9277
"There are two kinds of authentication used by the various schemes supported "
9278
"by\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9279
"brz:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9280
msgstr ""
9281
9282
#: en/help_topics/authentication.txt:48
9283
msgid "1. user and password"
9284
msgstr ""
9285
9286
#: en/help_topics/authentication.txt:50
9287
msgid ""
9288
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9289
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9290
"ssh agents are a better, more secure solution. So we have chosen to not "
9291
"provide\n"
9292
"our own less secure method."
9293
msgstr ""
9294
9295
#: en/help_topics/authentication.txt:55
9296
msgid "2. user, realm and password"
9297
msgstr ""
9298
9299
#: en/help_topics/authentication.txt:57
9300
msgid ""
9301
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9302
"against a host. But, by using ``.htaccess`` files, for example, it is "
9303
"possible\n"
9304
"to define several (``user, realm, password``) for a given ``host``. So what "
9305
"is\n"
9306
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9307
"is\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9308
"not taken into account in the definitions, but will displayed if brz "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9309
"prompts\n"
9310
"you for a password."
9311
msgstr ""
9312
9313
#: en/help_topics/authentication.txt:64
9314
msgid ""
9315
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9316
"specifying the appropriate port."
9317
msgstr ""
9318
9319
#: en/help_topics/authentication.txt:67
9320
msgid ""
9321
"To take all schemes into account, the password will be deduced from a set "
9322
"of\n"
9323
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9324
"``user``,\n"
9325
"``password``)."
9326
msgstr ""
9327
9328
#: en/help_topics/authentication.txt:71
9329
msgid ""
9330
"  * ``scheme``: can be empty (meaning the rest of the definition can be "
9331
"used\n"
9332
"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9333
"``ssh``\n"
9334
"    should be used instead since this is the real scheme regarding\n"
9335
"    authentication,"
9336
msgstr ""
9337
9338
#: en/help_topics/authentication.txt:76
9339
msgid "  * ``host``: can be empty (to act as a default for any host),"
9340
msgstr ""
9341
9342
#: en/help_topics/authentication.txt:78
9343
msgid ""
9344
"  * ``port`` can be empty (useful when an host provides several servers for "
9345
"the\n"
9346
"    same scheme), only numerical values are allowed, this should be used "
9347
"only\n"
9348
"    when the server uses a port different than the scheme standard port,"
9349
msgstr ""
9350
9351
#: en/help_topics/authentication.txt:82
9352
msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
9353
msgstr ""
9354
9355
#: en/help_topics/authentication.txt:84
9356
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9357
"  * ``user``: can be empty (``bzr`` will default to python's\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9358
"    ``getpass.get_user()``),"
9359
msgstr ""
9360
9361
#: en/help_topics/authentication.txt:87
9362
msgid ""
9363
"  * ``password``: can be empty if you prefer to always be prompted for your\n"
9364
"    password."
9365
msgstr ""
9366
9367
#: en/help_topics/authentication.txt:90
9368
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9369
"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
9370
"a\n"
9371
"(``user`` [, ``password``]) based on the following rules :"
9372
msgstr ""
9373
9374
#: en/help_topics/authentication.txt:93
9375
msgid " 1. the first match wins,"
9376
msgstr ""
9377
9378
#: en/help_topics/authentication.txt:95
9379
msgid " 2. empty fields match everything,"
9380
msgstr ""
9381
9382
#: en/help_topics/authentication.txt:97
9383
msgid ""
9384
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9385
msgstr ""
9386
9387
#: en/help_topics/authentication.txt:99
9388
msgid ""
9389
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9390
"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
9391
"net``\n"
9392
"    will not match ``bzr.sf.net``)."
9393
msgstr ""
9394
9395
#: en/help_topics/authentication.txt:103
9396
msgid ""
9397
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9398
msgstr ""
9399
9400
#: en/help_topics/authentication.txt:105
9401
msgid ""
9402
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9403
"above,\n"
9404
"    empty paths will match any provided path)."
9405
msgstr ""
9406
9407
#: en/help_topics/authentication.txt:110
9408
msgid ""
9409
"File format\n"
9410
"-----------"
9411
msgstr ""
9412
9413
#: en/help_topics/authentication.txt:113
9414
msgid ""
9415
"The general rules for :doc:`configuration files <configuration-help>`\n"
9416
"apply except for the variable policies."
9417
msgstr ""
9418
9419
#: en/help_topics/authentication.txt:116
9420
msgid "Each section describes an authentication definition."
9421
msgstr ""
9422
9423
#: en/help_topics/authentication.txt:118
9424
msgid ""
9425
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9426
"reserved\n"
9427
"and should appear as the *last* section."
9428
msgstr ""
9429
9430
#: en/help_topics/authentication.txt:121
9431
msgid "Each section should define:"
9432
msgstr ""
9433
9434
#: en/help_topics/authentication.txt:123
9435
msgid "* ``user``: the login to be used,"
9436
msgstr ""
9437
9438
#: en/help_topics/authentication.txt:125
9439
msgid "Each section could define:"
9440
msgstr ""
9441
9442
#: en/help_topics/authentication.txt:127
9443
msgid "* ``host``: the remote server,"
9444
msgstr ""
9445
9446
#: en/help_topics/authentication.txt:129
9447
msgid "* ``port``: the port the server is listening,"
9448
msgstr ""
9449
9450
#: en/help_topics/authentication.txt:131
9451
msgid "* ``path``: the branch location,"
9452
msgstr ""
9453
9454
#: en/help_topics/authentication.txt:133
9455
msgid "* ``password``: the password."
9456
msgstr ""
9457
9458
#: en/help_topics/authentication.txt:135
9459
msgid ""
9460
"\n"
9461
"Examples\n"
9462
"--------"
9463
msgstr ""
9464
9465
#: en/help_topics/authentication.txt:139
9466
msgid ""
9467
"\n"
9468
"Personal projects hosted outside\n"
9469
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9470
msgstr ""
9471
9472
#: en/help_topics/authentication.txt:143
9473
msgid ""
9474
"All connections are done with the same ``user`` (the remote one for which "
9475
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9476
"default brz one is not appropriate) and the password is always prompted "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9477
"with\n"
9478
"some exceptions::"
9479
msgstr ""
9480
9481
#: en/help_topics/authentication.txt:147
9482
msgid ""
9483
"        # Pet projects on hobby.net\n"
9484
"        [hobby]\n"
9485
"        host=r.hobby.net\n"
9486
"        user=jim\n"
9487
"        password=obvious1234\n"
9488
"        \n"
9489
"        # Home server\n"
9490
"        [home]\n"
9491
"        scheme=https\n"
9492
"        host=home.net\n"
9493
"        user=joe\n"
9494
"        password=1essobV10us\n"
9495
"        \n"
9496
"        [DEFAULT]\n"
9497
"        # Our local user is barbaz, on all remote sites we're known as "
9498
"foobar\n"
9499
"        user=foobar"
9500
msgstr ""
9501
9502
#: en/help_topics/authentication.txt:164
9503
msgid ""
9504
"\n"
9505
"Source hosting provider\n"
9506
"~~~~~~~~~~~~~~~~~~~~~~~"
9507
msgstr ""
9508
9509
#: en/help_topics/authentication.txt:168
9510
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9511
msgstr ""
9512
9513
#: en/help_topics/authentication.txt:170
9514
msgid ""
9515
"        [shpnet domain]\n"
9516
"        # we use sftp, but ssh is the scheme used for authentication\n"
9517
"        scheme=ssh\n"
9518
"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9519
"        host=.shp.net\n"
9520
"        user=joe\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9521
"        # brz doesn't support supplying a password for sftp,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9522
"        # consider using an ssh agent if you don't want to supply\n"
9523
"        # a password interactively. (pageant, ssh-agent, etc)"
9524
msgstr ""
9525
9526
#: en/help_topics/authentication.txt:180
9527
msgid ""
9528
"HTTPS, SFTP servers and their proxy\n"
9529
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9530
msgstr ""
9531
9532
#: en/help_topics/authentication.txt:183
9533
msgid ""
9534
"At company.com, the server hosting release and integration branches is "
9535
"behind a\n"
9536
"proxy, and the two branches use different authentication policies::"
9537
msgstr ""
9538
9539
#: en/help_topics/authentication.txt:186
9540
msgid ""
9541
"        [reference code]\n"
9542
"        scheme=https\n"
9543
"        host=dev.company.com\n"
9544
"        path=/dev\n"
9545
"        user=user1\n"
9546
"        password=pass1"
9547
msgstr ""
9548
9549
#: en/help_topics/authentication.txt:193
9550
msgid ""
9551
"        # development branches on dev server\n"
9552
"        [dev]\n"
9553
"        scheme=ssh # bzr+ssh and sftp are available here\n"
9554
"        host=dev.company.com\n"
9555
"        path=/dev/integration\n"
9556
"        user=user2\n"
9557
"        \n"
9558
"        # proxy\n"
9559
"        [proxy]\n"
9560
"        scheme=http\n"
9561
"        host=proxy.company.com\n"
9562
"        port=3128\n"
9563
"        user=proxyuser1\n"
9564
"        password=proxypass1"
9565
msgstr ""
9566
9567
#: en/help_topics/authentication.txt:208
9568
msgid ""
9569
"\n"
9570
"Planned enhancements\n"
9571
"--------------------"
9572
msgstr ""
9573
9574
#: en/help_topics/authentication.txt:212
9575
msgid ""
9576
"The following are not yet implemented but planned as parts of a work in\n"
9577
"progress:"
9578
msgstr ""
9579
9580
#: en/help_topics/authentication.txt:215
9581
msgid "* add a  ``password_encoding`` field allowing:"
9582
msgstr ""
9583
9584
#: en/help_topics/authentication.txt:217
9585
msgid ""
9586
"  - storing the passwords in various obfuscating encodings (base64 for one),"
9587
msgstr ""
9588
9589
#: en/help_topics/authentication.txt:219
9590
msgid "  - delegate password storage to plugins (.netrc for example)."
9591
msgstr ""
9592
9593
#: en/help_topics/authentication.txt:221
9594
msgid ""
9595
"* update the credentials when the user is prompted for user or password,"
9596
msgstr ""
9597
9598
#: en/help_topics/authentication.txt:223
9599
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9600
msgstr ""
9601
9602
#: en/help_topics/authentication.txt:225
9603
msgid ""
9604
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9605
"but\n"
9606
"ignored in the actual implementation.\n"
9607
msgstr ""
9608
9609
#: en/help_topics/bugs.txt:1
9610
msgid "Bug Tracker Settings"
9611
msgstr ""
9612
9613
#: en/help_topics/bugs.txt:3
9614
msgid ""
9615
"When making a commit, metadata about bugs fixed by that change can be\n"
9616
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9617
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9618
"(The only ``status`` value currently supported is ``fixed.``)"
9619
msgstr ""
9620
9621
#: en/help_topics/bugs.txt:8
9622
msgid ""
9623
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9624
"identifier\n"
9625
"rather than a full URL. This looks like::"
9626
msgstr ""
9627
9628
#: en/help_topics/bugs.txt:11
9629
msgid "    bzr commit --fixes <tracker>:<id>"
9630
msgstr ""
9631
6535.1.1 by Vincent Ladeuil
Release 2.6b2
9632
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9633
msgid "or::"
9634
msgstr ""
9635
9636
#: en/help_topics/bugs.txt:15
9637
msgid "    bzr commit --fixes <id>"
9638
msgstr ""
9639
9640
#: en/help_topics/bugs.txt:17
9641
msgid ""
9642
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9643
"the\n"
9644
"identifier for that bug within the bugtracker, usually the bug number.\n"
9645
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9646
"or global configuration is used."
9647
msgstr ""
9648
9649
#: en/help_topics/bugs.txt:22
9650
msgid ""
9651
"Bazaar knows about a few bug trackers that have many users. If\n"
9652
"you use one of these bug trackers then there is no setup required to\n"
9653
"use this feature, you just need to know the tracker identifier to use.\n"
9654
"These are the bugtrackers that are built in:"
9655
msgstr ""
9656
9657
#: en/help_topics/bugs.txt:27
9658
msgid ""
9659
"  ============================ ============ ============\n"
9660
"  URL                          Abbreviation Example\n"
9661
"  ============================ ============ ============\n"
9662
"  https://bugs.launchpad.net/  lp           lp:12345\n"
9663
"  http://bugs.debian.org/      deb          deb:12345\n"
9664
"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
9665
"  ============================ ============ ============"
9666
msgstr ""
9667
9668
#: en/help_topics/bugs.txt:35
9669
msgid ""
9670
"For the bug trackers not listed above configuration is required.\n"
9671
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9672
"is built in, along with a template mechanism for other bugtrackers with\n"
9673
"simple URL schemes. If your bug tracker can't be described by one\n"
9674
"of the schemes described below then you can write a plugin to support\n"
9675
"it."
9676
msgstr ""
9677
9678
#: en/help_topics/bugs.txt:42
9679
msgid ""
9680
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9681
"variable which contains the base URL of the bug tracker. These options\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9682
"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
9683
"configuration section in ``locations.conf``.  You can set up these values\n"
9684
"for each of the projects you work on."
9685
msgstr ""
9686
9687
#: en/help_topics/bugs.txt:48
9688
msgid ""
9689
"Note: As you provide a short name for each tracker, you can specify one or\n"
9690
"more bugs in one or more trackers at commit time if you wish."
9691
msgstr ""
9692
9693
#: en/help_topics/bugs.txt:51
9694
msgid ""
9695
"Launchpad\n"
9696
"---------"
9697
msgstr ""
9698
9699
#: en/help_topics/bugs.txt:54
9700
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9701
msgstr ""
9702
9703
#: en/help_topics/bugs.txt:56
9704
msgid ""
9705
"bugzilla_<tracker>_url\n"
9706
"----------------------"
9707
msgstr ""
9708
9709
#: en/help_topics/bugs.txt:59
9710
msgid ""
9711
"If present, the location of the Bugzilla bug tracker referred to by\n"
9712
"<tracker>. This option can then be used together with ``bzr commit\n"
9713
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9714
"example::"
9715
msgstr ""
9716
9717
#: en/help_topics/bugs.txt:64
9718
msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
9719
msgstr ""
9720
9721
#: en/help_topics/bugs.txt:66
9722
msgid ""
9723
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9724
"fixed."
9725
msgstr ""
9726
9727
#: en/help_topics/bugs.txt:69
9728
msgid ""
9729
"trac_<tracker>_url\n"
9730
"------------------"
9731
msgstr ""
9732
9733
#: en/help_topics/bugs.txt:72
9734
msgid ""
9735
"If present, the location of the Trac instance referred to by\n"
9736
"<tracker>. This option can then be used together with ``bzr commit\n"
9737
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9738
"example::"
9739
msgstr ""
9740
9741
#: en/help_topics/bugs.txt:77
9742
msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
9743
msgstr ""
9744
9745
#: en/help_topics/bugs.txt:79
9746
msgid ""
9747
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9748
"as\n"
9749
"fixed."
9750
msgstr ""
9751
9752
#: en/help_topics/bugs.txt:82
9753
msgid ""
9754
"bugtracker_<tracker>_url\n"
9755
"------------------------"
9756
msgstr ""
9757
9758
#: en/help_topics/bugs.txt:85
9759
msgid ""
9760
"If present, the location of a generic bug tracker instance referred to by\n"
9761
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9762
"which will be replaced by a specific bug ID. This option can then be used\n"
9763
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9764
"fixed by that commit. For example::"
9765
msgstr ""
9766
9767
#: en/help_topics/bugs.txt:91
9768
msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
9769
msgstr ""
9770
9771
#: en/help_topics/bugs.txt:93
9772
msgid ""
9773
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9774
"Roundup bug tracker as fixed, or::"
9775
msgstr ""
9776
9777
#: en/help_topics/bugs.txt:96
9778
msgid ""
9779
"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9780
msgstr ""
9781
9782
#: en/help_topics/bugs.txt:98
9783
msgid ""
9784
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9785
"RT bug tracker as fixed, or::"
9786
msgstr ""
9787
9788
#: en/help_topics/bugs.txt:101
9789
msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9790
msgstr ""
9791
9792
#: en/help_topics/bugs.txt:103
9793
msgid ""
9794
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9795
"HUDSON-1234\n"
9796
"in Hudson's JIRA bug tracker as fixed.\n"
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:1
9800
msgid ""
9801
"Configuration Settings\n"
9802
"======================="
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:4
9806
msgid ""
9807
"Environment settings\n"
9808
"---------------------"
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:7
9812
msgid ""
9813
"While most configuration is handled by configuration files, some options\n"
9814
"which may be semi-permanent can also be controlled through the environment."
9815
msgstr ""
9816
9817
#: en/help_topics/configuration.txt:10
9818
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9819
"BRZ_EMAIL\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9820
"~~~~~~~~~"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:13
7185.1.1 by Jelmer Vernooij
Update pot file.
9824
msgid "Override the email id used by Breezy.  Typical format::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9825
msgstr ""
9826
9827
#: en/help_topics/configuration.txt:15
9828
msgid "  \"John Doe <jdoe@example.com>\""
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:17
9832
msgid "See also the ``email`` configuration option."
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:19
9836
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9837
"BRZ_PROGRESS_BAR\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9838
"~~~~~~~~~~~~~~~~"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:22
9842
msgid ""
9843
"Override the progress display.  Possible values are \"none\" or \"text\".  "
9844
"If\n"
9845
"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
9846
"draws\n"
9847
"the ordinary command line progress bar."
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:26
9851
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9852
"BRZ_SIGQUIT_PDB\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9853
"~~~~~~~~~~~~~~~"
9854
msgstr ""
9855
9856
#: en/help_topics/configuration.txt:29
9857
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:31
9861
msgid ""
9862
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9863
"* 1 = Invoke breakin debugger (default)"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:34
9867
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9868
"BRZ_HOME\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9869
"~~~~~~~~"
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:37
7185.1.1 by Jelmer Vernooij
Update pot file.
9873
msgid "Override the home directory used by Breezy."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:39
9877
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9878
"BRZ_SSH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9879
"~~~~~~~"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:42
9883
msgid "Select a different SSH implementation."
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:44
9887
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9888
"BRZ_PDB\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9889
"~~~~~~~"
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:47
9893
msgid "Control whether to launch a debugger on error."
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:49
9897
msgid ""
9898
"* 0 = Standard behavior\n"
9899
"* 1 = Launch debugger"
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:52
9903
msgid ""
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
9904
"BZR_REMOTE_PATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9905
"~~~~~~~~~~~~~~~"
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:55
7185.1.1 by Jelmer Vernooij
Update pot file.
9909
msgid ""
9910
"Path to the Bazaar or Breezy executable to use when using the bzr+ssh "
9911
"protocol."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:57
9915
msgid "See also the ``bzr_remote_path`` configuration option."
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:59
9919
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9920
"BRZ_EDITOR\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9921
"~~~~~~~~~~"
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:62
7185.1.1 by Jelmer Vernooij
Update pot file.
9925
msgid "Path to the editor Breezy should use for commit messages, etc."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:64
9929
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9930
"BRZ_LOG\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9931
"~~~~~~~"
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:67
9935
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9936
"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
9937
"running ``bzr version``."
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:70
9941
msgid ""
9942
"The log file contains debug information that is useful for diagnosing or\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9943
"reporting problems with Breezy."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:73
9947
msgid ""
9948
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9949
"will disable logging."
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:76
9953
msgid ""
9954
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9955
"BRZ_PLUGIN_PATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9956
"~~~~~~~~~~~~~~~"
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:80
9960
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9961
"The path to the plugins directory that Breezy should use.\n"
9962
"If not set, Breezy will search for plugins in:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:83
9966
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:85
7185.1.1 by Jelmer Vernooij
Update pot file.
9970
msgid "* the breezy directory (containing the ``core`` plugins),"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9971
msgstr ""
9972
9973
#: en/help_topics/configuration.txt:87
9974
msgid ""
9975
"* the site specific plugin directory if applicable (containing\n"
9976
"  the ``site`` plugins)."
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:90
9980
msgid ""
9981
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9982
"the way the plugin are searched. "
9983
msgstr ""
9984
9985
#: en/help_topics/configuration.txt:93
9986
msgid ""
9987
"As for the ``PATH`` variables, if multiple directories are\n"
9988
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9989
"platform specific appropriate character (':' on Unix,\n"
9990
"';' on windows)"
9991
msgstr ""
9992
9993
#: en/help_topics/configuration.txt:98
9994
msgid ""
9995
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9996
"in ``user``.  However it will continue to search in ``core`` and\n"
9997
"``site`` unless they are explicitly removed."
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:102
10001
msgid ""
10002
"If you need to change the order or remove one of these\n"
10003
"directories, you should use special values:"
10004
msgstr ""
10005
10006
#: en/help_topics/configuration.txt:105
10007
msgid ""
10008
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
10009
"  path from the default values,"
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:108
10013
msgid ""
10014
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
10015
"  before the remaining default values (and also remove it from\n"
10016
"  the default values)."
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:112
10020
msgid ""
10021
"Note that the special values 'user', 'core' and 'site' should be\n"
10022
"used literally, they will be substituted by the corresponding,\n"
10023
"platform specific, values."
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:116
10027
msgid ""
10028
"The examples below use ':' as the separator, windows users\n"
10029
"should use ';'."
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:119
10033
msgid "Overriding the default user plugin directory::"
10034
msgstr ""
10035
10036
#: en/help_topics/configuration.txt:121
10037
msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:123
10041
msgid "Disabling the site directory while retaining the user directory::"
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:125
10045
msgid "  BZR_PLUGIN_PATH='-site:+user'"
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:127
10049
msgid "Disabling all plugins (better achieved with --no-plugins)::"
10050
msgstr ""
10051
10052
#: en/help_topics/configuration.txt:129
10053
msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
10054
msgstr ""
10055
10056
#: en/help_topics/configuration.txt:131
10057
msgid "Overriding the default site plugin directory::"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:133
10061
msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:135
10065
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10066
"BRZ_DISABLE_PLUGINS\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10067
"~~~~~~~~~~~~~~~~~~~"
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:138
10071
msgid ""
10072
"Under special circumstances (mostly when trying to diagnose a\n"
10073
"bug), it's better to disable a plugin (or several) rather than\n"
10074
"uninstalling them completely. Such plugins can be specified in\n"
10075
"the ``BZR_DISABLE_PLUGINS`` environment variable."
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:143
10079
msgid ""
10080
"In that case, ``bzr`` will stop loading the specified plugins and\n"
10081
"will raise an import error if they are explicitly imported (by\n"
10082
"another plugin that depends on them for example)."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:147
10086
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
10087
msgstr ""
10088
10089
#: en/help_topics/configuration.txt:149
10090
msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:151
10094
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10095
"BRZ_PLUGINS_AT\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10096
"~~~~~~~~~~~~~~"
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:154
10100
msgid ""
10101
"When adding a new feature or working on a bug in a plugin,\n"
10102
"developers often need to use a specific version of a given\n"
10103
"plugin. Since python requires that the directory containing the\n"
10104
"code is named like the plugin itself this make it impossible to\n"
10105
"use arbitrary directory names (using a two-level directory scheme\n"
10106
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
10107
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:162
10111
msgid ""
10112
"Plugins specified in this environment variable takes precedence\n"
10113
"over the ones in ``BZR_PLUGIN_PATH``."
10114
msgstr ""
10115
10116
#: en/help_topics/configuration.txt:165
10117
msgid ""
10118
"The variable specified a list of ``plugin_name@plugin path``,\n"
10119
"``plugin_name`` being the name of the plugin as it appears in\n"
10120
"python module paths, ``plugin_path`` being the path to the\n"
10121
"directory containing the plugin code itself\n"
10122
"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
10123
"separator, use ';' on windows."
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:172
10127
msgid ""
10128
"Example:\n"
10129
"~~~~~~~~"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:175
10133
msgid ""
10134
"Using a specific version of ``myplugin``:\n"
10135
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:178
10139
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10140
"BRZPATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10141
"~~~~~~~"
10142
msgstr ""
10143
10144
#: en/help_topics/configuration.txt:181
7185.1.1 by Jelmer Vernooij
Update pot file.
10145
msgid "The path where Breezy should look for shell plugin external commands."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:183
10149
msgid ""
10150
"\n"
10151
"http_proxy, https_proxy\n"
10152
"~~~~~~~~~~~~~~~~~~~~~~~"
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:187
10156
msgid "Specifies the network proxy for outgoing connections, for example::"
10157
msgstr ""
10158
10159
#: en/help_topics/configuration.txt:189
10160
msgid ""
10161
"  http_proxy=http://proxy.example.com:3128/ \n"
10162
"  https_proxy=http://proxy.example.com:3128/"
10163
msgstr ""
10164
10165
#: en/help_topics/configuration.txt:192
10166
msgid ""
10167
"\n"
10168
"Configuration files\n"
10169
"-------------------"
10170
msgstr ""
10171
10172
#: en/help_topics/configuration.txt:196
10173
msgid ""
10174
"Location\n"
10175
"~~~~~~~~"
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:199
10179
msgid ""
10180
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10181
"``C:\\Documents and Settings\\<username>\\Application Data\\Breezy\\2.0`` "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10182
"on\n"
10183
"Windows. (You can check the location for your system by using\n"
10184
"``bzr version``.)"
10185
msgstr ""
10186
10187
#: en/help_topics/configuration.txt:204
10188
msgid "There are three primary configuration files in this location:"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:206
7185.1.1 by Jelmer Vernooij
Update pot file.
10192
msgid "* ``breezy.conf`` describes default configuration options,"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:208
10196
msgid ""
10197
"* ``locations.conf`` describes configuration information for\n"
10198
"  specific branch locations,"
10199
msgstr ""
10200
10201
#: en/help_topics/configuration.txt:211
10202
msgid ""
10203
"* ``authentication.conf`` describes credential information for\n"
10204
"  remote servers."
10205
msgstr ""
10206
10207
#: en/help_topics/configuration.txt:214
10208
msgid ""
10209
"Each branch can also contain a configuration file that sets values specific\n"
10210
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10211
"the\n"
10212
"branch. This file is visible to all users of a branch, if you wish to "
10213
"override\n"
10214
"one of the values for a branch with a setting that is specific to you then "
10215
"you\n"
10216
"can do so in ``locations.conf``."
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:220
10220
msgid ""
10221
"General format\n"
10222
"~~~~~~~~~~~~~~"
10223
msgstr ""
10224
10225
#: en/help_topics/configuration.txt:223
10226
msgid ""
10227
"An ini file has three types of contructs: section headers, section\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10228
"options and comments."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10229
msgstr ""
10230
10231
#: en/help_topics/configuration.txt:226
10232
msgid ""
10233
"Comments\n"
10234
"^^^^^^^^"
10235
msgstr ""
10236
10237
#: en/help_topics/configuration.txt:229
10238
msgid ""
10239
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10240
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10241
"Breezy when parsing ini files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10242
msgstr ""
10243
10244
#: en/help_topics/configuration.txt:233
10245
msgid ""
10246
"Section headers\n"
10247
"^^^^^^^^^^^^^^^"
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:236
10251
msgid ""
10252
"A section header is a word enclosed in brackets that starts at the begining\n"
10253
"of a line.  A typical section header looks like this::"
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:239
10257
msgid "    [DEFAULT]"
10258
msgstr ""
10259
10260
#: en/help_topics/configuration.txt:241
10261
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10262
"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
10263
"[ALIASES].  Section headers are case sensitive. The default section provides "
10264
"for\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10265
"setting options which can be overridden with the branch config file."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:245
10269
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10270
"For ``locations.conf``, the options from the section with the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10271
"longest matching section header are used to the exclusion of other\n"
10272
"potentially valid section headers. A section header uses the path for\n"
10273
"the branch as the section header. Some examples include::"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:250
10277
msgid ""
10278
"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
10279
"    [/home/jdoe/branches/]"
10280
msgstr ""
10281
10282
#: en/help_topics/configuration.txt:253
10283
msgid ""
10284
"\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10285
"Section options\n"
10286
"^^^^^^^^^^^^^^^"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:257
10290
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10291
"A section option resides within a section. A section option contains an\n"
10292
"option name, an equals sign and a value.  For example::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:260
10296
msgid ""
10297
"    email            = John Doe <jdoe@isp.com>\n"
10298
"    gpg_signing_key  = Amy Pond <amy@example.com>"
10299
msgstr ""
10300
10301
#: en/help_topics/configuration.txt:263
10302
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10303
"A option can reference other options by enclosing them in curly brackets::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10304
msgstr ""
10305
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10306
#: en/help_topics/configuration.txt:265
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10307
msgid ""
10308
"    my_branch_name = feature_x\n"
10309
"    my_server      = bzr+ssh://example.com\n"
10310
"    push_location   = {my_server}/project/{my_branch_name}"
10311
msgstr ""
10312
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10313
#: en/help_topics/configuration.txt:269
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10314
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10315
"Option policies\n"
10316
"^^^^^^^^^^^^^^^"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10317
msgstr ""
10318
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10319
#: en/help_topics/configuration.txt:272
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10320
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10321
"Options defined in a section affect the named directory or URL plus\n"
10322
"any locations they contain.  Policies can be used to change how an\n"
10323
"option value is interpreted for contained locations.  Currently\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10324
"there are three policies available:"
10325
msgstr ""
10326
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10327
#: en/help_topics/configuration.txt:277
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10328
msgid ""
10329
" none:\n"
10330
"   the value is interpreted the same for contained locations.  This is\n"
10331
"   the default behaviour.\n"
10332
" norecurse:\n"
10333
"   the value is only used for the exact location specified by the\n"
10334
"   section name.\n"
10335
" appendpath:\n"
10336
"   for contained locations, any additional path components are\n"
10337
"   appended to the value."
10338
msgstr ""
10339
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10340
#: en/help_topics/configuration.txt:287
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10341
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10342
"Policies are specified by keys with names of the form \"<option_name>:policy"
10343
"\".\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10344
"For example, to define the push location for a tree of branches, the\n"
10345
"following could be used::"
10346
msgstr ""
10347
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10348
#: en/help_topics/configuration.txt:291
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10349
msgid ""
10350
"  [/top/location]\n"
10351
"  push_location = sftp://example.com/location\n"
10352
"  push_location:policy = appendpath"
10353
msgstr ""
10354
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10355
#: en/help_topics/configuration.txt:295
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10356
msgid ""
10357
"With this configuration, the push location for ``/top/location/branch1``\n"
10358
"would be ``sftp://example.com/location/branch1``."
10359
msgstr ""
10360
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10361
#: en/help_topics/configuration.txt:298
10362
msgid ""
10363
"Section local options\n"
10364
"^^^^^^^^^^^^^^^^^^^^^"
10365
msgstr ""
10366
10367
#: en/help_topics/configuration.txt:301
10368
msgid ""
10369
"Some options are defined automatically inside a given section and can be\n"
10370
"refered to in this section only. "
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:304
10374
msgid "For example, the ``appendpath`` policy can be used like this::"
10375
msgstr ""
10376
10377
#: en/help_topics/configuration.txt:306
10378
msgid ""
10379
"  [/home/vila/src/bzr/bugs]\n"
10380
"  mypush = lp:~vila/bzr\n"
10381
"  mypush:policy=appendpath"
10382
msgstr ""
10383
10384
#: en/help_topics/configuration.txt:310
10385
msgid "Using ``relpath`` to achieve the same result is done like this::"
10386
msgstr ""
10387
10388
#: en/help_topics/configuration.txt:312
10389
msgid ""
10390
"  [/home/vila/src/bzr/bugs]\n"
10391
"  mypush = lp:~vila/bzr/{relpath}"
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:315
10395
msgid ""
10396
"In both cases, when used in a directory like\n"
10397
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10398
msgstr ""
10399
6437.2.2 by Vincent Ladeuil
Release 2.5b5
10400
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10401
msgid ""
10402
"   $ bzr config mypush\n"
10403
"   lp:~vila/bzr/832013-expand-in-stack"
10404
msgstr ""
10405
10406
#: en/help_topics/configuration.txt:321
6349.1.1 by Vincent Ladeuil
Release 2.5b4
10407
msgid "Another such option is ``basename`` which can be used like this::"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:323
10411
msgid ""
10412
"  [/home/vila/src/bzr]\n"
10413
"  mypush = lp:~vila/bzr/{basename}"
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:326
10417
msgid ""
10418
"When used in a directory like\n"
10419
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10420
msgstr ""
10421
10422
#: en/help_topics/configuration.txt:332
10423
msgid ""
10424
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10425
"itself is defined as the relative path between the section name and the\n"
10426
"location it matches."
10427
msgstr ""
10428
10429
#: en/help_topics/configuration.txt:336
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10430
msgid ""
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10431
"Another such option is ``branchname``, which refers to the name of a "
10432
"colocated\n"
10433
"branch.  For non-colocated branches, it behaves like basename.  It can be "
10434
"used\n"
10435
"like this::"
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:340
10439
msgid ""
10440
"  [/home/vila/src/bzr/bugs]\n"
10441
"  mypush = lp:~vila/bzr/{branchname}"
10442
msgstr ""
10443
10444
#: en/help_topics/configuration.txt:343
10445
msgid ""
10446
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10447
"get::"
10448
msgstr ""
10449
10450
#: en/help_topics/configuration.txt:345
10451
msgid ""
10452
"  bzr config mypush\n"
10453
"  lp:~vila/bzr/832013-expand-in-stack"
10454
msgstr ""
10455
10456
#: en/help_topics/configuration.txt:348
10457
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10458
"When an option is local to a Section, it cannot be referred to from option\n"
10459
"values in any other section from the same ``Store`` nor from any other\n"
10460
"``Store``."
10461
msgstr ""
10462
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10463
#: en/help_topics/configuration.txt:352
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10464
msgid ""
10465
"\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10466
"The main configuration file, breezy.conf\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10467
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10468
msgstr ""
10469
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10470
#: en/help_topics/configuration.txt:356
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10471
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10472
"``breezy.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10473
"The default section contains the default\n"
10474
"configuration options for all branches. The default section can be\n"
10475
"overriden by providing a branch-specific section in ``locations.conf``."
10476
msgstr ""
10477
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10478
#: en/help_topics/configuration.txt:361
7185.1.1 by Jelmer Vernooij
Update pot file.
10479
msgid "A typical ``breezy.conf`` section often looks like the following::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10480
msgstr ""
10481
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10482
#: en/help_topics/configuration.txt:363
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10483
msgid ""
10484
"    [DEFAULT]\n"
10485
"    email             = John Doe <jdoe@isp.com>\n"
10486
"    editor            = /usr/bin/vim\n"
10487
"    create_signatures = when-required"
10488
msgstr ""
10489
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10490
#: en/help_topics/configuration.txt:368
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10491
msgid ""
10492
"\n"
10493
"The branch location configuration file, locations.conf\n"
10494
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10495
msgstr ""
10496
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10497
#: en/help_topics/configuration.txt:372
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10498
msgid ""
10499
"``locations.conf`` allows one to specify overriding settings for\n"
10500
"a specific branch. The format is almost identical to the default section in\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10501
"breezy.conf with one significant change: The section header, instead of "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10502
"saying\n"
10503
"default, will be the path to a branch that you wish to override a value\n"
10504
"for. The '?' and '*' wildcards are supported::"
10505
msgstr ""
10506
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10507
#: en/help_topics/configuration.txt:378
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10508
msgid ""
10509
"    [/home/jdoe/branches/nethack]\n"
10510
"    email = Nethack Admin <nethack@nethack.com>"
10511
msgstr ""
10512
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10513
#: en/help_topics/configuration.txt:381
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10514
msgid ""
10515
"    [http://hypothetical.site.com/branches/devel-branch]\n"
10516
"    create_signatures = always"
10517
msgstr ""
10518
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10519
#: en/help_topics/configuration.txt:384
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10520
msgid ""
10521
"The authentication configuration file, authentication.conf\n"
10522
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10523
msgstr ""
10524
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10525
#: en/help_topics/configuration.txt:387
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10526
msgid ""
10527
"``authentication.conf`` allows one to specify credentials for\n"
10528
"remote servers. This can be used for all the supported transports and any "
10529
"part\n"
10530
"of bzr that requires authentication (smtp for example)."
10531
msgstr ""
10532
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10533
#: en/help_topics/configuration.txt:391
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10534
msgid ""
10535
"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
10536
"option policies which don't apply."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10537
msgstr ""
10538
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10539
#: en/help_topics/configuration.txt:394
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10540
msgid ""
10541
"For more information on the possible uses of the authentication "
10542
"configuration\n"
10543
"file see :doc:`authentication-help`."
10544
msgstr ""
10545
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10546
#: en/help_topics/configuration.txt:397
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10547
msgid ""
10548
"\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10549
"Common options\n"
10550
"--------------"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10551
msgstr ""
10552
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10553
#: en/help_topics/configuration.txt:401
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10554
msgid ""
10555
"debug_flags\n"
10556
"~~~~~~~~~~~"
10557
msgstr ""
10558
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10559
#: en/help_topics/configuration.txt:404
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10560
msgid ""
10561
"A comma-separated list of debugging options to turn on.  The same values\n"
10562
"can be used as with the -D command-line option (see `help global-options`).\n"
10563
"For example::"
10564
msgstr ""
10565
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10566
#: en/help_topics/configuration.txt:408
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10567
msgid "    debug_flags = hpss"
10568
msgstr ""
10569
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10570
#: en/help_topics/configuration.txt:412
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10571
msgid "    debug_flags = hpss,evil"
10572
msgstr ""
10573
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10574
#: en/help_topics/configuration.txt:414
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10575
msgid ""
10576
"email\n"
10577
"~~~~~"
10578
msgstr ""
10579
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10580
#: en/help_topics/configuration.txt:417
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10581
msgid ""
10582
"The email address to use when committing a branch. Typically takes the form\n"
10583
"of::"
10584
msgstr ""
10585
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10586
#: en/help_topics/configuration.txt:420
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10587
msgid "    email = Full Name <account@hostname.tld>"
10588
msgstr ""
10589
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10590
#: en/help_topics/configuration.txt:422
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10591
msgid ""
10592
"editor\n"
10593
"~~~~~~"
10594
msgstr ""
10595
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10596
#: en/help_topics/configuration.txt:425
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10597
msgid ""
10598
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10599
"a commit message. This setting is trumped by the environment variable\n"
10600
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10601
"variables."
10602
msgstr ""
10603
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10604
#: en/help_topics/configuration.txt:430
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10605
msgid ""
10606
"log_format\n"
10607
"~~~~~~~~~~"
10608
msgstr ""
10609
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10610
#: en/help_topics/configuration.txt:433
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10611
msgid ""
10612
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10613
"and ``line``. Additional formats may be provided by plugins. The default\n"
10614
"value is ``long``."
10615
msgstr ""
10616
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10617
#: en/help_topics/configuration.txt:437
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10618
msgid ""
10619
"check_signatures\n"
10620
"~~~~~~~~~~~~~~~~"
10621
msgstr ""
10622
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10623
#: en/help_topics/configuration.txt:440
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10624
msgid ""
10625
"Reserved for future use.  These options will allow a policy for branches to\n"
10626
"require signatures."
10627
msgstr ""
10628
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10629
#: en/help_topics/configuration.txt:443
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10630
msgid ""
10631
"require\n"
10632
"    The gnupg signature for revisions must be present and must be valid."
10633
msgstr ""
10634
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10635
#: en/help_topics/configuration.txt:446
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10636
msgid ""
10637
"ignore\n"
10638
"    Do not check gnupg signatures of revisions."
10639
msgstr ""
10640
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10641
#: en/help_topics/configuration.txt:449
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10642
msgid ""
10643
"check-available\n"
10644
"    (default) If gnupg signatures for revisions are present, check them.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10645
"    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
10646
"    no signature is present."
10647
msgstr ""
10648
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10649
#: en/help_topics/configuration.txt:454
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10650
msgid ""
10651
"create_signatures\n"
10652
"~~~~~~~~~~~~~~~~~"
10653
msgstr ""
10654
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10655
#: en/help_topics/configuration.txt:457
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10656
msgid ""
10657
"Defines the behaviour of signing revisions on commits.  By default bzr will "
10658
"not\n"
10659
"sign new commits."
10660
msgstr ""
10661
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10662
#: en/help_topics/configuration.txt:460
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10663
msgid ""
10664
"always\n"
10665
"    Sign every new revision that is committed.  If the signing fails then "
10666
"the\n"
10667
"    commit will not be made."
10668
msgstr ""
10669
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10670
#: en/help_topics/configuration.txt:464
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10671
msgid ""
10672
"when-required\n"
10673
"    Reserved for future use."
10674
msgstr ""
10675
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10676
#: en/help_topics/configuration.txt:467
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10677
msgid ""
10678
"never\n"
10679
"    Reserved for future use."
10680
msgstr ""
10681
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10682
#: en/help_topics/configuration.txt:470
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10683
msgid ""
10684
"In future it is planned that ``when-required`` will sign newly\n"
10685
"committed revisions only when the branch requires them.  ``never`` will "
10686
"refuse\n"
10687
"to sign newly committed revisions, even if the branch requires signatures."
10688
msgstr ""
10689
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10690
#: en/help_topics/configuration.txt:474
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10691
msgid ""
10692
"dirstate.fdatasync\n"
10693
"~~~~~~~~~~~~~~~~~~"
10694
msgstr ""
10695
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10696
#: en/help_topics/configuration.txt:477
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10697
msgid ""
10698
"If true (default), working tree metadata changes are flushed through the\n"
10699
"OS buffers to physical disk.  This is somewhat slower, but means data\n"
10700
"should not be lost if the machine crashes.  See also repository.fdatasync."
10701
msgstr ""
10702
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10703
#: en/help_topics/configuration.txt:481
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10704
msgid ""
10705
"gpg_signing_key\n"
10706
"~~~~~~~~~~~~~~~"
10707
msgstr ""
10708
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10709
#: en/help_topics/configuration.txt:484
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10710
msgid ""
10711
"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
10712
"address, key fingerprint or full key ID.  When unset or when set to\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10713
"\"default\" Breezy will use the user e-mail set with ``whoami``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10714
msgstr ""
10715
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10716
#: en/help_topics/configuration.txt:488
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10717
msgid ""
10718
"recurse\n"
10719
"~~~~~~~"
10720
msgstr ""
10721
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10722
#: en/help_topics/configuration.txt:491
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10723
msgid ""
10724
"Only useful in ``locations.conf``. Defines whether or not the\n"
10725
"configuration for this section applies to subdirectories:"
10726
msgstr ""
10727
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10728
#: en/help_topics/configuration.txt:494
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10729
msgid ""
10730
"true\n"
10731
"    (default) This section applies to subdirectories as well."
10732
msgstr ""
10733
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10734
#: en/help_topics/configuration.txt:497
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10735
msgid ""
10736
"false\n"
10737
"    This section only applies to the branch at this directory and not\n"
10738
"    branches below it."
10739
msgstr ""
10740
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10741
#: en/help_topics/configuration.txt:501
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10742
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10743
"bzr_remote_path\n"
10744
"~~~~~~~~~~~~~~~"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10745
msgstr ""
10746
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10747
#: en/help_topics/configuration.txt:504
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10748
msgid ""
10749
"(Default: \"bzr\").  The path to the command that should be used to run the "
10750
"smart\n"
10751
"server for bzr.  This value may only be specified in locations.conf, because:"
10752
msgstr ""
10753
7185.1.1 by Jelmer Vernooij
Update pot file.
10754
#: en/help_topics/configuration.txt:507
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10755
msgid ""
10756
"- it's needed before branch.conf is accessible\n"
10757
"- allowing remote branch.conf files to specify commands would be a security\n"
10758
"  risk"
10759
msgstr ""
10760
7185.1.1 by Jelmer Vernooij
Update pot file.
10761
#: en/help_topics/configuration.txt:511
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10762
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10763
msgstr ""
10764
7185.1.1 by Jelmer Vernooij
Update pot file.
10765
#: en/help_topics/configuration.txt:513
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10766
msgid ""
10767
"smtp_server\n"
10768
"~~~~~~~~~~~"
10769
msgstr ""
10770
7185.1.1 by Jelmer Vernooij
Update pot file.
10771
#: en/help_topics/configuration.txt:516
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10772
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10773
"(Default: \"localhost\"). SMTP server to use when Breezy needs to send\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10774
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10775
msgstr ""
10776
7185.1.1 by Jelmer Vernooij
Update pot file.
10777
#: en/help_topics/configuration.txt:519
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10778
msgid ""
10779
"smtp_username, smtp_password\n"
10780
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10781
msgstr ""
10782
7185.1.1 by Jelmer Vernooij
Update pot file.
10783
#: en/help_topics/configuration.txt:522
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10784
msgid ""
10785
"User and password to authenticate to the SMTP server. If smtp_username\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10786
"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
10787
"These settings are only needed if the SMTP server requires authentication\n"
10788
"to send mail."
10789
msgstr ""
10790
7185.1.1 by Jelmer Vernooij
Update pot file.
10791
#: en/help_topics/configuration.txt:527
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10792
msgid ""
10793
"locks.steal_dead\n"
10794
"~~~~~~~~~~~~~~~~"
10795
msgstr ""
10796
7185.1.1 by Jelmer Vernooij
Update pot file.
10797
#: en/help_topics/configuration.txt:530
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10798
msgid ""
10799
"If set to true, bzr will automatically break locks held by processes from\n"
10800
"the same machine and user that are no longer alive.  Otherwise, it will\n"
10801
"print a message and you can break the lock manually, if you are satisfied\n"
10802
"the object is no longer in use."
10803
msgstr ""
10804
7185.1.1 by Jelmer Vernooij
Update pot file.
10805
#: en/help_topics/configuration.txt:535
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10806
msgid ""
10807
"mail_client\n"
10808
"~~~~~~~~~~~"
10809
msgstr ""
10810
7185.1.1 by Jelmer Vernooij
Update pot file.
10811
#: en/help_topics/configuration.txt:538
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10812
msgid ""
10813
"A mail client to use for sending merge requests.\n"
10814
"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
10815
"it\n"
10816
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10817
"``editor``."
10818
msgstr ""
10819
7185.1.1 by Jelmer Vernooij
Update pot file.
10820
#: en/help_topics/configuration.txt:543
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10821
msgid "Supported values for specific clients:"
10822
msgstr ""
10823
7185.1.1 by Jelmer Vernooij
Update pot file.
10824
#: en/help_topics/configuration.txt:545
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10825
msgid ""
10826
":claws: Use Claws.  This skips a dialog for attaching files.\n"
10827
":evolution: Use Evolution.\n"
10828
":kmail: Use KMail.\n"
10829
":mutt: Use Mutt.\n"
10830
":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
10831
"1.5,\n"
10832
"    this works around some bugs that xdg-email doesn't handle."
10833
msgstr ""
10834
7185.1.1 by Jelmer Vernooij
Update pot file.
10835
#: en/help_topics/configuration.txt:552
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10836
msgid "Supported generic values are:"
10837
msgstr ""
10838
7185.1.1 by Jelmer Vernooij
Update pot file.
10839
#: en/help_topics/configuration.txt:554
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10840
msgid ""
10841
":default: See above.\n"
10842
":editor: Use your editor to compose the merge request.  This also uses\n"
10843
"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10844
"    smtp_username and smtp_password.\n"
10845
":mapi: Use your preferred e-mail client on Windows.\n"
10846
":xdg-email: Use xdg-email to run your preferred mail program"
10847
msgstr ""
10848
7185.1.1 by Jelmer Vernooij
Update pot file.
10849
#: en/help_topics/configuration.txt:561
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10850
msgid ""
10851
"repository.fdatasync\n"
10852
"~~~~~~~~~~~~~~~~~~~~"
10853
msgstr ""
10854
7185.1.1 by Jelmer Vernooij
Update pot file.
10855
#: en/help_topics/configuration.txt:564
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10856
msgid ""
10857
"If true (default), repository changes are flushed through the OS buffers\n"
10858
"to physical disk.  This is somewhat slower, but means data should not be\n"
10859
"lost if the machine crashes.  See also dirstate.fdatasync."
10860
msgstr ""
10861
7185.1.1 by Jelmer Vernooij
Update pot file.
10862
#: en/help_topics/configuration.txt:568
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10863
msgid ""
10864
"submit_branch\n"
10865
"~~~~~~~~~~~~~"
10866
msgstr ""
10867
7185.1.1 by Jelmer Vernooij
Update pot file.
10868
#: en/help_topics/configuration.txt:571
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10869
msgid ""
10870
"The branch you intend to submit your current work to.  This is "
10871
"automatically\n"
10872
"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
10873
"This\n"
10874
"should usually be set on a per-branch or per-location basis."
10875
msgstr ""
10876
7185.1.1 by Jelmer Vernooij
Update pot file.
10877
#: en/help_topics/configuration.txt:575
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10878
msgid ""
10879
"public_branch\n"
10880
"~~~~~~~~~~~~~"
10881
msgstr ""
10882
7185.1.1 by Jelmer Vernooij
Update pot file.
10883
#: en/help_topics/configuration.txt:578
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10884
msgid ""
10885
"A publically-accessible version of this branch (implying that this version "
10886
"is\n"
10887
"not publically-accessible).  Used (and set) by ``bzr send``."
10888
msgstr ""
10889
7185.1.1 by Jelmer Vernooij
Update pot file.
10890
#: en/help_topics/configuration.txt:581
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10891
msgid ""
10892
"suppress_warnings\n"
10893
"~~~~~~~~~~~~~~~~~"
10894
msgstr ""
10895
7185.1.1 by Jelmer Vernooij
Update pot file.
10896
#: en/help_topics/configuration.txt:584
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10897
msgid ""
10898
"A list of strings, each string represent a warning that can be emitted by\n"
10899
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10900
msgstr ""
10901
7185.1.1 by Jelmer Vernooij
Update pot file.
10902
#: en/help_topics/configuration.txt:587
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10903
msgid "Valid values:"
10904
msgstr ""
10905
7185.1.1 by Jelmer Vernooij
Update pot file.
10906
#: en/help_topics/configuration.txt:589
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10907
msgid ""
10908
"* ``format_deprecation``:\n"
10909
"    whether the format deprecation warning is shown on repositories that "
10910
"are\n"
10911
"    using deprecated formats."
10912
msgstr ""
10913
7185.1.1 by Jelmer Vernooij
Update pot file.
10914
#: en/help_topics/configuration.txt:593
10915
msgid ""
10916
"* ``insecure_permissions``:\n"
10917
"    whether a warning is shown if ``authentication.conf`` can be read\n"
10918
"    by other users."
10919
msgstr ""
10920
10921
#: en/help_topics/configuration.txt:597
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10922
msgid ""
10923
"default_format\n"
10924
"~~~~~~~~~~~~~~"
10925
msgstr ""
10926
7185.1.1 by Jelmer Vernooij
Update pot file.
10927
#: en/help_topics/configuration.txt:600
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10928
msgid ""
10929
"A format name for the default format used when creating branches.  See "
10930
"``bzr\n"
10931
"help formats`` for possible values."
10932
msgstr ""
10933
7185.1.1 by Jelmer Vernooij
Update pot file.
10934
#: en/help_topics/configuration.txt:603
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10935
msgid ""
10936
"\n"
10937
"Unicode options\n"
10938
"---------------"
10939
msgstr ""
10940
7185.1.1 by Jelmer Vernooij
Update pot file.
10941
#: en/help_topics/configuration.txt:607
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10942
msgid ""
10943
"output_encoding\n"
10944
"~~~~~~~~~~~~~~~"
10945
msgstr ""
10946
7185.1.1 by Jelmer Vernooij
Update pot file.
10947
#: en/help_topics/configuration.txt:610
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10948
msgid ""
10949
"A Python unicode encoding name for text output from bzr, such as log\n"
10950
"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
10951
"is the terminal encoding prefered by the operating system."
10952
msgstr ""
10953
7185.1.1 by Jelmer Vernooij
Update pot file.
10954
#: en/help_topics/configuration.txt:614
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10955
msgid ""
10956
"\n"
10957
"Branch type specific options\n"
10958
"----------------------------"
10959
msgstr ""
10960
7185.1.1 by Jelmer Vernooij
Update pot file.
10961
#: en/help_topics/configuration.txt:618
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10962
msgid ""
10963
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10964
"later format.  They\n"
10965
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10966
"manually set in ``locations.conf`` or ``breezy.conf``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10967
msgstr ""
10968
7185.1.1 by Jelmer Vernooij
Update pot file.
10969
#: en/help_topics/configuration.txt:623
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10970
msgid ""
10971
"append_revisions_only\n"
10972
"~~~~~~~~~~~~~~~~~~~~~"
10973
msgstr ""
10974
7185.1.1 by Jelmer Vernooij
Update pot file.
10975
#: en/help_topics/configuration.txt:626
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10976
msgid ""
10977
"If set to \"True\" then revisions can only be appended to the log, not\n"
10978
"removed.  A branch with this setting enabled can only pull from another\n"
10979
"branch if the other branch's log is a longer version of its own.  This is\n"
10980
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10981
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10982
"compatibility with previous bzr versions (older than 2.2)."
10983
msgstr ""
10984
7185.1.1 by Jelmer Vernooij
Update pot file.
10985
#: en/help_topics/configuration.txt:633
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10986
msgid ""
10987
"parent_location\n"
10988
"~~~~~~~~~~~~~~~"
10989
msgstr ""
10990
7185.1.1 by Jelmer Vernooij
Update pot file.
10991
#: en/help_topics/configuration.txt:636
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10992
msgid ""
10993
"If present, the location of the default branch for pull or merge.  This "
10994
"option\n"
10995
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10996
"--remember``."
10997
msgstr ""
10998
7185.1.1 by Jelmer Vernooij
Update pot file.
10999
#: en/help_topics/configuration.txt:640
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11000
msgid ""
11001
"push_location\n"
11002
"~~~~~~~~~~~~~"
11003
msgstr ""
11004
7185.1.1 by Jelmer Vernooij
Update pot file.
11005
#: en/help_topics/configuration.txt:643
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11006
msgid ""
11007
"If present, the location of the default branch for push.  This option\n"
11008
"is normally set by the first ``push`` or ``push --remember``."
11009
msgstr ""
11010
7185.1.1 by Jelmer Vernooij
Update pot file.
11011
#: en/help_topics/configuration.txt:646
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11012
msgid ""
11013
"push_strict\n"
11014
"~~~~~~~~~~~"
11015
msgstr ""
11016
7185.1.1 by Jelmer Vernooij
Update pot file.
11017
#: en/help_topics/configuration.txt:649
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11018
msgid ""
11019
"If present, defines the ``--strict`` option default value for checking\n"
11020
"uncommitted changes before pushing."
11021
msgstr ""
11022
7185.1.1 by Jelmer Vernooij
Update pot file.
11023
#: en/help_topics/configuration.txt:652
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11024
msgid ""
11025
"bound_location\n"
11026
"~~~~~~~~~~~~~~"
11027
msgstr ""
11028
7185.1.1 by Jelmer Vernooij
Update pot file.
11029
#: en/help_topics/configuration.txt:655
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11030
msgid ""
11031
"The location that commits should go to when acting as a checkout.\n"
11032
"This option is normally set by ``bind``."
11033
msgstr ""
11034
7185.1.1 by Jelmer Vernooij
Update pot file.
11035
#: en/help_topics/configuration.txt:658
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11036
msgid ""
11037
"bound\n"
11038
"~~~~~"
11039
msgstr ""
11040
7185.1.1 by Jelmer Vernooij
Update pot file.
11041
#: en/help_topics/configuration.txt:661
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11042
msgid ""
11043
"If set to \"True\", the branch should act as a checkout, and push each "
11044
"commit to\n"
11045
"the bound_location.  This option is normally set by ``bind``/``unbind``."
11046
msgstr ""
11047
7185.1.1 by Jelmer Vernooij
Update pot file.
11048
#: en/help_topics/configuration.txt:664
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11049
msgid ""
11050
"send_strict\n"
11051
"~~~~~~~~~~~"
11052
msgstr ""
11053
7185.1.1 by Jelmer Vernooij
Update pot file.
11054
#: en/help_topics/configuration.txt:667
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11055
msgid ""
11056
"If present, defines the ``--strict`` option default value for checking\n"
11057
"uncommitted changes before sending a merge directive."
11058
msgstr ""
11059
7185.1.1 by Jelmer Vernooij
Update pot file.
11060
#: en/help_topics/configuration.txt:670
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11061
msgid ""
11062
"add.maximum_file_size\n"
11063
"~~~~~~~~~~~~~~~~~~~~~"
11064
msgstr ""
11065
7185.1.1 by Jelmer Vernooij
Update pot file.
11066
#: en/help_topics/configuration.txt:673
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11067
msgid ""
11068
"Defines the maximum file size the command line \"add\" operation will allow\n"
11069
"in recursive mode, with files larger than this value being skipped. You "
11070
"may \n"
11071
"specify this value as an integer (in which case it is interpreted as "
11072
"bytes), \n"
11073
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
11074
"0 \n"
11075
"will disable skipping."
11076
msgstr ""
11077
7185.1.1 by Jelmer Vernooij
Update pot file.
11078
#: en/help_topics/configuration.txt:679
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11079
msgid ""
11080
"External Merge Tools\n"
11081
"--------------------"
11082
msgstr ""
11083
7185.1.1 by Jelmer Vernooij
Update pot file.
11084
#: en/help_topics/configuration.txt:682
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11085
msgid ""
11086
"bzr.mergetool.<name>\n"
11087
"~~~~~~~~~~~~~~~~~~~~"
11088
msgstr ""
11089
7185.1.1 by Jelmer Vernooij
Update pot file.
11090
#: en/help_topics/configuration.txt:685
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11091
msgid ""
11092
"Defines an external merge tool called <name> with the given command-line.\n"
11093
"Arguments containing spaces should be quoted using single or double quotes. "
11094
"The\n"
11095
"executable may omit its path if it can be found on the PATH."
11096
msgstr ""
11097
7185.1.1 by Jelmer Vernooij
Update pot file.
11098
#: en/help_topics/configuration.txt:689
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11099
msgid ""
11100
"The following markers can be used in the command-line to substitute "
11101
"filenames\n"
11102
"involved in the merge conflict::"
11103
msgstr ""
11104
7185.1.1 by Jelmer Vernooij
Update pot file.
11105
#: en/help_topics/configuration.txt:692
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11106
msgid ""
11107
"  {base}      file.BASE\n"
11108
"  {this}      file.THIS\n"
11109
"  {other}     file.OTHER\n"
11110
"  {result}    output file\n"
11111
"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
11112
"merge\n"
11113
"              succeeds."
11114
msgstr ""
11115
7185.1.1 by Jelmer Vernooij
Update pot file.
11116
#: en/help_topics/configuration.txt:701
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11117
msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11118
msgstr ""
11119
7185.1.1 by Jelmer Vernooij
Update pot file.
11120
#: en/help_topics/configuration.txt:703
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11121
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
11122
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
11123
"interpolation markers, trying to display the mergetool line results in the\n"
11124
"following problem::"
11125
msgstr ""
11126
7185.1.1 by Jelmer Vernooij
Update pot file.
11127
#: en/help_topics/configuration.txt:707
6581.1.2 by Vincent Ladeuil
Update translation template.
11128
msgid ""
11129
"\n"
11130
"  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
11131
"{result}'\n"
11132
"  $ bzr config bzr.mergetool.kdiff3\n"
11133
"  bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
11134
"{this} {other} -o {result}\"."
11135
msgstr ""
11136
7185.1.1 by Jelmer Vernooij
Update pot file.
11137
#: en/help_topics/configuration.txt:712
6581.1.2 by Vincent Ladeuil
Update translation template.
11138
msgid ""
11139
"To avoid this, ``config`` can be instructed not to try expanding variables::"
11140
msgstr ""
11141
7185.1.1 by Jelmer Vernooij
Update pot file.
11142
#: en/help_topics/configuration.txt:714
6581.1.2 by Vincent Ladeuil
Update translation template.
11143
msgid ""
11144
"  $ bzr config --all bzr.mergetool.kdiff3\n"
11145
"  branch:\n"
11146
"    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11147
msgstr ""
11148
7185.1.1 by Jelmer Vernooij
Update pot file.
11149
#: en/help_topics/configuration.txt:718
6581.1.2 by Vincent Ladeuil
Update translation template.
11150
msgid ""
11151
"\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11152
"bzr.default_mergetool\n"
11153
"~~~~~~~~~~~~~~~~~~~~~"
11154
msgstr ""
11155
7185.1.1 by Jelmer Vernooij
Update pot file.
11156
#: en/help_topics/configuration.txt:722
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11157
msgid ""
11158
"Specifies which external merge tool (as defined above) should be selected "
11159
"by\n"
11160
"default in tools such as ``bzr qconflicts``."
11161
msgstr ""
11162
7185.1.1 by Jelmer Vernooij
Update pot file.
11163
#: en/help_topics/configuration.txt:727
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11164
msgid "  bzr.default_mergetool = kdiff3\n"
11165
msgstr ""
11166
11167
#: en/help_topics/conflict-types.txt:1
11168
msgid ""
11169
"Conflict Types\n"
11170
"=============="
11171
msgstr ""
11172
11173
#: en/help_topics/conflict-types.txt:4
11174
msgid ""
11175
"Some operations, like merge, revert and pull, modify the contents of your\n"
11176
"working tree.  These modifications are programmatically generated, and so "
11177
"they\n"
11178
"may conflict with the current state of your working tree. "
11179
msgstr ""
11180
11181
#: en/help_topics/conflict-types.txt:8
11182
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11183
"When conflicts are present in your working tree (as shown by ``brz\n"
11184
"conflicts``), you should resolve them and then inform brz that the "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11185
"conflicts\n"
11186
"have been resolved."
11187
msgstr ""
11188
11189
#: en/help_topics/conflict-types.txt:12
11190
msgid ""
11191
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11192
"should resolve them is not the one responsible for their occurrence, as is "
11193
"the\n"
11194
"case when merging other people's work or because some conflicts are "
11195
"presented\n"
11196
"in a way that is not easy to understand."
11197
msgstr ""
11198
11199
#: en/help_topics/conflict-types.txt:17
11200
msgid ""
11201
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11202
"conflict if and only if there's an actual conceptual conflict in the source\n"
11203
"tree.  Because Bazaar doesn't understand the real meaning of the files "
11204
"being\n"
11205
"versioned, it can, when faced with ambiguities, fall short in either "
11206
"direction\n"
11207
"trying to resolve the conflict itself. Many kinds of changes can be "
11208
"combined\n"
11209
"programmatically, but sometimes only a human can determine the right thing "
11210
"to\n"
11211
"do."
11212
msgstr ""
11213
11214
#: en/help_topics/conflict-types.txt:25
11215
msgid ""
11216
"When Bazaar generates a conflict, it adds information into the working tree "
11217
"to\n"
11218
"present the conflicting versions, and it's up to you to find the correct\n"
11219
"resolution."
11220
msgstr ""
11221
11222
#: en/help_topics/conflict-types.txt:29
11223
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11224
msgstr ""
11225
11226
#: en/help_topics/conflict-types.txt:31
11227
msgid ""
11228
"1. Modify the working tree content so that the conflicted item is now in "
11229
"the\n"
11230
"   state you want to keep, then"
11231
msgstr ""
11232
11233
#: en/help_topics/conflict-types.txt:34
11234
msgid ""
11235
"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.
11236
"   remaining generated information (``brz resolve <item>``)."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11237
msgstr ""
11238
11239
#: en/help_topics/conflict-types.txt:37
11240
msgid ""
11241
"For most conflict types, there are some obvious ways to modify the working\n"
11242
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11243
"itself already made a choice, when possible."
11244
msgstr ""
11245
11246
#: en/help_topics/conflict-types.txt:41
11247
msgid ""
11248
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11249
"different ways to resolve the conflict."
11250
msgstr ""
11251
11252
#: en/help_topics/conflict-types.txt:44
11253
msgid ""
11254
"Each type of conflict is explained below, and the action which must be done "
11255
"to\n"
11256
"resolve the conflict is outlined."
11257
msgstr ""
11258
11259
#: en/help_topics/conflict-types.txt:47
11260
msgid ""
11261
"Various actions are available depending on the kind of conflict, for some "
11262
"of\n"
11263
"these actions, Bazaar can provide some help. In the end you should at least\n"
11264
"inform Bazaar that you're done with the conflict with::"
11265
msgstr ""
11266
11267
#: en/help_topics/conflict-types.txt:51
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11268
msgid "  ``brz resolve FILE --action=done'"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11269
msgstr ""
11270
11271
#: en/help_topics/conflict-types.txt:53
11272
msgid ""
11273
"Note that this is the default action when a single file is involved so you "
11274
"can\n"
11275
"simply use::"
11276
msgstr ""
11277
11278
#: en/help_topics/conflict-types.txt:56
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11279
msgid "   ``brz resolve FILE``"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11280
msgstr ""
11281
11282
#: en/help_topics/conflict-types.txt:58
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11283
msgid "See ``brz help resolve`` for more details."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11284
msgstr ""
11285
11286
#: en/help_topics/conflict-types.txt:60
11287
msgid ""
11288
"Text conflicts\n"
11289
"--------------"
11290
msgstr ""
11291
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11292
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11293
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11294
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11295
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11296
#: 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
11297
msgid "Typical message::"
11298
msgstr ""
11299
11300
#: en/help_topics/conflict-types.txt:65
11301
msgid "  Text conflict in FILE"
11302
msgstr ""
11303
11304
#: en/help_topics/conflict-types.txt:67
11305
msgid ""
11306
"These are produced when a text merge cannot completely reconcile two sets "
11307
"of\n"
11308
"text changes.  Bazaar will emit files for each version with the extensions\n"
11309
"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
11310
"tree,\n"
11311
"i.e. the tree that you are merging changes into.  OTHER is the version that "
11312
"you\n"
11313
"are merging into the target.  BASE is an older version that is used as a "
11314
"basis\n"
11315
"for comparison."
11316
msgstr ""
11317
11318
#: en/help_topics/conflict-types.txt:74
11319
msgid ""
11320
"In the main copy of the file, Bazaar will include all the changes that it\n"
11321
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11322
"\"herringbone\" markers like ``<<<<<<<``."
11323
msgstr ""
11324
11325
#: en/help_topics/conflict-types.txt:78
11326
msgid ""
11327
"Say the initial text is \"The project leader released it.\", and THIS "
11328
"modifies it\n"
11329
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11330
"leader\n"
11331
"released Bazaar.\"  A conflict would look like this::"
11332
msgstr ""
11333
11334
#: en/help_topics/conflict-types.txt:82
11335
msgid ""
11336
"  <<<<<<< TREE\n"
11337
"  Martin Pool released it.\n"
11338
"  =======\n"
11339
"  The project leader released Bazaar.\n"
11340
"  >>>>>>> MERGE-SOURCE"
11341
msgstr ""
11342
11343
#: en/help_topics/conflict-types.txt:88
11344
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11345
msgstr ""
11346
11347
#: en/help_topics/conflict-types.txt:90
11348
msgid ""
11349
"You can handle text conflicts either by editing the main copy of the file,\n"
11350
"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
11351
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11352
"set of changes over the other (but see below when you encounter these\n"
11353
"cases).  More often, the two sets of changes must be intelligently combined."
11354
msgstr ""
11355
11356
#: en/help_topics/conflict-types.txt:96
11357
msgid ""
11358
"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
11359
"you are done editing, the file should look like it never had a conflict, and "
11360
"be\n"
11361
"ready to commit."
11362
msgstr ""
11363
11364
#: en/help_topics/conflict-types.txt:100
11365
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11366
"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
11367
"Bazaar will auto-detect which conflicts you have resolved."
11368
msgstr ""
11369
11370
#: en/help_topics/conflict-types.txt:103
11371
msgid ""
11372
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11373
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11374
"working tree."
11375
msgstr ""
11376
11377
#: en/help_topics/conflict-types.txt:107
11378
msgid ""
11379
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11380
"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
11381
"resolve`` with one of the following actions:"
11382
msgstr ""
11383
11384
#: en/help_topics/conflict-types.txt:111
11385
msgid ""
11386
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11387
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11388
msgstr ""
11389
11390
#: en/help_topics/conflict-types.txt:114
11391
msgid ""
11392
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11393
"modifications will be taken into account."
11394
msgstr ""
11395
11396
#: en/help_topics/conflict-types.txt:117
11397
msgid ""
11398
"Content conflicts\n"
11399
"-----------------"
11400
msgstr ""
11401
11402
#: en/help_topics/conflict-types.txt:122
11403
msgid "  Contents conflict in FILE"
11404
msgstr ""
11405
11406
#: en/help_topics/conflict-types.txt:124
11407
msgid ""
11408
"This conflict happens when there are conflicting changes in the working "
11409
"tree\n"
11410
"and the merge source, but the conflicted items are not text files.  They "
11411
"may\n"
11412
"be binary files, or symlinks, or directories.  It can even happen with "
11413
"files\n"
11414
"that are deleted on one side, and modified on the other."
11415
msgstr ""
11416
11417
#: en/help_topics/conflict-types.txt:129
11418
msgid ""
11419
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
11420
"be\n"
11421
"regular files, symlinks or directories).  But it will not include a \"main "
11422
"copy\"\n"
11423
"of the file with herringbone conflict markers.  It will appear that the "
11424
"\"main\n"
11425
"copy\" has been renamed to THIS or OTHER."
11426
msgstr ""
11427
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11428
#: 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
11429
msgid ""
11430
"To resolve that kind of conflict, you should rebuild FILE from either "
11431
"version\n"
11432
"or a combination of both."
11433
msgstr ""
11434
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11435
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11436
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11437
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11438
#: en/help_topics/conflict-types.txt:361
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11439
msgid "``brz resolve`` recognizes the following actions:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11440
msgstr ""
11441
11442
#: en/help_topics/conflict-types.txt:139
11443
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11444
"* ``--action=take-this`` will issue ``brz mv FILE.THIS FILE``,\n"
11445
"* ``--action=take-other`` will issue ``brz mv FILE.OTHER FILE``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11446
"* ``--action=done`` will just mark the conflict as resolved."
11447
msgstr ""
11448
11449
#: en/help_topics/conflict-types.txt:143
11450
msgid ""
11451
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11452
"and\n"
11453
"``.OTHER`` files if they are still present in the working tree."
11454
msgstr ""
11455
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11456
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11457
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11458
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11459
#: en/help_topics/conflict-types.txt:369
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11460
msgid ""
11461
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11462
msgstr ""
11463
11464
#: en/help_topics/conflict-types.txt:148
11465
msgid ""
11466
"Tag conflicts\n"
11467
"-------------"
11468
msgstr ""
11469
11470
#: en/help_topics/conflict-types.txt:153
11471
msgid ""
11472
"  Conflicting tags:\n"
11473
"      version-0.1"
11474
msgstr ""
11475
11476
#: en/help_topics/conflict-types.txt:156
11477
msgid ""
11478
"When pulling from or pushing to another branch, Bazaar informs you about "
11479
"tags\n"
11480
"that conflict between the two branches; that is the same tag points to two\n"
11481
"different revisions.  You need not resolve these conflicts, but subsequent\n"
11482
"uses of pull or push will result in the same message."
11483
msgstr ""
11484
11485
#: en/help_topics/conflict-types.txt:161
11486
msgid ""
11487
"To resolve the conflict, you must apply the correct tags to either the "
11488
"target\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11489
"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
11490
"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
11491
"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.
11492
"``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
11493
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11494
"source\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11495
"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
11496
"favor of the target branch, you need to similarly use ``tag --force`` in "
11497
"the\n"
11498
"source branch.  (Note that pulling or pushing using --overwrite will "
11499
"overwrite\n"
11500
"all tags as well.)"
11501
msgstr ""
11502
11503
#: en/help_topics/conflict-types.txt:172
11504
msgid ""
11505
"Duplicate paths\n"
11506
"---------------"
11507
msgstr ""
11508
11509
#: en/help_topics/conflict-types.txt:177
11510
msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
11511
msgstr ""
11512
11513
#: en/help_topics/conflict-types.txt:179
11514
msgid ""
11515
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11516
"already been used.  The existing file will be renamed to \"FILE.moved\".  "
11517
msgstr ""
11518
11519
#: en/help_topics/conflict-types.txt:187
11520
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11521
"* ``--action=take-this`` will issue ``brz rm FILE ; brz mv FILE.moved "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11522
"FILE``,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11523
"* ``--action=take-other`` will issue ``brz rm FILE.moved``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11524
"* ``--action=done`` will just mark the conflict as resolved."
11525
msgstr ""
11526
11527
#: en/help_topics/conflict-types.txt:191
11528
msgid ""
11529
"Note that you must get rid of FILE.moved before using ``--action=done``."
11530
msgstr ""
11531
11532
#: en/help_topics/conflict-types.txt:195
11533
msgid ""
11534
"Unversioned parent\n"
11535
"------------------"
11536
msgstr ""
11537
11538
#: en/help_topics/conflict-types.txt:200
11539
msgid "    Conflict because FILE is not versioned, but has versioned children."
11540
msgstr ""
11541
11542
#: en/help_topics/conflict-types.txt:202
11543
msgid ""
11544
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11545
"not\n"
11546
"versioned.  This happens when the directory has been deleted in the target,\n"
11547
"but has a new child in the source, or vice versa.  In this situation, "
11548
"Bazaar\n"
11549
"will version the parent directory as well.  Resolving this issue depends\n"
11550
"very much on the particular scenario.  You may wish to rename or delete "
11551
"either\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11552
"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
11553
"resolve\n"
11554
"FILE\" to mark the conflict as resolved."
11555
msgstr ""
11556
11557
#: en/help_topics/conflict-types.txt:210
11558
msgid ""
11559
"Missing parent\n"
11560
"--------------"
11561
msgstr ""
11562
11563
#: en/help_topics/conflict-types.txt:215
11564
msgid "  Conflict adding files to FILE.  Created directory."
11565
msgstr ""
11566
11567
#: en/help_topics/conflict-types.txt:217
11568
msgid ""
11569
"This happens when a directory has been deleted in the target, but has new\n"
11570
"children in the source.  This is similar to the \"unversioned parent\" "
11571
"conflict,\n"
11572
"except that the parent directory does not *exist*, instead of just being\n"
11573
"unversioned.  In this situation, Bazaar will create the missing parent.\n"
11574
"Resolving this issue depends very much on the particular scenario."
11575
msgstr ""
11576
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11577
#: 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
11578
msgid ""
11579
"To resolve that kind of conflict, you should either remove or rename the\n"
11580
"children or the directory or a combination of both."
11581
msgstr ""
11582
11583
#: en/help_topics/conflict-types.txt:228
11584
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11585
"* ``--action=take-this`` will issue ``brz rm directory`` including the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11586
"  children,\n"
11587
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11588
"children\n"
11589
"  and restoring the directory,\n"
11590
"* ``--action=done`` will just mark the conflict as resolved."
11591
msgstr ""
11592
11593
#: en/help_topics/conflict-types.txt:236
11594
msgid ""
11595
"Deleting parent\n"
11596
"---------------"
11597
msgstr ""
11598
11599
#: en/help_topics/conflict-types.txt:241
11600
msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
11601
msgstr ""
11602
11603
#: en/help_topics/conflict-types.txt:243
11604
msgid ""
11605
"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
11606
"source, but has new children in the target (either because a directory\n"
11607
"deletion is merged or because the merge introduce new children).  Bazaar\n"
11608
"will retain the directory.  Resolving this issue depends very much on the\n"
11609
"particular scenario."
11610
msgstr ""
11611
11612
#: en/help_topics/conflict-types.txt:254
11613
msgid ""
11614
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11615
"directory,"
11616
msgstr ""
11617
11618
#: en/help_topics/conflict-types.txt:256
11619
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11620
"* ``--action=take-other`` will issue ``brz rm directory`` including the \n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11621
"  children,"
11622
msgstr ""
11623
11624
#: en/help_topics/conflict-types.txt:259
11625
msgid "* ``--action=done`` will just mark the conflict as resolved."
11626
msgstr ""
11627
11628
#: en/help_topics/conflict-types.txt:261
11629
msgid ""
11630
"Note that when merging a directory deletion, if unversioned files are\n"
11631
"present, they become potential orphans has they don't have a directory\n"
11632
"parent anymore."
11633
msgstr ""
11634
11635
#: en/help_topics/conflict-types.txt:265
11636
msgid ""
11637
"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.
11638
"setting the ``brz.transform.orphan_policy`` configuration option."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11639
msgstr ""
11640
11641
#: en/help_topics/conflict-types.txt:268
11642
msgid "There are two possible values for this option:"
11643
msgstr ""
11644
11645
#: en/help_topics/conflict-types.txt:270
11646
msgid ""
11647
"* ``conflict`` (the default): will leave the orphans in place and\n"
11648
"  generate a conflicts,"
11649
msgstr ""
11650
11651
#: en/help_topics/conflict-types.txt:273
11652
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11653
"* ``move``: will move the orphans to a ``brz-orphans`` directory at the "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11654
"root\n"
11655
"  of the working tree with names like ``<file>.~#~``."
11656
msgstr ""
11657
11658
#: en/help_topics/conflict-types.txt:278
11659
msgid ""
11660
"Path conflict\n"
11661
"-------------"
11662
msgstr ""
11663
11664
#: en/help_topics/conflict-types.txt:283
11665
msgid "  Path conflict: PATH1 / PATH2"
11666
msgstr ""
11667
11668
#: en/help_topics/conflict-types.txt:285
11669
msgid ""
11670
"This happens when the source and target have each modified the name or "
11671
"parent\n"
11672
"directory of a file.  Bazaar will use the path elements from the source."
11673
msgstr ""
11674
11675
#: en/help_topics/conflict-types.txt:288
11676
msgid ""
11677
"To resolve that kind of conflict, you just have to decide what name should "
11678
"be\n"
11679
"retained for the file involved."
11680
msgstr ""
11681
11682
#: en/help_topics/conflict-types.txt:293
11683
msgid ""
11684
"* ``--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.
11685
"  issuing ``brz mv PATH2 PATH1``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11686
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11687
"``PATH2``,\n"
11688
"* ``--action=done`` will just mark the conflict as resolved."
11689
msgstr ""
11690
11691
#: en/help_topics/conflict-types.txt:300
11692
msgid ""
11693
"Parent loop\n"
11694
"-----------"
11695
msgstr ""
11696
11697
#: en/help_topics/conflict-types.txt:305
11698
msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
11699
msgstr ""
11700
11701
#: en/help_topics/conflict-types.txt:307
11702
msgid ""
11703
"This happens when the source and the target have each moved directories, so\n"
11704
"that, if the change could be applied, a directory would be contained by "
11705
"itself.\n"
11706
"For example::"
11707
msgstr ""
11708
11709
#: en/help_topics/conflict-types.txt:311
11710
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11711
"  $ brz init\n"
11712
"  $ brz mkdir white\n"
11713
"  $ brz mkdir black\n"
11714
"  $ brz commit -m \"BASE\"\n"
11715
"  $ brz branch . ../other\n"
11716
"  $ brz mv white black\n"
11717
"  $ brz commit -m \"THIS\"\n"
11718
"  $ brz mv ../other/black ../other/white\n"
11719
"  $ brz commit ../other -m \"OTHER\"\n"
11720
"  $ brz merge ../other"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11721
msgstr ""
11722
11723
#: en/help_topics/conflict-types.txt:322
11724
msgid ""
11725
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11726
"``black``.  To resolve that kind of conflict, you just have to decide what\n"
11727
"name should be retained for the directories involved."
11728
msgstr ""
11729
11730
#: en/help_topics/conflict-types.txt:328
11731
msgid ""
11732
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11733
"``white`` \n"
11734
"  in ``black``,\n"
11735
"* ``--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.
11736
"   ``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
11737
"* ``--action=done`` will just mark the conflict as resolved."
11738
msgstr ""
11739
11740
#: en/help_topics/conflict-types.txt:336
11741
msgid ""
11742
"Non-directory parent\n"
11743
"--------------------"
11744
msgstr ""
11745
11746
#: en/help_topics/conflict-types.txt:341
11747
msgid ""
11748
"  Conflict: foo.new is not a directory, but has files in it.\n"
11749
"  Created directory."
11750
msgstr ""
11751
11752
#: en/help_topics/conflict-types.txt:344
11753
msgid ""
11754
"This happens when one side has added files to a directory, and the other "
11755
"side\n"
11756
"has changed the directory into a file or symlink.  For example::"
11757
msgstr ""
11758
11759
#: en/help_topics/conflict-types.txt:347
11760
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11761
"  $ brz init\n"
11762
"  $ brz mkdir foo\n"
11763
"  $ brz commit -m \"BASE\"\n"
11764
"  $ brz branch . ../other\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11765
"  $ rmdir foo\n"
11766
"  $ touch foo\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11767
"  $ brz commit -m \"THIS\"\n"
11768
"  $ brz mkdir ../other/foo/bar\n"
11769
"  $ brz commit ../other -m \"OTHER\"\n"
11770
"  $ brz merge ../other"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11771
msgstr ""
11772
11773
#: en/help_topics/conflict-types.txt:358
11774
msgid ""
11775
"To resolve that kind of conflict, you have to decide what name should be\n"
11776
"retained for the file, directory or symlink involved."
11777
msgstr ""
11778
11779
#: en/help_topics/conflict-types.txt:363
11780
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11781
"* ``--action=take-this`` will issue ``brz rm --force foo.new`` and \n"
11782
"  ``brz add foo``,\n"
11783
"* ``--action=take-other`` will issue ``brz rm --force foo`` and \n"
11784
"  ``brz mv foo.new foo``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11785
"* ``--action=done`` will just mark the conflict as resolved."
11786
msgstr ""
11787
11788
#: en/help_topics/conflict-types.txt:371
11789
msgid ""
11790
"MalformedTransform\n"
11791
"------------------"
11792
msgstr ""
11793
11794
#: en/help_topics/conflict-types.txt:374
11795
msgid ""
11796
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11797
"exception.  This means that Bazaar encountered a filesystem conflict that it "
11798
"was\n"
11799
"unable to resolve.  This usually indicates a bug.  Please let us know if "
11800
"you\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11801
"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
11802
msgstr ""
11803
11804
#: en/help_topics/content-filters.txt:1
11805
msgid ""
11806
"Content Filters\n"
11807
"==============="
11808
msgstr ""
11809
11810
#: en/help_topics/content-filters.txt:4
11811
msgid ""
11812
"Content formats\n"
11813
"---------------"
11814
msgstr ""
11815
11816
#: en/help_topics/content-filters.txt:7
11817
msgid ""
11818
"Bazaar's content filtering allows you to store files in a different\n"
11819
"format from the copy in your working tree.  This lets you, or your\n"
11820
"co-developers, use Windows development tools that expect CRLF files\n"
11821
"on projects that use other line-ending conventions. Among other things,\n"
11822
"content filters also let Unix developers more easily work on projects\n"
11823
"using Windows line-ending conventions, keyword expansion/compression,\n"
11824
"and trailing spaces on lines in text files to be implicitly stripped\n"
11825
"when committed."
11826
msgstr ""
11827
11828
#: en/help_topics/content-filters.txt:16
11829
msgid "To generalize, there are two content formats supported by Bazaar:"
11830
msgstr ""
11831
11832
#: en/help_topics/content-filters.txt:18
11833
msgid ""
11834
"* a canonical format - how files are stored internally\n"
11835
"* a convenience format - how files are created in a working tree."
11836
msgstr ""
11837
11838
#: en/help_topics/content-filters.txt:21
11839
msgid ""
11840
"\n"
11841
"Format conversion\n"
11842
"-----------------"
11843
msgstr ""
11844
11845
#: en/help_topics/content-filters.txt:25
11846
msgid ""
11847
"The conversion between these formats is done by content filters.\n"
11848
"A content filter has two parts:"
11849
msgstr ""
11850
11851
#: en/help_topics/content-filters.txt:28
11852
msgid ""
11853
"* a read converter - converts from convenience to canonical format\n"
11854
"* a write converter - converts from canonical to convenience format."
11855
msgstr ""
11856
11857
#: en/help_topics/content-filters.txt:31
11858
msgid ""
11859
"Many of these converters will provide *round-trip* conversion,\n"
11860
"i.e. applying the read converter followed by the write converter\n"
11861
"gives back the original content. However, others may provide an\n"
11862
"asymmetric conversion. For example, a read converter might strip\n"
11863
"trailing whitespace off lines in source code while the matching\n"
11864
"write converter might pass content through unchanged."
11865
msgstr ""
11866
11867
#: en/help_topics/content-filters.txt:38
11868
msgid ""
11869
"\n"
11870
"Enabling content filters\n"
11871
"------------------------"
11872
msgstr ""
11873
11874
#: en/help_topics/content-filters.txt:42
11875
msgid ""
11876
"Content filters are typically provided by plugins, so the first step\n"
11877
"in using them is to install the relevant plugins and read their\n"
11878
"documentation. Some plugins may be very specific about which files\n"
11879
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11880
"In other cases, the plugin may leave it in the user's hands to\n"
11881
"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.
11882
"using rule-based preferences. See ``brz help rules`` for general\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11883
"information about defining these."
11884
msgstr ""
11885
11886
#: en/help_topics/content-filters.txt:51
11887
msgid ""
11888
"\n"
11889
"Impact on commands\n"
11890
"------------------"
11891
msgstr ""
11892
11893
#: en/help_topics/content-filters.txt:55
11894
msgid ""
11895
"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.
11896
"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
11897
"will apply read converters to files in the working tree, then compare\n"
11898
"the results to the content last committed."
11899
msgstr ""
11900
11901
#: en/help_topics/content-filters.txt:60
11902
msgid ""
11903
"Write converters are only applied by commands that **create files in a\n"
11904
"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.
11905
"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
11906
"respectively."
11907
msgstr ""
11908
11909
#: en/help_topics/content-filters.txt:65
11910
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11911
"Note: ``brz commit`` does not implicitly apply write converters after\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11912
"comitting files. If this makes sense for a given plugin providing\n"
11913
"a content filter, the plugin can usually achieve this effect by using a\n"
11914
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11915
"for more information on hooks."
11916
msgstr ""
11917
11918
#: en/help_topics/content-filters.txt:71
11919
msgid ""
11920
"\n"
11921
"Refreshing your working tree\n"
11922
"----------------------------"
11923
msgstr ""
11924
11925
#: en/help_topics/content-filters.txt:75
11926
msgid ""
11927
"For performance reasons, Bazaar caches the timestamps of files in\n"
11928
"a working tree, and assumes files are unchanged if their timestamps\n"
11929
"match the cached values. As a consequence, there are times when\n"
11930
"you may need to explicitly ask for content filtering to be reapplied\n"
11931
"in one or both directions, e.g. after installing or reconfiguring\n"
11932
"plugins providing it."
11933
msgstr ""
11934
11935
#: en/help_topics/content-filters.txt:82
11936
msgid "Here are some general guidelines for doing this:"
11937
msgstr ""
11938
11939
#: en/help_topics/content-filters.txt:84
11940
msgid ""
11941
" * To reapply read converters, ``touch`` files, i.e. update their\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11942
"   timestamp. Operations like ``brz status`` should then reapply the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11943
"   relevant read converters and compare the end result with the\n"
11944
"   canonical format."
11945
msgstr ""
11946
11947
#: en/help_topics/content-filters.txt:89
11948
msgid ""
11949
" * To reapply write converters, ensure there are no local changes,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11950
"   delete the relevant files and run ``brz revert`` on those files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11951
msgstr ""
11952
11953
#: en/help_topics/content-filters.txt:92
11954
msgid ""
11955
"Note: In the future, it is likely that additional options will be added\n"
11956
"to commands to make this refreshing process faster and safer.\n"
11957
msgstr ""
11958
11959
#: en/help_topics/current-formats.txt:1
11960
msgid "Current Storage Formats"
11961
msgstr ""
11962
11963
#: en/help_topics/current-formats.txt:3
11964
msgid ""
11965
":2a:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11966
"    (native) (default) Format for the bzr 2.0 series."
11967
msgstr ""
11968
11969
#: en/help_topics/current-formats.txt:6
11970
msgid ""
11971
":git:\n"
11972
"    GIT repository."
11973
msgstr ""
11974
11975
#: en/help_topics/current-formats.txt:9
11976
msgid ""
11977
":git-bare:\n"
11978
"    Bare GIT repository (no working tree)."
11979
msgstr ""
11980
11981
#: 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
11982
msgid ""
11983
"\n"
11984
"See :doc:`formats-help` for more about storage formats."
11985
msgstr ""
11986
11987
#: en/help_topics/debug-flags.txt:1
11988
msgid ""
11989
"Debug Flags\n"
11990
"==========="
11991
msgstr ""
11992
11993
#: en/help_topics/debug-flags.txt:4
11994
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11995
"These flags can be passed on the brz command line or (without the ``-D``\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11996
"prefix) put in the ``debug_flags`` variable in ``breezy.conf``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11997
msgstr ""
11998
11999
#: en/help_topics/debug-flags.txt:7
12000
msgid ""
12001
"-Dauth            Trace authentication sections used.\n"
12002
"-Dbytes           Print out how many bytes were transferred\n"
12003
"-Ddirstate        Trace dirstate activity (verbose!)\n"
12004
"-Derror           Instead of normal error handling, always print a "
12005
"traceback\n"
12006
"                  on error.\n"
12007
"-Devil            Capture call sites that do expensive or badly-scaling\n"
12008
"                  operations.\n"
12009
"-Dfetch           Trace history copying between repositories.\n"
12010
"-Dfilters         Emit information for debugging content filtering.\n"
12011
"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
12012
"fetch.\n"
12013
"-Dgraph           Trace graph traversal.\n"
12014
"-Dhashcache       Log every time a working file is read to determine its "
12015
"hash.\n"
12016
"-Dhooks           Trace hook execution.\n"
12017
"-Dhpss            Trace smart protocol requests and responses.\n"
12018
"-Dhpssdetail      More hpss details.\n"
12019
"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
12020
"-Dhttp            Trace http connections, requests and responses.\n"
12021
"-Dindex           Trace major index operations.\n"
12022
"-Dknit            Trace knit operations.\n"
12023
"-Dlock            Trace when lockdir locks are taken or released.\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
12024
"-Dnoretry         If a connection is reset, fail immediately rather than\n"
12025
"                  retrying the request.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12026
"-Dprogress        Trace progress bar operations.\n"
12027
"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
12028
"-Dmerge           Emit information for debugging merges.\n"
12029
"-Dno_apport       Don't use apport to report crashes.\n"
12030
"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
12031
"-Dpack            Emit information about pack operations.\n"
12032
"-Drelock          Emit a message every time a branch or repository object "
12033
"is\n"
12034
"                  unlocked then relocked the same way.\n"
12035
"-Dsftp            Trace SFTP internals.\n"
12036
"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
12037
"expected\n"
12038
"-Dstream          Trace fetch streams.\n"
12039
"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
12040
"portable\n"
12041
"                  manner.\n"
12042
"-Dunlock          Some errors during unlock are treated as warnings.\n"
12043
"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
12044
"-DIDS_always      Always use InterDifferingSerializer to fetch if "
12045
"appropriate\n"
12046
"                  for the format, even for non-local fetches.\n"
12047
msgstr ""
12048
12049
#: en/help_topics/diverged-branches.txt:1
12050
msgid ""
12051
"Diverged Branches\n"
12052
"================="
12053
msgstr ""
12054
12055
#: en/help_topics/diverged-branches.txt:4
12056
msgid ""
12057
"When Bazaar tries to push one branch onto another, it requires that the\n"
12058
"destination branch must be ready to receive the source branch.  If this "
12059
"isn't\n"
12060
"the case, then we say that the branches have ``diverged``.  Branches are\n"
12061
"considered diverged if the destination branch's most recent commit is one "
12062
"that\n"
12063
"has not been merged (directly or indirectly) by the source branch.  To "
12064
"recover\n"
12065
"from diverged branches, one must merge the missing revisions into the "
12066
"source\n"
12067
"branch."
12068
msgstr ""
12069
12070
#: en/help_topics/diverged-branches.txt:12
12071
msgid ""
12072
"This situation commonly arises when using a centralized workflow with local\n"
12073
"commits.  If someone else has committed new work to the mainline since your\n"
12074
"last pull and you have local commits that have not yet been pushed to the\n"
12075
"mainline, then your local branch and the mainline have diverged."
12076
msgstr ""
12077
12078
#: en/help_topics/diverged-branches.txt:17
12079
msgid ""
12080
"Discovering What Has Diverged\n"
12081
"-----------------------------"
12082
msgstr ""
12083
12084
#: en/help_topics/diverged-branches.txt:20
12085
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12086
"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
12087
"another\n"
12088
"branch that are not present in the current branch, and vice-versa.  It shows "
12089
"a\n"
12090
"summary of  which extra revisions exist in each branch.  If you want to see "
12091
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12092
"precise effects of those revisions, you can use ``brz diff --"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12093
"old=other_branch``\n"
12094
"to show the differences between other_branch and your current branch."
12095
msgstr ""
12096
12097
#: en/help_topics/diverged-branches.txt:26
12098
msgid ""
12099
"A Solution\n"
12100
"----------"
12101
msgstr ""
12102
12103
#: en/help_topics/diverged-branches.txt:29
12104
msgid ""
12105
"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.
12106
"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
12107
"mainline.  This merge may result in conflicts if the other developer's "
12108
"changes\n"
12109
"overlap with your changes.  These conflicts should be resolved before\n"
12110
"continuing. After any conflicts have been resolved, or even if there were "
12111
"no\n"
12112
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
12113
"to your local branch.  This requirement gives you an opportunity to test "
12114
"the\n"
12115
"resulting working tree for correctness, since the merged revisions could "
12116
"have\n"
12117
"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.
12118
"``brz commit``.  This clears up the diverged branches situation.  Your "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12119
"local\n"
12120
"branch can now be pushed to the mainline.\n"
12121
msgstr ""
12122
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12123
#: en/help_topics/env-variables.txt:1
12124
msgid "Environment Variables"
12125
msgstr ""
12126
12127
#: en/help_topics/env-variables.txt:3
7185.1.1 by Jelmer Vernooij
Update pot file.
12128
msgid "See brz help configuration for more details."
6581.1.2 by Vincent Ladeuil
Update translation template.
12129
msgstr ""
12130
12131
#: en/help_topics/env-variables.txt:5
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12132
msgid ""
12133
"=================== "
12134
"===========================================================\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12135
"BRZPATH             Path where brz is to look for shell plugin external\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12136
"                    commands.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12137
"BRZ_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12138
"EMAIL               E-Mail address of the user.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12139
"BRZ_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12140
"EDITOR              Editor for editing commit messages.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12141
"BRZ_PLUGIN_PATH     Paths where brz should look for plugins.\n"
12142
"BRZ_DISABLE_PLUGINS Plugins that brz should not load.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12143
"BRZ_PLUGINS_AT      Plugins to load from a directory not in "
12144
"BRZ_PLUGIN_PATH.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12145
"BRZ_HOME            Directory holding breezy config dir. Overrides HOME.\n"
12146
"BRZ_HOME (Win32)    Directory holding breezy config dir. Overrides APPDATA "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12147
"and\n"
12148
"                    HOME.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12149
"BZR_REMOTE_PATH     Full name of remote 'brz' command (for brz+ssh:// "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12150
"URLs).\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12151
"BRZ_SSH             Path to SSH client, or one of paramiko, openssh, "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12152
"sshcorp,\n"
12153
"                    plink or lsh.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12154
"BRZ_LOG             Location of .brz.log (use '/dev/null' to suppress log).\n"
12155
"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.
12156
"BRZ_COLUMNS         Override implicit terminal width.\n"
12157
"BRZ_CONCURRENCY     Number of processes that can be run concurrently "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12158
"(selftest)\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12159
"BRZ_PROGRESS_BAR    Override the progress display. Values are 'none' or "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12160
"'text'.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12161
"BRZ_PDB             Control whether to launch a debugger on error.\n"
12162
"BRZ_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12163
"                    breakin debugger.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12164
"BRZ_TEXTUI_INPUT    Force console input mode for prompts to line-based "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12165
"(instead\n"
12166
"                    of char-based).\n"
12167
"=================== "
12168
"===========================================================\n"
12169
msgstr ""
12170
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12171
#: en/help_topics/eol.txt:1
12172
msgid ""
12173
"End of Line Conversion\n"
12174
"======================"
12175
msgstr ""
12176
12177
#: en/help_topics/eol.txt:4
12178
msgid ""
12179
"EOL conversion is provided as a content filter where Bazaar internally\n"
12180
"stores a canonical format but outputs a convenience format. See\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12181
"``brz help content-filters`` for general information about using these."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12182
msgstr ""
12183
12184
#: en/help_topics/eol.txt:8
12185
msgid ""
12186
"Note: Content filtering is only supported in recently added formats,\n"
12187
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12188
"in a recent format. (Just setting the format on the repository\n"
12189
"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.
12190
"'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
12191
"or later."
12192
msgstr ""
12193
12194
#: en/help_topics/eol.txt:15
12195
msgid ""
12196
"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.
12197
"rules. See ``brz help rules`` for general information on defining rules.\n"
12198
"Currently, rules are only supported in $brz_HOME/.bazaar/rules (or\n"
12199
"%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
12200
"supported in a future verison of Bazaar."
12201
msgstr ""
12202
12203
#: en/help_topics/eol.txt:21
12204
msgid ""
12205
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12206
"(If a value is not set, ``exact`` is the default.)"
12207
msgstr ""
12208
12209
#: en/help_topics/eol.txt:24
12210
msgid ""
12211
" ========== ===================================== ======================\n"
12212
" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
12213
" ========== ===================================== ======================\n"
12214
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12215
" ---------- ------------------------------------- ----------------------\n"
12216
" ``lf``     ``lf``                                ``lf``\n"
12217
" ---------- ------------------------------------- ----------------------\n"
12218
" ``crlf``   ``crlf``                              ``lf``\n"
12219
" ---------- ------------------------------------- ----------------------\n"
12220
" ``exact``  No conversion                         Exactly as in file\n"
12221
" ========== ===================================== ======================"
12222
msgstr ""
12223
12224
#: en/help_topics/eol.txt:36
12225
msgid ""
12226
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12227
"byte is detected in the file."
12228
msgstr ""
12229
12230
#: en/help_topics/eol.txt:39
12231
msgid ""
12232
"For users working on a cross-platform project, here is a suggested rule\n"
12233
"to use as a starting point::"
12234
msgstr ""
12235
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12236
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12237
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12238
msgid ""
12239
"  [name *]\n"
12240
"  eol = native"
12241
msgstr ""
12242
12243
#: en/help_topics/eol.txt:45
12244
msgid ""
12245
"If you have binary files that do not contain a null byte though, be\n"
12246
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12247
"by giving more explicit patterns earlier in the rules file. For example::"
12248
msgstr ""
12249
12250
#: en/help_topics/eol.txt:49
12251
msgid ""
12252
"  [name *.png]\n"
12253
"  eol = exact"
12254
msgstr ""
12255
12256
#: en/help_topics/eol.txt:55
12257
msgid ""
12258
"If your working tree is on a network drive shared by users on different\n"
12259
"operating systems, you typically want to force certain conventions for\n"
12260
"certain files. In that way, if a file is created with the wrong line\n"
12261
"endings or line endings get mixed during editing, it gets committed\n"
12262
"correctly and gets checked out correctly. For example::"
12263
msgstr ""
12264
12265
#: en/help_topics/eol.txt:61
12266
msgid ""
12267
"  [name *.bat]\n"
12268
"  eol = crlf"
12269
msgstr ""
12270
12271
#: en/help_topics/eol.txt:64
12272
msgid ""
12273
"  [name *.sh]\n"
12274
"  eol = lf"
12275
msgstr ""
12276
12277
#: en/help_topics/eol.txt:70
12278
msgid ""
12279
"If you take the care to create files with their required endings, you can\n"
12280
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12281
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12282
"introducing mixed line endings will be corrected during commit for files\n"
12283
"with those settings."
12284
msgstr ""
12285
12286
#: en/help_topics/eol.txt:76
12287
msgid ""
12288
"If you have sample test data that deliberately has text files with mixed\n"
12289
"newline conventions, you can ask for those to be left alone like this::"
12290
msgstr ""
12291
12292
#: en/help_topics/eol.txt:79
12293
msgid ""
12294
"  [name test_data/]\n"
12295
"  eol = exact"
12296
msgstr ""
12297
12298
#: en/help_topics/eol.txt:85
12299
msgid ""
12300
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12301
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12302
"of content analysis to detect binary files for commands like ``diff``.\n"
12303
"In the future, a ``binary = true`` rule may be added but it is not\n"
12304
"supported yet.)"
12305
msgstr ""
12306
12307
#: en/help_topics/eol.txt:91
12308
msgid ""
12309
"If you have an existing repository with text files already stored using\n"
12310
"Windows newline conventions (``crlf``), then you may want to keep using "
12311
"that\n"
12312
"convention in the repository. Forcing certain files to this convention\n"
12313
"may also help users who do not have rules configured. To do this, set\n"
12314
"``eol`` to one of the values below."
12315
msgstr ""
12316
12317
#: en/help_topics/eol.txt:97
12318
msgid ""
12319
" ============================ ======================== "
12320
"======================\n"
12321
" Value                        Checkout end-of-lines as Commit end-of-lines "
12322
"as\n"
12323
" ============================ ======================== "
12324
"======================\n"
12325
" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
12326
"                              ``lf`` otherwise\n"
12327
" ---------------------------- ------------------------ "
12328
"----------------------\n"
12329
" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
12330
" ---------------------------- ------------------------ "
12331
"----------------------\n"
12332
" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
12333
" ============================ ======================== ======================"
12334
msgstr ""
12335
12336
#: en/help_topics/eol.txt:108
12337
msgid ""
12338
"For users working on an existing project that uses Windows newline\n"
12339
"conventions in their Bazaar repository, this rule is suggested as a\n"
12340
"starting point::"
12341
msgstr ""
12342
12343
#: en/help_topics/eol.txt:112
12344
msgid ""
12345
"  [name *]\n"
12346
"  eol = native-with-crlf-in-repo"
12347
msgstr ""
12348
12349
#: en/help_topics/eol.txt:115
12350
msgid ""
12351
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12352
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12353
"``crlf`` and ``exact``."
12354
msgstr ""
12355
12356
#: en/help_topics/eol.txt:119
12357
msgid ""
12358
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12359
"never reject files because a given line ending or mixed line endings\n"
12360
"are found. A precommit hook should be used if you wish to validate\n"
12361
"(and not just convert) content before committing.\n"
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:1
12365
msgid ""
12366
"\n"
12367
"Hooks\n"
12368
"====="
12369
msgstr ""
12370
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12371
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12372
msgid ""
12373
"Introduction\n"
12374
"------------"
12375
msgstr ""
12376
12377
#: en/help_topics/hooks.txt:8
12378
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12379
msgstr ""
12380
12381
#: en/help_topics/hooks.txt:10
12382
msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:12
12386
msgid ""
12387
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12388
msgstr ""
12389
12390
#: en/help_topics/hooks.txt:14
12391
msgid ""
12392
"The class that contains each hook is given before the hooks it supplies. "
12393
"For\n"
12394
"instance, BranchHooks as the class is the hooks class for\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12395
"`breezy.branch.Branch.hooks`."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:18
12399
msgid ""
12400
"Each description also indicates whether the hook runs on the client (the\n"
12401
"machine where bzr was invoked) or the server (the machine addressed by\n"
12402
"the branch URL).  These may be, but are not necessarily, the same machine."
12403
msgstr ""
12404
12405
#: en/help_topics/hooks.txt:22
12406
msgid ""
12407
"Plugins (including hooks) are run on the server if all of these is true:"
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:24
12411
msgid ""
12412
"  * The connection is via a smart server (accessed with a URL starting with\n"
12413
"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12414
"\"http://\"\n"
12415
"    URL when a smart server is available via HTTP)."
12416
msgstr ""
12417
12418
#: en/help_topics/hooks.txt:28
12419
msgid ""
12420
"  * The hook is either server specific or part of general infrastructure "
12421
"rather\n"
12422
"    than client specific code (such as commit)."
12423
msgstr ""
12424
12425
#: en/help_topics/hooks.txt:31
12426
msgid ""
12427
"\n"
12428
"BranchHooks\n"
12429
"-----------"
12430
msgstr ""
12431
12432
#: en/help_topics/hooks.txt:35
12433
msgid ""
12434
"automatic_tag_name\n"
12435
"~~~~~~~~~~~~~~~~~~"
12436
msgstr ""
12437
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12438
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
7185.1.1 by Jelmer Vernooij
Update pot file.
12439
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:315
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12440
msgid "Introduced in: 2.2"
12441
msgstr ""
12442
12443
#: en/help_topics/hooks.txt:40
12444
msgid ""
12445
"Called to determine an automatic tag name for a revision.\n"
12446
"automatic_tag_name is called with (branch, revision_id) and should\n"
12447
"return a tag name or None if no tag name could be determined. The\n"
12448
"first non-None tag name returned will be used."
12449
msgstr ""
12450
12451
#: en/help_topics/hooks.txt:45
12452
msgid ""
12453
"open\n"
12454
"~~~~"
12455
msgstr ""
12456
7185.1.1 by Jelmer Vernooij
Update pot file.
12457
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:346
12458
#: en/help_topics/hooks.txt:360
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12459
msgid "Introduced in: 1.8"
12460
msgstr ""
12461
12462
#: en/help_topics/hooks.txt:50
12463
msgid ""
12464
"Called with the Branch object that has been opened after a branch is\n"
12465
"opened."
12466
msgstr ""
12467
12468
#: en/help_topics/hooks.txt:53
12469
msgid ""
12470
"post_branch_init\n"
12471
"~~~~~~~~~~~~~~~~"
12472
msgstr ""
12473
12474
#: en/help_topics/hooks.txt:58
12475
msgid ""
12476
"Called after new branch initialization completes. post_branch_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12477
"called with a breezy.branch.BranchInitHookParams. Note that init,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12478
"branch and checkout (both heavyweight and lightweight) will all\n"
12479
"trigger this hook."
12480
msgstr ""
12481
12482
#: en/help_topics/hooks.txt:63
12483
msgid ""
12484
"post_change_branch_tip\n"
12485
"~~~~~~~~~~~~~~~~~~~~~~"
12486
msgstr ""
12487
7185.1.1 by Jelmer Vernooij
Update pot file.
12488
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:474
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12489
msgid "Introduced in: 1.4"
12490
msgstr ""
12491
12492
#: en/help_topics/hooks.txt:68
12493
msgid ""
12494
"Called in bzr client and server after a change to the tip of a branch\n"
12495
"is made. post_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12496
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12497
"uncommit will all trigger this hook."
12498
msgstr ""
12499
7185.1.1 by Jelmer Vernooij
Update pot file.
12500
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:445
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12501
msgid ""
12502
"post_commit\n"
12503
"~~~~~~~~~~~"
12504
msgstr ""
12505
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12506
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12507
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12508
msgid "Introduced in: 0.15"
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:78
12512
msgid ""
12513
"Called in the bzr client after a commit has completed. post_commit is\n"
12514
"called with (local, master, old_revno, old_revid, new_revno,\n"
12515
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12516
"branch."
12517
msgstr ""
12518
12519
#: en/help_topics/hooks.txt:83
12520
msgid ""
12521
"post_pull\n"
12522
"~~~~~~~~~"
12523
msgstr ""
12524
12525
#: en/help_topics/hooks.txt:88
12526
msgid ""
12527
"Called after a pull operation completes. post_pull is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12528
"breezy.branch.PullResult object and only runs in the bzr client."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12529
msgstr ""
12530
12531
#: en/help_topics/hooks.txt:91
12532
msgid ""
12533
"post_push\n"
12534
"~~~~~~~~~"
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:96
12538
msgid ""
12539
"Called after a push operation completes. post_push is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12540
"breezy.branch.BranchPushResult object and only runs in the bzr client."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12541
msgstr ""
12542
12543
#: en/help_topics/hooks.txt:99
12544
msgid ""
12545
"post_switch\n"
12546
"~~~~~~~~~~~"
12547
msgstr ""
12548
12549
#: en/help_topics/hooks.txt:104
12550
msgid ""
12551
"Called after a checkout switches branch. post_switch is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12552
"breezy.branch.SwitchHookParams."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12553
msgstr ""
12554
12555
#: en/help_topics/hooks.txt:107
12556
msgid ""
12557
"post_uncommit\n"
12558
"~~~~~~~~~~~~~"
12559
msgstr ""
12560
12561
#: en/help_topics/hooks.txt:112
12562
msgid ""
12563
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12564
"called with (local, master, old_revno, old_revid, new_revno,\n"
12565
"new_revid) where local is the local branch or None, master is the\n"
12566
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12567
"of None."
12568
msgstr ""
12569
12570
#: en/help_topics/hooks.txt:118
12571
msgid ""
12572
"pre_change_branch_tip\n"
12573
"~~~~~~~~~~~~~~~~~~~~~"
12574
msgstr ""
12575
12576
#: en/help_topics/hooks.txt:121
12577
msgid "Introduced in: 1.6"
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:123
12581
msgid ""
12582
"Called in bzr client and server before a change to the tip of a branch\n"
12583
"is made. pre_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12584
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12585
"uncommit will all trigger this hook."
12586
msgstr ""
12587
12588
#: en/help_topics/hooks.txt:128
12589
msgid ""
12590
"pre_commit\n"
12591
"~~~~~~~~~~"
12592
msgstr ""
12593
12594
#: en/help_topics/hooks.txt:131
12595
msgid "Introduced in: 0.91"
12596
msgstr ""
12597
12598
#: en/help_topics/hooks.txt:133
12599
msgid ""
12600
"Called after a commit is calculated but before it is completed.\n"
12601
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12602
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12603
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12604
"TreeDelta object describing changes from the basis revision. hooks\n"
12605
"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
12606
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12607
"tree."
12608
msgstr ""
12609
12610
#: en/help_topics/hooks.txt:142
12611
msgid ""
12612
"transform_fallback_location\n"
12613
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12614
msgstr ""
12615
6504.1.1 by Vincent Ladeuil
Update translation template
12616
#: en/help_topics/hooks.txt:145
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12617
msgid "Introduced in: 1.9"
12618
msgstr ""
12619
6504.1.1 by Vincent Ladeuil
Update translation template
12620
#: en/help_topics/hooks.txt:147
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12621
msgid ""
12622
"Called when a stacked branch is activating its fallback locations.\n"
12623
"transform_fallback_location is called with (branch, url), and should\n"
12624
"return a new url. Returning the same url allows it to be used as-is,\n"
12625
"returning a different one can be used to cause the branch to stack on\n"
12626
"a closer copy of that fallback_location. Note that the branch cannot\n"
12627
"have history accessing methods called on it during this hook because\n"
12628
"the fallback locations have not been activated. When there are\n"
12629
"multiple hooks installed for transform_fallback_location, all are\n"
12630
"called with the url returned from the previous hook.The order is\n"
12631
"however undefined."
12632
msgstr ""
12633
6504.1.1 by Vincent Ladeuil
Update translation template
12634
#: en/help_topics/hooks.txt:158
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12635
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
12636
"SmartClientHooks\n"
12637
"----------------"
12638
msgstr ""
12639
12640
#: en/help_topics/hooks.txt:161
12641
msgid ""
12642
"call\n"
12643
"~~~~"
12644
msgstr ""
12645
12646
#: en/help_topics/hooks.txt:164
12647
msgid "Introduced in: unknown"
12648
msgstr ""
12649
12650
#: en/help_topics/hooks.txt:166
12651
msgid ""
12652
"Called when the smart client is submitting a request to the smart\n"
12653
"server. Called with a breezy.bzr.smart.client.CallHookParams object.\n"
12654
"Streaming request bodies, and responses, are not accessible."
12655
msgstr ""
12656
12657
#: en/help_topics/hooks.txt:170
12658
msgid ""
12659
"SmartServerHooks\n"
12660
"----------------"
12661
msgstr ""
12662
12663
#: en/help_topics/hooks.txt:173
12664
msgid ""
12665
"server_exception\n"
12666
"~~~~~~~~~~~~~~~~"
12667
msgstr ""
12668
12669
#: en/help_topics/hooks.txt:176 en/help_topics/hooks.txt:274
12670
#: en/help_topics/hooks.txt:282 en/help_topics/hooks.txt:289
12671
#: en/help_topics/hooks.txt:297 en/help_topics/hooks.txt:304
12672
#: en/help_topics/hooks.txt:426
12673
msgid "Introduced in: 2.4"
12674
msgstr ""
12675
12676
#: en/help_topics/hooks.txt:178
12677
msgid ""
12678
"Called by the bzr server when an exception occurs. server_exception is\n"
12679
"called with the sys.exc_info() tuple return true for the hook if the\n"
12680
"exception has been handled, in which case the server will exit\n"
12681
"normally."
12682
msgstr ""
12683
12684
#: en/help_topics/hooks.txt:183
12685
msgid ""
12686
"server_started\n"
12687
"~~~~~~~~~~~~~~"
12688
msgstr ""
12689
12690
#: en/help_topics/hooks.txt:186 en/help_topics/hooks.txt:205
12691
msgid "Introduced in: 0.16"
12692
msgstr ""
12693
12694
#: en/help_topics/hooks.txt:188
12695
msgid ""
12696
"Called by the bzr server when it starts serving a directory.\n"
12697
"server_started is called with (backing urls, public url), where\n"
12698
"backing_url is a list of URLs giving the server-specific directory\n"
12699
"locations, and public_url is the public URL for the directory being\n"
12700
"served."
12701
msgstr ""
12702
12703
#: en/help_topics/hooks.txt:194
12704
msgid ""
12705
"server_started_ex\n"
12706
"~~~~~~~~~~~~~~~~~"
12707
msgstr ""
12708
12709
#: en/help_topics/hooks.txt:197 en/help_topics/hooks.txt:226
12710
#: en/help_topics/hooks.txt:238 en/help_topics/hooks.txt:247
12711
msgid "Introduced in: 1.17"
12712
msgstr ""
12713
12714
#: en/help_topics/hooks.txt:199
12715
msgid ""
12716
"Called by the bzr server when it starts serving a directory.\n"
12717
"server_started is called with (backing_urls, server_obj)."
12718
msgstr ""
12719
12720
#: en/help_topics/hooks.txt:202
12721
msgid ""
12722
"server_stopped\n"
12723
"~~~~~~~~~~~~~~"
12724
msgstr ""
12725
12726
#: en/help_topics/hooks.txt:207
12727
msgid ""
12728
"Called by the bzr server when it stops serving a directory.\n"
12729
"server_stopped is called with the same parameters as the\n"
12730
"server_started hook: (backing_urls, public_url)."
12731
msgstr ""
12732
12733
#: en/help_topics/hooks.txt:211
12734
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12735
"CommandHooks\n"
12736
"------------"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12737
msgstr ""
12738
7185.1.1 by Jelmer Vernooij
Update pot file.
12739
#: en/help_topics/hooks.txt:214
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12740
msgid ""
12741
"extend_command\n"
12742
"~~~~~~~~~~~~~~"
12743
msgstr ""
12744
7185.1.1 by Jelmer Vernooij
Update pot file.
12745
#: en/help_topics/hooks.txt:217
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12746
msgid "Introduced in: 1.13"
12747
msgstr ""
12748
7185.1.1 by Jelmer Vernooij
Update pot file.
12749
#: en/help_topics/hooks.txt:219
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12750
msgid ""
12751
"Called after creating a command object to allow modifications such as\n"
12752
"adding or removing options, docs etc. Called with the new\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12753
"breezy.commands.Command object."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12754
msgstr ""
12755
7185.1.1 by Jelmer Vernooij
Update pot file.
12756
#: en/help_topics/hooks.txt:223
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12757
msgid ""
12758
"get_command\n"
12759
"~~~~~~~~~~~"
12760
msgstr ""
12761
7185.1.1 by Jelmer Vernooij
Update pot file.
12762
#: en/help_topics/hooks.txt:228
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12763
msgid ""
12764
"Called when creating a single command. Called with (cmd_or_None,\n"
12765
"command_name). get_command should either return the cmd_or_None\n"
12766
"parameter, or a replacement Command object that should be used for the\n"
12767
"command. Note that the Command.hooks hooks are core infrastructure.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12768
"Many users will prefer to use breezy.commands.register_command or\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12769
"plugin_cmds.register_lazy."
12770
msgstr ""
12771
7185.1.1 by Jelmer Vernooij
Update pot file.
12772
#: en/help_topics/hooks.txt:235
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12773
msgid ""
12774
"get_missing_command\n"
12775
"~~~~~~~~~~~~~~~~~~~"
12776
msgstr ""
12777
7185.1.1 by Jelmer Vernooij
Update pot file.
12778
#: en/help_topics/hooks.txt:240
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12779
msgid ""
12780
"Called when creating a single command if no command could be found.\n"
12781
"Called with (command_name). get_missing_command should either return\n"
12782
"None, or a Command object to be used for the command."
12783
msgstr ""
12784
7185.1.1 by Jelmer Vernooij
Update pot file.
12785
#: en/help_topics/hooks.txt:244
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12786
msgid ""
12787
"list_commands\n"
12788
"~~~~~~~~~~~~~"
12789
msgstr ""
12790
7185.1.1 by Jelmer Vernooij
Update pot file.
12791
#: en/help_topics/hooks.txt:249
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12792
msgid ""
12793
"Called when enumerating commands. Called with a set of cmd_name\n"
12794
"strings for all the commands found so far. This set  is safe to mutate\n"
12795
"- e.g. to remove a command. list_commands should return the updated\n"
12796
"set of command names."
12797
msgstr ""
12798
7185.1.1 by Jelmer Vernooij
Update pot file.
12799
#: en/help_topics/hooks.txt:254
6504.1.1 by Vincent Ladeuil
Update translation template
12800
msgid ""
12801
"post_command\n"
12802
"~~~~~~~~~~~~"
12803
msgstr ""
12804
7185.1.1 by Jelmer Vernooij
Update pot file.
12805
#: en/help_topics/hooks.txt:257 en/help_topics/hooks.txt:264
6504.1.1 by Vincent Ladeuil
Update translation template
12806
msgid "Introduced in: 2.6"
12807
msgstr ""
12808
7185.1.1 by Jelmer Vernooij
Update pot file.
12809
#: en/help_topics/hooks.txt:259
6504.1.1 by Vincent Ladeuil
Update translation template
12810
msgid "Called after executing a command. Called with the command object."
12811
msgstr ""
12812
7185.1.1 by Jelmer Vernooij
Update pot file.
12813
#: en/help_topics/hooks.txt:261
6504.1.1 by Vincent Ladeuil
Update translation template
12814
msgid ""
12815
"pre_command\n"
12816
"~~~~~~~~~~~"
12817
msgstr ""
12818
7185.1.1 by Jelmer Vernooij
Update pot file.
12819
#: en/help_topics/hooks.txt:266
6504.1.1 by Vincent Ladeuil
Update translation template
12820
msgid "Called prior to executing a command. Called with the command object."
12821
msgstr ""
12822
7185.1.1 by Jelmer Vernooij
Update pot file.
12823
#: en/help_topics/hooks.txt:268
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12824
msgid ""
12825
"_ConfigHooks\n"
12826
"------------"
12827
msgstr ""
12828
7185.1.1 by Jelmer Vernooij
Update pot file.
12829
#: en/help_topics/hooks.txt:271
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12830
msgid ""
12831
"get\n"
12832
"~~~"
12833
msgstr ""
12834
7185.1.1 by Jelmer Vernooij
Update pot file.
12835
#: en/help_topics/hooks.txt:276
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12836
msgid ""
12837
"Invoked when a config option is read. The signature is (stack, name,\n"
12838
"value)."
12839
msgstr ""
12840
7185.1.1 by Jelmer Vernooij
Update pot file.
12841
#: en/help_topics/hooks.txt:279
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12842
msgid ""
12843
"load\n"
12844
"~~~~"
12845
msgstr ""
12846
7185.1.1 by Jelmer Vernooij
Update pot file.
12847
#: en/help_topics/hooks.txt:284
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12848
msgid "Invoked when a config store is loaded. The signature is (store)."
12849
msgstr ""
12850
7185.1.1 by Jelmer Vernooij
Update pot file.
12851
#: en/help_topics/hooks.txt:286
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12852
msgid ""
12853
"remove\n"
12854
"~~~~~~"
12855
msgstr ""
12856
7185.1.1 by Jelmer Vernooij
Update pot file.
12857
#: en/help_topics/hooks.txt:291
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12858
msgid ""
12859
"Invoked when a config option is removed. The signature is (stack,\n"
12860
"name)."
12861
msgstr ""
12862
7185.1.1 by Jelmer Vernooij
Update pot file.
12863
#: en/help_topics/hooks.txt:294
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12864
msgid ""
12865
"save\n"
12866
"~~~~"
12867
msgstr ""
12868
7185.1.1 by Jelmer Vernooij
Update pot file.
12869
#: en/help_topics/hooks.txt:299
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12870
msgid "Invoked when a config store is saved. The signature is (store)."
12871
msgstr ""
12872
7185.1.1 by Jelmer Vernooij
Update pot file.
12873
#: en/help_topics/hooks.txt:301
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12874
msgid ""
12875
"set\n"
12876
"~~~"
12877
msgstr ""
12878
7185.1.1 by Jelmer Vernooij
Update pot file.
12879
#: en/help_topics/hooks.txt:306
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12880
msgid ""
12881
"Invoked when a config option is set. The signature is (stack, name,\n"
12882
"value)."
12883
msgstr ""
12884
7185.1.1 by Jelmer Vernooij
Update pot file.
12885
#: en/help_topics/hooks.txt:309
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12886
msgid ""
12887
"ControlDirHooks\n"
12888
"---------------"
12889
msgstr ""
12890
7185.1.1 by Jelmer Vernooij
Update pot file.
12891
#: en/help_topics/hooks.txt:312
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12892
msgid ""
12893
"post_repo_init\n"
12894
"~~~~~~~~~~~~~~"
12895
msgstr ""
12896
7185.1.1 by Jelmer Vernooij
Update pot file.
12897
#: en/help_topics/hooks.txt:317
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12898
msgid ""
12899
"Invoked after a repository has been initialized. post_repo_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12900
"called with a breezy.controldir.RepoInitHookParams."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12901
msgstr ""
12902
7185.1.1 by Jelmer Vernooij
Update pot file.
12903
#: en/help_topics/hooks.txt:320
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12904
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12905
"pre_open\n"
12906
"~~~~~~~~"
12907
msgstr ""
12908
7185.1.1 by Jelmer Vernooij
Update pot file.
12909
#: en/help_topics/hooks.txt:323
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12910
msgid "Introduced in: 1.14"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12911
msgstr ""
12912
7185.1.1 by Jelmer Vernooij
Update pot file.
12913
#: en/help_topics/hooks.txt:325
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12914
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12915
"Invoked before attempting to open a ControlDir with the transport that\n"
12916
"the open will use."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12917
msgstr ""
12918
7185.1.1 by Jelmer Vernooij
Update pot file.
12919
#: en/help_topics/hooks.txt:328
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12920
msgid ""
12921
"InfoHooks\n"
12922
"---------"
12923
msgstr ""
12924
7185.1.1 by Jelmer Vernooij
Update pot file.
12925
#: en/help_topics/hooks.txt:331
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12926
msgid ""
12927
"repository\n"
12928
"~~~~~~~~~~"
12929
msgstr ""
12930
7185.1.1 by Jelmer Vernooij
Update pot file.
12931
#: en/help_topics/hooks.txt:334 en/help_topics/hooks.txt:353
6504.1.1 by Vincent Ladeuil
Update translation template
12932
#: en/help_topics/hooks.txt:524
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12933
msgid "Introduced in: 1.15"
12934
msgstr ""
12935
7185.1.1 by Jelmer Vernooij
Update pot file.
12936
#: en/help_topics/hooks.txt:336
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12937
msgid ""
12938
"Invoked when displaying the statistics for a repository. repository is\n"
12939
"called with a statistics dictionary as returned by the repository and\n"
12940
"a file-like object to write to."
12941
msgstr ""
12942
7185.1.1 by Jelmer Vernooij
Update pot file.
12943
#: en/help_topics/hooks.txt:340
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12944
msgid ""
12945
"LockHooks\n"
12946
"---------"
12947
msgstr ""
12948
7185.1.1 by Jelmer Vernooij
Update pot file.
12949
#: en/help_topics/hooks.txt:343
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12950
msgid ""
12951
"lock_acquired\n"
12952
"~~~~~~~~~~~~~"
12953
msgstr ""
12954
7185.1.1 by Jelmer Vernooij
Update pot file.
12955
#: en/help_topics/hooks.txt:348
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12956
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
12957
msgstr ""
12958
7185.1.1 by Jelmer Vernooij
Update pot file.
12959
#: en/help_topics/hooks.txt:350
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12960
msgid ""
12961
"lock_broken\n"
12962
"~~~~~~~~~~~"
12963
msgstr ""
12964
7185.1.1 by Jelmer Vernooij
Update pot file.
12965
#: en/help_topics/hooks.txt:355
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12966
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
12967
msgstr ""
12968
7185.1.1 by Jelmer Vernooij
Update pot file.
12969
#: en/help_topics/hooks.txt:357
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12970
msgid ""
12971
"lock_released\n"
12972
"~~~~~~~~~~~~~"
12973
msgstr ""
12974
7185.1.1 by Jelmer Vernooij
Update pot file.
12975
#: en/help_topics/hooks.txt:362
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12976
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
12977
msgstr ""
12978
7185.1.1 by Jelmer Vernooij
Update pot file.
12979
#: en/help_topics/hooks.txt:364
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12980
msgid ""
12981
"MergeHooks\n"
12982
"----------"
12983
msgstr ""
12984
7185.1.1 by Jelmer Vernooij
Update pot file.
12985
#: en/help_topics/hooks.txt:367
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12986
msgid ""
12987
"merge_file_content\n"
12988
"~~~~~~~~~~~~~~~~~~"
12989
msgstr ""
12990
7185.1.1 by Jelmer Vernooij
Update pot file.
12991
#: en/help_topics/hooks.txt:370
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12992
msgid "Introduced in: 2.1"
12993
msgstr ""
12994
7185.1.1 by Jelmer Vernooij
Update pot file.
12995
#: en/help_topics/hooks.txt:372
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12996
msgid ""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12997
"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
12998
"object when starting a merge. Should return either None or a subclass\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12999
"of ``breezy.merge.AbstractPerFileMerger``. Such objects will then be\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13000
"called per file that needs to be merged (including when one side has\n"
13001
"deleted the file and the other has changed it). See the\n"
13002
"AbstractPerFileMerger API docs for details on how it is used by merge."
13003
msgstr ""
13004
7185.1.1 by Jelmer Vernooij
Update pot file.
13005
#: en/help_topics/hooks.txt:379
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13006
msgid ""
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13007
"post_merge\n"
13008
"~~~~~~~~~~"
13009
msgstr ""
13010
7185.1.1 by Jelmer Vernooij
Update pot file.
13011
#: en/help_topics/hooks.txt:382 en/help_topics/hooks.txt:390
13012
#: en/help_topics/hooks.txt:440 en/help_topics/hooks.txt:458
13013
#: en/help_topics/hooks.txt:466 en/help_topics/hooks.txt:512
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13014
msgid "Introduced in: 2.5"
13015
msgstr ""
13016
7185.1.1 by Jelmer Vernooij
Update pot file.
13017
#: en/help_topics/hooks.txt:384
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13018
msgid ""
13019
"Called after a merge. Receives a Merger object as the single argument.\n"
13020
"The return value is ignored."
13021
msgstr ""
13022
7185.1.1 by Jelmer Vernooij
Update pot file.
13023
#: en/help_topics/hooks.txt:387
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13024
msgid ""
13025
"pre_merge\n"
13026
"~~~~~~~~~"
13027
msgstr ""
13028
7185.1.1 by Jelmer Vernooij
Update pot file.
13029
#: en/help_topics/hooks.txt:392
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13030
msgid ""
13031
"Called before a merge. Receives a Merger object as the single\n"
13032
"argument."
13033
msgstr ""
13034
7185.1.1 by Jelmer Vernooij
Update pot file.
13035
#: en/help_topics/hooks.txt:395
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13036
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13037
"MergeDirectiveHooks\n"
13038
"-------------------"
13039
msgstr ""
13040
7185.1.1 by Jelmer Vernooij
Update pot file.
13041
#: en/help_topics/hooks.txt:398
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13042
msgid ""
13043
"merge_request_body\n"
13044
"~~~~~~~~~~~~~~~~~~"
13045
msgstr ""
13046
7185.1.1 by Jelmer Vernooij
Update pot file.
13047
#: en/help_topics/hooks.txt:401
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13048
msgid "Introduced in: 1.15.0"
13049
msgstr ""
13050
7185.1.1 by Jelmer Vernooij
Update pot file.
13051
#: en/help_topics/hooks.txt:403
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13052
msgid ""
13053
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
13054
"request.  Callbacks must return a body.  If more than one callback is\n"
13055
"registered, the output of one callback is provided to the next."
13056
msgstr ""
13057
7185.1.1 by Jelmer Vernooij
Update pot file.
13058
#: en/help_topics/hooks.txt:407
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13059
msgid ""
13060
"MessageEditorHooks\n"
13061
"------------------"
13062
msgstr ""
13063
7185.1.1 by Jelmer Vernooij
Update pot file.
13064
#: en/help_topics/hooks.txt:410
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13065
msgid ""
13066
"commit_message_template\n"
13067
"~~~~~~~~~~~~~~~~~~~~~~~"
13068
msgstr ""
13069
7185.1.1 by Jelmer Vernooij
Update pot file.
13070
#: en/help_topics/hooks.txt:413
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13071
msgid "Introduced in: 1.10"
13072
msgstr ""
13073
7185.1.1 by Jelmer Vernooij
Update pot file.
13074
#: en/help_topics/hooks.txt:415
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13075
msgid ""
13076
"Called when a commit message is being generated.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13077
"commit_message_template is called with the breezy.commit.Commit object\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13078
"and the message that is known so far. commit_message_template must\n"
13079
"return a new message to use (which could be the same as it was given).\n"
13080
"When there are multiple hooks registered for commit_message_template,\n"
13081
"they are chained with the result from the first passed into the\n"
13082
"second, and so on."
13083
msgstr ""
13084
7185.1.1 by Jelmer Vernooij
Update pot file.
13085
#: en/help_topics/hooks.txt:423
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13086
msgid ""
13087
"set_commit_message\n"
13088
"~~~~~~~~~~~~~~~~~~"
13089
msgstr ""
13090
7185.1.1 by Jelmer Vernooij
Update pot file.
13091
#: en/help_topics/hooks.txt:428
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13092
msgid ""
13093
"Set a fixed commit message. set_commit_message is called with the\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13094
"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
13095
"properties by editing commit.builder._revprops) and the message so\n"
13096
"far. set_commit_message must return the message to use or None if it\n"
13097
"should use the message editor as normal."
13098
msgstr ""
13099
7185.1.1 by Jelmer Vernooij
Update pot file.
13100
#: en/help_topics/hooks.txt:434
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13101
msgid ""
13102
"MutableTreeHooks\n"
13103
"----------------"
13104
msgstr ""
13105
7185.1.1 by Jelmer Vernooij
Update pot file.
13106
#: en/help_topics/hooks.txt:437
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13107
msgid ""
13108
"post_build_tree\n"
13109
"~~~~~~~~~~~~~~~"
13110
msgstr ""
13111
7185.1.1 by Jelmer Vernooij
Update pot file.
13112
#: en/help_topics/hooks.txt:442
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13113
msgid ""
13114
"Called after a completely new tree is built. The hook is called with\n"
13115
"the tree as its only argument."
13116
msgstr ""
13117
7185.1.1 by Jelmer Vernooij
Update pot file.
13118
#: en/help_topics/hooks.txt:448
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13119
msgid "Introduced in: 2.0"
13120
msgstr ""
13121
7185.1.1 by Jelmer Vernooij
Update pot file.
13122
#: en/help_topics/hooks.txt:450
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13123
msgid ""
13124
"Called after a commit is performed on a tree. The hook is called with\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13125
"a breezy.mutabletree.PostCommitHookParams object. The mutable tree the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13126
"commit was performed on is available via the mutable_tree attribute of\n"
13127
"that object."
13128
msgstr ""
13129
7185.1.1 by Jelmer Vernooij
Update pot file.
13130
#: en/help_topics/hooks.txt:455
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13131
msgid ""
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13132
"post_transform\n"
13133
"~~~~~~~~~~~~~~"
13134
msgstr ""
13135
7185.1.1 by Jelmer Vernooij
Update pot file.
13136
#: en/help_topics/hooks.txt:460
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13137
msgid ""
13138
"Called after a tree transform has been performed on a tree. The hook\n"
13139
"is called with the tree that is being transformed and the transform."
13140
msgstr ""
13141
7185.1.1 by Jelmer Vernooij
Update pot file.
13142
#: en/help_topics/hooks.txt:463
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13143
msgid ""
13144
"pre_transform\n"
13145
"~~~~~~~~~~~~~"
13146
msgstr ""
13147
7185.1.1 by Jelmer Vernooij
Update pot file.
13148
#: en/help_topics/hooks.txt:468
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13149
msgid ""
13150
"Called before a tree transform on this tree. The hook is called with\n"
13151
"the tree that is being transformed and the transform."
13152
msgstr ""
13153
7185.1.1 by Jelmer Vernooij
Update pot file.
13154
#: en/help_topics/hooks.txt:471
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
13155
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13156
"start_commit\n"
13157
"~~~~~~~~~~~~"
13158
msgstr ""
13159
7185.1.1 by Jelmer Vernooij
Update pot file.
13160
#: en/help_topics/hooks.txt:476
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13161
msgid ""
13162
"Called before a commit is performed on a tree. The start commit hook\n"
13163
"is able to change the tree before the commit takes place. start_commit\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13164
"is called with the breezy.mutabletree.MutableTree that the commit is\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13165
"being performed on."
13166
msgstr ""
13167
6504.1.1 by Vincent Ladeuil
Update translation template
13168
#: en/help_topics/hooks.txt:481
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13169
msgid ""
13170
"StatusHooks\n"
13171
"-----------"
13172
msgstr ""
13173
6504.1.1 by Vincent Ladeuil
Update translation template
13174
#: en/help_topics/hooks.txt:484
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13175
msgid ""
13176
"post_status\n"
13177
"~~~~~~~~~~~"
13178
msgstr ""
13179
6504.1.1 by Vincent Ladeuil
Update translation template
13180
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13181
msgid "Introduced in: 2.3"
13182
msgstr ""
13183
6504.1.1 by Vincent Ladeuil
Update translation template
13184
#: en/help_topics/hooks.txt:489
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13185
msgid ""
13186
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13187
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13188
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13189
"correspond to the command line options specified by the user for the\n"
13190
"status command. to_file is the output stream for writing."
13191
msgstr ""
13192
6504.1.1 by Vincent Ladeuil
Update translation template
13193
#: en/help_topics/hooks.txt:495
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13194
msgid ""
13195
"pre_status\n"
13196
"~~~~~~~~~~"
13197
msgstr ""
13198
6504.1.1 by Vincent Ladeuil
Update translation template
13199
#: en/help_topics/hooks.txt:500
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13200
msgid ""
13201
"Called with argument StatusHookParams before Bazaar displays the\n"
13202
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13203
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13204
"correspond to the command line options specified by the user for the\n"
13205
"status command. to_file is the output stream for writing."
13206
msgstr ""
13207
6504.1.1 by Vincent Ladeuil
Update translation template
13208
#: en/help_topics/hooks.txt:506
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13209
msgid ""
13210
"TransportHooks\n"
13211
"--------------"
13212
msgstr ""
13213
6504.1.1 by Vincent Ladeuil
Update translation template
13214
#: en/help_topics/hooks.txt:509
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13215
msgid ""
13216
"post_connect\n"
13217
"~~~~~~~~~~~~"
13218
msgstr ""
13219
6504.1.1 by Vincent Ladeuil
Update translation template
13220
#: en/help_topics/hooks.txt:514
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13221
msgid ""
13222
"Called after a new connection is established or a reconnect occurs.\n"
13223
"The sole argument passed is either the connected transport or smart\n"
13224
"medium instance."
13225
msgstr ""
13226
6504.1.1 by Vincent Ladeuil
Update translation template
13227
#: en/help_topics/hooks.txt:518
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13228
msgid ""
13229
"RioVersionInfoBuilderHooks\n"
13230
"--------------------------"
13231
msgstr ""
13232
6504.1.1 by Vincent Ladeuil
Update translation template
13233
#: en/help_topics/hooks.txt:521
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13234
msgid ""
13235
"revision\n"
13236
"~~~~~~~~"
13237
msgstr ""
13238
6504.1.1 by Vincent Ladeuil
Update translation template
13239
#: en/help_topics/hooks.txt:526
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13240
msgid ""
13241
"Invoked when adding information about a revision to the RIO stanza\n"
13242
"that is printed. revision is called with a revision object and a RIO\n"
13243
"stanza.\n"
13244
msgstr ""
13245
13246
#: en/help_topics/location-alias.txt:1
13247
msgid ""
13248
"Location aliases\n"
13249
"================"
13250
msgstr ""
13251
13252
#: en/help_topics/location-alias.txt:4
13253
msgid ""
13254
"Bazaar defines several aliases for locations associated with a branch.  "
13255
"These\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13256
"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
13257
msgstr ""
13258
13259
#: en/help_topics/location-alias.txt:7
13260
msgid "The aliases are::"
13261
msgstr ""
13262
13263
#: en/help_topics/location-alias.txt:9
13264
msgid ""
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13265
"  :bound     The branch this branch is bound to, for bound branches.\n"
13266
"  :parent    The parent of this branch.\n"
13267
"  :public    The public location of this branch.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13268
"  :push      The saved location used for `brz push` with no arguments.\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13269
"  :submit    The submit branch for this branch.\n"
13270
"  :this      This branch."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13271
msgstr ""
13272
13273
#: en/help_topics/location-alias.txt:16
13274
msgid "For example, to push to the parent location::"
13275
msgstr ""
13276
13277
#: en/help_topics/location-alias.txt:18
7185.1.1 by Jelmer Vernooij
Update pot file.
13278
msgid "    brz push :parent\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13279
msgstr ""
13280
13281
#: en/help_topics/log-formats.txt:1
13282
msgid ""
13283
"Log Formats\n"
13284
"==========="
13285
msgstr ""
13286
13287
#: en/help_topics/log-formats.txt:4
13288
msgid ""
13289
"A log format controls how information about each revision is displayed.\n"
13290
"The standard log formats are compared below::"
13291
msgstr ""
13292
13293
#: en/help_topics/log-formats.txt:7
13294
msgid ""
13295
"  Feature                 long           short         line\n"
13296
"  ----------------------  -------------  ------------  -------------------\n"
13297
"  design goal             detailed view  concise view  1 revision per line\n"
13298
"  committer               name+email     name only     name only\n"
13299
"  author                  name+email     -             -\n"
13300
"  date-time format        full           date only     date only\n"
13301
"  commit message          full           full          top line\n"
13302
"  tags                    yes            yes           yes\n"
13303
"  merges indicator        -              yes           -\n"
13304
"  status/delta            optional       optional      -\n"
13305
"  diff/patch              optional       optional      -\n"
13306
"  revision-id             optional       optional      -\n"
13307
"  branch nick             yes            -             -\n"
13308
"  foreign vcs properties  yes            yes           -\n"
13309
"  preferred levels        all            1             1\n"
13310
"  digital signature       optional       -             -"
13311
msgstr ""
13312
13313
#: en/help_topics/log-formats.txt:24
13314
msgid ""
13315
"The default format is ``long``. To change this, define the ``log_format``\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13316
"setting in the ``[DEFAULT]`` section of ``breezy.conf`` like this (say)::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13317
msgstr ""
13318
13319
#: en/help_topics/log-formats.txt:27
13320
msgid ""
13321
"  [DEFAULT]\n"
13322
"  log_format = short"
13323
msgstr ""
13324
13325
#: en/help_topics/log-formats.txt:30
13326
msgid ""
13327
"Alternatively, to change the log format used for a given query, use the\n"
13328
"--long, --short or --line options."
13329
msgstr ""
13330
13331
#: en/help_topics/log-formats.txt:33
13332
msgid ""
13333
"If one of the standard log formats does not meet your needs, additional\n"
13334
"formats can be provided by plugins.\n"
13335
msgstr ""
13336
7185.1.1 by Jelmer Vernooij
Update pot file.
13337
#: en/help_topics/missing-extensions.txt:1
13338
msgid ""
13339
"Missing Extensions\n"
13340
"=================="
13341
msgstr ""
13342
13343
#: en/help_topics/missing-extensions.txt:4
13344
msgid ""
13345
"Breezy gives a warning if it failed to load some compiled extensions. (See\n"
13346
"http://bazaarvcs.wordpress.com/2009/09/17/extension-warnings/ for "
13347
"background.)"
13348
msgstr ""
13349
13350
#: en/help_topics/missing-extensions.txt:7
13351
msgid ""
13352
"This may indicate either that there's been a problem installing or "
13353
"packaging\n"
13354
"Breezy, or it may just be a case where you don't want to use the compiled\n"
13355
"extensions."
13356
msgstr ""
13357
13358
#: en/help_topics/missing-extensions.txt:11
13359
msgid ""
13360
"1. If you installed Breezy from an official binary package or a "
13361
"distribution\n"
13362
"and you're seeing this warning, please report a bug."
13363
msgstr ""
13364
13365
#: en/help_topics/missing-extensions.txt:14
13366
msgid ""
13367
"2. If you're running Breezy from a source tree or tarball, please run 'make' "
13368
"in\n"
13369
"that directory to compile the extensions. You should do this every time you\n"
13370
"update the tree. To do this you will need some build dependencies installed\n"
13371
"including make, a C compiler, and the Python header files."
13372
msgstr ""
13373
13374
#: en/help_topics/missing-extensions.txt:19
13375
msgid ""
13376
"3. If you can't or don't want to build the extensions, add this line to\n"
13377
"breezy.conf (whose location is shown by 'brz --version')::"
13378
msgstr ""
13379
13380
#: en/help_topics/missing-extensions.txt:22
13381
msgid "  suppress_warnings=missing_extensions"
13382
msgstr ""
13383
13384
#: en/help_topics/missing-extensions.txt:24
13385
msgid "Breezy will work normally but some operations may be slower."
13386
msgstr ""
13387
13388
#: en/help_topics/missing-extensions.txt:26
13389
msgid "The specific modules that failed, and why, are listed in .brz.log.\n"
13390
msgstr ""
13391
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13392
#: en/help_topics/other-formats.txt:1
13393
msgid "Other Storage Formats"
13394
msgstr ""
13395
13396
#: en/help_topics/other-formats.txt:3
7185.1.1 by Jelmer Vernooij
Update pot file.
13397
msgid "No experimental formats are available."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13398
msgstr ""
13399
13400
#: en/help_topics/other-formats.txt:5
13401
msgid ""
13402
"\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13403
"No deprecated formats are available."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13404
msgstr ""
13405
13406
#: en/help_topics/patterns.txt:1
13407
msgid ""
13408
"Patterns\n"
13409
"========"
13410
msgstr ""
13411
13412
#: en/help_topics/patterns.txt:4
13413
msgid ""
13414
"Bazaar uses patterns to match files at various times. For example,\n"
13415
"the ``add`` command skips over files that match ignore patterns\n"
13416
"and preferences can be associated with files using rule patterns.\n"
13417
"The pattern syntax is described below."
13418
msgstr ""
13419
13420
#: en/help_topics/patterns.txt:9
13421
msgid ""
13422
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13423
"slash or is a regular expression, it is compared to the whole path\n"
13424
"from the branch root. Otherwise, it is compared to only the last\n"
13425
"component of the path. To match a file only in the root directory,\n"
13426
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13427
msgstr ""
13428
13429
#: en/help_topics/patterns.txt:15
13430
msgid "Patterns may include globbing wildcards such as::"
13431
msgstr ""
13432
13433
#: en/help_topics/patterns.txt:17
13434
msgid ""
13435
"  ? - Matches any single character except '/'\n"
13436
"  * - Matches 0 or more characters except '/'\n"
13437
"  /**/ - Matches 0 or more directories in a path\n"
13438
"  [a-z] - Matches a single character from within a group of characters"
13439
msgstr ""
13440
13441
#: en/help_topics/patterns.txt:22
13442
msgid ""
13443
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13444
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13445
"expression.  Regular expression patterns may not include named or\n"
13446
"numbered groups."
13447
msgstr ""
13448
13449
#: en/help_topics/patterns.txt:27
13450
msgid ""
13451
"Case insensitive ignore patterns can be specified with regular expressions\n"
13452
"by using the ``i`` (for ignore case) flag in the pattern."
13453
msgstr ""
13454
13455
#: en/help_topics/patterns.txt:30
13456
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
13457
msgstr ""
13458
13459
#: en/help_topics/patterns.txt:32
13460
msgid "  RE:(?i)foo"
13461
msgstr ""
13462
13463
#: en/help_topics/patterns.txt:34
13464
msgid ""
13465
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13466
"matched by that pattern will not be ignored."
13467
msgstr ""
13468
13469
#: en/help_topics/patterns.txt:37
13470
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
13471
msgstr ""
13472
13473
#: en/help_topics/revisionspec.txt:1
13474
msgid "Revision Identifiers"
13475
msgstr ""
13476
13477
#: en/help_topics/revisionspec.txt:3
13478
msgid ""
13479
"A revision identifier refers to a specific state of a branch's history.  It\n"
13480
"can be expressed in several ways.  It can begin with a keyword to\n"
13481
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13482
"'before:yesterday' and 'submit:'."
13483
msgstr ""
13484
13485
#: en/help_topics/revisionspec.txt:8
13486
msgid ""
13487
"Alternately, it can be given without a keyword, in which case it will be\n"
13488
"checked as a revision number, a tag, a revision id, a date specification, or "
13489
"a\n"
13490
"branch specification, in that order.  For example, 'date:today' could be\n"
13491
"written as simply 'today', though if you have a tag called 'today' that "
13492
"will\n"
13493
"be found first."
13494
msgstr ""
13495
13496
#: en/help_topics/revisionspec.txt:14
13497
msgid ""
13498
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13499
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13500
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13501
"or\n"
13502
"spaces around the '..')."
13503
msgstr ""
13504
13505
#: en/help_topics/revisionspec.txt:19
13506
msgid ""
13507
"Ranges are interpreted differently by different commands. To the \"log\" "
13508
"command,\n"
13509
"a range is a sequence of log messages, but to the \"diff\" command, the "
13510
"range\n"
13511
"denotes a change between revisions (and not a sequence of changes).  In\n"
13512
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13513
"consider it\n"
13514
"to be open-ended, that is, they include one end but not the other.  For "
13515
"example:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13516
"\"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
13517
"3649,\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13518
"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
13519
"and\n"
13520
"3649, but not 3647."
13521
msgstr ""
13522
13523
#: en/help_topics/revisionspec.txt:28
13524
msgid "The keywords used as revision selection methods are the following:"
13525
msgstr ""
13526
13527
#: en/help_topics/revisionspec.txt:30
13528
msgid ""
13529
":revid:\n"
13530
"\tSelects a revision using the revision id.\n"
13531
":submit:\n"
13532
"\tSelects a common ancestor with the submit branch.\n"
13533
":ancestor:\n"
13534
"\tSelects a common ancestor with a second branch.\n"
13535
":date:\n"
13536
"\tSelects a revision on the basis of a datestamp.\n"
13537
":branch:\n"
13538
"\tSelects the last revision of a specified branch.\n"
13539
":tag:\n"
13540
"\tSelects a revision identified by a tag name.\n"
13541
":revno:\n"
13542
"\tSelects a revision using a number.\n"
13543
":before:\n"
13544
"\tSelects the parent of the revision specified.\n"
13545
":annotate:\n"
13546
"\tSelect the revision that last modified the specified line.\n"
13547
":mainline:\n"
13548
"\tSelect mainline revision that merged the specified revision.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13549
":git:\n"
13550
"\tSelects a revision using a Git revision sha1.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13551
":last:\n"
13552
"\tSelects the nth revision from the end."
13553
msgstr ""
13554
7185.1.1 by Jelmer Vernooij
Update pot file.
13555
#: en/help_topics/revisionspec.txt:55
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13556
msgid "In addition, plugins can provide other keywords."
13557
msgstr ""
13558
7185.1.1 by Jelmer Vernooij
Update pot file.
13559
#: en/help_topics/revisionspec.txt:57
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13560
msgid "A detailed description of each keyword is given below."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13561
msgstr ""
13562
7185.1.1 by Jelmer Vernooij
Update pot file.
13563
#: en/help_topics/revisionspec.txt:59
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13564
msgid ":revid:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13565
msgstr ""
13566
7185.1.1 by Jelmer Vernooij
Update pot file.
13567
#: en/help_topics/revisionspec.txt:61
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13568
msgid ""
13569
"    Supply a specific revision id, that can be used to specify any\n"
13570
"    revision id in the ancestry of the branch.\n"
13571
"    Including merges, and pending merges.\n"
13572
"    Examples::"
13573
msgstr ""
13574
7185.1.1 by Jelmer Vernooij
Update pot file.
13575
#: en/help_topics/revisionspec.txt:66
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13576
msgid ""
13577
"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13578
msgstr ""
13579
7185.1.1 by Jelmer Vernooij
Update pot file.
13580
#: en/help_topics/revisionspec.txt:68
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13581
msgid ":submit:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13582
msgstr ""
13583
7185.1.1 by Jelmer Vernooij
Update pot file.
13584
#: en/help_topics/revisionspec.txt:70
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13585
msgid ""
13586
"    Diffing against this shows all the changes that were made in this "
13587
"branch,\n"
13588
"    and is a good predictor of what merge will do.  The submit branch is\n"
13589
"    used by the bundle and merge directive commands.  If no submit branch\n"
13590
"    is specified, the parent branch is used instead."
13591
msgstr ""
13592
7185.1.1 by Jelmer Vernooij
Update pot file.
13593
#: en/help_topics/revisionspec.txt:75 en/help_topics/revisionspec.txt:87
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13594
msgid ""
13595
"    The common ancestor is the last revision that existed in both\n"
13596
"    branches. Usually this is the branch point, but it could also be\n"
13597
"    a revision that was merged."
13598
msgstr ""
13599
7185.1.1 by Jelmer Vernooij
Update pot file.
13600
#: en/help_topics/revisionspec.txt:79 en/help_topics/revisionspec.txt:95
13601
#: en/help_topics/revisionspec.txt:111 en/help_topics/revisionspec.txt:121
13602
#: en/help_topics/revisionspec.txt:155
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13603
msgid "    Examples::"
13604
msgstr ""
13605
7185.1.1 by Jelmer Vernooij
Update pot file.
13606
#: en/help_topics/revisionspec.txt:81
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13607
msgid "      $ bzr diff -r submit:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13608
msgstr ""
13609
7185.1.1 by Jelmer Vernooij
Update pot file.
13610
#: en/help_topics/revisionspec.txt:83
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13611
msgid ":ancestor:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13612
msgstr ""
13613
7185.1.1 by Jelmer Vernooij
Update pot file.
13614
#: en/help_topics/revisionspec.txt:85
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13615
msgid "    Supply the path to a branch to select the common ancestor."
13616
msgstr ""
13617
7185.1.1 by Jelmer Vernooij
Update pot file.
13618
#: en/help_topics/revisionspec.txt:91
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13619
msgid ""
13620
"    This is frequently used with 'diff' to return all of the changes\n"
13621
"    that your branch introduces, while excluding the changes that you\n"
13622
"    have not merged from the remote branch."
13623
msgstr ""
13624
7185.1.1 by Jelmer Vernooij
Update pot file.
13625
#: en/help_topics/revisionspec.txt:97
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13626
msgid ""
13627
"      ancestor:/path/to/branch\n"
13628
"      $ bzr diff -r ancestor:../../mainline/branch"
13629
msgstr ""
13630
7185.1.1 by Jelmer Vernooij
Update pot file.
13631
#: en/help_topics/revisionspec.txt:100
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13632
msgid ":date:"
13633
msgstr ""
13634
7185.1.1 by Jelmer Vernooij
Update pot file.
13635
#: en/help_topics/revisionspec.txt:102
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13636
msgid ""
13637
"    Supply a datestamp to select the first revision that matches the date.\n"
13638
"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13639
"    Matches the first entry after a given date (either at midnight or\n"
13640
"    at a specified time)."
13641
msgstr ""
13642
7185.1.1 by Jelmer Vernooij
Update pot file.
13643
#: en/help_topics/revisionspec.txt:107
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13644
msgid "    One way to display all the changes since yesterday would be::"
13645
msgstr ""
13646
7185.1.1 by Jelmer Vernooij
Update pot file.
13647
#: en/help_topics/revisionspec.txt:109
13648
msgid "        brz log -r date:yesterday.."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13649
msgstr ""
13650
7185.1.1 by Jelmer Vernooij
Update pot file.
13651
#: en/help_topics/revisionspec.txt:113
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13652
msgid ""
13653
"      date:yesterday            -> select the first revision since "
13654
"yesterday\n"
13655
"      date:2006-08-14,17:10:14  -> select the first revision after\n"
13656
"                                   August 14th, 2006 at 5:10pm."
13657
msgstr ""
13658
7185.1.1 by Jelmer Vernooij
Update pot file.
13659
#: en/help_topics/revisionspec.txt:117
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13660
msgid ":branch:"
13661
msgstr ""
13662
7185.1.1 by Jelmer Vernooij
Update pot file.
13663
#: en/help_topics/revisionspec.txt:119
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13664
msgid "    Supply the path to a branch to select its last revision."
13665
msgstr ""
13666
7185.1.1 by Jelmer Vernooij
Update pot file.
13667
#: en/help_topics/revisionspec.txt:123
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13668
msgid "      branch:/path/to/branch"
13669
msgstr ""
13670
7185.1.1 by Jelmer Vernooij
Update pot file.
13671
#: en/help_topics/revisionspec.txt:125
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13672
msgid ":tag:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13673
msgstr ""
13674
7185.1.1 by Jelmer Vernooij
Update pot file.
13675
#: en/help_topics/revisionspec.txt:127
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13676
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
13677
msgstr ""
13678
7185.1.1 by Jelmer Vernooij
Update pot file.
13679
#: en/help_topics/revisionspec.txt:129
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13680
msgid ":revno:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13681
msgstr ""
13682
7185.1.1 by Jelmer Vernooij
Update pot file.
13683
#: en/help_topics/revisionspec.txt:131
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13684
msgid ""
13685
"    Use an integer to specify a revision in the history of the branch.\n"
13686
"    Optionally a branch can be specified.  A negative number will count\n"
13687
"    from the end of the branch (-1 is the last revision, -2 the previous\n"
13688
"    one). If the negative number is larger than the branch's history, the\n"
13689
"    first revision is returned.\n"
13690
"    Examples::"
13691
msgstr ""
13692
7185.1.1 by Jelmer Vernooij
Update pot file.
13693
#: en/help_topics/revisionspec.txt:138
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13694
msgid ""
13695
"      revno:1                   -> return the first revision of this branch\n"
13696
"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
13697
"                                   the branch '/path/to/branch'\n"
13698
"      revno:-1                  -> The last revision in a branch.\n"
13699
"      -2:http://other/branch    -> The second to last revision in the\n"
13700
"                                   remote branch.\n"
13701
"      -1000000                  -> Most likely the first revision, unless\n"
13702
"                                   your history is very long."
13703
msgstr ""
13704
7185.1.1 by Jelmer Vernooij
Update pot file.
13705
#: en/help_topics/revisionspec.txt:147
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13706
msgid ":before:"
13707
msgstr ""
13708
7185.1.1 by Jelmer Vernooij
Update pot file.
13709
#: en/help_topics/revisionspec.txt:149
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13710
msgid ""
13711
"    Supply any revision spec to return the parent of that revision.  This "
13712
"is\n"
13713
"    mostly useful when inspecting revisions that are not in the revision "
13714
"history\n"
13715
"    of a branch."
13716
msgstr ""
13717
7185.1.1 by Jelmer Vernooij
Update pot file.
13718
#: en/help_topics/revisionspec.txt:153
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13719
msgid ""
13720
"    It is an error to request the parent of the null revision (before:0)."
13721
msgstr ""
13722
7185.1.1 by Jelmer Vernooij
Update pot file.
13723
#: en/help_topics/revisionspec.txt:157
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13724
msgid ""
13725
"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
13726
"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
13727
"                                            aaaa@bbbb-1234567890\n"
13728
"      bzr diff -r before:1913..1913\n"
13729
"            -> Find the changes between revision 1913 and its parent "
13730
"(1912).\n"
13731
"               (What changes did revision 1913 introduce).\n"
13732
"               This is equivalent to:  bzr diff -c 1913"
13733
msgstr ""
13734
7185.1.1 by Jelmer Vernooij
Update pot file.
13735
#: en/help_topics/revisionspec.txt:165
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13736
msgid ":annotate:"
13737
msgstr ""
13738
7185.1.1 by Jelmer Vernooij
Update pot file.
13739
#: en/help_topics/revisionspec.txt:167
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13740
msgid ""
13741
"    Select the revision that last modified the specified line.  Line is\n"
13742
"    specified as path:number.  Path is a relative path to the file.  "
13743
"Numbers\n"
13744
"    start at 1, and are relative to the current version, not the last-\n"
13745
"    committed version of the file."
13746
msgstr ""
13747
7185.1.1 by Jelmer Vernooij
Update pot file.
13748
#: en/help_topics/revisionspec.txt:172
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13749
msgid ":mainline:"
13750
msgstr ""
13751
7185.1.1 by Jelmer Vernooij
Update pot file.
13752
#: en/help_topics/revisionspec.txt:174
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13753
msgid ""
13754
"    Select the revision that merged the specified revision into mainline."
13755
msgstr ""
13756
7185.1.1 by Jelmer Vernooij
Update pot file.
13757
#: en/help_topics/revisionspec.txt:176
13758
msgid ":git:"
13759
msgstr ""
13760
13761
#: en/help_topics/revisionspec.txt:178
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13762
msgid ":last:"
13763
msgstr ""
13764
7185.1.1 by Jelmer Vernooij
Update pot file.
13765
#: en/help_topics/revisionspec.txt:180
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13766
msgid ""
13767
"    Supply a positive number to get the nth revision from the end.\n"
13768
"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
13769
"    Examples::"
13770
msgstr ""
13771
7185.1.1 by Jelmer Vernooij
Update pot file.
13772
#: en/help_topics/revisionspec.txt:184
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13773
msgid ""
13774
"      last:1        -> return the last revision\n"
13775
"      last:3        -> return the revision 2 before the end.\n"
13776
msgstr ""
13777
13778
#: en/help_topics/rules.txt:1
13779
msgid ""
13780
"Rules\n"
13781
"====="
13782
msgstr ""
13783
13784
#: en/help_topics/rules.txt:7
13785
msgid ""
13786
"Rules are defined in ini file format where the sections are file glob\n"
13787
"patterns and the contents of each section are the preferences for files\n"
13788
"matching that pattern(s). For example::"
13789
msgstr ""
13790
13791
#: en/help_topics/rules.txt:11
13792
msgid ""
13793
"    [name *.bat]\n"
13794
"    eol = native"
13795
msgstr ""
13796
13797
#: en/help_topics/rules.txt:14
13798
msgid ""
13799
"    [name *.html *.xml]\n"
13800
"    keywords = xml_escape"
13801
msgstr ""
13802
13803
#: en/help_topics/rules.txt:17
13804
msgid ""
13805
"Preferences like these are useful for commands and plugins wishing to\n"
13806
"provide custom behaviour for selected files.  For more information on \n"
13807
"end of line conversion see :doc:`eol-help`.\n"
13808
"Keyword support is provided by the `keywords plugin\n"
13809
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13810
msgstr ""
13811
13812
#: en/help_topics/rules.txt:23
13813
msgid ""
13814
"Files\n"
13815
"-----"
13816
msgstr ""
13817
13818
#: en/help_topics/rules.txt:26
13819
msgid ""
13820
"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.
13821
"``BRZ_HOME/rules``. "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13822
msgstr ""
13823
13824
#: en/help_topics/rules.txt:29
13825
msgid ""
13826
"Rule Patterns\n"
13827
"-------------"
13828
msgstr ""
13829
13830
#: en/help_topics/rules.txt:32
13831
msgid ""
13832
"Patterns are ordered and searching stops as soon as one matches.\n"
13833
"As a consequence, more explicit patterns should be placed towards\n"
13834
"the top of the file. Rule patterns use exactly the same conventions\n"
13835
"as ignore patterns. See :doc:`patterns-help` for details."
13836
msgstr ""
13837
13838
#: en/help_topics/rules.txt:37
13839
msgid ".. note::"
13840
msgstr ""
13841
13842
#: en/help_topics/rules.txt:39
13843
msgid ""
13844
"   Patterns containing square brackets or spaces should be\n"
13845
"   surrounded in quotes to ensure they are correctly parsed.\n"
13846
msgstr ""
13847
13848
#: en/help_topics/topics.txt:1
13849
msgid ""
13850
"authentication       Information on configuring authentication\n"
13851
"basic                Basic commands\n"
13852
"branches             Information on what a branch is\n"
13853
"bugs                 Bug tracker settings\n"
13854
"checkouts            Information on what a checkout is\n"
13855
"configuration        Details on the configuration settings available\n"
13856
"conflict-types       Types of conflicts and what to do about them\n"
13857
"content-filters      Conversion of content into/from working trees\n"
13858
"criss-cross          Information on criss-cross merging\n"
13859
"current-formats      Current storage formats\n"
13860
"debug-flags          Options to show or record debug information\n"
13861
"diverged-branches    How to fix diverged branches\n"
13862
"env-variables        Environment variable names and values\n"
13863
"eol                  Information on end-of-line handling\n"
13864
"files                Information on configuration and log files\n"
13865
"formats              Information on choosing a storage format\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13866
"git                  Using Bazaar with Git\n"
13867
"global-options       Options that control how Breezy runs\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13868
"hooks                Points at which custom processing can be added\n"
13869
"launchpad            Using Bazaar with Launchpad.net\n"
13870
"location-alias       Aliases for remembered locations\n"
13871
"log-formats          Details on the logging formats available\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
13872
"missing-extensions   What to do when compiled extensions are missing\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13873
"other-formats        Experimental and deprecated storage formats\n"
13874
"patterns             Information on the pattern syntax\n"
13875
"repositories         Basic information on shared repositories.\n"
13876
"revisionspec         Explain how to use --revision\n"
13877
"rules                Information on defining rule-based preferences\n"
13878
"standalone-trees     Information on what a standalone tree is\n"
13879
"standard-options     Options that can be used with any command\n"
13880
"status-flags         Help on status flags\n"
13881
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13882
"topics               Topics list\n"
13883
"url-special-chars    Special character handling in URLs\n"
13884
"urlspec              Supported transport protocols\n"
13885
"working-trees        Information on working trees\n"
13886
msgstr ""
13887
13888
#: en/help_topics/url-special-chars.txt:1
13889
msgid ""
13890
"Special character handling in URLs\n"
13891
"=================================="
13892
msgstr ""
13893
13894
#: en/help_topics/url-special-chars.txt:4
13895
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13896
msgstr ""
13897
13898
#: en/help_topics/url-special-chars.txt:6
13899
msgid " * Fully qualified URLs"
13900
msgstr ""
13901
13902
#: en/help_topics/url-special-chars.txt:8
13903
msgid " * File system paths, relative or absolute"
13904
msgstr ""
13905
13906
#: en/help_topics/url-special-chars.txt:10
13907
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13908
"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
13909
"that are specified it will automatically determine the appropriate URL\n"
13910
"representation, and escape special characters where necessary."
13911
msgstr ""
13912
13913
#: en/help_topics/url-special-chars.txt:14
13914
msgid ""
13915
"There are a few characters which have special meaning in URLs and need "
13916
"careful\n"
13917
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13918
"value in URLs. Any non-ASCII characters in a file path will automatically "
13919
"be\n"
13920
"urlencoded when the path is converted to a URL."
13921
msgstr ""
13922
13923
#: en/help_topics/url-special-chars.txt:19
13924
msgid ""
13925
"URLs represent non-ASCII characters in an encoding defined by the server, "
13926
"but\n"
13927
"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
13928
"be\n"
13929
"generous in what it accepts as a URL and to print them in a way that\n"
13930
"will be readable."
13931
msgstr ""
13932
13933
#: en/help_topics/url-special-chars.txt:24
13934
msgid ""
13935
"For example, if you have a directory named '/tmp/%2False' these are all "
13936
"valid\n"
13937
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13938
"slash)::"
13939
msgstr ""
13940
13941
#: en/help_topics/url-special-chars.txt:27
13942
msgid ""
13943
"  cd /tmp\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13944
"  brz log /tmp/%2False\n"
13945
"  brz log %2False\n"
13946
"  brz log file:///tmp/%252False\n"
13947
"  brz log file://localhost/tmp/%252False\n"
13948
"  brz log file:%252False"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13949
msgstr ""
13950
13951
#: en/help_topics/url-special-chars.txt:34
13952
msgid "These are valid but do not refer to the same file::"
13953
msgstr ""
13954
13955
#: en/help_topics/url-special-chars.txt:36
13956
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13957
"  brz log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13958
"  brz log %252False (refers to a file called /tmp/%252False)"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13959
msgstr ""
13960
13961
#: en/help_topics/url-special-chars.txt:39
13962
msgid ""
13963
"Comma also has special meaning in URLs, because it denotes `segment "
13964
"parameters`_"
13965
msgstr ""
13966
13967
#: en/help_topics/url-special-chars.txt:41
13968
msgid ""
13969
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13970
msgstr ""
13971
13972
#: en/help_topics/url-special-chars.txt:43
13973
msgid ""
13974
"Comma is also special in any file system paths that are specified. To use a "
13975
"literal\n"
13976
"comma in a file system path, specify a URL and URL encode the comma::"
13977
msgstr ""
13978
13979
#: en/help_topics/url-special-chars.txt:46
13980
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13981
"  brz log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13982
"\" set to \"bla\"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13983
"  brz log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13984
"  brz log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13985
"\" set to \"bla\"\n"
13986
msgstr ""
13987
13988
#: en/help_topics/urlspec.txt:1
13989
msgid "URL Identifiers"
13990
msgstr ""
13991
13992
#: en/help_topics/urlspec.txt:3
13993
msgid "Supported URL prefixes::"
13994
msgstr ""
13995
13996
#: en/help_topics/urlspec.txt:5
13997
msgid ""
13998
"  bzr://              Fast access using the Bazaar smart server.\n"
13999
"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
14000
"  file://             Access using the standard filesystem (default)\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14001
"  git://              Access using the Git smart server protocol.\n"
14002
"  git+ssh://          Access using the Git smart server protocol over SSH.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14003
"  http://             Read-only access of branches exported on the web.\n"
14004
"  https://            Read-only access of branches exported on the web using "
14005
"SSL.\n"
14006
"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
14007
msgstr ""
14008
14009
#: en/help_topics/urlspec.txt:14
14010
msgid "Supported modifiers::"
14011
msgstr ""
14012
14013
#: en/help_topics/urlspec.txt:16
14014
msgid "  gio+                Access using any GIO supported protocols."
14015
msgstr ""
14016
14017
#: en/help_topics/urlspec.txt:18
7185.1.1 by Jelmer Vernooij
Update pot file.
14018
msgid "Breezy supports all of the standard parts within the URL::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14019
msgstr ""
14020
14021
#: en/help_topics/urlspec.txt:20
14022
msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
14023
msgstr ""
14024
14025
#: en/help_topics/urlspec.txt:22
14026
msgid "allowing URLs such as::"
14027
msgstr ""
14028
14029
#: en/help_topics/urlspec.txt:24
7185.1.1 by Jelmer Vernooij
Update pot file.
14030
msgid "  http://brzuser:BadPass@brz.example.com:8080/brz/trunk"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14031
msgstr ""
14032
14033
#: en/help_topics/urlspec.txt:26
14034
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
14035
"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
14036
"with '~' as meaning that the rest of the path should be interpreted\n"
14037
"relative to the remote user's home directory.  For example if the user\n"
14038
"``remote`` has a  home directory of ``/home/remote`` on the server\n"
14039
"shell.example.com, then::"
14040
msgstr ""
14041
14042
#: en/help_topics/urlspec.txt:32
7185.1.1 by Jelmer Vernooij
Update pot file.
14043
msgid "  brz+ssh://remote@shell.example.com/~/myproject/trunk"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14044
msgstr ""
14045
14046
#: en/help_topics/urlspec.txt:34
14047
msgid "would refer to ``/home/remote/myproject/trunk``."
14048
msgstr ""
14049
14050
#: en/help_topics/urlspec.txt:36
14051
msgid ""
14052
"Many commands that accept URLs also accept location aliases too.\n"
14053
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
14054
msgstr ""