/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"
7490.31.3 by Jelmer Vernooij
Update po.
11
"POT-Creation-Date: 2020-05-21 19:00+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
7490.31.3 by Jelmer Vernooij
Update po.
111
#: breezy/branch.py:828
6138.4.4 by Jonathan Riddell
update bzr.pot
112
msgid "Unstacking"
113
msgstr ""
114
7490.31.3 by Jelmer Vernooij
Update po.
115
#: breezy/branch.py:2009
6138.4.4 by Jonathan Riddell
update bzr.pot
116
#, python-format
117
msgid "Pushed up to revision %d."
118
msgstr ""
119
7490.31.3 by Jelmer Vernooij
Update po.
120
#: breezy/branch.py:2012
121
#, python-format
122
msgid "Pushed up to revision id %s."
123
msgstr ""
124
125
#: breezy/branch.py:2015
6138.4.4 by Jonathan Riddell
update bzr.pot
126
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
127
msgid "%d tag updated."
128
msgid_plural "%d tags updated."
129
msgstr[0] ""
130
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
131
7490.31.3 by Jelmer Vernooij
Update po.
132
#: breezy/branch.py:2019
6138.4.4 by Jonathan Riddell
update bzr.pot
133
msgid "No new revisions or tags to push."
134
msgstr ""
135
7490.31.3 by Jelmer Vernooij
Update po.
136
#: breezy/branch.py:2021
6138.4.4 by Jonathan Riddell
update bzr.pot
137
msgid "No new revisions to push."
138
msgstr ""
139
7490.31.3 by Jelmer Vernooij
Update po.
140
#: breezy/branch.py:2041
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
141
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
142
msgid "checked branch {0} format {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
143
msgstr ""
144
7490.31.3 by Jelmer Vernooij
Update po.
145
#: breezy/branch.py:2044
6138.4.4 by Jonathan Riddell
update bzr.pot
146
#, python-format
147
msgid "found error:%s"
148
msgstr ""
149
7490.31.3 by Jelmer Vernooij
Update po.
150
#: breezy/builtins.py:262 breezy/builtins.py:3094 breezy/workingtree.py:251
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
151
#, python-format
152
msgid "Ignoring files outside view. View is %s"
153
msgstr ""
154
7490.31.3 by Jelmer Vernooij
Update po.
155
#: breezy/builtins.py:272
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
156
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
157
msgid "brz %s --revision takes exactly one revision identifier"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
158
msgstr ""
159
7490.31.3 by Jelmer Vernooij
Update po.
160
#: breezy/builtins.py:327
6093.2.1 by Jonathan Riddell
add .pot file to archive
161
msgid "Display status summary."
162
msgstr ""
163
7490.31.3 by Jelmer Vernooij
Update po.
164
#: breezy/builtins.py:329
6093.2.1 by Jonathan Riddell
add .pot file to archive
165
msgid ""
166
"This reports on versioned and unknown files, reporting them\n"
167
"grouped by state.  Possible states are:"
168
msgstr ""
169
7490.31.3 by Jelmer Vernooij
Update po.
170
#: breezy/builtins.py:332
6093.2.1 by Jonathan Riddell
add .pot file to archive
171
msgid ""
172
"added\n"
173
"    Versioned in the working copy but not in the previous revision."
174
msgstr ""
175
7490.31.3 by Jelmer Vernooij
Update po.
176
#: breezy/builtins.py:335
6093.2.1 by Jonathan Riddell
add .pot file to archive
177
msgid ""
178
"removed\n"
179
"    Versioned in the previous revision but removed or deleted\n"
180
"    in the working copy."
181
msgstr ""
182
7490.31.3 by Jelmer Vernooij
Update po.
183
#: breezy/builtins.py:339
6093.2.1 by Jonathan Riddell
add .pot file to archive
184
msgid ""
185
"renamed\n"
186
"    Path of this file changed from the previous revision;\n"
187
"    the text may also have changed.  This includes files whose\n"
188
"    parent directory was renamed."
189
msgstr ""
190
7490.31.3 by Jelmer Vernooij
Update po.
191
#: breezy/builtins.py:344
6093.2.1 by Jonathan Riddell
add .pot file to archive
192
msgid ""
193
"modified\n"
194
"    Text has changed since the previous revision."
195
msgstr ""
196
7490.31.3 by Jelmer Vernooij
Update po.
197
#: breezy/builtins.py:347
6093.2.1 by Jonathan Riddell
add .pot file to archive
198
msgid ""
199
"kind changed\n"
200
"    File kind has been changed (e.g. from file to directory)."
201
msgstr ""
202
7490.31.3 by Jelmer Vernooij
Update po.
203
#: breezy/builtins.py:350
6093.2.1 by Jonathan Riddell
add .pot file to archive
204
msgid ""
205
"unknown\n"
206
"    Not versioned and not matching an ignore pattern."
207
msgstr ""
208
7490.31.3 by Jelmer Vernooij
Update po.
209
#: breezy/builtins.py:353
6093.2.1 by Jonathan Riddell
add .pot file to archive
210
msgid ""
211
"Additionally for directories, symlinks and files with a changed\n"
7490.31.3 by Jelmer Vernooij
Update po.
212
"executable bit, Breezy indicates their type using a trailing\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
213
"character: '/', '@' or '*' respectively. These decorations can be\n"
214
"disabled using the '--no-classify' option."
215
msgstr ""
216
7490.31.3 by Jelmer Vernooij
Update po.
217
#: breezy/builtins.py:358
6093.2.1 by Jonathan Riddell
add .pot file to archive
218
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
219
"To see ignored files use 'brz ignored'.  For details on the\n"
220
"changes to file texts, use 'brz diff'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
221
msgstr ""
222
7490.31.3 by Jelmer Vernooij
Update po.
223
#: breezy/builtins.py:361
6093.2.1 by Jonathan Riddell
add .pot file to archive
224
msgid ""
225
"Note that --short or -S gives status flags for each item, similar\n"
226
"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.
227
"use brz status -SV."
6093.2.1 by Jonathan Riddell
add .pot file to archive
228
msgstr ""
229
7490.31.3 by Jelmer Vernooij
Update po.
230
#: breezy/builtins.py:365
6093.2.1 by Jonathan Riddell
add .pot file to archive
231
msgid ""
232
"If no arguments are specified, the status of the entire working\n"
233
"directory is shown.  Otherwise, only the status of the specified\n"
234
"files or directories is reported.  If a directory is given, status\n"
235
"is reported for everything inside that directory."
236
msgstr ""
237
7490.31.3 by Jelmer Vernooij
Update po.
238
#: breezy/builtins.py:370
6093.2.1 by Jonathan Riddell
add .pot file to archive
239
msgid ""
240
"Before merges are committed, the pending merge tip revisions are\n"
241
"shown. To see all pending merge revisions, use the -v option.\n"
242
"To skip the display of pending merge information altogether, use\n"
243
"the no-pending option or specify a file/directory."
244
msgstr ""
245
7490.31.3 by Jelmer Vernooij
Update po.
246
#: breezy/builtins.py:375
6093.2.1 by Jonathan Riddell
add .pot file to archive
247
msgid ""
248
"To compare the working directory to a specific revision, pass a\n"
249
"single revision to the revision argument."
250
msgstr ""
251
7490.31.3 by Jelmer Vernooij
Update po.
252
#: breezy/builtins.py:378
6093.2.1 by Jonathan Riddell
add .pot file to archive
253
msgid ""
254
"To see which files have changed in a specific revision, or between\n"
255
"two revisions, pass a revision range to the revision argument.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
256
"This will produce the same results as calling 'brz diff --summarize'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
257
msgstr ""
258
259
# help of 'short' option of 'status' command
7490.31.3 by Jelmer Vernooij
Update po.
260
#: breezy/builtins.py:387
6093.2.1 by Jonathan Riddell
add .pot file to archive
261
msgid "Use short status indicators."
262
msgstr ""
263
264
# help of 'versioned' option of 'status' command
7490.31.3 by Jelmer Vernooij
Update po.
265
#: breezy/builtins.py:389
6093.2.1 by Jonathan Riddell
add .pot file to archive
266
msgid "Only show versioned files."
267
msgstr ""
268
269
# help of 'no-pending' option of 'status' command
7490.31.3 by Jelmer Vernooij
Update po.
270
#: breezy/builtins.py:391
6093.2.1 by Jonathan Riddell
add .pot file to archive
271
msgid "Don't show pending merges."
272
msgstr ""
273
274
# help of 'no-classify' option of 'status' command
7490.31.3 by Jelmer Vernooij
Update po.
275
#: breezy/builtins.py:393
6093.2.1 by Jonathan Riddell
add .pot file to archive
276
msgid "Do not mark object type using indicator."
277
msgstr ""
278
7490.31.3 by Jelmer Vernooij
Update po.
279
#: breezy/builtins.py:408
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
280
msgid "brz status --revision takes exactly one or two revision specifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
281
msgstr ""
282
7490.31.3 by Jelmer Vernooij
Update po.
283
#: breezy/builtins.py:452 breezy/builtins.py:5331
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
284
msgid "You can only supply one of revision_id or --revision"
285
msgstr ""
286
7490.31.3 by Jelmer Vernooij
Update po.
287
#: breezy/builtins.py:456 breezy/builtins.py:5334
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
288
msgid "You must supply either --revision or a revision_id"
289
msgstr ""
290
7490.31.3 by Jelmer Vernooij
Update po.
291
#: breezy/builtins.py:463
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
292
#, python-format
293
msgid "Repository %r does not support access to raw revision texts"
294
msgstr ""
295
7490.31.3 by Jelmer Vernooij
Update po.
296
#: breezy/builtins.py:474
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
297
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
298
msgid "The repository {0} contains no revision {1}."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
299
msgstr ""
300
7490.31.3 by Jelmer Vernooij
Update po.
301
#: breezy/builtins.py:481
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
302
msgid "You cannot specify a NULL revision."
303
msgstr ""
304
7490.31.3 by Jelmer Vernooij
Update po.
305
#: breezy/builtins.py:487
6093.2.1 by Jonathan Riddell
add .pot file to archive
306
msgid "Remove the working tree from a given branch/checkout."
307
msgstr ""
308
7490.31.3 by Jelmer Vernooij
Update po.
309
#: breezy/builtins.py:489
6093.2.1 by Jonathan Riddell
add .pot file to archive
310
msgid ""
311
"Since a lightweight checkout is little more than a working tree\n"
312
"this will refuse to run against one."
313
msgstr ""
314
7490.31.3 by Jelmer Vernooij
Update po.
315
#: breezy/builtins.py:492
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
316
msgid "To re-create the working tree, use \"brz checkout\"."
6093.2.1 by Jonathan Riddell
add .pot file to archive
317
msgstr ""
318
319
# help of 'force' option of 'remove-tree' command
7490.31.3 by Jelmer Vernooij
Update po.
320
#: breezy/builtins.py:498
6093.2.1 by Jonathan Riddell
add .pot file to archive
321
msgid "Remove the working tree even if it has uncommitted or shelved changes."
322
msgstr ""
323
7490.31.3 by Jelmer Vernooij
Update po.
324
#: breezy/builtins.py:513
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
325
msgid "No working tree to remove"
326
msgstr ""
327
7490.31.3 by Jelmer Vernooij
Update po.
328
#: breezy/builtins.py:516
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
329
msgid "You cannot remove the working tree of a remote path"
330
msgstr ""
331
7490.31.3 by Jelmer Vernooij
Update po.
332
#: breezy/builtins.py:526
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
333
msgid "You cannot remove the working tree from a lightweight checkout"
334
msgstr ""
335
7490.31.3 by Jelmer Vernooij
Update po.
336
#: breezy/builtins.py:567
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
337
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
338
"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
339
"instead. Use \"--force\" if you are sure you want to reset the working tree."
340
msgstr ""
341
7490.31.3 by Jelmer Vernooij
Update po.
342
#: breezy/builtins.py:578
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
343
msgid ""
344
", the header appears corrupt, try passing -r -1 to set the state to the last "
345
"commit"
346
msgstr ""
347
7490.31.3 by Jelmer Vernooij
Update po.
348
#: breezy/builtins.py:583
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
349
#, python-brace-format
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
350
msgid "failed to reset the tree state{0}"
351
msgstr ""
352
7490.31.3 by Jelmer Vernooij
Update po.
353
#: breezy/builtins.py:587
6093.2.1 by Jonathan Riddell
add .pot file to archive
354
msgid "Show current revision number."
355
msgstr ""
356
7490.31.3 by Jelmer Vernooij
Update po.
357
#: breezy/builtins.py:589
6093.2.1 by Jonathan Riddell
add .pot file to archive
358
msgid "This is equal to the number of revisions on this branch."
359
msgstr ""
360
7490.31.3 by Jelmer Vernooij
Update po.
361
#: breezy/builtins.py:603
6252.1.1 by Vincent Ladeuil
Release 2.5b3
362
msgid "--tree and --revision can not be used together"
363
msgstr ""
364
7490.31.3 by Jelmer Vernooij
Update po.
365
#: breezy/builtins.py:619
6581.1.2 by Vincent Ladeuil
Update translation template.
366
msgid "Revision numbers only make sense for single revisions, not ranges"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
367
msgstr ""
368
6093.2.1 by Jonathan Riddell
add .pot file to archive
369
# help of 'tree' option of 'revno' command
7490.31.3 by Jelmer Vernooij
Update po.
370
#: breezy/builtins.py:642
6349.1.1 by Vincent Ladeuil
Release 2.5b4
371
msgid "Show revno of working tree."
6093.2.1 by Jonathan Riddell
add .pot file to archive
372
msgstr ""
373
7490.31.3 by Jelmer Vernooij
Update po.
374
#: breezy/builtins.py:691
6093.2.1 by Jonathan Riddell
add .pot file to archive
375
msgid "Add specified files or directories."
376
msgstr ""
377
7490.31.3 by Jelmer Vernooij
Update po.
378
#: breezy/builtins.py:693
6093.2.1 by Jonathan Riddell
add .pot file to archive
379
msgid ""
380
"In non-recursive mode, all the named items are added, regardless\n"
381
"of whether they were previously ignored.  A warning is given if\n"
382
"any of the named files are already versioned."
383
msgstr ""
384
7490.31.3 by Jelmer Vernooij
Update po.
385
#: breezy/builtins.py:697
6093.2.1 by Jonathan Riddell
add .pot file to archive
386
msgid ""
387
"In recursive mode (the default), files are treated the same way\n"
388
"but the behaviour for directories is different.  Directories that\n"
389
"are already versioned do not give a warning.  All directories,\n"
390
"whether already versioned or not, are searched for files or\n"
391
"subdirectories that are neither versioned or ignored, and these\n"
392
"are added.  This search proceeds recursively into versioned\n"
393
"directories.  If no names are given '.' is assumed."
394
msgstr ""
395
7490.31.3 by Jelmer Vernooij
Update po.
396
#: breezy/builtins.py:705
6252.1.1 by Vincent Ladeuil
Release 2.5b3
397
msgid ""
398
"A warning will be printed when nested trees are encountered,\n"
399
"unless they are explicitly ignored."
400
msgstr ""
401
7490.31.3 by Jelmer Vernooij
Update po.
402
#: breezy/builtins.py:708
6093.2.1 by Jonathan Riddell
add .pot file to archive
403
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
404
"Therefore simply saying 'brz add' will version all files that\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
405
"are currently unknown."
406
msgstr ""
407
7490.31.3 by Jelmer Vernooij
Update po.
408
#: breezy/builtins.py:711
6093.2.1 by Jonathan Riddell
add .pot file to archive
409
msgid ""
410
"Adding a file whose parent directory is not versioned will\n"
411
"implicitly add the parent, and so on up to the root. This means\n"
412
"you should never need to explicitly add a directory, they'll just\n"
413
"get added when you add a file in the directory."
414
msgstr ""
415
7490.31.3 by Jelmer Vernooij
Update po.
416
#: breezy/builtins.py:716
6093.2.1 by Jonathan Riddell
add .pot file to archive
417
msgid ""
418
"--dry-run will show which files would be added, but not actually\n"
419
"add them."
420
msgstr ""
421
7490.31.3 by Jelmer Vernooij
Update po.
422
#: breezy/builtins.py:719
6093.2.1 by Jonathan Riddell
add .pot file to archive
423
msgid ""
424
"--file-ids-from will try to use the file ids from the supplied path.\n"
425
"It looks up ids trying to find a matching parent directory with the\n"
426
"same filename, and then by pure path. This option is rarely needed\n"
427
"but can be useful when adding the same logical file into two\n"
428
"branches that will be merged later (without showing the two different\n"
429
"adds as a conflict). It is also useful when merging another project\n"
430
"into a subdirectory of this one."
431
msgstr ""
432
7490.31.3 by Jelmer Vernooij
Update po.
433
#: breezy/builtins.py:727
6093.2.1 by Jonathan Riddell
add .pot file to archive
434
msgid ""
435
"Any files matching patterns in the ignore list will not be added\n"
436
"unless they are explicitly mentioned."
437
msgstr ""
438
7490.31.3 by Jelmer Vernooij
Update po.
439
#: breezy/builtins.py:730
6093.2.1 by Jonathan Riddell
add .pot file to archive
440
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
441
"In recursive mode, files larger than the configuration option\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
442
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
443
"to file size."
444
msgstr ""
445
446
# help of 'no-recurse' option of 'add' command
7490.31.3 by Jelmer Vernooij
Update po.
447
#: breezy/builtins.py:737
6093.2.1 by Jonathan Riddell
add .pot file to archive
448
msgid "Don't recursively add the contents of directories."
449
msgstr ""
450
451
# help of 'file-ids-from' option of 'add' command
7490.31.3 by Jelmer Vernooij
Update po.
452
#: breezy/builtins.py:745
6093.2.1 by Jonathan Riddell
add .pot file to archive
453
msgid "Lookup file ids from this tree."
454
msgstr ""
455
7490.31.3 by Jelmer Vernooij
Update po.
456
#: breezy/builtins.py:757
457
msgid ""
458
"Ignoring --file-ids-from, since the tree does not support setting file ids."
459
msgstr ""
460
461
#: breezy/builtins.py:788
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
462
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
463
msgid "ignored {0} matching \"{1}\"\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
464
msgstr ""
465
7490.31.3 by Jelmer Vernooij
Update po.
466
#: breezy/builtins.py:793
6093.2.1 by Jonathan Riddell
add .pot file to archive
467
msgid "Create a new versioned directory."
468
msgstr ""
469
7490.31.3 by Jelmer Vernooij
Update po.
470
#: breezy/builtins.py:795
6093.2.1 by Jonathan Riddell
add .pot file to archive
471
msgid "This is equivalent to creating the directory and then adding it."
472
msgstr ""
473
6437.2.2 by Vincent Ladeuil
Release 2.5b5
474
# help of 'parents' option of 'mkdir' command
7490.31.3 by Jelmer Vernooij
Update po.
475
#: breezy/builtins.py:802
6437.2.2 by Vincent Ladeuil
Release 2.5b5
476
msgid "No error if existing, make parent directories as needed."
477
msgstr ""
478
7490.31.3 by Jelmer Vernooij
Update po.
479
#: breezy/builtins.py:836
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
480
#, python-format
481
msgid "added %s\n"
482
msgstr ""
483
7490.31.3 by Jelmer Vernooij
Update po.
484
#: breezy/builtins.py:883
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
485
#, python-format
486
msgid "invalid kind %r specified"
487
msgstr ""
488
7490.31.3 by Jelmer Vernooij
Update po.
489
#: breezy/builtins.py:921
7185.1.1 by Jelmer Vernooij
Update pot file.
490
msgid "Copy a file."
491
msgstr ""
492
7490.31.3 by Jelmer Vernooij
Update po.
493
#: breezy/builtins.py:923
7185.1.1 by Jelmer Vernooij
Update pot file.
494
msgid "    brz cp SOURCE... DESTINATION"
495
msgstr ""
496
7490.31.3 by Jelmer Vernooij
Update po.
497
#: breezy/builtins.py:925
7185.1.1 by Jelmer Vernooij
Update pot file.
498
msgid ""
499
"If the last argument is a versioned directory, all the other names\n"
500
"are copied into it.  Otherwise, there must be exactly two arguments\n"
501
"and the file is copied to a new name."
502
msgstr ""
503
7490.31.3 by Jelmer Vernooij
Update po.
504
#: breezy/builtins.py:929
7185.1.1 by Jelmer Vernooij
Update pot file.
505
msgid ""
506
"Files cannot be copied between branches. Only files can be copied\n"
507
"at the moment."
508
msgstr ""
509
7490.31.3 by Jelmer Vernooij
Update po.
510
#: breezy/builtins.py:945 breezy/builtins.py:1038
7185.1.1 by Jelmer Vernooij
Update pot file.
511
msgid "missing file argument"
512
msgstr ""
513
7490.31.3 by Jelmer Vernooij
Update po.
514
#: breezy/builtins.py:951
7185.1.1 by Jelmer Vernooij
Update pot file.
515
msgid "can not copy root of branch"
516
msgstr ""
517
7490.31.3 by Jelmer Vernooij
Update po.
518
#: breezy/builtins.py:959
7185.1.1 by Jelmer Vernooij
Update pot file.
519
msgid "to copy multiple files the destination must be a versioned directory"
520
msgstr ""
521
7490.31.3 by Jelmer Vernooij
Update po.
522
#: breezy/builtins.py:973 breezy/builtins.py:989
7185.1.1 by Jelmer Vernooij
Update pot file.
523
#, python-format
524
msgid "Could not copy %s => %s: %s is not versioned."
525
msgstr ""
526
7490.31.3 by Jelmer Vernooij
Update po.
527
#: breezy/builtins.py:977
7185.1.1 by Jelmer Vernooij
Update pot file.
528
#, python-format
529
msgid "Could not copy %s => %s . %s is not versioned\\."
530
msgstr ""
531
7490.31.3 by Jelmer Vernooij
Update po.
532
#: breezy/builtins.py:981
7185.1.1 by Jelmer Vernooij
Update pot file.
533
#, python-format
534
msgid "Could not copy %s => %s . %s is a directory."
535
msgstr ""
536
7490.31.3 by Jelmer Vernooij
Update po.
537
#: breezy/builtins.py:993
7185.1.1 by Jelmer Vernooij
Update pot file.
538
#, python-format
539
msgid "Could not copy to %s: %s is not a directory."
540
msgstr ""
541
7490.31.3 by Jelmer Vernooij
Update po.
542
#: breezy/builtins.py:1000
6093.2.1 by Jonathan Riddell
add .pot file to archive
543
msgid "Move or rename a file."
544
msgstr ""
545
7490.31.3 by Jelmer Vernooij
Update po.
546
#: breezy/builtins.py:1002
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
547
msgid "    brz mv SOURCE... DESTINATION"
6093.2.1 by Jonathan Riddell
add .pot file to archive
548
msgstr ""
549
7490.31.3 by Jelmer Vernooij
Update po.
550
#: breezy/builtins.py:1004
6093.2.1 by Jonathan Riddell
add .pot file to archive
551
msgid ""
552
"If the last argument is a versioned directory, all the other names\n"
553
"are moved into it.  Otherwise, there must be exactly two arguments\n"
554
"and the file is changed to a new name."
555
msgstr ""
556
7490.31.3 by Jelmer Vernooij
Update po.
557
#: breezy/builtins.py:1008
6093.2.1 by Jonathan Riddell
add .pot file to archive
558
msgid ""
559
"If OLDNAME does not exist on the filesystem but is versioned and\n"
560
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
561
"assumes that the file has been manually moved and only updates\n"
562
"its internal inventory to reflect that change.\n"
563
"The same is valid when moving many SOURCE files to a DESTINATION."
564
msgstr ""
565
7490.31.3 by Jelmer Vernooij
Update po.
566
#: breezy/builtins.py:1014
6093.2.1 by Jonathan Riddell
add .pot file to archive
567
msgid "Files cannot be moved between branches."
568
msgstr ""
569
570
# help of 'after' option of 'mv' command
7490.31.3 by Jelmer Vernooij
Update po.
571
#: breezy/builtins.py:1021
6093.2.1 by Jonathan Riddell
add .pot file to archive
572
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
573
"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
574
"moved."
575
msgstr ""
576
577
# help of 'auto' option of 'mv' command
7490.31.3 by Jelmer Vernooij
Update po.
578
#: breezy/builtins.py:1023
6093.2.1 by Jonathan Riddell
add .pot file to archive
579
msgid "Automatically guess renames."
580
msgstr ""
581
582
# help of 'dry-run' option of 'mv' command
7490.31.3 by Jelmer Vernooij
Update po.
583
#: breezy/builtins.py:1025
6093.2.1 by Jonathan Riddell
add .pot file to archive
584
msgid "Avoid making changes when guessing renames."
585
msgstr ""
586
7490.31.3 by Jelmer Vernooij
Update po.
587
#: breezy/builtins.py:1034
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
588
msgid "--dry-run requires --auto."
589
msgstr ""
590
7490.31.3 by Jelmer Vernooij
Update po.
591
#: breezy/builtins.py:1044
6252.1.1 by Vincent Ladeuil
Release 2.5b3
592
msgid "can not move root of branch"
593
msgstr ""
594
7490.31.3 by Jelmer Vernooij
Update po.
595
#: breezy/builtins.py:1051
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
596
msgid "Only one path may be specified to --auto."
597
msgstr ""
598
7490.31.3 by Jelmer Vernooij
Update po.
599
#: breezy/builtins.py:1054
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
600
msgid "--after cannot be specified with --auto."
601
msgstr ""
602
7490.31.3 by Jelmer Vernooij
Update po.
603
#: breezy/builtins.py:1090
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
604
msgid "to mv multiple files the destination must be a versioned directory"
605
msgstr ""
606
7490.31.3 by Jelmer Vernooij
Update po.
607
#: breezy/builtins.py:1143
6093.2.1 by Jonathan Riddell
add .pot file to archive
608
msgid "Turn this branch into a mirror of another branch."
609
msgstr ""
610
7490.31.3 by Jelmer Vernooij
Update po.
611
#: breezy/builtins.py:1145
6093.2.1 by Jonathan Riddell
add .pot file to archive
612
msgid ""
613
"By default, this command only works on branches that have not diverged.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
614
"Branches are considered diverged if the destination branch's most recent\n"
615
"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
616
"parent."
617
msgstr ""
618
7490.31.3 by Jelmer Vernooij
Update po.
619
#: breezy/builtins.py:1150
6093.2.1 by Jonathan Riddell
add .pot file to archive
620
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
621
"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
622
"from one into the other.  Once one branch has merged, the other should\n"
623
"be able to pull it again."
624
msgstr ""
625
7490.31.3 by Jelmer Vernooij
Update po.
626
#: breezy/builtins.py:1154
6093.2.1 by Jonathan Riddell
add .pot file to archive
627
msgid ""
628
"If you want to replace your local changes and just want your branch to\n"
629
"match the remote one, use pull --overwrite. This will work even if the two\n"
630
"branches have diverged."
631
msgstr ""
632
7490.31.3 by Jelmer Vernooij
Update po.
633
#: breezy/builtins.py:1158
6093.2.1 by Jonathan Riddell
add .pot file to archive
634
msgid ""
635
"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
636
"--no-remember to avoid setting it). After that, you can omit the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
637
"location to use the default.  To change the default, use --remember. The\n"
638
"value will only be saved if the remote location can be accessed."
639
msgstr ""
640
7490.31.3 by Jelmer Vernooij
Update po.
641
#: breezy/builtins.py:1163
6252.1.1 by Vincent Ladeuil
Release 2.5b3
642
msgid ""
643
"The --verbose option will display the revisions pulled using the log_format\n"
644
"configuration option. You can use a different format by overriding it with\n"
645
"-Olog_format=<other_format>."
646
msgstr ""
647
7490.31.3 by Jelmer Vernooij
Update po.
648
#: breezy/builtins.py:1167
6093.2.1 by Jonathan Riddell
add .pot file to archive
649
msgid ""
650
"Note: The location can be specified either in the form of a branch,\n"
651
"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.
652
"with brz send."
6093.2.1 by Jonathan Riddell
add .pot file to archive
653
msgstr ""
654
655
# help of 'verbose' option of 'pull' command
7490.31.3 by Jelmer Vernooij
Update po.
656
#: breezy/builtins.py:1175
6093.2.1 by Jonathan Riddell
add .pot file to archive
657
msgid "Show logs of pulled revisions."
658
msgstr ""
659
660
# help of 'directory' option of 'pull' command
7490.31.3 by Jelmer Vernooij
Update po.
661
#: breezy/builtins.py:1177
6093.2.1 by Jonathan Riddell
add .pot file to archive
662
msgid ""
663
"Branch to pull into, rather than the one containing the working directory."
664
msgstr ""
665
666
# help of 'local' option of 'pull' command
7490.31.3 by Jelmer Vernooij
Update po.
667
#: breezy/builtins.py:1180
6093.2.1 by Jonathan Riddell
add .pot file to archive
668
msgid ""
669
"Perform a local pull in a bound branch.  Local pulls are not applied to the "
670
"master branch."
671
msgstr ""
672
7490.31.3 by Jelmer Vernooij
Update po.
673
#: breezy/builtins.py:1217
6581.1.2 by Vincent Ladeuil
Update translation template.
674
msgid "No working tree, ignoring --show-base"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
675
msgstr ""
676
7490.31.3 by Jelmer Vernooij
Update po.
677
#: breezy/builtins.py:1233 breezy/plugins/rewrite/commands.py:479
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
678
msgid "No pull location known or specified."
679
msgstr ""
680
7490.31.3 by Jelmer Vernooij
Update po.
681
#: breezy/builtins.py:1240
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
682
#, python-format
683
msgid "Using saved parent location: %s\n"
684
msgstr ""
685
7490.31.3 by Jelmer Vernooij
Update po.
686
#: breezy/builtins.py:1247 breezy/builtins.py:4529
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
687
msgid "Cannot use -r with merge directives or bundles"
688
msgstr ""
689
7490.31.3 by Jelmer Vernooij
Update po.
690
#: breezy/builtins.py:1290
6093.2.1 by Jonathan Riddell
add .pot file to archive
691
msgid "Update a mirror of this branch."
692
msgstr ""
693
7490.31.3 by Jelmer Vernooij
Update po.
694
#: breezy/builtins.py:1292
6093.2.1 by Jonathan Riddell
add .pot file to archive
695
msgid ""
696
"The target branch will not have its working tree populated because this\n"
697
"is both expensive, and is not supported on remote file systems."
698
msgstr ""
699
7490.31.3 by Jelmer Vernooij
Update po.
700
#: breezy/builtins.py:1295
6093.2.1 by Jonathan Riddell
add .pot file to archive
701
msgid ""
702
"Some smart servers or protocols *may* put the working tree in place in\n"
703
"the future."
704
msgstr ""
705
7490.31.3 by Jelmer Vernooij
Update po.
706
#: breezy/builtins.py:1298
6093.2.1 by Jonathan Riddell
add .pot file to archive
707
msgid ""
708
"This command only works on branches that have not diverged.  Branches are\n"
709
"considered diverged if the destination branch's most recent commit is one\n"
710
"that has not been merged (directly or indirectly) by the source branch."
711
msgstr ""
712
7490.31.3 by Jelmer Vernooij
Update po.
713
#: breezy/builtins.py:1302
6093.2.1 by Jonathan Riddell
add .pot file to archive
714
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
715
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
716
"the other branch completely, discarding its unmerged changes."
717
msgstr ""
718
7490.31.3 by Jelmer Vernooij
Update po.
719
#: breezy/builtins.py:1305
6093.2.1 by Jonathan Riddell
add .pot file to archive
720
msgid ""
721
"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.
722
"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
723
"After that you will be able to do a push without '--overwrite'."
724
msgstr ""
725
7490.31.3 by Jelmer Vernooij
Update po.
726
#: breezy/builtins.py:1309
6093.2.1 by Jonathan Riddell
add .pot file to archive
727
msgid ""
728
"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
729
"--no-remember to avoid setting it).  After that, you can omit the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
730
"location to use the default.  To change the default, use --remember. The\n"
731
"value will only be saved if the remote location can be accessed."
732
msgstr ""
733
7490.31.3 by Jelmer Vernooij
Update po.
734
#: breezy/builtins.py:1314
6252.1.1 by Vincent Ladeuil
Release 2.5b3
735
msgid ""
736
"The --verbose option will display the revisions pushed using the log_format\n"
737
"configuration option. You can use a different format by overriding it with\n"
738
"-Olog_format=<other_format>."
739
msgstr ""
740
6437.2.2 by Vincent Ladeuil
Release 2.5b5
741
# help of 'directory' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
742
#: breezy/builtins.py:1325
6437.2.2 by Vincent Ladeuil
Release 2.5b5
743
msgid ""
744
"Branch to push from, rather than the one containing the working directory."
745
msgstr ""
746
6093.2.1 by Jonathan Riddell
add .pot file to archive
747
# help of 'use-existing-dir' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
748
#: breezy/builtins.py:1328
6093.2.1 by Jonathan Riddell
add .pot file to archive
749
msgid ""
750
"By default push will fail if the target directory exists, but does not "
751
"already have a control directory.  This flag will allow push to proceed."
752
msgstr ""
753
754
# help of 'stacked' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
755
#: breezy/builtins.py:1333
6093.2.1 by Jonathan Riddell
add .pot file to archive
756
msgid ""
757
"Create a stacked branch that references the public location of the parent "
758
"branch."
759
msgstr ""
760
761
# help of 'stacked-on' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
762
#: breezy/builtins.py:1336
6093.2.1 by Jonathan Riddell
add .pot file to archive
763
msgid ""
764
"Create a stacked branch that refers to another branch for the commit "
765
"history. Only the work not present in the referenced branch is included in "
766
"the branch created."
767
msgstr ""
768
6437.2.2 by Vincent Ladeuil
Release 2.5b5
769
# help of 'strict' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
770
#: breezy/builtins.py:1341
6437.2.2 by Vincent Ladeuil
Release 2.5b5
771
msgid ""
772
"Refuse to push if there are uncommitted changes in the working tree, --no-"
773
"strict disables the check."
774
msgstr ""
775
6093.2.1 by Jonathan Riddell
add .pot file to archive
776
# help of 'no-tree' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
777
#: breezy/builtins.py:1344
6093.2.1 by Jonathan Riddell
add .pot file to archive
778
msgid "Don't populate the working tree, even for protocols that support it."
779
msgstr ""
780
6535.1.1 by Vincent Ladeuil
Release 2.6b2
781
# help of 'overwrite-tags' option of 'pull' command
782
# help of 'overwrite-tags' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
783
#: breezy/builtins.py:1347
6535.1.1 by Vincent Ladeuil
Release 2.6b2
784
msgid "Overwrite tags only."
785
msgstr ""
786
7185.1.1 by Jelmer Vernooij
Update pot file.
787
# help of 'lossy' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
788
#: breezy/builtins.py:1348
7185.1.1 by Jelmer Vernooij
Update pot file.
789
msgid ""
790
"Allow lossy push, i.e. dropping metadata that can't be represented in the "
791
"target."
792
msgstr ""
793
7490.31.3 by Jelmer Vernooij
Update po.
794
#: breezy/builtins.py:1402
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
795
msgid "Could not determine branch to refer to."
796
msgstr ""
797
7490.31.3 by Jelmer Vernooij
Update po.
798
#: breezy/builtins.py:1411
6437.2.2 by Vincent Ladeuil
Release 2.5b5
799
#, python-format
800
msgid ""
801
"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.
802
"use 'brz push :parent'."
6437.2.2 by Vincent Ladeuil
Release 2.5b5
803
msgstr ""
804
7490.31.3 by Jelmer Vernooij
Update po.
805
#: breezy/builtins.py:1417
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
806
msgid "No push location known or specified."
807
msgstr ""
808
7490.31.3 by Jelmer Vernooij
Update po.
809
#: breezy/builtins.py:1421
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
810
#, python-format
811
msgid "Using saved push location: %s"
812
msgstr ""
813
7490.31.3 by Jelmer Vernooij
Update po.
814
#: breezy/builtins.py:1432
6093.2.1 by Jonathan Riddell
add .pot file to archive
815
msgid "Create a new branch that is a copy of an existing branch."
816
msgstr ""
817
7490.31.3 by Jelmer Vernooij
Update po.
818
#: breezy/builtins.py:1434
6093.2.1 by Jonathan Riddell
add .pot file to archive
819
msgid ""
820
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
821
"be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
822
"bar.\n"
823
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
824
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
825
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
826
"create ./foo-bar."
827
msgstr ""
828
7490.31.3 by Jelmer Vernooij
Update po.
829
#: breezy/builtins.py:1441
6093.2.1 by Jonathan Riddell
add .pot file to archive
830
msgid ""
831
"To retrieve the branch as of a particular revision, supply the --revision\n"
832
"parameter, as in \"branch foo/bar -r 5\"."
833
msgstr ""
834
835
# help of 'no-tree' option of 'branch' command
7490.31.3 by Jelmer Vernooij
Update po.
836
#: breezy/builtins.py:1454
6093.2.1 by Jonathan Riddell
add .pot file to archive
837
msgid "Create a branch without a working-tree."
838
msgstr ""
839
840
# help of 'switch' option of 'branch' command
7490.31.3 by Jelmer Vernooij
Update po.
841
#: breezy/builtins.py:1456
6093.2.1 by Jonathan Riddell
add .pot file to archive
842
msgid "Switch the checkout in the current directory to the new branch."
843
msgstr ""
844
845
# help of 'stacked' option of 'branch' command
7490.31.3 by Jelmer Vernooij
Update po.
846
#: breezy/builtins.py:1459
6093.2.1 by Jonathan Riddell
add .pot file to archive
847
msgid ""
848
"Create a stacked branch referring to the source branch. The new branch will "
849
"depend on the availability of the source branch for all operations."
850
msgstr ""
851
852
# help of 'standalone' option of 'branch' command
7490.31.3 by Jelmer Vernooij
Update po.
853
#: breezy/builtins.py:1463
6093.2.1 by Jonathan Riddell
add .pot file to archive
854
msgid "Do not use a shared repository, even if available."
855
msgstr ""
856
857
# help of 'use-existing-dir' option of 'branch' command
7490.31.3 by Jelmer Vernooij
Update po.
858
#: breezy/builtins.py:1465
6093.2.1 by Jonathan Riddell
add .pot file to archive
859
msgid ""
860
"By default branch will fail if the target directory exists, but does not "
861
"already have a control directory.  This flag will allow branch to proceed."
862
msgstr ""
863
864
# help of 'bind' option of 'branch' command
7490.31.3 by Jelmer Vernooij
Update po.
865
#: breezy/builtins.py:1470
6093.2.1 by Jonathan Riddell
add .pot file to archive
866
msgid "Bind new branch to from location."
867
msgstr ""
868
7490.31.3 by Jelmer Vernooij
Update po.
869
# help of 'colocated-branch' option of 'branch' command
870
#: breezy/builtins.py:1474
871
msgid "Name of colocated branch to sprout."
872
msgstr ""
873
874
#: breezy/builtins.py:1515
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
875
#, python-format
876
msgid "Target directory \"%s\" already exists."
877
msgstr ""
878
7490.31.3 by Jelmer Vernooij
Update po.
879
#: breezy/builtins.py:1527
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
880
#, python-format
881
msgid "Parent of \"%s\" does not exist."
882
msgstr ""
883
7490.31.3 by Jelmer Vernooij
Update po.
884
#: breezy/builtins.py:1546
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
885
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
886
msgid "The branch {0} has no revision {1}."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
887
msgstr ""
888
7490.31.3 by Jelmer Vernooij
Update po.
889
#: breezy/builtins.py:1563 breezy/push.py:54
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
890
#, python-format
891
msgid "Created new stacked branch referring to %s."
892
msgstr ""
893
7490.31.3 by Jelmer Vernooij
Update po.
894
#: breezy/builtins.py:1569
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
895
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
896
msgid "Branched %d revision."
897
msgid_plural "Branched %d revisions."
898
msgstr[0] ""
899
msgstr[1] ""
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
900
7490.31.3 by Jelmer Vernooij
Update po.
901
#: breezy/builtins.py:1573 breezy/push.py:57
7185.1.1 by Jelmer Vernooij
Update pot file.
902
msgid "Created new branch."
903
msgstr ""
904
7490.31.3 by Jelmer Vernooij
Update po.
905
#: breezy/builtins.py:1578
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
906
#, python-format
907
msgid "New branch bound to %s"
908
msgstr ""
909
7490.31.3 by Jelmer Vernooij
Update po.
910
#: breezy/builtins.py:1583
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
911
#, python-format
912
msgid "Switched to branch: %s"
913
msgstr ""
914
7490.31.3 by Jelmer Vernooij
Update po.
915
#: breezy/builtins.py:1588
6093.2.1 by Jonathan Riddell
add .pot file to archive
916
msgid "List the branches available at the current location."
917
msgstr ""
918
7490.31.3 by Jelmer Vernooij
Update po.
919
#: breezy/builtins.py:1590
6252.1.1 by Vincent Ladeuil
Release 2.5b3
920
msgid ""
921
"This command will print the names of all the branches at the current\n"
922
"location."
923
msgstr ""
924
925
# help of 'recursive' option of 'branches' command
7490.31.3 by Jelmer Vernooij
Update po.
926
#: breezy/builtins.py:1597
6252.1.1 by Vincent Ladeuil
Release 2.5b3
927
msgid ""
928
"Recursively scan for branches rather than just looking in the specified "
929
"location."
930
msgstr ""
931
7490.31.3 by Jelmer Vernooij
Update po.
932
#: breezy/builtins.py:1626
6437.2.2 by Vincent Ladeuil
Release 2.5b5
933
msgid "(default)"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
934
msgstr ""
935
7490.31.3 by Jelmer Vernooij
Update po.
936
#: breezy/builtins.py:1638
6093.2.1 by Jonathan Riddell
add .pot file to archive
937
msgid "Create a new checkout of an existing branch."
938
msgstr ""
939
7490.31.3 by Jelmer Vernooij
Update po.
940
#: breezy/builtins.py:1640
6093.2.1 by Jonathan Riddell
add .pot file to archive
941
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
942
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree\n"
943
"for the branch found in '.'. This is useful if you have removed the working\n"
944
"tree or if it was never created - i.e. if you pushed the branch to its\n"
945
"current location using SFTP."
6093.2.1 by Jonathan Riddell
add .pot file to archive
946
msgstr ""
947
7490.31.3 by Jelmer Vernooij
Update po.
948
#: breezy/builtins.py:1645
6093.2.1 by Jonathan Riddell
add .pot file to archive
949
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
950
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION\n"
951
"will be used.  In other words, \"checkout ../foo/bar\" will attempt to "
952
"create\n"
953
"./bar.  If the BRANCH_LOCATION has no / or path separator embedded, the\n"
954
"TO_LOCATION is derived from the BRANCH_LOCATION by stripping a leading\n"
955
"scheme or drive identifier, if any. For example, \"checkout lp:foo-bar\" "
6093.2.1 by Jonathan Riddell
add .pot file to archive
956
"will\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
957
"attempt to create ./foo-bar."
6093.2.1 by Jonathan Riddell
add .pot file to archive
958
msgstr ""
959
7490.31.3 by Jelmer Vernooij
Update po.
960
#: breezy/builtins.py:1652
6093.2.1 by Jonathan Riddell
add .pot file to archive
961
msgid ""
962
"To retrieve the branch as of a particular revision, supply the --revision\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
963
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be\n"
964
"immediately out of date [so you cannot commit] but it may be useful (i.e.\n"
965
"to examine old code.)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
966
msgstr ""
967
968
# help of 'lightweight' option of 'checkout' command
7490.31.3 by Jelmer Vernooij
Update po.
969
#: breezy/builtins.py:1662
6093.2.1 by Jonathan Riddell
add .pot file to archive
970
msgid ""
971
"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
972
"the branch for every operation.  Normal checkouts can perform common "
973
"operations like diff and status without such access, and also support local "
974
"commits."
975
msgstr ""
976
977
# help of 'files-from' option of 'branch' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
978
# help of 'files-from' option of 'checkout' command
7490.31.3 by Jelmer Vernooij
Update po.
979
#: breezy/builtins.py:1669
6093.2.1 by Jonathan Riddell
add .pot file to archive
980
msgid "Get file contents from this tree."
981
msgstr ""
982
983
# help of 'hardlink' option of 'branch' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
984
# help of 'hardlink' option of 'checkout' command
7490.31.3 by Jelmer Vernooij
Update po.
985
#: breezy/builtins.py:1671
6093.2.1 by Jonathan Riddell
add .pot file to archive
986
msgid "Hard-link working tree files where possible."
987
msgstr ""
988
7490.31.3 by Jelmer Vernooij
Update po.
989
#: breezy/builtins.py:1711
990
msgid ""
991
"Clone a control directory.\n"
992
"    "
993
msgstr ""
994
995
# help of 'no-recurse-nested' option of 'branch' command
996
# help of 'no-recurse-nested' option of 'clone' command
997
#: breezy/builtins.py:1717
998
msgid "Do not recursively check out nested trees."
999
msgstr ""
1000
1001
#: breezy/builtins.py:1739
1002
msgid "Created new control directory."
1003
msgstr ""
1004
1005
#: breezy/builtins.py:1743
6093.2.1 by Jonathan Riddell
add .pot file to archive
1006
msgid ""
1007
"Show list of renamed files.\n"
1008
"    "
1009
msgstr ""
1010
7490.31.3 by Jelmer Vernooij
Update po.
1011
#: breezy/builtins.py:1771
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1012
msgid "Update a working tree to a new revision."
1013
msgstr ""
1014
7490.31.3 by Jelmer Vernooij
Update po.
1015
#: breezy/builtins.py:1773
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1016
msgid ""
1017
"This will perform a merge of the destination revision (the tip of the\n"
1018
"branch, or the specified revision) into the working tree, and then make\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1019
"that revision the basis revision for the working tree."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1020
msgstr ""
1021
7490.31.3 by Jelmer Vernooij
Update po.
1022
#: breezy/builtins.py:1777
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1023
msgid ""
1024
"You can use this to visit an older revision, or to update a working tree\n"
1025
"that is out of date from its branch."
1026
msgstr ""
1027
7490.31.3 by Jelmer Vernooij
Update po.
1028
#: breezy/builtins.py:1780
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1029
msgid ""
1030
"If there are any uncommitted changes in the tree, they will be carried\n"
1031
"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.
1032
"these changes, use 'brz revert'.  The uncommitted changes may conflict\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1033
"with the changes brought in by the change in basis revision."
1034
msgstr ""
1035
7490.31.3 by Jelmer Vernooij
Update po.
1036
#: breezy/builtins.py:1785
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1037
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1038
"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
1039
"the branch from the master."
1040
msgstr ""
1041
7490.31.3 by Jelmer Vernooij
Update po.
1042
#: breezy/builtins.py:1788
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1043
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
1044
"You cannot update just a single file or directory, because each Breezy\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1045
"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.
1046
"file that has been removed locally, use 'brz revert' instead of 'brz\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1047
"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.
1048
"revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1049
"out the old content of that file to a new location."
1050
msgstr ""
1051
7490.31.3 by Jelmer Vernooij
Update po.
1052
#: breezy/builtins.py:1795
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1053
msgid ""
1054
"The 'dir' argument, if given, must be the location of the root of a\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1055
"working tree to update.  By default, the working tree that contains the\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1056
"current working directory is used."
1057
msgstr ""
1058
7490.31.3 by Jelmer Vernooij
Update po.
1059
#: breezy/builtins.py:1811
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1060
msgid "brz update --revision takes exactly one revision"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1061
msgstr ""
1062
7490.31.3 by Jelmer Vernooij
Update po.
1063
#: breezy/builtins.py:1819
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1064
msgid "brz update can only update a whole tree, not a file or subdirectory"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
1065
msgstr ""
1066
7490.31.3 by Jelmer Vernooij
Update po.
1067
#: breezy/builtins.py:1849
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1068
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
1069
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
1070
msgstr ""
1071
7490.31.3 by Jelmer Vernooij
Update po.
1072
#: breezy/builtins.py:1865
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1073
#, python-format
1074
msgid ""
1075
"branch has no revision %s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1076
"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
1077
msgstr ""
1078
7490.31.3 by Jelmer Vernooij
Update po.
1079
#: breezy/builtins.py:1871
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1080
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
1081
msgid "Updated to revision {0} of branch {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1082
msgstr ""
1083
7490.31.3 by Jelmer Vernooij
Update po.
1084
#: breezy/builtins.py:1875
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1085
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1086
"Your local commits will now show as pending merges with 'brz status', and "
1087
"can be committed with 'brz commit'."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1088
msgstr ""
1089
7490.31.3 by Jelmer Vernooij
Update po.
1090
#: breezy/builtins.py:1884
6093.2.1 by Jonathan Riddell
add .pot file to archive
1091
msgid "Show information about a working tree, branch or repository."
1092
msgstr ""
1093
7490.31.3 by Jelmer Vernooij
Update po.
1094
#: breezy/builtins.py:1886
6093.2.1 by Jonathan Riddell
add .pot file to archive
1095
msgid ""
1096
"This command will show all known locations and formats associated to the\n"
1097
"tree, branch or repository."
1098
msgstr ""
1099
7490.31.3 by Jelmer Vernooij
Update po.
1100
#: breezy/builtins.py:1889
6093.2.1 by Jonathan Riddell
add .pot file to archive
1101
msgid ""
1102
"In verbose mode, statistical information is included with each report.\n"
1103
"To see extended statistic information, use a verbosity level of 2 or\n"
1104
"higher by specifying the verbose option multiple times, e.g. -vv."
1105
msgstr ""
1106
7490.31.3 by Jelmer Vernooij
Update po.
1107
#: breezy/builtins.py:1893
6093.2.1 by Jonathan Riddell
add .pot file to archive
1108
msgid "Branches and working trees will also report any missing revisions."
1109
msgstr ""
1110
7490.31.3 by Jelmer Vernooij
Update po.
1111
#: breezy/builtins.py:1895 breezy/builtins.py:3830 breezy/builtins.py:4997
1112
#: breezy/builtins.py:6591 breezy/plugins/fastimport/cmds.py:211
1113
#: breezy/plugins/fastimport/cmds.py:417 breezy/plugins/propose/cmds.py:285
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1114
msgid ":Examples:"
1115
msgstr ""
1116
7490.31.3 by Jelmer Vernooij
Update po.
1117
#: breezy/builtins.py:1897
6093.2.1 by Jonathan Riddell
add .pot file to archive
1118
msgid "  Display information on the format and related locations:"
1119
msgstr ""
1120
7490.31.3 by Jelmer Vernooij
Update po.
1121
#: breezy/builtins.py:1899
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1122
msgid "    brz info"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1123
msgstr ""
1124
7490.31.3 by Jelmer Vernooij
Update po.
1125
#: breezy/builtins.py:1901
6093.2.1 by Jonathan Riddell
add .pot file to archive
1126
msgid ""
1127
"  Display the above together with extended format information and\n"
1128
"  basic statistics (like the number of files in the working tree and\n"
1129
"  number of revisions in the branch and repository):"
1130
msgstr ""
1131
7490.31.3 by Jelmer Vernooij
Update po.
1132
#: breezy/builtins.py:1905
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1133
msgid "    brz info -v"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1134
msgstr ""
1135
7490.31.3 by Jelmer Vernooij
Update po.
1136
#: breezy/builtins.py:1907
6093.2.1 by Jonathan Riddell
add .pot file to archive
1137
msgid "  Display the above together with number of committers to the branch:"
1138
msgstr ""
1139
7490.31.3 by Jelmer Vernooij
Update po.
1140
#: breezy/builtins.py:1909
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1141
msgid "    brz info -vv"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1142
msgstr ""
1143
7490.31.3 by Jelmer Vernooij
Update po.
1144
#: breezy/builtins.py:1928
6093.2.1 by Jonathan Riddell
add .pot file to archive
1145
msgid "Remove files or directories."
1146
msgstr ""
1147
7490.31.3 by Jelmer Vernooij
Update po.
1148
#: breezy/builtins.py:1930
6093.2.1 by Jonathan Riddell
add .pot file to archive
1149
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
1150
"This makes Breezy stop tracking changes to the specified files. Breezy will\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1151
"delete them if they can easily be recovered using revert otherwise they\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
1152
"will be backed up (adding an extension of the form .~#~). If no options or\n"
7490.31.3 by Jelmer Vernooij
Update po.
1153
"parameters are given Breezy will scan for files that are being tracked by\n"
1154
"Breezy but missing in your tree and stop tracking them for you."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1155
msgstr ""
1156
1157
# help of 'new' option of 'remove' command
7490.31.3 by Jelmer Vernooij
Update po.
1158
#: breezy/builtins.py:1939
6093.2.1 by Jonathan Riddell
add .pot file to archive
1159
msgid "Only remove files that have never been committed."
1160
msgstr ""
1161
1162
# help of 'file-deletion-strategy' option of 'remove' command
7490.31.3 by Jelmer Vernooij
Update po.
1163
#: breezy/builtins.py:1941
6093.2.1 by Jonathan Riddell
add .pot file to archive
1164
msgid "The file deletion mode to be used."
1165
msgstr ""
1166
1167
# title of 'file-deletion-strategy' option of 'remove' command
7490.31.3 by Jelmer Vernooij
Update po.
1168
#: breezy/builtins.py:1942
6093.2.1 by Jonathan Riddell
add .pot file to archive
1169
msgid "Deletion Strategy"
1170
msgstr ""
1171
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1172
# help of 'file-deletion-strategy=safe' option of 'remove' command
7490.31.3 by Jelmer Vernooij
Update po.
1173
#: breezy/builtins.py:1943
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1174
msgid "Backup changed files (default)."
1175
msgstr ""
1176
1177
# help of 'file-deletion-strategy=keep' option of 'remove' command
7490.31.3 by Jelmer Vernooij
Update po.
1178
#: breezy/builtins.py:1944
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1179
msgid "Delete from brz but leave the working copy."
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1180
msgstr ""
1181
1182
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
7490.31.3 by Jelmer Vernooij
Update po.
1183
#: breezy/builtins.py:1945
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1184
msgid "Don't backup changed files."
1185
msgstr ""
1186
7490.31.3 by Jelmer Vernooij
Update po.
1187
#: breezy/builtins.py:1966
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1188
msgid "No matching files."
1189
msgstr ""
1190
7490.31.3 by Jelmer Vernooij
Update po.
1191
#: breezy/builtins.py:1983
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1192
msgid "Reconcile brz metadata in a branch."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1193
msgstr ""
1194
7490.31.3 by Jelmer Vernooij
Update po.
1195
#: breezy/builtins.py:1985
6093.2.1 by Jonathan Riddell
add .pot file to archive
1196
msgid ""
1197
"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.
1198
"previous ghost operations or brz upgrades. You should only\n"
1199
"need to run this command if 'brz check' or a brz developer\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1200
"advises you to run it."
1201
msgstr ""
1202
7490.31.3 by Jelmer Vernooij
Update po.
1203
#: breezy/builtins.py:1990
6093.2.1 by Jonathan Riddell
add .pot file to archive
1204
msgid ""
1205
"If a second branch is provided, cross-branch reconciliation is\n"
1206
"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.
1207
"id which was not present in very early brz versions is represented\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1208
"correctly in both branches."
1209
msgstr ""
1210
7490.31.3 by Jelmer Vernooij
Update po.
1211
#: breezy/builtins.py:1995
6093.2.1 by Jonathan Riddell
add .pot file to archive
1212
msgid ""
1213
"At the same time it is run it may recompress data resulting in\n"
1214
"a potential saving in disk space or performance gain."
1215
msgstr ""
1216
7490.31.3 by Jelmer Vernooij
Update po.
1217
#: breezy/builtins.py:1998
6093.2.1 by Jonathan Riddell
add .pot file to archive
1218
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1219
msgstr ""
1220
7185.1.1 by Jelmer Vernooij
Update pot file.
1221
# help of 'format=git-bare' option of 'init' command
7490.31.3 by Jelmer Vernooij
Update po.
1222
# help of 'format=git-bare' option of 'init-shared-repository' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1223
# help of 'format=git-bare' option of 'upgrade' command
7490.31.3 by Jelmer Vernooij
Update po.
1224
#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
7185.1.1 by Jelmer Vernooij
Update pot file.
1225
msgid "Bare GIT repository (no working tree)."
1226
msgstr ""
1227
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1228
# help of 'format=2a' option of 'init' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1229
# help of 'format=bzr' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1230
# help of 'format=default' option of 'init' command
7490.31.3 by Jelmer Vernooij
Update po.
1231
# help of 'format=2a' option of 'init-shared-repository' command
1232
# help of 'format=bzr' option of 'init-shared-repository' command
1233
# help of 'format=default' option of 'init-shared-repository' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1234
# help of 'format=2a' option of 'upgrade' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1235
# help of 'format=bzr' option of 'upgrade' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1236
# help of 'format=default' option of 'upgrade' command
7490.31.3 by Jelmer Vernooij
Update po.
1237
#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
7185.1.1 by Jelmer Vernooij
Update pot file.
1238
msgid "Format for the bzr 2.0 series.\n"
1239
msgstr ""
1240
1241
# help of 'format=git' option of 'init' command
7490.31.3 by Jelmer Vernooij
Update po.
1242
# help of 'format=git' option of 'init-shared-repository' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1243
# help of 'format=git' option of 'upgrade' command
7490.31.3 by Jelmer Vernooij
Update po.
1244
#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
7185.1.1 by Jelmer Vernooij
Update pot file.
1245
msgid "GIT repository."
1246
msgstr ""
1247
7490.31.3 by Jelmer Vernooij
Update po.
1248
#: breezy/builtins.py:2066
6093.2.1 by Jonathan Riddell
add .pot file to archive
1249
msgid "Make a directory into a versioned branch."
1250
msgstr ""
1251
7490.31.3 by Jelmer Vernooij
Update po.
1252
#: breezy/builtins.py:2068
6093.2.1 by Jonathan Riddell
add .pot file to archive
1253
msgid ""
1254
"Use this to create an empty branch, or before importing an\n"
1255
"existing project."
1256
msgstr ""
1257
7490.31.3 by Jelmer Vernooij
Update po.
1258
#: breezy/builtins.py:2071
6093.2.1 by Jonathan Riddell
add .pot file to archive
1259
msgid ""
1260
"If there is a repository in a parent directory of the location, then\n"
1261
"the history of the branch will be stored in the repository.  Otherwise\n"
1262
"init creates a standalone branch which carries its own history\n"
1263
"in the .bzr directory."
1264
msgstr ""
1265
7490.31.3 by Jelmer Vernooij
Update po.
1266
#: breezy/builtins.py:2076
6093.2.1 by Jonathan Riddell
add .pot file to archive
1267
msgid ""
1268
"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.
1269
"the tree can be populated with 'brz checkout'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1270
msgstr ""
1271
7490.31.3 by Jelmer Vernooij
Update po.
1272
#: breezy/builtins.py:2079
6093.2.1 by Jonathan Riddell
add .pot file to archive
1273
msgid "Recipe for importing a tree of files::"
1274
msgstr ""
1275
7490.31.3 by Jelmer Vernooij
Update po.
1276
#: breezy/builtins.py:2081
6093.2.1 by Jonathan Riddell
add .pot file to archive
1277
msgid ""
1278
"    cd ~/project\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1279
"    brz init\n"
1280
"    brz add .\n"
1281
"    brz status\n"
1282
"    brz commit -m \"imported project\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
1283
msgstr ""
1284
1285
# help of 'create-prefix' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1286
# help of 'create-prefix' option of 'push' command
7490.31.3 by Jelmer Vernooij
Update po.
1287
#: breezy/builtins.py:2092
6093.2.1 by Jonathan Riddell
add .pot file to archive
1288
msgid "Create the path leading up to the branch if it does not already exist."
1289
msgstr ""
1290
1291
# help of 'format' option of 'init' command
7490.31.3 by Jelmer Vernooij
Update po.
1292
#: breezy/builtins.py:2095
7185.1.1 by Jelmer Vernooij
Update pot file.
1293
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
1294
msgstr ""
1295
1296
# help of 'append-revisions-only' option of 'init' command
7490.31.3 by Jelmer Vernooij
Update po.
1297
#: breezy/builtins.py:2104
6093.2.1 by Jonathan Riddell
add .pot file to archive
1298
msgid "Never change revnos or the existing log.  Append revisions to it only."
1299
msgstr ""
1300
1301
# help of 'no-tree' option of 'init' command
7490.31.3 by Jelmer Vernooij
Update po.
1302
#: breezy/builtins.py:2107
6093.2.1 by Jonathan Riddell
add .pot file to archive
1303
msgid "Create a branch without a working tree."
1304
msgstr ""
1305
7490.31.3 by Jelmer Vernooij
Update po.
1306
#: breezy/builtins.py:2128 breezy/push.py:112
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1307
#, python-format
1308
msgid ""
1309
"Parent directory of %s does not exist.\n"
1310
"You may supply --create-prefix to create all leading parent directories."
1311
msgstr ""
1312
7490.31.3 by Jelmer Vernooij
Update po.
1313
#: breezy/builtins.py:2163
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1314
msgid ""
1315
"This branch format cannot be set to append-revisions-only.  Try --default."
1316
msgstr ""
1317
7490.31.3 by Jelmer Vernooij
Update po.
1318
#: breezy/builtins.py:2174
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1319
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
1320
msgid "Created a {0} (format: {1})\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1321
msgstr ""
1322
7490.31.3 by Jelmer Vernooij
Update po.
1323
#: breezy/builtins.py:2183
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1324
#, python-format
1325
msgid "Using shared repository: %s\n"
1326
msgstr ""
1327
7490.31.3 by Jelmer Vernooij
Update po.
1328
#: breezy/builtins.py:2187
6093.2.1 by Jonathan Riddell
add .pot file to archive
1329
msgid "Create a shared repository for branches to share storage space."
1330
msgstr ""
1331
7490.31.3 by Jelmer Vernooij
Update po.
1332
#: breezy/builtins.py:2189
6093.2.1 by Jonathan Riddell
add .pot file to archive
1333
msgid ""
1334
"New branches created under the repository directory will store their\n"
1335
"revisions in the repository, not in the branch directory.  For branches\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1336
"with shared history, this reduces the amount of storage needed and\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1337
"speeds up the creation of new branches."
1338
msgstr ""
1339
7490.31.3 by Jelmer Vernooij
Update po.
1340
#: breezy/builtins.py:2194
6093.2.1 by Jonathan Riddell
add .pot file to archive
1341
msgid ""
1342
"If the --no-trees option is given then the branches in the repository\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1343
"will not have working trees by default.  They will still exist as\n"
1344
"directories on disk, but they will not have separate copies of the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1345
"files at a certain revision.  This can be useful for repositories that\n"
1346
"store branches which are interacted with through checkouts or remote\n"
1347
"branches, such as on a server."
1348
msgstr ""
1349
7490.31.3 by Jelmer Vernooij
Update po.
1350
#: breezy/builtins.py:2201
6093.2.1 by Jonathan Riddell
add .pot file to archive
1351
msgid ""
1352
":Examples:\n"
1353
"    Create a shared repository holding just branches::"
1354
msgstr ""
1355
7490.31.3 by Jelmer Vernooij
Update po.
1356
#: breezy/builtins.py:2204
6093.2.1 by Jonathan Riddell
add .pot file to archive
1357
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
1358
"        brz init-shared-repo --no-trees repo\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1359
"        brz init repo/trunk"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1360
msgstr ""
1361
7490.31.3 by Jelmer Vernooij
Update po.
1362
#: breezy/builtins.py:2207
6093.2.1 by Jonathan Riddell
add .pot file to archive
1363
msgid "    Make a lightweight checkout elsewhere::"
1364
msgstr ""
1365
7490.31.3 by Jelmer Vernooij
Update po.
1366
#: breezy/builtins.py:2209
6093.2.1 by Jonathan Riddell
add .pot file to archive
1367
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1368
"        brz checkout --lightweight repo/trunk trunk-checkout\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1369
"        cd trunk-checkout\n"
1370
"        (add files here)"
1371
msgstr ""
1372
7490.31.3 by Jelmer Vernooij
Update po.
1373
# help of 'format' option of 'init-shared-repository' command
1374
#: breezy/builtins.py:2217
6093.2.1 by Jonathan Riddell
add .pot file to archive
1375
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1376
"Specify a format for this repository. See \"brz help formats\" for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1377
msgstr ""
1378
7490.31.3 by Jelmer Vernooij
Update po.
1379
# title of 'format' option of 'init-shared-repository' command
7185.1.1 by Jelmer Vernooij
Update pot file.
1380
# title of 'format' option of 'fast-import' command
7490.31.3 by Jelmer Vernooij
Update po.
1381
#: breezy/builtins.py:2223 breezy/plugins/fastimport/cmds.py:287
6093.2.1 by Jonathan Riddell
add .pot file to archive
1382
msgid "Repository format"
1383
msgstr ""
1384
7490.31.3 by Jelmer Vernooij
Update po.
1385
# help of 'no-trees' option of 'init-shared-repository' command
1386
#: breezy/builtins.py:2225
6093.2.1 by Jonathan Riddell
add .pot file to archive
1387
msgid "Branches in the repository will default to not having a working tree."
1388
msgstr ""
1389
7490.31.3 by Jelmer Vernooij
Update po.
1390
# help of 'color' option of 'diff' command
1391
#: breezy/builtins.py:2255
1392
msgid ""
1393
"Color mode to use.  \"always\": Always colorize output (default).  \"auto\": "
1394
"Only colorize output if terminal supports it and STDOUT is a TTY.  \"never"
1395
"\": Never colorize output."
1396
msgstr ""
1397
1398
#: breezy/builtins.py:2256
6093.2.1 by Jonathan Riddell
add .pot file to archive
1399
msgid "Show differences in the working tree, between revisions or branches."
1400
msgstr ""
1401
7490.31.3 by Jelmer Vernooij
Update po.
1402
#: breezy/builtins.py:2258
6093.2.1 by Jonathan Riddell
add .pot file to archive
1403
msgid ""
1404
"If no arguments are given, all changes for the current tree are listed.\n"
1405
"If files are given, only the changes in those files are listed.\n"
1406
"Remote and multiple branches can be compared by using the --old and\n"
1407
"--new options. If not provided, the default for both is derived from\n"
1408
"the first argument, if any, or the current tree if no arguments are\n"
1409
"given."
1410
msgstr ""
1411
7490.31.3 by Jelmer Vernooij
Update po.
1412
#: breezy/builtins.py:2265
6093.2.1 by Jonathan Riddell
add .pot file to archive
1413
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1414
"\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1415
"produces patches suitable for \"patch -p1\"."
1416
msgstr ""
1417
7490.31.3 by Jelmer Vernooij
Update po.
1418
#: breezy/builtins.py:2268
6093.2.1 by Jonathan Riddell
add .pot file to archive
1419
msgid ""
1420
"Note that when using the -r argument with a range of revisions, the\n"
1421
"differences are computed between the two specified revisions.  That\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1422
"is, the command does not show the changes introduced by the first\n"
1423
"revision in the range.  This differs from the interpretation of\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1424
"revision ranges used by \"brz log\" which includes the first revision\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1425
"in the range."
1426
msgstr ""
1427
7490.31.3 by Jelmer Vernooij
Update po.
1428
#: breezy/builtins.py:2275
6093.2.1 by Jonathan Riddell
add .pot file to archive
1429
msgid ""
1430
":Exit values:\n"
1431
"    1 - changed\n"
1432
"    2 - unrepresentable changes\n"
1433
"    3 - error\n"
1434
"    0 - no change"
1435
msgstr ""
1436
7490.31.3 by Jelmer Vernooij
Update po.
1437
#: breezy/builtins.py:2281
6093.2.1 by Jonathan Riddell
add .pot file to archive
1438
msgid ""
1439
":Examples:\n"
1440
"    Shows the difference in the working tree versus the last commit::"
1441
msgstr ""
1442
7490.31.3 by Jelmer Vernooij
Update po.
1443
#: breezy/builtins.py:2284
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1444
msgid "        brz diff"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1445
msgstr ""
1446
7490.31.3 by Jelmer Vernooij
Update po.
1447
#: breezy/builtins.py:2286
6093.2.1 by Jonathan Riddell
add .pot file to archive
1448
msgid "    Difference between the working tree and revision 1::"
1449
msgstr ""
1450
7490.31.3 by Jelmer Vernooij
Update po.
1451
#: breezy/builtins.py:2288
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1452
msgid "        brz diff -r1"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1453
msgstr ""
1454
7490.31.3 by Jelmer Vernooij
Update po.
1455
#: breezy/builtins.py:2290
6093.2.1 by Jonathan Riddell
add .pot file to archive
1456
msgid "    Difference between revision 3 and revision 1::"
1457
msgstr ""
1458
7490.31.3 by Jelmer Vernooij
Update po.
1459
#: breezy/builtins.py:2292
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1460
msgid "        brz diff -r1..3"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1461
msgstr ""
1462
7490.31.3 by Jelmer Vernooij
Update po.
1463
#: breezy/builtins.py:2294
6093.2.1 by Jonathan Riddell
add .pot file to archive
1464
msgid "    Difference between revision 3 and revision 1 for branch xxx::"
1465
msgstr ""
1466
7490.31.3 by Jelmer Vernooij
Update po.
1467
#: breezy/builtins.py:2296
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1468
msgid "        brz diff -r1..3 xxx"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1469
msgstr ""
1470
7490.31.3 by Jelmer Vernooij
Update po.
1471
#: breezy/builtins.py:2298
6093.2.1 by Jonathan Riddell
add .pot file to archive
1472
msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
1473
msgstr ""
1474
7490.31.3 by Jelmer Vernooij
Update po.
1475
#: breezy/builtins.py:2300
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1476
msgid "        brz diff -c2"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1477
msgstr ""
1478
7490.31.3 by Jelmer Vernooij
Update po.
1479
#: breezy/builtins.py:2302
7185.1.1 by Jelmer Vernooij
Update pot file.
1480
msgid "    To see the changes introduced by revision X::"
1481
msgstr ""
1482
7490.31.3 by Jelmer Vernooij
Update po.
1483
#: breezy/builtins.py:2304
7185.1.1 by Jelmer Vernooij
Update pot file.
1484
msgid "        brz diff -cX"
1485
msgstr ""
1486
7490.31.3 by Jelmer Vernooij
Update po.
1487
#: breezy/builtins.py:2306
6093.2.1 by Jonathan Riddell
add .pot file to archive
1488
msgid ""
1489
"    Note that in the case of a merge, the -c option shows the changes\n"
1490
"    compared to the left hand parent. To see the changes against\n"
1491
"    another parent, use::"
1492
msgstr ""
1493
7490.31.3 by Jelmer Vernooij
Update po.
1494
#: breezy/builtins.py:2310
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1495
msgid "        brz diff -r<chosen_parent>..X"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1496
msgstr ""
1497
7490.31.3 by Jelmer Vernooij
Update po.
1498
#: breezy/builtins.py:2312
6093.2.1 by Jonathan Riddell
add .pot file to archive
1499
msgid ""
1500
"    The changes between the current revision and the previous revision\n"
1501
"    (equivalent to -c-1 and -r-2..-1)"
1502
msgstr ""
1503
7490.31.3 by Jelmer Vernooij
Update po.
1504
#: breezy/builtins.py:2315
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1505
msgid "        brz diff -r-2.."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1506
msgstr ""
1507
7490.31.3 by Jelmer Vernooij
Update po.
1508
#: breezy/builtins.py:2317
6093.2.1 by Jonathan Riddell
add .pot file to archive
1509
msgid "    Show just the differences for file NEWS::"
1510
msgstr ""
1511
7490.31.3 by Jelmer Vernooij
Update po.
1512
#: breezy/builtins.py:2319
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1513
msgid "        brz diff NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1514
msgstr ""
1515
7490.31.3 by Jelmer Vernooij
Update po.
1516
#: breezy/builtins.py:2321
6093.2.1 by Jonathan Riddell
add .pot file to archive
1517
msgid "    Show the differences in working tree xxx for file NEWS::"
1518
msgstr ""
1519
7490.31.3 by Jelmer Vernooij
Update po.
1520
#: breezy/builtins.py:2323
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1521
msgid "        brz diff xxx/NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1522
msgstr ""
1523
7490.31.3 by Jelmer Vernooij
Update po.
1524
#: breezy/builtins.py:2325
6093.2.1 by Jonathan Riddell
add .pot file to archive
1525
msgid "    Show the differences from branch xxx to this working tree:"
1526
msgstr ""
1527
7490.31.3 by Jelmer Vernooij
Update po.
1528
#: breezy/builtins.py:2327
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1529
msgid "        brz diff --old xxx"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1530
msgstr ""
1531
7490.31.3 by Jelmer Vernooij
Update po.
1532
#: breezy/builtins.py:2329
6093.2.1 by Jonathan Riddell
add .pot file to archive
1533
msgid "    Show the differences between two branches for file NEWS::"
1534
msgstr ""
1535
7490.31.3 by Jelmer Vernooij
Update po.
1536
#: breezy/builtins.py:2331
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1537
msgid "        brz diff --old xxx --new yyy NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1538
msgstr ""
1539
7490.31.3 by Jelmer Vernooij
Update po.
1540
#: breezy/builtins.py:2333
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1541
msgid "    Same as 'brz diff' but prefix paths with old/ and new/::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1542
msgstr ""
1543
7490.31.3 by Jelmer Vernooij
Update po.
1544
#: breezy/builtins.py:2335
7185.1.1 by Jelmer Vernooij
Update pot file.
1545
msgid "        brz diff --prefix old/:new/"
1546
msgstr ""
1547
7490.31.3 by Jelmer Vernooij
Update po.
1548
#: breezy/builtins.py:2337
7185.1.1 by Jelmer Vernooij
Update pot file.
1549
msgid "    Show the differences using a custom diff program with options::"
1550
msgstr ""
1551
7490.31.3 by Jelmer Vernooij
Update po.
1552
#: breezy/builtins.py:2339
7185.1.1 by Jelmer Vernooij
Update pot file.
1553
msgid "        brz diff --using /usr/bin/diff --diff-options -wu"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1554
msgstr ""
1555
1556
# help of 'diff-options' option of 'diff' command
7490.31.3 by Jelmer Vernooij
Update po.
1557
#: breezy/builtins.py:2345
6093.2.1 by Jonathan Riddell
add .pot file to archive
1558
msgid "Pass these options to the external diff program."
1559
msgstr ""
1560
1561
# help of 'prefix' option of 'diff' command
7490.31.3 by Jelmer Vernooij
Update po.
1562
#: breezy/builtins.py:2348
6093.2.1 by Jonathan Riddell
add .pot file to archive
1563
msgid ""
1564
"Set prefixes added to old and new filenames, as two values separated by a "
1565
"colon. (eg \"old/:new/\")."
1566
msgstr ""
1567
1568
# help of 'old' option of 'diff' command
7490.31.3 by Jelmer Vernooij
Update po.
1569
#: breezy/builtins.py:2351
6093.2.1 by Jonathan Riddell
add .pot file to archive
1570
msgid "Branch/tree to compare from."
1571
msgstr ""
1572
1573
# help of 'new' option of 'diff' command
7490.31.3 by Jelmer Vernooij
Update po.
1574
#: breezy/builtins.py:2355
6093.2.1 by Jonathan Riddell
add .pot file to archive
1575
msgid "Branch/tree to compare to."
1576
msgstr ""
1577
1578
# help of 'using' option of 'diff' command
7490.31.3 by Jelmer Vernooij
Update po.
1579
#: breezy/builtins.py:2361
6093.2.1 by Jonathan Riddell
add .pot file to archive
1580
msgid "Use this command to compare files."
1581
msgstr ""
1582
1583
# help of 'format' option of 'diff' command
7490.31.3 by Jelmer Vernooij
Update po.
1584
#: breezy/builtins.py:2366
6093.2.1 by Jonathan Riddell
add .pot file to archive
1585
msgid "Diff format to use."
1586
msgstr ""
1587
1588
# title of 'format' option of 'diff' command
7490.31.3 by Jelmer Vernooij
Update po.
1589
#: breezy/builtins.py:2368
6093.2.1 by Jonathan Riddell
add .pot file to archive
1590
msgid "Diff format"
1591
msgstr ""
1592
6581.1.2 by Vincent Ladeuil
Update translation template.
1593
# help of 'context' option of 'diff' command
7490.31.3 by Jelmer Vernooij
Update po.
1594
#: breezy/builtins.py:2370
6581.1.2 by Vincent Ladeuil
Update translation template.
1595
msgid "How many lines of context to show."
1596
msgstr ""
1597
7490.31.3 by Jelmer Vernooij
Update po.
1598
# title of 'color' option of 'diff' command
1599
#: breezy/builtins.py:2376
1600
msgid "Color Mode"
1601
msgstr ""
1602
1603
# help of 'check-style' option of 'diff' command
1604
#: breezy/builtins.py:2383
1605
msgid "Warn if trailing whitespace or spurious changes have been  added."
1606
msgstr ""
1607
1608
#: breezy/builtins.py:2408
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1609
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1610
msgstr ""
1611
7490.31.3 by Jelmer Vernooij
Update po.
1612
#: breezy/builtins.py:2412
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1613
msgid "brz diff --revision takes exactly one or two revision specifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1614
msgstr ""
1615
7490.31.3 by Jelmer Vernooij
Update po.
1616
#: breezy/builtins.py:2417 breezy/builtins.py:2823 breezy/builtins.py:2831
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1617
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
1618
msgid "{0} and {1} are mutually exclusive"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1619
msgstr ""
1620
7490.31.3 by Jelmer Vernooij
Update po.
1621
#: breezy/builtins.py:2447
6093.2.1 by Jonathan Riddell
add .pot file to archive
1622
msgid ""
1623
"List files deleted in the working tree.\n"
1624
"    "
1625
msgstr ""
1626
7490.31.3 by Jelmer Vernooij
Update po.
1627
#: breezy/builtins.py:2522
6581.1.2 by Vincent Ladeuil
Update translation template.
1628
msgid "Show the tree root directory."
1629
msgstr ""
1630
7490.31.3 by Jelmer Vernooij
Update po.
1631
#: breezy/builtins.py:2524
6093.2.1 by Jonathan Riddell
add .pot file to archive
1632
msgid ""
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
1633
"The root is the nearest enclosing directory with a control\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1634
"directory."
1635
msgstr ""
1636
7490.31.3 by Jelmer Vernooij
Update po.
1637
#: breezy/builtins.py:2540
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1638
msgid "The limit argument must be an integer."
1639
msgstr ""
1640
7490.31.3 by Jelmer Vernooij
Update po.
1641
#: breezy/builtins.py:2548
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1642
msgid "The levels argument must be an integer."
1643
msgstr ""
1644
7490.31.3 by Jelmer Vernooij
Update po.
1645
#: breezy/builtins.py:2553
6581.1.2 by Vincent Ladeuil
Update translation template.
1646
msgid "Show historical log for a branch or subset of a branch."
1647
msgstr ""
1648
7490.31.3 by Jelmer Vernooij
Update po.
1649
#: breezy/builtins.py:2555
6093.2.1 by Jonathan Riddell
add .pot file to archive
1650
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1651
"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
1652
"The branch to use is taken from the first parameter. If no parameters\n"
1653
"are given, the branch containing the working directory is logged.\n"
1654
"Here are some simple examples::"
1655
msgstr ""
1656
7490.31.3 by Jelmer Vernooij
Update po.
1657
#: breezy/builtins.py:2560
6093.2.1 by Jonathan Riddell
add .pot file to archive
1658
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1659
"  brz log                       log the current branch\n"
1660
"  brz log foo.py                log a file in its branch\n"
1661
"  brz log http://server/branch  log a branch on a server"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1662
msgstr ""
1663
7490.31.3 by Jelmer Vernooij
Update po.
1664
#: breezy/builtins.py:2564
6093.2.1 by Jonathan Riddell
add .pot file to archive
1665
msgid ""
1666
"The filtering, ordering and information shown for each revision can\n"
1667
"be controlled as explained below. By default, all revisions are\n"
1668
"shown sorted (topologically) so that newer revisions appear before\n"
1669
"older ones and descendants always appear before ancestors. If displayed,\n"
1670
"merged revisions are shown indented under the revision in which they\n"
1671
"were merged."
1672
msgstr ""
1673
7490.31.3 by Jelmer Vernooij
Update po.
1674
#: breezy/builtins.py:2571
6581.1.2 by Vincent Ladeuil
Update translation template.
1675
msgid ":Output control:"
1676
msgstr ""
1677
7490.31.3 by Jelmer Vernooij
Update po.
1678
#: breezy/builtins.py:2573
6093.2.1 by Jonathan Riddell
add .pot file to archive
1679
msgid ""
1680
"  The log format controls how information about each revision is\n"
1681
"  displayed. The standard log formats are called ``long``, ``short``\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1682
"  and ``line``. The default is long. See ``brz help log-formats``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1683
"  for more details on log formats."
1684
msgstr ""
1685
7490.31.3 by Jelmer Vernooij
Update po.
1686
#: breezy/builtins.py:2578
6093.2.1 by Jonathan Riddell
add .pot file to archive
1687
msgid ""
1688
"  The following options can be used to control what information is\n"
1689
"  displayed::"
1690
msgstr ""
1691
7490.31.3 by Jelmer Vernooij
Update po.
1692
#: breezy/builtins.py:2581
6093.2.1 by Jonathan Riddell
add .pot file to archive
1693
msgid ""
1694
"    -l N        display a maximum of N revisions\n"
1695
"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
1696
"    -v          display a status summary (delta) for each revision\n"
1697
"    -p          display a diff (patch) for each revision\n"
1698
"    --show-ids  display revision-ids (and file-ids), not just revnos"
1699
msgstr ""
1700
7490.31.3 by Jelmer Vernooij
Update po.
1701
#: breezy/builtins.py:2587
6093.2.1 by Jonathan Riddell
add .pot file to archive
1702
msgid ""
1703
"  Note that the default number of levels to display is a function of the\n"
1704
"  log format. If the -n option is not used, the standard log formats show\n"
1705
"  just the top level (mainline)."
1706
msgstr ""
1707
7490.31.3 by Jelmer Vernooij
Update po.
1708
#: breezy/builtins.py:2591
6093.2.1 by Jonathan Riddell
add .pot file to archive
1709
msgid ""
1710
"  Status summaries are shown using status flags like A, M, etc. To see\n"
1711
"  the changes explained using words like ``added`` and ``modified``\n"
1712
"  instead, use the -vv option."
1713
msgstr ""
1714
7490.31.3 by Jelmer Vernooij
Update po.
1715
#: breezy/builtins.py:2595
6581.1.2 by Vincent Ladeuil
Update translation template.
1716
msgid ":Ordering control:"
1717
msgstr ""
1718
7490.31.3 by Jelmer Vernooij
Update po.
1719
#: breezy/builtins.py:2597
6093.2.1 by Jonathan Riddell
add .pot file to archive
1720
msgid ""
1721
"  To display revisions from oldest to newest, use the --forward option.\n"
1722
"  In most cases, using this option will have little impact on the total\n"
1723
"  time taken to produce a log, though --forward does not incrementally\n"
1724
"  display revisions like --reverse does when it can."
1725
msgstr ""
1726
7490.31.3 by Jelmer Vernooij
Update po.
1727
#: breezy/builtins.py:2602
6581.1.2 by Vincent Ladeuil
Update translation template.
1728
msgid ":Revision filtering:"
1729
msgstr ""
1730
7490.31.3 by Jelmer Vernooij
Update po.
1731
#: breezy/builtins.py:2604
6093.2.1 by Jonathan Riddell
add .pot file to archive
1732
msgid ""
1733
"  The -r option can be used to specify what revision or range of revisions\n"
1734
"  to filter against. The various forms are shown below::"
1735
msgstr ""
1736
7490.31.3 by Jelmer Vernooij
Update po.
1737
#: breezy/builtins.py:2607
6093.2.1 by Jonathan Riddell
add .pot file to archive
1738
msgid ""
1739
"    -rX      display revision X\n"
1740
"    -rX..    display revision X and later\n"
1741
"    -r..Y    display up to and including revision Y\n"
1742
"    -rX..Y   display from X to Y inclusive"
1743
msgstr ""
1744
7490.31.3 by Jelmer Vernooij
Update po.
1745
#: breezy/builtins.py:2612
6093.2.1 by Jonathan Riddell
add .pot file to archive
1746
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1747
"  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
1748
"  Some common examples are given below::"
1749
msgstr ""
1750
7490.31.3 by Jelmer Vernooij
Update po.
1751
#: breezy/builtins.py:2615
6093.2.1 by Jonathan Riddell
add .pot file to archive
1752
msgid ""
1753
"    -r-1                show just the tip\n"
1754
"    -r-10..             show the last 10 mainline revisions\n"
1755
"    -rsubmit:..         show what's new on this branch\n"
1756
"    -rancestor:path..   show changes since the common ancestor of this\n"
1757
"                        branch and the one at location path\n"
1758
"    -rdate:yesterday..  show changes since yesterday"
1759
msgstr ""
1760
7490.31.3 by Jelmer Vernooij
Update po.
1761
#: breezy/builtins.py:2622
6093.2.1 by Jonathan Riddell
add .pot file to archive
1762
msgid ""
1763
"  When logging a range of revisions using -rX..Y, log starts at\n"
1764
"  revision Y and searches back in history through the primary\n"
1765
"  (\"left-hand\") parents until it finds X. When logging just the\n"
1766
"  top level (using -n1), an error is reported if X is not found\n"
1767
"  along the way. If multi-level logging is used (-n0), X may be\n"
1768
"  a nested merge revision and the log will be truncated accordingly."
1769
msgstr ""
1770
7490.31.3 by Jelmer Vernooij
Update po.
1771
#: breezy/builtins.py:2629
6581.1.2 by Vincent Ladeuil
Update translation template.
1772
msgid ":Path filtering:"
1773
msgstr ""
1774
7490.31.3 by Jelmer Vernooij
Update po.
1775
#: breezy/builtins.py:2631
6093.2.1 by Jonathan Riddell
add .pot file to archive
1776
msgid ""
1777
"  If parameters are given and the first one is not a branch, the log\n"
1778
"  will be filtered to show only those revisions that changed the\n"
1779
"  nominated files or directories."
1780
msgstr ""
1781
7490.31.3 by Jelmer Vernooij
Update po.
1782
#: breezy/builtins.py:2635
6093.2.1 by Jonathan Riddell
add .pot file to archive
1783
msgid ""
1784
"  Filenames are interpreted within their historical context. To log a\n"
1785
"  deleted file, specify a revision range so that the file existed at\n"
1786
"  the end or start of the range."
1787
msgstr ""
1788
7490.31.3 by Jelmer Vernooij
Update po.
1789
#: breezy/builtins.py:2639
6093.2.1 by Jonathan Riddell
add .pot file to archive
1790
msgid ""
1791
"  Historical context is also important when interpreting pathnames of\n"
1792
"  renamed files/directories. Consider the following example:"
1793
msgstr ""
1794
7490.31.3 by Jelmer Vernooij
Update po.
1795
#: breezy/builtins.py:2642
6093.2.1 by Jonathan Riddell
add .pot file to archive
1796
msgid ""
1797
"  * revision 1: add tutorial.txt\n"
1798
"  * revision 2: modify tutorial.txt\n"
1799
"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1800
msgstr ""
1801
7490.31.3 by Jelmer Vernooij
Update po.
1802
#: breezy/builtins.py:2646
6581.1.2 by Vincent Ladeuil
Update translation template.
1803
msgid "  In this case:"
1804
msgstr ""
1805
7490.31.3 by Jelmer Vernooij
Update po.
1806
#: breezy/builtins.py:2648
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1807
msgid "  * ``brz log guide.txt`` will log the file added in revision 1"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1808
msgstr ""
1809
7490.31.3 by Jelmer Vernooij
Update po.
1810
#: breezy/builtins.py:2650
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1811
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
1812
msgstr ""
1813
7490.31.3 by Jelmer Vernooij
Update po.
1814
#: breezy/builtins.py:2652
6093.2.1 by Jonathan Riddell
add .pot file to archive
1815
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1816
"  * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1817
"    the original file in revision 2."
1818
msgstr ""
1819
7490.31.3 by Jelmer Vernooij
Update po.
1820
#: breezy/builtins.py:2655
6093.2.1 by Jonathan Riddell
add .pot file to archive
1821
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1822
"  * ``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
1823
"    was no file called guide.txt in revision 2."
1824
msgstr ""
1825
7490.31.3 by Jelmer Vernooij
Update po.
1826
#: breezy/builtins.py:2658
6093.2.1 by Jonathan Riddell
add .pot file to archive
1827
msgid ""
1828
"  Renames are always followed by log. By design, there is no need to\n"
1829
"  explicitly ask for this (and no way to stop logging a file back\n"
1830
"  until it was last renamed)."
1831
msgstr ""
1832
7490.31.3 by Jelmer Vernooij
Update po.
1833
#: breezy/builtins.py:2662
6581.1.2 by Vincent Ladeuil
Update translation template.
1834
msgid ":Other filtering:"
1835
msgstr ""
1836
7490.31.3 by Jelmer Vernooij
Update po.
1837
#: breezy/builtins.py:2664
6093.2.1 by Jonathan Riddell
add .pot file to archive
1838
msgid ""
1839
"  The --match option can be used for finding revisions that match a\n"
1840
"  regular expression in a commit message, committer, author or bug.\n"
1841
"  Specifying the option several times will match any of the supplied\n"
1842
"  expressions. --match-author, --match-bugs, --match-committer and\n"
1843
"  --match-message can be used to only match a specific field."
1844
msgstr ""
1845
7490.31.3 by Jelmer Vernooij
Update po.
1846
#: breezy/builtins.py:2670
6581.1.2 by Vincent Ladeuil
Update translation template.
1847
msgid ":Tips & tricks:"
1848
msgstr ""
1849
7490.31.3 by Jelmer Vernooij
Update po.
1850
#: breezy/builtins.py:2672
6093.2.1 by Jonathan Riddell
add .pot file to archive
1851
msgid ""
1852
"  GUI tools and IDEs are often better at exploring history than command\n"
1853
"  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.
1854
"  bzr-explorer shell, or the Loggerhead web interface.  See the Bazaar\n"
1855
"  Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
1856
"  <http://wiki.bazaar.canonical.com/IDEIntegration>."
1857
msgstr ""
1858
7490.31.3 by Jelmer Vernooij
Update po.
1859
#: breezy/builtins.py:2678
7185.1.1 by Jelmer Vernooij
Update pot file.
1860
msgid "  You may find it useful to add the aliases below to ``breezy.conf``::"
1861
msgstr ""
1862
7490.31.3 by Jelmer Vernooij
Update po.
1863
#: breezy/builtins.py:2680
6093.2.1 by Jonathan Riddell
add .pot file to archive
1864
msgid ""
1865
"    [ALIASES]\n"
1866
"    tip = log -r-1\n"
1867
"    top = log -l10 --line\n"
1868
"    show = log -v -p"
1869
msgstr ""
1870
7490.31.3 by Jelmer Vernooij
Update po.
1871
#: breezy/builtins.py:2685
6093.2.1 by Jonathan Riddell
add .pot file to archive
1872
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1873
"  ``brz tip`` will then show the latest revision while ``brz top``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1874
"  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.
1875
"  particular revision X,  ``brz show -rX``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1876
msgstr ""
1877
7490.31.3 by Jelmer Vernooij
Update po.
1878
#: breezy/builtins.py:2689
6093.2.1 by Jonathan Riddell
add .pot file to archive
1879
msgid ""
1880
"  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.
1881
"  use ``brz log -n0 -rX``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1882
msgstr ""
1883
7490.31.3 by Jelmer Vernooij
Update po.
1884
#: breezy/builtins.py:2692
6093.2.1 by Jonathan Riddell
add .pot file to archive
1885
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1886
"  ``brz log -v`` on a branch with lots of history is currently\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1887
"  very slow. A fix for this issue is currently under development.\n"
1888
"  With or without that fix, it is recommended that a revision range\n"
1889
"  be given when using the -v option."
1890
msgstr ""
1891
7490.31.3 by Jelmer Vernooij
Update po.
1892
#: breezy/builtins.py:2697
6093.2.1 by Jonathan Riddell
add .pot file to archive
1893
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1894
"  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
1895
"  used to find revisions matching user names, commit messages, etc.\n"
1896
"  Among other features, this plugin can find all revisions containing\n"
1897
"  a list of words but not others."
1898
msgstr ""
1899
7490.31.3 by Jelmer Vernooij
Update po.
1900
#: breezy/builtins.py:2702
6093.2.1 by Jonathan Riddell
add .pot file to archive
1901
msgid ""
1902
"  When exploring non-mainline history on large projects with deep\n"
1903
"  history, the performance of log can be greatly improved by installing\n"
1904
"  the historycache plugin. This plugin buffers historical information\n"
1905
"  trading disk space for faster speed."
1906
msgstr ""
1907
1908
# help of 'forward' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1909
#: breezy/builtins.py:2711
6093.2.1 by Jonathan Riddell
add .pot file to archive
1910
msgid "Show from oldest to newest."
1911
msgstr ""
1912
1913
# help of 'verbose' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1914
#: breezy/builtins.py:2714
6093.2.1 by Jonathan Riddell
add .pot file to archive
1915
msgid "Show files changed in each revision."
1916
msgstr ""
1917
1918
# help of 'change' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1919
#: breezy/builtins.py:2720
6093.2.1 by Jonathan Riddell
add .pot file to archive
1920
msgid "Show just the specified revision. See also \"help revisionspec\"."
1921
msgstr ""
1922
1923
# help of 'authors' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1924
#: breezy/builtins.py:2724
6093.2.1 by Jonathan Riddell
add .pot file to archive
1925
msgid "What names to list as authors - first, all or committer."
1926
msgstr ""
1927
1928
# title of 'authors' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1929
#: breezy/builtins.py:2725
6093.2.1 by Jonathan Riddell
add .pot file to archive
1930
msgid "Authors"
1931
msgstr ""
1932
1933
# help of 'levels' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1934
#: breezy/builtins.py:2731
6093.2.1 by Jonathan Riddell
add .pot file to archive
1935
msgid "Number of levels to display - 0 for all, 1 for flat."
1936
msgstr ""
1937
1938
# help of 'limit' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1939
#: breezy/builtins.py:2741
6093.2.1 by Jonathan Riddell
add .pot file to archive
1940
msgid "Limit the output to the first N revisions."
1941
msgstr ""
1942
1943
# help of 'show-diff' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1944
#: breezy/builtins.py:2746
6093.2.1 by Jonathan Riddell
add .pot file to archive
1945
msgid "Show changes made in each revision as a patch."
1946
msgstr ""
1947
6150.1.1 by Jonathan Riddell
update bzr.pot
1948
# help of 'include-merged' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1949
#: breezy/builtins.py:2748
6093.2.1 by Jonathan Riddell
add .pot file to archive
1950
msgid "Show merged revisions like --levels 0 does."
1951
msgstr ""
1952
6150.1.1 by Jonathan Riddell
update bzr.pot
1953
# help of 'omit-merges' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1954
#: breezy/builtins.py:2752
6150.1.1 by Jonathan Riddell
update bzr.pot
1955
msgid "Do not report commits with more than one parent."
1956
msgstr ""
1957
6093.2.1 by Jonathan Riddell
add .pot file to archive
1958
# help of 'exclude-common-ancestry' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1959
#: breezy/builtins.py:2754
6093.2.1 by Jonathan Riddell
add .pot file to archive
1960
msgid ""
1961
"Display only the revisions that are not part of both ancestries (require -"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1962
"rX..Y)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1963
msgstr ""
1964
1965
# help of 'signatures' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1966
#: breezy/builtins.py:2758
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1967
msgid "Show digital signature validity."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1968
msgstr ""
1969
1970
# help of 'match' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1971
#: breezy/builtins.py:2761
6093.2.1 by Jonathan Riddell
add .pot file to archive
1972
msgid "Show revisions whose properties match this expression."
1973
msgstr ""
1974
1975
# help of 'match-message' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1976
#: breezy/builtins.py:2765
6093.2.1 by Jonathan Riddell
add .pot file to archive
1977
msgid "Show revisions whose message matches this expression."
1978
msgstr ""
1979
1980
# help of 'match-committer' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1981
#: breezy/builtins.py:2769
6093.2.1 by Jonathan Riddell
add .pot file to archive
1982
msgid "Show revisions whose committer matches this expression."
1983
msgstr ""
1984
1985
# help of 'match-author' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1986
#: breezy/builtins.py:2773
6093.2.1 by Jonathan Riddell
add .pot file to archive
1987
msgid "Show revisions whose authors match this expression."
1988
msgstr ""
1989
1990
# help of 'match-bugs' option of 'log' command
7490.31.3 by Jelmer Vernooij
Update po.
1991
#: breezy/builtins.py:2777
6093.2.1 by Jonathan Riddell
add .pot file to archive
1992
msgid "Show revisions whose bugs match this expression."
1993
msgstr ""
1994
7490.31.3 by Jelmer Vernooij
Update po.
1995
#: breezy/builtins.py:2817
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1996
msgid "--exclude-common-ancestry requires -r with two revisions"
1997
msgstr ""
1998
7490.31.3 by Jelmer Vernooij
Update po.
1999
#: breezy/builtins.py:2845
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2000
#, python-format
2001
msgid "Path unknown at end or start of revision range: %s"
2002
msgstr ""
2003
7490.31.3 by Jelmer Vernooij
Update po.
2004
#: breezy/builtins.py:2963
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2005
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2006
msgid "brz %s doesn't accept two revisions in different branches."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2007
msgstr ""
2008
7490.31.3 by Jelmer Vernooij
Update po.
2009
#: breezy/builtins.py:2979
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2010
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2011
msgid "brz %s --revision takes one or two values."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2012
msgstr ""
2013
7490.31.3 by Jelmer Vernooij
Update po.
2014
#: breezy/builtins.py:3024
6093.2.1 by Jonathan Riddell
add .pot file to archive
2015
msgid ""
2016
"List files in a tree.\n"
2017
"    "
2018
msgstr ""
2019
2020
# help of 'recursive' option of 'ls' command
7490.31.3 by Jelmer Vernooij
Update po.
2021
#: breezy/builtins.py:3033
6093.2.1 by Jonathan Riddell
add .pot file to archive
2022
msgid "Recurse into subdirectories."
2023
msgstr ""
2024
2025
# help of 'from-root' option of 'ls' command
7490.31.3 by Jelmer Vernooij
Update po.
2026
#: breezy/builtins.py:3035
6093.2.1 by Jonathan Riddell
add .pot file to archive
2027
msgid "Print paths relative to the root of the branch."
2028
msgstr ""
2029
2030
# help of 'unknown' option of 'ls' command
7490.31.3 by Jelmer Vernooij
Update po.
2031
#: breezy/builtins.py:3037
6093.2.1 by Jonathan Riddell
add .pot file to archive
2032
msgid "Print unknown files."
2033
msgstr ""
2034
2035
# help of 'versioned' option of 'ls' command
7490.31.3 by Jelmer Vernooij
Update po.
2036
#: breezy/builtins.py:3038
6093.2.1 by Jonathan Riddell
add .pot file to archive
2037
msgid "Print versioned files."
2038
msgstr ""
2039
2040
# help of 'ignored' option of 'ls' command
7490.31.3 by Jelmer Vernooij
Update po.
2041
#: breezy/builtins.py:3041
6093.2.1 by Jonathan Riddell
add .pot file to archive
2042
msgid "Print ignored files."
2043
msgstr ""
2044
2045
# help of 'kind' option of 'ls' command
7490.31.3 by Jelmer Vernooij
Update po.
2046
#: breezy/builtins.py:3043
7185.1.1 by Jelmer Vernooij
Update pot file.
2047
msgid ""
2048
"List entries of a particular kind: file, directory, symlink, tree-reference."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2049
msgstr ""
2050
7490.31.3 by Jelmer Vernooij
Update po.
2051
#: breezy/builtins.py:3058
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2052
msgid "invalid kind specified"
2053
msgstr ""
2054
7490.31.3 by Jelmer Vernooij
Update po.
2055
#: breezy/builtins.py:3062
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2056
msgid "Cannot set both --verbose and --null"
2057
msgstr ""
2058
7490.31.3 by Jelmer Vernooij
Update po.
2059
#: breezy/builtins.py:3071
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2060
msgid "cannot specify both --from-root and PATH"
2061
msgstr ""
2062
7490.31.3 by Jelmer Vernooij
Update po.
2063
#: breezy/builtins.py:3158
6581.1.2 by Vincent Ladeuil
Update translation template.
2064
msgid "Ignore specified files or patterns."
2065
msgstr ""
2066
7490.31.3 by Jelmer Vernooij
Update po.
2067
#: breezy/builtins.py:3160
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2068
msgid "See ``brz help patterns`` for details on the syntax of patterns."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2069
msgstr ""
2070
7490.31.3 by Jelmer Vernooij
Update po.
2071
#: breezy/builtins.py:3162
6093.2.1 by Jonathan Riddell
add .pot file to archive
2072
msgid ""
2073
"If a .bzrignore file does not exist, the ignore command\n"
2074
"will create one and add the specified files or patterns to the newly\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
2075
"created file. The ignore command will also automatically add the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2076
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2077
"the use of the ignore command will require an explicit add command."
2078
msgstr ""
2079
7490.31.3 by Jelmer Vernooij
Update po.
2080
#: breezy/builtins.py:3168
6093.2.1 by Jonathan Riddell
add .pot file to archive
2081
msgid ""
2082
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2083
"After adding, editing or deleting that file either indirectly by\n"
2084
"using this command or directly by using an editor, be sure to commit\n"
2085
"it."
2086
msgstr ""
2087
7490.31.3 by Jelmer Vernooij
Update po.
2088
#: breezy/builtins.py:3173
6093.2.1 by Jonathan Riddell
add .pot file to archive
2089
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
2090
"Breezy also supports a global ignore file ~/.config/breezy/ignore. On\n"
2091
"Windows the global ignore file can be found in the application data\n"
2092
"directory as\n"
2093
"C:\\Documents and Settings\\<user>\\Application Data\\Breezy\\3.0\\ignore.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2094
"Global ignores are not touched by this command. The global ignore file\n"
2095
"can be edited directly using an editor."
2096
msgstr ""
2097
7490.31.3 by Jelmer Vernooij
Update po.
2098
#: breezy/builtins.py:3180
6093.2.1 by Jonathan Riddell
add .pot file to archive
2099
msgid ""
2100
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2101
"precedence over regular ignores.  Such exceptions are used to specify\n"
2102
"files that should be versioned which would otherwise be ignored."
2103
msgstr ""
2104
7490.31.3 by Jelmer Vernooij
Update po.
2105
#: breezy/builtins.py:3184
6093.2.1 by Jonathan Riddell
add .pot file to archive
2106
msgid ""
2107
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2108
"precedence over the '!' exception patterns."
2109
msgstr ""
2110
7490.31.3 by Jelmer Vernooij
Update po.
2111
#: breezy/builtins.py:3187
7185.1.1 by Jelmer Vernooij
Update pot file.
2112
msgid ":Notes:"
2113
msgstr ""
2114
7490.31.3 by Jelmer Vernooij
Update po.
2115
#: breezy/builtins.py:3189
6093.2.1 by Jonathan Riddell
add .pot file to archive
2116
msgid ""
2117
"* Ignore patterns containing shell wildcards must be quoted from\n"
2118
"  the shell on Unix."
2119
msgstr ""
2120
7490.31.3 by Jelmer Vernooij
Update po.
2121
#: breezy/builtins.py:3192
6093.2.1 by Jonathan Riddell
add .pot file to archive
2122
msgid ""
2123
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2124
"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
2125
msgstr ""
2126
7490.31.3 by Jelmer Vernooij
Update po.
2127
#: breezy/builtins.py:3195
6093.2.1 by Jonathan Riddell
add .pot file to archive
2128
msgid ""
2129
":Examples:\n"
2130
"    Ignore the top level Makefile::"
2131
msgstr ""
2132
7490.31.3 by Jelmer Vernooij
Update po.
2133
#: breezy/builtins.py:3198
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2134
msgid "        brz ignore ./Makefile"
6581.1.2 by Vincent Ladeuil
Update translation template.
2135
msgstr ""
2136
7490.31.3 by Jelmer Vernooij
Update po.
2137
#: breezy/builtins.py:3200
6581.1.2 by Vincent Ladeuil
Update translation template.
2138
msgid "    Ignore .class files in all directories...::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2139
msgstr ""
2140
7490.31.3 by Jelmer Vernooij
Update po.
2141
#: breezy/builtins.py:3202
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2142
msgid "        brz ignore \"*.class\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2143
msgstr ""
2144
7490.31.3 by Jelmer Vernooij
Update po.
2145
#: breezy/builtins.py:3204
6581.1.2 by Vincent Ladeuil
Update translation template.
2146
msgid "    ...but do not ignore \"special.class\"::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2147
msgstr ""
2148
7490.31.3 by Jelmer Vernooij
Update po.
2149
#: breezy/builtins.py:3206
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2150
msgid "        brz ignore \"!special.class\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2151
msgstr ""
2152
7490.31.3 by Jelmer Vernooij
Update po.
2153
#: breezy/builtins.py:3208
6581.1.2 by Vincent Ladeuil
Update translation template.
2154
msgid "    Ignore files whose name begins with the \"#\" character::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2155
msgstr ""
2156
7490.31.3 by Jelmer Vernooij
Update po.
2157
#: breezy/builtins.py:3210
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2158
msgid "        brz ignore \"RE:^#\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2159
msgstr ""
2160
7490.31.3 by Jelmer Vernooij
Update po.
2161
#: breezy/builtins.py:3212 breezy/builtins.py:3216
6093.2.1 by Jonathan Riddell
add .pot file to archive
2162
msgid "    Ignore .o files under the lib directory::"
2163
msgstr ""
2164
7490.31.3 by Jelmer Vernooij
Update po.
2165
#: breezy/builtins.py:3214
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2166
msgid "        brz ignore \"lib/**/*.o\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2167
msgstr ""
2168
7490.31.3 by Jelmer Vernooij
Update po.
2169
#: breezy/builtins.py:3218
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2170
msgid "        brz ignore \"RE:lib/.*\\.o\""
6581.1.2 by Vincent Ladeuil
Update translation template.
2171
msgstr ""
2172
7490.31.3 by Jelmer Vernooij
Update po.
2173
#: breezy/builtins.py:3220
6581.1.2 by Vincent Ladeuil
Update translation template.
2174
msgid "    Ignore everything but the \"debian\" toplevel directory::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2175
msgstr ""
2176
7490.31.3 by Jelmer Vernooij
Update po.
2177
#: breezy/builtins.py:3222
7185.1.1 by Jelmer Vernooij
Update pot file.
2178
msgid "        brz ignore \"RE:(?!debian/).*\""
2179
msgstr ""
2180
7490.31.3 by Jelmer Vernooij
Update po.
2181
#: breezy/builtins.py:3224
6093.2.1 by Jonathan Riddell
add .pot file to archive
2182
msgid ""
2183
"    Ignore everything except the \"local\" toplevel directory,\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
2184
"    but always ignore autosave files ending in ~, even under local/::"
2185
msgstr ""
2186
7490.31.3 by Jelmer Vernooij
Update po.
2187
#: breezy/builtins.py:3227
7185.1.1 by Jelmer Vernooij
Update pot file.
2188
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2189
"        brz ignore \"*\"\n"
2190
"        brz ignore \"!./local\"\n"
2191
"        brz ignore \"!!*~\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2192
msgstr ""
2193
2194
# help of 'default-rules' option of 'ignore' command
7490.31.3 by Jelmer Vernooij
Update po.
2195
#: breezy/builtins.py:3236
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2196
msgid "Display the default ignore rules that brz uses."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2197
msgstr ""
2198
7490.31.3 by Jelmer Vernooij
Update po.
2199
#: breezy/builtins.py:3248
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2200
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2201
msgstr ""
2202
7490.31.3 by Jelmer Vernooij
Update po.
2203
#: breezy/builtins.py:3259
6143.1.7 by Jonathan Riddell
update bzr.pot
2204
#, python-format
2205
msgid "Invalid ignore pattern found. %s"
2206
msgid_plural "Invalid ignore patterns found. %s"
2207
msgstr[0] ""
2208
msgstr[1] ""
2209
7490.31.3 by Jelmer Vernooij
Update po.
2210
#: breezy/builtins.py:3268
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2211
msgid "NAME_PATTERN should not be an absolute path"
2212
msgstr ""
2213
7490.31.3 by Jelmer Vernooij
Update po.
2214
#: breezy/builtins.py:3280
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2215
#, python-format
2216
msgid ""
2217
"Warning: the following files are version controlled and match your ignore "
2218
"pattern:\n"
2219
"%s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2220
"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
2221
"them.\n"
2222
msgstr ""
2223
7490.31.3 by Jelmer Vernooij
Update po.
2224
#: breezy/builtins.py:3287
6581.1.2 by Vincent Ladeuil
Update translation template.
2225
msgid "List ignored files and the patterns that matched them."
2226
msgstr ""
2227
7490.31.3 by Jelmer Vernooij
Update po.
2228
#: breezy/builtins.py:3289
6093.2.1 by Jonathan Riddell
add .pot file to archive
2229
msgid ""
2230
"List all the ignored files and the ignore pattern that caused the file to\n"
2231
"be ignored."
2232
msgstr ""
2233
7490.31.3 by Jelmer Vernooij
Update po.
2234
#: breezy/builtins.py:3292
6581.1.2 by Vincent Ladeuil
Update translation template.
2235
msgid "Alternatively, to list just the files::"
2236
msgstr ""
2237
7490.31.3 by Jelmer Vernooij
Update po.
2238
#: breezy/builtins.py:3294
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2239
msgid "    brz ls --ignored"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2240
msgstr ""
2241
7490.31.3 by Jelmer Vernooij
Update po.
2242
#: breezy/builtins.py:3328
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2243
#, python-format
2244
msgid "not a valid revision-number: %r"
2245
msgstr ""
2246
7490.31.3 by Jelmer Vernooij
Update po.
2247
#: breezy/builtins.py:3336
6581.1.2 by Vincent Ladeuil
Update translation template.
2248
msgid "Export current or past revision to a destination directory or archive."
2249
msgstr ""
2250
7490.31.3 by Jelmer Vernooij
Update po.
2251
#: breezy/builtins.py:3338
6581.1.2 by Vincent Ladeuil
Update translation template.
2252
msgid "If no revision is specified this exports the last committed revision."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2253
msgstr ""
2254
7490.31.3 by Jelmer Vernooij
Update po.
2255
#: breezy/builtins.py:3340
6093.2.1 by Jonathan Riddell
add .pot file to archive
2256
msgid ""
2257
"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
2258
"given, try to find the format with the extension. If no extension\n"
2259
"is found exports to a directory (equivalent to --format=dir)."
2260
msgstr ""
2261
7490.31.3 by Jelmer Vernooij
Update po.
2262
#: breezy/builtins.py:3344
6093.2.1 by Jonathan Riddell
add .pot file to archive
2263
msgid ""
2264
"If root is supplied, it will be used as the root directory inside\n"
2265
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2266
"to the exported filename. The root option has no effect for 'dir' format."
2267
msgstr ""
2268
7490.31.3 by Jelmer Vernooij
Update po.
2269
#: breezy/builtins.py:3348
6093.2.1 by Jonathan Riddell
add .pot file to archive
2270
msgid ""
2271
"If branch is omitted then the branch containing the current working\n"
2272
"directory will be used."
2273
msgstr ""
2274
7490.31.3 by Jelmer Vernooij
Update po.
2275
#: breezy/builtins.py:3351
6581.1.2 by Vincent Ladeuil
Update translation template.
2276
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2277
msgstr ""
2278
7490.31.3 by Jelmer Vernooij
Update po.
2279
#: breezy/builtins.py:3353
6093.2.1 by Jonathan Riddell
add .pot file to archive
2280
msgid ""
2281
"  =================       =========================\n"
2282
"  Supported formats       Autodetected by extension\n"
2283
"  =================       =========================\n"
2284
"     dir                         (none)\n"
2285
"     tar                          .tar\n"
2286
"     tbz2                    .tar.bz2, .tbz2\n"
2287
"     tgz                      .tar.gz, .tgz\n"
2288
"     zip                          .zip\n"
2289
"  =================       ========================="
2290
msgstr ""
2291
2292
# help of 'format' option of 'export' command
7490.31.3 by Jelmer Vernooij
Update po.
2293
#: breezy/builtins.py:3368
6093.2.1 by Jonathan Riddell
add .pot file to archive
2294
msgid "Type of file to export to."
2295
msgstr ""
2296
2297
# help of 'filters' option of 'export' command
7490.31.3 by Jelmer Vernooij
Update po.
2298
#: breezy/builtins.py:3371
6093.2.1 by Jonathan Riddell
add .pot file to archive
2299
msgid "Apply content filters to export the convenient form."
2300
msgstr ""
2301
2302
# help of 'root' option of 'export' command
7490.31.3 by Jelmer Vernooij
Update po.
2303
#: breezy/builtins.py:3375
6093.2.1 by Jonathan Riddell
add .pot file to archive
2304
msgid "Name of the root directory inside the exported file."
2305
msgstr ""
2306
2307
# help of 'per-file-timestamps' option of 'export' command
7490.31.3 by Jelmer Vernooij
Update po.
2308
#: breezy/builtins.py:3377
6093.2.1 by Jonathan Riddell
add .pot file to archive
2309
msgid ""
2310
"Set modification time of files to that of the last revision in which it was "
2311
"changed."
2312
msgstr ""
2313
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2314
# help of 'uncommitted' option of 'export' command
7490.31.3 by Jelmer Vernooij
Update po.
2315
#: breezy/builtins.py:3380
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2316
msgid "Export the working tree contents rather than that of the last revision."
2317
msgstr ""
2318
7490.31.3 by Jelmer Vernooij
Update po.
2319
#: breezy/builtins.py:3400
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2320
msgid "--uncommitted requires a working tree"
2321
msgstr ""
2322
7490.31.3 by Jelmer Vernooij
Update po.
2323
#: breezy/builtins.py:3428
6138.4.4 by Jonathan Riddell
update bzr.pot
2324
#, python-format
2325
msgid "Unsupported export format: %s"
2326
msgstr ""
2327
7490.31.3 by Jelmer Vernooij
Update po.
2328
#: breezy/builtins.py:3432
6581.1.2 by Vincent Ladeuil
Update translation template.
2329
msgid "Write the contents of a file as of a given revision to standard output."
2330
msgstr ""
2331
7490.31.3 by Jelmer Vernooij
Update po.
2332
#: breezy/builtins.py:3434
6581.1.2 by Vincent Ladeuil
Update translation template.
2333
msgid "If no revision is nominated, the last revision is used."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2334
msgstr ""
2335
7490.31.3 by Jelmer Vernooij
Update po.
2336
#: breezy/builtins.py:3436
6093.2.1 by Jonathan Riddell
add .pot file to archive
2337
msgid ""
2338
"Note: Take care to redirect standard output when using this command on a\n"
2339
"binary file."
2340
msgstr ""
2341
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2342
# help of 'name-from-revision' option of 'cat' command
7490.31.3 by Jelmer Vernooij
Update po.
2343
#: breezy/builtins.py:3443
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2344
msgid "The path name in the old tree."
2345
msgstr ""
2346
6093.2.1 by Jonathan Riddell
add .pot file to archive
2347
# help of 'filters' option of 'cat' command
7490.31.3 by Jelmer Vernooij
Update po.
2348
#: breezy/builtins.py:3444
6093.2.1 by Jonathan Riddell
add .pot file to archive
2349
msgid "Apply content filters to display the convenience form."
2350
msgstr ""
2351
7490.31.3 by Jelmer Vernooij
Update po.
2352
#: breezy/builtins.py:3455
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2353
msgid "brz cat --revision takes exactly one revision specifier"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2354
msgstr ""
2355
7490.31.3 by Jelmer Vernooij
Update po.
2356
#: breezy/builtins.py:3475 breezy/builtins.py:3489
6138.2.6 by Jonathan Riddell
update bzr.pot
2357
msgid "{0!r} is not present in revision {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2358
msgstr ""
2359
7490.31.3 by Jelmer Vernooij
Update po.
2360
#: breezy/builtins.py:3516
6581.1.2 by Vincent Ladeuil
Update translation template.
2361
msgid "Commit changes into a new revision."
2362
msgstr ""
2363
7490.31.3 by Jelmer Vernooij
Update po.
2364
#: breezy/builtins.py:3518
6093.2.1 by Jonathan Riddell
add .pot file to archive
2365
msgid ""
2366
"An explanatory message needs to be given for each commit. This is\n"
2367
"often done by using the --message option (getting the message from the\n"
2368
"command line) or by using the --file option (getting the message from\n"
2369
"a file). If neither of these options is given, an editor is opened for\n"
2370
"the user to enter the message. To see the changed files in the\n"
2371
"boilerplate text loaded into the editor, use the --show-diff option."
2372
msgstr ""
2373
7490.31.3 by Jelmer Vernooij
Update po.
2374
#: breezy/builtins.py:3525
6093.2.1 by Jonathan Riddell
add .pot file to archive
2375
msgid ""
2376
"By default, the entire tree is committed and the person doing the\n"
2377
"commit is assumed to be the author. These defaults can be overridden\n"
2378
"as explained below."
2379
msgstr ""
2380
7490.31.3 by Jelmer Vernooij
Update po.
2381
#: breezy/builtins.py:3529
6581.1.2 by Vincent Ladeuil
Update translation template.
2382
msgid ":Selective commits:"
2383
msgstr ""
2384
7490.31.3 by Jelmer Vernooij
Update po.
2385
#: breezy/builtins.py:3531
6093.2.1 by Jonathan Riddell
add .pot file to archive
2386
msgid ""
2387
"  If selected files are specified, only changes to those files are\n"
2388
"  committed.  If a directory is specified then the directory and\n"
2389
"  everything within it is committed."
2390
msgstr ""
2391
7490.31.3 by Jelmer Vernooij
Update po.
2392
#: breezy/builtins.py:3535
6093.2.1 by Jonathan Riddell
add .pot file to archive
2393
msgid ""
2394
"  When excludes are given, they take precedence over selected files.\n"
2395
"  For example, to commit only changes within foo, but not changes\n"
2396
"  within foo/bar::"
2397
msgstr ""
2398
7490.31.3 by Jelmer Vernooij
Update po.
2399
#: breezy/builtins.py:3539
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2400
msgid "    brz commit foo -x foo/bar"
6581.1.2 by Vincent Ladeuil
Update translation template.
2401
msgstr ""
2402
7490.31.3 by Jelmer Vernooij
Update po.
2403
#: breezy/builtins.py:3541
6581.1.2 by Vincent Ladeuil
Update translation template.
2404
msgid "  A selective commit after a merge is not yet supported."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2405
msgstr ""
2406
7490.31.3 by Jelmer Vernooij
Update po.
2407
#: breezy/builtins.py:3543
6581.1.2 by Vincent Ladeuil
Update translation template.
2408
msgid ":Custom authors:"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2409
msgstr ""
2410
7490.31.3 by Jelmer Vernooij
Update po.
2411
#: breezy/builtins.py:3545
6093.2.1 by Jonathan Riddell
add .pot file to archive
2412
msgid ""
2413
"  If the author of the change is not the same person as the committer,\n"
2414
"  you can specify the author's name using the --author option. The\n"
2415
"  name should be in the same format as a committer-id, e.g.\n"
2416
"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2417
"  the change you can specify the option multiple times, once for each\n"
2418
"  author."
2419
msgstr ""
2420
7490.31.3 by Jelmer Vernooij
Update po.
2421
#: breezy/builtins.py:3552
6581.1.2 by Vincent Ladeuil
Update translation template.
2422
msgid ":Checks:"
2423
msgstr ""
2424
7490.31.3 by Jelmer Vernooij
Update po.
2425
#: breezy/builtins.py:3554
6093.2.1 by Jonathan Riddell
add .pot file to archive
2426
msgid ""
2427
"  A common mistake is to forget to add a new file or directory before\n"
2428
"  running the commit command. The --strict option checks for unknown\n"
2429
"  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.
2430
"  checks can be implemented by defining hooks. See ``brz help hooks``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2431
"  for details."
2432
msgstr ""
2433
7490.31.3 by Jelmer Vernooij
Update po.
2434
#: breezy/builtins.py:3560
6581.1.2 by Vincent Ladeuil
Update translation template.
2435
msgid ":Things to note:"
2436
msgstr ""
2437
7490.31.3 by Jelmer Vernooij
Update po.
2438
#: breezy/builtins.py:3562
6093.2.1 by Jonathan Riddell
add .pot file to archive
2439
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
2440
"  If you accidentally commit the wrong changes or make a spelling\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2441
"  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.
2442
"  to undo it. See ``brz help uncommit`` for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2443
msgstr ""
2444
7490.31.3 by Jelmer Vernooij
Update po.
2445
#: breezy/builtins.py:3566
6093.2.1 by Jonathan Riddell
add .pot file to archive
2446
msgid ""
2447
"  Hooks can also be configured to run after a commit. This allows you\n"
2448
"  to trigger updates to external systems like bug trackers. The --fixes\n"
2449
"  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.
2450
"  one or more bugs. See ``brz help bugs`` for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2451
msgstr ""
2452
2453
# help of 'exclude' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2454
#: breezy/builtins.py:3577
6093.2.1 by Jonathan Riddell
add .pot file to archive
2455
msgid "Do not consider changes made to a given path."
2456
msgstr ""
2457
2458
# help of 'message' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2459
#: breezy/builtins.py:3580
6093.2.1 by Jonathan Riddell
add .pot file to archive
2460
msgid "Description of the new revision."
2461
msgstr ""
2462
2463
# help of 'unchanged' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2464
#: breezy/builtins.py:3583
6093.2.1 by Jonathan Riddell
add .pot file to archive
2465
msgid "Commit even if nothing has changed."
2466
msgstr ""
2467
2468
# help of 'file' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2469
#: breezy/builtins.py:3587
6093.2.1 by Jonathan Riddell
add .pot file to archive
2470
msgid "Take commit message from this file."
2471
msgstr ""
2472
2473
# help of 'strict' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2474
#: breezy/builtins.py:3589
6093.2.1 by Jonathan Riddell
add .pot file to archive
2475
msgid "Refuse to commit if there are unknown files in the working tree."
2476
msgstr ""
2477
2478
# help of 'commit-time' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2479
#: breezy/builtins.py:3592
6093.2.1 by Jonathan Riddell
add .pot file to archive
2480
msgid ""
2481
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2482
"08:00:00 +0100'."
2483
msgstr ""
2484
7185.1.1 by Jelmer Vernooij
Update pot file.
2485
# help of 'bugs' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2486
#: breezy/builtins.py:3596
7185.1.1 by Jelmer Vernooij
Update pot file.
2487
msgid "Link to a related bug. (see \"brz help bugs\")."
2488
msgstr ""
2489
6093.2.1 by Jonathan Riddell
add .pot file to archive
2490
# help of 'fixes' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2491
#: breezy/builtins.py:3599
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2492
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
2493
msgstr ""
2494
2495
# help of 'author' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2496
#: breezy/builtins.py:3603
6093.2.1 by Jonathan Riddell
add .pot file to archive
2497
msgid "Set the author's name, if it's different from the committer."
2498
msgstr ""
2499
2500
# help of 'local' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2501
#: breezy/builtins.py:3606
6093.2.1 by Jonathan Riddell
add .pot file to archive
2502
msgid ""
2503
"Perform a local commit in a bound branch.  Local commits are not pushed to "
2504
"the master branch until a normal commit is performed."
2505
msgstr ""
2506
2507
# help of 'show-diff' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2508
#: breezy/builtins.py:3612
6093.2.1 by Jonathan Riddell
add .pot file to archive
2509
msgid ""
2510
"When no message is supplied, show the diff along with the status summary in "
2511
"the message editor."
2512
msgstr ""
2513
2514
# help of 'lossy' option of 'commit' command
7490.31.3 by Jelmer Vernooij
Update po.
2515
#: breezy/builtins.py:3615
6093.2.1 by Jonathan Riddell
add .pot file to archive
2516
msgid ""
2517
"When committing to a foreign version control system do not push data that "
2518
"can not be natively represented."
2519
msgstr ""
2520
7490.31.3 by Jelmer Vernooij
Update po.
2521
#: breezy/builtins.py:3632
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2522
#, python-format
2523
msgid ""
2524
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2525
"default bug tracker using the `bugtracker` option.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2526
"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
2527
msgstr ""
2528
7490.31.3 by Jelmer Vernooij
Update po.
2529
#: breezy/builtins.py:3641
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2530
#, python-format
2531
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2532
"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
2533
"for more information on this feature.\n"
2534
"Commit refused."
2535
msgstr ""
2536
7490.31.3 by Jelmer Vernooij
Update po.
2537
#: breezy/builtins.py:3650
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2538
#, python-format
2539
msgid "Unrecognized bug %s. Commit refused."
2540
msgstr ""
2541
7490.31.3 by Jelmer Vernooij
Update po.
2542
#: breezy/builtins.py:3653
6150.1.1 by Jonathan Riddell
update bzr.pot
2543
#, python-format
2544
msgid ""
2545
"%s\n"
2546
"Commit refused."
2547
msgstr ""
2548
7490.31.3 by Jelmer Vernooij
Update po.
2549
#: breezy/builtins.py:3680
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2550
msgid "Could not parse --commit-time: "
2551
msgstr ""
2552
7490.31.3 by Jelmer Vernooij
Update po.
2553
#: breezy/builtins.py:3724
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2554
msgid "please specify either --message or --file"
2555
msgstr ""
2556
7490.31.3 by Jelmer Vernooij
Update po.
2557
#: breezy/builtins.py:3754
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2558
msgid "please specify a commit message with either --message or --file"
2559
msgstr ""
2560
7490.31.3 by Jelmer Vernooij
Update po.
2561
#: breezy/builtins.py:3757
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2562
msgid ""
2563
"Empty commit message specified. Please specify a commit message with either "
2564
"--message or --file or leave a blank message with --message \"\"."
2565
msgstr ""
2566
7490.31.3 by Jelmer Vernooij
Update po.
2567
#: breezy/builtins.py:3777
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2568
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2569
"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
2570
"--unchanged to force an empty commit."
2571
msgstr ""
2572
7490.31.3 by Jelmer Vernooij
Update po.
2573
#: breezy/builtins.py:3781
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2574
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2575
"Conflicts detected in working tree.  Use \"brz conflicts\" to list, \"brz "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2576
"resolve FILE\" to resolve."
2577
msgstr ""
2578
7490.31.3 by Jelmer Vernooij
Update po.
2579
#: breezy/builtins.py:3785
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2580
msgid "Commit refused because there are unknown files in the working tree."
2581
msgstr ""
2582
7490.31.3 by Jelmer Vernooij
Update po.
2583
#: breezy/builtins.py:3788
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2584
msgid ""
2585
"\n"
2586
"To commit to master branch, run update and then commit.\n"
2587
"You can also pass --local to commit to continue working disconnected."
2588
msgstr ""
2589
7490.31.3 by Jelmer Vernooij
Update po.
2590
#: breezy/builtins.py:3796
6581.1.2 by Vincent Ladeuil
Update translation template.
2591
msgid ""
2592
"Validate working tree structure, branch consistency and repository history."
2593
msgstr ""
2594
7490.31.3 by Jelmer Vernooij
Update po.
2595
#: breezy/builtins.py:3798
6093.2.1 by Jonathan Riddell
add .pot file to archive
2596
msgid ""
2597
"This command checks various invariants about branch and repository storage\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2598
"to detect data corruption or brz bugs."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2599
msgstr ""
2600
7490.31.3 by Jelmer Vernooij
Update po.
2601
#: breezy/builtins.py:3801
6093.2.1 by Jonathan Riddell
add .pot file to archive
2602
msgid ""
2603
"The working tree and branch checks will only give output if a problem is\n"
2604
"detected. The output fields of the repository check are:"
2605
msgstr ""
2606
7490.31.3 by Jelmer Vernooij
Update po.
2607
#: breezy/builtins.py:3804
6093.2.1 by Jonathan Riddell
add .pot file to archive
2608
msgid ""
2609
"revisions\n"
2610
"    This is just the number of revisions checked.  It doesn't\n"
2611
"    indicate a problem."
2612
msgstr ""
2613
7490.31.3 by Jelmer Vernooij
Update po.
2614
#: breezy/builtins.py:3808
6093.2.1 by Jonathan Riddell
add .pot file to archive
2615
msgid ""
2616
"versionedfiles\n"
2617
"    This is just the number of versionedfiles checked.  It\n"
2618
"    doesn't indicate a problem."
2619
msgstr ""
2620
7490.31.3 by Jelmer Vernooij
Update po.
2621
#: breezy/builtins.py:3812
6093.2.1 by Jonathan Riddell
add .pot file to archive
2622
msgid ""
2623
"unreferenced ancestors\n"
2624
"    Texts that are ancestors of other texts, but\n"
2625
"    are not properly referenced by the revision ancestry.  This is a\n"
7490.31.3 by Jelmer Vernooij
Update po.
2626
"    subtle problem that Breezy can work around."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2627
msgstr ""
2628
7490.31.3 by Jelmer Vernooij
Update po.
2629
#: breezy/builtins.py:3817
6093.2.1 by Jonathan Riddell
add .pot file to archive
2630
msgid ""
2631
"unique file texts\n"
2632
"    This is the total number of unique file contents\n"
2633
"    seen in the checked revisions.  It does not indicate a problem."
2634
msgstr ""
2635
7490.31.3 by Jelmer Vernooij
Update po.
2636
#: breezy/builtins.py:3821
6093.2.1 by Jonathan Riddell
add .pot file to archive
2637
msgid ""
2638
"repeated file texts\n"
2639
"    This is the total number of repeated texts seen\n"
2640
"    in the checked revisions.  Texts can be repeated when their file\n"
2641
"    entries are modified, but the file contents are not.  It does not\n"
2642
"    indicate a problem."
2643
msgstr ""
2644
7490.31.3 by Jelmer Vernooij
Update po.
2645
#: breezy/builtins.py:3827
6093.2.1 by Jonathan Riddell
add .pot file to archive
2646
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
2647
"If no restrictions are specified, all data that is found at the given\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2648
"location will be checked."
2649
msgstr ""
2650
7490.31.3 by Jelmer Vernooij
Update po.
2651
#: breezy/builtins.py:3832
6581.1.2 by Vincent Ladeuil
Update translation template.
2652
msgid "    Check the tree and branch at 'foo'::"
2653
msgstr ""
2654
7490.31.3 by Jelmer Vernooij
Update po.
2655
#: breezy/builtins.py:3834
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2656
msgid "        brz check --tree --branch foo"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2657
msgstr ""
2658
7490.31.3 by Jelmer Vernooij
Update po.
2659
#: breezy/builtins.py:3836
6581.1.2 by Vincent Ladeuil
Update translation template.
2660
msgid "    Check only the repository at 'bar'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2661
msgstr ""
2662
7490.31.3 by Jelmer Vernooij
Update po.
2663
#: breezy/builtins.py:3838
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2664
msgid "        brz check --repo bar"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2665
msgstr ""
2666
7490.31.3 by Jelmer Vernooij
Update po.
2667
#: breezy/builtins.py:3840
6581.1.2 by Vincent Ladeuil
Update translation template.
2668
msgid "    Check everything at 'baz'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2669
msgstr ""
2670
7490.31.3 by Jelmer Vernooij
Update po.
2671
#: breezy/builtins.py:3842
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2672
msgid "        brz check baz"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2673
msgstr ""
2674
2675
# help of 'branch' option of 'check' command
7490.31.3 by Jelmer Vernooij
Update po.
2676
#: breezy/builtins.py:3848
6093.2.1 by Jonathan Riddell
add .pot file to archive
2677
msgid "Check the branch related to the current directory."
2678
msgstr ""
2679
2680
# help of 'repo' option of 'check' command
7490.31.3 by Jelmer Vernooij
Update po.
2681
#: breezy/builtins.py:3850
6093.2.1 by Jonathan Riddell
add .pot file to archive
2682
msgid "Check the repository related to the current directory."
2683
msgstr ""
2684
2685
# help of 'tree' option of 'check' command
7490.31.3 by Jelmer Vernooij
Update po.
2686
#: breezy/builtins.py:3852
6093.2.1 by Jonathan Riddell
add .pot file to archive
2687
msgid "Check the working tree related to the current directory."
2688
msgstr ""
2689
7490.31.3 by Jelmer Vernooij
Update po.
2690
#: breezy/builtins.py:3866
6581.1.2 by Vincent Ladeuil
Update translation template.
2691
msgid "Upgrade a repository, branch or working tree to a newer format."
2692
msgstr ""
2693
7490.31.3 by Jelmer Vernooij
Update po.
2694
#: breezy/builtins.py:3868
6093.2.1 by Jonathan Riddell
add .pot file to archive
2695
msgid ""
2696
"When the default format has changed after a major new release of\n"
7490.31.3 by Jelmer Vernooij
Update po.
2697
"Bazaar/Breezy, you may be informed during certain operations that you\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2698
"should upgrade. Upgrading to a newer format may improve performance\n"
2699
"or make new features available. It may however limit interoperability\n"
7490.31.3 by Jelmer Vernooij
Update po.
2700
"with older repositories or with older versions of Bazaar or Breezy."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2701
msgstr ""
2702
7490.31.3 by Jelmer Vernooij
Update po.
2703
#: breezy/builtins.py:3874
6093.2.1 by Jonathan Riddell
add .pot file to archive
2704
msgid ""
2705
"If you wish to upgrade to a particular format rather than the\n"
2706
"current default, that can be specified using the --format option.\n"
2707
"As a consequence, you can use the upgrade command this way to\n"
2708
"\"downgrade\" to an earlier format, though some conversions are\n"
2709
"a one way process (e.g. changing from the 1.x default to the\n"
2710
"2.x default) so downgrading is not always possible."
2711
msgstr ""
2712
7490.31.3 by Jelmer Vernooij
Update po.
2713
#: breezy/builtins.py:3881
6093.2.1 by Jonathan Riddell
add .pot file to archive
2714
msgid ""
2715
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2716
"process (where # is a number). By default, this is left there on\n"
2717
"completion. If the conversion fails, delete the new .bzr directory\n"
2718
"and rename this one back in its place. Use the --clean option to ask\n"
2719
"for the backup.bzr directory to be removed on successful conversion.\n"
2720
"Alternatively, you can delete it by hand if everything looks good\n"
2721
"afterwards."
2722
msgstr ""
2723
7490.31.3 by Jelmer Vernooij
Update po.
2724
#: breezy/builtins.py:3889
6093.2.1 by Jonathan Riddell
add .pot file to archive
2725
msgid ""
2726
"If the location given is a shared repository, dependent branches\n"
2727
"are also converted provided the repository converts successfully.\n"
2728
"If the conversion of a branch fails, remaining branches are still\n"
2729
"tried."
2730
msgstr ""
2731
7490.31.3 by Jelmer Vernooij
Update po.
2732
#: breezy/builtins.py:3894
6093.2.1 by Jonathan Riddell
add .pot file to archive
2733
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
2734
"For more information on upgrades, see the Breezy Upgrade Guide,\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
2735
"https://www.breezy-vcs.org/doc/en/upgrade-guide/."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2736
msgstr ""
2737
2738
# help of 'format' option of 'upgrade' command
7490.31.3 by Jelmer Vernooij
Update po.
2739
#: breezy/builtins.py:3902
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2740
msgid "Upgrade to a specific format.  See \"brz help formats\" for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2741
msgstr ""
2742
2743
# title of 'format' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2744
# title of 'format' option of 'upgrade' command
7490.31.3 by Jelmer Vernooij
Update po.
2745
#: breezy/builtins.py:3907
6093.2.1 by Jonathan Riddell
add .pot file to archive
2746
msgid "Branch format"
2747
msgstr ""
2748
2749
# help of 'clean' option of 'upgrade' command
7490.31.3 by Jelmer Vernooij
Update po.
2750
#: breezy/builtins.py:3909
6093.2.1 by Jonathan Riddell
add .pot file to archive
2751
msgid "Remove the backup.bzr directory if successful."
2752
msgstr ""
2753
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2754
# help of 'dry-run' option of 'add' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2755
# help of 'dry-run' option of 'upgrade' command
7490.31.3 by Jelmer Vernooij
Update po.
2756
# help of 'dry-run' option of 'rebase' command
2757
#: breezy/builtins.py:3911 breezy/plugins/rewrite/commands.py:97
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2758
msgid "Show what would be done, but don't actually do anything."
2759
msgstr ""
2760
7490.31.3 by Jelmer Vernooij
Update po.
2761
#: breezy/builtins.py:3926
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2762
msgid "Show or set brz user id."
6581.1.2 by Vincent Ladeuil
Update translation template.
2763
msgstr ""
2764
7490.31.3 by Jelmer Vernooij
Update po.
2765
#: breezy/builtins.py:3928
6093.2.1 by Jonathan Riddell
add .pot file to archive
2766
msgid ""
2767
":Examples:\n"
2768
"    Show the email of the current user::"
2769
msgstr ""
2770
7490.31.3 by Jelmer Vernooij
Update po.
2771
#: breezy/builtins.py:3931
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2772
msgid "        brz whoami --email"
6581.1.2 by Vincent Ladeuil
Update translation template.
2773
msgstr ""
2774
7490.31.3 by Jelmer Vernooij
Update po.
2775
#: breezy/builtins.py:3933
6581.1.2 by Vincent Ladeuil
Update translation template.
2776
msgid "    Set the current user::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2777
msgstr ""
2778
7490.31.3 by Jelmer Vernooij
Update po.
2779
#: breezy/builtins.py:3935
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2780
msgid "        brz whoami \"Frank Chu <fchu@example.com>\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2781
msgstr ""
2782
2783
# help of 'email' option of 'whoami' command
7490.31.3 by Jelmer Vernooij
Update po.
2784
#: breezy/builtins.py:3939
6093.2.1 by Jonathan Riddell
add .pot file to archive
2785
msgid "Display email address only."
2786
msgstr ""
2787
2788
# help of 'branch' option of 'whoami' command
7490.31.3 by Jelmer Vernooij
Update po.
2789
#: breezy/builtins.py:3941
6093.2.1 by Jonathan Riddell
add .pot file to archive
2790
msgid "Set identity for the current branch instead of globally."
2791
msgstr ""
2792
7490.31.3 by Jelmer Vernooij
Update po.
2793
#: breezy/builtins.py:3967
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2794
msgid "--email can only be used to display existing identity"
2795
msgstr ""
2796
7490.31.3 by Jelmer Vernooij
Update po.
2797
#: breezy/builtins.py:3991
6581.1.2 by Vincent Ladeuil
Update translation template.
2798
msgid "Print or set the branch nickname."
2799
msgstr ""
2800
7490.31.3 by Jelmer Vernooij
Update po.
2801
#: breezy/builtins.py:3993
6093.2.1 by Jonathan Riddell
add .pot file to archive
2802
msgid ""
6504.1.1 by Vincent Ladeuil
Update translation template
2803
"If unset, the colocated branch name is used for colocated branches, and\n"
2804
"the branch directory name is used for other branches.  To print the\n"
2805
"current nickname, execute with no argument."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2806
msgstr ""
2807
7490.31.3 by Jelmer Vernooij
Update po.
2808
#: breezy/builtins.py:3997
6093.2.1 by Jonathan Riddell
add .pot file to archive
2809
msgid ""
2810
"Bound branches use the nickname of its master branch unless it is set\n"
2811
"locally."
2812
msgstr ""
2813
7490.31.3 by Jelmer Vernooij
Update po.
2814
#: breezy/builtins.py:4018
6581.1.2 by Vincent Ladeuil
Update translation template.
2815
msgid "Set/unset and display aliases."
2816
msgstr ""
2817
7490.31.3 by Jelmer Vernooij
Update po.
2818
#: breezy/builtins.py:4020
6093.2.1 by Jonathan Riddell
add .pot file to archive
2819
msgid ""
2820
":Examples:\n"
2821
"    Show the current aliases::"
2822
msgstr ""
2823
7490.31.3 by Jelmer Vernooij
Update po.
2824
#: breezy/builtins.py:4023
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2825
msgid "        brz alias"
6581.1.2 by Vincent Ladeuil
Update translation template.
2826
msgstr ""
2827
7490.31.3 by Jelmer Vernooij
Update po.
2828
#: breezy/builtins.py:4025
6581.1.2 by Vincent Ladeuil
Update translation template.
2829
msgid "    Show the alias specified for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2830
msgstr ""
2831
7490.31.3 by Jelmer Vernooij
Update po.
2832
#: breezy/builtins.py:4027
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2833
msgid "        brz alias ll"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2834
msgstr ""
2835
7490.31.3 by Jelmer Vernooij
Update po.
2836
#: breezy/builtins.py:4029
6581.1.2 by Vincent Ladeuil
Update translation template.
2837
msgid "    Set an alias for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2838
msgstr ""
2839
7490.31.3 by Jelmer Vernooij
Update po.
2840
#: breezy/builtins.py:4031
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2841
msgid "        brz alias ll=\"log --line -r-10..-1\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2842
msgstr ""
2843
7490.31.3 by Jelmer Vernooij
Update po.
2844
#: breezy/builtins.py:4033
6581.1.2 by Vincent Ladeuil
Update translation template.
2845
msgid "    To remove an alias for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2846
msgstr ""
2847
7490.31.3 by Jelmer Vernooij
Update po.
2848
#: breezy/builtins.py:4035
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2849
msgid "        brz alias --remove ll"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2850
msgstr ""
2851
2852
# help of 'remove' option of 'alias' command
7490.31.3 by Jelmer Vernooij
Update po.
2853
#: breezy/builtins.py:4040
6093.2.1 by Jonathan Riddell
add .pot file to archive
2854
msgid "Remove the alias."
2855
msgstr ""
2856
7490.31.3 by Jelmer Vernooij
Update po.
2857
#: breezy/builtins.py:4058
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2858
msgid "brz alias --remove expects an alias to remove."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2859
msgstr ""
2860
7490.31.3 by Jelmer Vernooij
Update po.
2861
#: breezy/builtins.py:4249
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2862
msgid "subunit not available. subunit needs to be installed to use --subunit."
2863
msgstr ""
2864
7490.31.3 by Jelmer Vernooij
Update po.
2865
#: breezy/builtins.py:4266
7185.1.1 by Jelmer Vernooij
Update pot file.
2866
msgid "subunit not available. subunit needs to be installed to use --subunit2."
2867
msgstr ""
2868
7490.31.3 by Jelmer Vernooij
Update po.
2869
#: breezy/builtins.py:4275
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2870
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2871
"--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
2872
msgstr ""
2873
7490.31.3 by Jelmer Vernooij
Update po.
2874
#: breezy/builtins.py:4322
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2875
msgid "Show version of brz."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2876
msgstr ""
2877
2878
# help of 'short' option of 'version' command
7490.31.3 by Jelmer Vernooij
Update po.
2879
#: breezy/builtins.py:4326
6093.2.1 by Jonathan Riddell
add .pot file to archive
2880
msgid "Print just the version number."
2881
msgstr ""
2882
7490.31.3 by Jelmer Vernooij
Update po.
2883
#: breezy/builtins.py:4345
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2884
msgid "It sure does!\n"
2885
msgstr ""
2886
7490.31.3 by Jelmer Vernooij
Update po.
2887
#: breezy/builtins.py:4369
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2888
#, python-format
2889
msgid "merge base is revision %s\n"
2890
msgstr ""
2891
7490.31.3 by Jelmer Vernooij
Update po.
2892
#: breezy/builtins.py:4374
6581.1.2 by Vincent Ladeuil
Update translation template.
2893
msgid "Perform a three-way merge."
2894
msgstr ""
2895
7490.31.3 by Jelmer Vernooij
Update po.
2896
#: breezy/builtins.py:4376
6093.2.1 by Jonathan Riddell
add .pot file to archive
2897
msgid ""
2898
"The source of the merge can be specified either in the form of a branch,\n"
2899
"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.
2900
"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
2901
"or the branch most recently merged using --remember.  The source of the\n"
2902
"merge may also be specified in the form of a path to a file in another\n"
2903
"branch:  in this case, only the modifications to that file are merged into\n"
2904
"the current working tree."
2905
msgstr ""
2906
7490.31.3 by Jelmer Vernooij
Update po.
2907
#: breezy/builtins.py:4384
6093.2.1 by Jonathan Riddell
add .pot file to archive
2908
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2909
"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
2910
"work from the other branch, automatically determining an appropriate base\n"
2911
"revision.  If this fails, you may need to give an explicit base."
2912
msgstr ""
2913
7490.31.3 by Jelmer Vernooij
Update po.
2914
#: breezy/builtins.py:4388
6093.2.1 by Jonathan Riddell
add .pot file to archive
2915
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2916
"To pick a different ending revision, pass \"--revision OTHER\".  brz will\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2917
"try to merge in all new work up to and including revision OTHER."
2918
msgstr ""
2919
7490.31.3 by Jelmer Vernooij
Update po.
2920
#: breezy/builtins.py:4391
6093.2.1 by Jonathan Riddell
add .pot file to archive
2921
msgid ""
2922
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2923
"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
2924
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2925
"not already contain revision BASE, such a merge is commonly referred to as\n"
7490.31.3 by Jelmer Vernooij
Update po.
2926
"a \"cherrypick\". Unlike a normal merge, Breezy does not currently track\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2927
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2928
"changes from the other branch is not stored in the commit."
2929
msgstr ""
2930
7490.31.3 by Jelmer Vernooij
Update po.
2931
#: breezy/builtins.py:4399
6093.2.1 by Jonathan Riddell
add .pot file to archive
2932
msgid "Revision numbers are always relative to the source branch."
2933
msgstr ""
2934
7490.31.3 by Jelmer Vernooij
Update po.
2935
#: breezy/builtins.py:4401 breezy/conflicts.py:54 breezy/conflicts.py:111
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2936
msgid ""
2937
"Merge will do its best to combine the changes in two branches, but there\n"
2938
"are some kinds of problems only a human can fix.  When it encounters those,\n"
2939
"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
2940
"before you can commit."
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2941
msgstr ""
2942
7490.31.3 by Jelmer Vernooij
Update po.
2943
#: breezy/builtins.py:4406
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2944
msgid "Use brz resolve when you have fixed a problem.  See also brz conflicts."
6581.1.2 by Vincent Ladeuil
Update translation template.
2945
msgstr ""
2946
7490.31.3 by Jelmer Vernooij
Update po.
2947
#: breezy/builtins.py:4408
6093.2.1 by Jonathan Riddell
add .pot file to archive
2948
msgid ""
2949
"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
2950
"--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
2951
"to use the default.  To change the default, use --remember. The value will\n"
2952
"only be saved if the remote location can be accessed."
2953
msgstr ""
2954
7490.31.3 by Jelmer Vernooij
Update po.
2955
#: breezy/builtins.py:4413
6093.2.1 by Jonathan Riddell
add .pot file to archive
2956
msgid ""
2957
"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.
2958
"directory, where they can be reviewed (with brz diff), tested, and then\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2959
"committed to record the result of the merge."
2960
msgstr ""
2961
7490.31.3 by Jelmer Vernooij
Update po.
2962
#: breezy/builtins.py:4417
6093.2.1 by Jonathan Riddell
add .pot file to archive
2963
msgid ""
2964
"merge refuses to run if there are any uncommitted changes, unless\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
2965
"--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
2966
"will be merged with the current working tree, including any uncommitted\n"
2967
"changes in the tree.  The --force option can also be used to create a\n"
2968
"merge revision which has more than two parents."
2969
msgstr ""
2970
7490.31.3 by Jelmer Vernooij
Update po.
2971
#: breezy/builtins.py:4423
6093.2.1 by Jonathan Riddell
add .pot file to archive
2972
msgid ""
2973
"If one would like to merge changes from the working tree of the other\n"
2974
"branch without merging any committed revisions, the --uncommitted option\n"
2975
"can be given."
2976
msgstr ""
2977
7490.31.3 by Jelmer Vernooij
Update po.
2978
#: breezy/builtins.py:4427
6093.2.1 by Jonathan Riddell
add .pot file to archive
2979
msgid ""
2980
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2981
"you to apply each diff hunk and file change, similar to \"shelve\"."
2982
msgstr ""
2983
7490.31.3 by Jelmer Vernooij
Update po.
2984
#: breezy/builtins.py:4430
6093.2.1 by Jonathan Riddell
add .pot file to archive
2985
msgid ""
2986
":Examples:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2987
"    To merge all new revisions from brz.dev::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2988
msgstr ""
2989
7490.31.3 by Jelmer Vernooij
Update po.
2990
#: breezy/builtins.py:4433
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2991
msgid "        brz merge ../brz.dev"
6581.1.2 by Vincent Ladeuil
Update translation template.
2992
msgstr ""
2993
7490.31.3 by Jelmer Vernooij
Update po.
2994
#: breezy/builtins.py:4435
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2995
msgid "    To merge changes up to and including revision 82 from brz.dev::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2996
msgstr ""
2997
7490.31.3 by Jelmer Vernooij
Update po.
2998
#: breezy/builtins.py:4437
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2999
msgid "        brz merge -r 82 ../brz.dev"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3000
msgstr ""
3001
7490.31.3 by Jelmer Vernooij
Update po.
3002
#: breezy/builtins.py:4439
6581.1.2 by Vincent Ladeuil
Update translation template.
3003
msgid "    To merge the changes introduced by 82, without previous changes::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3004
msgstr ""
3005
7490.31.3 by Jelmer Vernooij
Update po.
3006
#: breezy/builtins.py:4441
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3007
msgid "        brz merge -r 81..82 ../brz.dev"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3008
msgstr ""
3009
7490.31.3 by Jelmer Vernooij
Update po.
3010
#: breezy/builtins.py:4443
6581.1.2 by Vincent Ladeuil
Update translation template.
3011
msgid "    To apply a merge directive contained in /tmp/merge::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3012
msgstr ""
3013
7490.31.3 by Jelmer Vernooij
Update po.
3014
#: breezy/builtins.py:4445
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3015
msgid "        brz merge /tmp/merge"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3016
msgstr ""
3017
7490.31.3 by Jelmer Vernooij
Update po.
3018
#: breezy/builtins.py:4447
6093.2.1 by Jonathan Riddell
add .pot file to archive
3019
msgid ""
3020
"    To create a merge revision with three parents from two branches\n"
3021
"    feature1a and feature1b:"
3022
msgstr ""
3023
7490.31.3 by Jelmer Vernooij
Update po.
3024
#: breezy/builtins.py:4450
6093.2.1 by Jonathan Riddell
add .pot file to archive
3025
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3026
"        brz merge ../feature1a\n"
3027
"        brz merge ../feature1b --force\n"
3028
"        brz commit -m 'revision with three parents'"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3029
msgstr ""
3030
3031
# help of 'force' option of 'merge' command
7490.31.3 by Jelmer Vernooij
Update po.
3032
#: breezy/builtins.py:4462
6093.2.1 by Jonathan Riddell
add .pot file to archive
3033
msgid "Merge even if the destination tree has uncommitted changes."
3034
msgstr ""
3035
3036
# help of 'uncommitted' option of 'merge' command
7490.31.3 by Jelmer Vernooij
Update po.
3037
#: breezy/builtins.py:4468
6093.2.1 by Jonathan Riddell
add .pot file to archive
3038
msgid ""
3039
"Apply uncommitted changes from a working copy, instead of branch changes."
3040
msgstr ""
3041
3042
# help of 'pull' option of 'merge' command
7490.31.3 by Jelmer Vernooij
Update po.
3043
#: breezy/builtins.py:4470
6093.2.1 by Jonathan Riddell
add .pot file to archive
3044
msgid ""
3045
"If the destination is already completely merged into the source, pull from "
3046
"the source rather than merging.  When this happens, you do not need to "
3047
"commit the result."
3048
msgstr ""
3049
3050
# help of 'directory' option of 'merge' command
7490.31.3 by Jelmer Vernooij
Update po.
3051
#: breezy/builtins.py:4475
6093.2.1 by Jonathan Riddell
add .pot file to archive
3052
msgid ""
3053
"Branch to merge into, rather than the one containing the working directory."
3054
msgstr ""
3055
3056
# help of 'preview' option of 'merge' command
7490.31.3 by Jelmer Vernooij
Update po.
3057
#: breezy/builtins.py:4477
6093.2.1 by Jonathan Riddell
add .pot file to archive
3058
msgid "Instead of merging, show a diff of the merge."
3059
msgstr ""
3060
3061
# help of 'interactive' option of 'merge' command
7490.31.3 by Jelmer Vernooij
Update po.
3062
#: breezy/builtins.py:4479
6093.2.1 by Jonathan Riddell
add .pot file to archive
3063
msgid "Select changes interactively."
3064
msgstr ""
3065
7490.31.3 by Jelmer Vernooij
Update po.
3066
#: breezy/builtins.py:4502
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3067
msgid ""
3068
"Merging into empty branches not currently supported, https://bugs.launchpad."
7185.1.1 by Jelmer Vernooij
Update pot file.
3069
"net/bzr/+bug/308562"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3070
msgstr ""
3071
7490.31.3 by Jelmer Vernooij
Update po.
3072
#: breezy/builtins.py:4524
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3073
msgid "Cannot use --uncommitted with bundles or merge directives."
3074
msgstr ""
3075
7490.31.3 by Jelmer Vernooij
Update po.
3076
#: breezy/builtins.py:4535
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3077
msgid "Cannot use --uncommitted and --revision at the same time."
3078
msgstr ""
3079
7490.31.3 by Jelmer Vernooij
Update po.
3080
#: breezy/builtins.py:4555
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3081
msgid "merger: "
3082
msgstr ""
3083
7490.31.3 by Jelmer Vernooij
Update po.
3084
#: breezy/builtins.py:4557 breezy/bzr/bundle/apply_bundle.py:65
3085
#: breezy/plugins/rewrite/commands.py:518
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3086
msgid "Nothing to do."
3087
msgstr ""
3088
7490.31.3 by Jelmer Vernooij
Update po.
3089
#: breezy/builtins.py:4562
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3090
msgid "Cannot pull individual files"
3091
msgstr ""
3092
7490.31.3 by Jelmer Vernooij
Update po.
3093
#: breezy/builtins.py:4570
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3094
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
3095
msgstr ""
3096
7490.31.3 by Jelmer Vernooij
Update po.
3097
#: breezy/builtins.py:4628
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3098
#, python-format
3099
msgid "Show-base is not supported for this merge type. %s"
3100
msgstr ""
3101
7490.31.3 by Jelmer Vernooij
Update po.
3102
#: breezy/builtins.py:4637
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3103
#, python-format
3104
msgid "Conflict reduction is not supported for merge type %s."
3105
msgstr ""
3106
7490.31.3 by Jelmer Vernooij
Update po.
3107
#: breezy/builtins.py:4641
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3108
msgid "Cannot do conflict reduction and show base."
3109
msgstr ""
3110
7490.31.3 by Jelmer Vernooij
Update po.
3111
#: breezy/builtins.py:4650
7185.1.1 by Jelmer Vernooij
Update pot file.
3112
msgid "Plan file merge unsupported: Merge type incompatible with tree formats."
3113
msgstr ""
3114
7490.31.3 by Jelmer Vernooij
Update po.
3115
#: breezy/builtins.py:4761
6581.1.2 by Vincent Ladeuil
Update translation template.
3116
msgid "No location specified or remembered"
3117
msgstr ""
3118
7490.31.3 by Jelmer Vernooij
Update po.
3119
#: breezy/builtins.py:4763
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3120
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
3121
msgid "{0} remembered {1} location {2}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3122
msgstr ""
3123
7490.31.3 by Jelmer Vernooij
Update po.
3124
#: breezy/builtins.py:4769
6581.1.2 by Vincent Ladeuil
Update translation template.
3125
msgid "Redo a merge."
3126
msgstr ""
3127
7490.31.3 by Jelmer Vernooij
Update po.
3128
#: breezy/builtins.py:4771
6093.2.1 by Jonathan Riddell
add .pot file to archive
3129
msgid ""
3130
"Use this if you want to try a different merge technique while resolving\n"
3131
"conflicts.  Some merge techniques are better than others, and remerge\n"
3132
"lets you try different ones on different files."
3133
msgstr ""
3134
7490.31.3 by Jelmer Vernooij
Update po.
3135
#: breezy/builtins.py:4775
6093.2.1 by Jonathan Riddell
add .pot file to archive
3136
msgid ""
3137
"The options for remerge have the same meaning and defaults as the ones for\n"
3138
"merge.  The difference is that remerge can (only) be run when there is a\n"
3139
"pending merge, and it lets you specify particular files."
3140
msgstr ""
3141
7490.31.3 by Jelmer Vernooij
Update po.
3142
#: breezy/builtins.py:4779
6093.2.1 by Jonathan Riddell
add .pot file to archive
3143
msgid ""
3144
":Examples:\n"
3145
"    Re-do the merge of all conflicted files, and show the base text in\n"
3146
"    conflict regions, in addition to the usual THIS and OTHER texts::"
3147
msgstr ""
3148
7490.31.3 by Jelmer Vernooij
Update po.
3149
#: breezy/builtins.py:4783
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3150
msgid "        brz remerge --show-base"
6581.1.2 by Vincent Ladeuil
Update translation template.
3151
msgstr ""
3152
7490.31.3 by Jelmer Vernooij
Update po.
3153
#: breezy/builtins.py:4785
6093.2.1 by Jonathan Riddell
add .pot file to archive
3154
msgid ""
3155
"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3156
"    additional processing to reduce the size of conflict regions::"
3157
msgstr ""
3158
7490.31.3 by Jelmer Vernooij
Update po.
3159
#: breezy/builtins.py:4788
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3160
msgid "        brz remerge --merge-type weave --reprocess foobar"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3161
msgstr ""
3162
3163
# help of 'show-base' option of 'merge' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
3164
# help of 'show-base' option of 'pull' command
3165
# help of 'show-base' option of 'remerge' command
3166
# help of 'show-base' option of 'update' command
7490.31.3 by Jelmer Vernooij
Update po.
3167
#: breezy/builtins.py:4795
6093.2.1 by Jonathan Riddell
add .pot file to archive
3168
msgid "Show base revision text in conflicts."
3169
msgstr ""
3170
7490.31.3 by Jelmer Vernooij
Update po.
3171
#: breezy/builtins.py:4808
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3172
msgid ""
3173
"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
3174
"merges."
3175
msgstr ""
3176
7490.31.3 by Jelmer Vernooij
Update po.
3177
#: breezy/builtins.py:4862
6581.1.2 by Vincent Ladeuil
Update translation template.
3178
msgid ""
3179
"Set files in the working tree back to the contents of a previous revision."
3180
msgstr ""
3181
7490.31.3 by Jelmer Vernooij
Update po.
3182
#: breezy/builtins.py:4864
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3183
msgid ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
3184
"Giving a list of files will revert only those files.  Otherwise, all files\n"
3185
"will be reverted.  If the revision is not specified with '--revision', the\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3186
"working tree basis revision is used. A revert operation affects only the\n"
3187
"working tree, not any revision history like the branch and repository or\n"
3188
"the working tree basis revision."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3189
msgstr ""
3190
7490.31.3 by Jelmer Vernooij
Update po.
3191
#: breezy/builtins.py:4870
6093.2.1 by Jonathan Riddell
add .pot file to archive
3192
msgid ""
3193
"To remove only some changes, without reverting to a prior version, use\n"
3194
"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3195
"will remove the changes introduced by the second last commit (-2), without\n"
3196
"affecting the changes introduced by the last commit (-1).  To remove\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3197
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3198
"To update the branch to a specific revision or the latest revision and\n"
3199
"update the working tree accordingly while preserving local changes, see the\n"
3200
"update command."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3201
msgstr ""
3202
7490.31.3 by Jelmer Vernooij
Update po.
3203
#: breezy/builtins.py:4879
6093.2.1 by Jonathan Riddell
add .pot file to archive
3204
msgid ""
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3205
"Uncommitted changes to files that are reverted will be discarded.\n"
7490.31.3 by Jelmer Vernooij
Update po.
3206
"However, by default, any files that have been manually changed will be\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
3207
"backed up first.  (Files changed only by merge are not backed up.)  Backup\n"
3208
"files have '.~#~' appended to their name, where # is a number."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3209
msgstr ""
3210
7490.31.3 by Jelmer Vernooij
Update po.
3211
#: breezy/builtins.py:4884
6093.2.1 by Jonathan Riddell
add .pot file to archive
3212
msgid ""
3213
"When you provide files, you can use their current pathname or the pathname\n"
3214
"from the target revision.  So you can use revert to \"undelete\" a file by\n"
3215
"name.  If you name a directory, all the contents of that directory will be\n"
3216
"reverted."
3217
msgstr ""
3218
7490.31.3 by Jelmer Vernooij
Update po.
3219
#: breezy/builtins.py:4889
6093.2.1 by Jonathan Riddell
add .pot file to archive
3220
msgid ""
3221
"If you have newly added files since the target revision, they will be\n"
3222
"removed.  If the files to be removed have been changed, backups will be\n"
3223
"created as above.  Directories containing unknown files will not be\n"
3224
"deleted."
3225
msgstr ""
3226
7490.31.3 by Jelmer Vernooij
Update po.
3227
#: breezy/builtins.py:4894
6093.2.1 by Jonathan Riddell
add .pot file to archive
3228
msgid ""
3229
"The working tree contains a list of revisions that have been merged but\n"
3230
"not yet committed. These revisions will be included as additional parents\n"
3231
"of the next commit.  Normally, using revert clears that list as well as\n"
3232
"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.
3233
"of uncommitted merges alone and reverts only the files.  Use ``brz revert\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3234
".`` 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.
3235
"and ``brz revert --forget-merges`` to clear the pending merge list without\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3236
"reverting any files."
3237
msgstr ""
3238
7490.31.3 by Jelmer Vernooij
Update po.
3239
#: breezy/builtins.py:4903
6093.2.1 by Jonathan Riddell
add .pot file to archive
3240
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3241
"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
3242
"changes from a branch in a single revision.  To do this, perform the merge\n"
3243
"as desired.  Then doing revert with the \"--forget-merges\" option will "
3244
"keep\n"
3245
"the content of the tree as it was, but it will clear the list of pending\n"
3246
"merges.  The next commit will then contain all of the changes that are\n"
3247
"present in the other branch, but without any other parent revisions.\n"
3248
"Because this technique forgets where these changes originated, it may\n"
3249
"cause additional conflicts on later merges involving the same source and\n"
3250
"target branches."
3251
msgstr ""
3252
3253
# help of 'no-backup' option of 'revert' command
7490.31.3 by Jelmer Vernooij
Update po.
3254
#: breezy/builtins.py:4918
6093.2.1 by Jonathan Riddell
add .pot file to archive
3255
msgid "Do not save backups of reverted files."
3256
msgstr ""
3257
3258
# help of 'forget-merges' option of 'revert' command
7490.31.3 by Jelmer Vernooij
Update po.
3259
#: breezy/builtins.py:4920
6093.2.1 by Jonathan Riddell
add .pot file to archive
3260
msgid "Remove pending merge marker, without changing any files."
3261
msgstr ""
3262
7490.31.3 by Jelmer Vernooij
Update po.
3263
#: breezy/builtins.py:4951
6093.2.1 by Jonathan Riddell
add .pot file to archive
3264
msgid ""
3265
"Show help on a command or other topic.\n"
3266
"    "
3267
msgstr ""
3268
3269
# help of 'long' option of 'help' command
7490.31.3 by Jelmer Vernooij
Update po.
3270
#: breezy/builtins.py:4956
6093.2.1 by Jonathan Riddell
add .pot file to archive
3271
msgid "Show help on all commands."
3272
msgstr ""
3273
7490.31.3 by Jelmer Vernooij
Update po.
3274
#: breezy/builtins.py:4985
6581.1.2 by Vincent Ladeuil
Update translation template.
3275
msgid "Show unmerged/unpulled revisions between two branches."
3276
msgstr ""
3277
7490.31.3 by Jelmer Vernooij
Update po.
3278
#: breezy/builtins.py:4987
6581.1.2 by Vincent Ladeuil
Update translation template.
3279
msgid "OTHER_BRANCH may be local or remote."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3280
msgstr ""
3281
7490.31.3 by Jelmer Vernooij
Update po.
3282
#: breezy/builtins.py:4989
6093.2.1 by Jonathan Riddell
add .pot file to archive
3283
msgid ""
3284
"To filter on a range of revisions, you can use the command -r begin..end\n"
3285
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
3286
"also valid."
3287
msgstr ""
3288
7490.31.3 by Jelmer Vernooij
Update po.
3289
#: breezy/builtins.py:4993
7185.1.1 by Jelmer Vernooij
Update pot file.
3290
msgid ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
3291
":Exit values:\n"
3292
"    1 - some missing revisions\n"
3293
"    0 - no missing revisions"
3294
msgstr ""
3295
7490.31.3 by Jelmer Vernooij
Update po.
3296
#: breezy/builtins.py:4999
6093.2.1 by Jonathan Riddell
add .pot file to archive
3297
msgid ""
3298
"    Determine the missing revisions between this and the branch at the\n"
3299
"    remembered pull location::"
3300
msgstr ""
3301
7490.31.3 by Jelmer Vernooij
Update po.
3302
#: breezy/builtins.py:5002
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3303
msgid "        brz missing"
6581.1.2 by Vincent Ladeuil
Update translation template.
3304
msgstr ""
3305
7490.31.3 by Jelmer Vernooij
Update po.
3306
#: breezy/builtins.py:5004
6581.1.2 by Vincent Ladeuil
Update translation template.
3307
msgid "    Determine the missing revisions between this and another branch::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3308
msgstr ""
3309
7490.31.3 by Jelmer Vernooij
Update po.
3310
#: breezy/builtins.py:5006
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3311
msgid "        brz missing http://server/branch"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3312
msgstr ""
3313
7490.31.3 by Jelmer Vernooij
Update po.
3314
#: breezy/builtins.py:5008
6093.2.1 by Jonathan Riddell
add .pot file to archive
3315
msgid ""
3316
"    Determine the missing revisions up to a specific revision on the other\n"
3317
"    branch::"
3318
msgstr ""
3319
7490.31.3 by Jelmer Vernooij
Update po.
3320
#: breezy/builtins.py:5011
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3321
msgid "        brz missing -r ..-10"
6581.1.2 by Vincent Ladeuil
Update translation template.
3322
msgstr ""
3323
7490.31.3 by Jelmer Vernooij
Update po.
3324
#: breezy/builtins.py:5013
6093.2.1 by Jonathan Riddell
add .pot file to archive
3325
msgid ""
3326
"    Determine the missing revisions up to a specific revision on this\n"
3327
"    branch::"
3328
msgstr ""
3329
7490.31.3 by Jelmer Vernooij
Update po.
3330
#: breezy/builtins.py:5016
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3331
msgid "        brz missing --my-revision ..-10"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3332
msgstr ""
3333
3334
# help of 'reverse' option of 'missing' command
7490.31.3 by Jelmer Vernooij
Update po.
3335
#: breezy/builtins.py:5023
6093.2.1 by Jonathan Riddell
add .pot file to archive
3336
msgid "Reverse the order of revisions."
3337
msgstr ""
3338
3339
# help of 'mine-only' option of 'missing' command
7490.31.3 by Jelmer Vernooij
Update po.
3340
#: breezy/builtins.py:5025
6093.2.1 by Jonathan Riddell
add .pot file to archive
3341
msgid "Display changes in the local branch only."
3342
msgstr ""
3343
3344
# help of 'this' option of 'missing' command
7490.31.3 by Jelmer Vernooij
Update po.
3345
#: breezy/builtins.py:5026
6093.2.1 by Jonathan Riddell
add .pot file to archive
3346
msgid "Same as --mine-only."
3347
msgstr ""
3348
3349
# help of 'theirs-only' option of 'missing' command
7490.31.3 by Jelmer Vernooij
Update po.
3350
#: breezy/builtins.py:5028
6093.2.1 by Jonathan Riddell
add .pot file to archive
3351
msgid "Display changes in the remote branch only."
3352
msgstr ""
3353
3354
# help of 'other' option of 'missing' command
7490.31.3 by Jelmer Vernooij
Update po.
3355
#: breezy/builtins.py:5029
6093.2.1 by Jonathan Riddell
add .pot file to archive
3356
msgid "Same as --theirs-only."
3357
msgstr ""
3358
3359
# help of 'revision' option of 'missing' command
7490.31.3 by Jelmer Vernooij
Update po.
3360
#: breezy/builtins.py:5034
6093.2.1 by Jonathan Riddell
add .pot file to archive
3361
msgid ""
3362
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3363
"details."
3364
msgstr ""
3365
3366
# help of 'my-revision' option of 'missing' command
7490.31.3 by Jelmer Vernooij
Update po.
3367
#: breezy/builtins.py:5038
6093.2.1 by Jonathan Riddell
add .pot file to archive
3368
msgid ""
3369
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3370
"details."
3371
msgstr ""
3372
6150.1.1 by Jonathan Riddell
update bzr.pot
3373
# help of 'include-merged' option of 'missing' command
7490.31.3 by Jelmer Vernooij
Update po.
3374
#: breezy/builtins.py:5041
6093.2.1 by Jonathan Riddell
add .pot file to archive
3375
msgid "Show all revisions in addition to the mainline ones."
3376
msgstr ""
3377
7490.31.3 by Jelmer Vernooij
Update po.
3378
#: breezy/builtins.py:5082
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3379
msgid "No peer location known or specified."
3380
msgstr ""
3381
7490.31.3 by Jelmer Vernooij
Update po.
3382
#: breezy/builtins.py:5086
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3383
#, python-brace-format
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3384
msgid "Using saved parent location: {0}\n"
3385
msgstr ""
3386
7490.31.3 by Jelmer Vernooij
Update po.
3387
#: breezy/builtins.py:5119
6143.1.7 by Jonathan Riddell
update bzr.pot
3388
#, python-format
3389
msgid "You have %d extra revision:\n"
3390
msgid_plural "You have %d extra revisions:\n"
3391
msgstr[0] ""
3392
msgstr[1] ""
3393
7490.31.3 by Jelmer Vernooij
Update po.
3394
#: breezy/builtins.py:5139
6143.1.7 by Jonathan Riddell
update bzr.pot
3395
#, python-format
3396
msgid "You are missing %d revision:\n"
3397
msgid_plural "You are missing %d revisions:\n"
3398
msgstr[0] ""
3399
msgstr[1] ""
3400
7490.31.3 by Jelmer Vernooij
Update po.
3401
#: breezy/builtins.py:5154
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3402
msgid "This branch has no new revisions.\n"
3403
msgstr ""
3404
7490.31.3 by Jelmer Vernooij
Update po.
3405
#: breezy/builtins.py:5157
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3406
msgid "Other branch has no new revisions.\n"
3407
msgstr ""
3408
7490.31.3 by Jelmer Vernooij
Update po.
3409
#: breezy/builtins.py:5162
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3410
msgid "Branches are up to date.\n"
3411
msgstr ""
3412
7490.31.3 by Jelmer Vernooij
Update po.
3413
#: breezy/builtins.py:5173
6581.1.2 by Vincent Ladeuil
Update translation template.
3414
msgid "Compress the data within a repository."
3415
msgstr ""
3416
7490.31.3 by Jelmer Vernooij
Update po.
3417
#: breezy/builtins.py:5175
6093.2.1 by Jonathan Riddell
add .pot file to archive
3418
msgid ""
3419
"This operation compresses the data within a bazaar repository. As\n"
3420
"bazaar supports automatic packing of repository, this operation is\n"
3421
"normally not required to be done manually."
3422
msgstr ""
3423
7490.31.3 by Jelmer Vernooij
Update po.
3424
#: breezy/builtins.py:5179
6093.2.1 by Jonathan Riddell
add .pot file to archive
3425
msgid ""
3426
"During the pack operation, bazaar takes a backup of existing repository\n"
3427
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3428
"automatically when it is safe to do so. To save disk space by removing\n"
3429
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3430
"used."
3431
msgstr ""
3432
7490.31.3 by Jelmer Vernooij
Update po.
3433
#: breezy/builtins.py:5185
6093.2.1 by Jonathan Riddell
add .pot file to archive
3434
msgid ""
3435
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3436
"during or immediately after repacking, you may be left with a state\n"
3437
"where the deletion has been written to disk but the new packs have not\n"
3438
"been. In this case the repository may be unusable."
3439
msgstr ""
3440
3441
# help of 'clean-obsolete-packs' option of 'pack' command
7490.31.3 by Jelmer Vernooij
Update po.
3442
#: breezy/builtins.py:5195
6093.2.1 by Jonathan Riddell
add .pot file to archive
3443
msgid "Delete obsolete packs to save disk space."
3444
msgstr ""
3445
7490.31.3 by Jelmer Vernooij
Update po.
3446
#: breezy/builtins.py:5209
6581.1.2 by Vincent Ladeuil
Update translation template.
3447
msgid "List the installed plugins."
3448
msgstr ""
3449
7490.31.3 by Jelmer Vernooij
Update po.
3450
#: breezy/builtins.py:5211
6093.2.1 by Jonathan Riddell
add .pot file to archive
3451
msgid ""
3452
"This command displays the list of installed plugins including\n"
3453
"version of plugin and a short description of each."
3454
msgstr ""
3455
7490.31.3 by Jelmer Vernooij
Update po.
3456
#: breezy/builtins.py:5214
6581.1.2 by Vincent Ladeuil
Update translation template.
3457
msgid "--verbose shows the path where each plugin is located."
3458
msgstr ""
3459
7490.31.3 by Jelmer Vernooij
Update po.
3460
#: breezy/builtins.py:5216
6093.2.1 by Jonathan Riddell
add .pot file to archive
3461
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
3462
"A plugin is an external component for Breezy that extends the\n"
3463
"revision control system, by adding or replacing code in Breezy.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3464
"Plugins can do a variety of things, including overriding commands,\n"
3465
"adding new commands, providing additional network transports and\n"
3466
"customizing log output."
3467
msgstr ""
3468
7490.31.3 by Jelmer Vernooij
Update po.
3469
#: breezy/builtins.py:5222
6093.2.1 by Jonathan Riddell
add .pot file to archive
3470
msgid ""
3471
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3472
"for further information on plugins including where to find them and how to\n"
3473
"install them. Instructions are also provided there on how to write new\n"
3474
"plugins using the Python programming language."
3475
msgstr ""
3476
7490.31.3 by Jelmer Vernooij
Update po.
3477
#: breezy/builtins.py:5238
6093.2.1 by Jonathan Riddell
add .pot file to archive
3478
msgid "Show testament (signing-form) of a revision."
3479
msgstr ""
3480
3481
# help of 'long' option of 'testament' command
7490.31.3 by Jelmer Vernooij
Update po.
3482
#: breezy/builtins.py:5241
6093.2.1 by Jonathan Riddell
add .pot file to archive
3483
msgid "Produce long-format testament."
3484
msgstr ""
3485
3486
# help of 'strict' option of 'testament' command
7490.31.3 by Jelmer Vernooij
Update po.
3487
#: breezy/builtins.py:5243
6093.2.1 by Jonathan Riddell
add .pot file to archive
3488
msgid "Produce a strict-format testament."
3489
msgstr ""
3490
7490.31.3 by Jelmer Vernooij
Update po.
3491
#: breezy/builtins.py:5271
6093.2.1 by Jonathan Riddell
add .pot file to archive
3492
msgid "Show the origin of each line in a file."
3493
msgstr ""
3494
7490.31.3 by Jelmer Vernooij
Update po.
3495
#: breezy/builtins.py:5273
6093.2.1 by Jonathan Riddell
add .pot file to archive
3496
msgid ""
3497
"This prints out the given file with an annotation on the left side\n"
3498
"indicating which revision, author and date introduced the change."
3499
msgstr ""
3500
7490.31.3 by Jelmer Vernooij
Update po.
3501
#: breezy/builtins.py:5276
6093.2.1 by Jonathan Riddell
add .pot file to archive
3502
msgid ""
3503
"If the origin is the same for a run of consecutive lines, it is\n"
3504
"shown only at the top, unless the --all option is given."
3505
msgstr ""
3506
3507
# help of 'all' option of 'annotate' command
7490.31.3 by Jelmer Vernooij
Update po.
3508
#: breezy/builtins.py:5284
6093.2.1 by Jonathan Riddell
add .pot file to archive
3509
msgid "Show annotations on all lines."
3510
msgstr ""
3511
3512
# help of 'long' option of 'annotate' command
7490.31.3 by Jelmer Vernooij
Update po.
3513
#: breezy/builtins.py:5285
6093.2.1 by Jonathan Riddell
add .pot file to archive
3514
msgid "Show commit date in annotations."
3515
msgstr ""
3516
7490.31.3 by Jelmer Vernooij
Update po.
3517
#: breezy/builtins.py:5362
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3518
msgid "Cannot sign a range of non-revision-history revisions"
3519
msgstr ""
3520
7490.31.3 by Jelmer Vernooij
Update po.
3521
#: breezy/builtins.py:5369
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3522
msgid "Please supply either one revision, or a range."
3523
msgstr ""
3524
7490.31.3 by Jelmer Vernooij
Update po.
3525
#: breezy/builtins.py:5373
6093.2.1 by Jonathan Riddell
add .pot file to archive
3526
msgid ""
3527
"Convert the current branch into a checkout of the supplied branch.\n"
3528
"If no branch is supplied, rebind to the last bound location."
3529
msgstr ""
3530
7490.31.3 by Jelmer Vernooij
Update po.
3531
#: breezy/builtins.py:5376
6093.2.1 by Jonathan Riddell
add .pot file to archive
3532
msgid ""
3533
"Once converted into a checkout, commits must succeed on the master branch\n"
3534
"before they will be applied to the local branch."
3535
msgstr ""
3536
7490.31.3 by Jelmer Vernooij
Update po.
3537
#: breezy/builtins.py:5379
6093.2.1 by Jonathan Riddell
add .pot file to archive
3538
msgid ""
3539
"Bound branches use the nickname of its master branch unless it is set\n"
3540
"locally, in which case binding will update the local nickname to be\n"
3541
"that of the master."
3542
msgstr ""
3543
7490.31.3 by Jelmer Vernooij
Update po.
3544
#: breezy/builtins.py:5395
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3545
msgid "No location supplied.  This format does not remember old locations."
3546
msgstr ""
3547
7490.31.3 by Jelmer Vernooij
Update po.
3548
#: breezy/builtins.py:5401
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3549
msgid "Branch is already bound"
3550
msgstr ""
3551
7490.31.3 by Jelmer Vernooij
Update po.
3552
#: breezy/builtins.py:5404
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3553
msgid "No location supplied and no previous location known"
3554
msgstr ""
3555
7490.31.3 by Jelmer Vernooij
Update po.
3556
#: breezy/builtins.py:5411
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3557
msgid "These branches have diverged. Try merging, and then bind again."
3558
msgstr ""
3559
7490.31.3 by Jelmer Vernooij
Update po.
3560
#: breezy/builtins.py:5418
6093.2.1 by Jonathan Riddell
add .pot file to archive
3561
msgid "Convert the current checkout into a regular branch."
3562
msgstr ""
3563
7490.31.3 by Jelmer Vernooij
Update po.
3564
#: breezy/builtins.py:5420
6093.2.1 by Jonathan Riddell
add .pot file to archive
3565
msgid ""
3566
"After unbinding, the local branch is considered independent and subsequent\n"
3567
"commits will be local only."
3568
msgstr ""
3569
7490.31.3 by Jelmer Vernooij
Update po.
3570
#: breezy/builtins.py:5431
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3571
msgid "Local branch is not bound"
3572
msgstr ""
3573
7490.31.3 by Jelmer Vernooij
Update po.
3574
#: breezy/builtins.py:5435
6093.2.1 by Jonathan Riddell
add .pot file to archive
3575
msgid "Remove the last committed revision."
3576
msgstr ""
3577
7490.31.3 by Jelmer Vernooij
Update po.
3578
#: breezy/builtins.py:5437
6093.2.1 by Jonathan Riddell
add .pot file to archive
3579
msgid ""
3580
"--verbose will print out what is being removed.\n"
3581
"--dry-run will go through all the motions, but not actually\n"
3582
"remove anything."
3583
msgstr ""
3584
7490.31.3 by Jelmer Vernooij
Update po.
3585
#: breezy/builtins.py:5441
6093.2.1 by Jonathan Riddell
add .pot file to archive
3586
msgid ""
3587
"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.
3588
"specified revision.  For example, \"brz uncommit -r 15\" will leave the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3589
"branch at revision 15."
3590
msgstr ""
3591
7490.31.3 by Jelmer Vernooij
Update po.
3592
#: breezy/builtins.py:5445
6093.2.1 by Jonathan Riddell
add .pot file to archive
3593
msgid ""
3594
"Uncommit leaves the working tree ready for a new commit.  The only change\n"
3595
"it may make is to restore any pending merges that were present before\n"
3596
"the commit."
3597
msgstr ""
3598
3599
# help of 'dry-run' option of 'uncommit' command
7490.31.3 by Jelmer Vernooij
Update po.
3600
#: breezy/builtins.py:5456
6093.2.1 by Jonathan Riddell
add .pot file to archive
3601
msgid "Don't actually make changes."
3602
msgstr ""
3603
3604
# help of 'force' option of 'uncommit' command
7490.31.3 by Jelmer Vernooij
Update po.
3605
#: breezy/builtins.py:5457
6093.2.1 by Jonathan Riddell
add .pot file to archive
3606
msgid "Say yes to all questions."
3607
msgstr ""
3608
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
3609
# help of 'keep-tags' option of 'uncommit' command
7490.31.3 by Jelmer Vernooij
Update po.
3610
#: breezy/builtins.py:5459
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
3611
msgid "Keep tags that point to removed revisions."
3612
msgstr ""
3613
6093.2.1 by Jonathan Riddell
add .pot file to archive
3614
# help of 'local' option of 'uncommit' command
7490.31.3 by Jelmer Vernooij
Update po.
3615
#: breezy/builtins.py:5461
6093.2.1 by Jonathan Riddell
add .pot file to archive
3616
msgid "Only remove the commits from the local branch when in a checkout."
3617
msgstr ""
3618
7490.31.3 by Jelmer Vernooij
Update po.
3619
#: breezy/builtins.py:5510
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3620
msgid "No revisions to uncommit.\n"
3621
msgstr ""
3622
7490.31.3 by Jelmer Vernooij
Update po.
3623
#: breezy/builtins.py:5525
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3624
msgid "Dry-run, pretending to remove the above revisions.\n"
3625
msgstr ""
3626
7490.31.3 by Jelmer Vernooij
Update po.
3627
#: breezy/builtins.py:5529
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3628
msgid "The above revision(s) will be removed.\n"
3629
msgstr ""
3630
7490.31.3 by Jelmer Vernooij
Update po.
3631
#: breezy/builtins.py:5533
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3632
msgid "Uncommit these revisions"
3633
msgstr ""
3634
7490.31.3 by Jelmer Vernooij
Update po.
3635
#: breezy/builtins.py:5536
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3636
msgid "Canceled\n"
3637
msgstr ""
3638
7490.31.3 by Jelmer Vernooij
Update po.
3639
#: breezy/builtins.py:5545
3640
#, python-format
3641
msgid ""
3642
"You can restore the old tip by running:\n"
3643
"  brz pull -d %s %s -r revid:%s\n"
3644
msgstr ""
3645
3646
#: breezy/builtins.py:5550
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3647
#, python-format
3648
msgid ""
3649
"You can restore the old tip by running:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3650
"  brz pull . -r revid:%s\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3651
msgstr ""
3652
7490.31.3 by Jelmer Vernooij
Update po.
3653
#: breezy/builtins.py:5556
6093.2.1 by Jonathan Riddell
add .pot file to archive
3654
msgid "Break a dead lock."
3655
msgstr ""
3656
7490.31.3 by Jelmer Vernooij
Update po.
3657
#: breezy/builtins.py:5558
6093.2.1 by Jonathan Riddell
add .pot file to archive
3658
msgid ""
3659
"This command breaks a lock on a repository, branch, working directory or\n"
3660
"config file."
3661
msgstr ""
3662
7490.31.3 by Jelmer Vernooij
Update po.
3663
#: breezy/builtins.py:5561
6093.2.1 by Jonathan Riddell
add .pot file to archive
3664
msgid ""
3665
"CAUTION: Locks should only be broken when you are sure that the process\n"
3666
"holding the lock has been stopped."
3667
msgstr ""
3668
7490.31.3 by Jelmer Vernooij
Update po.
3669
#: breezy/builtins.py:5564
6093.2.1 by Jonathan Riddell
add .pot file to archive
3670
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3671
"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
3672
"[location]' command."
3673
msgstr ""
3674
7490.31.3 by Jelmer Vernooij
Update po.
3675
#: breezy/builtins.py:5567
6093.2.1 by Jonathan Riddell
add .pot file to archive
3676
msgid ""
3677
":Examples:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3678
"    brz break-lock\n"
3679
"    brz break-lock brz+ssh://example.com/brz/foo\n"
7490.31.3 by Jelmer Vernooij
Update po.
3680
"    brz break-lock --conf ~/.config/breezy"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3681
msgstr ""
3682
3683
# help of 'config' option of 'break-lock' command
7490.31.3 by Jelmer Vernooij
Update po.
3684
#: breezy/builtins.py:5576
6093.2.1 by Jonathan Riddell
add .pot file to archive
3685
msgid "LOCATION is the directory where the config lock is."
3686
msgstr ""
3687
3688
# help of 'force' option of 'break-lock' command
7490.31.3 by Jelmer Vernooij
Update po.
3689
#: breezy/builtins.py:5578
6093.2.1 by Jonathan Riddell
add .pot file to archive
3690
msgid "Do not ask for confirmation before breaking the lock."
3691
msgstr ""
3692
7185.1.1 by Jelmer Vernooij
Update pot file.
3693
# help of 'protocol=git' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3694
#: breezy/builtins.py:5613
7185.1.1 by Jelmer Vernooij
Update pot file.
3695
msgid "Git Smart server protocol over TCP. (default port: 9418)"
3696
msgstr ""
3697
3698
# help of 'protocol=git-receive-pack' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3699
#: breezy/builtins.py:5613
7185.1.1 by Jelmer Vernooij
Update pot file.
3700
msgid "Git Smart server receive pack command. (inetd mode only)"
3701
msgstr ""
3702
3703
# help of 'protocol=git-upload-pack' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3704
#: breezy/builtins.py:5613
7185.1.1 by Jelmer Vernooij
Update pot file.
3705
msgid "Git Smart server upload pack command. (inetd mode only)"
3706
msgstr ""
3707
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3708
# help of 'protocol=bzr' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3709
#: breezy/builtins.py:5613
6581.1.2 by Vincent Ladeuil
Update translation template.
3710
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3711
msgstr ""
3712
7490.31.3 by Jelmer Vernooij
Update po.
3713
#: breezy/builtins.py:5614
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3714
msgid "Run the brz server."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3715
msgstr ""
3716
3717
# help of 'inet' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3718
#: breezy/builtins.py:5620
6093.2.1 by Jonathan Riddell
add .pot file to archive
3719
msgid "Serve on stdin/out for use from inetd or sshd."
3720
msgstr ""
3721
3722
# title of 'protocol' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3723
#: breezy/builtins.py:5621
6093.2.1 by Jonathan Riddell
add .pot file to archive
3724
msgid "protocol"
3725
msgstr ""
3726
3727
# help of 'protocol' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3728
#: breezy/builtins.py:5622
6093.2.1 by Jonathan Riddell
add .pot file to archive
3729
msgid "Protocol to serve."
3730
msgstr ""
3731
6504.1.1 by Vincent Ladeuil
Update translation template
3732
# help of 'listen' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3733
#: breezy/builtins.py:5627
6504.1.1 by Vincent Ladeuil
Update translation template
3734
msgid "Listen for connections on nominated address."
3735
msgstr ""
3736
6093.2.1 by Jonathan Riddell
add .pot file to archive
3737
# help of 'port' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3738
#: breezy/builtins.py:5630
6093.2.1 by Jonathan Riddell
add .pot file to archive
3739
msgid ""
6504.1.1 by Vincent Ladeuil
Update translation template
3740
"Listen for connections on nominated port.  Passing 0 as the port number will "
3741
"result in a dynamically allocated port.  The default port depends on the "
3742
"protocol."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3743
msgstr ""
3744
3745
# help of 'directory' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3746
#: breezy/builtins.py:5635
6093.2.1 by Jonathan Riddell
add .pot file to archive
3747
msgid "Serve contents of this directory."
3748
msgstr ""
3749
3750
# help of 'allow-writes' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3751
#: breezy/builtins.py:5637
6093.2.1 by Jonathan Riddell
add .pot file to archive
3752
msgid ""
3753
"By default the server is a readonly server.  Supplying --allow-writes "
3754
"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.
3755
"Note that ``brz serve`` does not perform authentication, so unless some form "
6093.2.1 by Jonathan Riddell
add .pot file to archive
3756
"of external authentication is arranged supplying this option leads to global "
3757
"uncontrolled write access to your file system."
3758
msgstr ""
3759
6252.1.1 by Vincent Ladeuil
Release 2.5b3
3760
# help of 'client-timeout' option of 'serve' command
7490.31.3 by Jelmer Vernooij
Update po.
3761
#: breezy/builtins.py:5646
6252.1.1 by Vincent Ladeuil
Release 2.5b3
3762
msgid "Override the default idle client timeout (5min)."
3763
msgstr ""
3764
7490.31.3 by Jelmer Vernooij
Update po.
3765
#: breezy/builtins.py:5664
6093.2.1 by Jonathan Riddell
add .pot file to archive
3766
msgid "Combine a tree into its containing tree."
3767
msgstr ""
3768
7490.31.3 by Jelmer Vernooij
Update po.
3769
#: breezy/builtins.py:5666
6093.2.1 by Jonathan Riddell
add .pot file to archive
3770
msgid "This command requires the target tree to be in a rich-root format."
3771
msgstr ""
3772
7490.31.3 by Jelmer Vernooij
Update po.
3773
#: breezy/builtins.py:5668
6093.2.1 by Jonathan Riddell
add .pot file to archive
3774
msgid ""
3775
"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.
3776
"not part of it.  (Such trees can be produced by \"brz split\", but also by\n"
3777
"running \"brz branch\" with the target inside a tree.)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3778
msgstr ""
3779
7490.31.3 by Jelmer Vernooij
Update po.
3780
#: breezy/builtins.py:5672
6093.2.1 by Jonathan Riddell
add .pot file to archive
3781
msgid ""
3782
"The result is a combined tree, with the subtree no longer an independent\n"
3783
"part.  This is marked as a merge of the subtree into the containing tree,\n"
3784
"and all history is preserved."
3785
msgstr ""
3786
7490.31.3 by Jelmer Vernooij
Update po.
3787
#: breezy/builtins.py:5691
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3788
#, python-format
3789
msgid ""
3790
"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.
3791
"You can use brz upgrade on the repository."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3792
msgstr ""
3793
7490.31.3 by Jelmer Vernooij
Update po.
3794
#: breezy/builtins.py:5701 breezy/builtins.py:5707
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3795
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
3796
msgid "Cannot join {0}.  {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3797
msgstr ""
3798
7490.31.3 by Jelmer Vernooij
Update po.
3799
#: breezy/builtins.py:5711
6093.2.1 by Jonathan Riddell
add .pot file to archive
3800
msgid "Split a subdirectory of a tree into a separate tree."
3801
msgstr ""
3802
7490.31.3 by Jelmer Vernooij
Update po.
3803
#: breezy/builtins.py:5713
6093.2.1 by Jonathan Riddell
add .pot file to archive
3804
msgid ""
3805
"This command will produce a target tree in a format that supports\n"
3806
"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
3807
"converted into earlier formats like 'dirstate-tags'."
3808
msgstr ""
3809
7490.31.3 by Jelmer Vernooij
Update po.
3810
#: breezy/builtins.py:5717
6093.2.1 by Jonathan Riddell
add .pot file to archive
3811
msgid ""
3812
"The TREE argument should be a subdirectory of a working tree.  That\n"
3813
"subdirectory will be converted into an independent tree, with its own\n"
3814
"branch.  Commits in the top-level tree will not apply to the new subtree."
3815
msgstr ""
3816
7490.31.3 by Jelmer Vernooij
Update po.
3817
#: breezy/builtins.py:5799
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3818
msgid "No submit branch specified or known"
3819
msgstr ""
3820
7490.31.3 by Jelmer Vernooij
Update po.
3821
#: breezy/builtins.py:5809 breezy/send.py:108
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3822
msgid "No public branch specified or known"
3823
msgstr ""
3824
7490.31.3 by Jelmer Vernooij
Update po.
3825
#: breezy/builtins.py:5814
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3826
msgid "brz merge-directive takes at most two one revision identifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3827
msgstr ""
3828
7490.31.3 by Jelmer Vernooij
Update po.
3829
#: breezy/builtins.py:5823
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3830
msgid "No revisions to bundle."
3831
msgstr ""
3832
7490.31.3 by Jelmer Vernooij
Update po.
3833
#: breezy/builtins.py:5842
6093.2.1 by Jonathan Riddell
add .pot file to archive
3834
msgid "Mail or create a merge-directive for submitting changes."
3835
msgstr ""
3836
7490.31.3 by Jelmer Vernooij
Update po.
3837
#: breezy/builtins.py:5844
6093.2.1 by Jonathan Riddell
add .pot file to archive
3838
msgid "A merge directive provides many things needed for requesting merges:"
3839
msgstr ""
3840
7490.31.3 by Jelmer Vernooij
Update po.
3841
#: breezy/builtins.py:5846
6093.2.1 by Jonathan Riddell
add .pot file to archive
3842
msgid "* A machine-readable description of the merge to perform"
3843
msgstr ""
3844
7490.31.3 by Jelmer Vernooij
Update po.
3845
#: breezy/builtins.py:5848
6093.2.1 by Jonathan Riddell
add .pot file to archive
3846
msgid "* An optional patch that is a preview of the changes requested"
3847
msgstr ""
3848
7490.31.3 by Jelmer Vernooij
Update po.
3849
#: breezy/builtins.py:5850
6093.2.1 by Jonathan Riddell
add .pot file to archive
3850
msgid ""
3851
"* An optional bundle of revision data, so that the changes can be applied\n"
3852
"  directly from the merge directive, without retrieving data from a\n"
3853
"  branch."
3854
msgstr ""
3855
7490.31.3 by Jelmer Vernooij
Update po.
3856
#: breezy/builtins.py:5854
6093.2.1 by Jonathan Riddell
add .pot file to archive
3857
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3858
"`brz send` creates a compact data set that, when applied using brz\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
3859
"merge, has the same effect as merging from the source branch."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3860
msgstr ""
3861
7490.31.3 by Jelmer Vernooij
Update po.
3862
#: breezy/builtins.py:5857
6093.2.1 by Jonathan Riddell
add .pot file to archive
3863
msgid ""
3864
"By default the merge directive is self-contained and can be applied to any\n"
3865
"branch containing submit_branch in its ancestory without needing access to\n"
3866
"the source branch."
3867
msgstr ""
3868
7490.31.3 by Jelmer Vernooij
Update po.
3869
#: breezy/builtins.py:5861
6093.2.1 by Jonathan Riddell
add .pot file to archive
3870
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
3871
"If --no-bundle is specified, then Breezy doesn't send the contents of the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3872
"revisions, but only a structured request to merge from the\n"
3873
"public_location.  In that case the public_branch is needed and it must be\n"
3874
"up-to-date and accessible to the recipient.  The public_branch is always\n"
3875
"included if known, so that people can check it later."
3876
msgstr ""
3877
7490.31.3 by Jelmer Vernooij
Update po.
3878
#: breezy/builtins.py:5867
6093.2.1 by Jonathan Riddell
add .pot file to archive
3879
msgid ""
3880
"The submit branch defaults to the parent of the source branch, but can be\n"
3881
"overridden.  Both submit branch and public branch will be remembered in\n"
3882
"branch.conf the first time they are used for a particular branch.  The\n"
3883
"source branch defaults to that containing the working directory, but can\n"
3884
"be changed using --from."
3885
msgstr ""
3886
7490.31.3 by Jelmer Vernooij
Update po.
3887
#: breezy/builtins.py:5873
6093.2.1 by Jonathan Riddell
add .pot file to archive
3888
msgid ""
3889
"Both the submit branch and the public branch follow the usual behavior with\n"
3890
"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
3891
"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
3892
"omit the location to use the default.  To change the default, use\n"
3893
"--remember. The value will only be saved if the location can be accessed."
3894
msgstr ""
3895
7490.31.3 by Jelmer Vernooij
Update po.
3896
#: breezy/builtins.py:5879
6093.2.1 by Jonathan Riddell
add .pot file to archive
3897
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3898
"In order to calculate those changes, brz must analyse the submit branch.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3899
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3900
"If a public location is known for the submit_branch, that location is used\n"
3901
"in the merge directive."
3902
msgstr ""
3903
7490.31.3 by Jelmer Vernooij
Update po.
3904
#: breezy/builtins.py:5884
6093.2.1 by Jonathan Riddell
add .pot file to archive
3905
msgid ""
3906
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3907
"given, in which case it is sent to a file."
3908
msgstr ""
3909
7490.31.3 by Jelmer Vernooij
Update po.
3910
#: breezy/builtins.py:5887
6093.2.1 by Jonathan Riddell
add .pot file to archive
3911
msgid ""
3912
"Mail is sent using your preferred mail program.  This should be transparent\n"
3913
"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
3914
"If the preferred client can't be found (or used), your editor will be used."
3915
msgstr ""
3916
7490.31.3 by Jelmer Vernooij
Update po.
3917
#: breezy/builtins.py:5891
6093.2.1 by Jonathan Riddell
add .pot file to archive
3918
msgid ""
3919
"To use a specific mail program, set the mail_client configuration option.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
3920
"Supported values for specific clients are \"claws\", \"evolution\", \"kmail"
3921
"\",\n"
3922
"\"mail.app\" (MacOS X's Mail.app), \"mutt\", and \"thunderbird\"; generic "
3923
"options\n"
3924
"are \"default\", \"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  "
3925
"Plugins\n"
3926
"may also add supported clients."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3927
msgstr ""
3928
7490.31.3 by Jelmer Vernooij
Update po.
3929
#: breezy/builtins.py:5897
6093.2.1 by Jonathan Riddell
add .pot file to archive
3930
msgid ""
3931
"If mail is being sent, a to address is required.  This can be supplied\n"
3932
"either on the commandline, by setting the submit_to configuration\n"
3933
"option in the branch itself or the child_submit_to configuration option\n"
3934
"in the submit branch."
3935
msgstr ""
3936
7490.31.3 by Jelmer Vernooij
Update po.
3937
#: breezy/builtins.py:5902
6093.2.1 by Jonathan Riddell
add .pot file to archive
3938
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3939
"The merge directives created by brz send may be applied using brz merge or\n"
3940
"brz pull by specifying a file containing a merge directive as the location."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3941
msgstr ""
3942
7490.31.3 by Jelmer Vernooij
Update po.
3943
#: breezy/builtins.py:5905
6093.2.1 by Jonathan Riddell
add .pot file to archive
3944
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3945
"brz send makes extensive use of public locations to map local locations "
6093.2.1 by Jonathan Riddell
add .pot file to archive
3946
"into\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3947
"URLs that can be used by other people.  See `brz help configuration` to\n"
3948
"set them, and use `brz info` to display them."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3949
msgstr ""
3950
3951
# help of 'output' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
3952
#: breezy/builtins.py:5929
6093.2.1 by Jonathan Riddell
add .pot file to archive
3953
msgid "Write merge directive to this file or directory; use - for stdout."
3954
msgstr ""
3955
3956
# help of 'strict' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
3957
#: breezy/builtins.py:5933
6093.2.1 by Jonathan Riddell
add .pot file to archive
3958
msgid ""
3959
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3960
"strict disables the check."
3961
msgstr ""
3962
3963
# help of 'mail-to' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
3964
#: breezy/builtins.py:5935
6093.2.1 by Jonathan Riddell
add .pot file to archive
3965
msgid "Mail the request to this address."
3966
msgstr ""
3967
3968
# help of 'body' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
3969
#: breezy/builtins.py:5939
6093.2.1 by Jonathan Riddell
add .pot file to archive
3970
msgid "Body for the email."
3971
msgstr ""
3972
3973
# help of 'no-bundle' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
3974
#: breezy/builtins.py:5986
6093.2.1 by Jonathan Riddell
add .pot file to archive
3975
msgid "Do not include a bundle in the merge directive."
3976
msgstr ""
3977
3978
# help of 'no-patch' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
3979
#: breezy/builtins.py:5987
6093.2.1 by Jonathan Riddell
add .pot file to archive
3980
msgid "Do not include a preview patch in the merge directive."
3981
msgstr ""
3982
3983
# help of 'remember' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
3984
#: breezy/builtins.py:5990
6093.2.1 by Jonathan Riddell
add .pot file to archive
3985
msgid "Remember submit and public branch."
3986
msgstr ""
3987
3988
# help of 'from' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
3989
#: breezy/builtins.py:5992
6093.2.1 by Jonathan Riddell
add .pot file to archive
3990
msgid ""
3991
"Branch to generate the submission from, rather than the one containing the "
3992
"working directory."
3993
msgstr ""
3994
3995
# title of 'format' option of 'send' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
3996
# title of 'format' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
3997
#: breezy/builtins.py:6002 breezy/cmd_version_info.py:79
6093.2.1 by Jonathan Riddell
add .pot file to archive
3998
msgid "format"
3999
msgstr ""
4000
4001
# help of 'format' option of 'send' command
7490.31.3 by Jelmer Vernooij
Update po.
4002
#: breezy/builtins.py:6003
6093.2.1 by Jonathan Riddell
add .pot file to archive
4003
msgid "Use the specified output format."
4004
msgstr ""
4005
7490.31.3 by Jelmer Vernooij
Update po.
4006
#: breezy/builtins.py:6025
6093.2.1 by Jonathan Riddell
add .pot file to archive
4007
msgid "Create, remove or modify a tag naming a revision."
4008
msgstr ""
4009
7490.31.3 by Jelmer Vernooij
Update po.
4010
#: breezy/builtins.py:6027
6093.2.1 by Jonathan Riddell
add .pot file to archive
4011
msgid ""
4012
"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
4013
"(--revision) option can be given -rtag:X, where X is any previously\n"
4014
"created tag."
4015
msgstr ""
4016
7490.31.3 by Jelmer Vernooij
Update po.
4017
#: breezy/builtins.py:6031
6093.2.1 by Jonathan Riddell
add .pot file to archive
4018
msgid ""
4019
"Tags are stored in the branch.  Tags are copied from one branch to another\n"
4020
"along when you branch, push, pull or merge."
4021
msgstr ""
4022
7490.31.3 by Jelmer Vernooij
Update po.
4023
#: breezy/builtins.py:6034
6093.2.1 by Jonathan Riddell
add .pot file to archive
4024
msgid ""
4025
"It is an error to give a tag name that already exists unless you pass\n"
4026
"--force, in which case the tag is moved to point to the new revision."
4027
msgstr ""
4028
7490.31.3 by Jelmer Vernooij
Update po.
4029
#: breezy/builtins.py:6037
6093.2.1 by Jonathan Riddell
add .pot file to archive
4030
msgid ""
4031
"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.
4032
"``brz\n"
4033
"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4034
msgstr ""
4035
7490.31.3 by Jelmer Vernooij
Update po.
4036
#: breezy/builtins.py:6040
6093.2.1 by Jonathan Riddell
add .pot file to archive
4037
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
4038
"If no tag name is specified it will be determined through the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4039
"'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.
4040
"upstream releases by reading configure.ac. See ``brz help hooks`` for\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4041
"details."
4042
msgstr ""
4043
4044
# help of 'delete' option of 'tag' command
7490.31.3 by Jelmer Vernooij
Update po.
4045
#: breezy/builtins.py:6050
6093.2.1 by Jonathan Riddell
add .pot file to archive
4046
msgid "Delete this tag rather than placing it."
4047
msgstr ""
4048
4049
# help of 'directory' option of 'tag' command
7490.31.3 by Jelmer Vernooij
Update po.
4050
#: breezy/builtins.py:6053
6093.2.1 by Jonathan Riddell
add .pot file to archive
4051
msgid "Branch in which to place the tag."
4052
msgstr ""
4053
4054
# help of 'force' option of 'tag' command
7490.31.3 by Jelmer Vernooij
Update po.
4055
#: breezy/builtins.py:6055
6093.2.1 by Jonathan Riddell
add .pot file to archive
4056
msgid "Replace existing tags."
4057
msgstr ""
4058
7490.31.3 by Jelmer Vernooij
Update po.
4059
#: breezy/builtins.py:6071
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4060
msgid "No tag specified to delete."
4061
msgstr ""
4062
7490.31.3 by Jelmer Vernooij
Update po.
4063
#: breezy/builtins.py:6073
6504.1.1 by Vincent Ladeuil
Update translation template
4064
#, python-format
4065
msgid "Deleted tag %s."
4066
msgstr ""
4067
7490.31.3 by Jelmer Vernooij
Update po.
4068
#: breezy/builtins.py:6078
6581.1.2 by Vincent Ladeuil
Update translation template.
4069
msgid "Tags can only be placed on a single revision, not on a range"
4070
msgstr ""
4071
7490.31.3 by Jelmer Vernooij
Update po.
4072
#: breezy/builtins.py:6087
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4073
msgid "Please specify a tag name."
4074
msgstr ""
4075
7490.31.3 by Jelmer Vernooij
Update po.
4076
#: breezy/builtins.py:6095
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4077
#, python-format
4078
msgid "Tag %s already exists for that revision."
4079
msgstr ""
4080
7490.31.3 by Jelmer Vernooij
Update po.
4081
#: breezy/builtins.py:6099
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4082
#, python-format
4083
msgid "Created tag %s."
4084
msgstr ""
4085
7490.31.3 by Jelmer Vernooij
Update po.
4086
#: breezy/builtins.py:6101
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4087
#, python-format
4088
msgid "Updated tag %s."
4089
msgstr ""
4090
7490.31.3 by Jelmer Vernooij
Update po.
4091
#: breezy/builtins.py:6105
6093.2.1 by Jonathan Riddell
add .pot file to archive
4092
msgid "List tags."
4093
msgstr ""
4094
7490.31.3 by Jelmer Vernooij
Update po.
4095
#: breezy/builtins.py:6107
6093.2.1 by Jonathan Riddell
add .pot file to archive
4096
msgid ""
4097
"This command shows a table of tag names and the revisions they reference."
4098
msgstr ""
4099
4100
# help of 'directory' option of 'tags' command
7490.31.3 by Jelmer Vernooij
Update po.
4101
#: breezy/builtins.py:6113
6093.2.1 by Jonathan Riddell
add .pot file to archive
4102
msgid "Branch whose tags should be displayed."
4103
msgstr ""
4104
4105
# help of 'sort' option of 'tags' command
7490.31.3 by Jelmer Vernooij
Update po.
4106
#: breezy/builtins.py:6115
6093.2.1 by Jonathan Riddell
add .pot file to archive
4107
msgid "Sort tags by different criteria."
4108
msgstr ""
4109
4110
# title of 'sort' option of 'tags' command
7490.31.3 by Jelmer Vernooij
Update po.
4111
#: breezy/builtins.py:6115
6093.2.1 by Jonathan Riddell
add .pot file to archive
4112
msgid "Sorting"
4113
msgstr ""
4114
7490.31.3 by Jelmer Vernooij
Update po.
4115
#: breezy/builtins.py:6185
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4116
msgid "Reconfigure the type of a brz directory."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4117
msgstr ""
4118
7490.31.3 by Jelmer Vernooij
Update po.
4119
#: breezy/builtins.py:6187
6093.2.1 by Jonathan Riddell
add .pot file to archive
4120
msgid "A target configuration must be specified."
4121
msgstr ""
4122
7490.31.3 by Jelmer Vernooij
Update po.
4123
#: breezy/builtins.py:6189
6093.2.1 by Jonathan Riddell
add .pot file to archive
4124
msgid ""
4125
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4126
"The order of preference is\n"
4127
"1. For a lightweight checkout, the current bound location.\n"
4128
"2. For branches that used to be checkouts, the previously-bound location.\n"
4129
"3. The push location.\n"
4130
"4. The parent location.\n"
4131
"If none of these is available, --bind-to must be specified."
4132
msgstr ""
4133
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4134
# title of 'tree_type' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4135
#: breezy/builtins.py:6203
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4136
msgid "Tree type"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4137
msgstr ""
4138
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4139
# help of 'tree_type' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4140
#: breezy/builtins.py:6204
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4141
msgid "The relation between branch and tree."
4142
msgstr ""
4143
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4144
# help of 'tree_type=branch' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4145
#: breezy/builtins.py:6206
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4146
msgid "Reconfigure to be an unbound branch with no working tree."
4147
msgstr ""
4148
4149
# help of 'tree_type=tree' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4150
#: breezy/builtins.py:6207
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4151
msgid "Reconfigure to be an unbound branch with a working tree."
4152
msgstr ""
4153
4154
# help of 'tree_type=checkout' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4155
#: breezy/builtins.py:6208
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4156
msgid "Reconfigure to be a bound branch with a working tree."
4157
msgstr ""
4158
4159
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4160
#: breezy/builtins.py:6209
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4161
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4162
msgstr ""
4163
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4164
# title of 'repository_type' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4165
#: breezy/builtins.py:6214
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4166
msgid "Repository type"
4167
msgstr ""
4168
4169
# help of 'repository_type' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4170
#: breezy/builtins.py:6215
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4171
msgid "Location fo the repository."
4172
msgstr ""
4173
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4174
# help of 'repository_type=standalone' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4175
#: breezy/builtins.py:6217
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4176
msgid ""
4177
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4178
msgstr ""
4179
4180
# help of 'repository_type=use-shared' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4181
#: breezy/builtins.py:6219
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4182
msgid "Reconfigure to use a shared repository."
4183
msgstr ""
4184
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4185
# title of 'repository_trees' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4186
#: breezy/builtins.py:6223
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4187
msgid "Trees in Repository"
4188
msgstr ""
4189
4190
# help of 'repository_trees' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4191
#: breezy/builtins.py:6224
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4192
msgid "Whether new branches in the repository have trees."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4193
msgstr ""
4194
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4195
# help of 'repository_trees=with-trees' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4196
#: breezy/builtins.py:6226
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4197
msgid "Reconfigure repository to create working trees on branches by default."
4198
msgstr ""
4199
4200
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4201
#: breezy/builtins.py:6228
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4202
msgid ""
4203
"Reconfigure repository to not create working trees on branches by default."
4204
msgstr ""
4205
6093.2.1 by Jonathan Riddell
add .pot file to archive
4206
# help of 'bind-to' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4207
#: breezy/builtins.py:6231
6093.2.1 by Jonathan Riddell
add .pot file to archive
4208
msgid "Branch to bind checkout to."
4209
msgstr ""
4210
4211
# help of 'force' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4212
#: breezy/builtins.py:6233
6093.2.1 by Jonathan Riddell
add .pot file to archive
4213
msgid "Perform reconfiguration even if local changes will be lost."
4214
msgstr ""
4215
4216
# help of 'stacked-on' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4217
#: breezy/builtins.py:6236
6093.2.1 by Jonathan Riddell
add .pot file to archive
4218
msgid "Reconfigure a branch to be stacked on another branch."
4219
msgstr ""
4220
4221
# help of 'unstacked' option of 'reconfigure' command
7490.31.3 by Jelmer Vernooij
Update po.
4222
#: breezy/builtins.py:6240
6093.2.1 by Jonathan Riddell
add .pot file to archive
4223
msgid ""
4224
"Reconfigure a branch to be unstacked.  This may require copying substantial "
4225
"data into it."
4226
msgstr ""
4227
7490.31.3 by Jelmer Vernooij
Update po.
4228
#: breezy/builtins.py:6251
6504.1.1 by Vincent Ladeuil
Update translation template
4229
msgid "Can't use both --stacked-on and --unstacked"
4230
msgstr ""
4231
7490.31.3 by Jelmer Vernooij
Update po.
4232
#: breezy/builtins.py:6265
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4233
msgid "No target configuration specified"
4234
msgstr ""
4235
7490.31.3 by Jelmer Vernooij
Update po.
4236
#: breezy/builtins.py:6300
6093.2.1 by Jonathan Riddell
add .pot file to archive
4237
msgid "Set the branch of a checkout and update."
4238
msgstr ""
4239
7490.31.3 by Jelmer Vernooij
Update po.
4240
#: breezy/builtins.py:6302
6093.2.1 by Jonathan Riddell
add .pot file to archive
4241
msgid ""
4242
"For lightweight checkouts, this changes the branch being referenced.\n"
4243
"For heavyweight checkouts, this checks that there are no local commits\n"
4244
"versus the current bound branch, then it makes the local branch a mirror\n"
4245
"of the new location and binds to it."
4246
msgstr ""
4247
7490.31.3 by Jelmer Vernooij
Update po.
4248
#: breezy/builtins.py:6307
6093.2.1 by Jonathan Riddell
add .pot file to archive
4249
msgid ""
4250
"In both cases, the working tree is updated and uncommitted changes\n"
4251
"are merged. The user can commit or revert these as they desire."
4252
msgstr ""
4253
7490.31.3 by Jelmer Vernooij
Update po.
4254
#: breezy/builtins.py:6310
6093.2.1 by Jonathan Riddell
add .pot file to archive
4255
msgid "Pending merges need to be committed or reverted before using switch."
4256
msgstr ""
4257
7490.31.3 by Jelmer Vernooij
Update po.
4258
#: breezy/builtins.py:6312
6093.2.1 by Jonathan Riddell
add .pot file to archive
4259
msgid ""
4260
"The path to the branch to switch to can be specified relative to the parent\n"
4261
"directory of the current branch. For example, if you are currently in a\n"
4262
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4263
"/path/to/newbranch."
4264
msgstr ""
4265
7490.31.3 by Jelmer Vernooij
Update po.
4266
#: breezy/builtins.py:6317
6093.2.1 by Jonathan Riddell
add .pot file to archive
4267
msgid ""
4268
"Bound branches use the nickname of its master branch unless it is set\n"
4269
"locally, in which case switching will update the local nickname to be\n"
4270
"that of the master."
4271
msgstr ""
4272
4273
# help of 'force' option of 'switch' command
7490.31.3 by Jelmer Vernooij
Update po.
4274
#: breezy/builtins.py:6325
6093.2.1 by Jonathan Riddell
add .pot file to archive
4275
msgid "Switch even if local commits will be lost."
4276
msgstr ""
4277
4278
# help of 'create-branch' option of 'switch' command
7490.31.3 by Jelmer Vernooij
Update po.
4279
#: breezy/builtins.py:6328
6504.1.1 by Vincent Ladeuil
Update translation template
4280
msgid "Create the target branch from this one before switching to it."
4281
msgstr ""
4282
6581.1.2 by Vincent Ladeuil
Update translation template.
4283
# help of 'store' option of 'switch' command
7490.31.3 by Jelmer Vernooij
Update po.
4284
#: breezy/builtins.py:6331
6581.1.2 by Vincent Ladeuil
Update translation template.
4285
msgid "Store and restore uncommitted changes in the branch."
4286
msgstr ""
4287
7490.31.3 by Jelmer Vernooij
Update po.
4288
#: breezy/builtins.py:6344
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4289
msgid "You must supply either a revision or a location"
4290
msgstr ""
4291
7490.31.3 by Jelmer Vernooij
Update po.
4292
#: breezy/builtins.py:6359
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4293
msgid "cannot create branch without source branch"
4294
msgstr ""
4295
7490.31.3 by Jelmer Vernooij
Update po.
4296
#: breezy/builtins.py:6387
7185.1.1 by Jelmer Vernooij
Update pot file.
4297
msgid ""
4298
"switching would create a branch reference loop. Use the \"bzr up\" command "
4299
"to switch to a different revision."
4300
msgstr ""
4301
7490.31.3 by Jelmer Vernooij
Update po.
4302
#: breezy/builtins.py:6395
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4303
#, python-format
4304
msgid "Switched to branch %s at %s"
4305
msgstr ""
4306
7490.31.3 by Jelmer Vernooij
Update po.
4307
#: breezy/builtins.py:6398
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4308
#, python-format
4309
msgid "Switched to branch %s"
4310
msgstr ""
4311
7490.31.3 by Jelmer Vernooij
Update po.
4312
#: breezy/builtins.py:6400
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
4313
#, python-format
4314
msgid "Switched to branch at %s"
4315
msgstr ""
4316
7490.31.3 by Jelmer Vernooij
Update po.
4317
#: breezy/builtins.py:6405
6093.2.1 by Jonathan Riddell
add .pot file to archive
4318
msgid "Manage filtered views."
4319
msgstr ""
4320
7490.31.3 by Jelmer Vernooij
Update po.
4321
#: breezy/builtins.py:6407
6093.2.1 by Jonathan Riddell
add .pot file to archive
4322
msgid ""
4323
"Views provide a mask over the tree so that users can focus on\n"
4324
"a subset of a tree when doing their work. After creating a view,\n"
4325
"commands that support a list of files - status, diff, commit, etc -\n"
4326
"effectively have that list of files implicitly given each time.\n"
4327
"An explicit list of files can still be given but those files\n"
4328
"must be within the current view."
4329
msgstr ""
4330
7490.31.3 by Jelmer Vernooij
Update po.
4331
#: breezy/builtins.py:6414
6093.2.1 by Jonathan Riddell
add .pot file to archive
4332
msgid ""
4333
"In most cases, a view has a short life-span: it is created to make\n"
4334
"a selected change and is deleted once that change is committed.\n"
4335
"At other times, you may wish to create one or more named views\n"
4336
"and switch between them."
4337
msgstr ""
4338
7490.31.3 by Jelmer Vernooij
Update po.
4339
#: breezy/builtins.py:6419
6093.2.1 by Jonathan Riddell
add .pot file to archive
4340
msgid ""
4341
"To disable the current view without deleting it, you can switch to\n"
4342
"the pseudo view called ``off``. This can be useful when you need\n"
4343
"to see the whole tree for an operation or two (e.g. merge) but\n"
4344
"want to switch back to your view after that."
4345
msgstr ""
4346
7490.31.3 by Jelmer Vernooij
Update po.
4347
#: breezy/builtins.py:6424
6093.2.1 by Jonathan Riddell
add .pot file to archive
4348
msgid ""
4349
":Examples:\n"
4350
"  To define the current view::"
4351
msgstr ""
4352
7490.31.3 by Jelmer Vernooij
Update po.
4353
#: breezy/builtins.py:6427
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4354
msgid "    brz view file1 dir1 ..."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4355
msgstr ""
4356
7490.31.3 by Jelmer Vernooij
Update po.
4357
#: breezy/builtins.py:6429
6093.2.1 by Jonathan Riddell
add .pot file to archive
4358
msgid "  To list the current view::"
4359
msgstr ""
4360
7490.31.3 by Jelmer Vernooij
Update po.
4361
#: breezy/builtins.py:6431
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4362
msgid "    brz view"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4363
msgstr ""
4364
7490.31.3 by Jelmer Vernooij
Update po.
4365
#: breezy/builtins.py:6433
6093.2.1 by Jonathan Riddell
add .pot file to archive
4366
msgid "  To delete the current view::"
4367
msgstr ""
4368
7490.31.3 by Jelmer Vernooij
Update po.
4369
#: breezy/builtins.py:6435
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4370
msgid "    brz view --delete"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4371
msgstr ""
4372
7490.31.3 by Jelmer Vernooij
Update po.
4373
#: breezy/builtins.py:6437
6093.2.1 by Jonathan Riddell
add .pot file to archive
4374
msgid "  To disable the current view without deleting it::"
4375
msgstr ""
4376
7490.31.3 by Jelmer Vernooij
Update po.
4377
#: breezy/builtins.py:6439
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4378
msgid "    brz view --switch off"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4379
msgstr ""
4380
7490.31.3 by Jelmer Vernooij
Update po.
4381
#: breezy/builtins.py:6441
6093.2.1 by Jonathan Riddell
add .pot file to archive
4382
msgid "  To define a named view and switch to it::"
4383
msgstr ""
4384
7490.31.3 by Jelmer Vernooij
Update po.
4385
#: breezy/builtins.py:6443
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4386
msgid "    brz view --name view-name file1 dir1 ..."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4387
msgstr ""
4388
7490.31.3 by Jelmer Vernooij
Update po.
4389
#: breezy/builtins.py:6445
6093.2.1 by Jonathan Riddell
add .pot file to archive
4390
msgid "  To list a named view::"
4391
msgstr ""
4392
7490.31.3 by Jelmer Vernooij
Update po.
4393
#: breezy/builtins.py:6447
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4394
msgid "    brz view --name view-name"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4395
msgstr ""
4396
7490.31.3 by Jelmer Vernooij
Update po.
4397
#: breezy/builtins.py:6449
6093.2.1 by Jonathan Riddell
add .pot file to archive
4398
msgid "  To delete a named view::"
4399
msgstr ""
4400
7490.31.3 by Jelmer Vernooij
Update po.
4401
#: breezy/builtins.py:6451
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4402
msgid "    brz view --name view-name --delete"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4403
msgstr ""
4404
7490.31.3 by Jelmer Vernooij
Update po.
4405
#: breezy/builtins.py:6453
6093.2.1 by Jonathan Riddell
add .pot file to archive
4406
msgid "  To switch to a named view::"
4407
msgstr ""
4408
7490.31.3 by Jelmer Vernooij
Update po.
4409
#: breezy/builtins.py:6455
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4410
msgid "    brz view --switch view-name"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4411
msgstr ""
4412
7490.31.3 by Jelmer Vernooij
Update po.
4413
#: breezy/builtins.py:6457
6093.2.1 by Jonathan Riddell
add .pot file to archive
4414
msgid "  To list all views defined::"
4415
msgstr ""
4416
7490.31.3 by Jelmer Vernooij
Update po.
4417
#: breezy/builtins.py:6459
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4418
msgid "    brz view --all"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4419
msgstr ""
4420
7490.31.3 by Jelmer Vernooij
Update po.
4421
#: breezy/builtins.py:6461
6093.2.1 by Jonathan Riddell
add .pot file to archive
4422
msgid "  To delete all views::"
4423
msgstr ""
4424
7490.31.3 by Jelmer Vernooij
Update po.
4425
#: breezy/builtins.py:6463
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4426
msgid "    brz view --delete --all"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4427
msgstr ""
4428
4429
# help of 'all' option of 'view' command
7490.31.3 by Jelmer Vernooij
Update po.
4430
#: breezy/builtins.py:6470
6093.2.1 by Jonathan Riddell
add .pot file to archive
4431
msgid "Apply list or delete action to all views."
4432
msgstr ""
4433
4434
# help of 'delete' option of 'view' command
7490.31.3 by Jelmer Vernooij
Update po.
4435
#: breezy/builtins.py:6473
6093.2.1 by Jonathan Riddell
add .pot file to archive
4436
msgid "Delete the view."
4437
msgstr ""
4438
4439
# help of 'name' option of 'view' command
7490.31.3 by Jelmer Vernooij
Update po.
4440
#: breezy/builtins.py:6476
6093.2.1 by Jonathan Riddell
add .pot file to archive
4441
msgid "Name of the view to define, list or delete."
4442
msgstr ""
4443
4444
# help of 'switch' option of 'view' command
7490.31.3 by Jelmer Vernooij
Update po.
4445
#: breezy/builtins.py:6480
6093.2.1 by Jonathan Riddell
add .pot file to archive
4446
msgid "Name of the view to switch to."
4447
msgstr ""
4448
7490.31.3 by Jelmer Vernooij
Update po.
4449
#: breezy/builtins.py:6499
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4450
msgid "Both --delete and a file list specified"
4451
msgstr ""
4452
7490.31.3 by Jelmer Vernooij
Update po.
4453
#: breezy/builtins.py:6502
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4454
msgid "Both --delete and --switch specified"
4455
msgstr ""
4456
7490.31.3 by Jelmer Vernooij
Update po.
4457
#: breezy/builtins.py:6505
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4458
msgid "Deleted all views.\n"
4459
msgstr ""
4460
7490.31.3 by Jelmer Vernooij
Update po.
4461
#: breezy/builtins.py:6508
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4462
msgid "No current view to delete"
4463
msgstr ""
4464
7490.31.3 by Jelmer Vernooij
Update po.
4465
#: breezy/builtins.py:6511
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4466
#, python-format
4467
msgid "Deleted '%s' view.\n"
4468
msgstr ""
4469
7490.31.3 by Jelmer Vernooij
Update po.
4470
#: breezy/builtins.py:6515
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4471
msgid "Both --switch and a file list specified"
4472
msgstr ""
4473
7490.31.3 by Jelmer Vernooij
Update po.
4474
#: breezy/builtins.py:6518
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4475
msgid "Both --switch and --all specified"
4476
msgstr ""
4477
7490.31.3 by Jelmer Vernooij
Update po.
4478
#: breezy/builtins.py:6522
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4479
msgid "No current view to disable"
4480
msgstr ""
4481
7490.31.3 by Jelmer Vernooij
Update po.
4482
#: breezy/builtins.py:6524
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4483
#, python-format
4484
msgid "Disabled '%s' view.\n"
4485
msgstr ""
4486
7490.31.3 by Jelmer Vernooij
Update po.
4487
#: breezy/builtins.py:6530 breezy/builtins.py:6553
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4488
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
4489
msgid "Using '{0}' view: {1}\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4490
msgstr ""
4491
7490.31.3 by Jelmer Vernooij
Update po.
4492
#: breezy/builtins.py:6533
6504.1.1 by Vincent Ladeuil
Update translation template
4493
msgid "Views defined:\n"
4494
msgstr ""
4495
7490.31.3 by Jelmer Vernooij
Update po.
4496
#: breezy/builtins.py:6542
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4497
msgid "No views defined.\n"
4498
msgstr ""
4499
7490.31.3 by Jelmer Vernooij
Update po.
4500
#: breezy/builtins.py:6549
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4501
msgid "Cannot change the 'off' pseudo view"
4502
msgstr ""
4503
7490.31.3 by Jelmer Vernooij
Update po.
4504
#: breezy/builtins.py:6558
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4505
msgid "No current view.\n"
4506
msgstr ""
4507
7490.31.3 by Jelmer Vernooij
Update po.
4508
#: breezy/builtins.py:6562
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4509
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
4510
msgid "'{0}' view is: {1}\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4511
msgstr ""
4512
7490.31.3 by Jelmer Vernooij
Update po.
4513
#: breezy/builtins.py:6582
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4514
msgid "    <no hooks installed>\n"
4515
msgstr ""
4516
7490.31.3 by Jelmer Vernooij
Update po.
4517
#: breezy/builtins.py:6586
6093.2.1 by Jonathan Riddell
add .pot file to archive
4518
msgid "Remove a branch."
4519
msgstr ""
4520
7490.31.3 by Jelmer Vernooij
Update po.
4521
#: breezy/builtins.py:6588
6093.2.1 by Jonathan Riddell
add .pot file to archive
4522
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
4523
"This will remove the branch from the specified location but\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4524
"will keep any working tree or repository in place."
4525
msgstr ""
4526
7490.31.3 by Jelmer Vernooij
Update po.
4527
#: breezy/builtins.py:6593
6093.2.1 by Jonathan Riddell
add .pot file to archive
4528
msgid "  Remove the branch at repo/trunk::"
4529
msgstr ""
4530
7490.31.3 by Jelmer Vernooij
Update po.
4531
#: breezy/builtins.py:6595
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4532
msgid "    brz remove-branch repo/trunk"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4533
msgstr ""
4534
6504.1.1 by Vincent Ladeuil
Update translation template
4535
# help of 'force' option of 'remove-branch' command
7490.31.3 by Jelmer Vernooij
Update po.
4536
#: breezy/builtins.py:6602
6504.1.1 by Vincent Ladeuil
Update translation template
4537
msgid "Remove branch even if it is the active branch."
4538
msgstr ""
4539
7490.31.3 by Jelmer Vernooij
Update po.
4540
#: breezy/builtins.py:6616
6504.1.1 by Vincent Ladeuil
Update translation template
4541
msgid "Branch is active. Use --force to remove it."
4542
msgstr ""
4543
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4544
# help of 'writer=plain' option of 'shelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4545
#: breezy/builtins.py:6620
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4546
msgid "Plaintext diff output."
4547
msgstr ""
4548
7490.31.3 by Jelmer Vernooij
Update po.
4549
#: breezy/builtins.py:6621
6093.2.1 by Jonathan Riddell
add .pot file to archive
4550
msgid "Temporarily set aside some changes from the current tree."
4551
msgstr ""
4552
7490.31.3 by Jelmer Vernooij
Update po.
4553
#: breezy/builtins.py:6623
6093.2.1 by Jonathan Riddell
add .pot file to archive
4554
msgid ""
4555
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4556
"ie. out of the way, until a later time when you can bring them back from\n"
4557
"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
4558
"your working tree, and so they aren't propagated along with your branch nor\n"
4559
"will they survive its deletion."
4560
msgstr ""
4561
7490.31.3 by Jelmer Vernooij
Update po.
4562
#: breezy/builtins.py:6629
6093.2.1 by Jonathan Riddell
add .pot file to archive
4563
msgid "If shelve --list is specified, previously-shelved changes are listed."
4564
msgstr ""
4565
7490.31.3 by Jelmer Vernooij
Update po.
4566
#: breezy/builtins.py:6631
6093.2.1 by Jonathan Riddell
add .pot file to archive
4567
msgid ""
4568
"Shelve is intended to help separate several sets of changes that have\n"
4569
"been inappropriately mingled.  If you just want to get rid of all changes\n"
4570
"and you don't need to restore them later, use revert.  If you want to\n"
4571
"shelve all text changes at once, use shelve --all."
4572
msgstr ""
4573
7490.31.3 by Jelmer Vernooij
Update po.
4574
#: breezy/builtins.py:6636
6093.2.1 by Jonathan Riddell
add .pot file to archive
4575
msgid ""
4576
"If filenames are specified, only the changes to those files will be\n"
4577
"shelved. Other files will be left untouched."
4578
msgstr ""
4579
7490.31.3 by Jelmer Vernooij
Update po.
4580
#: breezy/builtins.py:6639
6093.2.1 by Jonathan Riddell
add .pot file to archive
4581
msgid ""
4582
"If a revision is specified, changes since that revision will be shelved."
4583
msgstr ""
4584
7490.31.3 by Jelmer Vernooij
Update po.
4585
#: breezy/builtins.py:6641
6093.2.1 by Jonathan Riddell
add .pot file to archive
4586
msgid ""
4587
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4588
"restore the most recently shelved changes."
4589
msgstr ""
4590
7490.31.3 by Jelmer Vernooij
Update po.
4591
#: breezy/builtins.py:6644
6093.2.1 by Jonathan Riddell
add .pot file to archive
4592
msgid ""
4593
"For complicated changes, it is possible to edit the changes in a separate\n"
4594
"editor program to decide what the file remaining in the working copy\n"
4595
"should look like.  To do this, add the configuration option"
4596
msgstr ""
4597
7490.31.3 by Jelmer Vernooij
Update po.
4598
#: breezy/builtins.py:6648
4599
msgid "    change_editor = PROGRAM {new_path} {old_path}"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4600
msgstr ""
4601
7490.31.3 by Jelmer Vernooij
Update po.
4602
#: breezy/builtins.py:6650
6093.2.1 by Jonathan Riddell
add .pot file to archive
4603
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
4604
"where {new_path} is replaced with the path of the new version of the\n"
4605
"file and {old_path} is replaced with the path of the old version of\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
4606
"the file.  The PROGRAM should save the new file with the desired\n"
4607
"contents of the file in the working tree."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4608
msgstr ""
4609
4610
# help of 'all' option of 'shelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4611
#: breezy/builtins.py:6662
6093.2.1 by Jonathan Riddell
add .pot file to archive
4612
msgid "Shelve all changes."
4613
msgstr ""
4614
4615
# help of 'writer' option of 'shelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4616
#: breezy/builtins.py:6664
6093.2.1 by Jonathan Riddell
add .pot file to archive
4617
msgid "Method to use for writing diffs."
4618
msgstr ""
4619
4620
# title of 'writer' option of 'shelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4621
#: breezy/builtins.py:6664
6093.2.1 by Jonathan Riddell
add .pot file to archive
4622
msgid "writer"
4623
msgstr ""
4624
4625
# help of 'list' option of 'shelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4626
#: breezy/builtins.py:6668
6093.2.1 by Jonathan Riddell
add .pot file to archive
4627
msgid "List shelved changes."
4628
msgstr ""
4629
4630
# help of 'destroy' option of 'shelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4631
#: breezy/builtins.py:6670
6093.2.1 by Jonathan Riddell
add .pot file to archive
4632
msgid "Destroy removed changes instead of shelving them."
4633
msgstr ""
4634
7490.31.3 by Jelmer Vernooij
Update po.
4635
#: breezy/builtins.py:6699
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4636
msgid "No shelved changes."
4637
msgstr ""
4638
7490.31.3 by Jelmer Vernooij
Update po.
4639
#: breezy/builtins.py:6710
6093.2.1 by Jonathan Riddell
add .pot file to archive
4640
msgid "Restore shelved changes."
4641
msgstr ""
4642
7490.31.3 by Jelmer Vernooij
Update po.
4643
#: breezy/builtins.py:6712
6093.2.1 by Jonathan Riddell
add .pot file to archive
4644
msgid ""
4645
"By default, the most recently shelved changes are restored. However if you\n"
4646
"specify a shelf by id those changes will be restored instead.  This works\n"
4647
"best when the changes don't depend on each other."
4648
msgstr ""
4649
4650
# help of 'action' option of 'unshelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4651
#: breezy/builtins.py:6721
6093.2.1 by Jonathan Riddell
add .pot file to archive
4652
msgid "The action to perform."
4653
msgstr ""
4654
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4655
# title of 'action' option of 'resolve' command
4656
# title of 'action' option of 'unshelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4657
#: breezy/builtins.py:6721 breezy/conflicts.py:717
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4658
msgid "action"
4659
msgstr ""
4660
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4661
# help of 'action=apply' option of 'unshelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4662
#: breezy/builtins.py:6723
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4663
msgid "Apply changes and remove from the shelf."
4664
msgstr ""
4665
4666
# help of 'action=dry-run' option of 'unshelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4667
#: breezy/builtins.py:6724
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4668
msgid "Show changes, but do not apply or remove them."
4669
msgstr ""
4670
4671
# help of 'action=preview' option of 'unshelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4672
#: breezy/builtins.py:6725
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4673
msgid ""
4674
"Instead of unshelving the changes, show the diff that would result from "
4675
"unshelving."
4676
msgstr ""
4677
4678
# help of 'action=delete-only' option of 'unshelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4679
#: breezy/builtins.py:6727
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4680
msgid "Delete changes without applying them."
4681
msgstr ""
4682
4683
# help of 'action=keep' option of 'unshelve' command
7490.31.3 by Jelmer Vernooij
Update po.
4684
#: breezy/builtins.py:6728
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4685
msgid "Apply changes but don't delete them."
4686
msgstr ""
4687
7490.31.3 by Jelmer Vernooij
Update po.
4688
#: breezy/builtins.py:6743
6093.2.1 by Jonathan Riddell
add .pot file to archive
4689
msgid "Remove unwanted files from working tree."
4690
msgstr ""
4691
7490.31.3 by Jelmer Vernooij
Update po.
4692
#: breezy/builtins.py:6745
6093.2.1 by Jonathan Riddell
add .pot file to archive
4693
msgid ""
4694
"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
4695
"files are never deleted."
4696
msgstr ""
4697
7490.31.3 by Jelmer Vernooij
Update po.
4698
#: breezy/builtins.py:6748
6093.2.1 by Jonathan Riddell
add .pot file to archive
4699
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4700
"Another class is 'detritus', which includes files emitted by brz during\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4701
"normal operations and selftests.  (The value of these files decreases with\n"
4702
"time.)"
4703
msgstr ""
4704
7490.31.3 by Jelmer Vernooij
Update po.
4705
#: breezy/builtins.py:6752
6093.2.1 by Jonathan Riddell
add .pot file to archive
4706
msgid ""
4707
"If no options are specified, unknown files are deleted.  Otherwise, option\n"
4708
"flags are respected, and may be combined."
4709
msgstr ""
4710
7490.31.3 by Jelmer Vernooij
Update po.
4711
#: breezy/builtins.py:6755
6093.2.1 by Jonathan Riddell
add .pot file to archive
4712
msgid "To check what clean-tree will do, use --dry-run."
4713
msgstr ""
4714
4715
# help of 'ignored' option of 'clean-tree' command
7490.31.3 by Jelmer Vernooij
Update po.
4716
#: breezy/builtins.py:6758
6093.2.1 by Jonathan Riddell
add .pot file to archive
4717
msgid "Delete all ignored files."
4718
msgstr ""
4719
4720
# help of 'detritus' option of 'clean-tree' command
7490.31.3 by Jelmer Vernooij
Update po.
4721
#: breezy/builtins.py:6759
6093.2.1 by Jonathan Riddell
add .pot file to archive
4722
msgid ""
4723
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4724
msgstr ""
4725
4726
# help of 'unknown' option of 'clean-tree' command
7490.31.3 by Jelmer Vernooij
Update po.
4727
#: breezy/builtins.py:6762
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4728
msgid "Delete files unknown to brz (default)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4729
msgstr ""
4730
4731
# help of 'dry-run' option of 'clean-tree' command
7490.31.3 by Jelmer Vernooij
Update po.
4732
#: breezy/builtins.py:6763
6093.2.1 by Jonathan Riddell
add .pot file to archive
4733
msgid "Show files to delete instead of deleting them."
4734
msgstr ""
4735
4736
# help of 'force' option of 'clean-tree' command
7490.31.3 by Jelmer Vernooij
Update po.
4737
#: breezy/builtins.py:6765
6093.2.1 by Jonathan Riddell
add .pot file to archive
4738
msgid "Do not prompt before deleting."
4739
msgstr ""
4740
7490.31.3 by Jelmer Vernooij
Update po.
4741
#: breezy/builtins.py:6842
7185.1.1 by Jelmer Vernooij
Update pot file.
4742
msgid "Import sources from a directory, tarball or zip file"
4743
msgstr ""
4744
7490.31.3 by Jelmer Vernooij
Update po.
4745
#: breezy/builtins.py:6844
7185.1.1 by Jelmer Vernooij
Update pot file.
4746
msgid ""
4747
"This command will import a directory, tarball or zip file into a bzr\n"
4748
"tree, replacing any versioned files already present.  If a directory is\n"
4749
"specified, it is used as the target.  If the directory does not exist, or\n"
4750
"is not versioned, it is created."
4751
msgstr ""
4752
7490.31.3 by Jelmer Vernooij
Update po.
4753
#: breezy/builtins.py:6849
7185.1.1 by Jelmer Vernooij
Update pot file.
4754
msgid "Tarballs may be gzip or bzip2 compressed.  This is autodetected."
4755
msgstr ""
4756
7490.31.3 by Jelmer Vernooij
Update po.
4757
#: breezy/builtins.py:6851
7185.1.1 by Jelmer Vernooij
Update pot file.
4758
msgid ""
4759
"If the tarball or zip has a single root directory, that directory is\n"
4760
"stripped when extracting the tarball.  This is not done for directories."
4761
msgstr ""
4762
7490.31.3 by Jelmer Vernooij
Update po.
4763
#: breezy/builtins.py:6863
7185.1.1 by Jelmer Vernooij
Update pot file.
4764
msgid "Hardlink matching files to another tree."
4765
msgstr ""
4766
7490.31.3 by Jelmer Vernooij
Update po.
4767
#: breezy/builtins.py:6865
7185.1.1 by Jelmer Vernooij
Update pot file.
4768
msgid "Only files with identical content and execute bit will be linked."
4769
msgstr ""
4770
7490.31.3 by Jelmer Vernooij
Update po.
4771
#: breezy/builtins.py:6905
4772
msgid "Print lines matching PATTERN for specified files and revisions."
4773
msgstr ""
4774
4775
#: breezy/builtins.py:6907
4776
msgid ""
4777
"This command searches the specified files and revisions for a given\n"
4778
"pattern.  The pattern is specified as a Python regular expressions[1]."
4779
msgstr ""
4780
4781
#: breezy/builtins.py:6910
4782
msgid ""
4783
"If the file name is not specified, the revisions starting with the\n"
4784
"current directory are searched recursively. If the revision number is\n"
4785
"not specified, the working copy is searched. To search the last committed\n"
4786
"revision, use the '-r -1' or '-r last:1' option."
4787
msgstr ""
4788
4789
#: breezy/builtins.py:6915
4790
msgid ""
4791
"Unversioned files are not searched unless explicitly specified on the\n"
4792
"command line. Unversioned directores are not searched."
4793
msgstr ""
4794
4795
#: breezy/builtins.py:6918
4796
msgid ""
4797
"When searching a pattern, the output is shown in the 'filepath:string'\n"
4798
"format. If a revision is explicitly searched, the output is shown as\n"
4799
"'filepath~N:string', where N is the revision number."
4800
msgstr ""
4801
4802
#: breezy/builtins.py:6922
4803
msgid ""
4804
"--include and --exclude options can be used to search only (or exclude\n"
4805
"from search) files with base name matches the specified Unix style GLOB\n"
4806
"pattern.  The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
4807
"to quote wildcard or backslash character literally. Note that the glob\n"
4808
"pattern is not a regular expression."
4809
msgstr ""
4810
4811
#: breezy/builtins.py:6928
4812
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
4813
msgstr ""
4814
4815
# help of 'color' option of 'grep' command
4816
#: breezy/builtins.py:6937
4817
msgid "Show match in color. WHEN is never, always or auto."
4818
msgstr ""
4819
4820
# help of 'diff' option of 'grep' command
4821
#: breezy/builtins.py:6939
4822
msgid "Grep for pattern in changeset for each revision."
4823
msgstr ""
4824
4825
# help of 'exclude' option of 'grep' command
4826
#: breezy/builtins.py:6941
4827
msgid "Skip files whose base name matches GLOB."
4828
msgstr ""
4829
4830
# help of 'include' option of 'grep' command
4831
#: breezy/builtins.py:6943
4832
msgid "Search only files whose base name matches GLOB."
4833
msgstr ""
4834
4835
# help of 'files-with-matches' option of 'grep' command
4836
#: breezy/builtins.py:6945
4837
msgid "Print only the name of each input file in which PATTERN is found."
4838
msgstr ""
4839
4840
# help of 'files-without-match' option of 'grep' command
4841
#: breezy/builtins.py:6948
4842
msgid "Print only the name of each input file in which PATTERN is not found."
4843
msgstr ""
4844
4845
# help of 'fixed-string' option of 'grep' command
4846
#: breezy/builtins.py:6951
4847
msgid "Interpret PATTERN is a single fixed string (not regex)."
4848
msgstr ""
4849
4850
# help of 'from-root' option of 'grep' command
4851
#: breezy/builtins.py:6953
4852
msgid ""
4853
"Search for pattern starting from the root of the branch. (implies --"
4854
"recursive)"
4855
msgstr ""
4856
4857
# help of 'ignore-case' option of 'grep' command
4858
#: breezy/builtins.py:6956
4859
msgid "Ignore case distinctions while matching."
4860
msgstr ""
4861
4862
# help of 'levels' option of 'grep' command
4863
#: breezy/builtins.py:6958
4864
msgid ""
4865
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
4866
msgstr ""
4867
4868
# help of 'line-number' option of 'grep' command
4869
#: breezy/builtins.py:6963
4870
msgid "Show 1-based line number."
4871
msgstr ""
4872
4873
# help of 'no-recursive' option of 'grep' command
4874
#: breezy/builtins.py:6965
4875
msgid "Don't recurse into subdirectories. (default is --recursive)"
4876
msgstr ""
4877
4878
# help of 'null' option of 'grep' command
4879
#: breezy/builtins.py:6967
4880
msgid ""
4881
"Write an ASCII NUL (\\0) separator between output lines rather than a "
4882
"newline."
4883
msgstr ""
4884
4885
#: breezy/builtins.py:7083
4886
msgid "Apply a named patch to the current tree."
4887
msgstr ""
4888
4889
#: breezy/builtins.py:7085 breezy/plugins/propose/cmds.py:215
4890
msgid "    "
4891
msgstr ""
4892
4893
# help of 'strip' option of 'patch' command
4894
#: breezy/builtins.py:7089
4895
msgid ""
4896
"Strip the smallest prefix containing num leading slashes from filenames."
4897
msgstr ""
4898
4899
# help of 'silent' option of 'patch' command
4900
#: breezy/builtins.py:7091
4901
msgid "Suppress chatter."
4902
msgstr ""
4903
4904
#: breezy/bzr/bundle/apply_bundle.py:38
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4905
msgid "Install revisions"
4906
msgstr ""
4907
7490.31.3 by Jelmer Vernooij
Update po.
4908
#: breezy/bzr/bundle/commands.py:69
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4909
msgid "--verbose requires a merge directive"
4910
msgstr ""
4911
7490.31.3 by Jelmer Vernooij
Update po.
4912
#: breezy/bzr/bundle/commands.py:73
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4913
msgid "Bundle format not supported"
4914
msgstr ""
4915
7490.31.3 by Jelmer Vernooij
Update po.
4916
#: breezy/bzr/bundle/commands.py:83
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4917
msgid "Records\n"
4918
msgstr ""
4919
7490.31.3 by Jelmer Vernooij
Update po.
4920
#: breezy/bzr/bundle/commands.py:87
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4921
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4922
msgid "{0}: {1} ({2} multiparent)\n"
4923
msgstr ""
4924
7490.31.3 by Jelmer Vernooij
Update po.
4925
#: breezy/bzr/bundle/commands.py:89
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4926
#, python-format
4927
msgid "unique files: %d\n"
4928
msgstr ""
4929
7490.31.3 by Jelmer Vernooij
Update po.
4930
#: breezy/bzr/bundle/commands.py:98
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4931
msgid "Revisions\n"
4932
msgstr ""
4933
7490.31.3 by Jelmer Vernooij
Update po.
4934
#: breezy/bzr/bundle/commands.py:99
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4935
#, python-format
4936
msgid "nicks: %s\n"
4937
msgstr ""
4938
7490.31.3 by Jelmer Vernooij
Update po.
4939
#: breezy/bzr/bundle/commands.py:101
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4940
#, python-format
4941
msgid ""
4942
"committers: \n"
4943
"%s\n"
4944
msgstr ""
4945
7490.31.3 by Jelmer Vernooij
Update po.
4946
#: breezy/bzr/bundle/commands.py:110
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4947
msgid "Decoded contents\n"
4948
msgstr ""
4949
7490.31.3 by Jelmer Vernooij
Update po.
4950
#: breezy/bzr/bundle/serializer/v4.py:315
6138.4.4 by Jonathan Riddell
update bzr.pot
4951
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
4952
msgid "Bundling %d revision."
4953
msgid_plural "Bundling %d revisions."
4954
msgstr[0] ""
4955
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
4956
7490.31.3 by Jelmer Vernooij
Update po.
4957
#: breezy/bzr/bzrdir.py:508
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4958
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4959
msgid ""
6150.1.1 by Jonathan Riddell
update bzr.pot
4960
"making backup of {0}\n"
4961
"  to {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
4962
msgstr ""
4963
7490.31.3 by Jelmer Vernooij
Update po.
4964
#: breezy/bzr/bzrdir.py:529
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4965
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4966
msgid "renamed {0} to {1}"
4967
msgstr ""
4968
7490.31.3 by Jelmer Vernooij
Update po.
4969
#: breezy/bzr/bzrdir.py:1615
6138.4.4 by Jonathan Riddell
update bzr.pot
4970
#, python-format
4971
msgid ""
4972
"Source repository format does not support stacking, using format:\n"
4973
"  %s"
4974
msgstr ""
4975
7490.31.3 by Jelmer Vernooij
Update po.
4976
#: breezy/bzr/bzrdir.py:1635
6138.4.4 by Jonathan Riddell
update bzr.pot
4977
#, python-format
4978
msgid ""
4979
"Source branch format does not support stacking, using format:\n"
4980
"  %s"
4981
msgstr ""
4982
7490.31.3 by Jelmer Vernooij
Update po.
4983
#: breezy/bzr/bzrdir.py:1772
6138.4.4 by Jonathan Riddell
update bzr.pot
4984
msgid "starting repository conversion"
4985
msgstr ""
4986
7490.31.3 by Jelmer Vernooij
Update po.
4987
#: breezy/bzr/bzrdir.py:1898
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4988
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4989
msgid "Using default stacking branch {0} at {1}"
4990
msgstr ""
4991
7185.1.1 by Jelmer Vernooij
Update pot file.
4992
#: breezy/bzr/check.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
4993
msgid "check"
4994
msgstr ""
4995
7185.1.1 by Jelmer Vernooij
Update pot file.
4996
#: breezy/bzr/check.py:101
6138.4.4 by Jonathan Riddell
update bzr.pot
4997
msgid "checking revisions"
4998
msgstr ""
4999
7185.1.1 by Jelmer Vernooij
Update pot file.
5000
#: breezy/bzr/check.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
5001
msgid "checking commit contents"
5002
msgstr ""
5003
7185.1.1 by Jelmer Vernooij
Update pot file.
5004
#: breezy/bzr/check.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
5005
msgid "checking file graphs"
5006
msgstr ""
5007
7185.1.1 by Jelmer Vernooij
Update pot file.
5008
#: breezy/bzr/check.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
5009
msgid "checking branches and trees"
5010
msgstr ""
5011
7185.1.1 by Jelmer Vernooij
Update pot file.
5012
#: breezy/bzr/check.py:194
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5013
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5014
msgid "checked repository {0} format {1}"
5015
msgstr ""
5016
7185.1.1 by Jelmer Vernooij
Update pot file.
5017
#: breezy/bzr/check.py:197
6138.4.4 by Jonathan Riddell
update bzr.pot
5018
#, python-format
5019
msgid "%6d revisions"
5020
msgstr ""
5021
7185.1.1 by Jelmer Vernooij
Update pot file.
5022
#: breezy/bzr/check.py:198
6138.4.4 by Jonathan Riddell
update bzr.pot
5023
#, python-format
5024
msgid "%6d file-ids"
5025
msgstr ""
5026
7185.1.1 by Jelmer Vernooij
Update pot file.
5027
#: breezy/bzr/check.py:200
6138.4.4 by Jonathan Riddell
update bzr.pot
5028
#, python-format
5029
msgid "%6d unreferenced text versions"
5030
msgstr ""
5031
7185.1.1 by Jelmer Vernooij
Update pot file.
5032
#: breezy/bzr/check.py:204
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5033
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5034
msgid "unreferenced version: {{{0}}} in {1}"
5035
msgstr ""
5036
7185.1.1 by Jelmer Vernooij
Update pot file.
5037
#: breezy/bzr/check.py:207
6138.4.4 by Jonathan Riddell
update bzr.pot
5038
#, python-format
5039
msgid "%6d revisions are missing inventory_sha1"
5040
msgstr ""
5041
7185.1.1 by Jelmer Vernooij
Update pot file.
5042
#: breezy/bzr/check.py:210
6138.4.4 by Jonathan Riddell
update bzr.pot
5043
#, python-format
5044
msgid "%6d revisions are mentioned but not present"
5045
msgstr ""
5046
7185.1.1 by Jelmer Vernooij
Update pot file.
5047
#: breezy/bzr/check.py:213
6138.4.4 by Jonathan Riddell
update bzr.pot
5048
#, python-format
5049
msgid "%6d ghost revisions"
5050
msgstr ""
5051
7185.1.1 by Jelmer Vernooij
Update pot file.
5052
#: breezy/bzr/check.py:218
6138.4.4 by Jonathan Riddell
update bzr.pot
5053
#, python-format
5054
msgid "%6d revisions missing parents in ancestry"
5055
msgstr ""
5056
7185.1.1 by Jelmer Vernooij
Update pot file.
5057
#: breezy/bzr/check.py:222
6138.4.4 by Jonathan Riddell
update bzr.pot
5058
#, python-format
5059
msgid "      %s should be in the ancestry for:"
5060
msgstr ""
5061
7185.1.1 by Jelmer Vernooij
Update pot file.
5062
#: breezy/bzr/check.py:227
6138.4.4 by Jonathan Riddell
update bzr.pot
5063
#, python-format
5064
msgid "%6d inconsistent parents"
5065
msgstr ""
5066
7185.1.1 by Jelmer Vernooij
Update pot file.
5067
#: breezy/bzr/check.py:232
5068
#, python-brace-format
5069
msgid "      * {0} version {1} has parents ({2}) but should have ({3})"
6138.4.4 by Jonathan Riddell
update bzr.pot
5070
msgstr ""
5071
7185.1.1 by Jelmer Vernooij
Update pot file.
5072
#: breezy/bzr/check.py:239
6138.4.4 by Jonathan Riddell
update bzr.pot
5073
#, python-format
5074
msgid "%6d revisions have incorrect parents in the revision index"
5075
msgstr ""
5076
7185.1.1 by Jelmer Vernooij
Update pot file.
5077
#: breezy/bzr/check.py:245
5078
#, python-brace-format
5079
msgid "       {0} has wrong parents in index: ({1}) should be ({2})"
6138.4.4 by Jonathan Riddell
update bzr.pot
5080
msgstr ""
5081
7185.1.1 by Jelmer Vernooij
Update pot file.
5082
#: breezy/bzr/check.py:261
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5083
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5084
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
5085
msgstr ""
5086
7185.1.1 by Jelmer Vernooij
Update pot file.
5087
#: breezy/bzr/check.py:290
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5088
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5089
msgid ""
5090
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5091
"{{{4}}}"
5092
msgstr ""
5093
7490.31.3 by Jelmer Vernooij
Update po.
5094
#: breezy/bzr/fetch.py:99
7185.1.1 by Jelmer Vernooij
Update pot file.
5095
msgid "Finding revisions"
5096
msgstr ""
5097
7490.31.3 by Jelmer Vernooij
Update po.
5098
#: breezy/bzr/fetch.py:104
7185.1.1 by Jelmer Vernooij
Update pot file.
5099
msgid "Fetching revisions"
5100
msgstr ""
5101
7490.31.3 by Jelmer Vernooij
Update po.
5102
#: breezy/bzr/groupcompress.py:1799
7185.1.1 by Jelmer Vernooij
Update pot file.
5103
#, python-format
5104
msgid "Insert claimed random_id=True, but then inserted %r two times"
5105
msgstr ""
5106
7490.31.3 by Jelmer Vernooij
Update po.
5107
#: breezy/bzr/knit.py:1879 breezy/bzr/knit.py:1917
7185.1.1 by Jelmer Vernooij
Update pot file.
5108
msgid "Walking content"
5109
msgstr ""
5110
7490.31.3 by Jelmer Vernooij
Update po.
5111
#: breezy/bzr/knit.py:3465
7185.1.1 by Jelmer Vernooij
Update pot file.
5112
msgid "annotating"
5113
msgstr ""
5114
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
5115
#: breezy/bzr/reconcile.py:97
5116
msgid "Reading inventory data"
5117
msgstr ""
5118
5119
#: breezy/bzr/reconcile.py:117 breezy/bzr/reconcile.py:248
5120
msgid "Inventory ok."
5121
msgstr ""
5122
5123
#: breezy/bzr/reconcile.py:119 breezy/bzr/reconcile.py:250
5124
msgid "Backing up inventory"
5125
msgstr ""
5126
5127
#: breezy/bzr/reconcile.py:121
5128
msgid "Backup inventory created."
5129
msgstr ""
5130
5131
#: breezy/bzr/reconcile.py:137 breezy/bzr/reconcile.py:269
5132
msgid "Writing weave"
5133
msgstr ""
5134
5135
#: breezy/bzr/reconcile.py:140 breezy/bzr/reconcile.py:272
5136
msgid "Inventory regenerated."
5137
msgstr ""
5138
5139
#: breezy/bzr/reconcile.py:235 breezy/bzr/reconcile.py:237
5140
#: breezy/bzr/reconcile.py:240
5141
msgid "Reading indexes"
5142
msgstr ""
5143
5144
#: breezy/bzr/reconcile.py:244 breezy/bzr/reconcile.py:246
5145
msgid "Checking unused inventories"
5146
msgstr ""
5147
5148
#: breezy/bzr/reconcile.py:252
5149
msgid "Backup Inventory created"
5150
msgstr ""
5151
5152
#: breezy/bzr/reconcile.py:310
5153
msgid "Fixing text parents"
5154
msgstr ""
5155
5156
#: breezy/bzr/reconcile.py:463
5157
#, python-brace-format
5158
msgid "Fixing last revision info {0}  => {1}"
5159
msgstr ""
5160
5161
#: breezy/bzr/reconcile.py:470
5162
msgid "revision_history ok."
5163
msgstr ""
5164
7490.31.3 by Jelmer Vernooij
Update po.
5165
#: breezy/bzr/remote.py:1322
7185.1.1 by Jelmer Vernooij
Update pot file.
5166
#, python-format
5167
msgid "bzr: ERROR (ignored): %s"
5168
msgstr ""
5169
7490.31.3 by Jelmer Vernooij
Update po.
5170
#: breezy/bzr/remote.py:2644
7185.1.1 by Jelmer Vernooij
Update pot file.
5171
msgid "Copying repository content as tarball..."
5172
msgstr ""
5173
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
5174
#: breezy/bzr/smart/medium.py:739
7185.1.1 by Jelmer Vernooij
Update pot file.
5175
#, python-brace-format
5176
msgid "HPSS calls: {0} ({1} vfs) {2}"
5177
msgstr ""
5178
7490.31.3 by Jelmer Vernooij
Update po.
5179
#: breezy/bzr/smart/ping.py:34
7185.1.1 by Jelmer Vernooij
Update pot file.
5180
msgid "Pings a Bazaar smart server."
5181
msgstr ""
5182
7490.31.3 by Jelmer Vernooij
Update po.
5183
#: breezy/bzr/smart/ping.py:36
7185.1.1 by Jelmer Vernooij
Update pot file.
5184
msgid ""
5185
"This command sends a 'hello' request to the given location using the brz\n"
5186
"smart protocol, and reports the response."
5187
msgstr ""
5188
5189
#: breezy/bzr/smart/server.py:169
5190
msgid "Requested to stop gracefully"
5191
msgstr ""
5192
5193
#: breezy/bzr/smart/server.py:179
5194
#, python-format
5195
msgid "Waiting for %d client(s) to finish"
5196
msgstr ""
5197
5198
#: breezy/bzr/smart/server.py:185
5199
#, python-format
5200
msgid "Still waiting for %d client(s) to finish"
5201
msgstr ""
5202
5203
#: breezy/bzr/smart/server.py:219
5204
#, python-format
5205
msgid "listening socket error: %s"
5206
msgstr ""
5207
5208
#: breezy/bzr/smart/server.py:459
5209
#, python-format
5210
msgid "listening on port: %s"
5211
msgstr ""
5212
7490.31.3 by Jelmer Vernooij
Update po.
5213
#: breezy/bzr/vf_repository.py:801
7185.1.1 by Jelmer Vernooij
Update pot file.
5214
msgid "inventories"
5215
msgstr ""
5216
7490.31.3 by Jelmer Vernooij
Update po.
5217
#: breezy/bzr/vf_repository.py:827
7185.1.1 by Jelmer Vernooij
Update pot file.
5218
msgid "texts"
5219
msgstr ""
5220
7490.31.3 by Jelmer Vernooij
Update po.
5221
#: breezy/bzr/vf_repository.py:1334 breezy/bzr/vf_repository.py:1344
7185.1.1 by Jelmer Vernooij
Update pot file.
5222
msgid "Calculating text parents"
5223
msgstr ""
5224
7490.31.3 by Jelmer Vernooij
Update po.
5225
#: breezy/bzr/vf_repository.py:1422
7185.1.1 by Jelmer Vernooij
Update pot file.
5226
msgid "Fetch texts"
5227
msgstr ""
5228
7490.31.3 by Jelmer Vernooij
Update po.
5229
#: breezy/bzr/vf_repository.py:2301
7185.1.1 by Jelmer Vernooij
Update pot file.
5230
msgid "loading text store"
5231
msgstr ""
5232
7490.31.3 by Jelmer Vernooij
Update po.
5233
#: breezy/bzr/vf_repository.py:2308
7185.1.1 by Jelmer Vernooij
Update pot file.
5234
msgid "checking text graph"
5235
msgstr ""
5236
7490.31.3 by Jelmer Vernooij
Update po.
5237
#: breezy/bzr/vf_repository.py:2753 breezy/bzr/vf_repository.py:2767
5238
#: breezy/bzr/vf_repository.py:2880
7185.1.1 by Jelmer Vernooij
Update pot file.
5239
msgid "Transferring revisions"
5240
msgstr ""
5241
7490.31.3 by Jelmer Vernooij
Update po.
5242
#: breezy/check.py:65
6138.4.4 by Jonathan Riddell
update bzr.pot
5243
#, python-format
5244
msgid "Checking branch at '%s'."
5245
msgstr ""
5246
7185.1.1 by Jelmer Vernooij
Update pot file.
5247
#: breezy/check.py:84
6138.4.4 by Jonathan Riddell
update bzr.pot
5248
#, python-format
5249
msgid "Checking working tree at '%s'."
5250
msgstr ""
5251
7490.31.3 by Jelmer Vernooij
Update po.
5252
#: breezy/check.py:134 breezy/check.py:148
6138.4.4 by Jonathan Riddell
update bzr.pot
5253
msgid "No branch found at specified location."
5254
msgstr ""
5255
7490.31.3 by Jelmer Vernooij
Update po.
5256
#: breezy/check.py:136 breezy/check.py:146
6138.4.4 by Jonathan Riddell
update bzr.pot
5257
msgid "No working tree found at specified location."
5258
msgstr ""
5259
7490.31.3 by Jelmer Vernooij
Update po.
5260
#: breezy/check.py:139
6138.4.4 by Jonathan Riddell
update bzr.pot
5261
#, python-format
5262
msgid "Checking repository at '%s'."
5263
msgstr ""
5264
7490.31.3 by Jelmer Vernooij
Update po.
5265
#: breezy/check.py:150
6138.4.4 by Jonathan Riddell
update bzr.pot
5266
msgid "No repository found at specified location."
5267
msgstr ""
5268
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5269
#: breezy/clean_tree.py:63
6138.4.4 by Jonathan Riddell
update bzr.pot
5270
msgid "Nothing to delete."
5271
msgstr ""
5272
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5273
#: breezy/clean_tree.py:68
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5274
msgid "Are you sure you wish to delete these"
5275
msgstr ""
5276
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5277
#: breezy/clean_tree.py:70
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5278
msgid "Canceled"
5279
msgstr ""
5280
7185.1.1 by Jelmer Vernooij
Update pot file.
5281
#: breezy/clean_tree.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
5282
#, python-format
5283
msgid "unable to remove %s"
5284
msgstr ""
5285
7185.1.1 by Jelmer Vernooij
Update pot file.
5286
#: breezy/clean_tree.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
5287
msgid "deleting paths:"
5288
msgstr ""
5289
7185.1.1 by Jelmer Vernooij
Update pot file.
5290
#: breezy/clean_tree.py:123
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5291
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
5292
msgid "unable to remove \"{0}\": {1}."
6138.4.4 by Jonathan Riddell
update bzr.pot
5293
msgstr ""
5294
7185.1.1 by Jelmer Vernooij
Update pot file.
5295
#: breezy/clean_tree.py:128
6138.4.4 by Jonathan Riddell
update bzr.pot
5296
msgid "No files deleted."
5297
msgstr ""
5298
7490.31.3 by Jelmer Vernooij
Update po.
5299
#: breezy/cmd_version_info.py:51
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5300
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5301
msgid "No known version info format {0}. Supported types are: {1}"
5302
msgstr ""
5303
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5304
# help of 'format=custom' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5305
#: breezy/cmd_version_info.py:55
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5306
msgid "Version info in Custom template-based format."
5307
msgstr ""
5308
5309
# help of 'format=python' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5310
#: breezy/cmd_version_info.py:55
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5311
msgid "Version info in Python format."
5312
msgstr ""
5313
5314
# help of 'format=rio' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5315
#: breezy/cmd_version_info.py:55
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5316
msgid "Version info in RIO (simple text) format (default)."
5317
msgstr ""
5318
7490.31.3 by Jelmer Vernooij
Update po.
5319
#: breezy/cmd_version_info.py:56
6093.2.1 by Jonathan Riddell
add .pot file to archive
5320
msgid "Show version information about this tree."
5321
msgstr ""
5322
7490.31.3 by Jelmer Vernooij
Update po.
5323
#: breezy/cmd_version_info.py:58
6093.2.1 by Jonathan Riddell
add .pot file to archive
5324
msgid ""
5325
"You can use this command to add information about version into\n"
5326
"source code of an application. The output can be in one of the\n"
5327
"supported formats or in a custom format based on a template."
5328
msgstr ""
5329
7490.31.3 by Jelmer Vernooij
Update po.
5330
#: breezy/cmd_version_info.py:62 en/help_topics/configuration.txt:699
7185.1.1 by Jelmer Vernooij
Update pot file.
5331
#: en/help_topics/configuration.txt:725
6093.2.1 by Jonathan Riddell
add .pot file to archive
5332
msgid "For example::"
5333
msgstr ""
5334
7490.31.3 by Jelmer Vernooij
Update po.
5335
#: breezy/cmd_version_info.py:64
6093.2.1 by Jonathan Riddell
add .pot file to archive
5336
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5337
"  brz version-info --custom \\\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5338
"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5339
msgstr ""
5340
7490.31.3 by Jelmer Vernooij
Update po.
5341
#: breezy/cmd_version_info.py:67
6093.2.1 by Jonathan Riddell
add .pot file to archive
5342
msgid ""
5343
"will produce a C header file with formatted string containing the\n"
5344
"current revision number. Other supported variables in templates are:"
5345
msgstr ""
5346
7490.31.3 by Jelmer Vernooij
Update po.
5347
#: breezy/cmd_version_info.py:70
6093.2.1 by Jonathan Riddell
add .pot file to archive
5348
msgid ""
5349
"  * {date} - date of the last revision\n"
5350
"  * {build_date} - current date\n"
5351
"  * {revno} - revision number\n"
5352
"  * {revision_id} - revision id\n"
5353
"  * {branch_nick} - branch nickname\n"
5354
"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
5355
"              otherwise 1"
5356
msgstr ""
5357
5358
# help of 'format' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5359
#: breezy/cmd_version_info.py:80
6093.2.1 by Jonathan Riddell
add .pot file to archive
5360
msgid "Select the output format."
5361
msgstr ""
5362
5363
# help of 'all' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5364
#: breezy/cmd_version_info.py:84
6093.2.1 by Jonathan Riddell
add .pot file to archive
5365
msgid "Include all possible information."
5366
msgstr ""
5367
5368
# help of 'check-clean' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5369
#: breezy/cmd_version_info.py:85
6093.2.1 by Jonathan Riddell
add .pot file to archive
5370
msgid "Check if tree is clean."
5371
msgstr ""
5372
5373
# help of 'include-history' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5374
#: breezy/cmd_version_info.py:87
6093.2.1 by Jonathan Riddell
add .pot file to archive
5375
msgid "Include the revision-history."
5376
msgstr ""
5377
5378
# help of 'include-file-revisions' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5379
#: breezy/cmd_version_info.py:89
6093.2.1 by Jonathan Riddell
add .pot file to archive
5380
msgid "Include the last revision for each file."
5381
msgstr ""
5382
5383
# help of 'template' option of 'version-info' command
7490.31.3 by Jelmer Vernooij
Update po.
5384
#: breezy/cmd_version_info.py:91
6093.2.1 by Jonathan Riddell
add .pot file to archive
5385
msgid "Template for the output."
5386
msgstr ""
5387
7490.31.3 by Jelmer Vernooij
Update po.
5388
#: breezy/cmd_version_info.py:105
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5389
msgid "brz version-info --revision takes exactly one revision specifier"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5390
msgstr ""
5391
7185.1.1 by Jelmer Vernooij
Update pot file.
5392
#: breezy/commands.py:307
5393
#, python-format
5394
msgid "unknown command \"%s\". Perhaps you meant \"%s\""
5395
msgstr ""
5396
5397
#: breezy/commands.py:309
6138.4.4 by Jonathan Riddell
update bzr.pot
5398
#, python-format
5399
msgid "unknown command \"%s\""
5400
msgstr ""
5401
7490.31.3 by Jelmer Vernooij
Update po.
5402
#: breezy/commands.py:563
6093.2.1 by Jonathan Riddell
add .pot file to archive
5403
msgid "No help for this command."
5404
msgstr ""
5405
7490.31.3 by Jelmer Vernooij
Update po.
5406
#: breezy/commands.py:576
6093.2.1 by Jonathan Riddell
add .pot file to archive
5407
#, python-format
5408
msgid ":Purpose: %s\n"
5409
msgstr ""
5410
7490.31.3 by Jelmer Vernooij
Update po.
5411
#: breezy/commands.py:578
6093.2.1 by Jonathan Riddell
add .pot file to archive
5412
#, python-format
5413
msgid ""
5414
":Usage:\n"
5415
"%s\n"
5416
msgstr ""
5417
7490.31.3 by Jelmer Vernooij
Update po.
5418
#: breezy/commands.py:580
6093.2.1 by Jonathan Riddell
add .pot file to archive
5419
#, python-format
5420
msgid ":Usage:   %s\n"
5421
msgstr ""
5422
7490.31.3 by Jelmer Vernooij
Update po.
5423
#: breezy/commands.py:600
6093.2.1 by Jonathan Riddell
add .pot file to archive
5424
#, python-format
5425
msgid ":Options:%s"
5426
msgstr ""
5427
7490.31.3 by Jelmer Vernooij
Update po.
5428
#: breezy/commands.py:611
6093.2.1 by Jonathan Riddell
add .pot file to archive
5429
#, python-format
5430
msgid ""
5431
":Description:\n"
5432
"  %s\n"
5433
"\n"
5434
msgstr ""
5435
7490.31.3 by Jelmer Vernooij
Update po.
5436
#: breezy/commands.py:621
6093.2.1 by Jonathan Riddell
add .pot file to archive
5437
#, python-format
5438
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5439
"See brz help %s for more details and examples.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5440
"\n"
5441
msgstr ""
5442
7490.31.3 by Jelmer Vernooij
Update po.
5443
#: breezy/commands.py:626
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5444
msgid ":Aliases:  "
5445
msgstr ""
5446
7490.31.3 by Jelmer Vernooij
Update po.
5447
#: breezy/commands.py:630
6093.2.1 by Jonathan Riddell
add .pot file to archive
5448
#, python-format
5449
msgid ":From:     plugin \"%s\"\n"
5450
msgstr ""
5451
7490.31.3 by Jelmer Vernooij
Update po.
5452
#: breezy/commands.py:642
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5453
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5454
msgid ":doc:`{0} <{1}-help>`"
5455
msgstr ""
5456
7490.31.3 by Jelmer Vernooij
Update po.
5457
#: breezy/commands.py:646
6093.2.1 by Jonathan Riddell
add .pot file to archive
5458
#, python-format
5459
msgid ":See also: %s"
5460
msgstr ""
5461
7490.31.3 by Jelmer Vernooij
Update po.
5462
#: breezy/commands.py:919
6138.4.4 by Jonathan Riddell
update bzr.pot
5463
msgid "Only ASCII permitted in option names"
5464
msgstr ""
5465
7490.31.3 by Jelmer Vernooij
Update po.
5466
#: breezy/commands.py:944 breezy/commands.py:952
6138.4.4 by Jonathan Riddell
update bzr.pot
5467
msgid "command {0!r} needs one or more {1}"
5468
msgstr ""
5469
7490.31.3 by Jelmer Vernooij
Update po.
5470
#: breezy/commands.py:961
6138.4.4 by Jonathan Riddell
update bzr.pot
5471
msgid "command {0!r} requires argument {1}"
5472
msgstr ""
5473
7490.31.3 by Jelmer Vernooij
Update po.
5474
#: breezy/commands.py:968
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5475
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5476
msgid "extra argument to command {0}: {1}"
5477
msgstr ""
5478
7490.31.3 by Jelmer Vernooij
Update po.
5479
#: breezy/commands.py:1044
6138.4.4 by Jonathan Riddell
update bzr.pot
5480
#, python-format
5481
msgid "Profile data written to \"%s\"."
5482
msgstr ""
5483
7490.31.3 by Jelmer Vernooij
Update po.
5484
#: breezy/commit.py:151 breezy/commit.py:715
6138.4.4 by Jonathan Riddell
update bzr.pot
5485
msgid "added"
5486
msgstr ""
5487
7490.31.3 by Jelmer Vernooij
Update po.
5488
#: breezy/commit.py:151 breezy/commit.py:725
6138.4.4 by Jonathan Riddell
update bzr.pot
5489
msgid "modified"
5490
msgstr ""
5491
7490.31.3 by Jelmer Vernooij
Update po.
5492
#: breezy/commit.py:157
6138.4.4 by Jonathan Riddell
update bzr.pot
5493
#, python-format
7185.1.1 by Jelmer Vernooij
Update pot file.
5494
msgid "Committing to: %s"
6138.4.4 by Jonathan Riddell
update bzr.pot
5495
msgstr ""
5496
7185.1.1 by Jelmer Vernooij
Update pot file.
5497
#: breezy/commit.py:162
6138.4.4 by Jonathan Riddell
update bzr.pot
5498
#, python-format
5499
msgid "Committed revision %d."
5500
msgstr ""
5501
7490.31.3 by Jelmer Vernooij
Update po.
5502
#: breezy/commit.py:170
5503
#, python-format
5504
msgid "Committed revid %s."
5505
msgstr ""
5506
5507
#: breezy/commit.py:173
6138.4.4 by Jonathan Riddell
update bzr.pot
5508
#, python-format
5509
msgid "deleted %s"
5510
msgstr ""
5511
7490.31.3 by Jelmer Vernooij
Update po.
5512
#: breezy/commit.py:176
6138.4.4 by Jonathan Riddell
update bzr.pot
5513
#, python-format
5514
msgid "missing %s"
5515
msgstr ""
5516
7490.31.3 by Jelmer Vernooij
Update po.
5517
#: breezy/commit.py:495
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5518
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5519
msgid ""
5520
"Conflicting tags in bound branch:\n"
5521
"{0}"
5522
msgstr ""
5523
7490.31.3 by Jelmer Vernooij
Update po.
5524
#: breezy/commit.py:717
6138.4.4 by Jonathan Riddell
update bzr.pot
5525
msgid "renamed"
5526
msgstr ""
5527
7490.31.3 by Jelmer Vernooij
Update po.
5528
#: breezy/commit.py:782
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5529
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5530
msgid "{0} [{1}] - Stage"
5531
msgstr ""
5532
7490.31.3 by Jelmer Vernooij
Update po.
5533
#: breezy/commit.py:785
6138.4.4 by Jonathan Riddell
update bzr.pot
5534
#, python-format
5535
msgid "%s - Stage"
5536
msgstr ""
5537
7490.31.3 by Jelmer Vernooij
Update po.
5538
#: breezy/commit_signature_commands.py:35
6504.1.1 by Vincent Ladeuil
Update translation template
5539
msgid "Sign all commits by a given committer."
5540
msgstr ""
5541
7490.31.3 by Jelmer Vernooij
Update po.
5542
#: breezy/commit_signature_commands.py:37
6093.2.1 by Jonathan Riddell
add .pot file to archive
5543
msgid ""
5544
"If location is not specified the local tree is used.\n"
5545
"If committer is not specified the default committer is used."
5546
msgstr ""
5547
7490.31.3 by Jelmer Vernooij
Update po.
5548
#: breezy/commit_signature_commands.py:40
6093.2.1 by Jonathan Riddell
add .pot file to archive
5549
msgid "This does not sign commits that already have signatures."
5550
msgstr ""
5551
5552
# help of 'dry-run' option of 'sign-my-commits' command
7490.31.3 by Jelmer Vernooij
Update po.
5553
#: breezy/commit_signature_commands.py:48
6093.2.1 by Jonathan Riddell
add .pot file to archive
5554
msgid ""
5555
"Don't actually sign anything, just print the revisions that would be signed."
5556
msgstr ""
5557
7490.31.3 by Jelmer Vernooij
Update po.
5558
#: breezy/commit_signature_commands.py:90
6504.1.1 by Vincent Ladeuil
Update translation template
5559
#, python-format
5560
msgid "Signed %d revision.\n"
5561
msgid_plural "Signed %d revisions.\n"
5562
msgstr[0] ""
5563
msgstr[1] ""
5564
7490.31.3 by Jelmer Vernooij
Update po.
5565
#: breezy/commit_signature_commands.py:95
6093.2.1 by Jonathan Riddell
add .pot file to archive
5566
msgid "Verify all commit signatures."
5567
msgstr ""
5568
7490.31.3 by Jelmer Vernooij
Update po.
5569
#: breezy/commit_signature_commands.py:97
6093.2.1 by Jonathan Riddell
add .pot file to archive
5570
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
5571
msgstr ""
5572
5573
# help of 'acceptable-keys' option of 'verify-signatures' command
7490.31.3 by Jelmer Vernooij
Update po.
5574
#: breezy/commit_signature_commands.py:102
6093.2.1 by Jonathan Riddell
add .pot file to archive
5575
msgid ""
5576
"Comma separated list of GPG key patterns which are acceptable for "
5577
"verification."
5578
msgstr ""
5579
7490.31.3 by Jelmer Vernooij
Update po.
5580
#: breezy/commit_signature_commands.py:141
6138.4.4 by Jonathan Riddell
update bzr.pot
5581
msgid "Cannot verify a range of non-revision-history revisions"
5582
msgstr ""
5583
7490.31.3 by Jelmer Vernooij
Update po.
5584
#: breezy/commit_signature_commands.py:160
6093.2.1 by Jonathan Riddell
add .pot file to archive
5585
msgid "All commits signed with verifiable keys"
5586
msgstr ""
5587
7490.31.3 by Jelmer Vernooij
Update po.
5588
#: breezy/config.py:2256
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5589
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5590
msgid "{0} is not an SI unit."
5591
msgstr ""
5592
7490.31.3 by Jelmer Vernooij
Update po.
5593
#: breezy/config.py:2793
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5594
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5595
msgid ""
5596
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5597
"will be saved."
5598
msgstr ""
5599
7490.31.3 by Jelmer Vernooij
Update po.
5600
#: breezy/config.py:2938
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5601
#, python-format
5602
msgid "Invalid '%s', should be of the form 'name=value'"
5603
msgstr ""
5604
7490.31.3 by Jelmer Vernooij
Update po.
5605
#: breezy/config.py:3881
6093.2.1 by Jonathan Riddell
add .pot file to archive
5606
msgid "Display, set or remove a configuration option."
5607
msgstr ""
5608
7490.31.3 by Jelmer Vernooij
Update po.
5609
#: breezy/config.py:3883
6581.1.2 by Vincent Ladeuil
Update translation template.
5610
msgid "Display the active value for option NAME."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5611
msgstr ""
5612
7490.31.3 by Jelmer Vernooij
Update po.
5613
#: breezy/config.py:3885
6093.2.1 by Jonathan Riddell
add .pot file to archive
5614
msgid ""
5615
"If --all is specified, NAME is interpreted as a regular expression and all\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
5616
"matching options are displayed mentioning their scope and without resolving\n"
5617
"option references in the value). The active value that bzr will take into\n"
5618
"account is the first one displayed for each option."
5619
msgstr ""
5620
7490.31.3 by Jelmer Vernooij
Update po.
5621
#: breezy/config.py:3890
6581.1.2 by Vincent Ladeuil
Update translation template.
5622
msgid ""
5623
"If NAME is not given, --all .* is implied (all options are displayed for "
5624
"the\n"
5625
"current scope)."
5626
msgstr ""
5627
7490.31.3 by Jelmer Vernooij
Update po.
5628
#: breezy/config.py:3893
6581.1.2 by Vincent Ladeuil
Update translation template.
5629
msgid ""
5630
"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
5631
"is set in the most relevant scope and can be checked by displaying the\n"
5632
"option again."
5633
msgstr ""
5634
7490.31.3 by Jelmer Vernooij
Update po.
5635
#: breezy/config.py:3897
6581.1.2 by Vincent Ladeuil
Update translation template.
5636
msgid "Removing a value is achieved by using --remove NAME."
5637
msgstr ""
5638
6093.2.1 by Jonathan Riddell
add .pot file to archive
5639
# help of 'scope' option of 'config' command
7490.31.3 by Jelmer Vernooij
Update po.
5640
#: breezy/config.py:3907
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5641
msgid "Reduce the scope to the specified configuration file."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5642
msgstr ""
5643
5644
# help of 'all' option of 'config' command
7490.31.3 by Jelmer Vernooij
Update po.
5645
#: breezy/config.py:3911
6093.2.1 by Jonathan Riddell
add .pot file to archive
5646
msgid "Display all the defined values for the matching options."
5647
msgstr ""
5648
5649
# help of 'remove' option of 'config' command
7490.31.3 by Jelmer Vernooij
Update po.
5650
#: breezy/config.py:3913
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5651
msgid "Remove the option from the configuration file."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5652
msgstr ""
5653
7185.1.1 by Jelmer Vernooij
Update pot file.
5654
#: breezy/conflicts.py:52
6093.2.1 by Jonathan Riddell
add .pot file to archive
5655
msgid "List files with conflicts."
5656
msgstr ""
5657
7185.1.1 by Jelmer Vernooij
Update pot file.
5658
#: breezy/conflicts.py:59
6093.2.1 by Jonathan Riddell
add .pot file to archive
5659
msgid ""
5660
"Conflicts normally are listed as short, human-readable messages.  If --text\n"
5661
"is supplied, the pathnames of files with text conflicts are listed,\n"
5662
"instead.  (This is useful for editing all files with text conflicts.)"
5663
msgstr ""
5664
7185.1.1 by Jelmer Vernooij
Update pot file.
5665
#: breezy/conflicts.py:63
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5666
msgid "Use brz resolve when you have fixed a problem."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5667
msgstr ""
5668
5669
# help of 'text' option of 'conflicts' command
7185.1.1 by Jelmer Vernooij
Update pot file.
5670
#: breezy/conflicts.py:68
6093.2.1 by Jonathan Riddell
add .pot file to archive
5671
msgid "List paths of files with text conflicts."
5672
msgstr ""
5673
7490.31.3 by Jelmer Vernooij
Update po.
5674
# help of 'action=auto' option of 'resolve' command
5675
#: breezy/conflicts.py:87
5676
msgid "Detect whether conflict has been resolved by user."
5677
msgstr ""
5678
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5679
# help of 'action=done' option of 'resolve' command
7490.31.3 by Jelmer Vernooij
Update po.
5680
#: breezy/conflicts.py:89
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5681
msgid "Marks the conflict as resolved."
5682
msgstr ""
5683
5684
# help of 'action=take-this' option of 'resolve' command
7490.31.3 by Jelmer Vernooij
Update po.
5685
#: breezy/conflicts.py:92
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5686
msgid "Resolve the conflict preserving the version in the working tree."
5687
msgstr ""
5688
5689
# help of 'action=take-other' option of 'resolve' command
7490.31.3 by Jelmer Vernooij
Update po.
5690
#: breezy/conflicts.py:95
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5691
msgid "Resolve the conflict taking the merged version into account."
5692
msgstr ""
5693
6093.2.1 by Jonathan Riddell
add .pot file to archive
5694
# help of 'action' option of 'resolve' command
7490.31.3 by Jelmer Vernooij
Update po.
5695
#: breezy/conflicts.py:103
6093.2.1 by Jonathan Riddell
add .pot file to archive
5696
msgid "How to resolve the conflict."
5697
msgstr ""
5698
7490.31.3 by Jelmer Vernooij
Update po.
5699
#: breezy/conflicts.py:109
6093.2.1 by Jonathan Riddell
add .pot file to archive
5700
msgid "Mark a conflict as resolved."
5701
msgstr ""
5702
7490.31.3 by Jelmer Vernooij
Update po.
5703
#: breezy/conflicts.py:116
6093.2.1 by Jonathan Riddell
add .pot file to archive
5704
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5705
"Once you have fixed a problem, use \"brz resolve\" to automatically mark\n"
5706
"text conflicts as fixed, \"brz resolve FILE\" to mark a specific conflict "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5707
"as\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5708
"resolved, or \"brz resolve --all\" to mark all conflicts as resolved."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5709
msgstr ""
5710
5711
# help of 'all' option of 'resolve' command
7490.31.3 by Jelmer Vernooij
Update po.
5712
#: breezy/conflicts.py:124
6093.2.1 by Jonathan Riddell
add .pot file to archive
5713
msgid "Resolve all conflicts in this tree."
5714
msgstr ""
5715
7490.31.3 by Jelmer Vernooij
Update po.
5716
#: breezy/conflicts.py:132
6138.4.4 by Jonathan Riddell
update bzr.pot
5717
msgid "If --all is specified, no FILE may be provided"
5718
msgstr ""
5719
7490.31.3 by Jelmer Vernooij
Update po.
5720
#: breezy/conflicts.py:152
6138.4.4 by Jonathan Riddell
update bzr.pot
5721
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
5722
msgid "%d conflict auto-resolved."
5723
msgid_plural "%d conflicts auto-resolved."
5724
msgstr[0] ""
5725
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
5726
7490.31.3 by Jelmer Vernooij
Update po.
5727
#: breezy/conflicts.py:155
6138.4.4 by Jonathan Riddell
update bzr.pot
5728
msgid "Remaining conflicts:"
5729
msgstr ""
5730
7490.31.3 by Jelmer Vernooij
Update po.
5731
#: breezy/conflicts.py:160
5732
msgid "All conflicts resolved."
5733
msgstr ""
5734
7185.1.1 by Jelmer Vernooij
Update pot file.
5735
#: breezy/conflicts.py:163
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5736
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5737
msgid "{0} conflict resolved, {1} remaining"
5738
msgid_plural "{0} conflicts resolved, {1} remaining"
5739
msgstr[0] ""
5740
msgstr[1] ""
5741
7490.31.3 by Jelmer Vernooij
Update po.
5742
#: breezy/controldir.py:751
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5743
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5744
msgid "{0} is{1} redirected to {2}"
5745
msgstr ""
5746
7490.31.3 by Jelmer Vernooij
Update po.
5747
#: breezy/diff.py:474
6138.4.4 by Jonathan Riddell
update bzr.pot
5748
#, python-format
5749
msgid "*** Ignoring files outside view. View is %s"
5750
msgstr ""
5751
7185.1.1 by Jelmer Vernooij
Update pot file.
5752
#: breezy/errors.py:167
5753
msgid ""
5754
"API %(api)s is not compatible; one of versions %(wanted)r is required, but "
5755
"current version is %(current)r."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5756
msgstr ""
5757
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5758
#: breezy/errors.py:178
6093.2.1 by Jonathan Riddell
add .pot file to archive
5759
msgid "The transport '%(transport)s' is only accessible within this process."
5760
msgstr ""
5761
7185.1.1 by Jelmer Vernooij
Update pot file.
5762
#: breezy/errors.py:196
6093.2.1 by Jonathan Riddell
add .pot file to archive
5763
msgid "Invalid revision number %(revno)s"
5764
msgstr ""
5765
7185.1.1 by Jelmer Vernooij
Update pot file.
5766
#: breezy/errors.py:205
6093.2.1 by Jonathan Riddell
add .pot file to archive
5767
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5768
msgstr ""
5769
7185.1.1 by Jelmer Vernooij
Update pot file.
5770
#: breezy/errors.py:216
6093.2.1 by Jonathan Riddell
add .pot file to archive
5771
msgid "Reserved revision-id {%(revision_id)s}"
5772
msgstr ""
5773
7185.1.1 by Jelmer Vernooij
Update pot file.
5774
#: breezy/errors.py:230
6093.2.1 by Jonathan Riddell
add .pot file to archive
5775
msgid "There is no public branch set for \"%(branch_url)s\"."
5776
msgstr ""
5777
7185.1.1 by Jelmer Vernooij
Update pot file.
5778
#: breezy/errors.py:240
6093.2.1 by Jonathan Riddell
add .pot file to archive
5779
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5780
msgstr ""
5781
7185.1.1 by Jelmer Vernooij
Update pot file.
5782
#: breezy/errors.py:250
6093.2.1 by Jonathan Riddell
add .pot file to archive
5783
msgid "The branch '%(branch)s' is not stacked."
5784
msgstr ""
5785
7185.1.1 by Jelmer Vernooij
Update pot file.
5786
#: breezy/errors.py:264
6093.2.1 by Jonathan Riddell
add .pot file to archive
5787
msgid "No WorkingTree exists for \"%(base)s\"."
5788
msgstr ""
5789
7185.1.1 by Jelmer Vernooij
Update pot file.
5790
#: breezy/errors.py:273
6093.2.1 by Jonathan Riddell
add .pot file to archive
5791
msgid "%(url)s is not a local path."
5792
msgstr ""
5793
7490.31.3 by Jelmer Vernooij
Update po.
5794
#: breezy/errors.py:289
5795
msgid ""
5796
"Unable to determine your name.\n"
5797
"Please, set your name with the 'whoami' command.\n"
5798
"E.g. brz whoami \"Your Name <name@example.com>\""
5799
msgstr ""
5800
5801
#: breezy/errors.py:308
6093.2.1 by Jonathan Riddell
add .pot file to archive
5802
msgid "%(not_locked)r is not write locked but needs to be."
5803
msgstr ""
5804
7490.31.3 by Jelmer Vernooij
Update po.
5805
#: breezy/errors.py:316
7185.1.1 by Jelmer Vernooij
Update pot file.
5806
msgid "Commit refused because there are unknown files in the tree"
5807
msgstr ""
5808
7490.31.3 by Jelmer Vernooij
Update po.
5809
#: breezy/errors.py:327
6093.2.1 by Jonathan Riddell
add .pot file to archive
5810
msgid "Generic path error: %(path)r%(extra)s)"
5811
msgstr ""
5812
7490.31.3 by Jelmer Vernooij
Update po.
5813
#: breezy/errors.py:340
6093.2.1 by Jonathan Riddell
add .pot file to archive
5814
msgid "No such file: %(path)r%(extra)s"
5815
msgstr ""
5816
7490.31.3 by Jelmer Vernooij
Update po.
5817
#: breezy/errors.py:345
6093.2.1 by Jonathan Riddell
add .pot file to archive
5818
msgid "File exists: %(path)r%(extra)s"
5819
msgstr ""
5820
7490.31.3 by Jelmer Vernooij
Update po.
5821
#: breezy/errors.py:351
6093.2.1 by Jonathan Riddell
add .pot file to archive
5822
msgid ""
5823
"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.
5824
"after to tell brz about a rename that has already happened)%(extra)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5825
msgstr ""
5826
7490.31.3 by Jelmer Vernooij
Update po.
5827
#: breezy/errors.py:367
6093.2.1 by Jonathan Riddell
add .pot file to archive
5828
msgid "\"%(path)s\" is not a directory %(extra)s"
5829
msgstr ""
5830
7490.31.3 by Jelmer Vernooij
Update po.
5831
#: breezy/errors.py:372
6093.2.1 by Jonathan Riddell
add .pot file to archive
5832
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5833
msgstr ""
5834
7490.31.3 by Jelmer Vernooij
Update po.
5835
#: breezy/errors.py:377
6093.2.1 by Jonathan Riddell
add .pot file to archive
5836
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5837
msgstr ""
5838
7490.31.3 by Jelmer Vernooij
Update po.
5839
#: breezy/errors.py:382
6093.2.1 by Jonathan Riddell
add .pot file to archive
5840
msgid "Hard-linking \"%(path)s\" is not supported"
5841
msgstr ""
5842
7490.31.3 by Jelmer Vernooij
Update po.
5843
#: breezy/errors.py:397
6093.2.1 by Jonathan Riddell
add .pot file to archive
5844
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5845
msgstr ""
5846
7490.31.3 by Jelmer Vernooij
Update po.
5847
#: breezy/errors.py:402
6093.2.1 by Jonathan Riddell
add .pot file to archive
5848
msgid "Permission denied: \"%(path)s\"%(extra)s"
5849
msgstr ""
5850
7490.31.3 by Jelmer Vernooij
Update po.
5851
#: breezy/errors.py:419
6093.2.1 by Jonathan Riddell
add .pot file to archive
5852
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5853
msgstr ""
5854
7490.31.3 by Jelmer Vernooij
Update po.
5855
#: breezy/errors.py:427
6093.2.1 by Jonathan Riddell
add .pot file to archive
5856
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5857
msgstr ""
5858
7490.31.3 by Jelmer Vernooij
Update po.
5859
#: breezy/errors.py:437
6093.2.1 by Jonathan Riddell
add .pot file to archive
5860
msgid ""
5861
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5862
"need to upgrade the repository to permit branch stacking."
5863
msgstr ""
5864
7490.31.3 by Jelmer Vernooij
Update po.
5865
#: breezy/errors.py:448
6093.2.1 by Jonathan Riddell
add .pot file to archive
5866
msgid "Error reading from %(path)r."
5867
msgstr ""
5868
7490.31.3 by Jelmer Vernooij
Update po.
5869
#: breezy/errors.py:467
6093.2.1 by Jonathan Riddell
add .pot file to archive
5870
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5871
msgstr ""
5872
7490.31.3 by Jelmer Vernooij
Update po.
5873
#: breezy/errors.py:483
6093.2.1 by Jonathan Riddell
add .pot file to archive
5874
msgid "Path \"%(path)s\" is not unicode normalized"
5875
msgstr ""
5876
7490.31.3 by Jelmer Vernooij
Update po.
5877
#: breezy/errors.py:491
6093.2.1 by Jonathan Riddell
add .pot file to archive
5878
msgid "Not a branch: \"%(path)s\"%(detail)s."
5879
msgstr ""
5880
7490.31.3 by Jelmer Vernooij
Update po.
5881
#: breezy/errors.py:533
6093.2.1 by Jonathan Riddell
add .pot file to archive
5882
msgid "No submit branch available for branch \"%(path)s\""
5883
msgstr ""
5884
7490.31.3 by Jelmer Vernooij
Update po.
5885
#: breezy/errors.py:542
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5886
msgid "A control directory already exists: \"%(path)s\"."
5887
msgstr ""
5888
7490.31.3 by Jelmer Vernooij
Update po.
5889
#: breezy/errors.py:547
6093.2.1 by Jonathan Riddell
add .pot file to archive
5890
msgid "Already a branch: \"%(path)s\"."
5891
msgstr ""
5892
7490.31.3 by Jelmer Vernooij
Update po.
5893
#: breezy/errors.py:552
6504.1.1 by Vincent Ladeuil
Update translation template
5894
msgid "Invalid branch name: %(name)s"
5895
msgstr ""
5896
7490.31.3 by Jelmer Vernooij
Update po.
5897
#: breezy/errors.py:561
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5898
msgid "Parent branch already exists: \"%(path)s\"."
5899
msgstr ""
5900
7490.31.3 by Jelmer Vernooij
Update po.
5901
#: breezy/errors.py:566
6093.2.1 by Jonathan Riddell
add .pot file to archive
5902
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5903
"Directory contains a branch, but no working tree (use brz checkout if you "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5904
"wish to build a working tree): \"%(path)s\""
5905
msgstr ""
5906
7490.31.3 by Jelmer Vernooij
Update po.
5907
#: breezy/errors.py:572
6093.2.1 by Jonathan Riddell
add .pot file to archive
5908
msgid ""
5909
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5910
msgstr ""
5911
7490.31.3 by Jelmer Vernooij
Update po.
5912
#: breezy/errors.py:582
6093.2.1 by Jonathan Riddell
add .pot file to archive
5913
msgid "No repository present: \"%(path)s\""
5914
msgstr ""
5915
7490.31.3 by Jelmer Vernooij
Update po.
5916
#: breezy/errors.py:591
6093.2.1 by Jonathan Riddell
add .pot file to archive
5917
msgid ""
5918
"Unsupported branch format: %(format)s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5919
"Please run 'brz upgrade'"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5920
msgstr ""
5921
7490.31.3 by Jelmer Vernooij
Update po.
5922
#: breezy/errors.py:596
6093.2.1 by Jonathan Riddell
add .pot file to archive
5923
msgid "Unknown %(kind)s format: %(format)r"
5924
msgstr ""
5925
7490.31.3 by Jelmer Vernooij
Update po.
5926
#: breezy/errors.py:605
7185.1.1 by Jelmer Vernooij
Update pot file.
5927
msgid ""
5928
"Line ending corrupted for file: %(file)s; Maybe your files got corrupted in "
5929
"transport?"
5930
msgstr ""
5931
7490.31.3 by Jelmer Vernooij
Update po.
5932
#: breezy/errors.py:614
7185.1.1 by Jelmer Vernooij
Update pot file.
5933
msgid "Format %(format)s is not compatible with .bzr version %(controldir)s."
5934
msgstr ""
5935
7490.31.3 by Jelmer Vernooij
Update po.
5936
#: breezy/errors.py:624
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5937
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5938
msgstr ""
5939
7490.31.3 by Jelmer Vernooij
Update po.
5940
#: breezy/errors.py:642
6093.2.1 by Jonathan Riddell
add .pot file to archive
5941
msgid ""
5942
"%(target)s\n"
5943
"is not compatible with\n"
5944
"%(source)s\n"
5945
"%(details)s"
5946
msgstr ""
5947
7490.31.3 by Jelmer Vernooij
Update po.
5948
#: breezy/errors.py:655
6093.2.1 by Jonathan Riddell
add .pot file to archive
5949
msgid "Revision is not compatible with %(repo_format)s"
5950
msgstr ""
5951
7490.31.3 by Jelmer Vernooij
Update po.
5952
#: breezy/errors.py:665
6093.2.1 by Jonathan Riddell
add .pot file to archive
5953
msgid "%(context_info)s%(path)s is already versioned."
5954
msgstr ""
5955
7490.31.3 by Jelmer Vernooij
Update po.
5956
#: breezy/errors.py:686
6093.2.1 by Jonathan Riddell
add .pot file to archive
5957
msgid "%(context_info)s%(path)s is not versioned."
5958
msgstr ""
5959
7490.31.3 by Jelmer Vernooij
Update po.
5960
#: breezy/errors.py:707
6093.2.1 by Jonathan Riddell
add .pot file to archive
5961
msgid "Path(s) are not versioned: %(paths_as_string)s"
5962
msgstr ""
5963
7490.31.3 by Jelmer Vernooij
Update po.
5964
#: breezy/errors.py:718
6093.2.1 by Jonathan Riddell
add .pot file to archive
5965
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5966
msgstr ""
5967
7490.31.3 by Jelmer Vernooij
Update po.
5968
#: breezy/errors.py:737
6093.2.1 by Jonathan Riddell
add .pot file to archive
5969
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5970
msgstr ""
5971
7490.31.3 by Jelmer Vernooij
Update po.
5972
#: breezy/errors.py:745
6093.2.1 by Jonathan Riddell
add .pot file to archive
5973
msgid ""
5974
"Filename %(filename)r is not valid in your current filesystem encoding "
5975
"%(fs_encoding)s"
5976
msgstr ""
5977
7490.31.3 by Jelmer Vernooij
Update po.
5978
#: breezy/errors.py:756
6093.2.1 by Jonathan Riddell
add .pot file to archive
5979
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5980
msgstr ""
5981
7490.31.3 by Jelmer Vernooij
Update po.
5982
#: breezy/errors.py:774
6093.2.1 by Jonathan Riddell
add .pot file to archive
5983
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5984
msgstr ""
5985
7490.31.3 by Jelmer Vernooij
Update po.
5986
#: breezy/errors.py:813
6093.2.1 by Jonathan Riddell
add .pot file to archive
5987
msgid "Cannot lock %(lock)s: %(why)s"
5988
msgstr ""
5989
7490.31.3 by Jelmer Vernooij
Update po.
5990
#: breezy/errors.py:823
6093.2.1 by Jonathan Riddell
add .pot file to archive
5991
msgid ""
5992
"A transaction related operation was attempted after the transaction finished."
5993
msgstr ""
5994
7490.31.3 by Jelmer Vernooij
Update po.
5995
#: breezy/errors.py:850
6093.2.1 by Jonathan Riddell
add .pot file to archive
5996
msgid "Cannot lock: transport is read only: %(transport)s"
5997
msgstr ""
5998
7490.31.3 by Jelmer Vernooij
Update po.
5999
#: breezy/errors.py:858
6093.2.1 by Jonathan Riddell
add .pot file to archive
6000
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
6001
msgstr ""
6002
7490.31.3 by Jelmer Vernooij
Update po.
6003
#: breezy/errors.py:869
6093.2.1 by Jonathan Riddell
add .pot file to archive
6004
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
6005
msgstr ""
6006
7490.31.3 by Jelmer Vernooij
Update po.
6007
#: breezy/errors.py:880
6093.2.1 by Jonathan Riddell
add .pot file to archive
6008
msgid ""
6009
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6010
"%(holder)r, wanted to break %(target)r"
6011
msgstr ""
6012
7490.31.3 by Jelmer Vernooij
Update po.
6013
#: breezy/errors.py:893
6093.2.1 by Jonathan Riddell
add .pot file to archive
6014
msgid ""
6015
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6016
"Use 'brz break-lock' to clear it"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6017
msgstr ""
6018
7490.31.3 by Jelmer Vernooij
Update po.
6019
#: breezy/errors.py:905
6093.2.1 by Jonathan Riddell
add .pot file to archive
6020
msgid "Lock not held: %(lock)s"
6021
msgstr ""
6022
7490.31.3 by Jelmer Vernooij
Update po.
6023
#: breezy/errors.py:934
6093.2.1 by Jonathan Riddell
add .pot file to archive
6024
msgid "Upgrade URL cannot work with readonly URLs."
6025
msgstr ""
6026
7490.31.3 by Jelmer Vernooij
Update po.
6027
#: breezy/errors.py:939
6093.2.1 by Jonathan Riddell
add .pot file to archive
6028
msgid "The branch format %(format)s is already at the most recent format."
6029
msgstr ""
6030
7490.31.3 by Jelmer Vernooij
Update po.
6031
#: breezy/errors.py:957
6093.2.1 by Jonathan Riddell
add .pot file to archive
6032
msgid "Option --change does not accept revision ranges"
6033
msgstr ""
6034
7490.31.3 by Jelmer Vernooij
Update po.
6035
#: breezy/errors.py:962
6093.2.1 by Jonathan Riddell
add .pot file to archive
6036
msgid "No namespace registered for string: %(spec)r"
6037
msgstr ""
6038
7490.31.3 by Jelmer Vernooij
Update po.
6039
#: breezy/errors.py:981
6093.2.1 by Jonathan Riddell
add .pot file to archive
6040
msgid ""
6041
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
6042
"%(extra)s"
6043
msgstr ""
6044
7490.31.3 by Jelmer Vernooij
Update po.
6045
#: breezy/errors.py:995
6093.2.1 by Jonathan Riddell
add .pot file to archive
6046
msgid ""
6047
"Operation denied because it would change the main history, which is not "
6048
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
6049
msgstr ""
6050
7490.31.3 by Jelmer Vernooij
Update po.
6051
#: breezy/errors.py:1007
6093.2.1 by Jonathan Riddell
add .pot file to archive
6052
msgid ""
6053
"These branches have diverged. Use the missing command to see how.\n"
6054
"Use the merge command to reconcile them."
6055
msgstr ""
6056
7490.31.3 by Jelmer Vernooij
Update po.
6057
#: breezy/errors.py:1026
6093.2.1 by Jonathan Riddell
add .pot file to archive
6058
msgid ""
6059
"Branches have no common ancestor, and no merge base revision was specified."
6060
msgstr ""
6061
7490.31.3 by Jelmer Vernooij
Update po.
6062
#: breezy/errors.py:1032
6093.2.1 by Jonathan Riddell
add .pot file to archive
6063
msgid ""
6064
"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
6065
msgstr ""
6066
7490.31.3 by Jelmer Vernooij
Update po.
6067
#: breezy/errors.py:1038
6093.2.1 by Jonathan Riddell
add .pot file to archive
6068
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
6069
msgstr ""
6070
7490.31.3 by Jelmer Vernooij
Update po.
6071
#: breezy/errors.py:1047
6093.2.1 by Jonathan Riddell
add .pot file to archive
6072
msgid ""
6073
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
6074
msgstr ""
6075
7490.31.3 by Jelmer Vernooij
Update po.
6076
#: breezy/errors.py:1056
6093.2.1 by Jonathan Riddell
add .pot file to archive
6077
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
6078
msgstr ""
6079
7490.31.3 by Jelmer Vernooij
Update po.
6080
#: breezy/errors.py:1065
6093.2.1 by Jonathan Riddell
add .pot file to archive
6081
msgid "Branch %(branch)s has no commits."
6082
msgstr ""
6083
7490.31.3 by Jelmer Vernooij
Update po.
6084
#: breezy/errors.py:1082
6093.2.1 by Jonathan Riddell
add .pot file to archive
6085
msgid ""
6086
"Bound branch %(branch)s is out of date with master branch %(master)s."
6087
"%(extra_help)s"
6088
msgstr ""
6089
7490.31.3 by Jelmer Vernooij
Update po.
6090
#: breezy/errors.py:1094
6093.2.1 by Jonathan Riddell
add .pot file to archive
6091
msgid ""
6092
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6093
"bound to %(remote)s."
6094
msgstr ""
6095
7490.31.3 by Jelmer Vernooij
Update po.
6096
#: breezy/errors.py:1106
6093.2.1 by Jonathan Riddell
add .pot file to archive
6097
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
6098
msgstr ""
6099
7490.31.3 by Jelmer Vernooij
Update po.
6100
#: breezy/errors.py:1115
6093.2.1 by Jonathan Riddell
add .pot file to archive
6101
msgid ""
6102
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6103
"%(error)s"
6104
msgstr ""
6105
7490.31.3 by Jelmer Vernooij
Update po.
6106
#: breezy/errors.py:1127
6093.2.1 by Jonathan Riddell
add .pot file to archive
6107
msgid "Versioned file error"
6108
msgstr ""
6109
7490.31.3 by Jelmer Vernooij
Update po.
6110
#: breezy/errors.py:1132
6093.2.1 by Jonathan Riddell
add .pot file to archive
6111
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
6112
msgstr ""
6113
7490.31.3 by Jelmer Vernooij
Update po.
6114
#: breezy/errors.py:1142
6093.2.1 by Jonathan Riddell
add .pot file to archive
6115
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
6116
msgstr ""
6117
7490.31.3 by Jelmer Vernooij
Update po.
6118
#: breezy/errors.py:1152
6093.2.1 by Jonathan Riddell
add .pot file to archive
6119
msgid "Text did not match its checksum: %(msg)s"
6120
msgstr ""
6121
7490.31.3 by Jelmer Vernooij
Update po.
6122
#: breezy/errors.py:1204
6093.2.1 by Jonathan Riddell
add .pot file to archive
6123
msgid "Export format %(format)r not supported"
6124
msgstr ""
6125
7490.31.3 by Jelmer Vernooij
Update po.
6126
#: breezy/errors.py:1213
6093.2.1 by Jonathan Riddell
add .pot file to archive
6127
msgid "Transport error: %(msg)s %(orig_error)s"
6128
msgstr ""
6129
7490.31.3 by Jelmer Vernooij
Update po.
6130
#: breezy/errors.py:1239
6093.2.1 by Jonathan Riddell
add .pot file to archive
6131
msgid "Generic bzr smart protocol error: %(details)s"
6132
msgstr ""
6133
7490.31.3 by Jelmer Vernooij
Update po.
6134
#: breezy/errors.py:1247
6093.2.1 by Jonathan Riddell
add .pot file to archive
6135
msgid "Received bad protocol version marker: %(marker)r"
6136
msgstr ""
6137
7490.31.3 by Jelmer Vernooij
Update po.
6138
#: breezy/errors.py:1279
6093.2.1 by Jonathan Riddell
add .pot file to archive
6139
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
6140
msgstr ""
6141
7490.31.3 by Jelmer Vernooij
Update po.
6142
#: breezy/errors.py:1284
6093.2.1 by Jonathan Riddell
add .pot file to archive
6143
msgid "Connection error: %(msg)s %(orig_error)s"
6144
msgstr ""
6145
7490.31.3 by Jelmer Vernooij
Update po.
6146
#: breezy/errors.py:1289
6093.2.1 by Jonathan Riddell
add .pot file to archive
6147
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
6148
msgstr ""
6149
7490.31.3 by Jelmer Vernooij
Update po.
6150
#: breezy/errors.py:1310
6093.2.1 by Jonathan Riddell
add .pot file to archive
6151
msgid "Connection closed: %(msg)s %(orig_error)s"
6152
msgstr ""
6153
7490.31.3 by Jelmer Vernooij
Update po.
6154
#: breezy/errors.py:1315
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6155
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6156
msgstr ""
6157
7490.31.3 by Jelmer Vernooij
Update po.
6158
#: breezy/errors.py:1320
6093.2.1 by Jonathan Riddell
add .pot file to archive
6159
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6160
msgstr ""
6161
7490.31.3 by Jelmer Vernooij
Update po.
6162
#: breezy/errors.py:1330
6093.2.1 by Jonathan Riddell
add .pot file to archive
6163
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6164
msgstr ""
6165
7490.31.3 by Jelmer Vernooij
Update po.
6166
#: breezy/errors.py:1345
6093.2.1 by Jonathan Riddell
add .pot file to archive
6167
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6168
msgstr ""
6169
7490.31.3 by Jelmer Vernooij
Update po.
6170
#: breezy/errors.py:1359
6093.2.1 by Jonathan Riddell
add .pot file to archive
6171
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6172
msgstr ""
6173
7490.31.3 by Jelmer Vernooij
Update po.
6174
#: breezy/errors.py:1367
6093.2.1 by Jonathan Riddell
add .pot file to archive
6175
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6176
msgstr ""
6177
7490.31.3 by Jelmer Vernooij
Update po.
6178
#: breezy/errors.py:1376
6093.2.1 by Jonathan Riddell
add .pot file to archive
6179
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6180
msgstr ""
6181
7490.31.3 by Jelmer Vernooij
Update po.
6182
#: breezy/errors.py:1390
6093.2.1 by Jonathan Riddell
add .pot file to archive
6183
msgid "Too many redirections"
6184
msgstr ""
6185
7490.31.3 by Jelmer Vernooij
Update po.
6186
#: breezy/errors.py:1395
6093.2.1 by Jonathan Riddell
add .pot file to archive
6187
msgid "Working tree has conflicts."
6188
msgstr ""
6189
7490.31.3 by Jelmer Vernooij
Update po.
6190
#: breezy/errors.py:1400
6093.2.1 by Jonathan Riddell
add .pot file to archive
6191
msgid "Unable to import library \"%(library)s\": %(error)s"
6192
msgstr ""
6193
7490.31.3 by Jelmer Vernooij
Update po.
6194
#: breezy/errors.py:1408
6093.2.1 by Jonathan Riddell
add .pot file to archive
6195
msgid ""
6196
"The working tree for %(basedir)s has changed since the last commit, but "
6197
"weave merge requires that it be unchanged"
6198
msgstr ""
6199
7490.31.3 by Jelmer Vernooij
Update po.
6200
#: breezy/errors.py:1418
6093.2.1 by Jonathan Riddell
add .pot file to archive
6201
msgid "Cycle in graph %(graph)r"
6202
msgstr ""
6203
7490.31.3 by Jelmer Vernooij
Update po.
6204
#: breezy/errors.py:1446
6093.2.1 by Jonathan Riddell
add .pot file to archive
6205
msgid "File %(filename)s is not conflicted."
6206
msgstr ""
6207
7490.31.3 by Jelmer Vernooij
Update po.
6208
#: breezy/errors.py:1468
6093.2.1 by Jonathan Riddell
add .pot file to archive
6209
msgid "No bundle was found in \"%(filename)s\"."
6210
msgstr ""
6211
7490.31.3 by Jelmer Vernooij
Update po.
6212
#: breezy/errors.py:1477
6093.2.1 by Jonathan Riddell
add .pot file to archive
6213
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6214
msgstr ""
6215
7490.31.3 by Jelmer Vernooij
Update po.
6216
#: breezy/errors.py:1487
6093.2.1 by Jonathan Riddell
add .pot file to archive
6217
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6218
msgstr ""
6219
7490.31.3 by Jelmer Vernooij
Update po.
6220
#: breezy/errors.py:1500
6093.2.1 by Jonathan Riddell
add .pot file to archive
6221
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6222
msgstr ""
6223
7490.31.3 by Jelmer Vernooij
Update po.
6224
#: breezy/errors.py:1510
6093.2.1 by Jonathan Riddell
add .pot file to archive
6225
msgid "Key %(key)s is already present in map"
6226
msgstr ""
6227
7490.31.3 by Jelmer Vernooij
Update po.
6228
#: breezy/errors.py:1515
6093.2.1 by Jonathan Riddell
add .pot file to archive
6229
msgid "The prefix %(prefix)s is in the help search path twice."
6230
msgstr ""
6231
7490.31.3 by Jelmer Vernooij
Update po.
6232
#: breezy/errors.py:1528
6093.2.1 by Jonathan Riddell
add .pot file to archive
6233
msgid ""
6234
"No final name for trans_id %(trans_id)r\n"
6235
"file-id: %(file_id)r\n"
6236
"root trans-id: %(root_trans_id)r\n"
6237
msgstr ""
6238
7490.31.3 by Jelmer Vernooij
Update po.
6239
#: breezy/errors.py:1557
6093.2.1 by Jonathan Riddell
add .pot file to archive
6240
msgid "Attempt to reuse a transform that has already been applied."
6241
msgstr ""
6242
7490.31.3 by Jelmer Vernooij
Update po.
6243
#: breezy/errors.py:1562
6093.2.1 by Jonathan Riddell
add .pot file to archive
6244
msgid "Moving the root directory is not supported at this time"
6245
msgstr ""
6246
7490.31.3 by Jelmer Vernooij
Update po.
6247
#: breezy/errors.py:1567
6093.2.1 by Jonathan Riddell
add .pot file to archive
6248
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6249
msgstr ""
6250
7490.31.3 by Jelmer Vernooij
Update po.
6251
#: breezy/errors.py:1578
6093.2.1 by Jonathan Riddell
add .pot file to archive
6252
msgid ""
6253
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6254
msgstr ""
6255
7490.31.3 by Jelmer Vernooij
Update po.
6256
#: breezy/errors.py:1614
6093.2.1 by Jonathan Riddell
add .pot file to archive
6257
msgid ""
6258
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6259
msgstr ""
6260
7490.31.3 by Jelmer Vernooij
Update po.
6261
#: breezy/errors.py:1644
6093.2.1 by Jonathan Riddell
add .pot file to archive
6262
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6263
msgstr ""
6264
7490.31.3 by Jelmer Vernooij
Update po.
6265
#: breezy/errors.py:1652
6093.2.1 by Jonathan Riddell
add .pot file to archive
6266
msgid "Nothing to merge."
6267
msgstr ""
6268
7490.31.3 by Jelmer Vernooij
Update po.
6269
#: breezy/errors.py:1657
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6270
msgid "Format %(format)s cannot be initialised by this version of brz."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6271
msgstr ""
6272
7490.31.3 by Jelmer Vernooij
Update po.
6273
#: breezy/errors.py:1666
6093.2.1 by Jonathan Riddell
add .pot file to archive
6274
msgid ""
6275
"Cannot convert from format %(from_format)s to format %(format)s.    "
6276
"%(problem)s"
6277
msgstr ""
6278
7490.31.3 by Jelmer Vernooij
Update po.
6279
#: breezy/errors.py:1678
6093.2.1 by Jonathan Riddell
add .pot file to archive
6280
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6281
msgstr ""
6282
7490.31.3 by Jelmer Vernooij
Update po.
6283
#: breezy/errors.py:1686
6093.2.1 by Jonathan Riddell
add .pot file to archive
6284
msgid "%(exe_name)s could not be found on this machine"
6285
msgstr ""
6286
7490.31.3 by Jelmer Vernooij
Update po.
6287
#: breezy/errors.py:1694
6093.2.1 by Jonathan Riddell
add .pot file to archive
6288
msgid "Diff is not installed on this machine: %(msg)s"
6289
msgstr ""
6290
7490.31.3 by Jelmer Vernooij
Update po.
6291
#: breezy/errors.py:1702
6093.2.1 by Jonathan Riddell
add .pot file to archive
6292
msgid "Diff3 is not installed on this machine."
6293
msgstr ""
6294
7490.31.3 by Jelmer Vernooij
Update po.
6295
#: breezy/errors.py:1708
6093.2.1 by Jonathan Riddell
add .pot file to archive
6296
msgid "The content being inserted is already present."
6297
msgstr ""
6298
7490.31.3 by Jelmer Vernooij
Update po.
6299
#: breezy/errors.py:1713
6093.2.1 by Jonathan Riddell
add .pot file to archive
6300
msgid ""
6301
"This tree contains left-over files from a failed operation.\n"
6302
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
6303
"to\n"
6304
"    keep, and delete it when you are done."
6305
msgstr ""
6306
7490.31.3 by Jelmer Vernooij
Update po.
6307
#: breezy/errors.py:1724
6093.2.1 by Jonathan Riddell
add .pot file to archive
6308
msgid ""
6309
"This tree contains left-over files from a failed operation.\n"
6310
"    Please examine %(pending_deletion)s to see if it contains any files you\n"
6311
"    wish to keep, and delete it when you are done."
6312
msgstr ""
6313
7490.31.3 by Jelmer Vernooij
Update po.
6314
#: breezy/errors.py:1734
6093.2.1 by Jonathan Riddell
add .pot file to archive
6315
msgid ""
6316
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6317
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
6318
"to\n"
6319
"    keep, and delete it when you are done."
6320
msgstr ""
6321
7490.31.3 by Jelmer Vernooij
Update po.
6322
#: breezy/errors.py:1745
6093.2.1 by Jonathan Riddell
add .pot file to archive
6323
msgid ""
6324
"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
6325
"examine %(pending_deletion)s to see if it contains any files you wish to "
6326
"keep, and delete it when you are done."
6327
msgstr ""
6328
7490.31.3 by Jelmer Vernooij
Update po.
6329
#: breezy/errors.py:1755
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6330
msgid "Working tree is out of date, please run 'brz update'.%(more)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6331
msgstr ""
6332
7490.31.3 by Jelmer Vernooij
Update po.
6333
#: breezy/errors.py:1769
6093.2.1 by Jonathan Riddell
add .pot file to archive
6334
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6335
msgstr ""
6336
7490.31.3 by Jelmer Vernooij
Update po.
6337
#: breezy/errors.py:1782
6093.2.1 by Jonathan Riddell
add .pot file to archive
6338
msgid "Error in merge modified format"
6339
msgstr ""
6340
7490.31.3 by Jelmer Vernooij
Update po.
6341
#: breezy/errors.py:1787
6093.2.1 by Jonathan Riddell
add .pot file to archive
6342
msgid "Format error in conflict listings"
6343
msgstr ""
6344
7490.31.3 by Jelmer Vernooij
Update po.
6345
#: breezy/errors.py:1792
6093.2.1 by Jonathan Riddell
add .pot file to archive
6346
msgid ""
6347
"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.
6348
"Please run brz reconcile on this repository."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6349
msgstr ""
6350
7490.31.3 by Jelmer Vernooij
Update po.
6351
#: breezy/errors.py:1803
6093.2.1 by Jonathan Riddell
add .pot file to archive
6352
msgid ""
6353
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6354
"reason: %(reason)s"
6355
msgstr ""
6356
7490.31.3 by Jelmer Vernooij
Update po.
6357
#: breezy/errors.py:1816
6093.2.1 by Jonathan Riddell
add .pot file to archive
6358
msgid ""
6359
"An inconsistent delta was supplied: %(delta)r\n"
6360
"reason: %(reason)s"
6361
msgstr ""
6362
7490.31.3 by Jelmer Vernooij
Update po.
6363
#: breezy/errors.py:1827
6093.2.1 by Jonathan Riddell
add .pot file to archive
6364
msgid "To use this feature you must upgrade your branch at %(path)s."
6365
msgstr ""
6366
7490.31.3 by Jelmer Vernooij
Update po.
6367
#: breezy/errors.py:1836
6093.2.1 by Jonathan Riddell
add .pot file to archive
6368
msgid "To use this feature you must upgrade your repository at %(path)s."
6369
msgstr ""
6370
7490.31.3 by Jelmer Vernooij
Update po.
6371
#: breezy/errors.py:1841
6093.2.1 by Jonathan Riddell
add .pot file to archive
6372
msgid ""
6373
"To use this feature you must upgrade your branch at %(path)s to a format "
6374
"which supports rich roots."
6375
msgstr ""
6376
7490.31.3 by Jelmer Vernooij
Update po.
6377
#: breezy/errors.py:1847
6093.2.1 by Jonathan Riddell
add .pot file to archive
6378
msgid "Cannot perform local-only commits on unbound branches."
6379
msgstr ""
6380
7490.31.3 by Jelmer Vernooij
Update po.
6381
#: breezy/errors.py:1852
6093.2.1 by Jonathan Riddell
add .pot file to archive
6382
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6383
msgstr ""
6384
7490.31.3 by Jelmer Vernooij
Update po.
6385
#: breezy/errors.py:1876
6386
msgid "Shared repositories are not supported by %(format)r."
6387
msgstr ""
6388
6389
#: breezy/errors.py:1884
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
6390
msgid "Ghost tags not supported by format %(format)r."
6391
msgstr ""
6392
7490.31.3 by Jelmer Vernooij
Update po.
6393
#: breezy/errors.py:1892
6093.2.1 by Jonathan Riddell
add .pot file to archive
6394
msgid "File is binary but should be text."
6395
msgstr ""
6396
7490.31.3 by Jelmer Vernooij
Update po.
6397
#: breezy/errors.py:1897
6093.2.1 by Jonathan Riddell
add .pot file to archive
6398
msgid "The path %(path)s is not permitted on this platform"
6399
msgstr ""
6400
7490.31.3 by Jelmer Vernooij
Update po.
6401
#: breezy/errors.py:1906
6093.2.1 by Jonathan Riddell
add .pot file to archive
6402
msgid ""
6403
"Testament did not match expected value.\n"
6404
"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6405
"       {%(measured)s}"
6406
msgstr ""
6407
7490.31.3 by Jelmer Vernooij
Update po.
6408
#: breezy/errors.py:1918
6093.2.1 by Jonathan Riddell
add .pot file to archive
6409
msgid "Not a bzr revision-bundle: %(text)r"
6410
msgstr ""
6411
7490.31.3 by Jelmer Vernooij
Update po.
6412
#: breezy/errors.py:1927
6093.2.1 by Jonathan Riddell
add .pot file to archive
6413
msgid "Bad bzr revision-bundle: %(text)r"
6414
msgstr ""
6415
7490.31.3 by Jelmer Vernooij
Update po.
6416
#: breezy/errors.py:1936
6093.2.1 by Jonathan Riddell
add .pot file to archive
6417
msgid "Malformed bzr revision-bundle header: %(text)r"
6418
msgstr ""
6419
7490.31.3 by Jelmer Vernooij
Update po.
6420
#: breezy/errors.py:1941
6093.2.1 by Jonathan Riddell
add .pot file to archive
6421
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6422
msgstr ""
6423
7490.31.3 by Jelmer Vernooij
Update po.
6424
#: breezy/errors.py:1946
6093.2.1 by Jonathan Riddell
add .pot file to archive
6425
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6426
msgstr ""
6427
7490.31.3 by Jelmer Vernooij
Update po.
6428
#: breezy/errors.py:1951
6093.2.1 by Jonathan Riddell
add .pot file to archive
6429
msgid "End of line marker was not \\n in bzr revision-bundle"
6430
msgstr ""
6431
7490.31.3 by Jelmer Vernooij
Update po.
6432
#: breezy/errors.py:1961
6093.2.1 by Jonathan Riddell
add .pot file to archive
6433
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6434
msgstr ""
6435
7490.31.3 by Jelmer Vernooij
Update po.
6436
#: breezy/errors.py:1971
6093.2.1 by Jonathan Riddell
add .pot file to archive
6437
msgid "Root class for inventory serialization errors"
6438
msgstr ""
6439
7490.31.3 by Jelmer Vernooij
Update po.
6440
#: breezy/errors.py:1976
6093.2.1 by Jonathan Riddell
add .pot file to archive
6441
msgid ""
6442
"The inventory was not in the expected format:\n"
6443
" %(msg)s"
6444
msgstr ""
6445
7490.31.3 by Jelmer Vernooij
Update po.
6446
#: breezy/errors.py:1984
6093.2.1 by Jonathan Riddell
add .pot file to archive
6447
msgid "This operation requires rich root data storage"
6448
msgstr ""
6449
7490.31.3 by Jelmer Vernooij
Update po.
6450
#: breezy/errors.py:1997
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6451
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6452
msgstr ""
6453
7490.31.3 by Jelmer Vernooij
Update po.
6454
#: breezy/errors.py:2006
6093.2.1 by Jonathan Riddell
add .pot file to archive
6455
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6456
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6457
"variable."
6458
msgstr ""
6459
7490.31.3 by Jelmer Vernooij
Update po.
6460
#: breezy/errors.py:2013
6093.2.1 by Jonathan Riddell
add .pot file to archive
6461
msgid ""
6462
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6463
"ghost at {%(ghost_revision_id)s}"
6464
msgstr ""
6465
7490.31.3 by Jelmer Vernooij
Update po.
6466
#: breezy/errors.py:2023
6093.2.1 by Jonathan Riddell
add .pot file to archive
6467
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6468
msgstr ""
6469
7490.31.3 by Jelmer Vernooij
Update po.
6470
#: breezy/errors.py:2040
6093.2.1 by Jonathan Riddell
add .pot file to archive
6471
msgid ""
6472
"A merge directive must provide either a bundle or a public branch location."
6473
msgstr ""
6474
7490.31.3 by Jelmer Vernooij
Update po.
6475
#: breezy/errors.py:2047
6093.2.1 by Jonathan Riddell
add .pot file to archive
6476
msgid "Bad merge directive payload %(start)r"
6477
msgstr ""
6478
7490.31.3 by Jelmer Vernooij
Update po.
6479
#: breezy/errors.py:2057
6093.2.1 by Jonathan Riddell
add .pot file to archive
6480
msgid "Preview patch does not match requested changes."
6481
msgstr ""
6482
7490.31.3 by Jelmer Vernooij
Update po.
6483
#: breezy/errors.py:2063
6093.2.1 by Jonathan Riddell
add .pot file to archive
6484
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6485
msgstr ""
6486
7490.31.3 by Jelmer Vernooij
Update po.
6487
#: breezy/errors.py:2073
6093.2.1 by Jonathan Riddell
add .pot file to archive
6488
msgid ""
6489
"Your branch does not have all of the revisions required in order to merge "
6490
"this merge directive and the target location specified in the merge "
6491
"directive is not a branch: %(location)s."
6492
msgstr ""
6493
7490.31.3 by Jelmer Vernooij
Update po.
6494
#: breezy/errors.py:2085
6093.2.1 by Jonathan Riddell
add .pot file to archive
6495
msgid "Unsupported entry kind %(kind)s"
6496
msgstr ""
6497
7490.31.3 by Jelmer Vernooij
Update po.
6498
#: breezy/errors.py:2093
6093.2.1 by Jonathan Riddell
add .pot file to archive
6499
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6500
msgstr ""
6501
7490.31.3 by Jelmer Vernooij
Update po.
6502
#: breezy/errors.py:2103
6093.2.1 by Jonathan Riddell
add .pot file to archive
6503
msgid "Subsume target %(other_tree)s needs to be upgraded."
6504
msgstr ""
6505
7490.31.3 by Jelmer Vernooij
Update po.
6506
#: breezy/errors.py:2111
6093.2.1 by Jonathan Riddell
add .pot file to archive
6507
msgid "No such tag: %(tag_name)s"
6508
msgstr ""
6509
7490.31.3 by Jelmer Vernooij
Update po.
6510
#: breezy/errors.py:2119
6511
msgid ""
6512
"Tags not supported by %(branch)s; you may be able to use 'brz upgrade "
6513
"%(branch_url)s'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6514
msgstr ""
6515
7490.31.3 by Jelmer Vernooij
Update po.
6516
#: breezy/errors.py:2129
6093.2.1 by Jonathan Riddell
add .pot file to archive
6517
msgid "Tag %(tag_name)s already exists."
6518
msgstr ""
6519
7490.31.3 by Jelmer Vernooij
Update po.
6520
#: breezy/errors.py:2137
6093.2.1 by Jonathan Riddell
add .pot file to archive
6521
msgid "Could not understand response from smart server: %(response_tuple)r"
6522
msgstr ""
6523
7490.31.3 by Jelmer Vernooij
Update po.
6524
#: breezy/errors.py:2176
6093.2.1 by Jonathan Riddell
add .pot file to archive
6525
msgid "Server sent an unexpected error: %(error_tuple)r"
6526
msgstr ""
6527
7490.31.3 by Jelmer Vernooij
Update po.
6528
#: breezy/errors.py:2195
6093.2.1 by Jonathan Riddell
add .pot file to archive
6529
msgid "Unrecognised container format: %(container_format)r"
6530
msgstr ""
6531
7490.31.3 by Jelmer Vernooij
Update po.
6532
#: breezy/errors.py:2203
6093.2.1 by Jonathan Riddell
add .pot file to archive
6533
msgid "Unexpected end of container stream"
6534
msgstr ""
6535
7490.31.3 by Jelmer Vernooij
Update po.
6536
#: breezy/errors.py:2208
6093.2.1 by Jonathan Riddell
add .pot file to archive
6537
msgid "Unknown record type: %(record_type)r"
6538
msgstr ""
6539
7490.31.3 by Jelmer Vernooij
Update po.
6540
#: breezy/errors.py:2216
6093.2.1 by Jonathan Riddell
add .pot file to archive
6541
msgid "Invalid record: %(reason)s"
6542
msgstr ""
6543
7490.31.3 by Jelmer Vernooij
Update po.
6544
#: breezy/errors.py:2224
6093.2.1 by Jonathan Riddell
add .pot file to archive
6545
msgid "Container has data after end marker: %(excess)r"
6546
msgstr ""
6547
7490.31.3 by Jelmer Vernooij
Update po.
6548
#: breezy/errors.py:2232
6093.2.1 by Jonathan Riddell
add .pot file to archive
6549
msgid "Container has multiple records with the same name: %(name)s"
6550
msgstr ""
6551
7490.31.3 by Jelmer Vernooij
Update po.
6552
#: breezy/errors.py:2240
6093.2.1 by Jonathan Riddell
add .pot file to archive
6553
msgid "Corrupt or incompatible data stream: %(reason)s"
6554
msgstr ""
6555
7490.31.3 by Jelmer Vernooij
Update po.
6556
#: breezy/errors.py:2248
6093.2.1 by Jonathan Riddell
add .pot file to archive
6557
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6558
"Working tree \"%(display_url)s\" has uncommitted changes (See brz status)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6559
"%(more)s"
6560
msgstr ""
6561
7490.31.3 by Jelmer Vernooij
Update po.
6562
#: breezy/errors.py:2267
6093.2.1 by Jonathan Riddell
add .pot file to archive
6563
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
6564
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6565
msgstr ""
6566
7490.31.3 by Jelmer Vernooij
Update po.
6567
#: breezy/errors.py:2282
6581.1.2 by Vincent Ladeuil
Update translation template.
6568
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6569
"Working tree \"%(display_url)s\" has shelved changes (See brz shelve --list)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6570
"%(more)s"
6571
msgstr ""
6572
7490.31.3 by Jelmer Vernooij
Update po.
6573
#: breezy/errors.py:2288
6093.2.1 by Jonathan Riddell
add .pot file to archive
6574
msgid ""
6575
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6576
msgstr ""
6577
7490.31.3 by Jelmer Vernooij
Update po.
6578
#: breezy/errors.py:2300
6093.2.1 by Jonathan Riddell
add .pot file to archive
6579
msgid "The alias \"%(alias_name)s\" does not exist."
6580
msgstr ""
6581
7490.31.3 by Jelmer Vernooij
Update po.
6582
#: breezy/errors.py:2308
6093.2.1 by Jonathan Riddell
add .pot file to archive
6583
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6584
msgstr ""
6585
7490.31.3 by Jelmer Vernooij
Update po.
6586
#: breezy/errors.py:2321
6093.2.1 by Jonathan Riddell
add .pot file to archive
6587
msgid "Tip change rejected: %(msg)s"
6588
msgstr ""
6589
7490.31.3 by Jelmer Vernooij
Update po.
6590
#: breezy/errors.py:2329
6093.2.1 by Jonathan Riddell
add .pot file to archive
6591
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6592
msgstr ""
6593
7490.31.3 by Jelmer Vernooij
Update po.
6594
#: breezy/errors.py:2337
6093.2.1 by Jonathan Riddell
add .pot file to archive
6595
msgid "The user aborted the operation."
6596
msgstr ""
6597
7490.31.3 by Jelmer Vernooij
Update po.
6598
#: breezy/errors.py:2389
7185.1.1 by Jelmer Vernooij
Update pot file.
6599
msgid "%(controldir)r does not support co-located branches."
6600
msgstr ""
6601
7490.31.3 by Jelmer Vernooij
Update po.
6602
#: breezy/errors.py:2397
6093.2.1 by Jonathan Riddell
add .pot file to archive
6603
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6604
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `brz "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6605
"unbind` to fix."
6606
msgstr ""
6607
7490.31.3 by Jelmer Vernooij
Update po.
6608
#: breezy/errors.py:2406
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6609
msgid ""
6610
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6611
"format %(format)r"
6612
msgstr ""
6613
7490.31.3 by Jelmer Vernooij
Update po.
6614
#: breezy/errors.py:2418
6581.1.2 by Vincent Ladeuil
Update translation template.
6615
msgid ""
6616
"Cannot store uncommitted changes because this branch already stores "
6617
"uncommitted changes."
6618
msgstr ""
6619
7490.31.3 by Jelmer Vernooij
Update po.
6620
#: breezy/export_pot.py:256
6138.4.4 by Jonathan Riddell
update bzr.pot
6621
#, python-format
6622
msgid "Exporting messages from builtin command: %s"
6623
msgstr ""
6624
7490.31.3 by Jelmer Vernooij
Update po.
6625
#: breezy/export_pot.py:261
7185.1.1 by Jelmer Vernooij
Update pot file.
6626
#, python-format
6627
msgid "Plugin %s is not loaded"
6628
msgstr ""
6629
7490.31.3 by Jelmer Vernooij
Update po.
6630
#: breezy/export_pot.py:278
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6631
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
6632
msgid "Exporting messages from plugin command: {0} in {1}"
6633
msgstr ""
6634
7490.31.3 by Jelmer Vernooij
Update po.
6635
#: breezy/export_pot.py:299
6138.4.4 by Jonathan Riddell
update bzr.pot
6636
#, python-format
6637
msgid "Exporting message from error: %s"
6638
msgstr ""
6639
7490.31.3 by Jelmer Vernooij
Update po.
6640
#: breezy/git/commands.py:125
7185.1.1 by Jelmer Vernooij
Update pot file.
6641
#, python-format
6642
msgid "%r is not a git repository"
6643
msgstr ""
6644
7490.31.3 by Jelmer Vernooij
Update po.
6645
#: breezy/git/commands.py:138
7185.1.1 by Jelmer Vernooij
Update pot file.
6646
msgid "Target repository doesn't support rich roots"
6647
msgstr ""
6648
7490.31.3 by Jelmer Vernooij
Update po.
6649
#: breezy/git/commands.py:150
7185.1.1 by Jelmer Vernooij
Update pot file.
6650
msgid "creating branches"
6651
msgstr ""
6652
7490.31.3 by Jelmer Vernooij
Update po.
6653
#: breezy/git/commands.py:172
7185.1.1 by Jelmer Vernooij
Update pot file.
6654
msgid ""
6655
"Use 'bzr checkout' to create a working tree in the newly created branches."
6656
msgstr ""
6657
7490.31.3 by Jelmer Vernooij
Update po.
6658
#: breezy/git/commands.py:214
7185.1.1 by Jelmer Vernooij
Update pot file.
6659
#, python-format
6660
msgid "Object not found: %s"
6661
msgstr ""
6662
7490.31.3 by Jelmer Vernooij
Update po.
6663
#: breezy/gpg.py:372
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6664
#, python-brace-format
6504.1.1 by Vincent Ladeuil
Update translation template
6665
msgid "No GnuPG key results for pattern: {0}"
6666
msgstr ""
6667
7490.31.3 by Jelmer Vernooij
Update po.
6668
#: breezy/gpg.py:378
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6669
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6670
msgid "{0} commits with valid signatures"
6671
msgstr ""
6672
7490.31.3 by Jelmer Vernooij
Update po.
6673
#: breezy/gpg.py:384
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6674
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6675
msgid "{0} commit with unknown key"
6676
msgid_plural "{0} commits with unknown keys"
6677
msgstr[0] ""
6678
msgstr[1] ""
6679
7490.31.3 by Jelmer Vernooij
Update po.
6680
#: breezy/gpg.py:392
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6681
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6682
msgid "{0} commit not valid"
6683
msgid_plural "{0} commits not valid"
6684
msgstr[0] ""
6685
msgstr[1] ""
6686
7490.31.3 by Jelmer Vernooij
Update po.
6687
#: breezy/gpg.py:400
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6688
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6689
msgid "{0} commit not signed"
6690
msgid_plural "{0} commits not signed"
6691
msgstr[0] ""
6692
msgstr[1] ""
6693
7490.31.3 by Jelmer Vernooij
Update po.
6694
#: breezy/gpg.py:408
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6695
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6696
msgid "{0} commit with key now expired"
6697
msgid_plural "{0} commits with key now expired"
6698
msgstr[0] ""
6699
msgstr[1] ""
6700
7490.31.3 by Jelmer Vernooij
Update po.
6701
#: breezy/gpg.py:428
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6702
#, python-brace-format
6504.1.1 by Vincent Ladeuil
Update translation template
6703
msgid "{0} commit by author {1} with key {2} now expired"
6704
msgid_plural "{0} commits by author {1} with key {2} now expired"
6705
msgstr[0] ""
6706
msgstr[1] ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
6707
7490.31.3 by Jelmer Vernooij
Update po.
6708
#: breezy/gpg.py:444
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6709
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6710
msgid "{0} signed {1} commit"
6711
msgid_plural "{0} signed {1} commits"
6712
msgstr[0] ""
6713
msgstr[1] ""
6714
7490.31.3 by Jelmer Vernooij
Update po.
6715
#: breezy/gpg.py:461 breezy/gpg.py:478
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6716
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6717
msgid "{0} commit by author {1}"
6718
msgid_plural "{0} commits by author {1}"
6719
msgstr[0] ""
6720
msgstr[1] ""
6721
7490.31.3 by Jelmer Vernooij
Update po.
6722
#: breezy/gpg.py:493
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6723
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6724
msgid "Unknown key {0} signed {1} commit"
6725
msgid_plural "Unknown key {0} signed {1} commits"
6726
msgstr[0] ""
6727
msgstr[1] ""
6728
7185.1.1 by Jelmer Vernooij
Update pot file.
6729
#: breezy/hooks.py:320
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6730
#, python-format
6731
msgid "Introduced in: %s"
6732
msgstr ""
6733
7185.1.1 by Jelmer Vernooij
Update pot file.
6734
#: breezy/hooks.py:323
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6735
#, python-format
6736
msgid "Deprecated in: %s"
6737
msgstr ""
6738
7490.31.3 by Jelmer Vernooij
Update po.
6739
#: breezy/lock.py:470
6150.1.1 by Jonathan Riddell
update bzr.pot
6740
msgid "{0!r} was {1} locked again"
6138.4.4 by Jonathan Riddell
update bzr.pot
6741
msgstr ""
6742
7185.1.1 by Jelmer Vernooij
Update pot file.
6743
#: breezy/lockdir.py:322
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6744
#, python-format
6745
msgid "error removing pending lock: %s"
6746
msgstr ""
6747
7185.1.1 by Jelmer Vernooij
Update pot file.
6748
#: breezy/lockdir.py:614
6749
msgid "Unable to obtain"
6750
msgstr ""
6751
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6752
#: breezy/lockdir.py:616
7185.1.1 by Jelmer Vernooij
Update pot file.
6753
msgid "Lock owner changed for"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6754
msgstr ""
6755
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6756
#: breezy/lockdir.py:618
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6757
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6758
msgid "{0} lock {1} {2}."
6759
msgstr ""
6760
7185.1.1 by Jelmer Vernooij
Update pot file.
6761
#: breezy/lockdir.py:625
6762
#, python-format
6763
msgid "Will continue to try until %s, unless you press Ctrl-C."
6764
msgstr ""
6765
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6766
#: breezy/lockdir.py:627
7185.1.1 by Jelmer Vernooij
Update pot file.
6767
msgid "See \"brz help break-lock\" for more."
6768
msgstr ""
6769
6770
#: breezy/lockdir.py:737
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6771
#, python-format
6772
msgid ""
6773
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6774
msgstr ""
6775
7490.31.3 by Jelmer Vernooij
Update po.
6776
#: breezy/log.py:411
7185.1.1 by Jelmer Vernooij
Update pot file.
6777
msgid "Further revision history missing."
6778
msgstr ""
6779
7490.31.3 by Jelmer Vernooij
Update po.
6780
#: breezy/log.py:567
6138.4.4 by Jonathan Riddell
update bzr.pot
6781
msgid "--exclude-common-ancestry requires two different revisions"
6782
msgstr ""
6783
7490.31.3 by Jelmer Vernooij
Update po.
6784
#: breezy/log.py:569
6138.4.4 by Jonathan Riddell
update bzr.pot
6785
#, python-format
6786
msgid "invalid direction %r"
6787
msgstr ""
6788
7490.31.3 by Jelmer Vernooij
Update po.
6789
#: breezy/log.py:657
6138.4.4 by Jonathan Riddell
update bzr.pot
6790
msgid "Start revision not found in history of end revision."
6791
msgstr ""
6792
7490.31.3 by Jelmer Vernooij
Update po.
6793
#: breezy/log.py:1106 breezy/log.py:1164
6138.4.4 by Jonathan Riddell
update bzr.pot
6794
msgid "Logging revision 0 is invalid."
6795
msgstr ""
6796
7490.31.3 by Jelmer Vernooij
Update po.
6797
#: breezy/log.py:1109 breezy/log.py:1166
6138.4.4 by Jonathan Riddell
update bzr.pot
6798
msgid "Start revision must be older than the end revision."
6799
msgstr ""
6800
7490.31.3 by Jelmer Vernooij
Update po.
6801
#: breezy/log.py:1865
6138.4.4 by Jonathan Riddell
update bzr.pot
6802
#, python-format
6803
msgid "unknown log formatter: %r"
6804
msgstr ""
6805
7490.31.3 by Jelmer Vernooij
Update po.
6806
#: breezy/log.py:2162
6143.1.7 by Jonathan Riddell
update bzr.pot
6807
msgid "fixes bug"
6150.1.1 by Jonathan Riddell
update bzr.pot
6808
msgid_plural "fixes bugs"
6143.1.7 by Jonathan Riddell
update bzr.pot
6809
msgstr[0] ""
6810
msgstr[1] ""
6811
7490.31.3 by Jelmer Vernooij
Update po.
6812
#: breezy/log.py:2165
7185.1.1 by Jelmer Vernooij
Update pot file.
6813
msgid "related bug"
6814
msgid_plural "related bugs"
6815
msgstr[0] ""
6816
msgstr[1] ""
6817
7490.31.3 by Jelmer Vernooij
Update po.
6818
#: breezy/merge.py:666
6138.4.4 by Jonathan Riddell
update bzr.pot
6819
msgid "All changes applied successfully."
6820
msgstr ""
6821
7490.31.3 by Jelmer Vernooij
Update po.
6822
#: breezy/merge.py:668
6138.4.4 by Jonathan Riddell
update bzr.pot
6823
#, python-format
6824
msgid "%d conflicts encountered."
6825
msgstr ""
6826
7490.31.3 by Jelmer Vernooij
Update po.
6827
#: breezy/merge.py:799 breezy/merge.py:1834
6138.4.4 by Jonathan Riddell
update bzr.pot
6828
msgid "Preparing file merge"
6829
msgstr ""
6830
7490.31.3 by Jelmer Vernooij
Update po.
6831
#: breezy/mergeable.py:81
6832
msgid "A directory cannot be a bundle"
6833
msgstr ""
6834
6835
#: breezy/multiparent.py:439
6138.4.4 by Jonathan Riddell
update bzr.pot
6836
msgid "Importing revisions"
6837
msgstr ""
6838
6093.2.1 by Jonathan Riddell
add .pot file to archive
6839
# help of 'help' option
7490.31.3 by Jelmer Vernooij
Update po.
6840
#: breezy/option.py:551
6093.2.1 by Jonathan Riddell
add .pot file to archive
6841
msgid "Show help message."
6842
msgstr ""
6843
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6844
# help of 'quiet' option
7490.31.3 by Jelmer Vernooij
Update po.
6845
#: breezy/option.py:553
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6846
msgid "Only display errors and warnings."
6847
msgstr ""
6848
6093.2.1 by Jonathan Riddell
add .pot file to archive
6849
# help of 'usage' option
7490.31.3 by Jelmer Vernooij
Update po.
6850
#: breezy/option.py:556
6093.2.1 by Jonathan Riddell
add .pot file to archive
6851
msgid "Show usage message and options."
6852
msgstr ""
6853
6854
# help of 'verbose' option
7490.31.3 by Jelmer Vernooij
Update po.
6855
#: breezy/option.py:558
6093.2.1 by Jonathan Riddell
add .pot file to archive
6856
msgid "Display more information."
6857
msgstr ""
6858
6859
# help of 'change' option
7490.31.3 by Jelmer Vernooij
Update po.
6860
#: breezy/option.py:566
6093.2.1 by Jonathan Riddell
add .pot file to archive
6861
msgid ""
6862
"Select changes introduced by the specified revision. See also \"help "
6863
"revisionspec\"."
6864
msgstr ""
6865
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6866
# help of 'directory' option
7490.31.3 by Jelmer Vernooij
Update po.
6867
#: breezy/option.py:568
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6868
msgid "Branch to operate on, instead of working directory."
6869
msgstr ""
6870
6871
# help of 'log-format=long' option
7490.31.3 by Jelmer Vernooij
Update po.
6872
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6873
msgid "Detailed log format."
6874
msgstr ""
6875
6876
# help of 'log-format=gnu-changelog' option
7490.31.3 by Jelmer Vernooij
Update po.
6877
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6878
msgid "Format used by GNU ChangeLog files."
6879
msgstr ""
6880
6881
# help of 'log-format=line' option
7490.31.3 by Jelmer Vernooij
Update po.
6882
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6883
msgid "Log format with one line per revision."
6884
msgstr ""
6885
6886
# help of 'log-format=short' option
7490.31.3 by Jelmer Vernooij
Update po.
6887
#: breezy/option.py:570
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6888
msgid "Moderately short log format."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6889
msgstr ""
6890
6891
# help of 'log-format' option
7490.31.3 by Jelmer Vernooij
Update po.
6892
#: breezy/option.py:570
6093.2.1 by Jonathan Riddell
add .pot file to archive
6893
msgid "Use specified log format."
6894
msgstr ""
6895
6896
# title of 'log-format' option
7490.31.3 by Jelmer Vernooij
Update po.
6897
#: breezy/option.py:572
6093.2.1 by Jonathan Riddell
add .pot file to archive
6898
msgid "Log format"
6899
msgstr ""
6900
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6901
# help of 'merge-type=lca' option
7490.31.3 by Jelmer Vernooij
Update po.
6902
#: breezy/option.py:574
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6903
msgid "LCA-newness merge."
6904
msgstr ""
6905
6906
# help of 'merge-type=diff3' option
7490.31.3 by Jelmer Vernooij
Update po.
6907
#: breezy/option.py:574
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6908
msgid "Merge using external diff3."
6909
msgstr ""
6910
6911
# help of 'merge-type=merge3' option
7490.31.3 by Jelmer Vernooij
Update po.
6912
#: breezy/option.py:574
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6913
msgid "Native diff3-style merge."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6914
msgstr ""
6915
6916
# help of 'merge-type' option
7490.31.3 by Jelmer Vernooij
Update po.
6917
#: breezy/option.py:574
6093.2.1 by Jonathan Riddell
add .pot file to archive
6918
msgid "Select a particular merge algorithm."
6919
msgstr ""
6920
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6921
# help of 'merge-type=weave' option
7490.31.3 by Jelmer Vernooij
Update po.
6922
#: breezy/option.py:574
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6923
msgid "Weave-based merge."
6924
msgstr ""
6925
6093.2.1 by Jonathan Riddell
add .pot file to archive
6926
# title of 'merge-type' option
7490.31.3 by Jelmer Vernooij
Update po.
6927
#: breezy/option.py:576
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6928
msgid "Merge algorithm"
6929
msgstr ""
6930
6931
# help of 'message' option
7490.31.3 by Jelmer Vernooij
Update po.
6932
#: breezy/option.py:579
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6933
msgid "Message string."
6934
msgstr ""
6935
6936
# help of 'null' option
7490.31.3 by Jelmer Vernooij
Update po.
6937
#: breezy/option.py:581
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6938
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6939
msgstr ""
6940
6941
# help of 'overwrite' option
7490.31.3 by Jelmer Vernooij
Update po.
6942
#: breezy/option.py:583
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6943
msgid "Ignore differences between branches and overwrite unconditionally."
6944
msgstr ""
6945
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6946
# help of 'remember' option
7490.31.3 by Jelmer Vernooij
Update po.
6947
#: breezy/option.py:585
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6948
msgid "Remember the specified location as a default."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6949
msgstr ""
6950
6951
# help of 'reprocess' option
7490.31.3 by Jelmer Vernooij
Update po.
6952
#: breezy/option.py:587
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6953
msgid "Reprocess to reduce spurious conflicts."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6954
msgstr ""
6955
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6956
# help of 'revision' option
7490.31.3 by Jelmer Vernooij
Update po.
6957
#: breezy/option.py:591
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6958
msgid "See \"help revisionspec\" for details."
6959
msgstr ""
6960
6961
# help of 'show-ids' option
7490.31.3 by Jelmer Vernooij
Update po.
6962
#: breezy/option.py:593
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6963
msgid "Show internal object ids."
6964
msgstr ""
6965
6966
# help of 'timezone' option
7490.31.3 by Jelmer Vernooij
Update po.
6967
#: breezy/option.py:596
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6968
msgid "Display timezone as local, original, or utc."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6969
msgstr ""
6970
7490.31.3 by Jelmer Vernooij
Update po.
6971
#: breezy/osutils.py:100
6138.4.4 by Jonathan Riddell
update bzr.pot
6972
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6973
msgstr ""
6974
7490.31.3 by Jelmer Vernooij
Update po.
6975
#: breezy/osutils.py:225
6138.4.4 by Jonathan Riddell
update bzr.pot
6976
msgid "lstat/stat of ({0!r}): {1!r}"
6977
msgstr ""
6978
7490.31.3 by Jelmer Vernooij
Update po.
6979
#: breezy/osutils.py:1051 breezy/osutils.py:1062
6138.4.4 by Jonathan Riddell
update bzr.pot
6980
#, python-format
6981
msgid "sorry, %r not allowed in path"
6982
msgstr ""
6983
7490.31.3 by Jelmer Vernooij
Update po.
6984
#: breezy/osutils.py:1281
6138.4.4 by Jonathan Riddell
update bzr.pot
6985
#, python-format
6986
msgid "%r is too short to calculate a relative path"
6987
msgstr ""
6988
6093.2.1 by Jonathan Riddell
add .pot file to archive
6989
# help of 'plugin' option of 'bash-completion' command
7490.31.3 by Jelmer Vernooij
Update po.
6990
# help of 'plugin' option of 'zsh-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
6991
#: breezy/plugins/bash_completion/bashcomp.py:419
7490.31.3 by Jelmer Vernooij
Update po.
6992
#: breezy/plugins/zsh_completion/zshcomp.py:257
6093.2.1 by Jonathan Riddell
add .pot file to archive
6993
msgid "Enable completions for the selected plugin (default: all plugins)"
6994
msgstr ""
6995
7185.1.1 by Jelmer Vernooij
Update pot file.
6996
#: breezy/plugins/bash_completion/bashcomp.py:420
6093.2.1 by Jonathan Riddell
add .pot file to archive
6997
msgid "Generate a shell function for bash command line completion."
6998
msgstr ""
6999
7185.1.1 by Jelmer Vernooij
Update pot file.
7000
#: breezy/plugins/bash_completion/bashcomp.py:422
6093.2.1 by Jonathan Riddell
add .pot file to archive
7001
msgid ""
7002
"This command generates a shell function which can be used by bash to\n"
7003
"automatically complete the currently typed command when the user presses\n"
7004
"the completion key (usually tab)."
7005
msgstr ""
7006
7185.1.1 by Jelmer Vernooij
Update pot file.
7007
#: breezy/plugins/bash_completion/bashcomp.py:426
6093.2.1 by Jonathan Riddell
add .pot file to archive
7008
msgid ""
7009
"Commonly used like this:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7010
"    eval \"`brz bash-completion`\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
7011
msgstr ""
7012
7013
# help of 'function-name' option of 'bash-completion' command
7490.31.3 by Jelmer Vernooij
Update po.
7014
# help of 'function-name' option of 'zsh-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7015
#: breezy/plugins/bash_completion/bashcomp.py:432
7490.31.3 by Jelmer Vernooij
Update po.
7016
#: breezy/plugins/zsh_completion/zshcomp.py:270
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7017
msgid "Name of the generated function (default: _brz)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7018
msgstr ""
7019
7020
# help of 'function-only' option of 'bash-completion' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7021
#: breezy/plugins/bash_completion/bashcomp.py:434
6093.2.1 by Jonathan Riddell
add .pot file to archive
7022
msgid "Generate only the shell function, don't enable it"
7023
msgstr ""
7024
7185.1.1 by Jelmer Vernooij
Update pot file.
7025
#: breezy/plugins/fastimport/cmds.py:79
7026
msgid "Backend for fast Bazaar data importers."
7027
msgstr ""
7028
7029
#: breezy/plugins/fastimport/cmds.py:81
7030
msgid ""
7031
"This command reads a mixed command/data stream and creates\n"
7032
"branches in a Bazaar repository accordingly. The preferred\n"
7033
"recipe is::"
7034
msgstr ""
7035
7036
#: breezy/plugins/fastimport/cmds.py:85
7037
msgid "  bzr fast-import project.fi project.bzr"
7038
msgstr ""
7039
7040
#: breezy/plugins/fastimport/cmds.py:87
7041
msgid ""
7042
"Numerous commands are provided for generating a fast-import file\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7043
"to use as input.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
7044
"To specify standard input as the input stream, use a\n"
7045
"source name of '-' (instead of project.fi). If the source name\n"
7046
"ends in '.gz', it is assumed to be compressed in gzip format."
7047
msgstr ""
7048
7049
#: breezy/plugins/fastimport/cmds.py:93
7050
msgid ""
7051
"project.bzr will be created if it doesn't exist. If it exists\n"
7052
"already, it should be empty or be an existing Bazaar repository\n"
7053
"or branch. If not specified, the current directory is assumed."
7054
msgstr ""
7055
7056
#: breezy/plugins/fastimport/cmds.py:97
7057
msgid ""
7058
"fast-import will intelligently select the format to use when\n"
7059
"creating a repository or branch. If you are running Bazaar 1.17\n"
7060
"up to Bazaar 2.0, the default format for Bazaar 2.x (\"2a\") is used.\n"
7061
"Otherwise, the current default format (\"pack-0.92\" for Bazaar 1.x)\n"
7062
"is used. If you wish to specify a custom format, use the `--format`\n"
7063
"option."
7064
msgstr ""
7065
7066
#: breezy/plugins/fastimport/cmds.py:104 breezy/plugins/fastimport/cmds.py:176
7067
#: breezy/plugins/fastimport/cmds.py:190 breezy/plugins/fastimport/cmds.py:373
7068
msgid " .. note::"
7069
msgstr ""
7070
7071
#: breezy/plugins/fastimport/cmds.py:106
7072
msgid ""
7073
"    To maintain backwards compatibility, fast-import lets you\n"
7074
"    create the target repository or standalone branch yourself.\n"
7075
"    It is recommended though that you let fast-import create\n"
7076
"    these for you instead."
7077
msgstr ""
7078
7079
#: breezy/plugins/fastimport/cmds.py:111
7080
msgid ":Branch mapping rules:"
7081
msgstr ""
7082
7083
#: breezy/plugins/fastimport/cmds.py:113
7084
msgid " Git reference names are mapped to Bazaar branch names as follows:"
7085
msgstr ""
7086
7087
#: breezy/plugins/fastimport/cmds.py:115
7088
msgid ""
7089
" * refs/heads/foo is mapped to foo\n"
7090
" * refs/remotes/origin/foo is mapped to foo.remote\n"
7091
" * refs/tags/foo is mapped to foo.tag\n"
7092
" * */master is mapped to trunk, trunk.remote, etc.\n"
7093
" * */trunk is mapped to git-trunk, git-trunk.remote, etc."
7094
msgstr ""
7095
7096
#: breezy/plugins/fastimport/cmds.py:121
7097
msgid ":Branch creation rules:"
7098
msgstr ""
7099
7100
#: breezy/plugins/fastimport/cmds.py:123
7101
msgid ""
7102
" When a shared repository is created or found at the destination,\n"
7103
" branches are created inside it. In the simple case of a single\n"
7104
" branch (refs/heads/master) inside the input file, the branch is\n"
7105
" project.bzr/trunk."
7106
msgstr ""
7107
7108
#: breezy/plugins/fastimport/cmds.py:128
7109
msgid ""
7110
" When a standalone branch is found at the destination, the trunk\n"
7111
" is imported there and warnings are output about any other branches\n"
7112
" found in the input file."
7113
msgstr ""
7114
7115
#: breezy/plugins/fastimport/cmds.py:132
7116
msgid ""
7117
" When a branch in a shared repository is found at the destination,\n"
7118
" that branch is made the trunk and other branches, if any, are\n"
7119
" created in sister directories."
7120
msgstr ""
7121
7122
#: breezy/plugins/fastimport/cmds.py:136
7123
msgid ":Working tree updates:"
7124
msgstr ""
7125
7126
#: breezy/plugins/fastimport/cmds.py:138
7127
msgid ""
7128
" The working tree is generated for the trunk branch. If multiple\n"
7129
" branches are created, a message is output on completion explaining\n"
7130
" how to create the working trees for other branches."
7131
msgstr ""
7132
7133
#: breezy/plugins/fastimport/cmds.py:142
7134
msgid ":Custom exporters:"
7135
msgstr ""
7136
7137
#: breezy/plugins/fastimport/cmds.py:144
7138
msgid ""
7139
" The fast-export-from-xxx commands typically call more advanced\n"
7140
" xxx-fast-export scripts. You are welcome to use the advanced\n"
7141
" scripts if you prefer."
7142
msgstr ""
7143
7144
#: breezy/plugins/fastimport/cmds.py:148
7145
msgid ""
7146
" If you wish to write a custom exporter for your project, see\n"
7147
" http://bazaar-vcs.org/BzrFastImport for the detailed protocol\n"
7148
" specification. In many cases, exporters can be written quite\n"
7149
" quickly using whatever scripting/programming language you like."
7150
msgstr ""
7151
7152
#: breezy/plugins/fastimport/cmds.py:153
7153
msgid ":User mapping:"
7154
msgstr ""
7155
7156
#: breezy/plugins/fastimport/cmds.py:155
7157
msgid ""
7158
" Some source repositories store just the user name while Bazaar\n"
7159
" prefers a full email address. You can adjust user-ids while\n"
7160
" importing by using the --user-map option. The argument is a\n"
7161
" text file with lines in the format::"
7162
msgstr ""
7163
7164
#: breezy/plugins/fastimport/cmds.py:160
7165
msgid "   old-id = new-id"
7166
msgstr ""
7167
7168
#: breezy/plugins/fastimport/cmds.py:162
7169
msgid ""
7170
" Blank lines and lines beginning with # are ignored.\n"
7171
" If old-id has the special value '@', then users without an\n"
7172
" email address will get one created by using the matching new-id\n"
7173
" as the domain, unless a more explicit address is given for them.\n"
7174
" For example, given the user-map of::"
7175
msgstr ""
7176
7177
#: breezy/plugins/fastimport/cmds.py:168
7178
msgid ""
7179
"   @ = example.com\n"
7180
"   bill = William Jones <bill@example.com>"
7181
msgstr ""
7182
7183
#: breezy/plugins/fastimport/cmds.py:171
7184
msgid " then user-ids are mapped as follows::"
7185
msgstr ""
7186
7187
#: breezy/plugins/fastimport/cmds.py:173
7188
msgid ""
7189
"  maria => maria <maria@example.com>\n"
7190
"  bill => William Jones <bill@example.com>"
7191
msgstr ""
7192
7193
#: breezy/plugins/fastimport/cmds.py:178
7194
msgid ""
7195
"    User mapping is supported by both the fast-import and\n"
7196
"    fast-import-filter commands."
7197
msgstr ""
7198
7199
#: breezy/plugins/fastimport/cmds.py:181
7200
msgid ":Blob tracking:"
7201
msgstr ""
7202
7203
#: breezy/plugins/fastimport/cmds.py:183
7204
msgid ""
7205
" As some exporters (like git-fast-export) reuse blob data across\n"
7206
" commits, fast-import makes two passes over the input file by\n"
7207
" default. In the first pass, it collects data about what blobs are\n"
7208
" used when, along with some other statistics (e.g. total number of\n"
7209
" commits). In the second pass, it generates the repository and\n"
7210
" branches."
7211
msgstr ""
7212
7213
#: breezy/plugins/fastimport/cmds.py:192
7214
msgid ""
7215
"    The initial pass isn't done if the --info option is used\n"
7216
"    to explicitly pass in information about the input stream.\n"
7217
"    It also isn't done if the source is standard input. In the\n"
7218
"    latter case, memory consumption may be higher than otherwise\n"
7219
"    because some blobs may be kept in memory longer than necessary."
7220
msgstr ""
7221
7222
#: breezy/plugins/fastimport/cmds.py:198
7223
msgid ":Restarting an import:"
7224
msgstr ""
7225
7226
#: breezy/plugins/fastimport/cmds.py:200
7227
msgid ""
7228
" At checkpoints and on completion, the commit-id -> revision-id\n"
7229
" map is saved to a file called 'fastimport-id-map' in the control\n"
7230
" directory for the repository (e.g. .bzr/repository). If the import\n"
7231
" is interrupted or unexpectedly crashes, it can be started again\n"
7232
" and this file will be used to skip over already loaded revisions.\n"
7233
" As long as subsequent exports from the original source begin\n"
7234
" with exactly the same revisions, you can use this feature to\n"
7235
" maintain a mirror of a repository managed by a foreign tool.\n"
7236
" If and when Bazaar is used to manage the repository, this file\n"
7237
" can be safely deleted."
7238
msgstr ""
7239
7240
#: breezy/plugins/fastimport/cmds.py:213
7241
msgid " Import a Subversion repository into Bazaar::"
7242
msgstr ""
7243
7244
#: breezy/plugins/fastimport/cmds.py:215
7245
msgid ""
7246
"   svn-fast-export /svn/repo/path > project.fi\n"
7247
"   bzr fast-import project.fi project.bzr"
7248
msgstr ""
7249
7250
#: breezy/plugins/fastimport/cmds.py:218
7251
msgid " Import a CVS repository into Bazaar::"
7252
msgstr ""
7253
7254
#: breezy/plugins/fastimport/cmds.py:220
7255
msgid ""
7256
"   cvs2git /cvs/repo/path > project.fi\n"
7257
"   bzr fast-import project.fi project.bzr"
7258
msgstr ""
7259
7260
#: breezy/plugins/fastimport/cmds.py:223
7261
msgid " Import a Git repository into Bazaar::"
7262
msgstr ""
7263
7264
#: breezy/plugins/fastimport/cmds.py:225
7265
msgid ""
7266
"   cd /git/repo/path\n"
7267
"   git fast-export --all > project.fi\n"
7268
"   bzr fast-import project.fi project.bzr"
7269
msgstr ""
7270
7271
#: breezy/plugins/fastimport/cmds.py:229
7272
msgid " Import a Mercurial repository into Bazaar::"
7273
msgstr ""
7274
7275
#: breezy/plugins/fastimport/cmds.py:231
7276
msgid ""
7277
"   cd /hg/repo/path\n"
7278
"   hg fast-export > project.fi\n"
7279
"   bzr fast-import project.fi project.bzr"
7280
msgstr ""
7281
7282
#: breezy/plugins/fastimport/cmds.py:235
7283
msgid " Import a Darcs repository into Bazaar::"
7284
msgstr ""
7285
7286
#: breezy/plugins/fastimport/cmds.py:237
7287
msgid ""
7288
"   cd /darcs/repo/path\n"
7289
"   darcs-fast-export > project.fi\n"
7290
"   bzr fast-import project.fi project.bzr"
7291
msgstr ""
7292
7293
# help of 'user-map' option of 'fast-import' command
7294
#: breezy/plugins/fastimport/cmds.py:246
7295
msgid "Path to file containing a map of user-ids."
7296
msgstr ""
7297
7298
# help of 'info' option of 'fast-import' command
7299
#: breezy/plugins/fastimport/cmds.py:249
7300
msgid "Path to file containing caching hints."
7301
msgstr ""
7302
7303
# help of 'trees' option of 'fast-import' command
7304
#: breezy/plugins/fastimport/cmds.py:252
7305
msgid "Update all working trees, not just trunk's."
7306
msgstr ""
7307
7308
# help of 'count' option of 'fast-import' command
7309
#: breezy/plugins/fastimport/cmds.py:255
7310
msgid "Import this many revisions then exit."
7311
msgstr ""
7312
7313
# help of 'checkpoint' option of 'fast-import' command
7314
#: breezy/plugins/fastimport/cmds.py:258
7315
msgid "Checkpoint automatically every N revisions. The default is 10000."
7316
msgstr ""
7317
7318
# help of 'autopack' option of 'fast-import' command
7319
#: breezy/plugins/fastimport/cmds.py:262
7320
msgid "Pack every N checkpoints. The default is 4."
7321
msgstr ""
7322
7323
# help of 'inv-cache' option of 'fast-import' command
7324
#: breezy/plugins/fastimport/cmds.py:265
7325
msgid "Number of inventories to cache."
7326
msgstr ""
7327
7328
# help of 'mode' option of 'fast-import' command
7329
#: breezy/plugins/fastimport/cmds.py:268
7330
msgid "The import algorithm to use."
7331
msgstr ""
7332
7333
# title of 'mode' option of 'fast-import' command
7334
#: breezy/plugins/fastimport/cmds.py:269
7335
msgid "Import Algorithm"
7336
msgstr ""
7337
7338
# help of 'mode=default' option of 'fast-import' command
7339
#: breezy/plugins/fastimport/cmds.py:270
7340
msgid "Use the preferred algorithm (inventory deltas)."
7341
msgstr ""
7342
7343
# help of 'mode=experimental' option of 'fast-import' command
7344
#: breezy/plugins/fastimport/cmds.py:271
7345
msgid "Enable experimental features."
7346
msgstr ""
7347
7348
# help of 'format' option of 'fast-import' command
7349
#: breezy/plugins/fastimport/cmds.py:281
7350
msgid ""
7351
"Specify a format for the created repository. See \"bzr help formats\" for "
7352
"details."
7353
msgstr ""
7354
7355
#: breezy/plugins/fastimport/cmds.py:347
7356
msgid "Generate a fast-import stream from a Bazaar branch."
7357
msgstr ""
7358
7359
#: breezy/plugins/fastimport/cmds.py:349
7360
msgid ""
7361
"This program generates a stream from a Bazaar branch in fast-import\n"
7362
"format used by tools such as bzr fast-import, git-fast-import and\n"
7363
"hg-fast-import."
7364
msgstr ""
7365
7366
#: breezy/plugins/fastimport/cmds.py:353
7367
msgid ""
7368
"It takes two optional arguments: the source bzr branch to export and\n"
7369
"the destination to write the file to write the fastimport stream to."
7370
msgstr ""
7371
7372
#: breezy/plugins/fastimport/cmds.py:356
7373
msgid ""
7374
"If no source is specified, it will search for a branch in the\n"
7375
"current directory."
7376
msgstr ""
7377
7378
#: breezy/plugins/fastimport/cmds.py:359
7379
msgid ""
7380
"If no destination is given or the destination is '-', standard output\n"
7381
"is used. Otherwise, the destination is the name of a file. If the\n"
7382
"destination ends in '.gz', the output will be compressed into gzip\n"
7383
"format."
7384
msgstr ""
7385
7386
#: breezy/plugins/fastimport/cmds.py:364
7387
msgid ":Round-tripping:"
7388
msgstr ""
7389
7390
#: breezy/plugins/fastimport/cmds.py:366
7391
msgid ""
7392
" Recent versions of the fast-import specification support features\n"
7393
" that allow effective round-tripping most of the metadata in Bazaar\n"
7394
" branches. As such, fast-exporting a branch and fast-importing the data\n"
7395
" produced will create a new repository with roughly equivalent history, i."
7396
"e.\n"
7397
" \"bzr log -v -p --include-merges --forward\" on the old branch and\n"
7398
" new branch should produce similar, if not identical, results."
7399
msgstr ""
7400
7401
#: breezy/plugins/fastimport/cmds.py:375
7402
msgid ""
7403
"    Be aware that the new repository may appear to have similar history\n"
7404
"    but internally it is quite different with new revision-ids and\n"
7405
"    file-ids assigned. As a consequence, the ability to easily merge\n"
7406
"    with branches based on the old repository is lost. Depending on your\n"
7407
"    reasons for producing a new repository, this may or may not be an\n"
7408
"    issue."
7409
msgstr ""
7410
7411
#: breezy/plugins/fastimport/cmds.py:382
7412
msgid ":Interoperability:"
7413
msgstr ""
7414
7415
#: breezy/plugins/fastimport/cmds.py:384
7416
msgid ""
7417
" fast-export can use the following \"extended features\" to\n"
7418
" produce a richer data stream:"
7419
msgstr ""
7420
7421
#: breezy/plugins/fastimport/cmds.py:387
7422
msgid ""
7423
" * *multiple-authors* - if a commit has multiple authors (as commonly\n"
7424
"   occurs in pair-programming), all authors will be included in the\n"
7425
"   output, not just the first author"
7426
msgstr ""
7427
7428
#: breezy/plugins/fastimport/cmds.py:391
7429
msgid ""
7430
" * *commit-properties* - custom metadata per commit that Bazaar stores\n"
7431
"   in revision properties (e.g. branch-nick and bugs fixed by this\n"
7432
"   change) will be included in the output."
7433
msgstr ""
7434
7435
#: breezy/plugins/fastimport/cmds.py:395
7436
msgid ""
7437
" * *empty-directories* - directories, even the empty ones, will be\n"
7438
"   included in the output."
7439
msgstr ""
7440
7441
#: breezy/plugins/fastimport/cmds.py:398
7442
msgid ""
7443
" To disable these features and produce output acceptable to git 1.6,\n"
7444
" use the --plain option. To enable these features, use --no-plain.\n"
7445
" Currently, --plain is the default but that will change in the near\n"
7446
" future once the feature names and definitions are formally agreed\n"
7447
" to by the broader fast-import developer community."
7448
msgstr ""
7449
7450
#: breezy/plugins/fastimport/cmds.py:404
7451
msgid ""
7452
" Git has stricter naming rules for tags and fast-export --plain\n"
7453
" will skip tags which can't be imported into git. To replace characters\n"
7454
" unsupported in git with an underscore instead, specify\n"
7455
" --rewrite-tag-names."
7456
msgstr ""
7457
7458
#: breezy/plugins/fastimport/cmds.py:409
7459
msgid ":History truncation:"
7460
msgstr ""
7461
7462
#: breezy/plugins/fastimport/cmds.py:411
7463
msgid ""
7464
" It is sometimes convenient to simply truncate the revision history at a\n"
7465
" certain point.  The --baseline option, to be used in conjunction with -r,\n"
7466
" emits a baseline commit containing the state of the entire source tree at\n"
7467
" the first requested revision.  This allows a user to produce a tree\n"
7468
" identical to the original without munging multiple exports."
7469
msgstr ""
7470
7471
#: breezy/plugins/fastimport/cmds.py:419
7472
msgid " To produce data destined for import into Bazaar::"
7473
msgstr ""
7474
7475
#: breezy/plugins/fastimport/cmds.py:421
7476
msgid "   bzr fast-export --no-plain my-bzr-branch my.fi.gz"
7477
msgstr ""
7478
7479
#: breezy/plugins/fastimport/cmds.py:423
7480
msgid " To produce data destined for Git 1.6::"
7481
msgstr ""
7482
7483
#: breezy/plugins/fastimport/cmds.py:425
7484
msgid "   bzr fast-export --plain my-bzr-branch my.fi"
7485
msgstr ""
7486
7487
#: breezy/plugins/fastimport/cmds.py:427
7488
msgid ""
7489
" To import several unmerged but related branches into the same repository,\n"
7490
" use the --{export,import}-marks options, and specify a name for the git\n"
7491
" branch like this::"
7492
msgstr ""
7493
7494
#: breezy/plugins/fastimport/cmds.py:431
7495
msgid ""
7496
"   bzr fast-export --export-marks=marks.bzr project.dev |\n"
7497
"          GIT_DIR=project/.git git-fast-import --export-marks=marks.git"
7498
msgstr ""
7499
7500
#: breezy/plugins/fastimport/cmds.py:434
7501
msgid ""
7502
"   bzr fast-export --import-marks=marks.bzr -b other project.other |\n"
7503
"          GIT_DIR=project/.git git-fast-import --import-marks=marks.git"
7504
msgstr ""
7505
7506
#: breezy/plugins/fastimport/cmds.py:437
7507
msgid ""
7508
" If you get a \"Missing space after source\" error from git-fast-import,\n"
7509
" see the top of the commands.py module for a work-around."
7510
msgstr ""
7511
7512
#: breezy/plugins/fastimport/cmds.py:440
7513
msgid ""
7514
" Since bzr uses per-branch tags and git/hg use per-repo tags, the\n"
7515
" way bzr fast-export presently emits tags (unconditional reset &\n"
7516
" new ref) may result in clashes when several different branches\n"
7517
" are imported into single git/hg repo.  If this occurs, use the\n"
7518
" bzr fast-export option --no-tags during the export of one or more\n"
7519
" branches to avoid the issue."
7520
msgstr ""
7521
7522
# help of 'git-branch' option of 'fast-export' command
7523
#: breezy/plugins/fastimport/cmds.py:453
7524
msgid "Name of the git branch to create (default=master)."
7525
msgstr ""
7526
7527
# help of 'checkpoint' option of 'fast-export' command
7528
#: breezy/plugins/fastimport/cmds.py:456
7529
msgid "Checkpoint every N revisions (default=10000)."
7530
msgstr ""
7531
7532
# help of 'marks' option of 'fast-export' command
7533
#: breezy/plugins/fastimport/cmds.py:459
7534
msgid "Import marks from and export marks to file."
7535
msgstr ""
7536
7537
# help of 'import-marks' option of 'fast-export' command
7538
# help of 'import-marks' option of 'fast-import' command
7539
#: breezy/plugins/fastimport/cmds.py:462
7540
msgid "Import marks from file."
7541
msgstr ""
7542
7543
# help of 'export-marks' option of 'fast-export' command
7544
# help of 'export-marks' option of 'fast-import' command
7545
#: breezy/plugins/fastimport/cmds.py:465
7546
msgid "Export marks to file."
7547
msgstr ""
7548
7549
# help of 'plain' option of 'fast-export' command
7550
#: breezy/plugins/fastimport/cmds.py:468
7551
msgid "Exclude metadata to maximise interoperability."
7552
msgstr ""
7553
7554
# help of 'rewrite-tag-names' option of 'fast-export' command
7555
#: breezy/plugins/fastimport/cmds.py:471
7556
msgid "Replace characters invalid in git with '_' (plain mode only)."
7557
msgstr ""
7558
7559
# help of 'baseline' option of 'fast-export' command
7560
#: breezy/plugins/fastimport/cmds.py:475
7561
msgid "Export an 'absolute' baseline commit prior tothe first relative commit"
7562
msgstr ""
7563
7564
# help of 'no-tags' option of 'fast-export' command
7565
#: breezy/plugins/fastimport/cmds.py:479
7566
msgid "Don't export tags"
7567
msgstr ""
7568
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7569
#: breezy/plugins/launchpad/account.py:66
6504.1.1 by Vincent Ladeuil
Update translation template
7570
msgid "Setting ssh/sftp usernames for launchpad.net."
7571
msgstr ""
7572
7185.1.1 by Jelmer Vernooij
Update pot file.
7573
#: breezy/plugins/launchpad/cmds.py:44
6093.2.1 by Jonathan Riddell
add .pot file to archive
7574
msgid "Open a Launchpad branch page in your web browser."
7575
msgstr ""
7576
7577
# help of 'dry-run' option of 'launchpad-open' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7578
#: breezy/plugins/launchpad/cmds.py:49
6093.2.1 by Jonathan Riddell
add .pot file to archive
7579
msgid "Do not actually open the browser. Just say the URL we would use."
7580
msgstr ""
7581
7185.1.1 by Jelmer Vernooij
Update pot file.
7582
#: breezy/plugins/launchpad/cmds.py:85
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7583
#, python-format
7584
msgid "Opening %s in web browser"
7585
msgstr ""
7586
7185.1.1 by Jelmer Vernooij
Update pot file.
7587
#: breezy/plugins/launchpad/cmds.py:93
6093.2.1 by Jonathan Riddell
add .pot file to archive
7588
msgid "Show or set the Launchpad user ID."
7589
msgstr ""
7590
7185.1.1 by Jelmer Vernooij
Update pot file.
7591
#: breezy/plugins/launchpad/cmds.py:95
6093.2.1 by Jonathan Riddell
add .pot file to archive
7592
msgid ""
7593
"When communicating with Launchpad, some commands need to know your\n"
7594
"Launchpad user ID.  This command can be used to set or show the\n"
7595
"user ID that Bazaar will use for such communication."
7596
msgstr ""
7597
7185.1.1 by Jelmer Vernooij
Update pot file.
7598
#: breezy/plugins/launchpad/cmds.py:99
6093.2.1 by Jonathan Riddell
add .pot file to archive
7599
msgid ""
7600
":Examples:\n"
7601
"  Show the Launchpad ID of the current user::"
7602
msgstr ""
7603
7185.1.1 by Jelmer Vernooij
Update pot file.
7604
#: breezy/plugins/launchpad/cmds.py:102
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7605
msgid "      brz launchpad-login"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7606
msgstr ""
7607
7185.1.1 by Jelmer Vernooij
Update pot file.
7608
#: breezy/plugins/launchpad/cmds.py:104
6093.2.1 by Jonathan Riddell
add .pot file to archive
7609
msgid "  Set the Launchpad ID of the current user to 'bob'::"
7610
msgstr ""
7611
7185.1.1 by Jelmer Vernooij
Update pot file.
7612
#: breezy/plugins/launchpad/cmds.py:106
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7613
msgid "      brz launchpad-login bob"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7614
msgstr ""
7615
7616
# help of 'no-check' option of 'launchpad-login' command
7185.1.1 by Jelmer Vernooij
Update pot file.
7617
#: breezy/plugins/launchpad/cmds.py:113
6093.2.1 by Jonathan Riddell
add .pot file to archive
7618
msgid "Don't check that the user name is valid."
7619
msgstr ""
7620
7185.1.1 by Jelmer Vernooij
Update pot file.
7621
#: breezy/plugins/launchpad/cmds.py:128 breezy/plugins/launchpad/cmds.py:139
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7622
msgid "Launchpad user ID exists and has SSH keys.\n"
7623
msgstr ""
7624
7185.1.1 by Jelmer Vernooij
Update pot file.
7625
#: breezy/plugins/launchpad/cmds.py:131
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7626
msgid "No Launchpad user ID configured.\n"
7627
msgstr ""
7628
7185.1.1 by Jelmer Vernooij
Update pot file.
7629
#: breezy/plugins/launchpad/cmds.py:142
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7630
#, python-format
7631
msgid "Launchpad user ID set to '%s'.\n"
7632
msgstr ""
7633
7185.1.1 by Jelmer Vernooij
Update pot file.
7634
#: breezy/plugins/launchpad/cmds.py:147
7635
msgid "Unset the Launchpad user ID."
7636
msgstr ""
7637
7638
#: breezy/plugins/launchpad/cmds.py:149
7639
msgid ""
7640
"When communicating with Launchpad, some commands need to know your\n"
7641
"Launchpad user ID.  This command will log you out from Launchpad.\n"
7642
"This means that communication with Launchpad will happen over\n"
7643
"HTTPS, and will not require one of your SSH keys to be available."
7644
msgstr ""
7645
7646
#: breezy/plugins/launchpad/cmds.py:161
7647
msgid "Not logged into Launchpad.\n"
7648
msgstr ""
7649
7650
#: breezy/plugins/launchpad/cmds.py:166
7651
#, python-format
7652
msgid "Launchpad user ID %s logged out.\n"
7653
msgstr ""
7654
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7655
#: breezy/plugins/launchpad/cmds.py:236
6093.2.1 by Jonathan Riddell
add .pot file to archive
7656
msgid "Find the proposal to merge this revision."
7657
msgstr ""
7658
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7659
#: breezy/plugins/launchpad/cmds.py:238
6093.2.1 by Jonathan Riddell
add .pot file to archive
7660
msgid ""
7661
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
7662
"This works only if the if the merged_revno was recorded for the merge\n"
7663
"proposal.  The proposal(s) are opened in a web browser."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7664
msgstr ""
7665
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7666
#: breezy/plugins/launchpad/cmds.py:242
6093.2.1 by Jonathan Riddell
add .pot file to archive
7667
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
7668
"Only the revision specified is searched for.  To find the mainline\n"
7669
"revision that merged it into mainline, use the \"mainline\" revision spec."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7670
msgstr ""
7671
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7672
#: breezy/plugins/launchpad/cmds.py:245
6093.2.1 by Jonathan Riddell
add .pot file to archive
7673
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7674
msgstr ""
7675
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7676
#: breezy/plugins/launchpad/cmds.py:247
7677
msgid "  brz lp-find-proposal -r mainline:annotate:README:1"
7678
msgstr ""
7679
7185.1.1 by Jelmer Vernooij
Update pot file.
7680
#: breezy/plugins/launchpad/cmds.py:264
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7681
msgid "No review found."
7682
msgstr ""
7683
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7684
#: breezy/plugins/launchpad/cmds.py:265
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7685
#, python-format
7686
msgid "%d proposals(s) found."
7687
msgstr ""
7688
7490.31.3 by Jelmer Vernooij
Update po.
7689
#: breezy/plugins/launchpad/cmds.py:275
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7690
msgid "Finding proposals"
7691
msgstr ""
7692
7490.31.3 by Jelmer Vernooij
Update po.
7693
#: breezy/plugins/launchpad/lp_api.py:225
7694
#: breezy/plugins/launchpad/lp_api.py:230
7695
#, python-format
7696
msgid "%s is not registered on Launchpad"
7697
msgstr ""
7698
7185.1.1 by Jelmer Vernooij
Update pot file.
7699
#: breezy/plugins/launchpad/lp_api.py:240
7490.31.3 by Jelmer Vernooij
Update po.
7700
#, python-format
7701
msgid "%s has no development focus."
7702
msgstr ""
7703
7185.1.1 by Jelmer Vernooij
Update pot file.
7704
#: breezy/plugins/launchpad/lp_api.py:245
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7705
#, python-format
7706
msgid "development focus %s has no branch."
7707
msgstr ""
7708
7490.31.3 by Jelmer Vernooij
Update po.
7709
#: breezy/plugins/launchpad/lp_api.py:250
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7710
#, python-format
7711
msgid "source package %s has no branch."
7712
msgstr ""
7713
7490.31.3 by Jelmer Vernooij
Update po.
7714
#: breezy/plugins/launchpad/lp_api.py:254
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7715
#, python-format
7716
msgid "%s has no associated product or source package."
7717
msgstr ""
7718
7490.31.3 by Jelmer Vernooij
Update po.
7719
#: breezy/plugins/launchpad/lp_api.py:265
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7720
#, python-format
7721
msgid "%s is already up-to-date."
7722
msgstr ""
7723
7490.31.3 by Jelmer Vernooij
Update po.
7724
#: breezy/plugins/launchpad/lp_api.py:272
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7725
#, python-format
7726
msgid "Pushing to %s"
7727
msgstr ""
7728
7490.31.3 by Jelmer Vernooij
Update po.
7729
#: breezy/plugins/launchpad/lp_directory.py:175
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7730
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7731
msgid ""
7732
"resolution for {0}\n"
7733
"  local: {1}\n"
7734
" remote: {2}"
7735
msgstr ""
7736
7490.31.3 by Jelmer Vernooij
Update po.
7737
#: breezy/plugins/launchpad/lp_propose.py:150
7738
#: breezy/plugins/propose/cmds.py:207
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7739
#, python-format
7740
msgid "There is already a branch merge proposal: %s"
7741
msgstr ""
7742
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7743
#: breezy/plugins/propose/cmds.py:53
7744
msgid "Publish a derived branch."
7745
msgstr ""
7746
7747
#: breezy/plugins/propose/cmds.py:55
7748
msgid ""
7749
"Try to create a public copy of a local branch on a hosting site,\n"
7750
"derived from the specified base branch."
7751
msgstr ""
7752
7753
#: breezy/plugins/propose/cmds.py:58
7754
msgid ""
7755
"Reasonable defaults are picked for owner name, branch name and project\n"
7756
"name, but they can also be overridden from the command-line."
7757
msgstr ""
7758
7759
# help of 'owner' option of 'publish-derived' command
7760
#: breezy/plugins/propose/cmds.py:64
7761
msgid "Owner of the new remote branch."
7762
msgstr ""
7763
7764
# help of 'project' option of 'publish-derived' command
7765
#: breezy/plugins/propose/cmds.py:65
7766
msgid "Project name for the new remote branch."
7767
msgstr ""
7768
7769
# help of 'overwrite' option of 'publish-derived' command
7770
#: breezy/plugins/propose/cmds.py:70
7771
msgid "Overwrite existing commits."
7772
msgstr ""
7773
7774
#: breezy/plugins/propose/cmds.py:80
7775
#, python-format
7776
msgid "Using submit branch %s"
7777
msgstr ""
7778
7779
#: breezy/plugins/propose/cmds.py:83
7780
#, python-format
7781
msgid "Using parent branch %s"
7782
msgstr ""
7783
7490.31.3 by Jelmer Vernooij
Update po.
7784
#: breezy/plugins/propose/cmds.py:95
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7785
#, python-format
7786
msgid "Pushed to %s"
7787
msgstr ""
7788
7490.31.3 by Jelmer Vernooij
Update po.
7789
#: breezy/plugins/propose/cmds.py:129
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7790
msgid "Propose a branch for merging."
7791
msgstr ""
7792
7490.31.3 by Jelmer Vernooij
Update po.
7793
#: breezy/plugins/propose/cmds.py:131
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7794
msgid ""
7795
"This command creates a merge proposal for the local\n"
7796
"branch to the target branch. The format of the merge\n"
7797
"proposal depends on the submit branch."
7798
msgstr ""
7799
7800
# title of 'hoster' option of 'propose-merge' command
7490.31.3 by Jelmer Vernooij
Update po.
7801
#: breezy/plugins/propose/cmds.py:139
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7802
msgid "hoster"
7803
msgstr ""
7804
7805
# help of 'hoster' option of 'propose-merge' command
7490.31.3 by Jelmer Vernooij
Update po.
7806
#: breezy/plugins/propose/cmds.py:140
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7807
msgid "Use the hoster."
7808
msgstr ""
7809
7810
# help of 'reviewers' option of 'propose-merge' command
7490.31.3 by Jelmer Vernooij
Update po.
7811
#: breezy/plugins/propose/cmds.py:143
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7812
msgid "Requested reviewers."
7813
msgstr ""
7814
7815
# help of 'name' option of 'propose-merge' command
7816
# help of 'name' option of 'publish-derived' command
7490.31.3 by Jelmer Vernooij
Update po.
7817
#: breezy/plugins/propose/cmds.py:144
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7818
msgid "Name of the new remote branch."
7819
msgstr ""
7820
7821
# help of 'description' option of 'propose-merge' command
7490.31.3 by Jelmer Vernooij
Update po.
7822
#: breezy/plugins/propose/cmds.py:145
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7823
msgid "Description of the change."
7824
msgstr ""
7825
7826
# help of 'prerequisite' option of 'propose-merge' command
7490.31.3 by Jelmer Vernooij
Update po.
7827
#: breezy/plugins/propose/cmds.py:146
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7828
msgid "Prerequisite branch."
7829
msgstr ""
7830
7490.31.3 by Jelmer Vernooij
Update po.
7831
# help of 'wip' option of 'propose-merge' command
7832
#: breezy/plugins/propose/cmds.py:147
7833
msgid "Mark merge request as work-in-progress"
7834
msgstr ""
7835
7836
# help of 'commit-message' option of 'propose-merge' command
7837
#: breezy/plugins/propose/cmds.py:150
7838
msgid "Set commit message for merge, if supported"
7839
msgstr ""
7840
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7841
# help of 'labels' option of 'propose-merge' command
7490.31.3 by Jelmer Vernooij
Update po.
7842
#: breezy/plugins/propose/cmds.py:152
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7843
msgid "Labels to apply."
7844
msgstr ""
7845
7846
# help of 'no-allow-lossy' option of 'propose-merge' command
7847
# help of 'no-allow-lossy' option of 'publish-derived' command
7490.31.3 by Jelmer Vernooij
Update po.
7848
#: breezy/plugins/propose/cmds.py:154
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7849
msgid "Allow fallback to lossy push, if necessary."
7850
msgstr ""
7851
7490.31.3 by Jelmer Vernooij
Update po.
7852
# help of 'allow-collaboration' option of 'propose-merge' command
7853
#: breezy/plugins/propose/cmds.py:156
7854
msgid "Allow collaboration from target branch maintainer(s)"
7855
msgstr ""
7856
7857
#: breezy/plugins/propose/cmds.py:174 breezy/plugins/propose/cmds.py:233
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7858
msgid "No target location specified or remembered"
7859
msgstr ""
7860
7490.31.3 by Jelmer Vernooij
Update po.
7861
#: breezy/plugins/propose/cmds.py:187
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7862
#, python-format
7863
msgid "Published branch to %s"
7864
msgstr ""
7865
7490.31.3 by Jelmer Vernooij
Update po.
7866
#: breezy/plugins/propose/cmds.py:209
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7867
#, python-format
7868
msgid "Merge proposal created: %s"
7869
msgstr ""
7870
7490.31.3 by Jelmer Vernooij
Update po.
7871
#: breezy/plugins/propose/cmds.py:213
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7872
msgid "Find a merge proposal."
7873
msgstr ""
7874
7490.31.3 by Jelmer Vernooij
Update po.
7875
#: breezy/plugins/propose/cmds.py:238
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7876
#, python-format
7877
msgid "Merge proposal: %s\n"
7878
msgstr ""
7879
7490.31.3 by Jelmer Vernooij
Update po.
7880
#: breezy/plugins/propose/cmds.py:242
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7881
msgid "Log into GitHub."
7882
msgstr ""
7883
7490.31.3 by Jelmer Vernooij
Update po.
7884
#: breezy/plugins/propose/cmds.py:244
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7885
msgid ""
7886
"When communicating with GitHub, some commands need to authenticate to\n"
7887
"GitHub."
7888
msgstr ""
7889
7490.31.3 by Jelmer Vernooij
Update po.
7890
#: breezy/plugins/propose/cmds.py:279
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7891
msgid "Log into a GitLab instance."
7892
msgstr ""
7893
7490.31.3 by Jelmer Vernooij
Update po.
7894
#: breezy/plugins/propose/cmds.py:281
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7895
msgid ""
7896
"This command takes a GitLab instance URL (e.g. https://gitlab.com)\n"
7490.31.3 by Jelmer Vernooij
Update po.
7897
"as well as an optional private token. Private tokens can be created via the\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7898
"web UI."
7899
msgstr ""
7900
7490.31.3 by Jelmer Vernooij
Update po.
7901
#: breezy/plugins/propose/cmds.py:287
7902
msgid "  Log into GNOME's GitLab (prompts for a token):"
7903
msgstr ""
7904
7905
#: breezy/plugins/propose/cmds.py:289
7906
msgid "     brz gitlab-login https://gitlab.gnome.org/"
7907
msgstr ""
7908
7909
#: breezy/plugins/propose/cmds.py:291
7910
msgid "  Log into Debian's salsa, using a token created earlier:"
7911
msgstr ""
7912
7913
#: breezy/plugins/propose/cmds.py:293
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7914
msgid "     brz gitlab-login https://salsa.debian.org if4Theis6Eich7aef0zo"
7915
msgstr ""
7916
7917
# help of 'name' option of 'gitlab-login' command
7490.31.3 by Jelmer Vernooij
Update po.
7918
#: breezy/plugins/propose/cmds.py:299
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7919
msgid "Name for GitLab site in configuration."
7920
msgstr ""
7921
7922
# help of 'no-check' option of 'gitlab-login' command
7490.31.3 by Jelmer Vernooij
Update po.
7923
#: breezy/plugins/propose/cmds.py:302
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7924
msgid "Don't check that the token is valid."
7925
msgstr ""
7926
7490.31.3 by Jelmer Vernooij
Update po.
7927
#: breezy/plugins/propose/cmds.py:364
7928
msgid "Land a merge proposal."
7929
msgstr ""
7930
7931
# help of 'message' option of 'land-merge-proposal' command
7932
#: breezy/plugins/propose/cmds.py:368
7933
msgid "Commit message to use."
7934
msgstr ""
7935
7936
#: breezy/plugins/propose/github.py:397
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7937
#, python-format
7938
msgid "Forking new repository %s from %s"
7939
msgstr ""
7940
7490.31.3 by Jelmer Vernooij
Update po.
7941
#: breezy/plugins/propose/github.py:400
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
7942
#, python-format
7943
msgid "Reusing existing repository %s"
7944
msgstr ""
7945
7490.31.3 by Jelmer Vernooij
Update po.
7946
#: breezy/plugins/quilt/merge.py:113
7947
#, python-format
7948
msgid "Applying %d quilt patches."
7949
msgstr ""
7950
7951
#: breezy/plugins/quilt/merge.py:125
7952
#, python-format
7953
msgid "Unapplying %d quilt patches."
7954
msgstr ""
7955
7956
#: breezy/plugins/quilt/merge.py:141
7957
#, python-format
7958
msgid "Committing with %d patches applied and %d patches unapplied."
7959
msgstr ""
7960
7961
#: breezy/plugins/rewrite/commands.py:51
7962
msgid ""
7963
"A conflict occurred replaying a commit. Resolve the conflict and run 'brz "
7964
"rebase-continue' or run 'brz rebase-abort'."
7965
msgstr ""
7966
7967
#: breezy/plugins/rewrite/commands.py:59
7968
msgid "Re-base a branch."
7969
msgstr ""
7970
7971
#: breezy/plugins/rewrite/commands.py:61
7972
msgid ""
7973
"Rebasing is the process of taking a branch and modifying the history so\n"
7974
"that it appears to start from a different point. This can be useful\n"
7975
"to clean up the history before submitting your changes. The tree at the\n"
7976
"end of the process will be the same as if you had merged the other branch,\n"
7977
"but the history will be different."
7978
msgstr ""
7979
7980
#: breezy/plugins/rewrite/commands.py:67
7981
msgid ""
7982
"The command takes the location of another branch on to which the branch in\n"
7983
"the specified directory (by default, the current working directory)\n"
7984
"will be rebased. If a branch is not specified then the parent branch\n"
7985
"is used, and this is usually the desired result."
7986
msgstr ""
7987
7988
#: breezy/plugins/rewrite/commands.py:72
7989
msgid ""
7990
"The first step identifies the revisions that are in the current branch that\n"
7991
"are not in the parent branch. The current branch is then set to be at the\n"
7992
"same revision as the target branch, and each revision is replayed on top\n"
7993
"of the branch. At the end of the process it will appear as though your\n"
7994
"current branch was branched off the current last revision of the target."
7995
msgstr ""
7996
7997
#: breezy/plugins/rewrite/commands.py:78
7998
msgid ""
7999
"Each revision that is replayed may cause conflicts in the tree. If this\n"
8000
"happens the command will stop and allow you to fix them up. Resolve the\n"
8001
"commits as you would for a merge, and then run 'brz resolve' to marked\n"
8002
"them as resolved. Once you have resolved all the conflicts you should\n"
8003
"run 'brz rebase-continue' to continue the rebase operation."
8004
msgstr ""
8005
8006
#: breezy/plugins/rewrite/commands.py:84
8007
msgid ""
8008
"If conflicts are encountered and you decide that you do not wish to "
8009
"continue\n"
8010
"you can run 'brz rebase-abort'."
8011
msgstr ""
8012
8013
#: breezy/plugins/rewrite/commands.py:87
8014
msgid ""
8015
"The '--onto' option allows you to specify a different revision in the\n"
8016
"target branch to start at when replaying the revisions. This means that\n"
8017
"you can change the point at which the current branch will appear to be\n"
8018
"branched from when the operation completes."
8019
msgstr ""
8020
8021
# help of 'always-rebase-merges' option of 'rebase' command
8022
#: breezy/plugins/rewrite/commands.py:100
8023
msgid "Don't skip revisions that merge already present revisions."
8024
msgstr ""
8025
8026
# help of 'pending-merges' option of 'rebase' command
8027
#: breezy/plugins/rewrite/commands.py:103
8028
msgid "Rebase pending merges onto local branch."
8029
msgstr ""
8030
8031
# help of 'onto' option of 'rebase' command
8032
#: breezy/plugins/rewrite/commands.py:105
8033
msgid "Different revision to replay onto."
8034
msgstr ""
8035
8036
#: breezy/plugins/rewrite/commands.py:132
8037
msgid "--revision and --pending-merges are mutually exclusive"
8038
msgstr ""
8039
8040
#: breezy/plugins/rewrite/commands.py:144
8041
msgid "No upstream branch specified."
8042
msgstr ""
8043
8044
#: breezy/plugins/rewrite/commands.py:145
8045
#, python-format
8046
msgid "Rebasing on %s"
8047
msgstr ""
8048
8049
#: breezy/plugins/rewrite/commands.py:152
8050
msgid ""
8051
"A rebase operation was interrupted. Continue using 'brz rebase-continue' or "
8052
"abort using 'brz rebase-abort'"
8053
msgstr ""
8054
8055
#: breezy/plugins/rewrite/commands.py:169
8056
#: breezy/plugins/rewrite/commands.py:386
8057
msgid "--revision takes only one or two arguments"
8058
msgstr ""
8059
8060
#: breezy/plugins/rewrite/commands.py:174
8061
msgid "No pending merges present."
8062
msgstr ""
8063
8064
#: breezy/plugins/rewrite/commands.py:177
8065
msgid "Rebasing more than one pending merge not supported"
8066
msgstr ""
8067
8068
#: breezy/plugins/rewrite/commands.py:203
8069
msgid "No revisions to rebase.\n"
8070
msgstr ""
8071
8072
#: breezy/plugins/rewrite/commands.py:207
8073
msgid "Base branch is descendant of current branch. Pulling instead.\n"
8074
msgstr ""
8075
8076
#: breezy/plugins/rewrite/commands.py:224
8077
#, python-format
8078
msgid "%d revisions will be rebased:"
8079
msgstr ""
8080
8081
#: breezy/plugins/rewrite/commands.py:240
8082
msgid "Abort an interrupted rebase."
8083
msgstr ""
8084
8085
#: breezy/plugins/rewrite/commands.py:272
8086
msgid "Continue an interrupted rebase after resolving conflicts."
8087
msgstr ""
8088
8089
#: breezy/plugins/rewrite/commands.py:295
8090
msgid ""
8091
"There are still conflicts present. Resolve the conflicts and then run 'brz "
8092
"resolve' and try again."
8093
msgstr ""
8094
8095
#: breezy/plugins/rewrite/commands.py:302
8096
msgid "No rebase to continue"
8097
msgstr ""
8098
8099
#: breezy/plugins/rewrite/commands.py:313
8100
msgid ""
8101
"Print list of revisions that still need to be replayed as part of the\n"
8102
"current rebase operation."
8103
msgstr ""
8104
8105
#: breezy/plugins/rewrite/commands.py:337
8106
msgid "No rebase in progress"
8107
msgstr ""
8108
8109
#: breezy/plugins/rewrite/commands.py:340
8110
#, python-format
8111
msgid "Currently replaying: %s"
8112
msgstr ""
8113
8114
#: breezy/plugins/rewrite/commands.py:342
8115
#, python-brace-format
8116
msgid "{0} -> {1}"
8117
msgstr ""
8118
8119
#: breezy/plugins/rewrite/commands.py:388
8120
msgid "--revision is mandatory"
8121
msgstr ""
8122
8123
#: breezy/plugins/rewrite/commands.py:398
8124
msgid "replaying commits"
8125
msgstr ""
8126
8127
#: breezy/plugins/rewrite/commands.py:429
8128
msgid ""
8129
"Rebase revisions based on a branch created with a different import tool."
8130
msgstr ""
8131
8132
#: breezy/plugins/rewrite/commands.py:431
8133
msgid ""
8134
"This will change the identity of revisions whose parents\n"
8135
"were mapped from revisions in the other version control system."
8136
msgstr ""
8137
8138
#: breezy/plugins/rewrite/commands.py:434
8139
msgid ""
8140
"You are recommended to run \"brz check\" in the local repository\n"
8141
"after running this command."
8142
msgstr ""
8143
8144
# help of 'idmap-file' option of 'rebase-foreign' command
8145
#: breezy/plugins/rewrite/commands.py:440
8146
msgid "Write map with old and new revision ids."
8147
msgstr ""
8148
8149
# help of 'directory' option of 'rebase' command
8150
# help of 'directory' option of 'rebase-abort' command
8151
# help of 'directory' option of 'rebase-continue' command
8152
# help of 'directory' option of 'rebase-foreign' command
8153
# help of 'directory' option of 'rebase-todo' command
8154
#: breezy/plugins/rewrite/commands.py:445
8155
msgid ""
8156
"Branch to replay onto, rather than the one containing the working directory."
8157
msgstr ""
8158
8159
#: breezy/plugins/rewrite/commands.py:483
8160
#, python-format
8161
msgid "Using saved location: %s\n"
8162
msgstr ""
8163
8164
#: breezy/plugins/stats/cmds.py:241
7185.1.1 by Jelmer Vernooij
Update pot file.
8165
msgid "Generate statistics for LOCATION."
8166
msgstr ""
8167
8168
# help of 'show-class' option of 'committer-statistics' command
7490.31.3 by Jelmer Vernooij
Update po.
8169
#: breezy/plugins/stats/cmds.py:246
7185.1.1 by Jelmer Vernooij
Update pot file.
8170
msgid "Show the class of contributions."
8171
msgstr ""
8172
7490.31.3 by Jelmer Vernooij
Update po.
8173
#: breezy/plugins/stats/cmds.py:386
7185.1.1 by Jelmer Vernooij
Update pot file.
8174
msgid "Determine credits for LOCATION."
8175
msgstr ""
8176
7490.31.3 by Jelmer Vernooij
Update po.
8177
#: breezy/plugins/upload/cmds.py:466
8178
msgid "Upload a working tree, as a whole or incrementally."
8179
msgstr ""
8180
7185.1.1 by Jelmer Vernooij
Update pot file.
8181
#: breezy/plugins/upload/cmds.py:468
8182
msgid ""
8183
"If no destination is specified use the last one used.\n"
8184
"If no revision is specified upload the changes since the last upload."
8185
msgstr ""
8186
7490.31.3 by Jelmer Vernooij
Update po.
8187
#: breezy/plugins/upload/cmds.py:471
7185.1.1 by Jelmer Vernooij
Update pot file.
8188
msgid "Changes include files added, renamed, modified or removed."
8189
msgstr ""
8190
8191
# help of 'full' option of 'upload' command
7490.31.3 by Jelmer Vernooij
Update po.
8192
#: breezy/plugins/upload/cmds.py:479
7185.1.1 by Jelmer Vernooij
Update pot file.
8193
msgid "Upload the full working tree."
8194
msgstr ""
8195
8196
# help of 'quiet' option of 'upload' command
7490.31.3 by Jelmer Vernooij
Update po.
8197
#: breezy/plugins/upload/cmds.py:480
7185.1.1 by Jelmer Vernooij
Update pot file.
8198
msgid "Do not output what is being done."
8199
msgstr ""
8200
8201
# help of 'directory' option of 'upload' command
7490.31.3 by Jelmer Vernooij
Update po.
8202
#: breezy/plugins/upload/cmds.py:483
7185.1.1 by Jelmer Vernooij
Update pot file.
8203
msgid ""
8204
"Branch to upload from, rather than the one containing the working directory."
8205
msgstr ""
8206
8207
# help of 'auto' option of 'upload' command
7490.31.3 by Jelmer Vernooij
Update po.
8208
#: breezy/plugins/upload/cmds.py:489
7185.1.1 by Jelmer Vernooij
Update pot file.
8209
msgid "Trigger an upload from this branch whenever the tip revision changes."
8210
msgstr ""
8211
7490.31.3 by Jelmer Vernooij
Update po.
8212
#: breezy/plugins/weave_fmt/bzrdir.py:245
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8213
msgid "pb parameter to convert() is deprecated"
8214
msgstr ""
8215
7490.31.3 by Jelmer Vernooij
Update po.
8216
#: breezy/plugins/weave_fmt/bzrdir.py:247
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8217
msgid "starting upgrade from format 4 to 5"
8218
msgstr ""
8219
7490.31.3 by Jelmer Vernooij
Update po.
8220
#: breezy/plugins/weave_fmt/bzrdir.py:256
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8221
msgid "note: upgrade may be faster if all store files are ungzipped first"
8222
msgstr ""
8223
7490.31.3 by Jelmer Vernooij
Update po.
8224
#: breezy/plugins/weave_fmt/bzrdir.py:285
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8225
msgid "converting revision"
8226
msgstr ""
8227
7490.31.3 by Jelmer Vernooij
Update po.
8228
#: breezy/plugins/weave_fmt/bzrdir.py:290
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8229
msgid "upgraded to weaves:"
8230
msgstr ""
8231
7490.31.3 by Jelmer Vernooij
Update po.
8232
#: breezy/plugins/weave_fmt/bzrdir.py:291
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8233
#, python-format
8234
msgid "%6d revisions and inventories"
8235
msgstr ""
8236
7490.31.3 by Jelmer Vernooij
Update po.
8237
#: breezy/plugins/weave_fmt/bzrdir.py:293
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8238
#, python-format
8239
msgid "%6d revisions not present"
8240
msgstr ""
8241
7490.31.3 by Jelmer Vernooij
Update po.
8242
#: breezy/plugins/weave_fmt/bzrdir.py:295
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8243
#, python-format
8244
msgid "%6d texts"
8245
msgstr ""
8246
7490.31.3 by Jelmer Vernooij
Update po.
8247
#: breezy/plugins/weave_fmt/bzrdir.py:332
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8248
msgid "writing weave"
8249
msgstr ""
8250
7185.1.1 by Jelmer Vernooij
Update pot file.
8251
#: breezy/plugins/weave_fmt/bzrdir.py:336
7490.31.3 by Jelmer Vernooij
Update po.
8252
#: breezy/plugins/weave_fmt/bzrdir.py:338
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8253
msgid "inventory"
8254
msgstr ""
8255
7490.31.3 by Jelmer Vernooij
Update po.
8256
#: breezy/plugins/weave_fmt/bzrdir.py:355
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8257
msgid "write revision"
8258
msgstr ""
8259
7490.31.3 by Jelmer Vernooij
Update po.
8260
#: breezy/plugins/weave_fmt/bzrdir.py:369
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8261
msgid "loading revision"
8262
msgstr ""
8263
7490.31.3 by Jelmer Vernooij
Update po.
8264
#: breezy/plugins/weave_fmt/bzrdir.py:374
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8265
#, python-format
8266
msgid "revision {%s} not present in branch; will be converted as a ghost"
8267
msgstr ""
8268
7490.31.3 by Jelmer Vernooij
Update po.
8269
#: breezy/plugins/weave_fmt/bzrdir.py:506
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8270
msgid "starting upgrade from format 5 to 6"
8271
msgstr ""
8272
7490.31.3 by Jelmer Vernooij
Update po.
8273
#: breezy/plugins/weave_fmt/bzrdir.py:514
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8274
#, python-format
8275
msgid "adding prefixes to %s"
8276
msgstr ""
8277
7490.31.3 by Jelmer Vernooij
Update po.
8278
#: breezy/plugins/weave_fmt/bzrdir.py:556
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8279
msgid "starting upgrade from format 6 to metadir"
8280
msgstr ""
8281
7490.31.3 by Jelmer Vernooij
Update po.
8282
#: breezy/plugins/weave_fmt/bzrdir.py:564
8283
msgid "Removing ancestry.weave"
8284
msgstr ""
8285
7185.1.1 by Jelmer Vernooij
Update pot file.
8286
#: breezy/plugins/weave_fmt/bzrdir.py:569
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8287
msgid "Finding branch files"
8288
msgstr ""
8289
7490.31.3 by Jelmer Vernooij
Update po.
8290
#: breezy/plugins/weave_fmt/bzrdir.py:579
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8291
msgid "Upgrading repository"
8292
msgstr ""
8293
7490.31.3 by Jelmer Vernooij
Update po.
8294
#: breezy/plugins/weave_fmt/bzrdir.py:589
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8295
msgid "Upgrading branch"
8296
msgstr ""
8297
7490.31.3 by Jelmer Vernooij
Update po.
8298
#: breezy/plugins/weave_fmt/bzrdir.py:612
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8299
msgid "No working tree."
8300
msgstr ""
8301
7490.31.3 by Jelmer Vernooij
Update po.
8302
#: breezy/plugins/weave_fmt/bzrdir.py:619
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8303
msgid "Upgrading working tree"
8304
msgstr ""
8305
7490.31.3 by Jelmer Vernooij
Update po.
8306
#: breezy/plugins/weave_fmt/bzrdir.py:639
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8307
#, python-format
8308
msgid "Make %s lock"
8309
msgstr ""
8310
7490.31.3 by Jelmer Vernooij
Update po.
8311
#: breezy/plugins/weave_fmt/bzrdir.py:650
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8312
#, python-format
8313
msgid "Moving %s"
8314
msgstr ""
8315
7490.31.3 by Jelmer Vernooij
Update po.
8316
#: breezy/plugins/zsh_completion/zshcomp.py:258
8317
msgid "Generate a shell function for zsh command line completion."
8318
msgstr ""
8319
8320
#: breezy/plugins/zsh_completion/zshcomp.py:260
8321
msgid ""
8322
"This command generates a shell function which can be used by zsh to\n"
8323
"automatically complete the currently typed command when the user presses\n"
8324
"the completion key (usually tab)."
8325
msgstr ""
8326
8327
#: breezy/plugins/zsh_completion/zshcomp.py:264
8328
msgid ""
8329
"Commonly used like this:\n"
8330
"    eval \"`brz zsh -completion`\""
8331
msgstr ""
8332
7185.1.1 by Jelmer Vernooij
Update pot file.
8333
#: breezy/push.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
8334
#, python-format
8335
msgid ""
8336
"Target directory %s already contains a .bzr directory, but it is not valid."
8337
msgstr ""
8338
7185.1.1 by Jelmer Vernooij
Update pot file.
8339
#: breezy/push.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
8340
#, python-format
8341
msgid ""
8342
"Target directory %s already exists, but does not have a .bzr directory. "
8343
"Supply --use-existing-dir to push there anyway."
8344
msgstr ""
8345
7185.1.1 by Jelmer Vernooij
Update pot file.
8346
#: breezy/push.py:124
6138.4.4 by Jonathan Riddell
update bzr.pot
8347
#, python-format
8348
msgid "Too many redirections trying to make %s."
8349
msgstr ""
8350
7185.1.1 by Jelmer Vernooij
Update pot file.
8351
#: breezy/push.py:150
6138.4.4 by Jonathan Riddell
update bzr.pot
8352
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8353
"These branches have diverged.  See \"brz help diverged-branches\" for more "
6138.4.4 by Jonathan Riddell
update bzr.pot
8354
"information."
8355
msgstr ""
8356
7185.1.1 by Jelmer Vernooij
Update pot file.
8357
#: breezy/push.py:155
6138.4.4 by Jonathan Riddell
update bzr.pot
8358
#, python-format
8359
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8360
"It is not possible to losslessly push to %s. You may want to use --lossy."
6138.4.4 by Jonathan Riddell
update bzr.pot
8361
msgstr ""
8362
7185.1.1 by Jelmer Vernooij
Update pot file.
8363
#: breezy/push.py:161
6138.4.4 by Jonathan Riddell
update bzr.pot
8364
#, python-format
8365
msgid ""
8366
"At %s you have a valid .bzr control directory, but not a branch or "
8367
"repository. This is an unsupported configuration. Please move the target "
8368
"directory out of the way and try again."
8369
msgstr ""
8370
7490.31.3 by Jelmer Vernooij
Update po.
8371
#: breezy/reconcile.py:86
6138.4.4 by Jonathan Riddell
update bzr.pot
8372
#, python-format
8373
msgid "Reconciling branch %s"
8374
msgstr ""
8375
7490.31.3 by Jelmer Vernooij
Update po.
8376
#: breezy/reconcile.py:91
6138.4.4 by Jonathan Riddell
update bzr.pot
8377
#, python-format
8378
msgid "Reconciling repository %s"
8379
msgstr ""
8380
7490.31.3 by Jelmer Vernooij
Update po.
8381
#: breezy/reconcile.py:93
6138.4.4 by Jonathan Riddell
update bzr.pot
8382
msgid "Reconciling repository"
8383
msgstr ""
8384
7490.31.3 by Jelmer Vernooij
Update po.
8385
#: breezy/reconcile.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
8386
#, python-format
8387
msgid "%s cannot canonicalize CHKs."
8388
msgstr ""
8389
7490.31.3 by Jelmer Vernooij
Update po.
8390
#: breezy/reconcile.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
8391
msgid "Reconcile aborted: revision index has inconsistent parents."
8392
msgstr ""
8393
7490.31.3 by Jelmer Vernooij
Update po.
8394
#: breezy/reconcile.py:107
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8395
msgid "Run \"brz check\" for more details."
6138.4.4 by Jonathan Riddell
update bzr.pot
8396
msgstr ""
8397
7490.31.3 by Jelmer Vernooij
Update po.
8398
#: breezy/reconcile.py:109
6138.4.4 by Jonathan Riddell
update bzr.pot
8399
msgid "Reconciliation complete."
8400
msgstr ""
8401
7490.31.3 by Jelmer Vernooij
Update po.
8402
#: breezy/reconfigure.py:126
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8403
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8404
msgid "{0} is now stacked on {1}\n"
8405
msgstr ""
8406
7490.31.3 by Jelmer Vernooij
Update po.
8407
#: breezy/reconfigure.py:138
6138.4.4 by Jonathan Riddell
update bzr.pot
8408
#, python-format
8409
msgid "%s is now not stacked\n"
8410
msgstr ""
8411
7185.1.1 by Jelmer Vernooij
Update pot file.
8412
#: breezy/rename_map.py:73
6138.4.4 by Jonathan Riddell
update bzr.pot
8413
msgid "Calculating hashes"
8414
msgstr ""
8415
7185.1.1 by Jelmer Vernooij
Update pot file.
8416
#: breezy/rename_map.py:108
6138.4.4 by Jonathan Riddell
update bzr.pot
8417
msgid "Determining hash hits"
8418
msgstr ""
8419
7185.1.1 by Jelmer Vernooij
Update pot file.
8420
#: breezy/rename_map.py:235
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8421
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8422
msgid "{0} => {1}"
8423
msgstr ""
8424
7490.31.3 by Jelmer Vernooij
Update po.
8425
#: breezy/repository.py:318
7185.1.1 by Jelmer Vernooij
Update pot file.
8426
#, python-format
8427
msgid "brz: ERROR (ignored): %s"
8428
msgstr ""
8429
7490.31.3 by Jelmer Vernooij
Update po.
8430
#: breezy/repository.py:1599
6138.4.4 by Jonathan Riddell
update bzr.pot
8431
msgid "Moving repository to repository.backup"
8432
msgstr ""
8433
7490.31.3 by Jelmer Vernooij
Update po.
8434
#: breezy/repository.py:1607
6138.4.4 by Jonathan Riddell
update bzr.pot
8435
msgid "Creating new repository"
8436
msgstr ""
8437
7490.31.3 by Jelmer Vernooij
Update po.
8438
#: breezy/repository.py:1611
6138.4.4 by Jonathan Riddell
update bzr.pot
8439
msgid "Copying content"
8440
msgstr ""
8441
7490.31.3 by Jelmer Vernooij
Update po.
8442
#: breezy/repository.py:1613
6138.4.4 by Jonathan Riddell
update bzr.pot
8443
msgid "Deleting old repository content"
8444
msgstr ""
8445
7490.31.3 by Jelmer Vernooij
Update po.
8446
#: breezy/repository.py:1615
6138.4.4 by Jonathan Riddell
update bzr.pot
8447
msgid "repository converted"
8448
msgstr ""
8449
7490.31.3 by Jelmer Vernooij
Update po.
8450
#: breezy/revisionspec.py:858
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8451
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
8452
msgid "Using {0} {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
8453
msgstr ""
8454
7490.31.3 by Jelmer Vernooij
Update po.
8455
#: breezy/send.py:58
6138.4.4 by Jonathan Riddell
update bzr.pot
8456
#, python-format
8457
msgid "Mail client \"%s\" does not support specifying body"
8458
msgstr ""
8459
7490.31.3 by Jelmer Vernooij
Update po.
8460
#: breezy/send.py:62
6138.4.4 by Jonathan Riddell
update bzr.pot
8461
msgid "--remember requires a branch to be specified."
8462
msgstr ""
8463
7490.31.3 by Jelmer Vernooij
Update po.
8464
#: breezy/send.py:77
6138.4.4 by Jonathan Riddell
update bzr.pot
8465
msgid "No submit branch known or specified"
8466
msgstr ""
8467
7490.31.3 by Jelmer Vernooij
Update po.
8468
#: breezy/send.py:80
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8469
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
8470
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6138.4.4 by Jonathan Riddell
update bzr.pot
8471
msgstr ""
8472
7490.31.3 by Jelmer Vernooij
Update po.
8473
#: breezy/send.py:98
6138.4.4 by Jonathan Riddell
update bzr.pot
8474
#, python-format
8475
msgid "No such send format '%s'."
8476
msgstr ""
8477
7490.31.3 by Jelmer Vernooij
Update po.
8478
#: breezy/send.py:114
6138.4.4 by Jonathan Riddell
update bzr.pot
8479
msgid "bzr send takes at most two one revision identifiers"
8480
msgstr ""
8481
7490.31.3 by Jelmer Vernooij
Update po.
8482
#: breezy/send.py:127
6138.4.4 by Jonathan Riddell
update bzr.pot
8483
msgid "No revisions to submit."
8484
msgstr ""
8485
7490.31.3 by Jelmer Vernooij
Update po.
8486
#: breezy/send.py:139
6138.4.4 by Jonathan Riddell
update bzr.pot
8487
msgid ""
8488
"- not supported for merge directives that use more than one output file."
8489
msgstr ""
8490
7490.31.3 by Jelmer Vernooij
Update po.
8491
#: breezy/send.py:180
6138.4.4 by Jonathan Riddell
update bzr.pot
8492
msgid "Format 0.9 does not permit bundle with no patch"
8493
msgstr ""
8494
7490.31.3 by Jelmer Vernooij
Update po.
8495
#: breezy/shelf_ui.py:49
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8496
#, python-format
8497
msgid "Shelve adding file \"%(path)s\"?"
8498
msgstr ""
8499
7490.31.3 by Jelmer Vernooij
Update po.
8500
#: breezy/shelf_ui.py:50
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8501
msgid "Shelve binary changes?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8502
msgstr ""
8503
7490.31.3 by Jelmer Vernooij
Update po.
8504
#: breezy/shelf_ui.py:51
6143.1.7 by Jonathan Riddell
update bzr.pot
8505
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
8506
msgstr ""
8507
7490.31.3 by Jelmer Vernooij
Update po.
8508
#: breezy/shelf_ui.py:53
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8509
#, python-format
8510
msgid "Shelve removing file \"%(path)s\"?"
8511
msgstr ""
8512
7490.31.3 by Jelmer Vernooij
Update po.
8513
#: breezy/shelf_ui.py:54
6143.1.7 by Jonathan Riddell
update bzr.pot
8514
#, python-format
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8515
msgid "Shelve %d change(s)?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8516
msgstr ""
8517
7490.31.3 by Jelmer Vernooij
Update po.
8518
#: breezy/shelf_ui.py:55
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8519
msgid "Shelve?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8520
msgstr ""
8521
7490.31.3 by Jelmer Vernooij
Update po.
8522
#: breezy/shelf_ui.py:56
6143.1.7 by Jonathan Riddell
update bzr.pot
8523
#, python-format
8524
msgid ""
8525
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8526
msgstr ""
8527
7490.31.3 by Jelmer Vernooij
Update po.
8528
#: breezy/shelf_ui.py:58
6143.1.7 by Jonathan Riddell
update bzr.pot
8529
#, python-format
8530
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
8531
msgstr ""
8532
7490.31.3 by Jelmer Vernooij
Update po.
8533
#: breezy/shelf_ui.py:73
6138.4.4 by Jonathan Riddell
update bzr.pot
8534
#, python-format
8535
msgid "Changes shelved with id \"%d\"."
8536
msgstr ""
8537
7490.31.3 by Jelmer Vernooij
Update po.
8538
#: breezy/shelf_ui.py:77
6138.4.4 by Jonathan Riddell
update bzr.pot
8539
msgid "Selected changes destroyed."
8540
msgstr ""
8541
7490.31.3 by Jelmer Vernooij
Update po.
8542
#: breezy/shelf_ui.py:81
6138.4.4 by Jonathan Riddell
update bzr.pot
8543
msgid "Selected changes:"
8544
msgstr ""
8545
7490.31.3 by Jelmer Vernooij
Update po.
8546
#: breezy/shelf_ui.py:101
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8547
#, python-format
8548
msgid "Delete file \"%(path)s\"?"
8549
msgstr ""
8550
7490.31.3 by Jelmer Vernooij
Update po.
8551
#: breezy/shelf_ui.py:102
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8552
msgid "Apply binary changes?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8553
msgstr ""
8554
7490.31.3 by Jelmer Vernooij
Update po.
8555
#: breezy/shelf_ui.py:103
6143.1.7 by Jonathan Riddell
update bzr.pot
8556
#, python-format
8557
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
8558
msgstr ""
8559
7490.31.3 by Jelmer Vernooij
Update po.
8560
#: breezy/shelf_ui.py:105
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8561
#, python-format
8562
msgid "Add file \"%(path)s\"?"
8563
msgstr ""
8564
7490.31.3 by Jelmer Vernooij
Update po.
8565
#: breezy/shelf_ui.py:106
6143.1.7 by Jonathan Riddell
update bzr.pot
8566
#, python-format
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8567
msgid "Apply %d change(s)?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8568
msgstr ""
8569
7490.31.3 by Jelmer Vernooij
Update po.
8570
#: breezy/shelf_ui.py:107
6349.1.1 by Vincent Ladeuil
Release 2.5b4
8571
msgid "Apply change?"
6143.1.7 by Jonathan Riddell
update bzr.pot
8572
msgstr ""
8573
7490.31.3 by Jelmer Vernooij
Update po.
8574
#: breezy/shelf_ui.py:108
6143.1.7 by Jonathan Riddell
update bzr.pot
8575
#, python-format
8576
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
8577
msgstr ""
8578
7490.31.3 by Jelmer Vernooij
Update po.
8579
#: breezy/shelf_ui.py:110
6143.1.7 by Jonathan Riddell
update bzr.pot
8580
#, python-format
8581
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
8582
msgstr ""
8583
7490.31.3 by Jelmer Vernooij
Update po.
8584
#: breezy/shelf_ui.py:407
6138.4.4 by Jonathan Riddell
update bzr.pot
8585
msgid "No changes are shelved."
8586
msgstr ""
8587
7490.31.3 by Jelmer Vernooij
Update po.
8588
#: breezy/shelf_ui.py:464
6138.4.4 by Jonathan Riddell
update bzr.pot
8589
#, python-format
8590
msgid "Using changes with id \"%d\"."
8591
msgstr ""
8592
7490.31.3 by Jelmer Vernooij
Update po.
8593
#: breezy/shelf_ui.py:469
6138.4.4 by Jonathan Riddell
update bzr.pot
8594
#, python-format
8595
msgid "Message: %s"
8596
msgstr ""
8597
7490.31.3 by Jelmer Vernooij
Update po.
8598
#: breezy/shelf_ui.py:481
6138.4.4 by Jonathan Riddell
update bzr.pot
8599
#, python-format
8600
msgid "Deleted changes with id \"%d\"."
8601
msgstr ""
8602
7185.1.1 by Jelmer Vernooij
Update pot file.
8603
#: breezy/switch.py:71
6138.4.4 by Jonathan Riddell
update bzr.pot
8604
msgid "Pending merges must be committed or reverted before using switch."
8605
msgstr ""
8606
7185.1.1 by Jelmer Vernooij
Update pot file.
8607
#: breezy/switch.py:104
8608
#, python-format
8609
msgid "Tree is up to date at revision %d."
8610
msgstr ""
8611
8612
#: breezy/switch.py:112
8613
#, python-format
8614
msgid "Updated to revision %d."
8615
msgstr ""
8616
8617
#: breezy/switch.py:143
6138.4.4 by Jonathan Riddell
update bzr.pot
8618
msgid ""
8619
"Cannot switch as local commits found in the checkout. Commit these to the "
8620
"bound branch or use --force to throw them away."
8621
msgstr ""
8622
7185.1.1 by Jelmer Vernooij
Update pot file.
8623
#: breezy/switch.py:148
6138.4.4 by Jonathan Riddell
update bzr.pot
8624
#, python-format
8625
msgid ""
8626
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8627
"anyway, use --force."
8628
msgstr ""
8629
7490.31.3 by Jelmer Vernooij
Update po.
8630
#: breezy/switch.py:169
6138.4.4 by Jonathan Riddell
update bzr.pot
8631
msgid "Cannot switch a branch, only a checkout."
8632
msgstr ""
8633
7490.31.3 by Jelmer Vernooij
Update po.
8634
#: breezy/transform.py:1788 breezy/transform.py:1799 breezy/transform.py:1801
6138.4.4 by Jonathan Riddell
update bzr.pot
8635
msgid "Apply phase"
8636
msgstr ""
8637
7490.31.3 by Jelmer Vernooij
Update po.
8638
#: breezy/transform.py:1824 breezy/transform.py:1887
6138.4.4 by Jonathan Riddell
update bzr.pot
8639
msgid "removing file"
8640
msgstr ""
8641
7490.31.3 by Jelmer Vernooij
Update po.
8642
#: breezy/transform.py:1839 breezy/transform.py:1917
6138.4.4 by Jonathan Riddell
update bzr.pot
8643
msgid "adding file"
8644
msgstr ""
8645
7490.31.3 by Jelmer Vernooij
Update po.
8646
#: breezy/transform.py:2648
6138.4.4 by Jonathan Riddell
update bzr.pot
8647
msgid "Building tree"
8648
msgstr ""
8649
7490.31.3 by Jelmer Vernooij
Update po.
8650
#: breezy/transform.py:2741 breezy/transform.py:2762
6138.4.4 by Jonathan Riddell
update bzr.pot
8651
msgid "Adding file contents"
8652
msgstr ""
8653
7490.31.3 by Jelmer Vernooij
Update po.
8654
#: breezy/transform.py:3066
6138.4.4 by Jonathan Riddell
update bzr.pot
8655
msgid "Resolution pass"
8656
msgstr ""
8657
7490.31.3 by Jelmer Vernooij
Update po.
8658
#: breezy/tree.py:704
6138.4.4 by Jonathan Riddell
update bzr.pot
8659
msgid "*** {0} content-filter: {1} => {2!r}"
8660
msgstr ""
8661
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8662
#: breezy/upgrade.py:77
6138.4.4 by Jonathan Riddell
update bzr.pot
8663
#, python-format
8664
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
8665
msgstr ""
8666
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8667
#: breezy/upgrade.py:100
6138.4.4 by Jonathan Riddell
update bzr.pot
8668
#, python-format
8669
msgid "cannot upgrade from bzrdir format %s"
8670
msgstr ""
8671
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8672
#: breezy/upgrade.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
8673
#, python-format
8674
msgid "starting upgrade of %s"
8675
msgstr ""
8676
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8677
#: breezy/upgrade.py:110
6138.4.4 by Jonathan Riddell
update bzr.pot
8678
msgid "finished"
8679
msgstr ""
8680
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8681
#: breezy/upgrade.py:120
6138.4.4 by Jonathan Riddell
update bzr.pot
8682
msgid "Deleting backup.bzr"
8683
msgstr ""
8684
7185.1.1 by Jelmer Vernooij
Update pot file.
8685
#: breezy/upgrade.py:148
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8686
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8687
msgid ""
8688
"\n"
8689
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
8690
msgstr ""
8691
7185.1.1 by Jelmer Vernooij
Update pot file.
8692
#: breezy/upgrade.py:205
6138.4.4 by Jonathan Riddell
update bzr.pot
8693
#, python-format
8694
msgid "Found %d dependent branches - upgrading ..."
8695
msgstr ""
8696
7185.1.1 by Jelmer Vernooij
Update pot file.
8697
#: breezy/upgrade.py:275
6138.4.4 by Jonathan Riddell
update bzr.pot
8698
msgid "Upgrading bzrdirs"
8699
msgstr ""
8700
7185.1.1 by Jelmer Vernooij
Update pot file.
8701
#: breezy/upgrade.py:281
6138.4.4 by Jonathan Riddell
update bzr.pot
8702
#, python-format
8703
msgid "Upgrading %s"
8704
msgstr ""
8705
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8706
#: breezy/upgrade.py:283
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8707
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8708
msgid "Upgrading {0} {1} ..."
8709
msgstr ""
8710
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
8711
#: breezy/upgrade.py:301
6138.4.4 by Jonathan Riddell
update bzr.pot
8712
msgid "Removing backup ..."
8713
msgstr ""
8714
7185.1.1 by Jelmer Vernooij
Update pot file.
8715
#: breezy/upgrade.py:306
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8716
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
8717
msgid "failed to clean-up {0}: {1}"
8718
msgstr ""
8719
7490.31.3 by Jelmer Vernooij
Update po.
8720
#: breezy/win32utils.py:87
6138.4.4 by Jonathan Riddell
update bzr.pot
8721
msgid "Failed to GetProcessMemoryInfo()"
8722
msgstr ""
8723
7490.31.3 by Jelmer Vernooij
Update po.
8724
#: breezy/win32utils.py:102
6138.4.4 by Jonathan Riddell
update bzr.pot
8725
msgid "Cannot debug memory on win32 without ctypes or win32process"
8726
msgstr ""
8727
7490.31.3 by Jelmer Vernooij
Update po.
8728
#: breezy/win32utils.py:107
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
8729
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
8730
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6138.4.4 by Jonathan Riddell
update bzr.pot
8731
msgstr ""
8732
7490.31.3 by Jelmer Vernooij
Update po.
8733
#: breezy/win32utils.py:115
6138.4.4 by Jonathan Riddell
update bzr.pot
8734
#, python-format
8735
msgid "WorkingSize       %8d KiB"
8736
msgstr ""
8737
7490.31.3 by Jelmer Vernooij
Update po.
8738
#: breezy/win32utils.py:117
6138.4.4 by Jonathan Riddell
update bzr.pot
8739
#, python-format
8740
msgid "PeakWorking       %8d KiB"
8741
msgstr ""
8742
7490.31.3 by Jelmer Vernooij
Update po.
8743
#: breezy/win32utils.py:119
6138.4.4 by Jonathan Riddell
update bzr.pot
8744
#, python-format
8745
msgid "PagefileUsage     %8d KiB"
8746
msgstr ""
8747
7490.31.3 by Jelmer Vernooij
Update po.
8748
#: breezy/win32utils.py:121
6138.4.4 by Jonathan Riddell
update bzr.pot
8749
#, python-format
8750
msgid "PeakPagefileUsage %8d KiB"
8751
msgstr ""
8752
7490.31.3 by Jelmer Vernooij
Update po.
8753
#: breezy/win32utils.py:123
6138.4.4 by Jonathan Riddell
update bzr.pot
8754
#, python-format
8755
msgid "PrivateUsage      %8d KiB"
8756
msgstr ""
8757
7490.31.3 by Jelmer Vernooij
Update po.
8758
#: breezy/win32utils.py:125
6138.4.4 by Jonathan Riddell
update bzr.pot
8759
#, python-format
8760
msgid "PageFaultCount    %8d"
8761
msgstr ""
8762
7490.31.3 by Jelmer Vernooij
Update po.
8763
#: breezy/workingtree.py:1167
6138.4.4 by Jonathan Riddell
update bzr.pot
8764
msgid "Rerun update after fixing the conflicts."
8765
msgstr ""
8766
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8767
#: dummy/help_topics/authentication/summary.txt:1
8768
msgid "Information on configuring authentication"
8769
msgstr ""
8770
8771
#: dummy/help_topics/basic/detail.txt:1
8772
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
8773
"Breezy 3.1a0 -- a free distributed version-control tool\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8774
"https://www.breezy-vcs.org/"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8775
msgstr ""
8776
8777
#: dummy/help_topics/basic/detail.txt:4
8778
msgid ""
8779
"Basic commands:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8780
"  brz init           makes this directory a versioned branch\n"
8781
"  brz branch         make a copy of another branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8782
msgstr ""
8783
8784
#: dummy/help_topics/basic/detail.txt:8
8785
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8786
"  brz add            make files or directories versioned\n"
8787
"  brz ignore         ignore a file or pattern\n"
8788
"  brz mv             move or rename a versioned file"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8789
msgstr ""
8790
8791
#: dummy/help_topics/basic/detail.txt:12
8792
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8793
"  brz status         summarize changes in working copy\n"
8794
"  brz diff           show detailed diffs"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8795
msgstr ""
8796
8797
#: dummy/help_topics/basic/detail.txt:15
8798
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8799
"  brz merge          pull in changes from another branch\n"
8800
"  brz commit         save some or all changes\n"
8801
"  brz send           send changes via email"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8802
msgstr ""
8803
8804
#: dummy/help_topics/basic/detail.txt:19
8805
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8806
"  brz log            show history of changes\n"
8807
"  brz check          validate storage"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8808
msgstr ""
8809
8810
#: dummy/help_topics/basic/detail.txt:22
8811
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8812
"  brz help init      more help on e.g. init command\n"
8813
"  brz help commands  list all commands\n"
8814
"  brz help topics    list all help topics\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8815
msgstr ""
8816
8817
#: dummy/help_topics/basic/summary.txt:1
8818
msgid "Basic commands"
8819
msgstr ""
8820
8821
#: dummy/help_topics/branches/detail.txt:1
8822
msgid "Branches"
8823
msgstr ""
8824
8825
#: dummy/help_topics/branches/detail.txt:3
8826
msgid ""
8827
"A branch consists of the state of a project, including all of its\n"
8828
"history. All branches have a repository associated (which is where the\n"
8829
"branch history is stored), but multiple branches may share the same\n"
8830
"repository (a shared repository). Branches can be copied and merged."
8831
msgstr ""
8832
8833
#: dummy/help_topics/branches/detail.txt:8
8834
msgid ""
8835
"In addition, one branch may be bound to another one.  Binding to another\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
8836
"branch indicates that commits which happen in this branch must also\n"
8837
"happen in the other branch.  Breezy ensures consistency by not allowing\n"
8838
"commits when the two branches are out of date.  In order for a commit\n"
8839
"to succeed, it may be necessary to update the current branch using\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8840
"``brz update``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8841
msgstr ""
8842
8843
#: dummy/help_topics/branches/detail.txt:15
6437.2.2 by Vincent Ladeuil
Release 2.5b5
8844
#: dummy/help_topics/checkouts/detail.txt:66
8845
#: dummy/help_topics/repositories/detail.txt:36
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8846
msgid "Related commands::"
8847
msgstr ""
8848
8849
#: dummy/help_topics/branches/detail.txt:17
8850
msgid ""
8851
"  init    Change a directory into a versioned branch.\n"
8852
"  branch  Create a new branch that is a copy of an existing branch.\n"
8853
"  merge   Perform a three-way merge.\n"
8854
"  bind    Bind a branch to another one.\n"
8855
msgstr ""
8856
8857
#: dummy/help_topics/branches/summary.txt:1
8858
msgid "Information on what a branch is"
8859
msgstr ""
8860
8861
#: dummy/help_topics/bugs/summary.txt:1
8862
msgid "Bug tracker settings"
8863
msgstr ""
8864
8865
#: dummy/help_topics/checkouts/detail.txt:1
8866
msgid "Checkouts"
8867
msgstr ""
8868
8869
#: dummy/help_topics/checkouts/detail.txt:3
8870
msgid ""
8871
"Checkouts are source trees that are connected to a branch, so that when\n"
8872
"you commit in the source tree, the commit goes into that branch.  They\n"
8873
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8874
"Breezy's decentralized features until you want them. Using checkouts\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8875
"with shared repositories is very similar to working with SVN or CVS, but\n"
8876
"doesn't have the same restrictions.  And using checkouts still allows\n"
8877
"others working on the project to use whatever workflow they like."
8878
msgstr ""
8879
8880
#: dummy/help_topics/checkouts/detail.txt:11
8881
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8882
"A checkout is created with the brz checkout command (see \"help checkout"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8883
"\").\n"
8884
"You pass it a reference to another branch, and it will create a local copy\n"
8885
"for you that still contains a reference to the branch you created the\n"
8886
"checkout from (the master branch). Then if you make any commits they will "
8887
"be\n"
8888
"made on the other branch first. This creates an instant mirror of your work, "
8889
"or\n"
8890
"facilitates lockstep development, where each developer is working together,\n"
8891
"continuously integrating the changes of others."
8892
msgstr ""
8893
8894
#: dummy/help_topics/checkouts/detail.txt:19
8895
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
8896
"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
8897
"you have the full history locally.  As you have a first class branch you "
8898
"can\n"
8899
"also commit locally if you want, for instance due to the temporary loss af "
8900
"a\n"
8901
"network connection. Use the --local option to commit to do this. All the "
8902
"local\n"
8903
"commits will then be made on the master branch the next time you do a non-"
8904
"local\n"
8905
"commit."
8906
msgstr ""
8907
8908
#: dummy/help_topics/checkouts/detail.txt:26
8909
msgid ""
8910
"If you are using a checkout from a shared branch you will periodically want "
8911
"to\n"
8912
"pull in all the changes made by others. This is done using the \"update\"\n"
8913
"command. The changes need to be applied before any non-local commit, but\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
8914
"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
8915
"command when needed."
8916
msgstr ""
8917
8918
#: dummy/help_topics/checkouts/detail.txt:32
8919
msgid ""
8920
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8921
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8922
"SVN checkout in that it is not a first class branch, it mainly consists of "
8923
"the\n"
8924
"working tree. This means that any history operations must query the master\n"
8925
"branch, which could be slow if a network connection is involved. Also, as "
8926
"you\n"
8927
"don't have a local branch, then you cannot commit locally."
8928
msgstr ""
8929
8930
#: dummy/help_topics/checkouts/detail.txt:39
8931
msgid ""
8932
"Lightweight checkouts work best when you have fast reliable access to the\n"
8933
"master branch. This means that if the master branch is on the same disk or "
8934
"LAN\n"
8935
"a lightweight checkout will be faster than a heavyweight one for any "
8936
"commands\n"
8937
"that modify the revision history (as only one copy of the branch needs to\n"
8938
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8939
"that uses the history but does not change it, but if the master branch is "
8940
"on\n"
8941
"the same disk then there won't be a noticeable difference."
8942
msgstr ""
8943
8944
#: dummy/help_topics/checkouts/detail.txt:47
8945
msgid ""
8946
"Another possible use for a checkout is to use it with a treeless repository\n"
8947
"containing your branches, where you maintain only one working tree by\n"
8948
"switching the master branch that the checkout points to when you want to\n"
8949
"work on a different branch."
8950
msgstr ""
8951
8952
#: dummy/help_topics/checkouts/detail.txt:52
8953
msgid ""
8954
"Obviously to commit on a checkout you need to be able to write to the "
8955
"master\n"
8956
"branch. This means that the master branch must be accessible over a "
8957
"writeable\n"
8958
"protocol , such as sftp://, and that you have write permissions at the "
8959
"other\n"
8960
"end. Checkouts also work on the local file system, so that all that matters "
8961
"is\n"
8962
"file permissions."
8963
msgstr ""
8964
8965
#: dummy/help_topics/checkouts/detail.txt:58
8966
msgid ""
8967
"You can change the master of a checkout by using the \"switch\" command "
8968
"(see\n"
8969
"\"help switch\").  This will change the location that the commits are sent "
8970
"to.\n"
8971
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8972
"checkout. If you would like to convert your heavy checkout into a normal\n"
8973
"branch so that every commit is local, you can use the \"unbind\" command. To "
8974
"see\n"
8975
"whether or not a branch is bound or not you can use the \"info\" command. If "
8976
"the\n"
8977
"branch is bound it will tell you the location of the bound branch."
8978
msgstr ""
8979
8980
#: dummy/help_topics/checkouts/detail.txt:68
8981
msgid ""
8982
"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
8983
"              checkout\n"
8984
"  update      Pull any changes in the master branch in to your checkout\n"
8985
"  commit      Make a commit that is sent to the master branch. If you have\n"
8986
"              a heavy checkout then the --local option will commit to the\n"
8987
"              checkout without sending the commit to the master\n"
8988
"  switch      Change the master branch that the commits in the checkout "
8989
"will\n"
8990
"              be sent to\n"
8991
"  bind        Turn a standalone branch into a heavy checkout so that any\n"
8992
"              commits will be sent to the master branch\n"
8993
"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
8994
"              commits are only made locally\n"
8995
"  info        Displays whether a branch is bound or unbound. If the branch "
8996
"is\n"
8997
"              bound, then it will also display the location of the bound "
8998
"branch\n"
8999
msgstr ""
9000
9001
#: dummy/help_topics/checkouts/summary.txt:1
9002
msgid "Information on what a checkout is"
9003
msgstr ""
9004
9005
#: dummy/help_topics/configuration/summary.txt:1
9006
msgid "Details on the configuration settings available"
9007
msgstr ""
9008
9009
#: dummy/help_topics/conflict-types/summary.txt:1
9010
msgid "Types of conflicts and what to do about them"
9011
msgstr ""
9012
9013
#: dummy/help_topics/content-filters/summary.txt:1
9014
msgid "Conversion of content into/from working trees"
9015
msgstr ""
9016
9017
#: dummy/help_topics/criss-cross/detail.txt:1
9018
msgid "Criss-Cross"
9019
msgstr ""
9020
9021
#: dummy/help_topics/criss-cross/detail.txt:3
9022
msgid ""
9023
"A criss-cross in the branch history can cause the default merge technique\n"
9024
"to emit more conflicts than would normally be expected."
9025
msgstr ""
9026
9027
#: dummy/help_topics/criss-cross/detail.txt:6
9028
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9029
"In complex merge cases, ``brz merge --lca`` or ``brz merge --weave`` may "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9030
"give\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9031
"better results.  You may wish to ``brz revert`` the working tree and merge\n"
9032
"again.  Alternatively, use ``brz remerge`` on particular conflicted files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9033
msgstr ""
9034
9035
#: dummy/help_topics/criss-cross/detail.txt:10
9036
msgid ""
9037
"Criss-crosses occur in a branch's history if two branches merge the same "
9038
"thing\n"
9039
"and then merge one another, or if two branches merge one another at the "
9040
"same\n"
9041
"time.  They can be avoided by having each branch only merge from or into a\n"
9042
"designated central branch (a \"star topology\")."
9043
msgstr ""
9044
9045
#: dummy/help_topics/criss-cross/detail.txt:15
9046
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9047
"Criss-crosses cause problems because of the way merge works.  Breezy's "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9048
"default\n"
9049
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
9050
"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
9051
"differences between THIS and OTHER are due to one side adding lines, or\n"
9052
"from another side removing lines."
9053
msgstr ""
9054
9055
#: dummy/help_topics/criss-cross/detail.txt:21
9056
msgid ""
9057
"Criss-crosses mean there is no good choice for a base.  Selecting the "
9058
"recent\n"
9059
"merge points could cause one side's changes to be silently discarded.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9060
"Selecting older merge points (which Breezy does) mean that extra conflicts\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9061
"are emitted."
9062
msgstr ""
9063
9064
#: dummy/help_topics/criss-cross/detail.txt:26
9065
msgid ""
9066
"The ``weave`` merge type is not affected by this problem because it uses\n"
9067
"line-origin detection instead of a basis revision to determine the cause of\n"
9068
"differences.\n"
9069
msgstr ""
9070
9071
#: dummy/help_topics/criss-cross/summary.txt:1
9072
msgid "Information on criss-cross merging"
9073
msgstr ""
9074
9075
#: dummy/help_topics/current-formats/summary.txt:1
9076
msgid "Current storage formats"
9077
msgstr ""
9078
9079
#: dummy/help_topics/debug-flags/summary.txt:1
9080
msgid "Options to show or record debug information"
9081
msgstr ""
9082
9083
#: dummy/help_topics/diverged-branches/summary.txt:1
9084
msgid "How to fix diverged branches"
9085
msgstr ""
9086
9087
#: dummy/help_topics/env-variables/summary.txt:1
9088
msgid "Environment variable names and values"
9089
msgstr ""
9090
9091
#: dummy/help_topics/eol/summary.txt:1
9092
msgid "Information on end-of-line handling"
9093
msgstr ""
9094
9095
#: dummy/help_topics/files/detail.txt:1
9096
msgid "Files"
9097
msgstr ""
9098
9099
#: dummy/help_topics/files/detail.txt:3
9100
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9101
":On Unix:   ~/.config/breezy/breezy.conf\n"
7490.31.3 by Jelmer Vernooij
Update po.
9102
":On Windows: %APPDATA%\\\\breezy\\\\breezy.conf"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9103
msgstr ""
9104
9105
#: dummy/help_topics/files/detail.txt:6
9106
msgid ""
9107
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
9108
"used to define general configuration that will be applied everywhere.\n"
9109
"The section ``[ALIASES]`` can be used to create command aliases for\n"
9110
"commonly used options."
9111
msgstr ""
9112
9113
#: dummy/help_topics/files/detail.txt:11
9114
msgid "A typical config file might look something like::"
9115
msgstr ""
9116
9117
#: dummy/help_topics/files/detail.txt:13
9118
msgid ""
9119
"  [DEFAULT]\n"
9120
"  email=John Doe <jdoe@isp.com>"
9121
msgstr ""
9122
9123
#: dummy/help_topics/files/detail.txt:16
9124
msgid ""
9125
"  [ALIASES]\n"
9126
"  commit = commit --strict\n"
9127
"  log10 = log --short -r -10..-1\n"
9128
msgstr ""
9129
9130
#: dummy/help_topics/files/summary.txt:1
9131
msgid "Information on configuration and log files"
9132
msgstr ""
9133
9134
#: dummy/help_topics/formats/detail.txt:1
9135
msgid "Storage Formats"
9136
msgstr ""
9137
9138
#: dummy/help_topics/formats/detail.txt:3
9139
msgid ""
9140
"To ensure that older clients do not access data incorrectly,\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9141
"Breezy's policy is to introduce a new storage format whenever\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9142
"new features requiring new metadata are added. New storage\n"
9143
"formats may also be introduced to improve performance and\n"
9144
"scalability."
9145
msgstr ""
9146
9147
#: dummy/help_topics/formats/detail.txt:9
9148
msgid ""
9149
"The newest format, 2a, is highly recommended. If your\n"
9150
"project is not using 2a, then you should suggest to the\n"
9151
"project owner to upgrade."
9152
msgstr ""
9153
9154
#: dummy/help_topics/formats/detail.txt:13
9155
msgid ""
9156
"\n"
9157
".. note::"
9158
msgstr ""
9159
9160
#: dummy/help_topics/formats/detail.txt:16
9161
msgid ""
9162
"   Some of the older formats have two variants:\n"
9163
"   a plain one and a rich-root one. The latter include an additional\n"
9164
"   field about the root of the tree. There is no performance cost\n"
9165
"   for using a rich-root format but you cannot easily merge changes\n"
9166
"   from a rich-root format into a plain format. As a consequence,\n"
9167
"   moving a project to a rich-root format takes some co-ordination\n"
9168
"   in that all contributors need to upgrade their repositories\n"
9169
"   around the same time. 2a and all future formats will be\n"
9170
"   implicitly rich-root."
9171
msgstr ""
9172
9173
#: dummy/help_topics/formats/detail.txt:26
9174
msgid ""
9175
"See :doc:`current-formats-help` for the complete list of\n"
9176
"currently supported formats. See :doc:`other-formats-help` for\n"
9177
"descriptions of any available experimental and deprecated formats.\n"
9178
msgstr ""
9179
9180
#: dummy/help_topics/formats/summary.txt:1
9181
msgid "Information on choosing a storage format"
9182
msgstr ""
9183
7185.1.1 by Jelmer Vernooij
Update pot file.
9184
#: dummy/help_topics/git/detail.txt:1
9185
msgid "Using Bazaar with Git."
9186
msgstr ""
9187
9188
#: dummy/help_topics/git/detail.txt:3
9189
msgid ""
9190
"The bzr-git plugin provides support for using Bazaar with local and remote\n"
9191
"Git repositories, as just another format. You can clone, pull from and\n"
9192
"push to git repositories as you would with any native Bazaar branch."
9193
msgstr ""
9194
9195
#: dummy/help_topics/git/detail.txt:7
9196
msgid "The bzr-git plugin also adds three new bzr subcommands:"
9197
msgstr ""
9198
9199
#: dummy/help_topics/git/detail.txt:9
9200
msgid ""
9201
" * bzr git-objects: Extracts Git objects out of a Bazaar repository\n"
9202
" * bzr git-refs: Display Git refs from a Bazaar branch or repository\n"
9203
" * bzr git-import: Imports a local or remote Git repository to a set of "
9204
"Bazaar\n"
9205
"                   branches"
9206
msgstr ""
9207
9208
#: dummy/help_topics/git/detail.txt:14
9209
msgid ""
9210
"The 'git:' revision specifier can be used to find revisions by short or "
9211
"long\n"
9212
"GIT SHA1.\n"
9213
msgstr ""
9214
9215
#: dummy/help_topics/git/summary.txt:1
9216
msgid "Using Bazaar with Git"
9217
msgstr ""
9218
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9219
#: dummy/help_topics/global-options/detail.txt:1
9220
msgid "Global Options"
9221
msgstr ""
9222
9223
#: dummy/help_topics/global-options/detail.txt:3
9224
msgid ""
9225
"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.
9226
"command.  (e.g. ``brz --profile help``)."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9227
msgstr ""
9228
9229
#: dummy/help_topics/global-options/detail.txt:6
9230
msgid ""
9231
"--version      Print the version number. Must be supplied before the "
9232
"command.\n"
9233
"--no-aliases   Do not process command aliases when running this command.\n"
9234
"--builtin      Use the built-in version of a command, not the plugin "
9235
"version.\n"
9236
"               This does not suppress other plugin effects.\n"
9237
"--no-plugins   Do not process any plugins.\n"
9238
"--no-l10n      Do not translate messages.\n"
9239
"--concurrency  Number of processes that can be run concurrently (selftest)."
9240
msgstr ""
9241
9242
#: dummy/help_topics/global-options/detail.txt:14
9243
msgid ""
9244
"--profile      Profile execution using the hotshot profiler.\n"
9245
"--lsprof       Profile execution using the lsprof profiler.\n"
9246
"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
9247
"               results to a specified file.  If the filename ends with \".txt"
9248
"\",\n"
9249
"               text format will be used.  If the filename either starts "
9250
"with\n"
9251
"               \"callgrind.out\" or end with \".callgrind\", the output will "
9252
"be\n"
9253
"               formatted for use with KCacheGrind. Otherwise, the output\n"
9254
"               will be a pickle.\n"
9255
"--coverage     Generate line coverage report in the specified directory."
9256
msgstr ""
9257
9258
#: dummy/help_topics/global-options/detail.txt:24
9259
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9260
"-Oname=value   Override the ``name`` config option setting it to ``value`` "
9261
"for\n"
9262
"               the duration of the command.  This can be used multiple times "
9263
"if\n"
9264
"               several options need to be overridden."
9265
msgstr ""
9266
9267
#: dummy/help_topics/global-options/detail.txt:28
9268
msgid ""
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
9269
"See https://www.breezy-vcs.org/developers/profiling.html for more\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9270
"information on profiling."
9271
msgstr ""
9272
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9273
#: dummy/help_topics/global-options/detail.txt:31
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9274
msgid ""
9275
"A number of debug flags are also available to assist troubleshooting and\n"
9276
"development.  See :doc:`debug-flags-help`.\n"
9277
msgstr ""
9278
9279
#: dummy/help_topics/global-options/summary.txt:1
7185.1.1 by Jelmer Vernooij
Update pot file.
9280
msgid "Options that control how Breezy runs"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9281
msgstr ""
9282
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
9283
#: dummy/help_topics/glossary/summary.txt:1
9284
msgid "Glossary"
9285
msgstr ""
9286
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9287
#: dummy/help_topics/hooks/summary.txt:1
9288
msgid "Points at which custom processing can be added"
9289
msgstr ""
9290
9291
#: dummy/help_topics/launchpad/detail.txt:1
9292
msgid "Integration with Launchpad.net"
9293
msgstr ""
9294
9295
#: dummy/help_topics/launchpad/detail.txt:3
9296
msgid ""
9297
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9298
"specification tracking."
9299
msgstr ""
9300
9301
#: dummy/help_topics/launchpad/detail.txt:6
9302
msgid ""
9303
"The bzr client (through the plugin called 'launchpad') has special\n"
9304
"features to communicate with Launchpad:"
9305
msgstr ""
9306
9307
#: dummy/help_topics/launchpad/detail.txt:9
9308
msgid ""
9309
"    * The launchpad-login command tells Bazaar your Launchpad user name. "
9310
"This\n"
9311
"      is then used by the 'lp:' transport to download your branches using\n"
9312
"      bzr+ssh://."
9313
msgstr ""
9314
9315
#: dummy/help_topics/launchpad/detail.txt:13
9316
msgid ""
9317
"    * The 'lp:' transport uses Launchpad as a directory service: for "
9318
"example\n"
9319
"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
9320
"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
9321
"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
9322
msgstr ""
9323
9324
#: dummy/help_topics/launchpad/detail.txt:18
9325
msgid ""
9326
"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
9327
"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
9328
"lp:12345'\n"
9329
"      will record a revision property that marks that revision as fixing\n"
9330
"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
9331
"      automatically be linked to the bug report."
9332
msgstr ""
9333
9334
#: dummy/help_topics/launchpad/detail.txt:24
9335
msgid "For more information see http://help.launchpad.net/\n"
9336
msgstr ""
9337
9338
#: dummy/help_topics/launchpad/summary.txt:1
9339
msgid "Using Bazaar with Launchpad.net"
9340
msgstr ""
9341
9342
#: dummy/help_topics/location-alias/summary.txt:1
9343
msgid "Aliases for remembered locations"
9344
msgstr ""
9345
9346
#: dummy/help_topics/log-formats/summary.txt:1
9347
msgid "Details on the logging formats available"
9348
msgstr ""
9349
7185.1.1 by Jelmer Vernooij
Update pot file.
9350
#: dummy/help_topics/missing-extensions/summary.txt:1
9351
msgid "What to do when compiled extensions are missing"
9352
msgstr ""
9353
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9354
#: dummy/help_topics/other-formats/summary.txt:1
9355
msgid "Experimental and deprecated storage formats"
9356
msgstr ""
9357
9358
#: dummy/help_topics/patterns/summary.txt:1
9359
msgid "Information on the pattern syntax"
9360
msgstr ""
9361
9362
#: dummy/help_topics/repositories/detail.txt:1
9363
msgid "Repositories"
9364
msgstr ""
9365
9366
#: dummy/help_topics/repositories/detail.txt:3
9367
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9368
"Repositories in Breezy are where committed information is stored. There is\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9369
"a repository associated with every branch."
9370
msgstr ""
9371
9372
#: dummy/help_topics/repositories/detail.txt:6
9373
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9374
"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
9375
"good performance automatically, but in some situations (e.g. when doing\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9376
"very many commits in a short time period) you may want to ask brz to\n"
9377
"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
9378
msgstr ""
9379
9380
#: dummy/help_topics/repositories/detail.txt:11
9381
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
9382
"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
9383
"branch but it is possible to create a shared repository which allows "
9384
"multiple\n"
9385
"branches to share their information in the same location. When a new branch "
9386
"is\n"
9387
"created it will first look to see if there is a containing shared repository "
9388
"it\n"
9389
"can use."
9390
msgstr ""
9391
9392
#: dummy/help_topics/repositories/detail.txt:17
9393
msgid ""
9394
"When two branches of the same project share a repository, there is\n"
9395
"generally a large space saving. For some operations (e.g. branching\n"
9396
"within the repository) this translates in to a large time saving."
9397
msgstr ""
9398
9399
#: dummy/help_topics/repositories/detail.txt:21
9400
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
9401
"To create a shared repository use the init-shared-repository command (or "
9402
"the\n"
9403
"alias init-shared-repo). This command takes the location of the repository "
9404
"to\n"
9405
"create. This means that 'brz init-shared-repository repo' will create a\n"
9406
"directory named 'repo', which contains a shared repository. Any new "
9407
"branches\n"
9408
"that are created in this directory will then use it for storage."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9409
msgstr ""
9410
9411
#: dummy/help_topics/repositories/detail.txt:27
9412
msgid ""
9413
"It is a good idea to create a repository whenever you might create more\n"
9414
"than one branch of a project. This is true for both working areas where you\n"
9415
"are doing the development, and any server areas that you use for hosting\n"
9416
"projects. In the latter case, it is common to want branches without working\n"
9417
"trees. Since the files in the branch will not be edited directly there is "
9418
"no\n"
9419
"need to use up disk space for a working tree. To create a repository in "
9420
"which\n"
9421
"the branches will not have working trees pass the '--no-trees' option to\n"
7490.31.3 by Jelmer Vernooij
Update po.
9422
"'init-shared-repository'."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9423
msgstr ""
9424
9425
#: dummy/help_topics/repositories/detail.txt:38
9426
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
9427
"  init-shared-repository   Create a shared repository. Use --no-trees to "
9428
"create\n"
9429
"                           one in which new branches won't get a working "
9430
"tree.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9431
msgstr ""
9432
9433
#: dummy/help_topics/repositories/summary.txt:1
9434
msgid "Basic information on shared repositories."
9435
msgstr ""
9436
9437
#: dummy/help_topics/revisionspec/summary.txt:1
9438
msgid "Explain how to use --revision"
9439
msgstr ""
9440
9441
#: dummy/help_topics/rules/summary.txt:1
9442
msgid "Information on defining rule-based preferences"
9443
msgstr ""
9444
9445
#: dummy/help_topics/standalone-trees/detail.txt:1
9446
msgid "Standalone Trees"
9447
msgstr ""
9448
9449
#: dummy/help_topics/standalone-trees/detail.txt:3
9450
msgid ""
9451
"A standalone tree is a working tree with an associated repository. It\n"
9452
"is an independently usable branch, with no dependencies on any other.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9453
"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
9454
"an existing project under version control."
9455
msgstr ""
9456
9457
#: dummy/help_topics/standalone-trees/detail.txt:8
9458
msgid "Related Commands::"
9459
msgstr ""
9460
9461
#: dummy/help_topics/standalone-trees/detail.txt:10
9462
msgid "  init    Make a directory into a versioned branch.\n"
9463
msgstr ""
9464
9465
#: dummy/help_topics/standalone-trees/summary.txt:1
9466
msgid "Information on what a standalone tree is"
9467
msgstr ""
9468
9469
#: dummy/help_topics/standard-options/detail.txt:1
9470
msgid "Standard Options"
9471
msgstr ""
9472
9473
#: dummy/help_topics/standard-options/detail.txt:3
9474
msgid "Standard options are legal for all commands."
9475
msgstr ""
9476
9477
#: dummy/help_topics/standard-options/detail.txt:5
9478
msgid ""
9479
"--help, -h     Show help message.\n"
9480
"--verbose, -v  Display more information.\n"
9481
"--quiet, -q    Only display errors and warnings."
9482
msgstr ""
9483
9484
#: dummy/help_topics/standard-options/detail.txt:9
9485
msgid "Unlike global options, standard options can be used in aliases.\n"
9486
msgstr ""
9487
9488
#: dummy/help_topics/standard-options/summary.txt:1
9489
msgid "Options that can be used with any command"
9490
msgstr ""
9491
9492
#: dummy/help_topics/status-flags/detail.txt:1
9493
msgid "Status Flags"
9494
msgstr ""
9495
9496
#: dummy/help_topics/status-flags/detail.txt:3
9497
msgid ""
9498
"Status flags are used to summarise changes to the working tree in a concise\n"
9499
"manner.  They are in the form::"
9500
msgstr ""
9501
9502
#: dummy/help_topics/status-flags/detail.txt:6
9503
msgid "   xxx   <filename>"
9504
msgstr ""
9505
9506
#: dummy/help_topics/status-flags/detail.txt:8
9507
msgid "where the columns' meanings are as follows."
9508
msgstr ""
9509
9510
#: dummy/help_topics/status-flags/detail.txt:10
9511
msgid "Column 1 - versioning/renames::"
9512
msgstr ""
9513
9514
#: dummy/help_topics/status-flags/detail.txt:12
9515
msgid ""
9516
"  + File versioned\n"
9517
"  - File unversioned\n"
9518
"  R File renamed\n"
9519
"  ? File unknown\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9520
"  X File nonexistent (and unknown to brz)\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9521
"  C File has conflicts\n"
9522
"  P Entry for a pending merge (not a file)"
9523
msgstr ""
9524
9525
#: dummy/help_topics/status-flags/detail.txt:20
9526
msgid "Column 2 - contents::"
9527
msgstr ""
9528
9529
#: dummy/help_topics/status-flags/detail.txt:22
9530
msgid ""
9531
"  N File created\n"
9532
"  D File deleted\n"
9533
"  K File kind changed\n"
9534
"  M File modified"
9535
msgstr ""
9536
9537
#: dummy/help_topics/status-flags/detail.txt:27
9538
msgid "Column 3 - execute::"
9539
msgstr ""
9540
9541
#: dummy/help_topics/status-flags/detail.txt:29
9542
msgid "  * The execute bit was changed\n"
9543
msgstr ""
9544
9545
#: dummy/help_topics/status-flags/summary.txt:1
9546
msgid "Help on status flags"
9547
msgstr ""
9548
9549
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
9550
msgid "Branches Out of Sync"
9551
msgstr ""
9552
9553
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
9554
msgid ""
9555
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
9556
"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
9557
"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
9558
"have the same last revision as the new reference branch for the lightweight\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9559
"checkout, data could be lost, so Breezy refuses."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9560
msgstr ""
9561
9562
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
9563
msgid "How you deal with this depends on *why* the branches are out of sync."
9564
msgstr ""
9565
9566
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
9567
msgid ""
9568
"If you have a checkout and have done local commits, you can get back in "
9569
"sync\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9570
"by running \"brz update\" (and possibly \"brz commit\")."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9571
msgstr ""
9572
9573
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
9574
msgid ""
9575
"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.
9576
"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
9577
"you\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9578
"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
9579
"commit\n"
9580
"and then push your changes.  If you decide that some of the changes aren't\n"
9581
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
9582
msgstr ""
9583
9584
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
9585
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
9586
msgstr ""
9587
9588
#: dummy/help_topics/topics/summary.txt:1
9589
msgid "Topics list"
9590
msgstr ""
9591
9592
#: dummy/help_topics/url-special-chars/summary.txt:1
9593
msgid "Special character handling in URLs"
9594
msgstr ""
9595
9596
#: dummy/help_topics/urlspec/summary.txt:1
9597
msgid "Supported transport protocols"
9598
msgstr ""
9599
9600
#: dummy/help_topics/working-trees/detail.txt:1
9601
msgid "Working Trees"
9602
msgstr ""
9603
9604
#: dummy/help_topics/working-trees/detail.txt:3
9605
msgid ""
9606
"A working tree is the contents of a branch placed on disk so that you can\n"
9607
"see the files and edit them. The working tree is where you make changes to "
9608
"a\n"
9609
"branch, and when you commit the current state of the working tree is the\n"
9610
"snapshot that is recorded in the commit."
9611
msgstr ""
9612
9613
#: dummy/help_topics/working-trees/detail.txt:8
9614
msgid ""
9615
"When you push a branch to a remote system, a working tree will not be\n"
9616
"created. If one is already present the files will not be updated. The\n"
9617
"branch information will be updated and the working tree will be marked\n"
9618
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
9619
"may be uncommitted changes or the update may cause content conflicts that "
9620
"are\n"
9621
"difficult to deal with remotely."
9622
msgstr ""
9623
9624
#: dummy/help_topics/working-trees/detail.txt:15
9625
msgid ""
9626
"If you have a branch with no working tree you can use the 'checkout' "
9627
"command\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9628
"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
9629
"will\n"
9630
"create the working tree. If the branch is updated remotely, you can update "
9631
"the\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9632
"working tree by running 'brz update' in that directory."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9633
msgstr ""
9634
9635
#: dummy/help_topics/working-trees/detail.txt:20
9636
msgid ""
9637
"If you have a branch with a working tree that you do not want the 'remove-"
9638
"tree'\n"
9639
"command will remove the tree if it is safe. This can be done to avoid the\n"
9640
"warning about the remote working tree not being updated when pushing to the\n"
9641
"branch. It can also be useful when working with a '--no-trees' repository\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9642
"(see 'brz help repositories')."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9643
msgstr ""
9644
9645
#: dummy/help_topics/working-trees/detail.txt:26
9646
msgid ""
9647
"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.
9648
"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
9649
"some\n"
9650
"other method to update the tree during the push. There is an 'rspush' "
9651
"plugin\n"
9652
"that will update the working tree using rsync as well as doing a push. "
9653
"There\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9654
"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
9655
"SSH\n"
9656
"after each push."
9657
msgstr ""
9658
9659
#: dummy/help_topics/working-trees/detail.txt:33
9660
msgid "Useful commands::"
9661
msgstr ""
9662
9663
#: dummy/help_topics/working-trees/detail.txt:35
9664
msgid ""
9665
"  checkout     Create a working tree when a branch does not have one.\n"
9666
"  remove-tree  Removes the working tree from a branch when it is safe to do "
9667
"so.\n"
9668
"  update       When a working tree is out of sync with its associated "
9669
"branch\n"
9670
"               this will update the tree to match the branch.\n"
9671
msgstr ""
9672
9673
#: dummy/help_topics/working-trees/summary.txt:1
9674
msgid "Information on working trees"
9675
msgstr ""
9676
9677
#: en/help_topics/authentication.txt:1
9678
msgid ""
9679
"Authentication Settings\n"
9680
"======================="
9681
msgstr ""
9682
9683
#: en/help_topics/authentication.txt:4
9684
msgid ""
9685
"\n"
9686
"Intent\n"
9687
"------"
9688
msgstr ""
9689
9690
#: en/help_topics/authentication.txt:8
9691
msgid ""
9692
"Many different authentication policies can be described in the\n"
9693
"``authentication.conf`` file but a particular user should need only a few\n"
9694
"definitions to cover his needs without having to specify a user and a "
9695
"password\n"
9696
"for every branch he uses."
9697
msgstr ""
9698
9699
#: en/help_topics/authentication.txt:13
9700
msgid ""
9701
"The definitions found in this file are used to find the credentials to use "
9702
"for\n"
9703
"a given url. The same credentials can generally be used for as many branches "
9704
"as\n"
9705
"possible by grouping their declaration around the remote servers that need\n"
9706
"them. It's even possible to declare credentials that will be used by "
9707
"different\n"
9708
"servers."
9709
msgstr ""
9710
9711
#: en/help_topics/authentication.txt:19
9712
msgid ""
9713
"The intent is to make this file as small as possible to minimize maintenance."
9714
msgstr ""
9715
9716
#: en/help_topics/authentication.txt:21
9717
msgid ""
9718
"Once the relevant credentials are declared in this file you may use branch "
9719
"urls\n"
9720
"without embedding passwords (security hazard) or even users (enabling "
9721
"sharing\n"
9722
"of your urls with others)."
9723
msgstr ""
9724
9725
#: en/help_topics/authentication.txt:25
9726
msgid "Instead of using::"
9727
msgstr ""
9728
9729
#: en/help_topics/authentication.txt:27
7185.1.1 by Jelmer Vernooij
Update pot file.
9730
msgid "  brz branch sftp://joe:secret@host.com/path/to/my/branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9731
msgstr ""
9732
9733
#: en/help_topics/authentication.txt:29
9734
msgid "you simply use::"
9735
msgstr ""
9736
9737
#: en/help_topics/authentication.txt:31
7185.1.1 by Jelmer Vernooij
Update pot file.
9738
msgid "  brz branch sftp://host.com/path/to/my/branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9739
msgstr ""
9740
9741
#: en/help_topics/authentication.txt:33
9742
msgid "provided you have created the following ``authentication.conf`` file::"
9743
msgstr ""
9744
9745
#: en/help_topics/authentication.txt:35
9746
msgid ""
9747
"  [myprojects]\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
9748
"  scheme=sftp\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9749
"  host=host.com\n"
9750
"  user=joe\n"
9751
"  password=secret\n"
9752
"  "
9753
msgstr ""
9754
9755
#: en/help_topics/authentication.txt:42
9756
msgid ""
9757
"Authentication definitions\n"
9758
"--------------------------"
9759
msgstr ""
9760
9761
#: en/help_topics/authentication.txt:45
9762
msgid ""
9763
"There are two kinds of authentication used by the various schemes supported "
9764
"by\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9765
"brz:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9766
msgstr ""
9767
9768
#: en/help_topics/authentication.txt:48
9769
msgid "1. user and password"
9770
msgstr ""
9771
9772
#: en/help_topics/authentication.txt:50
9773
msgid ""
9774
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9775
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9776
"ssh agents are a better, more secure solution. So we have chosen to not "
9777
"provide\n"
9778
"our own less secure method."
9779
msgstr ""
9780
9781
#: en/help_topics/authentication.txt:55
9782
msgid "2. user, realm and password"
9783
msgstr ""
9784
9785
#: en/help_topics/authentication.txt:57
9786
msgid ""
9787
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9788
"against a host. But, by using ``.htaccess`` files, for example, it is "
9789
"possible\n"
9790
"to define several (``user, realm, password``) for a given ``host``. So what "
9791
"is\n"
9792
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9793
"is\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9794
"not taken into account in the definitions, but will displayed if brz "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9795
"prompts\n"
9796
"you for a password."
9797
msgstr ""
9798
9799
#: en/help_topics/authentication.txt:64
9800
msgid ""
9801
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9802
"specifying the appropriate port."
9803
msgstr ""
9804
9805
#: en/help_topics/authentication.txt:67
9806
msgid ""
9807
"To take all schemes into account, the password will be deduced from a set "
9808
"of\n"
9809
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9810
"``user``,\n"
9811
"``password``)."
9812
msgstr ""
9813
9814
#: en/help_topics/authentication.txt:71
9815
msgid ""
9816
"  * ``scheme``: can be empty (meaning the rest of the definition can be "
9817
"used\n"
9818
"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9819
"``ssh``\n"
9820
"    should be used instead since this is the real scheme regarding\n"
9821
"    authentication,"
9822
msgstr ""
9823
9824
#: en/help_topics/authentication.txt:76
9825
msgid "  * ``host``: can be empty (to act as a default for any host),"
9826
msgstr ""
9827
9828
#: en/help_topics/authentication.txt:78
9829
msgid ""
9830
"  * ``port`` can be empty (useful when an host provides several servers for "
9831
"the\n"
9832
"    same scheme), only numerical values are allowed, this should be used "
9833
"only\n"
9834
"    when the server uses a port different than the scheme standard port,"
9835
msgstr ""
9836
9837
#: en/help_topics/authentication.txt:82
9838
msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
9839
msgstr ""
9840
9841
#: en/help_topics/authentication.txt:84
9842
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9843
"  * ``user``: can be empty (``bzr`` will default to python's\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9844
"    ``getpass.get_user()``),"
9845
msgstr ""
9846
9847
#: en/help_topics/authentication.txt:87
9848
msgid ""
9849
"  * ``password``: can be empty if you prefer to always be prompted for your\n"
9850
"    password."
9851
msgstr ""
9852
9853
#: en/help_topics/authentication.txt:90
9854
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9855
"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
9856
"a\n"
9857
"(``user`` [, ``password``]) based on the following rules :"
9858
msgstr ""
9859
9860
#: en/help_topics/authentication.txt:93
9861
msgid " 1. the first match wins,"
9862
msgstr ""
9863
9864
#: en/help_topics/authentication.txt:95
9865
msgid " 2. empty fields match everything,"
9866
msgstr ""
9867
9868
#: en/help_topics/authentication.txt:97
9869
msgid ""
9870
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9871
msgstr ""
9872
9873
#: en/help_topics/authentication.txt:99
9874
msgid ""
9875
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9876
"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
9877
"net``\n"
9878
"    will not match ``bzr.sf.net``)."
9879
msgstr ""
9880
9881
#: en/help_topics/authentication.txt:103
9882
msgid ""
9883
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9884
msgstr ""
9885
9886
#: en/help_topics/authentication.txt:105
9887
msgid ""
9888
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9889
"above,\n"
9890
"    empty paths will match any provided path)."
9891
msgstr ""
9892
9893
#: en/help_topics/authentication.txt:110
9894
msgid ""
9895
"File format\n"
9896
"-----------"
9897
msgstr ""
9898
9899
#: en/help_topics/authentication.txt:113
9900
msgid ""
9901
"The general rules for :doc:`configuration files <configuration-help>`\n"
9902
"apply except for the variable policies."
9903
msgstr ""
9904
9905
#: en/help_topics/authentication.txt:116
9906
msgid "Each section describes an authentication definition."
9907
msgstr ""
9908
9909
#: en/help_topics/authentication.txt:118
9910
msgid ""
9911
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9912
"reserved\n"
9913
"and should appear as the *last* section."
9914
msgstr ""
9915
9916
#: en/help_topics/authentication.txt:121
9917
msgid "Each section should define:"
9918
msgstr ""
9919
9920
#: en/help_topics/authentication.txt:123
9921
msgid "* ``user``: the login to be used,"
9922
msgstr ""
9923
9924
#: en/help_topics/authentication.txt:125
9925
msgid "Each section could define:"
9926
msgstr ""
9927
9928
#: en/help_topics/authentication.txt:127
9929
msgid "* ``host``: the remote server,"
9930
msgstr ""
9931
9932
#: en/help_topics/authentication.txt:129
9933
msgid "* ``port``: the port the server is listening,"
9934
msgstr ""
9935
9936
#: en/help_topics/authentication.txt:131
9937
msgid "* ``path``: the branch location,"
9938
msgstr ""
9939
9940
#: en/help_topics/authentication.txt:133
9941
msgid "* ``password``: the password."
9942
msgstr ""
9943
9944
#: en/help_topics/authentication.txt:135
9945
msgid ""
9946
"\n"
9947
"Examples\n"
9948
"--------"
9949
msgstr ""
9950
9951
#: en/help_topics/authentication.txt:139
9952
msgid ""
9953
"\n"
9954
"Personal projects hosted outside\n"
9955
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9956
msgstr ""
9957
9958
#: en/help_topics/authentication.txt:143
9959
msgid ""
9960
"All connections are done with the same ``user`` (the remote one for which "
9961
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9962
"default brz one is not appropriate) and the password is always prompted "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9963
"with\n"
9964
"some exceptions::"
9965
msgstr ""
9966
9967
#: en/help_topics/authentication.txt:147
9968
msgid ""
9969
"        # Pet projects on hobby.net\n"
9970
"        [hobby]\n"
9971
"        host=r.hobby.net\n"
9972
"        user=jim\n"
9973
"        password=obvious1234\n"
9974
"        \n"
9975
"        # Home server\n"
9976
"        [home]\n"
9977
"        scheme=https\n"
9978
"        host=home.net\n"
9979
"        user=joe\n"
9980
"        password=1essobV10us\n"
9981
"        \n"
9982
"        [DEFAULT]\n"
9983
"        # Our local user is barbaz, on all remote sites we're known as "
9984
"foobar\n"
9985
"        user=foobar"
9986
msgstr ""
9987
9988
#: en/help_topics/authentication.txt:164
9989
msgid ""
9990
"\n"
9991
"Source hosting provider\n"
9992
"~~~~~~~~~~~~~~~~~~~~~~~"
9993
msgstr ""
9994
9995
#: en/help_topics/authentication.txt:168
9996
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9997
msgstr ""
9998
9999
#: en/help_topics/authentication.txt:170
10000
msgid ""
10001
"        [shpnet domain]\n"
10002
"        # we use sftp, but ssh is the scheme used for authentication\n"
10003
"        scheme=ssh\n"
10004
"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
10005
"        host=.shp.net\n"
10006
"        user=joe\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10007
"        # brz doesn't support supplying a password for sftp,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10008
"        # consider using an ssh agent if you don't want to supply\n"
10009
"        # a password interactively. (pageant, ssh-agent, etc)"
10010
msgstr ""
10011
10012
#: en/help_topics/authentication.txt:180
10013
msgid ""
10014
"HTTPS, SFTP servers and their proxy\n"
10015
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10016
msgstr ""
10017
10018
#: en/help_topics/authentication.txt:183
10019
msgid ""
10020
"At company.com, the server hosting release and integration branches is "
10021
"behind a\n"
10022
"proxy, and the two branches use different authentication policies::"
10023
msgstr ""
10024
10025
#: en/help_topics/authentication.txt:186
10026
msgid ""
10027
"        [reference code]\n"
10028
"        scheme=https\n"
10029
"        host=dev.company.com\n"
10030
"        path=/dev\n"
10031
"        user=user1\n"
10032
"        password=pass1"
10033
msgstr ""
10034
10035
#: en/help_topics/authentication.txt:193
10036
msgid ""
10037
"        # development branches on dev server\n"
10038
"        [dev]\n"
10039
"        scheme=ssh # bzr+ssh and sftp are available here\n"
10040
"        host=dev.company.com\n"
10041
"        path=/dev/integration\n"
10042
"        user=user2\n"
10043
"        \n"
10044
"        # proxy\n"
10045
"        [proxy]\n"
10046
"        scheme=http\n"
10047
"        host=proxy.company.com\n"
10048
"        port=3128\n"
10049
"        user=proxyuser1\n"
10050
"        password=proxypass1"
10051
msgstr ""
10052
10053
#: en/help_topics/authentication.txt:208
10054
msgid ""
10055
"\n"
10056
"Planned enhancements\n"
10057
"--------------------"
10058
msgstr ""
10059
10060
#: en/help_topics/authentication.txt:212
10061
msgid ""
10062
"The following are not yet implemented but planned as parts of a work in\n"
10063
"progress:"
10064
msgstr ""
10065
10066
#: en/help_topics/authentication.txt:215
10067
msgid "* add a  ``password_encoding`` field allowing:"
10068
msgstr ""
10069
10070
#: en/help_topics/authentication.txt:217
10071
msgid ""
10072
"  - storing the passwords in various obfuscating encodings (base64 for one),"
10073
msgstr ""
10074
10075
#: en/help_topics/authentication.txt:219
10076
msgid "  - delegate password storage to plugins (.netrc for example)."
10077
msgstr ""
10078
10079
#: en/help_topics/authentication.txt:221
10080
msgid ""
10081
"* update the credentials when the user is prompted for user or password,"
10082
msgstr ""
10083
10084
#: en/help_topics/authentication.txt:223
10085
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
10086
msgstr ""
10087
10088
#: en/help_topics/authentication.txt:225
10089
msgid ""
10090
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
10091
"but\n"
10092
"ignored in the actual implementation.\n"
10093
msgstr ""
10094
10095
#: en/help_topics/bugs.txt:1
10096
msgid "Bug Tracker Settings"
10097
msgstr ""
10098
10099
#: en/help_topics/bugs.txt:3
10100
msgid ""
10101
"When making a commit, metadata about bugs fixed by that change can be\n"
10102
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
10103
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
10104
"(The only ``status`` value currently supported is ``fixed.``)"
10105
msgstr ""
10106
10107
#: en/help_topics/bugs.txt:8
10108
msgid ""
10109
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
10110
"identifier\n"
10111
"rather than a full URL. This looks like::"
10112
msgstr ""
10113
10114
#: en/help_topics/bugs.txt:11
10115
msgid "    bzr commit --fixes <tracker>:<id>"
10116
msgstr ""
10117
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10118
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10119
msgid "or::"
10120
msgstr ""
10121
10122
#: en/help_topics/bugs.txt:15
10123
msgid "    bzr commit --fixes <id>"
10124
msgstr ""
10125
10126
#: en/help_topics/bugs.txt:17
10127
msgid ""
10128
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
10129
"the\n"
10130
"identifier for that bug within the bugtracker, usually the bug number.\n"
10131
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
10132
"or global configuration is used."
10133
msgstr ""
10134
10135
#: en/help_topics/bugs.txt:22
10136
msgid ""
10137
"Bazaar knows about a few bug trackers that have many users. If\n"
10138
"you use one of these bug trackers then there is no setup required to\n"
10139
"use this feature, you just need to know the tracker identifier to use.\n"
10140
"These are the bugtrackers that are built in:"
10141
msgstr ""
10142
10143
#: en/help_topics/bugs.txt:27
10144
msgid ""
10145
"  ============================ ============ ============\n"
10146
"  URL                          Abbreviation Example\n"
10147
"  ============================ ============ ============\n"
10148
"  https://bugs.launchpad.net/  lp           lp:12345\n"
10149
"  http://bugs.debian.org/      deb          deb:12345\n"
10150
"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
10151
"  ============================ ============ ============"
10152
msgstr ""
10153
10154
#: en/help_topics/bugs.txt:35
10155
msgid ""
10156
"For the bug trackers not listed above configuration is required.\n"
10157
"Support for generating the URLs for any project using Bugzilla or Trac\n"
10158
"is built in, along with a template mechanism for other bugtrackers with\n"
10159
"simple URL schemes. If your bug tracker can't be described by one\n"
10160
"of the schemes described below then you can write a plugin to support\n"
10161
"it."
10162
msgstr ""
10163
10164
#: en/help_topics/bugs.txt:42
10165
msgid ""
10166
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
10167
"variable which contains the base URL of the bug tracker. These options\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10168
"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
10169
"configuration section in ``locations.conf``.  You can set up these values\n"
10170
"for each of the projects you work on."
10171
msgstr ""
10172
10173
#: en/help_topics/bugs.txt:48
10174
msgid ""
10175
"Note: As you provide a short name for each tracker, you can specify one or\n"
10176
"more bugs in one or more trackers at commit time if you wish."
10177
msgstr ""
10178
10179
#: en/help_topics/bugs.txt:51
10180
msgid ""
10181
"Launchpad\n"
10182
"---------"
10183
msgstr ""
10184
10185
#: en/help_topics/bugs.txt:54
10186
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
10187
msgstr ""
10188
10189
#: en/help_topics/bugs.txt:56
10190
msgid ""
10191
"bugzilla_<tracker>_url\n"
10192
"----------------------"
10193
msgstr ""
10194
10195
#: en/help_topics/bugs.txt:59
10196
msgid ""
10197
"If present, the location of the Bugzilla bug tracker referred to by\n"
10198
"<tracker>. This option can then be used together with ``bzr commit\n"
10199
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10200
"example::"
10201
msgstr ""
10202
10203
#: en/help_topics/bugs.txt:64
10204
msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
10205
msgstr ""
10206
10207
#: en/help_topics/bugs.txt:66
10208
msgid ""
10209
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10210
"fixed."
10211
msgstr ""
10212
10213
#: en/help_topics/bugs.txt:69
10214
msgid ""
10215
"trac_<tracker>_url\n"
10216
"------------------"
10217
msgstr ""
10218
10219
#: en/help_topics/bugs.txt:72
10220
msgid ""
10221
"If present, the location of the Trac instance referred to by\n"
10222
"<tracker>. This option can then be used together with ``bzr commit\n"
10223
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10224
"example::"
10225
msgstr ""
10226
10227
#: en/help_topics/bugs.txt:77
10228
msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
10229
msgstr ""
10230
10231
#: en/help_topics/bugs.txt:79
10232
msgid ""
10233
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
10234
"as\n"
10235
"fixed."
10236
msgstr ""
10237
10238
#: en/help_topics/bugs.txt:82
10239
msgid ""
10240
"bugtracker_<tracker>_url\n"
10241
"------------------------"
10242
msgstr ""
10243
10244
#: en/help_topics/bugs.txt:85
10245
msgid ""
10246
"If present, the location of a generic bug tracker instance referred to by\n"
10247
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
10248
"which will be replaced by a specific bug ID. This option can then be used\n"
10249
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
10250
"fixed by that commit. For example::"
10251
msgstr ""
10252
10253
#: en/help_topics/bugs.txt:91
10254
msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
10255
msgstr ""
10256
10257
#: en/help_topics/bugs.txt:93
10258
msgid ""
10259
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10260
"Roundup bug tracker as fixed, or::"
10261
msgstr ""
10262
10263
#: en/help_topics/bugs.txt:96
10264
msgid ""
10265
"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
10266
msgstr ""
10267
10268
#: en/help_topics/bugs.txt:98
10269
msgid ""
10270
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10271
"RT bug tracker as fixed, or::"
10272
msgstr ""
10273
10274
#: en/help_topics/bugs.txt:101
10275
msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
10276
msgstr ""
10277
10278
#: en/help_topics/bugs.txt:103
10279
msgid ""
10280
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
10281
"HUDSON-1234\n"
10282
"in Hudson's JIRA bug tracker as fixed.\n"
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:1
10286
msgid ""
10287
"Configuration Settings\n"
10288
"======================="
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:4
10292
msgid ""
10293
"Environment settings\n"
10294
"---------------------"
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:7
10298
msgid ""
10299
"While most configuration is handled by configuration files, some options\n"
10300
"which may be semi-permanent can also be controlled through the environment."
10301
msgstr ""
10302
10303
#: en/help_topics/configuration.txt:10
10304
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10305
"BRZ_EMAIL\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10306
"~~~~~~~~~"
10307
msgstr ""
10308
10309
#: en/help_topics/configuration.txt:13
7185.1.1 by Jelmer Vernooij
Update pot file.
10310
msgid "Override the email id used by Breezy.  Typical format::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:15
10314
msgid "  \"John Doe <jdoe@example.com>\""
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:17
10318
msgid "See also the ``email`` configuration option."
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:19
10322
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10323
"BRZ_PROGRESS_BAR\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10324
"~~~~~~~~~~~~~~~~"
10325
msgstr ""
10326
10327
#: en/help_topics/configuration.txt:22
10328
msgid ""
10329
"Override the progress display.  Possible values are \"none\" or \"text\".  "
10330
"If\n"
10331
"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
10332
"draws\n"
10333
"the ordinary command line progress bar."
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:26
10337
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10338
"BRZ_SIGQUIT_PDB\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10339
"~~~~~~~~~~~~~~~"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:29
10343
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:31
10347
msgid ""
10348
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
10349
"* 1 = Invoke breakin debugger (default)"
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:34
10353
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10354
"BRZ_HOME\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10355
"~~~~~~~~"
10356
msgstr ""
10357
10358
#: en/help_topics/configuration.txt:37
7185.1.1 by Jelmer Vernooij
Update pot file.
10359
msgid "Override the home directory used by Breezy."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:39
10363
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10364
"BRZ_SSH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10365
"~~~~~~~"
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:42
10369
msgid "Select a different SSH implementation."
10370
msgstr ""
10371
10372
#: en/help_topics/configuration.txt:44
10373
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10374
"BRZ_PDB\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10375
"~~~~~~~"
10376
msgstr ""
10377
10378
#: en/help_topics/configuration.txt:47
10379
msgid "Control whether to launch a debugger on error."
10380
msgstr ""
10381
10382
#: en/help_topics/configuration.txt:49
10383
msgid ""
10384
"* 0 = Standard behavior\n"
10385
"* 1 = Launch debugger"
10386
msgstr ""
10387
10388
#: en/help_topics/configuration.txt:52
10389
msgid ""
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
10390
"BZR_REMOTE_PATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10391
"~~~~~~~~~~~~~~~"
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:55
7185.1.1 by Jelmer Vernooij
Update pot file.
10395
msgid ""
10396
"Path to the Bazaar or Breezy executable to use when using the bzr+ssh "
10397
"protocol."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:57
10401
msgid "See also the ``bzr_remote_path`` configuration option."
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:59
10405
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10406
"BRZ_EDITOR\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10407
"~~~~~~~~~~"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:62
7185.1.1 by Jelmer Vernooij
Update pot file.
10411
msgid "Path to the editor Breezy should use for commit messages, etc."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10412
msgstr ""
10413
10414
#: en/help_topics/configuration.txt:64
10415
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10416
"BRZ_LOG\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10417
"~~~~~~~"
10418
msgstr ""
10419
10420
#: en/help_topics/configuration.txt:67
10421
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10422
"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
10423
"running ``bzr version``."
10424
msgstr ""
10425
10426
#: en/help_topics/configuration.txt:70
10427
msgid ""
10428
"The log file contains debug information that is useful for diagnosing or\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10429
"reporting problems with Breezy."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10430
msgstr ""
10431
10432
#: en/help_topics/configuration.txt:73
10433
msgid ""
10434
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
10435
"will disable logging."
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:76
10439
msgid ""
10440
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10441
"BRZ_PLUGIN_PATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10442
"~~~~~~~~~~~~~~~"
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:80
10446
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10447
"The path to the plugins directory that Breezy should use.\n"
10448
"If not set, Breezy will search for plugins in:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:83
10452
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:85
7185.1.1 by Jelmer Vernooij
Update pot file.
10456
msgid "* the breezy directory (containing the ``core`` plugins),"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10457
msgstr ""
10458
10459
#: en/help_topics/configuration.txt:87
10460
msgid ""
10461
"* the site specific plugin directory if applicable (containing\n"
10462
"  the ``site`` plugins)."
10463
msgstr ""
10464
10465
#: en/help_topics/configuration.txt:90
10466
msgid ""
10467
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
10468
"the way the plugin are searched. "
10469
msgstr ""
10470
10471
#: en/help_topics/configuration.txt:93
10472
msgid ""
10473
"As for the ``PATH`` variables, if multiple directories are\n"
10474
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
10475
"platform specific appropriate character (':' on Unix,\n"
10476
"';' on windows)"
10477
msgstr ""
10478
10479
#: en/help_topics/configuration.txt:98
10480
msgid ""
10481
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
10482
"in ``user``.  However it will continue to search in ``core`` and\n"
10483
"``site`` unless they are explicitly removed."
10484
msgstr ""
10485
10486
#: en/help_topics/configuration.txt:102
10487
msgid ""
10488
"If you need to change the order or remove one of these\n"
10489
"directories, you should use special values:"
10490
msgstr ""
10491
10492
#: en/help_topics/configuration.txt:105
10493
msgid ""
10494
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
10495
"  path from the default values,"
10496
msgstr ""
10497
10498
#: en/help_topics/configuration.txt:108
10499
msgid ""
10500
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
10501
"  before the remaining default values (and also remove it from\n"
10502
"  the default values)."
10503
msgstr ""
10504
10505
#: en/help_topics/configuration.txt:112
10506
msgid ""
10507
"Note that the special values 'user', 'core' and 'site' should be\n"
10508
"used literally, they will be substituted by the corresponding,\n"
10509
"platform specific, values."
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:116
10513
msgid ""
10514
"The examples below use ':' as the separator, windows users\n"
10515
"should use ';'."
10516
msgstr ""
10517
10518
#: en/help_topics/configuration.txt:119
10519
msgid "Overriding the default user plugin directory::"
10520
msgstr ""
10521
10522
#: en/help_topics/configuration.txt:121
10523
msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
10524
msgstr ""
10525
10526
#: en/help_topics/configuration.txt:123
10527
msgid "Disabling the site directory while retaining the user directory::"
10528
msgstr ""
10529
10530
#: en/help_topics/configuration.txt:125
10531
msgid "  BZR_PLUGIN_PATH='-site:+user'"
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:127
10535
msgid "Disabling all plugins (better achieved with --no-plugins)::"
10536
msgstr ""
10537
10538
#: en/help_topics/configuration.txt:129
10539
msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
10540
msgstr ""
10541
10542
#: en/help_topics/configuration.txt:131
10543
msgid "Overriding the default site plugin directory::"
10544
msgstr ""
10545
10546
#: en/help_topics/configuration.txt:133
10547
msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
10548
msgstr ""
10549
10550
#: en/help_topics/configuration.txt:135
10551
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10552
"BRZ_DISABLE_PLUGINS\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10553
"~~~~~~~~~~~~~~~~~~~"
10554
msgstr ""
10555
10556
#: en/help_topics/configuration.txt:138
10557
msgid ""
10558
"Under special circumstances (mostly when trying to diagnose a\n"
10559
"bug), it's better to disable a plugin (or several) rather than\n"
10560
"uninstalling them completely. Such plugins can be specified in\n"
10561
"the ``BZR_DISABLE_PLUGINS`` environment variable."
10562
msgstr ""
10563
10564
#: en/help_topics/configuration.txt:143
10565
msgid ""
10566
"In that case, ``bzr`` will stop loading the specified plugins and\n"
10567
"will raise an import error if they are explicitly imported (by\n"
10568
"another plugin that depends on them for example)."
10569
msgstr ""
10570
10571
#: en/help_topics/configuration.txt:147
10572
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
10573
msgstr ""
10574
10575
#: en/help_topics/configuration.txt:149
10576
msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
10577
msgstr ""
10578
10579
#: en/help_topics/configuration.txt:151
10580
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10581
"BRZ_PLUGINS_AT\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10582
"~~~~~~~~~~~~~~"
10583
msgstr ""
10584
10585
#: en/help_topics/configuration.txt:154
10586
msgid ""
10587
"When adding a new feature or working on a bug in a plugin,\n"
10588
"developers often need to use a specific version of a given\n"
10589
"plugin. Since python requires that the directory containing the\n"
10590
"code is named like the plugin itself this make it impossible to\n"
10591
"use arbitrary directory names (using a two-level directory scheme\n"
10592
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
10593
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
10594
msgstr ""
10595
10596
#: en/help_topics/configuration.txt:162
10597
msgid ""
10598
"Plugins specified in this environment variable takes precedence\n"
10599
"over the ones in ``BZR_PLUGIN_PATH``."
10600
msgstr ""
10601
10602
#: en/help_topics/configuration.txt:165
10603
msgid ""
10604
"The variable specified a list of ``plugin_name@plugin path``,\n"
10605
"``plugin_name`` being the name of the plugin as it appears in\n"
10606
"python module paths, ``plugin_path`` being the path to the\n"
10607
"directory containing the plugin code itself\n"
10608
"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
10609
"separator, use ';' on windows."
10610
msgstr ""
10611
10612
#: en/help_topics/configuration.txt:172
10613
msgid ""
10614
"Example:\n"
10615
"~~~~~~~~"
10616
msgstr ""
10617
10618
#: en/help_topics/configuration.txt:175
10619
msgid ""
10620
"Using a specific version of ``myplugin``:\n"
10621
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
10622
msgstr ""
10623
10624
#: en/help_topics/configuration.txt:178
10625
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10626
"BRZPATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10627
"~~~~~~~"
10628
msgstr ""
10629
10630
#: en/help_topics/configuration.txt:181
7185.1.1 by Jelmer Vernooij
Update pot file.
10631
msgid "The path where Breezy should look for shell plugin external commands."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10632
msgstr ""
10633
10634
#: en/help_topics/configuration.txt:183
10635
msgid ""
10636
"\n"
10637
"http_proxy, https_proxy\n"
10638
"~~~~~~~~~~~~~~~~~~~~~~~"
10639
msgstr ""
10640
10641
#: en/help_topics/configuration.txt:187
10642
msgid "Specifies the network proxy for outgoing connections, for example::"
10643
msgstr ""
10644
10645
#: en/help_topics/configuration.txt:189
10646
msgid ""
10647
"  http_proxy=http://proxy.example.com:3128/ \n"
10648
"  https_proxy=http://proxy.example.com:3128/"
10649
msgstr ""
10650
10651
#: en/help_topics/configuration.txt:192
10652
msgid ""
10653
"\n"
10654
"Configuration files\n"
10655
"-------------------"
10656
msgstr ""
10657
10658
#: en/help_topics/configuration.txt:196
10659
msgid ""
10660
"Location\n"
10661
"~~~~~~~~"
10662
msgstr ""
10663
10664
#: en/help_topics/configuration.txt:199
10665
msgid ""
10666
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10667
"``C:\\Documents and Settings\\<username>\\Application Data\\Breezy\\2.0`` "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10668
"on\n"
10669
"Windows. (You can check the location for your system by using\n"
10670
"``bzr version``.)"
10671
msgstr ""
10672
10673
#: en/help_topics/configuration.txt:204
10674
msgid "There are three primary configuration files in this location:"
10675
msgstr ""
10676
10677
#: en/help_topics/configuration.txt:206
7185.1.1 by Jelmer Vernooij
Update pot file.
10678
msgid "* ``breezy.conf`` describes default configuration options,"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10679
msgstr ""
10680
10681
#: en/help_topics/configuration.txt:208
10682
msgid ""
10683
"* ``locations.conf`` describes configuration information for\n"
10684
"  specific branch locations,"
10685
msgstr ""
10686
10687
#: en/help_topics/configuration.txt:211
10688
msgid ""
10689
"* ``authentication.conf`` describes credential information for\n"
10690
"  remote servers."
10691
msgstr ""
10692
10693
#: en/help_topics/configuration.txt:214
10694
msgid ""
10695
"Each branch can also contain a configuration file that sets values specific\n"
10696
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10697
"the\n"
10698
"branch. This file is visible to all users of a branch, if you wish to "
10699
"override\n"
10700
"one of the values for a branch with a setting that is specific to you then "
10701
"you\n"
10702
"can do so in ``locations.conf``."
10703
msgstr ""
10704
10705
#: en/help_topics/configuration.txt:220
10706
msgid ""
10707
"General format\n"
10708
"~~~~~~~~~~~~~~"
10709
msgstr ""
10710
10711
#: en/help_topics/configuration.txt:223
10712
msgid ""
10713
"An ini file has three types of contructs: section headers, section\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10714
"options and comments."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10715
msgstr ""
10716
10717
#: en/help_topics/configuration.txt:226
10718
msgid ""
10719
"Comments\n"
10720
"^^^^^^^^"
10721
msgstr ""
10722
10723
#: en/help_topics/configuration.txt:229
10724
msgid ""
10725
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10726
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10727
"Breezy when parsing ini files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10728
msgstr ""
10729
10730
#: en/help_topics/configuration.txt:233
10731
msgid ""
10732
"Section headers\n"
10733
"^^^^^^^^^^^^^^^"
10734
msgstr ""
10735
10736
#: en/help_topics/configuration.txt:236
10737
msgid ""
10738
"A section header is a word enclosed in brackets that starts at the begining\n"
10739
"of a line.  A typical section header looks like this::"
10740
msgstr ""
10741
10742
#: en/help_topics/configuration.txt:239
10743
msgid "    [DEFAULT]"
10744
msgstr ""
10745
10746
#: en/help_topics/configuration.txt:241
10747
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10748
"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
10749
"[ALIASES].  Section headers are case sensitive. The default section provides "
10750
"for\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10751
"setting options which can be overridden with the branch config file."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10752
msgstr ""
10753
10754
#: en/help_topics/configuration.txt:245
10755
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10756
"For ``locations.conf``, the options from the section with the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10757
"longest matching section header are used to the exclusion of other\n"
10758
"potentially valid section headers. A section header uses the path for\n"
10759
"the branch as the section header. Some examples include::"
10760
msgstr ""
10761
10762
#: en/help_topics/configuration.txt:250
10763
msgid ""
10764
"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
10765
"    [/home/jdoe/branches/]"
10766
msgstr ""
10767
10768
#: en/help_topics/configuration.txt:253
10769
msgid ""
10770
"\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10771
"Section options\n"
10772
"^^^^^^^^^^^^^^^"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10773
msgstr ""
10774
10775
#: en/help_topics/configuration.txt:257
10776
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10777
"A section option resides within a section. A section option contains an\n"
10778
"option name, an equals sign and a value.  For example::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10779
msgstr ""
10780
10781
#: en/help_topics/configuration.txt:260
10782
msgid ""
10783
"    email            = John Doe <jdoe@isp.com>\n"
10784
"    gpg_signing_key  = Amy Pond <amy@example.com>"
10785
msgstr ""
10786
10787
#: en/help_topics/configuration.txt:263
10788
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10789
"A option can reference other options by enclosing them in curly brackets::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10790
msgstr ""
10791
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10792
#: en/help_topics/configuration.txt:265
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10793
msgid ""
10794
"    my_branch_name = feature_x\n"
10795
"    my_server      = bzr+ssh://example.com\n"
10796
"    push_location   = {my_server}/project/{my_branch_name}"
10797
msgstr ""
10798
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10799
#: en/help_topics/configuration.txt:269
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10800
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10801
"Option policies\n"
10802
"^^^^^^^^^^^^^^^"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10803
msgstr ""
10804
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10805
#: en/help_topics/configuration.txt:272
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10806
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10807
"Options defined in a section affect the named directory or URL plus\n"
10808
"any locations they contain.  Policies can be used to change how an\n"
10809
"option value is interpreted for contained locations.  Currently\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10810
"there are three policies available:"
10811
msgstr ""
10812
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10813
#: en/help_topics/configuration.txt:277
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10814
msgid ""
10815
" none:\n"
10816
"   the value is interpreted the same for contained locations.  This is\n"
10817
"   the default behaviour.\n"
10818
" norecurse:\n"
10819
"   the value is only used for the exact location specified by the\n"
10820
"   section name.\n"
10821
" appendpath:\n"
10822
"   for contained locations, any additional path components are\n"
10823
"   appended to the value."
10824
msgstr ""
10825
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10826
#: en/help_topics/configuration.txt:287
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10827
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10828
"Policies are specified by keys with names of the form \"<option_name>:policy"
10829
"\".\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10830
"For example, to define the push location for a tree of branches, the\n"
10831
"following could be used::"
10832
msgstr ""
10833
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10834
#: en/help_topics/configuration.txt:291
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10835
msgid ""
10836
"  [/top/location]\n"
10837
"  push_location = sftp://example.com/location\n"
10838
"  push_location:policy = appendpath"
10839
msgstr ""
10840
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10841
#: en/help_topics/configuration.txt:295
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10842
msgid ""
10843
"With this configuration, the push location for ``/top/location/branch1``\n"
10844
"would be ``sftp://example.com/location/branch1``."
10845
msgstr ""
10846
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10847
#: en/help_topics/configuration.txt:298
10848
msgid ""
10849
"Section local options\n"
10850
"^^^^^^^^^^^^^^^^^^^^^"
10851
msgstr ""
10852
10853
#: en/help_topics/configuration.txt:301
10854
msgid ""
10855
"Some options are defined automatically inside a given section and can be\n"
10856
"refered to in this section only. "
10857
msgstr ""
10858
10859
#: en/help_topics/configuration.txt:304
10860
msgid "For example, the ``appendpath`` policy can be used like this::"
10861
msgstr ""
10862
10863
#: en/help_topics/configuration.txt:306
10864
msgid ""
10865
"  [/home/vila/src/bzr/bugs]\n"
10866
"  mypush = lp:~vila/bzr\n"
10867
"  mypush:policy=appendpath"
10868
msgstr ""
10869
10870
#: en/help_topics/configuration.txt:310
10871
msgid "Using ``relpath`` to achieve the same result is done like this::"
10872
msgstr ""
10873
10874
#: en/help_topics/configuration.txt:312
10875
msgid ""
10876
"  [/home/vila/src/bzr/bugs]\n"
10877
"  mypush = lp:~vila/bzr/{relpath}"
10878
msgstr ""
10879
10880
#: en/help_topics/configuration.txt:315
10881
msgid ""
10882
"In both cases, when used in a directory like\n"
10883
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10884
msgstr ""
10885
6437.2.2 by Vincent Ladeuil
Release 2.5b5
10886
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10887
msgid ""
10888
"   $ bzr config mypush\n"
10889
"   lp:~vila/bzr/832013-expand-in-stack"
10890
msgstr ""
10891
10892
#: en/help_topics/configuration.txt:321
6349.1.1 by Vincent Ladeuil
Release 2.5b4
10893
msgid "Another such option is ``basename`` which can be used like this::"
10894
msgstr ""
10895
10896
#: en/help_topics/configuration.txt:323
10897
msgid ""
10898
"  [/home/vila/src/bzr]\n"
10899
"  mypush = lp:~vila/bzr/{basename}"
10900
msgstr ""
10901
10902
#: en/help_topics/configuration.txt:326
10903
msgid ""
10904
"When used in a directory like\n"
10905
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10906
msgstr ""
10907
10908
#: en/help_topics/configuration.txt:332
10909
msgid ""
10910
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10911
"itself is defined as the relative path between the section name and the\n"
10912
"location it matches."
10913
msgstr ""
10914
10915
#: en/help_topics/configuration.txt:336
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10916
msgid ""
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10917
"Another such option is ``branchname``, which refers to the name of a "
10918
"colocated\n"
10919
"branch.  For non-colocated branches, it behaves like basename.  It can be "
10920
"used\n"
10921
"like this::"
10922
msgstr ""
10923
10924
#: en/help_topics/configuration.txt:340
10925
msgid ""
10926
"  [/home/vila/src/bzr/bugs]\n"
10927
"  mypush = lp:~vila/bzr/{branchname}"
10928
msgstr ""
10929
10930
#: en/help_topics/configuration.txt:343
10931
msgid ""
10932
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10933
"get::"
10934
msgstr ""
10935
10936
#: en/help_topics/configuration.txt:345
10937
msgid ""
10938
"  bzr config mypush\n"
10939
"  lp:~vila/bzr/832013-expand-in-stack"
10940
msgstr ""
10941
10942
#: en/help_topics/configuration.txt:348
10943
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10944
"When an option is local to a Section, it cannot be referred to from option\n"
10945
"values in any other section from the same ``Store`` nor from any other\n"
10946
"``Store``."
10947
msgstr ""
10948
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10949
#: en/help_topics/configuration.txt:352
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10950
msgid ""
10951
"\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10952
"The main configuration file, breezy.conf\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10953
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10954
msgstr ""
10955
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10956
#: en/help_topics/configuration.txt:356
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10957
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
10958
"``breezy.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10959
"The default section contains the default\n"
10960
"configuration options for all branches. The default section can be\n"
10961
"overriden by providing a branch-specific section in ``locations.conf``."
10962
msgstr ""
10963
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10964
#: en/help_topics/configuration.txt:361
7185.1.1 by Jelmer Vernooij
Update pot file.
10965
msgid "A typical ``breezy.conf`` section often looks like the following::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10966
msgstr ""
10967
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10968
#: en/help_topics/configuration.txt:363
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10969
msgid ""
10970
"    [DEFAULT]\n"
10971
"    email             = John Doe <jdoe@isp.com>\n"
10972
"    editor            = /usr/bin/vim\n"
10973
"    create_signatures = when-required"
10974
msgstr ""
10975
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10976
#: en/help_topics/configuration.txt:368
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10977
msgid ""
10978
"\n"
10979
"The branch location configuration file, locations.conf\n"
10980
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10981
msgstr ""
10982
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10983
#: en/help_topics/configuration.txt:372
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10984
msgid ""
10985
"``locations.conf`` allows one to specify overriding settings for\n"
10986
"a specific branch. The format is almost identical to the default section in\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
10987
"breezy.conf with one significant change: The section header, instead of "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10988
"saying\n"
10989
"default, will be the path to a branch that you wish to override a value\n"
10990
"for. The '?' and '*' wildcards are supported::"
10991
msgstr ""
10992
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10993
#: en/help_topics/configuration.txt:378
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10994
msgid ""
10995
"    [/home/jdoe/branches/nethack]\n"
10996
"    email = Nethack Admin <nethack@nethack.com>"
10997
msgstr ""
10998
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10999
#: en/help_topics/configuration.txt:381
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11000
msgid ""
11001
"    [http://hypothetical.site.com/branches/devel-branch]\n"
11002
"    create_signatures = always"
11003
msgstr ""
11004
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11005
#: en/help_topics/configuration.txt:384
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11006
msgid ""
11007
"The authentication configuration file, authentication.conf\n"
11008
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11009
msgstr ""
11010
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11011
#: en/help_topics/configuration.txt:387
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11012
msgid ""
11013
"``authentication.conf`` allows one to specify credentials for\n"
11014
"remote servers. This can be used for all the supported transports and any "
11015
"part\n"
11016
"of bzr that requires authentication (smtp for example)."
11017
msgstr ""
11018
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11019
#: en/help_topics/configuration.txt:391
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11020
msgid ""
11021
"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
11022
"option policies which don't apply."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11023
msgstr ""
11024
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11025
#: en/help_topics/configuration.txt:394
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11026
msgid ""
11027
"For more information on the possible uses of the authentication "
11028
"configuration\n"
11029
"file see :doc:`authentication-help`."
11030
msgstr ""
11031
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11032
#: en/help_topics/configuration.txt:397
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11033
msgid ""
11034
"\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
11035
"Common options\n"
11036
"--------------"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11037
msgstr ""
11038
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11039
#: en/help_topics/configuration.txt:401
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11040
msgid ""
11041
"debug_flags\n"
11042
"~~~~~~~~~~~"
11043
msgstr ""
11044
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11045
#: en/help_topics/configuration.txt:404
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11046
msgid ""
11047
"A comma-separated list of debugging options to turn on.  The same values\n"
11048
"can be used as with the -D command-line option (see `help global-options`).\n"
11049
"For example::"
11050
msgstr ""
11051
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11052
#: en/help_topics/configuration.txt:408
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11053
msgid "    debug_flags = hpss"
11054
msgstr ""
11055
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11056
#: en/help_topics/configuration.txt:412
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11057
msgid "    debug_flags = hpss,evil"
11058
msgstr ""
11059
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11060
#: en/help_topics/configuration.txt:414
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11061
msgid ""
11062
"email\n"
11063
"~~~~~"
11064
msgstr ""
11065
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11066
#: en/help_topics/configuration.txt:417
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11067
msgid ""
11068
"The email address to use when committing a branch. Typically takes the form\n"
11069
"of::"
11070
msgstr ""
11071
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11072
#: en/help_topics/configuration.txt:420
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11073
msgid "    email = Full Name <account@hostname.tld>"
11074
msgstr ""
11075
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11076
#: en/help_topics/configuration.txt:422
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11077
msgid ""
11078
"editor\n"
11079
"~~~~~~"
11080
msgstr ""
11081
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11082
#: en/help_topics/configuration.txt:425
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11083
msgid ""
11084
"The path of the editor that you wish to use if *bzr commit* is run without\n"
11085
"a commit message. This setting is trumped by the environment variable\n"
11086
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
11087
"variables."
11088
msgstr ""
11089
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11090
#: en/help_topics/configuration.txt:430
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11091
msgid ""
11092
"log_format\n"
11093
"~~~~~~~~~~"
11094
msgstr ""
11095
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11096
#: en/help_topics/configuration.txt:433
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11097
msgid ""
11098
"The default log format to use. Standard log formats are ``long``, ``short``\n"
11099
"and ``line``. Additional formats may be provided by plugins. The default\n"
11100
"value is ``long``."
11101
msgstr ""
11102
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11103
#: en/help_topics/configuration.txt:437
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11104
msgid ""
11105
"check_signatures\n"
11106
"~~~~~~~~~~~~~~~~"
11107
msgstr ""
11108
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11109
#: en/help_topics/configuration.txt:440
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11110
msgid ""
11111
"Reserved for future use.  These options will allow a policy for branches to\n"
11112
"require signatures."
11113
msgstr ""
11114
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11115
#: en/help_topics/configuration.txt:443
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11116
msgid ""
11117
"require\n"
11118
"    The gnupg signature for revisions must be present and must be valid."
11119
msgstr ""
11120
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11121
#: en/help_topics/configuration.txt:446
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11122
msgid ""
11123
"ignore\n"
11124
"    Do not check gnupg signatures of revisions."
11125
msgstr ""
11126
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11127
#: en/help_topics/configuration.txt:449
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11128
msgid ""
11129
"check-available\n"
11130
"    (default) If gnupg signatures for revisions are present, check them.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11131
"    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
11132
"    no signature is present."
11133
msgstr ""
11134
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11135
#: en/help_topics/configuration.txt:454
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11136
msgid ""
11137
"create_signatures\n"
11138
"~~~~~~~~~~~~~~~~~"
11139
msgstr ""
11140
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11141
#: en/help_topics/configuration.txt:457
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11142
msgid ""
11143
"Defines the behaviour of signing revisions on commits.  By default bzr will "
11144
"not\n"
11145
"sign new commits."
11146
msgstr ""
11147
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11148
#: en/help_topics/configuration.txt:460
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11149
msgid ""
11150
"always\n"
11151
"    Sign every new revision that is committed.  If the signing fails then "
11152
"the\n"
11153
"    commit will not be made."
11154
msgstr ""
11155
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11156
#: en/help_topics/configuration.txt:464
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11157
msgid ""
11158
"when-required\n"
11159
"    Reserved for future use."
11160
msgstr ""
11161
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11162
#: en/help_topics/configuration.txt:467
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11163
msgid ""
11164
"never\n"
11165
"    Reserved for future use."
11166
msgstr ""
11167
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11168
#: en/help_topics/configuration.txt:470
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11169
msgid ""
11170
"In future it is planned that ``when-required`` will sign newly\n"
11171
"committed revisions only when the branch requires them.  ``never`` will "
11172
"refuse\n"
11173
"to sign newly committed revisions, even if the branch requires signatures."
11174
msgstr ""
11175
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11176
#: en/help_topics/configuration.txt:474
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11177
msgid ""
11178
"dirstate.fdatasync\n"
11179
"~~~~~~~~~~~~~~~~~~"
11180
msgstr ""
11181
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11182
#: en/help_topics/configuration.txt:477
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11183
msgid ""
11184
"If true (default), working tree metadata changes are flushed through the\n"
11185
"OS buffers to physical disk.  This is somewhat slower, but means data\n"
11186
"should not be lost if the machine crashes.  See also repository.fdatasync."
11187
msgstr ""
11188
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11189
#: en/help_topics/configuration.txt:481
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11190
msgid ""
11191
"gpg_signing_key\n"
11192
"~~~~~~~~~~~~~~~"
11193
msgstr ""
11194
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11195
#: en/help_topics/configuration.txt:484
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11196
msgid ""
11197
"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
11198
"address, key fingerprint or full key ID.  When unset or when set to\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11199
"\"default\" Breezy will use the user e-mail set with ``whoami``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11200
msgstr ""
11201
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11202
#: en/help_topics/configuration.txt:488
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11203
msgid ""
11204
"recurse\n"
11205
"~~~~~~~"
11206
msgstr ""
11207
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11208
#: en/help_topics/configuration.txt:491
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11209
msgid ""
11210
"Only useful in ``locations.conf``. Defines whether or not the\n"
11211
"configuration for this section applies to subdirectories:"
11212
msgstr ""
11213
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11214
#: en/help_topics/configuration.txt:494
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11215
msgid ""
11216
"true\n"
11217
"    (default) This section applies to subdirectories as well."
11218
msgstr ""
11219
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11220
#: en/help_topics/configuration.txt:497
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11221
msgid ""
11222
"false\n"
11223
"    This section only applies to the branch at this directory and not\n"
11224
"    branches below it."
11225
msgstr ""
11226
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11227
#: en/help_topics/configuration.txt:501
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11228
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
11229
"bzr_remote_path\n"
11230
"~~~~~~~~~~~~~~~"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11231
msgstr ""
11232
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11233
#: en/help_topics/configuration.txt:504
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11234
msgid ""
11235
"(Default: \"bzr\").  The path to the command that should be used to run the "
11236
"smart\n"
11237
"server for bzr.  This value may only be specified in locations.conf, because:"
11238
msgstr ""
11239
7185.1.1 by Jelmer Vernooij
Update pot file.
11240
#: en/help_topics/configuration.txt:507
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11241
msgid ""
11242
"- it's needed before branch.conf is accessible\n"
11243
"- allowing remote branch.conf files to specify commands would be a security\n"
11244
"  risk"
11245
msgstr ""
11246
7185.1.1 by Jelmer Vernooij
Update pot file.
11247
#: en/help_topics/configuration.txt:511
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11248
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
11249
msgstr ""
11250
7185.1.1 by Jelmer Vernooij
Update pot file.
11251
#: en/help_topics/configuration.txt:513
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11252
msgid ""
11253
"smtp_server\n"
11254
"~~~~~~~~~~~"
11255
msgstr ""
11256
7185.1.1 by Jelmer Vernooij
Update pot file.
11257
#: en/help_topics/configuration.txt:516
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11258
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
11259
"(Default: \"localhost\"). SMTP server to use when Breezy needs to send\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11260
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
11261
msgstr ""
11262
7185.1.1 by Jelmer Vernooij
Update pot file.
11263
#: en/help_topics/configuration.txt:519
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11264
msgid ""
11265
"smtp_username, smtp_password\n"
11266
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11267
msgstr ""
11268
7185.1.1 by Jelmer Vernooij
Update pot file.
11269
#: en/help_topics/configuration.txt:522
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11270
msgid ""
11271
"User and password to authenticate to the SMTP server. If smtp_username\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11272
"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
11273
"These settings are only needed if the SMTP server requires authentication\n"
11274
"to send mail."
11275
msgstr ""
11276
7185.1.1 by Jelmer Vernooij
Update pot file.
11277
#: en/help_topics/configuration.txt:527
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11278
msgid ""
11279
"locks.steal_dead\n"
11280
"~~~~~~~~~~~~~~~~"
11281
msgstr ""
11282
7185.1.1 by Jelmer Vernooij
Update pot file.
11283
#: en/help_topics/configuration.txt:530
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11284
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
11285
"By default, bzr will automatically break locks held by processes from\n"
11286
"the same machine and user that are no longer alive.  If disabled, it will\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11287
"print a message and you can break the lock manually, if you are satisfied\n"
11288
"the object is no longer in use."
11289
msgstr ""
11290
7185.1.1 by Jelmer Vernooij
Update pot file.
11291
#: en/help_topics/configuration.txt:535
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11292
msgid ""
11293
"mail_client\n"
11294
"~~~~~~~~~~~"
11295
msgstr ""
11296
7185.1.1 by Jelmer Vernooij
Update pot file.
11297
#: en/help_topics/configuration.txt:538
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11298
msgid ""
11299
"A mail client to use for sending merge requests.\n"
11300
"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
11301
"it\n"
11302
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
11303
"``editor``."
11304
msgstr ""
11305
7185.1.1 by Jelmer Vernooij
Update pot file.
11306
#: en/help_topics/configuration.txt:543
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11307
msgid "Supported values for specific clients:"
11308
msgstr ""
11309
7185.1.1 by Jelmer Vernooij
Update pot file.
11310
#: en/help_topics/configuration.txt:545
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11311
msgid ""
11312
":claws: Use Claws.  This skips a dialog for attaching files.\n"
11313
":evolution: Use Evolution.\n"
11314
":kmail: Use KMail.\n"
11315
":mutt: Use Mutt.\n"
11316
":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
11317
"1.5,\n"
11318
"    this works around some bugs that xdg-email doesn't handle."
11319
msgstr ""
11320
7185.1.1 by Jelmer Vernooij
Update pot file.
11321
#: en/help_topics/configuration.txt:552
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11322
msgid "Supported generic values are:"
11323
msgstr ""
11324
7185.1.1 by Jelmer Vernooij
Update pot file.
11325
#: en/help_topics/configuration.txt:554
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11326
msgid ""
11327
":default: See above.\n"
11328
":editor: Use your editor to compose the merge request.  This also uses\n"
11329
"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
11330
"    smtp_username and smtp_password.\n"
11331
":mapi: Use your preferred e-mail client on Windows.\n"
11332
":xdg-email: Use xdg-email to run your preferred mail program"
11333
msgstr ""
11334
7185.1.1 by Jelmer Vernooij
Update pot file.
11335
#: en/help_topics/configuration.txt:561
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11336
msgid ""
11337
"repository.fdatasync\n"
11338
"~~~~~~~~~~~~~~~~~~~~"
11339
msgstr ""
11340
7185.1.1 by Jelmer Vernooij
Update pot file.
11341
#: en/help_topics/configuration.txt:564
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11342
msgid ""
11343
"If true (default), repository changes are flushed through the OS buffers\n"
11344
"to physical disk.  This is somewhat slower, but means data should not be\n"
11345
"lost if the machine crashes.  See also dirstate.fdatasync."
11346
msgstr ""
11347
7185.1.1 by Jelmer Vernooij
Update pot file.
11348
#: en/help_topics/configuration.txt:568
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11349
msgid ""
11350
"submit_branch\n"
11351
"~~~~~~~~~~~~~"
11352
msgstr ""
11353
7185.1.1 by Jelmer Vernooij
Update pot file.
11354
#: en/help_topics/configuration.txt:571
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11355
msgid ""
11356
"The branch you intend to submit your current work to.  This is "
11357
"automatically\n"
11358
"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
11359
"This\n"
11360
"should usually be set on a per-branch or per-location basis."
11361
msgstr ""
11362
7185.1.1 by Jelmer Vernooij
Update pot file.
11363
#: en/help_topics/configuration.txt:575
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11364
msgid ""
11365
"public_branch\n"
11366
"~~~~~~~~~~~~~"
11367
msgstr ""
11368
7185.1.1 by Jelmer Vernooij
Update pot file.
11369
#: en/help_topics/configuration.txt:578
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11370
msgid ""
11371
"A publically-accessible version of this branch (implying that this version "
11372
"is\n"
11373
"not publically-accessible).  Used (and set) by ``bzr send``."
11374
msgstr ""
11375
7185.1.1 by Jelmer Vernooij
Update pot file.
11376
#: en/help_topics/configuration.txt:581
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11377
msgid ""
11378
"suppress_warnings\n"
11379
"~~~~~~~~~~~~~~~~~"
11380
msgstr ""
11381
7185.1.1 by Jelmer Vernooij
Update pot file.
11382
#: en/help_topics/configuration.txt:584
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11383
msgid ""
11384
"A list of strings, each string represent a warning that can be emitted by\n"
11385
"bzr. Mentioning a warning in this list tells bzr to not emit it."
11386
msgstr ""
11387
7185.1.1 by Jelmer Vernooij
Update pot file.
11388
#: en/help_topics/configuration.txt:587
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11389
msgid "Valid values:"
11390
msgstr ""
11391
7185.1.1 by Jelmer Vernooij
Update pot file.
11392
#: en/help_topics/configuration.txt:589
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11393
msgid ""
11394
"* ``format_deprecation``:\n"
11395
"    whether the format deprecation warning is shown on repositories that "
11396
"are\n"
11397
"    using deprecated formats."
11398
msgstr ""
11399
7185.1.1 by Jelmer Vernooij
Update pot file.
11400
#: en/help_topics/configuration.txt:593
11401
msgid ""
11402
"* ``insecure_permissions``:\n"
11403
"    whether a warning is shown if ``authentication.conf`` can be read\n"
11404
"    by other users."
11405
msgstr ""
11406
11407
#: en/help_topics/configuration.txt:597
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11408
msgid ""
11409
"default_format\n"
11410
"~~~~~~~~~~~~~~"
11411
msgstr ""
11412
7185.1.1 by Jelmer Vernooij
Update pot file.
11413
#: en/help_topics/configuration.txt:600
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11414
msgid ""
11415
"A format name for the default format used when creating branches.  See "
11416
"``bzr\n"
11417
"help formats`` for possible values."
11418
msgstr ""
11419
7185.1.1 by Jelmer Vernooij
Update pot file.
11420
#: en/help_topics/configuration.txt:603
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11421
msgid ""
11422
"\n"
11423
"Unicode options\n"
11424
"---------------"
11425
msgstr ""
11426
7185.1.1 by Jelmer Vernooij
Update pot file.
11427
#: en/help_topics/configuration.txt:607
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11428
msgid ""
11429
"output_encoding\n"
11430
"~~~~~~~~~~~~~~~"
11431
msgstr ""
11432
7185.1.1 by Jelmer Vernooij
Update pot file.
11433
#: en/help_topics/configuration.txt:610
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11434
msgid ""
11435
"A Python unicode encoding name for text output from bzr, such as log\n"
11436
"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
11437
"is the terminal encoding prefered by the operating system."
11438
msgstr ""
11439
7185.1.1 by Jelmer Vernooij
Update pot file.
11440
#: en/help_topics/configuration.txt:614
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11441
msgid ""
11442
"\n"
11443
"Branch type specific options\n"
11444
"----------------------------"
11445
msgstr ""
11446
7185.1.1 by Jelmer Vernooij
Update pot file.
11447
#: en/help_topics/configuration.txt:618
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11448
msgid ""
11449
"These options apply only to branches that use the ``dirstate-tags`` or\n"
11450
"later format.  They\n"
11451
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
11452
"manually set in ``locations.conf`` or ``breezy.conf``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11453
msgstr ""
11454
7185.1.1 by Jelmer Vernooij
Update pot file.
11455
#: en/help_topics/configuration.txt:623
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11456
msgid ""
11457
"append_revisions_only\n"
11458
"~~~~~~~~~~~~~~~~~~~~~"
11459
msgstr ""
11460
7185.1.1 by Jelmer Vernooij
Update pot file.
11461
#: en/help_topics/configuration.txt:626
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11462
msgid ""
11463
"If set to \"True\" then revisions can only be appended to the log, not\n"
11464
"removed.  A branch with this setting enabled can only pull from another\n"
11465
"branch if the other branch's log is a longer version of its own.  This is\n"
11466
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
11467
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
11468
"compatibility with previous bzr versions (older than 2.2)."
11469
msgstr ""
11470
7185.1.1 by Jelmer Vernooij
Update pot file.
11471
#: en/help_topics/configuration.txt:633
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11472
msgid ""
11473
"parent_location\n"
11474
"~~~~~~~~~~~~~~~"
11475
msgstr ""
11476
7185.1.1 by Jelmer Vernooij
Update pot file.
11477
#: en/help_topics/configuration.txt:636
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11478
msgid ""
11479
"If present, the location of the default branch for pull or merge.  This "
11480
"option\n"
11481
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
11482
"--remember``."
11483
msgstr ""
11484
7185.1.1 by Jelmer Vernooij
Update pot file.
11485
#: en/help_topics/configuration.txt:640
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11486
msgid ""
11487
"push_location\n"
11488
"~~~~~~~~~~~~~"
11489
msgstr ""
11490
7185.1.1 by Jelmer Vernooij
Update pot file.
11491
#: en/help_topics/configuration.txt:643
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11492
msgid ""
11493
"If present, the location of the default branch for push.  This option\n"
11494
"is normally set by the first ``push`` or ``push --remember``."
11495
msgstr ""
11496
7185.1.1 by Jelmer Vernooij
Update pot file.
11497
#: en/help_topics/configuration.txt:646
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11498
msgid ""
11499
"push_strict\n"
11500
"~~~~~~~~~~~"
11501
msgstr ""
11502
7185.1.1 by Jelmer Vernooij
Update pot file.
11503
#: en/help_topics/configuration.txt:649
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11504
msgid ""
11505
"If present, defines the ``--strict`` option default value for checking\n"
11506
"uncommitted changes before pushing."
11507
msgstr ""
11508
7185.1.1 by Jelmer Vernooij
Update pot file.
11509
#: en/help_topics/configuration.txt:652
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11510
msgid ""
11511
"bound_location\n"
11512
"~~~~~~~~~~~~~~"
11513
msgstr ""
11514
7185.1.1 by Jelmer Vernooij
Update pot file.
11515
#: en/help_topics/configuration.txt:655
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11516
msgid ""
11517
"The location that commits should go to when acting as a checkout.\n"
11518
"This option is normally set by ``bind``."
11519
msgstr ""
11520
7185.1.1 by Jelmer Vernooij
Update pot file.
11521
#: en/help_topics/configuration.txt:658
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11522
msgid ""
11523
"bound\n"
11524
"~~~~~"
11525
msgstr ""
11526
7185.1.1 by Jelmer Vernooij
Update pot file.
11527
#: en/help_topics/configuration.txt:661
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11528
msgid ""
11529
"If set to \"True\", the branch should act as a checkout, and push each "
11530
"commit to\n"
11531
"the bound_location.  This option is normally set by ``bind``/``unbind``."
11532
msgstr ""
11533
7185.1.1 by Jelmer Vernooij
Update pot file.
11534
#: en/help_topics/configuration.txt:664
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11535
msgid ""
11536
"send_strict\n"
11537
"~~~~~~~~~~~"
11538
msgstr ""
11539
7185.1.1 by Jelmer Vernooij
Update pot file.
11540
#: en/help_topics/configuration.txt:667
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11541
msgid ""
11542
"If present, defines the ``--strict`` option default value for checking\n"
11543
"uncommitted changes before sending a merge directive."
11544
msgstr ""
11545
7185.1.1 by Jelmer Vernooij
Update pot file.
11546
#: en/help_topics/configuration.txt:670
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11547
msgid ""
11548
"add.maximum_file_size\n"
11549
"~~~~~~~~~~~~~~~~~~~~~"
11550
msgstr ""
11551
7185.1.1 by Jelmer Vernooij
Update pot file.
11552
#: en/help_topics/configuration.txt:673
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11553
msgid ""
11554
"Defines the maximum file size the command line \"add\" operation will allow\n"
11555
"in recursive mode, with files larger than this value being skipped. You "
11556
"may \n"
11557
"specify this value as an integer (in which case it is interpreted as "
11558
"bytes), \n"
11559
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
11560
"0 \n"
11561
"will disable skipping."
11562
msgstr ""
11563
7185.1.1 by Jelmer Vernooij
Update pot file.
11564
#: en/help_topics/configuration.txt:679
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11565
msgid ""
11566
"External Merge Tools\n"
11567
"--------------------"
11568
msgstr ""
11569
7185.1.1 by Jelmer Vernooij
Update pot file.
11570
#: en/help_topics/configuration.txt:682
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11571
msgid ""
11572
"bzr.mergetool.<name>\n"
11573
"~~~~~~~~~~~~~~~~~~~~"
11574
msgstr ""
11575
7185.1.1 by Jelmer Vernooij
Update pot file.
11576
#: en/help_topics/configuration.txt:685
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11577
msgid ""
11578
"Defines an external merge tool called <name> with the given command-line.\n"
11579
"Arguments containing spaces should be quoted using single or double quotes. "
11580
"The\n"
11581
"executable may omit its path if it can be found on the PATH."
11582
msgstr ""
11583
7185.1.1 by Jelmer Vernooij
Update pot file.
11584
#: en/help_topics/configuration.txt:689
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11585
msgid ""
11586
"The following markers can be used in the command-line to substitute "
11587
"filenames\n"
11588
"involved in the merge conflict::"
11589
msgstr ""
11590
7185.1.1 by Jelmer Vernooij
Update pot file.
11591
#: en/help_topics/configuration.txt:692
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11592
msgid ""
11593
"  {base}      file.BASE\n"
11594
"  {this}      file.THIS\n"
11595
"  {other}     file.OTHER\n"
11596
"  {result}    output file\n"
11597
"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
11598
"merge\n"
11599
"              succeeds."
11600
msgstr ""
11601
7185.1.1 by Jelmer Vernooij
Update pot file.
11602
#: en/help_topics/configuration.txt:701
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11603
msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11604
msgstr ""
11605
7185.1.1 by Jelmer Vernooij
Update pot file.
11606
#: en/help_topics/configuration.txt:703
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11607
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
11608
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
11609
"interpolation markers, trying to display the mergetool line results in the\n"
11610
"following problem::"
11611
msgstr ""
11612
7185.1.1 by Jelmer Vernooij
Update pot file.
11613
#: en/help_topics/configuration.txt:707
6581.1.2 by Vincent Ladeuil
Update translation template.
11614
msgid ""
11615
"\n"
11616
"  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
11617
"{result}'\n"
11618
"  $ bzr config bzr.mergetool.kdiff3\n"
11619
"  bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
11620
"{this} {other} -o {result}\"."
11621
msgstr ""
11622
7185.1.1 by Jelmer Vernooij
Update pot file.
11623
#: en/help_topics/configuration.txt:712
6581.1.2 by Vincent Ladeuil
Update translation template.
11624
msgid ""
11625
"To avoid this, ``config`` can be instructed not to try expanding variables::"
11626
msgstr ""
11627
7185.1.1 by Jelmer Vernooij
Update pot file.
11628
#: en/help_topics/configuration.txt:714
6581.1.2 by Vincent Ladeuil
Update translation template.
11629
msgid ""
11630
"  $ bzr config --all bzr.mergetool.kdiff3\n"
11631
"  branch:\n"
11632
"    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11633
msgstr ""
11634
7185.1.1 by Jelmer Vernooij
Update pot file.
11635
#: en/help_topics/configuration.txt:718
6581.1.2 by Vincent Ladeuil
Update translation template.
11636
msgid ""
11637
"\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11638
"bzr.default_mergetool\n"
11639
"~~~~~~~~~~~~~~~~~~~~~"
11640
msgstr ""
11641
7185.1.1 by Jelmer Vernooij
Update pot file.
11642
#: en/help_topics/configuration.txt:722
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11643
msgid ""
11644
"Specifies which external merge tool (as defined above) should be selected "
11645
"by\n"
11646
"default in tools such as ``bzr qconflicts``."
11647
msgstr ""
11648
7185.1.1 by Jelmer Vernooij
Update pot file.
11649
#: en/help_topics/configuration.txt:727
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11650
msgid "  bzr.default_mergetool = kdiff3\n"
11651
msgstr ""
11652
11653
#: en/help_topics/conflict-types.txt:1
11654
msgid ""
11655
"Conflict Types\n"
11656
"=============="
11657
msgstr ""
11658
11659
#: en/help_topics/conflict-types.txt:4
11660
msgid ""
11661
"Some operations, like merge, revert and pull, modify the contents of your\n"
11662
"working tree.  These modifications are programmatically generated, and so "
11663
"they\n"
11664
"may conflict with the current state of your working tree. "
11665
msgstr ""
11666
11667
#: en/help_topics/conflict-types.txt:8
11668
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11669
"When conflicts are present in your working tree (as shown by ``brz\n"
11670
"conflicts``), you should resolve them and then inform brz that the "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11671
"conflicts\n"
11672
"have been resolved."
11673
msgstr ""
11674
11675
#: en/help_topics/conflict-types.txt:12
11676
msgid ""
11677
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11678
"should resolve them is not the one responsible for their occurrence, as is "
11679
"the\n"
11680
"case when merging other people's work or because some conflicts are "
11681
"presented\n"
11682
"in a way that is not easy to understand."
11683
msgstr ""
11684
11685
#: en/help_topics/conflict-types.txt:17
11686
msgid ""
11687
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11688
"conflict if and only if there's an actual conceptual conflict in the source\n"
11689
"tree.  Because Bazaar doesn't understand the real meaning of the files "
11690
"being\n"
11691
"versioned, it can, when faced with ambiguities, fall short in either "
11692
"direction\n"
11693
"trying to resolve the conflict itself. Many kinds of changes can be "
11694
"combined\n"
11695
"programmatically, but sometimes only a human can determine the right thing "
11696
"to\n"
11697
"do."
11698
msgstr ""
11699
11700
#: en/help_topics/conflict-types.txt:25
11701
msgid ""
11702
"When Bazaar generates a conflict, it adds information into the working tree "
11703
"to\n"
11704
"present the conflicting versions, and it's up to you to find the correct\n"
11705
"resolution."
11706
msgstr ""
11707
11708
#: en/help_topics/conflict-types.txt:29
11709
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11710
msgstr ""
11711
11712
#: en/help_topics/conflict-types.txt:31
11713
msgid ""
11714
"1. Modify the working tree content so that the conflicted item is now in "
11715
"the\n"
11716
"   state you want to keep, then"
11717
msgstr ""
11718
11719
#: en/help_topics/conflict-types.txt:34
11720
msgid ""
11721
"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.
11722
"   remaining generated information (``brz resolve <item>``)."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11723
msgstr ""
11724
11725
#: en/help_topics/conflict-types.txt:37
11726
msgid ""
11727
"For most conflict types, there are some obvious ways to modify the working\n"
11728
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11729
"itself already made a choice, when possible."
11730
msgstr ""
11731
11732
#: en/help_topics/conflict-types.txt:41
11733
msgid ""
11734
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11735
"different ways to resolve the conflict."
11736
msgstr ""
11737
11738
#: en/help_topics/conflict-types.txt:44
11739
msgid ""
11740
"Each type of conflict is explained below, and the action which must be done "
11741
"to\n"
11742
"resolve the conflict is outlined."
11743
msgstr ""
11744
11745
#: en/help_topics/conflict-types.txt:47
11746
msgid ""
11747
"Various actions are available depending on the kind of conflict, for some "
11748
"of\n"
11749
"these actions, Bazaar can provide some help. In the end you should at least\n"
11750
"inform Bazaar that you're done with the conflict with::"
11751
msgstr ""
11752
11753
#: en/help_topics/conflict-types.txt:51
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11754
msgid "  ``brz resolve FILE --action=done'"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11755
msgstr ""
11756
11757
#: en/help_topics/conflict-types.txt:53
11758
msgid ""
11759
"Note that this is the default action when a single file is involved so you "
11760
"can\n"
11761
"simply use::"
11762
msgstr ""
11763
11764
#: en/help_topics/conflict-types.txt:56
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11765
msgid "   ``brz resolve FILE``"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11766
msgstr ""
11767
11768
#: en/help_topics/conflict-types.txt:58
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11769
msgid "See ``brz help resolve`` for more details."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11770
msgstr ""
11771
11772
#: en/help_topics/conflict-types.txt:60
11773
msgid ""
11774
"Text conflicts\n"
11775
"--------------"
11776
msgstr ""
11777
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11778
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11779
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11780
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11781
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11782
#: 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
11783
msgid "Typical message::"
11784
msgstr ""
11785
11786
#: en/help_topics/conflict-types.txt:65
11787
msgid "  Text conflict in FILE"
11788
msgstr ""
11789
11790
#: en/help_topics/conflict-types.txt:67
11791
msgid ""
11792
"These are produced when a text merge cannot completely reconcile two sets "
11793
"of\n"
11794
"text changes.  Bazaar will emit files for each version with the extensions\n"
11795
"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
11796
"tree,\n"
11797
"i.e. the tree that you are merging changes into.  OTHER is the version that "
11798
"you\n"
11799
"are merging into the target.  BASE is an older version that is used as a "
11800
"basis\n"
11801
"for comparison."
11802
msgstr ""
11803
11804
#: en/help_topics/conflict-types.txt:74
11805
msgid ""
11806
"In the main copy of the file, Bazaar will include all the changes that it\n"
11807
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11808
"\"herringbone\" markers like ``<<<<<<<``."
11809
msgstr ""
11810
11811
#: en/help_topics/conflict-types.txt:78
11812
msgid ""
11813
"Say the initial text is \"The project leader released it.\", and THIS "
11814
"modifies it\n"
11815
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11816
"leader\n"
11817
"released Bazaar.\"  A conflict would look like this::"
11818
msgstr ""
11819
11820
#: en/help_topics/conflict-types.txt:82
11821
msgid ""
11822
"  <<<<<<< TREE\n"
11823
"  Martin Pool released it.\n"
11824
"  =======\n"
11825
"  The project leader released Bazaar.\n"
11826
"  >>>>>>> MERGE-SOURCE"
11827
msgstr ""
11828
11829
#: en/help_topics/conflict-types.txt:88
11830
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11831
msgstr ""
11832
11833
#: en/help_topics/conflict-types.txt:90
11834
msgid ""
11835
"You can handle text conflicts either by editing the main copy of the file,\n"
11836
"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
11837
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11838
"set of changes over the other (but see below when you encounter these\n"
11839
"cases).  More often, the two sets of changes must be intelligently combined."
11840
msgstr ""
11841
11842
#: en/help_topics/conflict-types.txt:96
11843
msgid ""
11844
"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
11845
"you are done editing, the file should look like it never had a conflict, and "
11846
"be\n"
11847
"ready to commit."
11848
msgstr ""
11849
11850
#: en/help_topics/conflict-types.txt:100
11851
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11852
"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
11853
"Bazaar will auto-detect which conflicts you have resolved."
11854
msgstr ""
11855
11856
#: en/help_topics/conflict-types.txt:103
11857
msgid ""
11858
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11859
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11860
"working tree."
11861
msgstr ""
11862
11863
#: en/help_topics/conflict-types.txt:107
11864
msgid ""
11865
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11866
"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
11867
"resolve`` with one of the following actions:"
11868
msgstr ""
11869
11870
#: en/help_topics/conflict-types.txt:111
11871
msgid ""
11872
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11873
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11874
msgstr ""
11875
11876
#: en/help_topics/conflict-types.txt:114
11877
msgid ""
11878
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11879
"modifications will be taken into account."
11880
msgstr ""
11881
11882
#: en/help_topics/conflict-types.txt:117
11883
msgid ""
11884
"Content conflicts\n"
11885
"-----------------"
11886
msgstr ""
11887
11888
#: en/help_topics/conflict-types.txt:122
11889
msgid "  Contents conflict in FILE"
11890
msgstr ""
11891
11892
#: en/help_topics/conflict-types.txt:124
11893
msgid ""
11894
"This conflict happens when there are conflicting changes in the working "
11895
"tree\n"
11896
"and the merge source, but the conflicted items are not text files.  They "
11897
"may\n"
11898
"be binary files, or symlinks, or directories.  It can even happen with "
11899
"files\n"
11900
"that are deleted on one side, and modified on the other."
11901
msgstr ""
11902
11903
#: en/help_topics/conflict-types.txt:129
11904
msgid ""
11905
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
11906
"be\n"
11907
"regular files, symlinks or directories).  But it will not include a \"main "
11908
"copy\"\n"
11909
"of the file with herringbone conflict markers.  It will appear that the "
11910
"\"main\n"
11911
"copy\" has been renamed to THIS or OTHER."
11912
msgstr ""
11913
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11914
#: 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
11915
msgid ""
11916
"To resolve that kind of conflict, you should rebuild FILE from either "
11917
"version\n"
11918
"or a combination of both."
11919
msgstr ""
11920
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11921
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11922
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11923
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11924
#: en/help_topics/conflict-types.txt:361
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11925
msgid "``brz resolve`` recognizes the following actions:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11926
msgstr ""
11927
11928
#: en/help_topics/conflict-types.txt:139
11929
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11930
"* ``--action=take-this`` will issue ``brz mv FILE.THIS FILE``,\n"
11931
"* ``--action=take-other`` will issue ``brz mv FILE.OTHER FILE``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11932
"* ``--action=done`` will just mark the conflict as resolved."
11933
msgstr ""
11934
11935
#: en/help_topics/conflict-types.txt:143
11936
msgid ""
11937
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11938
"and\n"
11939
"``.OTHER`` files if they are still present in the working tree."
11940
msgstr ""
11941
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11942
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11943
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11944
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11945
#: en/help_topics/conflict-types.txt:369
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11946
msgid ""
11947
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11948
msgstr ""
11949
11950
#: en/help_topics/conflict-types.txt:148
11951
msgid ""
11952
"Tag conflicts\n"
11953
"-------------"
11954
msgstr ""
11955
11956
#: en/help_topics/conflict-types.txt:153
11957
msgid ""
11958
"  Conflicting tags:\n"
11959
"      version-0.1"
11960
msgstr ""
11961
11962
#: en/help_topics/conflict-types.txt:156
11963
msgid ""
11964
"When pulling from or pushing to another branch, Bazaar informs you about "
11965
"tags\n"
11966
"that conflict between the two branches; that is the same tag points to two\n"
11967
"different revisions.  You need not resolve these conflicts, but subsequent\n"
11968
"uses of pull or push will result in the same message."
11969
msgstr ""
11970
11971
#: en/help_topics/conflict-types.txt:161
11972
msgid ""
11973
"To resolve the conflict, you must apply the correct tags to either the "
11974
"target\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11975
"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
11976
"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
11977
"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.
11978
"``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
11979
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11980
"source\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11981
"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
11982
"favor of the target branch, you need to similarly use ``tag --force`` in "
11983
"the\n"
11984
"source branch.  (Note that pulling or pushing using --overwrite will "
11985
"overwrite\n"
11986
"all tags as well.)"
11987
msgstr ""
11988
11989
#: en/help_topics/conflict-types.txt:172
11990
msgid ""
11991
"Duplicate paths\n"
11992
"---------------"
11993
msgstr ""
11994
11995
#: en/help_topics/conflict-types.txt:177
11996
msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
11997
msgstr ""
11998
11999
#: en/help_topics/conflict-types.txt:179
12000
msgid ""
12001
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
12002
"already been used.  The existing file will be renamed to \"FILE.moved\".  "
12003
msgstr ""
12004
12005
#: en/help_topics/conflict-types.txt:187
12006
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12007
"* ``--action=take-this`` will issue ``brz rm FILE ; brz mv FILE.moved "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12008
"FILE``,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12009
"* ``--action=take-other`` will issue ``brz rm FILE.moved``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12010
"* ``--action=done`` will just mark the conflict as resolved."
12011
msgstr ""
12012
12013
#: en/help_topics/conflict-types.txt:191
12014
msgid ""
12015
"Note that you must get rid of FILE.moved before using ``--action=done``."
12016
msgstr ""
12017
12018
#: en/help_topics/conflict-types.txt:195
12019
msgid ""
12020
"Unversioned parent\n"
12021
"------------------"
12022
msgstr ""
12023
12024
#: en/help_topics/conflict-types.txt:200
12025
msgid "    Conflict because FILE is not versioned, but has versioned children."
12026
msgstr ""
12027
12028
#: en/help_topics/conflict-types.txt:202
12029
msgid ""
12030
"Sometimes Bazaar will attempt to create a file whose parent directory is "
12031
"not\n"
12032
"versioned.  This happens when the directory has been deleted in the target,\n"
12033
"but has a new child in the source, or vice versa.  In this situation, "
12034
"Bazaar\n"
12035
"will version the parent directory as well.  Resolving this issue depends\n"
12036
"very much on the particular scenario.  You may wish to rename or delete "
12037
"either\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12038
"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
12039
"resolve\n"
12040
"FILE\" to mark the conflict as resolved."
12041
msgstr ""
12042
12043
#: en/help_topics/conflict-types.txt:210
12044
msgid ""
12045
"Missing parent\n"
12046
"--------------"
12047
msgstr ""
12048
12049
#: en/help_topics/conflict-types.txt:215
12050
msgid "  Conflict adding files to FILE.  Created directory."
12051
msgstr ""
12052
12053
#: en/help_topics/conflict-types.txt:217
12054
msgid ""
12055
"This happens when a directory has been deleted in the target, but has new\n"
12056
"children in the source.  This is similar to the \"unversioned parent\" "
12057
"conflict,\n"
12058
"except that the parent directory does not *exist*, instead of just being\n"
12059
"unversioned.  In this situation, Bazaar will create the missing parent.\n"
12060
"Resolving this issue depends very much on the particular scenario."
12061
msgstr ""
12062
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12063
#: 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
12064
msgid ""
12065
"To resolve that kind of conflict, you should either remove or rename the\n"
12066
"children or the directory or a combination of both."
12067
msgstr ""
12068
12069
#: en/help_topics/conflict-types.txt:228
12070
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12071
"* ``--action=take-this`` will issue ``brz rm directory`` including the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12072
"  children,\n"
12073
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
12074
"children\n"
12075
"  and restoring the directory,\n"
12076
"* ``--action=done`` will just mark the conflict as resolved."
12077
msgstr ""
12078
12079
#: en/help_topics/conflict-types.txt:236
12080
msgid ""
12081
"Deleting parent\n"
12082
"---------------"
12083
msgstr ""
12084
12085
#: en/help_topics/conflict-types.txt:241
12086
msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
12087
msgstr ""
12088
12089
#: en/help_topics/conflict-types.txt:243
12090
msgid ""
12091
"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
12092
"source, but has new children in the target (either because a directory\n"
12093
"deletion is merged or because the merge introduce new children).  Bazaar\n"
12094
"will retain the directory.  Resolving this issue depends very much on the\n"
12095
"particular scenario."
12096
msgstr ""
12097
12098
#: en/help_topics/conflict-types.txt:254
12099
msgid ""
12100
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
12101
"directory,"
12102
msgstr ""
12103
12104
#: en/help_topics/conflict-types.txt:256
12105
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12106
"* ``--action=take-other`` will issue ``brz rm directory`` including the \n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12107
"  children,"
12108
msgstr ""
12109
12110
#: en/help_topics/conflict-types.txt:259
12111
msgid "* ``--action=done`` will just mark the conflict as resolved."
12112
msgstr ""
12113
12114
#: en/help_topics/conflict-types.txt:261
12115
msgid ""
12116
"Note that when merging a directory deletion, if unversioned files are\n"
12117
"present, they become potential orphans has they don't have a directory\n"
12118
"parent anymore."
12119
msgstr ""
12120
12121
#: en/help_topics/conflict-types.txt:265
12122
msgid ""
12123
"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.
12124
"setting the ``brz.transform.orphan_policy`` configuration option."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12125
msgstr ""
12126
12127
#: en/help_topics/conflict-types.txt:268
12128
msgid "There are two possible values for this option:"
12129
msgstr ""
12130
12131
#: en/help_topics/conflict-types.txt:270
12132
msgid ""
12133
"* ``conflict`` (the default): will leave the orphans in place and\n"
12134
"  generate a conflicts,"
12135
msgstr ""
12136
12137
#: en/help_topics/conflict-types.txt:273
12138
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12139
"* ``move``: will move the orphans to a ``brz-orphans`` directory at the "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12140
"root\n"
12141
"  of the working tree with names like ``<file>.~#~``."
12142
msgstr ""
12143
12144
#: en/help_topics/conflict-types.txt:278
12145
msgid ""
12146
"Path conflict\n"
12147
"-------------"
12148
msgstr ""
12149
12150
#: en/help_topics/conflict-types.txt:283
12151
msgid "  Path conflict: PATH1 / PATH2"
12152
msgstr ""
12153
12154
#: en/help_topics/conflict-types.txt:285
12155
msgid ""
12156
"This happens when the source and target have each modified the name or "
12157
"parent\n"
12158
"directory of a file.  Bazaar will use the path elements from the source."
12159
msgstr ""
12160
12161
#: en/help_topics/conflict-types.txt:288
12162
msgid ""
12163
"To resolve that kind of conflict, you just have to decide what name should "
12164
"be\n"
12165
"retained for the file involved."
12166
msgstr ""
12167
12168
#: en/help_topics/conflict-types.txt:293
12169
msgid ""
12170
"* ``--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.
12171
"  issuing ``brz mv PATH2 PATH1``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12172
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
12173
"``PATH2``,\n"
12174
"* ``--action=done`` will just mark the conflict as resolved."
12175
msgstr ""
12176
12177
#: en/help_topics/conflict-types.txt:300
12178
msgid ""
12179
"Parent loop\n"
12180
"-----------"
12181
msgstr ""
12182
12183
#: en/help_topics/conflict-types.txt:305
12184
msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
12185
msgstr ""
12186
12187
#: en/help_topics/conflict-types.txt:307
12188
msgid ""
12189
"This happens when the source and the target have each moved directories, so\n"
12190
"that, if the change could be applied, a directory would be contained by "
12191
"itself.\n"
12192
"For example::"
12193
msgstr ""
12194
12195
#: en/help_topics/conflict-types.txt:311
12196
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12197
"  $ brz init\n"
12198
"  $ brz mkdir white\n"
12199
"  $ brz mkdir black\n"
12200
"  $ brz commit -m \"BASE\"\n"
12201
"  $ brz branch . ../other\n"
12202
"  $ brz mv white black\n"
12203
"  $ brz commit -m \"THIS\"\n"
12204
"  $ brz mv ../other/black ../other/white\n"
12205
"  $ brz commit ../other -m \"OTHER\"\n"
12206
"  $ brz merge ../other"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12207
msgstr ""
12208
12209
#: en/help_topics/conflict-types.txt:322
12210
msgid ""
12211
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
12212
"``black``.  To resolve that kind of conflict, you just have to decide what\n"
12213
"name should be retained for the directories involved."
12214
msgstr ""
12215
12216
#: en/help_topics/conflict-types.txt:328
12217
msgid ""
12218
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
12219
"``white`` \n"
12220
"  in ``black``,\n"
12221
"* ``--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.
12222
"   ``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
12223
"* ``--action=done`` will just mark the conflict as resolved."
12224
msgstr ""
12225
12226
#: en/help_topics/conflict-types.txt:336
12227
msgid ""
12228
"Non-directory parent\n"
12229
"--------------------"
12230
msgstr ""
12231
12232
#: en/help_topics/conflict-types.txt:341
12233
msgid ""
12234
"  Conflict: foo.new is not a directory, but has files in it.\n"
12235
"  Created directory."
12236
msgstr ""
12237
12238
#: en/help_topics/conflict-types.txt:344
12239
msgid ""
12240
"This happens when one side has added files to a directory, and the other "
12241
"side\n"
12242
"has changed the directory into a file or symlink.  For example::"
12243
msgstr ""
12244
12245
#: en/help_topics/conflict-types.txt:347
12246
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12247
"  $ brz init\n"
12248
"  $ brz mkdir foo\n"
12249
"  $ brz commit -m \"BASE\"\n"
12250
"  $ brz branch . ../other\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12251
"  $ rmdir foo\n"
12252
"  $ touch foo\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12253
"  $ brz commit -m \"THIS\"\n"
12254
"  $ brz mkdir ../other/foo/bar\n"
12255
"  $ brz commit ../other -m \"OTHER\"\n"
12256
"  $ brz merge ../other"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12257
msgstr ""
12258
12259
#: en/help_topics/conflict-types.txt:358
12260
msgid ""
12261
"To resolve that kind of conflict, you have to decide what name should be\n"
12262
"retained for the file, directory or symlink involved."
12263
msgstr ""
12264
12265
#: en/help_topics/conflict-types.txt:363
12266
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12267
"* ``--action=take-this`` will issue ``brz rm --force foo.new`` and \n"
12268
"  ``brz add foo``,\n"
12269
"* ``--action=take-other`` will issue ``brz rm --force foo`` and \n"
12270
"  ``brz mv foo.new foo``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12271
"* ``--action=done`` will just mark the conflict as resolved."
12272
msgstr ""
12273
12274
#: en/help_topics/conflict-types.txt:371
12275
msgid ""
12276
"MalformedTransform\n"
12277
"------------------"
12278
msgstr ""
12279
12280
#: en/help_topics/conflict-types.txt:374
12281
msgid ""
12282
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
12283
"exception.  This means that Bazaar encountered a filesystem conflict that it "
12284
"was\n"
12285
"unable to resolve.  This usually indicates a bug.  Please let us know if "
12286
"you\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12287
"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
12288
msgstr ""
12289
12290
#: en/help_topics/content-filters.txt:1
12291
msgid ""
12292
"Content Filters\n"
12293
"==============="
12294
msgstr ""
12295
12296
#: en/help_topics/content-filters.txt:4
12297
msgid ""
12298
"Content formats\n"
12299
"---------------"
12300
msgstr ""
12301
12302
#: en/help_topics/content-filters.txt:7
12303
msgid ""
12304
"Bazaar's content filtering allows you to store files in a different\n"
12305
"format from the copy in your working tree.  This lets you, or your\n"
12306
"co-developers, use Windows development tools that expect CRLF files\n"
12307
"on projects that use other line-ending conventions. Among other things,\n"
12308
"content filters also let Unix developers more easily work on projects\n"
12309
"using Windows line-ending conventions, keyword expansion/compression,\n"
12310
"and trailing spaces on lines in text files to be implicitly stripped\n"
12311
"when committed."
12312
msgstr ""
12313
12314
#: en/help_topics/content-filters.txt:16
12315
msgid "To generalize, there are two content formats supported by Bazaar:"
12316
msgstr ""
12317
12318
#: en/help_topics/content-filters.txt:18
12319
msgid ""
12320
"* a canonical format - how files are stored internally\n"
12321
"* a convenience format - how files are created in a working tree."
12322
msgstr ""
12323
12324
#: en/help_topics/content-filters.txt:21
12325
msgid ""
12326
"\n"
12327
"Format conversion\n"
12328
"-----------------"
12329
msgstr ""
12330
12331
#: en/help_topics/content-filters.txt:25
12332
msgid ""
12333
"The conversion between these formats is done by content filters.\n"
12334
"A content filter has two parts:"
12335
msgstr ""
12336
12337
#: en/help_topics/content-filters.txt:28
12338
msgid ""
12339
"* a read converter - converts from convenience to canonical format\n"
12340
"* a write converter - converts from canonical to convenience format."
12341
msgstr ""
12342
12343
#: en/help_topics/content-filters.txt:31
12344
msgid ""
12345
"Many of these converters will provide *round-trip* conversion,\n"
12346
"i.e. applying the read converter followed by the write converter\n"
12347
"gives back the original content. However, others may provide an\n"
12348
"asymmetric conversion. For example, a read converter might strip\n"
12349
"trailing whitespace off lines in source code while the matching\n"
12350
"write converter might pass content through unchanged."
12351
msgstr ""
12352
12353
#: en/help_topics/content-filters.txt:38
12354
msgid ""
12355
"\n"
12356
"Enabling content filters\n"
12357
"------------------------"
12358
msgstr ""
12359
12360
#: en/help_topics/content-filters.txt:42
12361
msgid ""
12362
"Content filters are typically provided by plugins, so the first step\n"
12363
"in using them is to install the relevant plugins and read their\n"
12364
"documentation. Some plugins may be very specific about which files\n"
12365
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
12366
"In other cases, the plugin may leave it in the user's hands to\n"
12367
"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.
12368
"using rule-based preferences. See ``brz help rules`` for general\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12369
"information about defining these."
12370
msgstr ""
12371
12372
#: en/help_topics/content-filters.txt:51
12373
msgid ""
12374
"\n"
12375
"Impact on commands\n"
12376
"------------------"
12377
msgstr ""
12378
12379
#: en/help_topics/content-filters.txt:55
12380
msgid ""
12381
"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.
12382
"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
12383
"will apply read converters to files in the working tree, then compare\n"
12384
"the results to the content last committed."
12385
msgstr ""
12386
12387
#: en/help_topics/content-filters.txt:60
12388
msgid ""
12389
"Write converters are only applied by commands that **create files in a\n"
12390
"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.
12391
"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
12392
"respectively."
12393
msgstr ""
12394
12395
#: en/help_topics/content-filters.txt:65
12396
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12397
"Note: ``brz commit`` does not implicitly apply write converters after\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12398
"comitting files. If this makes sense for a given plugin providing\n"
12399
"a content filter, the plugin can usually achieve this effect by using a\n"
12400
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
12401
"for more information on hooks."
12402
msgstr ""
12403
12404
#: en/help_topics/content-filters.txt:71
12405
msgid ""
12406
"\n"
12407
"Refreshing your working tree\n"
12408
"----------------------------"
12409
msgstr ""
12410
12411
#: en/help_topics/content-filters.txt:75
12412
msgid ""
12413
"For performance reasons, Bazaar caches the timestamps of files in\n"
12414
"a working tree, and assumes files are unchanged if their timestamps\n"
12415
"match the cached values. As a consequence, there are times when\n"
12416
"you may need to explicitly ask for content filtering to be reapplied\n"
12417
"in one or both directions, e.g. after installing or reconfiguring\n"
12418
"plugins providing it."
12419
msgstr ""
12420
12421
#: en/help_topics/content-filters.txt:82
12422
msgid "Here are some general guidelines for doing this:"
12423
msgstr ""
12424
12425
#: en/help_topics/content-filters.txt:84
12426
msgid ""
12427
" * To reapply read converters, ``touch`` files, i.e. update their\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12428
"   timestamp. Operations like ``brz status`` should then reapply the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12429
"   relevant read converters and compare the end result with the\n"
12430
"   canonical format."
12431
msgstr ""
12432
12433
#: en/help_topics/content-filters.txt:89
12434
msgid ""
12435
" * To reapply write converters, ensure there are no local changes,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12436
"   delete the relevant files and run ``brz revert`` on those files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12437
msgstr ""
12438
12439
#: en/help_topics/content-filters.txt:92
12440
msgid ""
12441
"Note: In the future, it is likely that additional options will be added\n"
12442
"to commands to make this refreshing process faster and safer.\n"
12443
msgstr ""
12444
12445
#: en/help_topics/current-formats.txt:1
12446
msgid "Current Storage Formats"
12447
msgstr ""
12448
12449
#: en/help_topics/current-formats.txt:3
12450
msgid ""
12451
":2a:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12452
"    (native) (default) Format for the bzr 2.0 series."
12453
msgstr ""
12454
12455
#: en/help_topics/current-formats.txt:6
12456
msgid ""
12457
":git:\n"
12458
"    GIT repository."
12459
msgstr ""
12460
12461
#: en/help_topics/current-formats.txt:9
12462
msgid ""
12463
":git-bare:\n"
12464
"    Bare GIT repository (no working tree)."
12465
msgstr ""
12466
12467
#: 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
12468
msgid ""
12469
"\n"
12470
"See :doc:`formats-help` for more about storage formats."
12471
msgstr ""
12472
12473
#: en/help_topics/debug-flags.txt:1
12474
msgid ""
12475
"Debug Flags\n"
12476
"==========="
12477
msgstr ""
12478
12479
#: en/help_topics/debug-flags.txt:4
12480
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12481
"These flags can be passed on the brz command line or (without the ``-D``\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12482
"prefix) put in the ``debug_flags`` variable in ``breezy.conf``."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12483
msgstr ""
12484
12485
#: en/help_topics/debug-flags.txt:7
12486
msgid ""
12487
"-Dauth            Trace authentication sections used.\n"
12488
"-Dbytes           Print out how many bytes were transferred\n"
12489
"-Ddirstate        Trace dirstate activity (verbose!)\n"
12490
"-Derror           Instead of normal error handling, always print a "
12491
"traceback\n"
12492
"                  on error.\n"
12493
"-Devil            Capture call sites that do expensive or badly-scaling\n"
12494
"                  operations.\n"
12495
"-Dfetch           Trace history copying between repositories.\n"
12496
"-Dfilters         Emit information for debugging content filtering.\n"
12497
"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
12498
"fetch.\n"
12499
"-Dgraph           Trace graph traversal.\n"
12500
"-Dhashcache       Log every time a working file is read to determine its "
12501
"hash.\n"
12502
"-Dhooks           Trace hook execution.\n"
12503
"-Dhpss            Trace smart protocol requests and responses.\n"
12504
"-Dhpssdetail      More hpss details.\n"
12505
"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
12506
"-Dhttp            Trace http connections, requests and responses.\n"
12507
"-Dindex           Trace major index operations.\n"
12508
"-Dknit            Trace knit operations.\n"
12509
"-Dlock            Trace when lockdir locks are taken or released.\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
12510
"-Dnoretry         If a connection is reset, fail immediately rather than\n"
12511
"                  retrying the request.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12512
"-Dprogress        Trace progress bar operations.\n"
12513
"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
12514
"-Dmerge           Emit information for debugging merges.\n"
12515
"-Dno_apport       Don't use apport to report crashes.\n"
12516
"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
12517
"-Dpack            Emit information about pack operations.\n"
12518
"-Drelock          Emit a message every time a branch or repository object "
12519
"is\n"
12520
"                  unlocked then relocked the same way.\n"
12521
"-Dsftp            Trace SFTP internals.\n"
12522
"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
12523
"expected\n"
12524
"-Dstream          Trace fetch streams.\n"
12525
"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
12526
"portable\n"
12527
"                  manner.\n"
12528
"-Dunlock          Some errors during unlock are treated as warnings.\n"
12529
"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
12530
"-DIDS_always      Always use InterDifferingSerializer to fetch if "
12531
"appropriate\n"
12532
"                  for the format, even for non-local fetches.\n"
12533
msgstr ""
12534
12535
#: en/help_topics/diverged-branches.txt:1
12536
msgid ""
12537
"Diverged Branches\n"
12538
"================="
12539
msgstr ""
12540
12541
#: en/help_topics/diverged-branches.txt:4
12542
msgid ""
12543
"When Bazaar tries to push one branch onto another, it requires that the\n"
12544
"destination branch must be ready to receive the source branch.  If this "
12545
"isn't\n"
12546
"the case, then we say that the branches have ``diverged``.  Branches are\n"
12547
"considered diverged if the destination branch's most recent commit is one "
12548
"that\n"
12549
"has not been merged (directly or indirectly) by the source branch.  To "
12550
"recover\n"
12551
"from diverged branches, one must merge the missing revisions into the "
12552
"source\n"
12553
"branch."
12554
msgstr ""
12555
12556
#: en/help_topics/diverged-branches.txt:12
12557
msgid ""
12558
"This situation commonly arises when using a centralized workflow with local\n"
12559
"commits.  If someone else has committed new work to the mainline since your\n"
12560
"last pull and you have local commits that have not yet been pushed to the\n"
12561
"mainline, then your local branch and the mainline have diverged."
12562
msgstr ""
12563
12564
#: en/help_topics/diverged-branches.txt:17
12565
msgid ""
12566
"Discovering What Has Diverged\n"
12567
"-----------------------------"
12568
msgstr ""
12569
12570
#: en/help_topics/diverged-branches.txt:20
12571
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12572
"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
12573
"another\n"
12574
"branch that are not present in the current branch, and vice-versa.  It shows "
12575
"a\n"
12576
"summary of  which extra revisions exist in each branch.  If you want to see "
12577
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12578
"precise effects of those revisions, you can use ``brz diff --"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12579
"old=other_branch``\n"
12580
"to show the differences between other_branch and your current branch."
12581
msgstr ""
12582
12583
#: en/help_topics/diverged-branches.txt:26
12584
msgid ""
12585
"A Solution\n"
12586
"----------"
12587
msgstr ""
12588
12589
#: en/help_topics/diverged-branches.txt:29
12590
msgid ""
12591
"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.
12592
"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
12593
"mainline.  This merge may result in conflicts if the other developer's "
12594
"changes\n"
12595
"overlap with your changes.  These conflicts should be resolved before\n"
12596
"continuing. After any conflicts have been resolved, or even if there were "
12597
"no\n"
12598
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
12599
"to your local branch.  This requirement gives you an opportunity to test "
12600
"the\n"
12601
"resulting working tree for correctness, since the merged revisions could "
12602
"have\n"
12603
"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.
12604
"``brz commit``.  This clears up the diverged branches situation.  Your "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12605
"local\n"
12606
"branch can now be pushed to the mainline.\n"
12607
msgstr ""
12608
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12609
#: en/help_topics/env-variables.txt:1
12610
msgid "Environment Variables"
12611
msgstr ""
12612
12613
#: en/help_topics/env-variables.txt:3
7185.1.1 by Jelmer Vernooij
Update pot file.
12614
msgid "See brz help configuration for more details."
6581.1.2 by Vincent Ladeuil
Update translation template.
12615
msgstr ""
12616
12617
#: en/help_topics/env-variables.txt:5
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12618
msgid ""
12619
"=================== "
12620
"===========================================================\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12621
"BRZPATH             Path where brz is to look for shell plugin external\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12622
"                    commands.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12623
"BRZ_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12624
"EMAIL               E-Mail address of the user.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12625
"BRZ_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12626
"EDITOR              Editor for editing commit messages.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12627
"BRZ_PLUGIN_PATH     Paths where brz should look for plugins.\n"
12628
"BRZ_DISABLE_PLUGINS Plugins that brz should not load.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12629
"BRZ_PLUGINS_AT      Plugins to load from a directory not in "
12630
"BRZ_PLUGIN_PATH.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12631
"BRZ_HOME            Directory holding breezy config dir. Overrides HOME.\n"
12632
"BRZ_HOME (Win32)    Directory holding breezy config dir. Overrides APPDATA "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12633
"and\n"
12634
"                    HOME.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
12635
"BZR_REMOTE_PATH     Full name of remote 'brz' command (for brz+ssh:// "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12636
"URLs).\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12637
"BRZ_SSH             Path to SSH client, or one of paramiko, openssh, "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12638
"sshcorp,\n"
12639
"                    plink or lsh.\n"
7490.31.3 by Jelmer Vernooij
Update po.
12640
"BRZ_LOG             Location of brz.log (use '/dev/null' to suppress log).\n"
12641
"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.
12642
"BRZ_COLUMNS         Override implicit terminal width.\n"
12643
"BRZ_CONCURRENCY     Number of processes that can be run concurrently "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12644
"(selftest)\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12645
"BRZ_PROGRESS_BAR    Override the progress display. Values are 'none' or "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12646
"'text'.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12647
"BRZ_PDB             Control whether to launch a debugger on error.\n"
12648
"BRZ_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12649
"                    breakin debugger.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12650
"BRZ_TEXTUI_INPUT    Force console input mode for prompts to line-based "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
12651
"(instead\n"
12652
"                    of char-based).\n"
12653
"=================== "
12654
"===========================================================\n"
12655
msgstr ""
12656
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12657
#: en/help_topics/eol.txt:1
12658
msgid ""
12659
"End of Line Conversion\n"
12660
"======================"
12661
msgstr ""
12662
12663
#: en/help_topics/eol.txt:4
12664
msgid ""
12665
"EOL conversion is provided as a content filter where Bazaar internally\n"
12666
"stores a canonical format but outputs a convenience format. See\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12667
"``brz help content-filters`` for general information about using these."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12668
msgstr ""
12669
12670
#: en/help_topics/eol.txt:8
12671
msgid ""
12672
"Note: Content filtering is only supported in recently added formats,\n"
12673
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12674
"in a recent format. (Just setting the format on the repository\n"
12675
"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.
12676
"'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
12677
"or later."
12678
msgstr ""
12679
12680
#: en/help_topics/eol.txt:15
12681
msgid ""
12682
"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.
12683
"rules. See ``brz help rules`` for general information on defining rules.\n"
12684
"Currently, rules are only supported in $brz_HOME/.bazaar/rules (or\n"
12685
"%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
12686
"supported in a future verison of Bazaar."
12687
msgstr ""
12688
12689
#: en/help_topics/eol.txt:21
12690
msgid ""
12691
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12692
"(If a value is not set, ``exact`` is the default.)"
12693
msgstr ""
12694
12695
#: en/help_topics/eol.txt:24
12696
msgid ""
12697
" ========== ===================================== ======================\n"
12698
" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
12699
" ========== ===================================== ======================\n"
12700
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12701
" ---------- ------------------------------------- ----------------------\n"
12702
" ``lf``     ``lf``                                ``lf``\n"
12703
" ---------- ------------------------------------- ----------------------\n"
12704
" ``crlf``   ``crlf``                              ``lf``\n"
12705
" ---------- ------------------------------------- ----------------------\n"
12706
" ``exact``  No conversion                         Exactly as in file\n"
12707
" ========== ===================================== ======================"
12708
msgstr ""
12709
12710
#: en/help_topics/eol.txt:36
12711
msgid ""
12712
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12713
"byte is detected in the file."
12714
msgstr ""
12715
12716
#: en/help_topics/eol.txt:39
12717
msgid ""
12718
"For users working on a cross-platform project, here is a suggested rule\n"
12719
"to use as a starting point::"
12720
msgstr ""
12721
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12722
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12723
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12724
msgid ""
12725
"  [name *]\n"
12726
"  eol = native"
12727
msgstr ""
12728
12729
#: en/help_topics/eol.txt:45
12730
msgid ""
12731
"If you have binary files that do not contain a null byte though, be\n"
12732
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12733
"by giving more explicit patterns earlier in the rules file. For example::"
12734
msgstr ""
12735
12736
#: en/help_topics/eol.txt:49
12737
msgid ""
12738
"  [name *.png]\n"
12739
"  eol = exact"
12740
msgstr ""
12741
12742
#: en/help_topics/eol.txt:55
12743
msgid ""
12744
"If your working tree is on a network drive shared by users on different\n"
12745
"operating systems, you typically want to force certain conventions for\n"
12746
"certain files. In that way, if a file is created with the wrong line\n"
12747
"endings or line endings get mixed during editing, it gets committed\n"
12748
"correctly and gets checked out correctly. For example::"
12749
msgstr ""
12750
12751
#: en/help_topics/eol.txt:61
12752
msgid ""
12753
"  [name *.bat]\n"
12754
"  eol = crlf"
12755
msgstr ""
12756
12757
#: en/help_topics/eol.txt:64
12758
msgid ""
12759
"  [name *.sh]\n"
12760
"  eol = lf"
12761
msgstr ""
12762
12763
#: en/help_topics/eol.txt:70
12764
msgid ""
12765
"If you take the care to create files with their required endings, you can\n"
12766
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12767
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12768
"introducing mixed line endings will be corrected during commit for files\n"
12769
"with those settings."
12770
msgstr ""
12771
12772
#: en/help_topics/eol.txt:76
12773
msgid ""
12774
"If you have sample test data that deliberately has text files with mixed\n"
12775
"newline conventions, you can ask for those to be left alone like this::"
12776
msgstr ""
12777
12778
#: en/help_topics/eol.txt:79
12779
msgid ""
12780
"  [name test_data/]\n"
12781
"  eol = exact"
12782
msgstr ""
12783
12784
#: en/help_topics/eol.txt:85
12785
msgid ""
12786
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12787
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12788
"of content analysis to detect binary files for commands like ``diff``.\n"
12789
"In the future, a ``binary = true`` rule may be added but it is not\n"
12790
"supported yet.)"
12791
msgstr ""
12792
12793
#: en/help_topics/eol.txt:91
12794
msgid ""
12795
"If you have an existing repository with text files already stored using\n"
12796
"Windows newline conventions (``crlf``), then you may want to keep using "
12797
"that\n"
12798
"convention in the repository. Forcing certain files to this convention\n"
12799
"may also help users who do not have rules configured. To do this, set\n"
12800
"``eol`` to one of the values below."
12801
msgstr ""
12802
12803
#: en/help_topics/eol.txt:97
12804
msgid ""
12805
" ============================ ======================== "
12806
"======================\n"
12807
" Value                        Checkout end-of-lines as Commit end-of-lines "
12808
"as\n"
12809
" ============================ ======================== "
12810
"======================\n"
12811
" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
12812
"                              ``lf`` otherwise\n"
12813
" ---------------------------- ------------------------ "
12814
"----------------------\n"
12815
" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
12816
" ---------------------------- ------------------------ "
12817
"----------------------\n"
12818
" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
12819
" ============================ ======================== ======================"
12820
msgstr ""
12821
12822
#: en/help_topics/eol.txt:108
12823
msgid ""
12824
"For users working on an existing project that uses Windows newline\n"
12825
"conventions in their Bazaar repository, this rule is suggested as a\n"
12826
"starting point::"
12827
msgstr ""
12828
12829
#: en/help_topics/eol.txt:112
12830
msgid ""
12831
"  [name *]\n"
12832
"  eol = native-with-crlf-in-repo"
12833
msgstr ""
12834
12835
#: en/help_topics/eol.txt:115
12836
msgid ""
12837
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12838
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12839
"``crlf`` and ``exact``."
12840
msgstr ""
12841
12842
#: en/help_topics/eol.txt:119
12843
msgid ""
12844
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12845
"never reject files because a given line ending or mixed line endings\n"
12846
"are found. A precommit hook should be used if you wish to validate\n"
12847
"(and not just convert) content before committing.\n"
12848
msgstr ""
12849
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
12850
#: en/help_topics/glossary.txt:1
12851
msgid ""
12852
"Glossary\n"
12853
"========"
12854
msgstr ""
12855
12856
#: en/help_topics/glossary.txt:4
12857
msgid ".. glossary::"
12858
msgstr ""
12859
12860
#: en/help_topics/glossary.txt:6
12861
msgid ""
12862
"  ancestor\n"
12863
"    An ancestor is one of any of the revisions that this revision is based "
12864
"on.\n"
12865
"    The immediately prior revision has a special name, the\n"
12866
"    :term:`parent revision`."
12867
msgstr ""
12868
12869
#: en/help_topics/glossary.txt:11
12870
msgid ""
12871
"  ancestral parent\n"
12872
"    Any branch that has been merged by another branch and then committed\n"
12873
"    becomes that branches ancestral parent."
12874
msgstr ""
12875
12876
#: en/help_topics/glossary.txt:15
12877
msgid ""
12878
"  branch\n"
12879
"    a line of development. In the simplest of terms, a branch is the record "
12880
"of\n"
12881
"    all the commits that have been done. Every :term:`working tree` has a\n"
12882
"    branch, but it may be in a different location. The actual revisions\n"
12883
"    produced by the commits are stored in a repository, which is sometimes\n"
12884
"    shared with other\n"
12885
"    branches."
12886
msgstr ""
12887
12888
#: en/help_topics/glossary.txt:23
12889
msgid ""
12890
"    A frequent activity done by users within the working tree of a branch is "
12891
"to\n"
12892
"    merge another branch. In this way users can share changes between two\n"
12893
"    branches -- even if the branch is run by someone else."
12894
msgstr ""
12895
12896
#: en/help_topics/glossary.txt:27
12897
msgid ""
12898
"    Bazaar's default behavior is to put the repository, branch, and working\n"
12899
"    tree all in the same place. This combination is called a standalone "
12900
"tree.\n"
12901
"    If there is no tree, it is called a :term:`standalone branch`. If the\n"
12902
"    repository is shared with other branches, it is called a repository "
12903
"branch.\n"
12904
"    A working tree in a different location from its branch is called a\n"
12905
"    checkout."
12906
msgstr ""
12907
12908
#: en/help_topics/glossary.txt:34
12909
msgid ""
12910
"  branch, bound\n"
12911
"    A bound branch is a branch that does not commit a new revision until "
12912
"after\n"
12913
"    the revision has been applied to another branch and first."
12914
msgstr ""
12915
12916
#: en/help_topics/glossary.txt:38
12917
msgid "    A bound branch is a part of a :term:`heavyweight checkout`."
12918
msgstr ""
12919
12920
#: en/help_topics/glossary.txt:40
12921
msgid ""
12922
"  cherry-pick\n"
12923
"    A cherrypick is an operation in which the delta between two revisions "
12924
"is\n"
12925
"    applied to a working tree. The process is roughly similiar to generating "
12926
"a\n"
12927
"    diff between two revisions and applying it to a working tree."
12928
msgstr ""
12929
12930
#: en/help_topics/glossary.txt:45
12931
msgid ""
12932
"    A cherrypick is a merge in which a range of revisions are selected and\n"
12933
"    merged into a working tree . Performing a limited merge is different "
12934
"than a\n"
12935
"    normal merge because normal merges imply all missing revisions should "
12936
"be\n"
12937
"    merged. One of the results of cherrypicking is the creation of "
12938
"intransitive\n"
12939
"    ancestors, which are revisons that are missing one or more of their\n"
12940
"    ancestors."
12941
msgstr ""
12942
12943
#: en/help_topics/glossary.txt:52
12944
msgid ""
12945
"    A cherrypick in Bazaar is a bit more advanced than the cherrypick with "
12946
"some\n"
12947
"    other revision control systems, in that a three way merge is performed\n"
12948
"    rather than a strict delta between revisions."
12949
msgstr ""
12950
12951
#: en/help_topics/glossary.txt:56
12952
msgid ""
12953
"    The downside to cherrypicking is that Bazaar does not track "
12954
"cherrypicked\n"
12955
"    revisions, although this feature is firmly on the wish list."
12956
msgstr ""
12957
12958
#: en/help_topics/glossary.txt:59
12959
msgid ""
12960
"    A common use-case for cherrypicking is the back-porting of fixes from "
12961
"an\n"
12962
"    ongoing branch of development to stable release branches."
12963
msgstr ""
12964
12965
#: en/help_topics/glossary.txt:62
12966
msgid ""
12967
"  checkout\n"
12968
"    A checkout is essentially a working tree that is linked to a branch at "
12969
"a\n"
12970
"    different location."
12971
msgstr ""
12972
12973
#: en/help_topics/glossary.txt:66
12974
msgid ""
12975
"    Checkouts also have local branches, which function as a local cache. "
12976
"This\n"
12977
"    means that checkouts can be used effectively even with branches that "
12978
"are\n"
12979
"    accessed through the Internet. Normal checkouts are sometimes called\n"
12980
"    heavyweight checkouts to distinguish them from lightweight checkouts."
12981
msgstr ""
12982
12983
#: en/help_topics/glossary.txt:71
12984
msgid ""
12985
"    A lightweight checkout is a related construct that lacks the local "
12986
"branch.\n"
12987
"    Lightweight checkouts are smaller, but require fast access to the "
12988
"branch,\n"
12989
"    such as on a LAN or local hard disk."
12990
msgstr ""
12991
12992
#: en/help_topics/glossary.txt:75
12993
msgid ""
12994
"    Checkouts provide a location for people to hack on code and commit. Once "
12995
"a\n"
12996
"    user commits, the associated branch is updated with a new revision that\n"
12997
"    represents the changes for the commit."
12998
msgstr ""
12999
13000
#: en/help_topics/glossary.txt:79
13001
msgid ""
13002
"  dag\n"
13003
"    Directed Acyclic Graph. The graph of revisions where each revision is\n"
13004
"    connected to its parent revisions."
13005
msgstr ""
13006
13007
#: en/help_topics/glossary.txt:83
13008
msgid ""
13009
"  delta\n"
13010
"    A delta is defined as the changes between two revisions. Any RCS that "
13011
"has\n"
13012
"    revisions typically builds a delta in order to perform a diff"
13013
msgstr ""
13014
13015
#: en/help_topics/glossary.txt:87
13016
msgid ""
13017
"  merge\n"
13018
"    Merging is the process of applying all the changes that were introduced "
13019
"in\n"
13020
"    one branch into another branch, without applying any changes that are\n"
13021
"    already common to both branches. Sometimes a user will not want all of "
13022
"the\n"
13023
"    changes. For these cases, a user may instead prefer a cherrypick, which\n"
13024
"    gives the user the option to apply only those revisions that are wanted."
13025
msgstr ""
13026
13027
#: en/help_topics/glossary.txt:94
13028
msgid ""
13029
"    As well as altering the working tree, bzr's merge command will also get "
13030
"all\n"
13031
"    of the revisions that a branch has, and add metadata indicating that a\n"
13032
"    merge has been performed."
13033
msgstr ""
13034
13035
#: en/help_topics/glossary.txt:98
13036
msgid ""
13037
"  merge, criss-cross\n"
13038
"    A failed type of merge caused by two branches merging each other at the\n"
13039
"    same time."
13040
msgstr ""
13041
13042
#: en/help_topics/glossary.txt:102
13043
msgid ""
13044
"  nuclear launch codes\n"
13045
"    Nuclear launch codes are an example of data that has been committed to "
13046
"a\n"
13047
"    branch that must be removed at all costs. Imagine if one had access to "
13048
"the\n"
13049
"    launch codes for a nuclear warhead, accidentally committed them to a "
13050
"branch\n"
13051
"    and then pushed the branch to a public place."
13052
msgstr ""
13053
13054
#: en/help_topics/glossary.txt:108
13055
msgid ""
13056
"    In real world situations most people do not have access to nuclear\n"
13057
"    launchcodes. Users may have data such as passwords, proprietary code "
13058
"and\n"
13059
"    other sensitive data. Accidental release of this type of data is\n"
13060
"    potentially damaging to the branch owner -- perhaps damaging enough "
13061
"that\n"
13062
"    the developer may hope for a nuclear disaster!"
13063
msgstr ""
13064
13065
#: en/help_topics/glossary.txt:114
13066
msgid ""
13067
"    A user dealing with a nuclear launch code problem needs specific data "
13068
"in\n"
13069
"    the branch to be exised at all costs and in a rapid manner."
13070
msgstr ""
13071
13072
#: en/help_topics/glossary.txt:117
13073
msgid ""
13074
"  repository\n"
13075
"    A library of revisions for branches."
13076
msgstr ""
13077
13078
#: en/help_topics/glossary.txt:120
13079
msgid ""
13080
"  revision\n"
13081
"    A revision is one state of the code."
13082
msgstr ""
13083
13084
#: en/help_topics/glossary.txt:123
13085
msgid ""
13086
"    bzr is snapshot based, meaning that conceptually it stores the whole "
13087
"state\n"
13088
"    of the tree at each revision. This is in contrast to changeset based, "
13089
"where\n"
13090
"    a revision refers to just the changes that were made in that revision. "
13091
"I\n"
13092
"    said \"conceptually\", as internally bzr uses delta compression to "
13093
"reduce the\n"
13094
"    amount of data that it stores, and so may only record the changes in a\n"
13095
"    revision. However you must always think of a revision as referring to a\n"
13096
"    whole snapshot."
13097
msgstr ""
13098
13099
#: en/help_topics/glossary.txt:131
13100
msgid ""
13101
"    A revision also contains some metadata. In particular it stores the\n"
13102
"    committer, and the timestamp when the commit was made, the log message "
13103
"that\n"
13104
"    was given, and the nick of the branch on which the commit was made. It "
13105
"also\n"
13106
"    stores pointers to the parent revisions, i.e. the revision preceeding "
13107
"it,\n"
13108
"    and the tip revisions of any branches that were merged. Lastly it stores "
13109
"a\n"
13110
"    number of revision properties, these is extra information that can be\n"
13111
"    stored with the revision and is immutable, some uses of them are to "
13112
"store\n"
13113
"    the author of the patch if it wasn't the committer (when given using "
13114
"the\n"
13115
"    --author option of bzr commit), or to store information about the bugs\n"
13116
"    fixed in that revision if using the bug-tracker integration."
13117
msgstr ""
13118
13119
#: en/help_topics/glossary.txt:142
13120
msgid ""
13121
"    A revision also has a name, referred to as a revision id. This is a\n"
13122
"    globally unique identifier for the revision so that it can be referred "
13123
"to\n"
13124
"    without ambiguity. This means that two revisions are identical, if, and\n"
13125
"    only if, they have the same revision id."
13126
msgstr ""
13127
13128
#: en/help_topics/glossary.txt:147
13129
msgid ""
13130
"    A revision may also be referred to using a revision number, however this "
13131
"is\n"
13132
"    not a globally unique identifier, meaning that revision 14 of your "
13133
"branch\n"
13134
"    may not be the same as revision 14 of my branch, even if they are the "
13135
"same\n"
13136
"    project. The only way to know if they are the same revision is to "
13137
"compare\n"
13138
"    the revision ids. This means that when talking about a revision you "
13139
"must\n"
13140
"    either use it's revision id, or also explain which branch you are "
13141
"referring\n"
13142
"    to when you specify a revision number."
13143
msgstr ""
13144
13145
#: en/help_topics/glossary.txt:155
13146
msgid ""
13147
"    Tags point at a revision, and so they may also be used to when referring "
13148
"to\n"
13149
"    a commit, but again, two different branches may have the same tag name\n"
13150
"    pointing to two different revisions, and so you should also give the "
13151
"branch\n"
13152
"    to which you are referring when stating a tag name."
13153
msgstr ""
13154
13155
#: en/help_topics/glossary.txt:160
13156
msgid ""
13157
"  revision, ancestor\n"
13158
"    An ancestor is one of any of the revisions that this revision is based "
13159
"on.\n"
13160
"    The immediately prior revision has a special name, the parent revision."
13161
msgstr ""
13162
13163
#: en/help_topics/glossary.txt:164
13164
msgid ""
13165
"  revision, ghost\n"
13166
"    A ghost :term:`revision`, also called a ghost, is a revision that a\n"
13167
"    :term:`branch` knows about but does not have."
13168
msgstr ""
13169
13170
#: en/help_topics/glossary.txt:168
13171
msgid ""
13172
"    Ghost revisions can occur in unusual situations such as the migration "
13173
"of\n"
13174
"    branches from foreign revision control systems into Bazaar format."
13175
msgstr ""
13176
13177
#: en/help_topics/glossary.txt:171
13178
msgid ""
13179
"    Ghost revisions can be scary the first time that a user bumps into "
13180
"them.\n"
13181
"    Thankfully though, revision ghosts are just like real ghosts (such as "
13182
"they\n"
13183
"    are) in that their discorporeal existence typically causes little, if "
13184
"any,\n"
13185
"    harm."
13186
msgstr ""
13187
13188
#: en/help_topics/glossary.txt:176
13189
msgid ""
13190
"  revision, parent\n"
13191
"    The revision that comes immediately prior to this revision."
13192
msgstr ""
13193
13194
#: en/help_topics/glossary.txt:179
13195
msgid ""
13196
"  shared repository\n"
13197
"    A shared repository is similar to the traditional concept of a "
13198
"repository\n"
13199
"    in other VCSs like CVS and Subversion. For example, in Subversion you "
13200
"have\n"
13201
"    a remote repository, which is where all of the history is stored, and\n"
13202
"    locally you don't have any history information, only a checkout of the\n"
13203
"    working tree files. Note that \"Shared\" in this context means shared "
13204
"between\n"
13205
"    branches. It *may* be shared between people, but standalone branches\n"
13206
"    can also be shared between people."
13207
msgstr ""
13208
13209
#: en/help_topics/glossary.txt:188
13210
msgid ""
13211
"    In Breezy_ terms, a \"Shared Repository\" is a location where multiple\n"
13212
"    branches can **share** their revision history information. In order to\n"
13213
"    support decentralized workflows, it is possible for every branch to\n"
13214
"    store its own revision history information. But this is often\n"
13215
"    inefficient, since related branches share history, and they might as\n"
13216
"    well share the storage as well."
13217
msgstr ""
13218
13219
#: en/help_topics/glossary.txt:195
13220
msgid ""
13221
"  tag\n"
13222
"    A tag is a nickname for a particular :term:`revision`. The typical use "
13223
"is to mark a\n"
13224
"    release of the software so you can easily refer to it later."
13225
msgstr ""
13226
13227
#: en/help_topics/glossary.txt:199
13228
msgid ""
13229
"  working tree\n"
13230
"    A working tree is a directory with project files that a user can edit."
13231
msgstr ""
13232
13233
#: en/help_topics/glossary.txt:202
13234
msgid ""
13235
"    Unlike a normal directory, a working tree is associated with a\n"
13236
"    :term:`branch`. The working tree is the space in which commands such as\n"
13237
"    commit and revert operate.\n"
13238
msgstr ""
13239
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13240
#: en/help_topics/hooks.txt:1
13241
msgid ""
13242
"\n"
13243
"Hooks\n"
13244
"====="
13245
msgstr ""
13246
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13247
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13248
msgid ""
13249
"Introduction\n"
13250
"------------"
13251
msgstr ""
13252
13253
#: en/help_topics/hooks.txt:8
13254
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
13255
msgstr ""
13256
13257
#: en/help_topics/hooks.txt:10
13258
msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
13259
msgstr ""
13260
13261
#: en/help_topics/hooks.txt:12
13262
msgid ""
13263
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
13264
msgstr ""
13265
13266
#: en/help_topics/hooks.txt:14
13267
msgid ""
13268
"The class that contains each hook is given before the hooks it supplies. "
13269
"For\n"
13270
"instance, BranchHooks as the class is the hooks class for\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13271
"`breezy.branch.Branch.hooks`."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13272
msgstr ""
13273
13274
#: en/help_topics/hooks.txt:18
13275
msgid ""
13276
"Each description also indicates whether the hook runs on the client (the\n"
13277
"machine where bzr was invoked) or the server (the machine addressed by\n"
13278
"the branch URL).  These may be, but are not necessarily, the same machine."
13279
msgstr ""
13280
13281
#: en/help_topics/hooks.txt:22
13282
msgid ""
13283
"Plugins (including hooks) are run on the server if all of these is true:"
13284
msgstr ""
13285
13286
#: en/help_topics/hooks.txt:24
13287
msgid ""
13288
"  * The connection is via a smart server (accessed with a URL starting with\n"
13289
"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
13290
"\"http://\"\n"
13291
"    URL when a smart server is available via HTTP)."
13292
msgstr ""
13293
13294
#: en/help_topics/hooks.txt:28
13295
msgid ""
13296
"  * The hook is either server specific or part of general infrastructure "
13297
"rather\n"
13298
"    than client specific code (such as commit)."
13299
msgstr ""
13300
13301
#: en/help_topics/hooks.txt:31
13302
msgid ""
13303
"\n"
13304
"BranchHooks\n"
13305
"-----------"
13306
msgstr ""
13307
13308
#: en/help_topics/hooks.txt:35
13309
msgid ""
13310
"automatic_tag_name\n"
13311
"~~~~~~~~~~~~~~~~~~"
13312
msgstr ""
13313
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13314
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
7185.1.1 by Jelmer Vernooij
Update pot file.
13315
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:315
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13316
msgid "Introduced in: 2.2"
13317
msgstr ""
13318
13319
#: en/help_topics/hooks.txt:40
13320
msgid ""
13321
"Called to determine an automatic tag name for a revision.\n"
13322
"automatic_tag_name is called with (branch, revision_id) and should\n"
13323
"return a tag name or None if no tag name could be determined. The\n"
13324
"first non-None tag name returned will be used."
13325
msgstr ""
13326
13327
#: en/help_topics/hooks.txt:45
13328
msgid ""
13329
"open\n"
13330
"~~~~"
13331
msgstr ""
13332
7185.1.1 by Jelmer Vernooij
Update pot file.
13333
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:346
13334
#: en/help_topics/hooks.txt:360
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13335
msgid "Introduced in: 1.8"
13336
msgstr ""
13337
13338
#: en/help_topics/hooks.txt:50
13339
msgid ""
13340
"Called with the Branch object that has been opened after a branch is\n"
13341
"opened."
13342
msgstr ""
13343
13344
#: en/help_topics/hooks.txt:53
13345
msgid ""
13346
"post_branch_init\n"
13347
"~~~~~~~~~~~~~~~~"
13348
msgstr ""
13349
13350
#: en/help_topics/hooks.txt:58
13351
msgid ""
13352
"Called after new branch initialization completes. post_branch_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13353
"called with a breezy.branch.BranchInitHookParams. Note that init,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13354
"branch and checkout (both heavyweight and lightweight) will all\n"
13355
"trigger this hook."
13356
msgstr ""
13357
13358
#: en/help_topics/hooks.txt:63
13359
msgid ""
13360
"post_change_branch_tip\n"
13361
"~~~~~~~~~~~~~~~~~~~~~~"
13362
msgstr ""
13363
7185.1.1 by Jelmer Vernooij
Update pot file.
13364
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:474
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13365
msgid "Introduced in: 1.4"
13366
msgstr ""
13367
13368
#: en/help_topics/hooks.txt:68
13369
msgid ""
13370
"Called in bzr client and server after a change to the tip of a branch\n"
13371
"is made. post_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13372
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13373
"uncommit will all trigger this hook."
13374
msgstr ""
13375
7185.1.1 by Jelmer Vernooij
Update pot file.
13376
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:445
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13377
msgid ""
13378
"post_commit\n"
13379
"~~~~~~~~~~~"
13380
msgstr ""
13381
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13382
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
13383
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13384
msgid "Introduced in: 0.15"
13385
msgstr ""
13386
13387
#: en/help_topics/hooks.txt:78
13388
msgid ""
13389
"Called in the bzr client after a commit has completed. post_commit is\n"
13390
"called with (local, master, old_revno, old_revid, new_revno,\n"
13391
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
13392
"branch."
13393
msgstr ""
13394
13395
#: en/help_topics/hooks.txt:83
13396
msgid ""
13397
"post_pull\n"
13398
"~~~~~~~~~"
13399
msgstr ""
13400
13401
#: en/help_topics/hooks.txt:88
13402
msgid ""
13403
"Called after a pull operation completes. post_pull is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13404
"breezy.branch.PullResult object and only runs in the bzr client."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13405
msgstr ""
13406
13407
#: en/help_topics/hooks.txt:91
13408
msgid ""
13409
"post_push\n"
13410
"~~~~~~~~~"
13411
msgstr ""
13412
13413
#: en/help_topics/hooks.txt:96
13414
msgid ""
13415
"Called after a push operation completes. post_push is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13416
"breezy.branch.BranchPushResult object and only runs in the bzr client."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13417
msgstr ""
13418
13419
#: en/help_topics/hooks.txt:99
13420
msgid ""
13421
"post_switch\n"
13422
"~~~~~~~~~~~"
13423
msgstr ""
13424
13425
#: en/help_topics/hooks.txt:104
13426
msgid ""
13427
"Called after a checkout switches branch. post_switch is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13428
"breezy.branch.SwitchHookParams."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13429
msgstr ""
13430
13431
#: en/help_topics/hooks.txt:107
13432
msgid ""
13433
"post_uncommit\n"
13434
"~~~~~~~~~~~~~"
13435
msgstr ""
13436
13437
#: en/help_topics/hooks.txt:112
13438
msgid ""
13439
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
13440
"called with (local, master, old_revno, old_revid, new_revno,\n"
13441
"new_revid) where local is the local branch or None, master is the\n"
13442
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
13443
"of None."
13444
msgstr ""
13445
13446
#: en/help_topics/hooks.txt:118
13447
msgid ""
13448
"pre_change_branch_tip\n"
13449
"~~~~~~~~~~~~~~~~~~~~~"
13450
msgstr ""
13451
13452
#: en/help_topics/hooks.txt:121
13453
msgid "Introduced in: 1.6"
13454
msgstr ""
13455
13456
#: en/help_topics/hooks.txt:123
13457
msgid ""
13458
"Called in bzr client and server before a change to the tip of a branch\n"
13459
"is made. pre_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13460
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13461
"uncommit will all trigger this hook."
13462
msgstr ""
13463
13464
#: en/help_topics/hooks.txt:128
13465
msgid ""
13466
"pre_commit\n"
13467
"~~~~~~~~~~"
13468
msgstr ""
13469
13470
#: en/help_topics/hooks.txt:131
13471
msgid "Introduced in: 0.91"
13472
msgstr ""
13473
13474
#: en/help_topics/hooks.txt:133
13475
msgid ""
13476
"Called after a commit is calculated but before it is completed.\n"
13477
"pre_commit is called with (local, master, old_revno, old_revid,\n"
13478
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
13479
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
13480
"TreeDelta object describing changes from the basis revision. hooks\n"
13481
"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
13482
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
13483
"tree."
13484
msgstr ""
13485
13486
#: en/help_topics/hooks.txt:142
13487
msgid ""
13488
"transform_fallback_location\n"
13489
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
13490
msgstr ""
13491
6504.1.1 by Vincent Ladeuil
Update translation template
13492
#: en/help_topics/hooks.txt:145
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13493
msgid "Introduced in: 1.9"
13494
msgstr ""
13495
6504.1.1 by Vincent Ladeuil
Update translation template
13496
#: en/help_topics/hooks.txt:147
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13497
msgid ""
13498
"Called when a stacked branch is activating its fallback locations.\n"
13499
"transform_fallback_location is called with (branch, url), and should\n"
13500
"return a new url. Returning the same url allows it to be used as-is,\n"
13501
"returning a different one can be used to cause the branch to stack on\n"
13502
"a closer copy of that fallback_location. Note that the branch cannot\n"
13503
"have history accessing methods called on it during this hook because\n"
13504
"the fallback locations have not been activated. When there are\n"
13505
"multiple hooks installed for transform_fallback_location, all are\n"
13506
"called with the url returned from the previous hook.The order is\n"
13507
"however undefined."
13508
msgstr ""
13509
6504.1.1 by Vincent Ladeuil
Update translation template
13510
#: en/help_topics/hooks.txt:158
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13511
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
13512
"SmartClientHooks\n"
13513
"----------------"
13514
msgstr ""
13515
13516
#: en/help_topics/hooks.txt:161
13517
msgid ""
13518
"call\n"
13519
"~~~~"
13520
msgstr ""
13521
13522
#: en/help_topics/hooks.txt:164
13523
msgid "Introduced in: unknown"
13524
msgstr ""
13525
13526
#: en/help_topics/hooks.txt:166
13527
msgid ""
13528
"Called when the smart client is submitting a request to the smart\n"
13529
"server. Called with a breezy.bzr.smart.client.CallHookParams object.\n"
13530
"Streaming request bodies, and responses, are not accessible."
13531
msgstr ""
13532
13533
#: en/help_topics/hooks.txt:170
13534
msgid ""
13535
"SmartServerHooks\n"
13536
"----------------"
13537
msgstr ""
13538
13539
#: en/help_topics/hooks.txt:173
13540
msgid ""
13541
"server_exception\n"
13542
"~~~~~~~~~~~~~~~~"
13543
msgstr ""
13544
13545
#: en/help_topics/hooks.txt:176 en/help_topics/hooks.txt:274
13546
#: en/help_topics/hooks.txt:282 en/help_topics/hooks.txt:289
13547
#: en/help_topics/hooks.txt:297 en/help_topics/hooks.txt:304
13548
#: en/help_topics/hooks.txt:426
13549
msgid "Introduced in: 2.4"
13550
msgstr ""
13551
13552
#: en/help_topics/hooks.txt:178
13553
msgid ""
13554
"Called by the bzr server when an exception occurs. server_exception is\n"
13555
"called with the sys.exc_info() tuple return true for the hook if the\n"
13556
"exception has been handled, in which case the server will exit\n"
13557
"normally."
13558
msgstr ""
13559
13560
#: en/help_topics/hooks.txt:183
13561
msgid ""
13562
"server_started\n"
13563
"~~~~~~~~~~~~~~"
13564
msgstr ""
13565
13566
#: en/help_topics/hooks.txt:186 en/help_topics/hooks.txt:205
13567
msgid "Introduced in: 0.16"
13568
msgstr ""
13569
13570
#: en/help_topics/hooks.txt:188
13571
msgid ""
13572
"Called by the bzr server when it starts serving a directory.\n"
13573
"server_started is called with (backing urls, public url), where\n"
13574
"backing_url is a list of URLs giving the server-specific directory\n"
13575
"locations, and public_url is the public URL for the directory being\n"
13576
"served."
13577
msgstr ""
13578
13579
#: en/help_topics/hooks.txt:194
13580
msgid ""
13581
"server_started_ex\n"
13582
"~~~~~~~~~~~~~~~~~"
13583
msgstr ""
13584
13585
#: en/help_topics/hooks.txt:197 en/help_topics/hooks.txt:226
13586
#: en/help_topics/hooks.txt:238 en/help_topics/hooks.txt:247
13587
msgid "Introduced in: 1.17"
13588
msgstr ""
13589
13590
#: en/help_topics/hooks.txt:199
13591
msgid ""
13592
"Called by the bzr server when it starts serving a directory.\n"
13593
"server_started is called with (backing_urls, server_obj)."
13594
msgstr ""
13595
13596
#: en/help_topics/hooks.txt:202
13597
msgid ""
13598
"server_stopped\n"
13599
"~~~~~~~~~~~~~~"
13600
msgstr ""
13601
13602
#: en/help_topics/hooks.txt:207
13603
msgid ""
13604
"Called by the bzr server when it stops serving a directory.\n"
13605
"server_stopped is called with the same parameters as the\n"
13606
"server_started hook: (backing_urls, public_url)."
13607
msgstr ""
13608
13609
#: en/help_topics/hooks.txt:211
13610
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13611
"CommandHooks\n"
13612
"------------"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13613
msgstr ""
13614
7185.1.1 by Jelmer Vernooij
Update pot file.
13615
#: en/help_topics/hooks.txt:214
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13616
msgid ""
13617
"extend_command\n"
13618
"~~~~~~~~~~~~~~"
13619
msgstr ""
13620
7185.1.1 by Jelmer Vernooij
Update pot file.
13621
#: en/help_topics/hooks.txt:217
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13622
msgid "Introduced in: 1.13"
13623
msgstr ""
13624
7185.1.1 by Jelmer Vernooij
Update pot file.
13625
#: en/help_topics/hooks.txt:219
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13626
msgid ""
13627
"Called after creating a command object to allow modifications such as\n"
13628
"adding or removing options, docs etc. Called with the new\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13629
"breezy.commands.Command object."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13630
msgstr ""
13631
7185.1.1 by Jelmer Vernooij
Update pot file.
13632
#: en/help_topics/hooks.txt:223
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13633
msgid ""
13634
"get_command\n"
13635
"~~~~~~~~~~~"
13636
msgstr ""
13637
7185.1.1 by Jelmer Vernooij
Update pot file.
13638
#: en/help_topics/hooks.txt:228
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13639
msgid ""
13640
"Called when creating a single command. Called with (cmd_or_None,\n"
13641
"command_name). get_command should either return the cmd_or_None\n"
13642
"parameter, or a replacement Command object that should be used for the\n"
13643
"command. Note that the Command.hooks hooks are core infrastructure.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13644
"Many users will prefer to use breezy.commands.register_command or\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13645
"plugin_cmds.register_lazy."
13646
msgstr ""
13647
7185.1.1 by Jelmer Vernooij
Update pot file.
13648
#: en/help_topics/hooks.txt:235
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13649
msgid ""
13650
"get_missing_command\n"
13651
"~~~~~~~~~~~~~~~~~~~"
13652
msgstr ""
13653
7185.1.1 by Jelmer Vernooij
Update pot file.
13654
#: en/help_topics/hooks.txt:240
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13655
msgid ""
13656
"Called when creating a single command if no command could be found.\n"
13657
"Called with (command_name). get_missing_command should either return\n"
13658
"None, or a Command object to be used for the command."
13659
msgstr ""
13660
7185.1.1 by Jelmer Vernooij
Update pot file.
13661
#: en/help_topics/hooks.txt:244
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13662
msgid ""
13663
"list_commands\n"
13664
"~~~~~~~~~~~~~"
13665
msgstr ""
13666
7185.1.1 by Jelmer Vernooij
Update pot file.
13667
#: en/help_topics/hooks.txt:249
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13668
msgid ""
13669
"Called when enumerating commands. Called with a set of cmd_name\n"
13670
"strings for all the commands found so far. This set  is safe to mutate\n"
13671
"- e.g. to remove a command. list_commands should return the updated\n"
13672
"set of command names."
13673
msgstr ""
13674
7185.1.1 by Jelmer Vernooij
Update pot file.
13675
#: en/help_topics/hooks.txt:254
6504.1.1 by Vincent Ladeuil
Update translation template
13676
msgid ""
13677
"post_command\n"
13678
"~~~~~~~~~~~~"
13679
msgstr ""
13680
7185.1.1 by Jelmer Vernooij
Update pot file.
13681
#: en/help_topics/hooks.txt:257 en/help_topics/hooks.txt:264
6504.1.1 by Vincent Ladeuil
Update translation template
13682
msgid "Introduced in: 2.6"
13683
msgstr ""
13684
7185.1.1 by Jelmer Vernooij
Update pot file.
13685
#: en/help_topics/hooks.txt:259
6504.1.1 by Vincent Ladeuil
Update translation template
13686
msgid "Called after executing a command. Called with the command object."
13687
msgstr ""
13688
7185.1.1 by Jelmer Vernooij
Update pot file.
13689
#: en/help_topics/hooks.txt:261
6504.1.1 by Vincent Ladeuil
Update translation template
13690
msgid ""
13691
"pre_command\n"
13692
"~~~~~~~~~~~"
13693
msgstr ""
13694
7185.1.1 by Jelmer Vernooij
Update pot file.
13695
#: en/help_topics/hooks.txt:266
6504.1.1 by Vincent Ladeuil
Update translation template
13696
msgid "Called prior to executing a command. Called with the command object."
13697
msgstr ""
13698
7185.1.1 by Jelmer Vernooij
Update pot file.
13699
#: en/help_topics/hooks.txt:268
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13700
msgid ""
13701
"_ConfigHooks\n"
13702
"------------"
13703
msgstr ""
13704
7185.1.1 by Jelmer Vernooij
Update pot file.
13705
#: en/help_topics/hooks.txt:271
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13706
msgid ""
13707
"get\n"
13708
"~~~"
13709
msgstr ""
13710
7185.1.1 by Jelmer Vernooij
Update pot file.
13711
#: en/help_topics/hooks.txt:276
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13712
msgid ""
13713
"Invoked when a config option is read. The signature is (stack, name,\n"
13714
"value)."
13715
msgstr ""
13716
7185.1.1 by Jelmer Vernooij
Update pot file.
13717
#: en/help_topics/hooks.txt:279
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13718
msgid ""
13719
"load\n"
13720
"~~~~"
13721
msgstr ""
13722
7185.1.1 by Jelmer Vernooij
Update pot file.
13723
#: en/help_topics/hooks.txt:284
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13724
msgid "Invoked when a config store is loaded. The signature is (store)."
13725
msgstr ""
13726
7185.1.1 by Jelmer Vernooij
Update pot file.
13727
#: en/help_topics/hooks.txt:286
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13728
msgid ""
13729
"remove\n"
13730
"~~~~~~"
13731
msgstr ""
13732
7185.1.1 by Jelmer Vernooij
Update pot file.
13733
#: en/help_topics/hooks.txt:291
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13734
msgid ""
13735
"Invoked when a config option is removed. The signature is (stack,\n"
13736
"name)."
13737
msgstr ""
13738
7185.1.1 by Jelmer Vernooij
Update pot file.
13739
#: en/help_topics/hooks.txt:294
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13740
msgid ""
13741
"save\n"
13742
"~~~~"
13743
msgstr ""
13744
7185.1.1 by Jelmer Vernooij
Update pot file.
13745
#: en/help_topics/hooks.txt:299
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13746
msgid "Invoked when a config store is saved. The signature is (store)."
13747
msgstr ""
13748
7185.1.1 by Jelmer Vernooij
Update pot file.
13749
#: en/help_topics/hooks.txt:301
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13750
msgid ""
13751
"set\n"
13752
"~~~"
13753
msgstr ""
13754
7185.1.1 by Jelmer Vernooij
Update pot file.
13755
#: en/help_topics/hooks.txt:306
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13756
msgid ""
13757
"Invoked when a config option is set. The signature is (stack, name,\n"
13758
"value)."
13759
msgstr ""
13760
7185.1.1 by Jelmer Vernooij
Update pot file.
13761
#: en/help_topics/hooks.txt:309
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13762
msgid ""
13763
"ControlDirHooks\n"
13764
"---------------"
13765
msgstr ""
13766
7185.1.1 by Jelmer Vernooij
Update pot file.
13767
#: en/help_topics/hooks.txt:312
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13768
msgid ""
13769
"post_repo_init\n"
13770
"~~~~~~~~~~~~~~"
13771
msgstr ""
13772
7185.1.1 by Jelmer Vernooij
Update pot file.
13773
#: en/help_topics/hooks.txt:317
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13774
msgid ""
13775
"Invoked after a repository has been initialized. post_repo_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13776
"called with a breezy.controldir.RepoInitHookParams."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13777
msgstr ""
13778
7185.1.1 by Jelmer Vernooij
Update pot file.
13779
#: en/help_topics/hooks.txt:320
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13780
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13781
"pre_open\n"
13782
"~~~~~~~~"
13783
msgstr ""
13784
7185.1.1 by Jelmer Vernooij
Update pot file.
13785
#: en/help_topics/hooks.txt:323
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13786
msgid "Introduced in: 1.14"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13787
msgstr ""
13788
7185.1.1 by Jelmer Vernooij
Update pot file.
13789
#: en/help_topics/hooks.txt:325
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13790
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13791
"Invoked before attempting to open a ControlDir with the transport that\n"
13792
"the open will use."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13793
msgstr ""
13794
7185.1.1 by Jelmer Vernooij
Update pot file.
13795
#: en/help_topics/hooks.txt:328
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13796
msgid ""
13797
"InfoHooks\n"
13798
"---------"
13799
msgstr ""
13800
7185.1.1 by Jelmer Vernooij
Update pot file.
13801
#: en/help_topics/hooks.txt:331
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13802
msgid ""
13803
"repository\n"
13804
"~~~~~~~~~~"
13805
msgstr ""
13806
7185.1.1 by Jelmer Vernooij
Update pot file.
13807
#: en/help_topics/hooks.txt:334 en/help_topics/hooks.txt:353
6504.1.1 by Vincent Ladeuil
Update translation template
13808
#: en/help_topics/hooks.txt:524
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13809
msgid "Introduced in: 1.15"
13810
msgstr ""
13811
7185.1.1 by Jelmer Vernooij
Update pot file.
13812
#: en/help_topics/hooks.txt:336
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13813
msgid ""
13814
"Invoked when displaying the statistics for a repository. repository is\n"
13815
"called with a statistics dictionary as returned by the repository and\n"
13816
"a file-like object to write to."
13817
msgstr ""
13818
7185.1.1 by Jelmer Vernooij
Update pot file.
13819
#: en/help_topics/hooks.txt:340
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13820
msgid ""
13821
"LockHooks\n"
13822
"---------"
13823
msgstr ""
13824
7185.1.1 by Jelmer Vernooij
Update pot file.
13825
#: en/help_topics/hooks.txt:343
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13826
msgid ""
13827
"lock_acquired\n"
13828
"~~~~~~~~~~~~~"
13829
msgstr ""
13830
7185.1.1 by Jelmer Vernooij
Update pot file.
13831
#: en/help_topics/hooks.txt:348
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13832
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
13833
msgstr ""
13834
7185.1.1 by Jelmer Vernooij
Update pot file.
13835
#: en/help_topics/hooks.txt:350
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13836
msgid ""
13837
"lock_broken\n"
13838
"~~~~~~~~~~~"
13839
msgstr ""
13840
7185.1.1 by Jelmer Vernooij
Update pot file.
13841
#: en/help_topics/hooks.txt:355
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13842
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
13843
msgstr ""
13844
7185.1.1 by Jelmer Vernooij
Update pot file.
13845
#: en/help_topics/hooks.txt:357
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13846
msgid ""
13847
"lock_released\n"
13848
"~~~~~~~~~~~~~"
13849
msgstr ""
13850
7185.1.1 by Jelmer Vernooij
Update pot file.
13851
#: en/help_topics/hooks.txt:362
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13852
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
13853
msgstr ""
13854
7185.1.1 by Jelmer Vernooij
Update pot file.
13855
#: en/help_topics/hooks.txt:364
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13856
msgid ""
13857
"MergeHooks\n"
13858
"----------"
13859
msgstr ""
13860
7185.1.1 by Jelmer Vernooij
Update pot file.
13861
#: en/help_topics/hooks.txt:367
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13862
msgid ""
13863
"merge_file_content\n"
13864
"~~~~~~~~~~~~~~~~~~"
13865
msgstr ""
13866
7185.1.1 by Jelmer Vernooij
Update pot file.
13867
#: en/help_topics/hooks.txt:370
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13868
msgid "Introduced in: 2.1"
13869
msgstr ""
13870
7185.1.1 by Jelmer Vernooij
Update pot file.
13871
#: en/help_topics/hooks.txt:372
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13872
msgid ""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13873
"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
13874
"object when starting a merge. Should return either None or a subclass\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13875
"of ``breezy.merge.AbstractPerFileMerger``. Such objects will then be\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13876
"called per file that needs to be merged (including when one side has\n"
13877
"deleted the file and the other has changed it). See the\n"
13878
"AbstractPerFileMerger API docs for details on how it is used by merge."
13879
msgstr ""
13880
7185.1.1 by Jelmer Vernooij
Update pot file.
13881
#: en/help_topics/hooks.txt:379
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13882
msgid ""
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13883
"post_merge\n"
13884
"~~~~~~~~~~"
13885
msgstr ""
13886
7185.1.1 by Jelmer Vernooij
Update pot file.
13887
#: en/help_topics/hooks.txt:382 en/help_topics/hooks.txt:390
13888
#: en/help_topics/hooks.txt:440 en/help_topics/hooks.txt:458
13889
#: en/help_topics/hooks.txt:466 en/help_topics/hooks.txt:512
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13890
msgid "Introduced in: 2.5"
13891
msgstr ""
13892
7185.1.1 by Jelmer Vernooij
Update pot file.
13893
#: en/help_topics/hooks.txt:384
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13894
msgid ""
13895
"Called after a merge. Receives a Merger object as the single argument.\n"
13896
"The return value is ignored."
13897
msgstr ""
13898
7185.1.1 by Jelmer Vernooij
Update pot file.
13899
#: en/help_topics/hooks.txt:387
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13900
msgid ""
13901
"pre_merge\n"
13902
"~~~~~~~~~"
13903
msgstr ""
13904
7185.1.1 by Jelmer Vernooij
Update pot file.
13905
#: en/help_topics/hooks.txt:392
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13906
msgid ""
13907
"Called before a merge. Receives a Merger object as the single\n"
13908
"argument."
13909
msgstr ""
13910
7185.1.1 by Jelmer Vernooij
Update pot file.
13911
#: en/help_topics/hooks.txt:395
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13912
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13913
"MergeDirectiveHooks\n"
13914
"-------------------"
13915
msgstr ""
13916
7185.1.1 by Jelmer Vernooij
Update pot file.
13917
#: en/help_topics/hooks.txt:398
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13918
msgid ""
13919
"merge_request_body\n"
13920
"~~~~~~~~~~~~~~~~~~"
13921
msgstr ""
13922
7185.1.1 by Jelmer Vernooij
Update pot file.
13923
#: en/help_topics/hooks.txt:401
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13924
msgid "Introduced in: 1.15.0"
13925
msgstr ""
13926
7185.1.1 by Jelmer Vernooij
Update pot file.
13927
#: en/help_topics/hooks.txt:403
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13928
msgid ""
13929
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
13930
"request.  Callbacks must return a body.  If more than one callback is\n"
13931
"registered, the output of one callback is provided to the next."
13932
msgstr ""
13933
7185.1.1 by Jelmer Vernooij
Update pot file.
13934
#: en/help_topics/hooks.txt:407
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13935
msgid ""
13936
"MessageEditorHooks\n"
13937
"------------------"
13938
msgstr ""
13939
7185.1.1 by Jelmer Vernooij
Update pot file.
13940
#: en/help_topics/hooks.txt:410
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13941
msgid ""
13942
"commit_message_template\n"
13943
"~~~~~~~~~~~~~~~~~~~~~~~"
13944
msgstr ""
13945
7185.1.1 by Jelmer Vernooij
Update pot file.
13946
#: en/help_topics/hooks.txt:413
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13947
msgid "Introduced in: 1.10"
13948
msgstr ""
13949
7185.1.1 by Jelmer Vernooij
Update pot file.
13950
#: en/help_topics/hooks.txt:415
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13951
msgid ""
13952
"Called when a commit message is being generated.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13953
"commit_message_template is called with the breezy.commit.Commit object\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13954
"and the message that is known so far. commit_message_template must\n"
13955
"return a new message to use (which could be the same as it was given).\n"
13956
"When there are multiple hooks registered for commit_message_template,\n"
13957
"they are chained with the result from the first passed into the\n"
13958
"second, and so on."
13959
msgstr ""
13960
7185.1.1 by Jelmer Vernooij
Update pot file.
13961
#: en/help_topics/hooks.txt:423
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13962
msgid ""
13963
"set_commit_message\n"
13964
"~~~~~~~~~~~~~~~~~~"
13965
msgstr ""
13966
7185.1.1 by Jelmer Vernooij
Update pot file.
13967
#: en/help_topics/hooks.txt:428
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13968
msgid ""
13969
"Set a fixed commit message. set_commit_message is called with the\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
13970
"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
13971
"properties by editing commit.builder._revprops) and the message so\n"
13972
"far. set_commit_message must return the message to use or None if it\n"
13973
"should use the message editor as normal."
13974
msgstr ""
13975
7185.1.1 by Jelmer Vernooij
Update pot file.
13976
#: en/help_topics/hooks.txt:434
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13977
msgid ""
13978
"MutableTreeHooks\n"
13979
"----------------"
13980
msgstr ""
13981
7185.1.1 by Jelmer Vernooij
Update pot file.
13982
#: en/help_topics/hooks.txt:437
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13983
msgid ""
13984
"post_build_tree\n"
13985
"~~~~~~~~~~~~~~~"
13986
msgstr ""
13987
7185.1.1 by Jelmer Vernooij
Update pot file.
13988
#: en/help_topics/hooks.txt:442
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13989
msgid ""
13990
"Called after a completely new tree is built. The hook is called with\n"
13991
"the tree as its only argument."
13992
msgstr ""
13993
7185.1.1 by Jelmer Vernooij
Update pot file.
13994
#: en/help_topics/hooks.txt:448
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13995
msgid "Introduced in: 2.0"
13996
msgstr ""
13997
7185.1.1 by Jelmer Vernooij
Update pot file.
13998
#: en/help_topics/hooks.txt:450
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13999
msgid ""
14000
"Called after a commit is performed on a tree. The hook is called with\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
14001
"a breezy.mutabletree.PostCommitHookParams object. The mutable tree the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14002
"commit was performed on is available via the mutable_tree attribute of\n"
14003
"that object."
14004
msgstr ""
14005
7185.1.1 by Jelmer Vernooij
Update pot file.
14006
#: en/help_topics/hooks.txt:455
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14007
msgid ""
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
14008
"post_transform\n"
14009
"~~~~~~~~~~~~~~"
14010
msgstr ""
14011
7185.1.1 by Jelmer Vernooij
Update pot file.
14012
#: en/help_topics/hooks.txt:460
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
14013
msgid ""
14014
"Called after a tree transform has been performed on a tree. The hook\n"
14015
"is called with the tree that is being transformed and the transform."
14016
msgstr ""
14017
7185.1.1 by Jelmer Vernooij
Update pot file.
14018
#: en/help_topics/hooks.txt:463
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
14019
msgid ""
14020
"pre_transform\n"
14021
"~~~~~~~~~~~~~"
14022
msgstr ""
14023
7185.1.1 by Jelmer Vernooij
Update pot file.
14024
#: en/help_topics/hooks.txt:468
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
14025
msgid ""
14026
"Called before a tree transform on this tree. The hook is called with\n"
14027
"the tree that is being transformed and the transform."
14028
msgstr ""
14029
7185.1.1 by Jelmer Vernooij
Update pot file.
14030
#: en/help_topics/hooks.txt:471
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
14031
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14032
"start_commit\n"
14033
"~~~~~~~~~~~~"
14034
msgstr ""
14035
7185.1.1 by Jelmer Vernooij
Update pot file.
14036
#: en/help_topics/hooks.txt:476
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14037
msgid ""
14038
"Called before a commit is performed on a tree. The start commit hook\n"
14039
"is able to change the tree before the commit takes place. start_commit\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
14040
"is called with the breezy.mutabletree.MutableTree that the commit is\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14041
"being performed on."
14042
msgstr ""
14043
6504.1.1 by Vincent Ladeuil
Update translation template
14044
#: en/help_topics/hooks.txt:481
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14045
msgid ""
14046
"StatusHooks\n"
14047
"-----------"
14048
msgstr ""
14049
6504.1.1 by Vincent Ladeuil
Update translation template
14050
#: en/help_topics/hooks.txt:484
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14051
msgid ""
14052
"post_status\n"
14053
"~~~~~~~~~~~"
14054
msgstr ""
14055
6504.1.1 by Vincent Ladeuil
Update translation template
14056
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14057
msgid "Introduced in: 2.3"
14058
msgstr ""
14059
6504.1.1 by Vincent Ladeuil
Update translation template
14060
#: en/help_topics/hooks.txt:489
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14061
msgid ""
14062
"Called with argument StatusHookParams after Bazaar has displayed the\n"
14063
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
14064
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
14065
"correspond to the command line options specified by the user for the\n"
14066
"status command. to_file is the output stream for writing."
14067
msgstr ""
14068
6504.1.1 by Vincent Ladeuil
Update translation template
14069
#: en/help_topics/hooks.txt:495
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14070
msgid ""
14071
"pre_status\n"
14072
"~~~~~~~~~~"
14073
msgstr ""
14074
6504.1.1 by Vincent Ladeuil
Update translation template
14075
#: en/help_topics/hooks.txt:500
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14076
msgid ""
14077
"Called with argument StatusHookParams before Bazaar displays the\n"
14078
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
14079
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
14080
"correspond to the command line options specified by the user for the\n"
14081
"status command. to_file is the output stream for writing."
14082
msgstr ""
14083
6504.1.1 by Vincent Ladeuil
Update translation template
14084
#: en/help_topics/hooks.txt:506
6437.2.2 by Vincent Ladeuil
Release 2.5b5
14085
msgid ""
14086
"TransportHooks\n"
14087
"--------------"
14088
msgstr ""
14089
6504.1.1 by Vincent Ladeuil
Update translation template
14090
#: en/help_topics/hooks.txt:509
6437.2.2 by Vincent Ladeuil
Release 2.5b5
14091
msgid ""
14092
"post_connect\n"
14093
"~~~~~~~~~~~~"
14094
msgstr ""
14095
6504.1.1 by Vincent Ladeuil
Update translation template
14096
#: en/help_topics/hooks.txt:514
6437.2.2 by Vincent Ladeuil
Release 2.5b5
14097
msgid ""
14098
"Called after a new connection is established or a reconnect occurs.\n"
14099
"The sole argument passed is either the connected transport or smart\n"
14100
"medium instance."
14101
msgstr ""
14102
6504.1.1 by Vincent Ladeuil
Update translation template
14103
#: en/help_topics/hooks.txt:518
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14104
msgid ""
14105
"RioVersionInfoBuilderHooks\n"
14106
"--------------------------"
14107
msgstr ""
14108
6504.1.1 by Vincent Ladeuil
Update translation template
14109
#: en/help_topics/hooks.txt:521
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14110
msgid ""
14111
"revision\n"
14112
"~~~~~~~~"
14113
msgstr ""
14114
6504.1.1 by Vincent Ladeuil
Update translation template
14115
#: en/help_topics/hooks.txt:526
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14116
msgid ""
14117
"Invoked when adding information about a revision to the RIO stanza\n"
14118
"that is printed. revision is called with a revision object and a RIO\n"
14119
"stanza.\n"
14120
msgstr ""
14121
14122
#: en/help_topics/location-alias.txt:1
14123
msgid ""
14124
"Location aliases\n"
14125
"================"
14126
msgstr ""
14127
14128
#: en/help_topics/location-alias.txt:4
14129
msgid ""
14130
"Bazaar defines several aliases for locations associated with a branch.  "
14131
"These\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14132
"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
14133
msgstr ""
14134
14135
#: en/help_topics/location-alias.txt:7
14136
msgid "The aliases are::"
14137
msgstr ""
14138
14139
#: en/help_topics/location-alias.txt:9
14140
msgid ""
6349.1.1 by Vincent Ladeuil
Release 2.5b4
14141
"  :bound     The branch this branch is bound to, for bound branches.\n"
14142
"  :parent    The parent of this branch.\n"
14143
"  :public    The public location of this branch.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14144
"  :push      The saved location used for `brz push` with no arguments.\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
14145
"  :submit    The submit branch for this branch.\n"
14146
"  :this      This branch."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14147
msgstr ""
14148
14149
#: en/help_topics/location-alias.txt:16
14150
msgid "For example, to push to the parent location::"
14151
msgstr ""
14152
14153
#: en/help_topics/location-alias.txt:18
7185.1.1 by Jelmer Vernooij
Update pot file.
14154
msgid "    brz push :parent\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14155
msgstr ""
14156
14157
#: en/help_topics/log-formats.txt:1
14158
msgid ""
14159
"Log Formats\n"
14160
"==========="
14161
msgstr ""
14162
14163
#: en/help_topics/log-formats.txt:4
14164
msgid ""
14165
"A log format controls how information about each revision is displayed.\n"
14166
"The standard log formats are compared below::"
14167
msgstr ""
14168
14169
#: en/help_topics/log-formats.txt:7
14170
msgid ""
14171
"  Feature                 long           short         line\n"
14172
"  ----------------------  -------------  ------------  -------------------\n"
14173
"  design goal             detailed view  concise view  1 revision per line\n"
14174
"  committer               name+email     name only     name only\n"
14175
"  author                  name+email     -             -\n"
14176
"  date-time format        full           date only     date only\n"
14177
"  commit message          full           full          top line\n"
14178
"  tags                    yes            yes           yes\n"
14179
"  merges indicator        -              yes           -\n"
14180
"  status/delta            optional       optional      -\n"
14181
"  diff/patch              optional       optional      -\n"
14182
"  revision-id             optional       optional      -\n"
14183
"  branch nick             yes            -             -\n"
14184
"  foreign vcs properties  yes            yes           -\n"
14185
"  preferred levels        all            1             1\n"
14186
"  digital signature       optional       -             -"
14187
msgstr ""
14188
14189
#: en/help_topics/log-formats.txt:24
14190
msgid ""
14191
"The default format is ``long``. To change this, define the ``log_format``\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14192
"setting in the ``[DEFAULT]`` section of ``breezy.conf`` like this (say)::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14193
msgstr ""
14194
14195
#: en/help_topics/log-formats.txt:27
14196
msgid ""
14197
"  [DEFAULT]\n"
14198
"  log_format = short"
14199
msgstr ""
14200
14201
#: en/help_topics/log-formats.txt:30
14202
msgid ""
14203
"Alternatively, to change the log format used for a given query, use the\n"
14204
"--long, --short or --line options."
14205
msgstr ""
14206
14207
#: en/help_topics/log-formats.txt:33
14208
msgid ""
14209
"If one of the standard log formats does not meet your needs, additional\n"
14210
"formats can be provided by plugins.\n"
14211
msgstr ""
14212
7185.1.1 by Jelmer Vernooij
Update pot file.
14213
#: en/help_topics/missing-extensions.txt:1
14214
msgid ""
14215
"Missing Extensions\n"
14216
"=================="
14217
msgstr ""
14218
14219
#: en/help_topics/missing-extensions.txt:4
14220
msgid ""
14221
"Breezy gives a warning if it failed to load some compiled extensions. (See\n"
14222
"http://bazaarvcs.wordpress.com/2009/09/17/extension-warnings/ for "
14223
"background.)"
14224
msgstr ""
14225
14226
#: en/help_topics/missing-extensions.txt:7
14227
msgid ""
14228
"This may indicate either that there's been a problem installing or "
14229
"packaging\n"
14230
"Breezy, or it may just be a case where you don't want to use the compiled\n"
14231
"extensions."
14232
msgstr ""
14233
14234
#: en/help_topics/missing-extensions.txt:11
14235
msgid ""
14236
"1. If you installed Breezy from an official binary package or a "
14237
"distribution\n"
14238
"and you're seeing this warning, please report a bug."
14239
msgstr ""
14240
14241
#: en/help_topics/missing-extensions.txt:14
14242
msgid ""
14243
"2. If you're running Breezy from a source tree or tarball, please run 'make' "
14244
"in\n"
14245
"that directory to compile the extensions. You should do this every time you\n"
14246
"update the tree. To do this you will need some build dependencies installed\n"
14247
"including make, a C compiler, and the Python header files."
14248
msgstr ""
14249
14250
#: en/help_topics/missing-extensions.txt:19
14251
msgid ""
14252
"3. If you can't or don't want to build the extensions, add this line to\n"
14253
"breezy.conf (whose location is shown by 'brz --version')::"
14254
msgstr ""
14255
14256
#: en/help_topics/missing-extensions.txt:22
14257
msgid "  suppress_warnings=missing_extensions"
14258
msgstr ""
14259
14260
#: en/help_topics/missing-extensions.txt:24
14261
msgid "Breezy will work normally but some operations may be slower."
14262
msgstr ""
14263
14264
#: en/help_topics/missing-extensions.txt:26
7490.31.3 by Jelmer Vernooij
Update po.
14265
msgid "The specific modules that failed, and why, are listed in brz.log.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14266
msgstr ""
14267
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14268
#: en/help_topics/other-formats.txt:1
14269
msgid "Other Storage Formats"
14270
msgstr ""
14271
14272
#: en/help_topics/other-formats.txt:3
7185.1.1 by Jelmer Vernooij
Update pot file.
14273
msgid "No experimental formats are available."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14274
msgstr ""
14275
14276
#: en/help_topics/other-formats.txt:5
14277
msgid ""
14278
"\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14279
"No deprecated formats are available."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14280
msgstr ""
14281
14282
#: en/help_topics/patterns.txt:1
14283
msgid ""
14284
"Patterns\n"
14285
"========"
14286
msgstr ""
14287
14288
#: en/help_topics/patterns.txt:4
14289
msgid ""
14290
"Bazaar uses patterns to match files at various times. For example,\n"
14291
"the ``add`` command skips over files that match ignore patterns\n"
14292
"and preferences can be associated with files using rule patterns.\n"
14293
"The pattern syntax is described below."
14294
msgstr ""
14295
14296
#: en/help_topics/patterns.txt:9
14297
msgid ""
14298
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
14299
"slash or is a regular expression, it is compared to the whole path\n"
14300
"from the branch root. Otherwise, it is compared to only the last\n"
14301
"component of the path. To match a file only in the root directory,\n"
14302
"prepend ``./``. Patterns specifying absolute paths are not allowed."
14303
msgstr ""
14304
14305
#: en/help_topics/patterns.txt:15
14306
msgid "Patterns may include globbing wildcards such as::"
14307
msgstr ""
14308
14309
#: en/help_topics/patterns.txt:17
14310
msgid ""
14311
"  ? - Matches any single character except '/'\n"
14312
"  * - Matches 0 or more characters except '/'\n"
14313
"  /**/ - Matches 0 or more directories in a path\n"
14314
"  [a-z] - Matches a single character from within a group of characters"
14315
msgstr ""
14316
14317
#: en/help_topics/patterns.txt:22
14318
msgid ""
14319
"Patterns may also be `Python regular expressions`_. Regular expression\n"
14320
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
14321
"expression.  Regular expression patterns may not include named or\n"
14322
"numbered groups."
14323
msgstr ""
14324
14325
#: en/help_topics/patterns.txt:27
14326
msgid ""
14327
"Case insensitive ignore patterns can be specified with regular expressions\n"
14328
"by using the ``i`` (for ignore case) flag in the pattern."
14329
msgstr ""
14330
14331
#: en/help_topics/patterns.txt:30
14332
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
14333
msgstr ""
14334
14335
#: en/help_topics/patterns.txt:32
14336
msgid "  RE:(?i)foo"
14337
msgstr ""
14338
14339
#: en/help_topics/patterns.txt:34
14340
msgid ""
14341
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
14342
"matched by that pattern will not be ignored."
14343
msgstr ""
14344
14345
#: en/help_topics/patterns.txt:37
14346
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
14347
msgstr ""
14348
14349
#: en/help_topics/revisionspec.txt:1
14350
msgid "Revision Identifiers"
14351
msgstr ""
14352
14353
#: en/help_topics/revisionspec.txt:3
14354
msgid ""
14355
"A revision identifier refers to a specific state of a branch's history.  It\n"
14356
"can be expressed in several ways.  It can begin with a keyword to\n"
14357
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
14358
"'before:yesterday' and 'submit:'."
14359
msgstr ""
14360
14361
#: en/help_topics/revisionspec.txt:8
14362
msgid ""
14363
"Alternately, it can be given without a keyword, in which case it will be\n"
14364
"checked as a revision number, a tag, a revision id, a date specification, or "
14365
"a\n"
14366
"branch specification, in that order.  For example, 'date:today' could be\n"
14367
"written as simply 'today', though if you have a tag called 'today' that "
14368
"will\n"
14369
"be found first."
14370
msgstr ""
14371
14372
#: en/help_topics/revisionspec.txt:14
14373
msgid ""
14374
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
14375
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
14376
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
14377
"or\n"
14378
"spaces around the '..')."
14379
msgstr ""
14380
14381
#: en/help_topics/revisionspec.txt:19
14382
msgid ""
14383
"Ranges are interpreted differently by different commands. To the \"log\" "
14384
"command,\n"
14385
"a range is a sequence of log messages, but to the \"diff\" command, the "
14386
"range\n"
14387
"denotes a change between revisions (and not a sequence of changes).  In\n"
14388
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
14389
"consider it\n"
14390
"to be open-ended, that is, they include one end but not the other.  For "
14391
"example:\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14392
"\"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
14393
"3649,\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14394
"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
14395
"and\n"
14396
"3649, but not 3647."
14397
msgstr ""
14398
14399
#: en/help_topics/revisionspec.txt:28
14400
msgid "The keywords used as revision selection methods are the following:"
14401
msgstr ""
14402
14403
#: en/help_topics/revisionspec.txt:30
14404
msgid ""
7490.31.3 by Jelmer Vernooij
Update po.
14405
":revno:\n"
14406
"\tSelects a revision using a number.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14407
":revid:\n"
14408
"\tSelects a revision using the revision id.\n"
7490.31.3 by Jelmer Vernooij
Update po.
14409
":last:\n"
14410
"\tSelects the nth revision from the end.\n"
14411
":before:\n"
14412
"\tSelects the parent of the revision specified.\n"
14413
":tag:\n"
14414
"\tSelects a revision identified by a tag name.\n"
14415
":date:\n"
14416
"\tSelects a revision on the basis of a datestamp.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14417
":ancestor:\n"
14418
"\tSelects a common ancestor with a second branch.\n"
14419
":branch:\n"
14420
"\tSelects the last revision of a specified branch.\n"
7490.31.3 by Jelmer Vernooij
Update po.
14421
":submit:\n"
14422
"\tSelects a common ancestor with the submit branch.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14423
":annotate:\n"
14424
"\tSelect the revision that last modified the specified line.\n"
14425
":mainline:\n"
14426
"\tSelect mainline revision that merged the specified revision.\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14427
":git:\n"
7490.31.3 by Jelmer Vernooij
Update po.
14428
"\tSelects a revision using a Git commit SHA1."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14429
msgstr ""
14430
7185.1.1 by Jelmer Vernooij
Update pot file.
14431
#: en/help_topics/revisionspec.txt:55
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14432
msgid "In addition, plugins can provide other keywords."
14433
msgstr ""
14434
7185.1.1 by Jelmer Vernooij
Update pot file.
14435
#: en/help_topics/revisionspec.txt:57
6252.1.1 by Vincent Ladeuil
Release 2.5b3
14436
msgid "A detailed description of each keyword is given below."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14437
msgstr ""
14438
7185.1.1 by Jelmer Vernooij
Update pot file.
14439
#: en/help_topics/revisionspec.txt:59
7490.31.3 by Jelmer Vernooij
Update po.
14440
msgid ":revno:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14441
msgstr ""
14442
7185.1.1 by Jelmer Vernooij
Update pot file.
14443
#: en/help_topics/revisionspec.txt:61
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14444
msgid ""
14445
"    Use an integer to specify a revision in the history of the branch.\n"
14446
"    Optionally a branch can be specified.  A negative number will count\n"
14447
"    from the end of the branch (-1 is the last revision, -2 the previous\n"
14448
"    one). If the negative number is larger than the branch's history, the\n"
14449
"    first revision is returned.\n"
14450
"    Examples::"
14451
msgstr ""
14452
7490.31.3 by Jelmer Vernooij
Update po.
14453
#: en/help_topics/revisionspec.txt:68
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14454
msgid ""
14455
"      revno:1                   -> return the first revision of this branch\n"
14456
"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
14457
"                                   the branch '/path/to/branch'\n"
14458
"      revno:-1                  -> The last revision in a branch.\n"
14459
"      -2:http://other/branch    -> The second to last revision in the\n"
14460
"                                   remote branch.\n"
14461
"      -1000000                  -> Most likely the first revision, unless\n"
14462
"                                   your history is very long."
14463
msgstr ""
14464
7490.31.3 by Jelmer Vernooij
Update po.
14465
#: en/help_topics/revisionspec.txt:77
14466
msgid ":revid:"
14467
msgstr ""
14468
14469
#: en/help_topics/revisionspec.txt:79
14470
msgid ""
14471
"    Supply a specific revision id, that can be used to specify any\n"
14472
"    revision id in the ancestry of the branch.\n"
14473
"    Including merges, and pending merges.\n"
14474
"    Examples::"
14475
msgstr ""
14476
14477
#: en/help_topics/revisionspec.txt:84
14478
msgid ""
14479
"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
14480
msgstr ""
14481
14482
#: en/help_topics/revisionspec.txt:86
14483
msgid ":last:"
14484
msgstr ""
14485
14486
#: en/help_topics/revisionspec.txt:88
14487
msgid ""
14488
"    Supply a positive number to get the nth revision from the end.\n"
14489
"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
14490
"    Examples::"
14491
msgstr ""
14492
14493
#: en/help_topics/revisionspec.txt:92
14494
msgid ""
14495
"      last:1        -> return the last revision\n"
14496
"      last:3        -> return the revision 2 before the end."
14497
msgstr ""
14498
14499
#: en/help_topics/revisionspec.txt:95
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14500
msgid ":before:"
14501
msgstr ""
14502
7490.31.3 by Jelmer Vernooij
Update po.
14503
#: en/help_topics/revisionspec.txt:97
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14504
msgid ""
14505
"    Supply any revision spec to return the parent of that revision.  This "
14506
"is\n"
14507
"    mostly useful when inspecting revisions that are not in the revision "
14508
"history\n"
14509
"    of a branch."
14510
msgstr ""
14511
7490.31.3 by Jelmer Vernooij
Update po.
14512
#: en/help_topics/revisionspec.txt:101
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14513
msgid ""
14514
"    It is an error to request the parent of the null revision (before:0)."
14515
msgstr ""
14516
7490.31.3 by Jelmer Vernooij
Update po.
14517
#: en/help_topics/revisionspec.txt:103 en/help_topics/revisionspec.txt:128
14518
#: en/help_topics/revisionspec.txt:146 en/help_topics/revisionspec.txt:155
14519
#: en/help_topics/revisionspec.txt:170
14520
msgid "    Examples::"
14521
msgstr ""
14522
14523
#: en/help_topics/revisionspec.txt:105
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14524
msgid ""
14525
"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
14526
"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
14527
"                                            aaaa@bbbb-1234567890\n"
14528
"      bzr diff -r before:1913..1913\n"
14529
"            -> Find the changes between revision 1913 and its parent "
14530
"(1912).\n"
14531
"               (What changes did revision 1913 introduce).\n"
14532
"               This is equivalent to:  bzr diff -c 1913"
14533
msgstr ""
14534
7490.31.3 by Jelmer Vernooij
Update po.
14535
#: en/help_topics/revisionspec.txt:113
14536
msgid ":tag:"
14537
msgstr ""
14538
14539
#: en/help_topics/revisionspec.txt:115
14540
msgid "    Tags are stored in the branch and created by the 'tag' command."
14541
msgstr ""
14542
14543
#: en/help_topics/revisionspec.txt:117
14544
msgid ":date:"
14545
msgstr ""
14546
14547
#: en/help_topics/revisionspec.txt:119
14548
msgid ""
14549
"    Supply a datestamp to select the first revision that matches the date.\n"
14550
"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
14551
"    Matches the first entry after a given date (either at midnight or\n"
14552
"    at a specified time)."
14553
msgstr ""
14554
14555
#: en/help_topics/revisionspec.txt:124
14556
msgid "    One way to display all the changes since yesterday would be::"
14557
msgstr ""
14558
14559
#: en/help_topics/revisionspec.txt:126
14560
msgid "        brz log -r date:yesterday.."
14561
msgstr ""
14562
14563
#: en/help_topics/revisionspec.txt:130
14564
msgid ""
14565
"      date:yesterday            -> select the first revision since "
14566
"yesterday\n"
14567
"      date:2006-08-14,17:10:14  -> select the first revision after\n"
14568
"                                   August 14th, 2006 at 5:10pm."
14569
msgstr ""
14570
14571
#: en/help_topics/revisionspec.txt:134
14572
msgid ":ancestor:"
14573
msgstr ""
14574
14575
#: en/help_topics/revisionspec.txt:136
14576
msgid "    Supply the path to a branch to select the common ancestor."
14577
msgstr ""
14578
14579
#: en/help_topics/revisionspec.txt:138 en/help_topics/revisionspec.txt:166
14580
msgid ""
14581
"    The common ancestor is the last revision that existed in both\n"
14582
"    branches. Usually this is the branch point, but it could also be\n"
14583
"    a revision that was merged."
14584
msgstr ""
14585
14586
#: en/help_topics/revisionspec.txt:142
14587
msgid ""
14588
"    This is frequently used with 'diff' to return all of the changes\n"
14589
"    that your branch introduces, while excluding the changes that you\n"
14590
"    have not merged from the remote branch."
14591
msgstr ""
14592
14593
#: en/help_topics/revisionspec.txt:148
14594
msgid ""
14595
"      ancestor:/path/to/branch\n"
14596
"      $ bzr diff -r ancestor:../../mainline/branch"
14597
msgstr ""
14598
14599
#: en/help_topics/revisionspec.txt:151
14600
msgid ":branch:"
14601
msgstr ""
14602
14603
#: en/help_topics/revisionspec.txt:153
14604
msgid "    Supply the path to a branch to select its last revision."
14605
msgstr ""
14606
14607
#: en/help_topics/revisionspec.txt:157
14608
msgid "      branch:/path/to/branch"
14609
msgstr ""
14610
14611
#: en/help_topics/revisionspec.txt:159
14612
msgid ":submit:"
14613
msgstr ""
14614
14615
#: en/help_topics/revisionspec.txt:161
14616
msgid ""
14617
"    Diffing against this shows all the changes that were made in this "
14618
"branch,\n"
14619
"    and is a good predictor of what merge will do.  The submit branch is\n"
14620
"    used by the bundle and merge directive commands.  If no submit branch\n"
14621
"    is specified, the parent branch is used instead."
14622
msgstr ""
14623
14624
#: en/help_topics/revisionspec.txt:172
14625
msgid "      $ bzr diff -r submit:"
14626
msgstr ""
14627
14628
#: en/help_topics/revisionspec.txt:174
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14629
msgid ":annotate:"
14630
msgstr ""
14631
7490.31.3 by Jelmer Vernooij
Update po.
14632
#: en/help_topics/revisionspec.txt:176
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14633
msgid ""
14634
"    Select the revision that last modified the specified line.  Line is\n"
14635
"    specified as path:number.  Path is a relative path to the file.  "
14636
"Numbers\n"
14637
"    start at 1, and are relative to the current version, not the last-\n"
14638
"    committed version of the file."
14639
msgstr ""
14640
7490.31.3 by Jelmer Vernooij
Update po.
14641
#: en/help_topics/revisionspec.txt:181
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14642
msgid ":mainline:"
14643
msgstr ""
14644
7490.31.3 by Jelmer Vernooij
Update po.
14645
#: en/help_topics/revisionspec.txt:183
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14646
msgid ""
14647
"    Select the revision that merged the specified revision into mainline."
14648
msgstr ""
14649
7490.31.3 by Jelmer Vernooij
Update po.
14650
#: en/help_topics/revisionspec.txt:185
7185.1.1 by Jelmer Vernooij
Update pot file.
14651
msgid ":git:"
14652
msgstr ""
14653
7490.31.3 by Jelmer Vernooij
Update po.
14654
#: en/help_topics/revisionspec.txt:187
14655
msgid "    Selects a revision using a Git commit SHA1, short or long."
14656
msgstr ""
14657
14658
#: en/help_topics/revisionspec.txt:189
14659
msgid ""
14660
"    This works for both native Git repositories and Git revisions\n"
14661
"    imported into Bazaar repositories.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14662
msgstr ""
14663
14664
#: en/help_topics/rules.txt:1
14665
msgid ""
14666
"Rules\n"
14667
"====="
14668
msgstr ""
14669
14670
#: en/help_topics/rules.txt:7
14671
msgid ""
14672
"Rules are defined in ini file format where the sections are file glob\n"
14673
"patterns and the contents of each section are the preferences for files\n"
14674
"matching that pattern(s). For example::"
14675
msgstr ""
14676
14677
#: en/help_topics/rules.txt:11
14678
msgid ""
14679
"    [name *.bat]\n"
14680
"    eol = native"
14681
msgstr ""
14682
14683
#: en/help_topics/rules.txt:14
14684
msgid ""
14685
"    [name *.html *.xml]\n"
14686
"    keywords = xml_escape"
14687
msgstr ""
14688
14689
#: en/help_topics/rules.txt:17
14690
msgid ""
14691
"Preferences like these are useful for commands and plugins wishing to\n"
14692
"provide custom behaviour for selected files.  For more information on \n"
14693
"end of line conversion see :doc:`eol-help`.\n"
14694
"Keyword support is provided by the `keywords plugin\n"
14695
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
14696
msgstr ""
14697
14698
#: en/help_topics/rules.txt:23
14699
msgid ""
14700
"Files\n"
14701
"-----"
14702
msgstr ""
14703
14704
#: en/help_topics/rules.txt:26
14705
msgid ""
14706
"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.
14707
"``BRZ_HOME/rules``. "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14708
msgstr ""
14709
14710
#: en/help_topics/rules.txt:29
14711
msgid ""
14712
"Rule Patterns\n"
14713
"-------------"
14714
msgstr ""
14715
14716
#: en/help_topics/rules.txt:32
14717
msgid ""
14718
"Patterns are ordered and searching stops as soon as one matches.\n"
14719
"As a consequence, more explicit patterns should be placed towards\n"
14720
"the top of the file. Rule patterns use exactly the same conventions\n"
14721
"as ignore patterns. See :doc:`patterns-help` for details."
14722
msgstr ""
14723
14724
#: en/help_topics/rules.txt:37
14725
msgid ".. note::"
14726
msgstr ""
14727
14728
#: en/help_topics/rules.txt:39
14729
msgid ""
14730
"   Patterns containing square brackets or spaces should be\n"
14731
"   surrounded in quotes to ensure they are correctly parsed.\n"
14732
msgstr ""
14733
14734
#: en/help_topics/topics.txt:1
14735
msgid ""
14736
"authentication       Information on configuring authentication\n"
14737
"basic                Basic commands\n"
14738
"branches             Information on what a branch is\n"
14739
"bugs                 Bug tracker settings\n"
14740
"checkouts            Information on what a checkout is\n"
14741
"configuration        Details on the configuration settings available\n"
14742
"conflict-types       Types of conflicts and what to do about them\n"
14743
"content-filters      Conversion of content into/from working trees\n"
14744
"criss-cross          Information on criss-cross merging\n"
14745
"current-formats      Current storage formats\n"
14746
"debug-flags          Options to show or record debug information\n"
14747
"diverged-branches    How to fix diverged branches\n"
14748
"env-variables        Environment variable names and values\n"
14749
"eol                  Information on end-of-line handling\n"
14750
"files                Information on configuration and log files\n"
14751
"formats              Information on choosing a storage format\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14752
"git                  Using Bazaar with Git\n"
14753
"global-options       Options that control how Breezy runs\n"
7240.6.2 by Jelmer Vernooij
Prepare for 3.0beta1.
14754
"glossary             Glossary\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14755
"hooks                Points at which custom processing can be added\n"
14756
"launchpad            Using Bazaar with Launchpad.net\n"
14757
"location-alias       Aliases for remembered locations\n"
14758
"log-formats          Details on the logging formats available\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14759
"missing-extensions   What to do when compiled extensions are missing\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14760
"other-formats        Experimental and deprecated storage formats\n"
14761
"patterns             Information on the pattern syntax\n"
14762
"repositories         Basic information on shared repositories.\n"
14763
"revisionspec         Explain how to use --revision\n"
14764
"rules                Information on defining rule-based preferences\n"
14765
"standalone-trees     Information on what a standalone tree is\n"
14766
"standard-options     Options that can be used with any command\n"
14767
"status-flags         Help on status flags\n"
14768
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
14769
"topics               Topics list\n"
14770
"url-special-chars    Special character handling in URLs\n"
14771
"urlspec              Supported transport protocols\n"
14772
"working-trees        Information on working trees\n"
14773
msgstr ""
14774
14775
#: en/help_topics/url-special-chars.txt:1
14776
msgid ""
14777
"Special character handling in URLs\n"
14778
"=================================="
14779
msgstr ""
14780
14781
#: en/help_topics/url-special-chars.txt:4
14782
msgid "Bazaar allows locations to be specified in multiple ways, either:"
14783
msgstr ""
14784
14785
#: en/help_topics/url-special-chars.txt:6
14786
msgid " * Fully qualified URLs"
14787
msgstr ""
14788
14789
#: en/help_topics/url-special-chars.txt:8
14790
msgid " * File system paths, relative or absolute"
14791
msgstr ""
14792
14793
#: en/help_topics/url-special-chars.txt:10
14794
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14795
"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
14796
"that are specified it will automatically determine the appropriate URL\n"
14797
"representation, and escape special characters where necessary."
14798
msgstr ""
14799
14800
#: en/help_topics/url-special-chars.txt:14
14801
msgid ""
14802
"There are a few characters which have special meaning in URLs and need "
14803
"careful\n"
14804
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
14805
"value in URLs. Any non-ASCII characters in a file path will automatically "
14806
"be\n"
14807
"urlencoded when the path is converted to a URL."
14808
msgstr ""
14809
14810
#: en/help_topics/url-special-chars.txt:19
14811
msgid ""
14812
"URLs represent non-ASCII characters in an encoding defined by the server, "
14813
"but\n"
14814
"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
14815
"be\n"
14816
"generous in what it accepts as a URL and to print them in a way that\n"
14817
"will be readable."
14818
msgstr ""
14819
14820
#: en/help_topics/url-special-chars.txt:24
14821
msgid ""
14822
"For example, if you have a directory named '/tmp/%2False' these are all "
14823
"valid\n"
14824
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
14825
"slash)::"
14826
msgstr ""
14827
14828
#: en/help_topics/url-special-chars.txt:27
14829
msgid ""
14830
"  cd /tmp\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14831
"  brz log /tmp/%2False\n"
14832
"  brz log %2False\n"
14833
"  brz log file:///tmp/%252False\n"
14834
"  brz log file://localhost/tmp/%252False\n"
14835
"  brz log file:%252False"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14836
msgstr ""
14837
14838
#: en/help_topics/url-special-chars.txt:34
14839
msgid "These are valid but do not refer to the same file::"
14840
msgstr ""
14841
14842
#: en/help_topics/url-special-chars.txt:36
14843
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14844
"  brz log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
14845
"  brz log %252False (refers to a file called /tmp/%252False)"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14846
msgstr ""
14847
14848
#: en/help_topics/url-special-chars.txt:39
14849
msgid ""
14850
"Comma also has special meaning in URLs, because it denotes `segment "
14851
"parameters`_"
14852
msgstr ""
14853
14854
#: en/help_topics/url-special-chars.txt:41
14855
msgid ""
14856
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
14857
msgstr ""
14858
14859
#: en/help_topics/url-special-chars.txt:43
14860
msgid ""
14861
"Comma is also special in any file system paths that are specified. To use a "
14862
"literal\n"
14863
"comma in a file system path, specify a URL and URL encode the comma::"
14864
msgstr ""
14865
14866
#: en/help_topics/url-special-chars.txt:46
14867
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14868
"  brz log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14869
"\" set to \"bla\"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
14870
"  brz log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
14871
"  brz log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14872
"\" set to \"bla\"\n"
14873
msgstr ""
14874
14875
#: en/help_topics/urlspec.txt:1
14876
msgid "URL Identifiers"
14877
msgstr ""
14878
14879
#: en/help_topics/urlspec.txt:3
14880
msgid "Supported URL prefixes::"
14881
msgstr ""
14882
14883
#: en/help_topics/urlspec.txt:5
14884
msgid ""
14885
"  bzr://              Fast access using the Bazaar smart server.\n"
14886
"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
7490.31.3 by Jelmer Vernooij
Update po.
14887
"  cvs+pserver://      The pserver access protocol for CVS.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14888
"  file://             Access using the standard filesystem (default)\n"
7185.1.1 by Jelmer Vernooij
Update pot file.
14889
"  git://              Access using the Git smart server protocol.\n"
14890
"  git+ssh://          Access using the Git smart server protocol over SSH.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14891
"  http://             Read-only access of branches exported on the web.\n"
14892
"  https://            Read-only access of branches exported on the web using "
14893
"SSL.\n"
7490.31.3 by Jelmer Vernooij
Update po.
14894
"  sftp://             Access using SFTP (most SSH servers provide SFTP).\n"
14895
"  svn://              Access using the Subversion smart server.\n"
14896
"  svn+ssh://          Access using the Subversion smart server tunneled over "
14897
"SSH."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14898
msgstr ""
14899
7490.31.3 by Jelmer Vernooij
Update po.
14900
#: en/help_topics/urlspec.txt:17
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14901
msgid "Supported modifiers::"
14902
msgstr ""
14903
7490.31.3 by Jelmer Vernooij
Update po.
14904
#: en/help_topics/urlspec.txt:19
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14905
msgid "  gio+                Access using any GIO supported protocols."
14906
msgstr ""
14907
7490.31.3 by Jelmer Vernooij
Update po.
14908
#: en/help_topics/urlspec.txt:21
7185.1.1 by Jelmer Vernooij
Update pot file.
14909
msgid "Breezy supports all of the standard parts within the URL::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14910
msgstr ""
14911
7490.31.3 by Jelmer Vernooij
Update po.
14912
#: en/help_topics/urlspec.txt:23
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14913
msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
14914
msgstr ""
14915
7490.31.3 by Jelmer Vernooij
Update po.
14916
#: en/help_topics/urlspec.txt:25
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14917
msgid "allowing URLs such as::"
14918
msgstr ""
14919
7490.31.3 by Jelmer Vernooij
Update po.
14920
#: en/help_topics/urlspec.txt:27
7185.1.1 by Jelmer Vernooij
Update pot file.
14921
msgid "  http://brzuser:BadPass@brz.example.com:8080/brz/trunk"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14922
msgstr ""
14923
7490.31.3 by Jelmer Vernooij
Update po.
14924
#: en/help_topics/urlspec.txt:29
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14925
msgid ""
7185.1.1 by Jelmer Vernooij
Update pot file.
14926
"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
14927
"with '~' as meaning that the rest of the path should be interpreted\n"
14928
"relative to the remote user's home directory.  For example if the user\n"
14929
"``remote`` has a  home directory of ``/home/remote`` on the server\n"
14930
"shell.example.com, then::"
14931
msgstr ""
14932
7490.31.3 by Jelmer Vernooij
Update po.
14933
#: en/help_topics/urlspec.txt:35
7185.1.1 by Jelmer Vernooij
Update pot file.
14934
msgid "  brz+ssh://remote@shell.example.com/~/myproject/trunk"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14935
msgstr ""
14936
7490.31.3 by Jelmer Vernooij
Update po.
14937
#: en/help_topics/urlspec.txt:37
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14938
msgid "would refer to ``/home/remote/myproject/trunk``."
14939
msgstr ""
14940
7490.31.3 by Jelmer Vernooij
Update po.
14941
#: en/help_topics/urlspec.txt:39
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
14942
msgid ""
14943
"Many commands that accept URLs also accept location aliases too.\n"
14944
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
14945
msgstr ""