/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"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11
"POT-Creation-Date: 2017-05-21 14:44+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
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
21
#: breezy/add.py:93
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
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
26
#: breezy/branch.py:872
6138.4.4 by Jonathan Riddell
update bzr.pot
27
msgid "Unstacking"
28
msgstr ""
29
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
30
#: breezy/branch.py:3012
6138.4.4 by Jonathan Riddell
update bzr.pot
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr ""
34
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
35
#: breezy/branch.py:3014
6138.4.4 by Jonathan Riddell
update bzr.pot
36
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] ""
40
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
41
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
42
#: breezy/branch.py:3017
6138.4.4 by Jonathan Riddell
update bzr.pot
43
msgid "No new revisions or tags to push."
44
msgstr ""
45
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
46
#: breezy/branch.py:3019
6138.4.4 by Jonathan Riddell
update bzr.pot
47
msgid "No new revisions to push."
48
msgstr ""
49
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
50
#: breezy/branch.py:3039
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
51
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
52
msgid "checked branch {0} format {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
53
msgstr ""
54
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
55
#: breezy/branch.py:3042
6138.4.4 by Jonathan Riddell
update bzr.pot
56
#, python-format
57
msgid "found error:%s"
58
msgstr ""
59
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
60
#: breezy/builtins.py:251 breezy/builtins.py:3043 breezy/workingtree.py:324
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
61
#, python-format
62
msgid "Ignoring files outside view. View is %s"
63
msgstr ""
64
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
65
#: breezy/builtins.py:260
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
66
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
67
msgid "brz %s --revision takes exactly one revision identifier"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
68
msgstr ""
69
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
70
#: breezy/builtins.py:315
6093.2.1 by Jonathan Riddell
add .pot file to archive
71
msgid "Display status summary."
72
msgstr ""
73
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
74
#: breezy/builtins.py:317
6093.2.1 by Jonathan Riddell
add .pot file to archive
75
msgid ""
76
"This reports on versioned and unknown files, reporting them\n"
77
"grouped by state.  Possible states are:"
78
msgstr ""
79
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
80
#: breezy/builtins.py:320
6093.2.1 by Jonathan Riddell
add .pot file to archive
81
msgid ""
82
"added\n"
83
"    Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
86
#: breezy/builtins.py:323
6093.2.1 by Jonathan Riddell
add .pot file to archive
87
msgid ""
88
"removed\n"
89
"    Versioned in the previous revision but removed or deleted\n"
90
"    in the working copy."
91
msgstr ""
92
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
93
#: breezy/builtins.py:327
6093.2.1 by Jonathan Riddell
add .pot file to archive
94
msgid ""
95
"renamed\n"
96
"    Path of this file changed from the previous revision;\n"
97
"    the text may also have changed.  This includes files whose\n"
98
"    parent directory was renamed."
99
msgstr ""
100
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
101
#: breezy/builtins.py:332
6093.2.1 by Jonathan Riddell
add .pot file to archive
102
msgid ""
103
"modified\n"
104
"    Text has changed since the previous revision."
105
msgstr ""
106
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
107
#: breezy/builtins.py:335
6093.2.1 by Jonathan Riddell
add .pot file to archive
108
msgid ""
109
"kind changed\n"
110
"    File kind has been changed (e.g. from file to directory)."
111
msgstr ""
112
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
113
#: breezy/builtins.py:338
6093.2.1 by Jonathan Riddell
add .pot file to archive
114
msgid ""
115
"unknown\n"
116
"    Not versioned and not matching an ignore pattern."
117
msgstr ""
118
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
119
#: breezy/builtins.py:341
6093.2.1 by Jonathan Riddell
add .pot file to archive
120
msgid ""
121
"Additionally for directories, symlinks and files with a changed\n"
122
"executable bit, Bazaar indicates their type using a trailing\n"
123
"character: '/', '@' or '*' respectively. These decorations can be\n"
124
"disabled using the '--no-classify' option."
125
msgstr ""
126
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
127
#: breezy/builtins.py:346
6093.2.1 by Jonathan Riddell
add .pot file to archive
128
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
129
"To see ignored files use 'brz ignored'.  For details on the\n"
130
"changes to file texts, use 'brz diff'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
131
msgstr ""
132
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
133
#: breezy/builtins.py:349
6093.2.1 by Jonathan Riddell
add .pot file to archive
134
msgid ""
135
"Note that --short or -S gives status flags for each item, similar\n"
136
"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.
137
"use brz status -SV."
6093.2.1 by Jonathan Riddell
add .pot file to archive
138
msgstr ""
139
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
140
#: breezy/builtins.py:353
6093.2.1 by Jonathan Riddell
add .pot file to archive
141
msgid ""
142
"If no arguments are specified, the status of the entire working\n"
143
"directory is shown.  Otherwise, only the status of the specified\n"
144
"files or directories is reported.  If a directory is given, status\n"
145
"is reported for everything inside that directory."
146
msgstr ""
147
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
148
#: breezy/builtins.py:358
6093.2.1 by Jonathan Riddell
add .pot file to archive
149
msgid ""
150
"Before merges are committed, the pending merge tip revisions are\n"
151
"shown. To see all pending merge revisions, use the -v option.\n"
152
"To skip the display of pending merge information altogether, use\n"
153
"the no-pending option or specify a file/directory."
154
msgstr ""
155
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
156
#: breezy/builtins.py:363
6093.2.1 by Jonathan Riddell
add .pot file to archive
157
msgid ""
158
"To compare the working directory to a specific revision, pass a\n"
159
"single revision to the revision argument."
160
msgstr ""
161
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
162
#: breezy/builtins.py:366
6093.2.1 by Jonathan Riddell
add .pot file to archive
163
msgid ""
164
"To see which files have changed in a specific revision, or between\n"
165
"two revisions, pass a revision range to the revision argument.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
166
"This will produce the same results as calling 'brz diff --summarize'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
167
msgstr ""
168
169
# help of 'short' option of 'status' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
170
#: breezy/builtins.py:375
6093.2.1 by Jonathan Riddell
add .pot file to archive
171
msgid "Use short status indicators."
172
msgstr ""
173
174
# help of 'versioned' option of 'status' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
175
#: breezy/builtins.py:377
6093.2.1 by Jonathan Riddell
add .pot file to archive
176
msgid "Only show versioned files."
177
msgstr ""
178
179
# help of 'no-pending' option of 'status' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
180
#: breezy/builtins.py:379
6093.2.1 by Jonathan Riddell
add .pot file to archive
181
msgid "Don't show pending merges."
182
msgstr ""
183
184
# help of 'no-classify' option of 'status' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
185
#: breezy/builtins.py:382
6093.2.1 by Jonathan Riddell
add .pot file to archive
186
msgid "Do not mark object type using indicator."
187
msgstr ""
188
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
189
#: breezy/builtins.py:397
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
190
msgid "brz status --revision takes exactly one or two revision specifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
191
msgstr ""
192
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
193
#: breezy/builtins.py:441 breezy/builtins.py:5229
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
194
msgid "You can only supply one of revision_id or --revision"
195
msgstr ""
196
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
197
#: breezy/builtins.py:444 breezy/builtins.py:5231
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
198
msgid "You must supply either --revision or a revision_id"
199
msgstr ""
200
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
201
#: breezy/builtins.py:451
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
202
#, python-format
203
msgid "Repository %r does not support access to raw revision texts"
204
msgstr ""
205
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
206
#: breezy/builtins.py:462
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
207
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
208
msgid "The repository {0} contains no revision {1}."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
209
msgstr ""
210
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
211
#: breezy/builtins.py:469
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
212
msgid "You cannot specify a NULL revision."
213
msgstr ""
214
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
215
#: breezy/builtins.py:561
6093.2.1 by Jonathan Riddell
add .pot file to archive
216
msgid "Remove the working tree from a given branch/checkout."
217
msgstr ""
218
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
219
#: breezy/builtins.py:563
6093.2.1 by Jonathan Riddell
add .pot file to archive
220
msgid ""
221
"Since a lightweight checkout is little more than a working tree\n"
222
"this will refuse to run against one."
223
msgstr ""
224
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
225
#: breezy/builtins.py:566
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
226
msgid "To re-create the working tree, use \"brz checkout\"."
6093.2.1 by Jonathan Riddell
add .pot file to archive
227
msgstr ""
228
229
# help of 'force' option of 'remove-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
230
#: breezy/builtins.py:572
6093.2.1 by Jonathan Riddell
add .pot file to archive
231
msgid "Remove the working tree even if it has uncommitted or shelved changes."
232
msgstr ""
233
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
234
#: breezy/builtins.py:586
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
235
msgid "No working tree to remove"
236
msgstr ""
237
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
238
#: breezy/builtins.py:588
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
239
msgid "You cannot remove the working tree of a remote path"
240
msgstr ""
241
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
242
#: breezy/builtins.py:597
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
243
msgid "You cannot remove the working tree from a lightweight checkout"
244
msgstr ""
245
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
246
#: breezy/builtins.py:637
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
247
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
248
"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
249
"instead. Use \"--force\" if you are sure you want to reset the working tree."
250
msgstr ""
251
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
252
#: breezy/builtins.py:648
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
253
msgid ""
254
", the header appears corrupt, try passing -r -1 to set the state to the last "
255
"commit"
256
msgstr ""
257
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
258
#: breezy/builtins.py:652
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
259
#, python-brace-format
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
260
msgid "failed to reset the tree state{0}"
261
msgstr ""
262
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
263
#: breezy/builtins.py:656
6093.2.1 by Jonathan Riddell
add .pot file to archive
264
msgid "Show current revision number."
265
msgstr ""
266
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
267
#: breezy/builtins.py:658
6093.2.1 by Jonathan Riddell
add .pot file to archive
268
msgid "This is equal to the number of revisions on this branch."
269
msgstr ""
270
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
271
#: breezy/builtins.py:671
6252.1.1 by Vincent Ladeuil
Release 2.5b3
272
msgid "--tree and --revision can not be used together"
273
msgstr ""
274
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
275
#: breezy/builtins.py:688
6581.1.2 by Vincent Ladeuil
Update translation template.
276
msgid "Revision numbers only make sense for single revisions, not ranges"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
277
msgstr ""
278
6093.2.1 by Jonathan Riddell
add .pot file to archive
279
# help of 'tree' option of 'revno' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
280
#: breezy/builtins.py:712
6349.1.1 by Vincent Ladeuil
Release 2.5b4
281
msgid "Show revno of working tree."
6093.2.1 by Jonathan Riddell
add .pot file to archive
282
msgstr ""
283
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
284
#: breezy/builtins.py:760
6093.2.1 by Jonathan Riddell
add .pot file to archive
285
msgid "Add specified files or directories."
286
msgstr ""
287
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
288
#: breezy/builtins.py:762
6093.2.1 by Jonathan Riddell
add .pot file to archive
289
msgid ""
290
"In non-recursive mode, all the named items are added, regardless\n"
291
"of whether they were previously ignored.  A warning is given if\n"
292
"any of the named files are already versioned."
293
msgstr ""
294
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
295
#: breezy/builtins.py:766
6093.2.1 by Jonathan Riddell
add .pot file to archive
296
msgid ""
297
"In recursive mode (the default), files are treated the same way\n"
298
"but the behaviour for directories is different.  Directories that\n"
299
"are already versioned do not give a warning.  All directories,\n"
300
"whether already versioned or not, are searched for files or\n"
301
"subdirectories that are neither versioned or ignored, and these\n"
302
"are added.  This search proceeds recursively into versioned\n"
303
"directories.  If no names are given '.' is assumed."
304
msgstr ""
305
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
306
#: breezy/builtins.py:774
6252.1.1 by Vincent Ladeuil
Release 2.5b3
307
msgid ""
308
"A warning will be printed when nested trees are encountered,\n"
309
"unless they are explicitly ignored."
310
msgstr ""
311
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
312
#: breezy/builtins.py:777
6093.2.1 by Jonathan Riddell
add .pot file to archive
313
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
314
"Therefore simply saying 'brz add' will version all files that\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
315
"are currently unknown."
316
msgstr ""
317
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
318
#: breezy/builtins.py:780
6093.2.1 by Jonathan Riddell
add .pot file to archive
319
msgid ""
320
"Adding a file whose parent directory is not versioned will\n"
321
"implicitly add the parent, and so on up to the root. This means\n"
322
"you should never need to explicitly add a directory, they'll just\n"
323
"get added when you add a file in the directory."
324
msgstr ""
325
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
326
#: breezy/builtins.py:785
6093.2.1 by Jonathan Riddell
add .pot file to archive
327
msgid ""
328
"--dry-run will show which files would be added, but not actually\n"
329
"add them."
330
msgstr ""
331
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
332
#: breezy/builtins.py:788
6093.2.1 by Jonathan Riddell
add .pot file to archive
333
msgid ""
334
"--file-ids-from will try to use the file ids from the supplied path.\n"
335
"It looks up ids trying to find a matching parent directory with the\n"
336
"same filename, and then by pure path. This option is rarely needed\n"
337
"but can be useful when adding the same logical file into two\n"
338
"branches that will be merged later (without showing the two different\n"
339
"adds as a conflict). It is also useful when merging another project\n"
340
"into a subdirectory of this one."
341
msgstr ""
342
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
343
#: breezy/builtins.py:796
6093.2.1 by Jonathan Riddell
add .pot file to archive
344
msgid ""
345
"Any files matching patterns in the ignore list will not be added\n"
346
"unless they are explicitly mentioned."
347
msgstr ""
348
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
349
#: breezy/builtins.py:799
6093.2.1 by Jonathan Riddell
add .pot file to archive
350
msgid ""
351
"In recursive mode, files larger than the configuration option \n"
352
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
353
"to file size."
354
msgstr ""
355
356
# help of 'no-recurse' option of 'add' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
357
#: breezy/builtins.py:806
6093.2.1 by Jonathan Riddell
add .pot file to archive
358
msgid "Don't recursively add the contents of directories."
359
msgstr ""
360
361
# help of 'file-ids-from' option of 'add' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
362
#: breezy/builtins.py:813
6093.2.1 by Jonathan Riddell
add .pot file to archive
363
msgid "Lookup file ids from this tree."
364
msgstr ""
365
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
366
#: breezy/builtins.py:849
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
367
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
368
msgid "ignored {0} matching \"{1}\"\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
369
msgstr ""
370
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
371
#: breezy/builtins.py:854
6093.2.1 by Jonathan Riddell
add .pot file to archive
372
msgid "Create a new versioned directory."
373
msgstr ""
374
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
375
#: breezy/builtins.py:856
6093.2.1 by Jonathan Riddell
add .pot file to archive
376
msgid "This is equivalent to creating the directory and then adding it."
377
msgstr ""
378
6437.2.2 by Vincent Ladeuil
Release 2.5b5
379
# help of 'parents' option of 'mkdir' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
380
#: breezy/builtins.py:863
6437.2.2 by Vincent Ladeuil
Release 2.5b5
381
msgid "No error if existing, make parent directories as needed."
382
msgstr ""
383
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
384
#: breezy/builtins.py:897
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
385
#, python-format
386
msgid "added %s\n"
387
msgstr ""
388
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
389
#: breezy/builtins.py:939
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
390
#, python-format
391
msgid "invalid kind %r specified"
392
msgstr ""
393
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
394
#: breezy/builtins.py:976
6093.2.1 by Jonathan Riddell
add .pot file to archive
395
msgid "Move or rename a file."
396
msgstr ""
397
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
398
#: breezy/builtins.py:978
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
399
msgid "    brz mv SOURCE... DESTINATION"
6093.2.1 by Jonathan Riddell
add .pot file to archive
400
msgstr ""
401
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
402
#: breezy/builtins.py:980
6093.2.1 by Jonathan Riddell
add .pot file to archive
403
msgid ""
404
"If the last argument is a versioned directory, all the other names\n"
405
"are moved into it.  Otherwise, there must be exactly two arguments\n"
406
"and the file is changed to a new name."
407
msgstr ""
408
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
409
#: breezy/builtins.py:984
6093.2.1 by Jonathan Riddell
add .pot file to archive
410
msgid ""
411
"If OLDNAME does not exist on the filesystem but is versioned and\n"
412
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
413
"assumes that the file has been manually moved and only updates\n"
414
"its internal inventory to reflect that change.\n"
415
"The same is valid when moving many SOURCE files to a DESTINATION."
416
msgstr ""
417
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
418
#: breezy/builtins.py:990
6093.2.1 by Jonathan Riddell
add .pot file to archive
419
msgid "Files cannot be moved between branches."
420
msgstr ""
421
422
# help of 'after' option of 'mv' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
423
#: breezy/builtins.py:997
6093.2.1 by Jonathan Riddell
add .pot file to archive
424
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
425
"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
426
"moved."
427
msgstr ""
428
429
# help of 'auto' option of 'mv' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
430
#: breezy/builtins.py:999
6093.2.1 by Jonathan Riddell
add .pot file to archive
431
msgid "Automatically guess renames."
432
msgstr ""
433
434
# help of 'dry-run' option of 'mv' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
435
#: breezy/builtins.py:1000
6093.2.1 by Jonathan Riddell
add .pot file to archive
436
msgid "Avoid making changes when guessing renames."
437
msgstr ""
438
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
439
#: breezy/builtins.py:1009
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
440
msgid "--dry-run requires --auto."
441
msgstr ""
442
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
443
#: breezy/builtins.py:1013
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
444
msgid "missing file argument"
445
msgstr ""
446
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
447
#: breezy/builtins.py:1017
6252.1.1 by Vincent Ladeuil
Release 2.5b3
448
msgid "can not move root of branch"
449
msgstr ""
450
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
451
#: breezy/builtins.py:1023
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
452
msgid "Only one path may be specified to --auto."
453
msgstr ""
454
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
455
#: breezy/builtins.py:1026
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
456
msgid "--after cannot be specified with --auto."
457
msgstr ""
458
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
459
#: breezy/builtins.py:1062
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
460
msgid "to mv multiple files the destination must be a versioned directory"
461
msgstr ""
462
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
463
#: breezy/builtins.py:1114
6093.2.1 by Jonathan Riddell
add .pot file to archive
464
msgid "Turn this branch into a mirror of another branch."
465
msgstr ""
466
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
467
#: breezy/builtins.py:1116
6093.2.1 by Jonathan Riddell
add .pot file to archive
468
msgid ""
469
"By default, this command only works on branches that have not diverged.\n"
470
"Branches are considered diverged if the destination branch's most recent \n"
471
"commit is one that has not been merged (directly or indirectly) into the \n"
472
"parent."
473
msgstr ""
474
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
475
#: breezy/builtins.py:1121
6093.2.1 by Jonathan Riddell
add .pot file to archive
476
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
477
"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
478
"from one into the other.  Once one branch has merged, the other should\n"
479
"be able to pull it again."
480
msgstr ""
481
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
482
#: breezy/builtins.py:1125
6093.2.1 by Jonathan Riddell
add .pot file to archive
483
msgid ""
484
"If you want to replace your local changes and just want your branch to\n"
485
"match the remote one, use pull --overwrite. This will work even if the two\n"
486
"branches have diverged."
487
msgstr ""
488
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
489
#: breezy/builtins.py:1129
6093.2.1 by Jonathan Riddell
add .pot file to archive
490
msgid ""
491
"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
492
"--no-remember to avoid setting it). After that, you can omit the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
493
"location to use the default.  To change the default, use --remember. The\n"
494
"value will only be saved if the remote location can be accessed."
495
msgstr ""
496
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
497
#: breezy/builtins.py:1134
6252.1.1 by Vincent Ladeuil
Release 2.5b3
498
msgid ""
499
"The --verbose option will display the revisions pulled using the log_format\n"
500
"configuration option. You can use a different format by overriding it with\n"
501
"-Olog_format=<other_format>."
502
msgstr ""
503
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
504
#: breezy/builtins.py:1138
6093.2.1 by Jonathan Riddell
add .pot file to archive
505
msgid ""
506
"Note: The location can be specified either in the form of a branch,\n"
507
"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.
508
"with brz send."
6093.2.1 by Jonathan Riddell
add .pot file to archive
509
msgstr ""
510
511
# help of 'verbose' option of 'pull' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
512
#: breezy/builtins.py:1146
6093.2.1 by Jonathan Riddell
add .pot file to archive
513
msgid "Show logs of pulled revisions."
514
msgstr ""
515
516
# help of 'directory' option of 'pull' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
517
#: breezy/builtins.py:1148
6093.2.1 by Jonathan Riddell
add .pot file to archive
518
msgid ""
519
"Branch to pull into, rather than the one containing the working directory."
520
msgstr ""
521
522
# help of 'local' option of 'pull' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
523
#: breezy/builtins.py:1151
6093.2.1 by Jonathan Riddell
add .pot file to archive
524
msgid ""
525
"Perform a local pull in a bound branch.  Local pulls are not applied to the "
526
"master branch."
527
msgstr ""
528
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
529
#: breezy/builtins.py:1188
6581.1.2 by Vincent Ladeuil
Update translation template.
530
msgid "No working tree, ignoring --show-base"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
531
msgstr ""
532
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
533
#: breezy/builtins.py:1204
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
534
msgid "No pull location known or specified."
535
msgstr ""
536
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
537
#: breezy/builtins.py:1210
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
538
#, python-format
539
msgid "Using saved parent location: %s\n"
540
msgstr ""
541
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
542
#: breezy/builtins.py:1217 breezy/builtins.py:4423
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
543
msgid "Cannot use -r with merge directives or bundles"
544
msgstr ""
545
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
546
#: breezy/builtins.py:1260
6093.2.1 by Jonathan Riddell
add .pot file to archive
547
msgid "Update a mirror of this branch."
548
msgstr ""
549
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
550
#: breezy/builtins.py:1262
6093.2.1 by Jonathan Riddell
add .pot file to archive
551
msgid ""
552
"The target branch will not have its working tree populated because this\n"
553
"is both expensive, and is not supported on remote file systems."
554
msgstr ""
555
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
556
#: breezy/builtins.py:1265
6093.2.1 by Jonathan Riddell
add .pot file to archive
557
msgid ""
558
"Some smart servers or protocols *may* put the working tree in place in\n"
559
"the future."
560
msgstr ""
561
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
562
#: breezy/builtins.py:1268
6093.2.1 by Jonathan Riddell
add .pot file to archive
563
msgid ""
564
"This command only works on branches that have not diverged.  Branches are\n"
565
"considered diverged if the destination branch's most recent commit is one\n"
566
"that has not been merged (directly or indirectly) by the source branch."
567
msgstr ""
568
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
569
#: breezy/builtins.py:1272
6093.2.1 by Jonathan Riddell
add .pot file to archive
570
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
571
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
572
"the other branch completely, discarding its unmerged changes."
573
msgstr ""
574
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
575
#: breezy/builtins.py:1275
6093.2.1 by Jonathan Riddell
add .pot file to archive
576
msgid ""
577
"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.
578
"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
579
"After that you will be able to do a push without '--overwrite'."
580
msgstr ""
581
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
582
#: breezy/builtins.py:1279
6093.2.1 by Jonathan Riddell
add .pot file to archive
583
msgid ""
584
"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
585
"--no-remember to avoid setting it).  After that, you can omit the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
586
"location to use the default.  To change the default, use --remember. The\n"
587
"value will only be saved if the remote location can be accessed."
588
msgstr ""
589
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
590
#: breezy/builtins.py:1284
6252.1.1 by Vincent Ladeuil
Release 2.5b3
591
msgid ""
592
"The --verbose option will display the revisions pushed using the log_format\n"
593
"configuration option. You can use a different format by overriding it with\n"
594
"-Olog_format=<other_format>."
595
msgstr ""
596
6437.2.2 by Vincent Ladeuil
Release 2.5b5
597
# help of 'directory' option of 'dpush' command
598
# help of 'directory' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
599
#: breezy/builtins.py:1295 breezy/foreign.py:272
6437.2.2 by Vincent Ladeuil
Release 2.5b5
600
msgid ""
601
"Branch to push from, rather than the one containing the working directory."
602
msgstr ""
603
6093.2.1 by Jonathan Riddell
add .pot file to archive
604
# help of 'use-existing-dir' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
605
#: breezy/builtins.py:1298
6093.2.1 by Jonathan Riddell
add .pot file to archive
606
msgid ""
607
"By default push will fail if the target directory exists, but does not "
608
"already have a control directory.  This flag will allow push to proceed."
609
msgstr ""
610
611
# help of 'stacked' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
612
#: breezy/builtins.py:1303
6093.2.1 by Jonathan Riddell
add .pot file to archive
613
msgid ""
614
"Create a stacked branch that references the public location of the parent "
615
"branch."
616
msgstr ""
617
618
# help of 'stacked-on' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
619
#: breezy/builtins.py:1306
6093.2.1 by Jonathan Riddell
add .pot file to archive
620
msgid ""
621
"Create a stacked branch that refers to another branch for the commit "
622
"history. Only the work not present in the referenced branch is included in "
623
"the branch created."
624
msgstr ""
625
6437.2.2 by Vincent Ladeuil
Release 2.5b5
626
# help of 'strict' option of 'dpush' command
627
# help of 'strict' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
628
#: breezy/builtins.py:1311 breezy/foreign.py:279
6437.2.2 by Vincent Ladeuil
Release 2.5b5
629
msgid ""
630
"Refuse to push if there are uncommitted changes in the working tree, --no-"
631
"strict disables the check."
632
msgstr ""
633
6093.2.1 by Jonathan Riddell
add .pot file to archive
634
# help of 'no-tree' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
635
#: breezy/builtins.py:1314
6093.2.1 by Jonathan Riddell
add .pot file to archive
636
msgid "Don't populate the working tree, even for protocols that support it."
637
msgstr ""
638
6535.1.1 by Vincent Ladeuil
Release 2.6b2
639
# help of 'overwrite-tags' option of 'pull' command
640
# help of 'overwrite-tags' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
641
#: breezy/builtins.py:1317
6535.1.1 by Vincent Ladeuil
Release 2.6b2
642
msgid "Overwrite tags only."
643
msgstr ""
644
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
645
#: breezy/builtins.py:1368
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
646
msgid "Could not determine branch to refer to."
647
msgstr ""
648
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
649
#: breezy/builtins.py:1377
6437.2.2 by Vincent Ladeuil
Release 2.5b5
650
#, python-format
651
msgid ""
652
"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.
653
"use 'brz push :parent'."
6437.2.2 by Vincent Ladeuil
Release 2.5b5
654
msgstr ""
655
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
656
#: breezy/builtins.py:1383 breezy/foreign.py:306
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
657
msgid "No push location known or specified."
658
msgstr ""
659
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
660
#: breezy/builtins.py:1387
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
661
#, python-format
662
msgid "Using saved push location: %s"
663
msgstr ""
664
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
665
#: breezy/builtins.py:1397
6093.2.1 by Jonathan Riddell
add .pot file to archive
666
msgid "Create a new branch that is a copy of an existing branch."
667
msgstr ""
668
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
669
#: breezy/builtins.py:1399
6093.2.1 by Jonathan Riddell
add .pot file to archive
670
msgid ""
671
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
672
"be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
673
"bar.\n"
674
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
675
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
676
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
677
"create ./foo-bar."
678
msgstr ""
679
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
680
#: breezy/builtins.py:1406
6093.2.1 by Jonathan Riddell
add .pot file to archive
681
msgid ""
682
"To retrieve the branch as of a particular revision, supply the --revision\n"
683
"parameter, as in \"branch foo/bar -r 5\"."
684
msgstr ""
685
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
686
#: breezy/builtins.py:1409
6093.2.1 by Jonathan Riddell
add .pot file to archive
687
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
688
msgstr ""
689
690
# help of 'no-tree' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
691
#: breezy/builtins.py:1419
6093.2.1 by Jonathan Riddell
add .pot file to archive
692
msgid "Create a branch without a working-tree."
693
msgstr ""
694
695
# help of 'switch' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
696
#: breezy/builtins.py:1421
6093.2.1 by Jonathan Riddell
add .pot file to archive
697
msgid "Switch the checkout in the current directory to the new branch."
698
msgstr ""
699
700
# help of 'stacked' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
701
#: breezy/builtins.py:1424
6093.2.1 by Jonathan Riddell
add .pot file to archive
702
msgid ""
703
"Create a stacked branch referring to the source branch. The new branch will "
704
"depend on the availability of the source branch for all operations."
705
msgstr ""
706
707
# help of 'standalone' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
708
#: breezy/builtins.py:1428
6093.2.1 by Jonathan Riddell
add .pot file to archive
709
msgid "Do not use a shared repository, even if available."
710
msgstr ""
711
712
# help of 'use-existing-dir' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
713
#: breezy/builtins.py:1430
6093.2.1 by Jonathan Riddell
add .pot file to archive
714
msgid ""
715
"By default branch will fail if the target directory exists, but does not "
716
"already have a control directory.  This flag will allow branch to proceed."
717
msgstr ""
718
719
# help of 'bind' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
720
#: breezy/builtins.py:1435
6093.2.1 by Jonathan Riddell
add .pot file to archive
721
msgid "Bind new branch to from location."
722
msgstr ""
723
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
724
#: breezy/builtins.py:1482
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
725
#, python-format
726
msgid "Target directory \"%s\" already exists."
727
msgstr ""
728
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
729
#: breezy/builtins.py:1494
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
730
#, python-format
731
msgid "Parent of \"%s\" does not exist."
732
msgstr ""
733
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
734
#: breezy/builtins.py:1513
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
735
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
736
msgid "The branch {0} has no revision {1}."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
737
msgstr ""
738
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
739
#: breezy/builtins.py:1528 breezy/push.py:53
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
740
#, python-format
741
msgid "Created new stacked branch referring to %s."
742
msgstr ""
743
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
744
#: breezy/builtins.py:1532
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
745
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
746
msgid "Branched %d revision."
747
msgid_plural "Branched %d revisions."
748
msgstr[0] ""
749
msgstr[1] ""
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
750
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
751
#: breezy/builtins.py:1537
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
752
#, python-format
753
msgid "New branch bound to %s"
754
msgstr ""
755
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
756
#: breezy/builtins.py:1542 breezy/builtins.py:6283
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
757
#, python-format
758
msgid "Switched to branch: %s"
759
msgstr ""
760
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
761
#: breezy/builtins.py:1547
6093.2.1 by Jonathan Riddell
add .pot file to archive
762
msgid "List the branches available at the current location."
763
msgstr ""
764
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
765
#: breezy/builtins.py:1549
6252.1.1 by Vincent Ladeuil
Release 2.5b3
766
msgid ""
767
"This command will print the names of all the branches at the current\n"
768
"location."
769
msgstr ""
770
771
# help of 'recursive' option of 'branches' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
772
#: breezy/builtins.py:1556
6252.1.1 by Vincent Ladeuil
Release 2.5b3
773
msgid ""
774
"Recursively scan for branches rather than just looking in the specified "
775
"location."
776
msgstr ""
777
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
778
#: breezy/builtins.py:1585
6437.2.2 by Vincent Ladeuil
Release 2.5b5
779
msgid "(default)"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
780
msgstr ""
781
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
782
#: breezy/builtins.py:1597
6093.2.1 by Jonathan Riddell
add .pot file to archive
783
msgid "Create a new checkout of an existing branch."
784
msgstr ""
785
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
786
#: breezy/builtins.py:1599
6093.2.1 by Jonathan Riddell
add .pot file to archive
787
msgid ""
788
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
789
"for\n"
790
"the branch found in '.'. This is useful if you have removed the working "
791
"tree\n"
792
"or if it was never created - i.e. if you pushed the branch to its current\n"
793
"location using SFTP."
794
msgstr ""
795
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
796
#: breezy/builtins.py:1604
6093.2.1 by Jonathan Riddell
add .pot file to archive
797
msgid ""
798
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
799
"will\n"
800
"be used.  In other words, \"checkout ../foo/bar\" will attempt to create ./"
801
"bar.\n"
802
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
803
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
804
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
805
"create ./foo-bar."
806
msgstr ""
807
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
808
#: breezy/builtins.py:1611
6093.2.1 by Jonathan Riddell
add .pot file to archive
809
msgid ""
810
"To retrieve the branch as of a particular revision, supply the --revision\n"
811
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
812
"immediately\n"
813
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
814
"old\n"
815
"code.)"
816
msgstr ""
817
818
# help of 'lightweight' option of 'checkout' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
819
#: breezy/builtins.py:1621
6093.2.1 by Jonathan Riddell
add .pot file to archive
820
msgid ""
821
"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
822
"the branch for every operation.  Normal checkouts can perform common "
823
"operations like diff and status without such access, and also support local "
824
"commits."
825
msgstr ""
826
827
# help of 'files-from' option of 'branch' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
828
# help of 'files-from' option of 'checkout' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
829
#: breezy/builtins.py:1628
6093.2.1 by Jonathan Riddell
add .pot file to archive
830
msgid "Get file contents from this tree."
831
msgstr ""
832
833
# help of 'hardlink' option of 'branch' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
834
# help of 'hardlink' option of 'checkout' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
835
#: breezy/builtins.py:1630
6093.2.1 by Jonathan Riddell
add .pot file to archive
836
msgid "Hard-link working tree files where possible."
837
msgstr ""
838
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
839
#: breezy/builtins.py:1671
6093.2.1 by Jonathan Riddell
add .pot file to archive
840
msgid ""
841
"Show list of renamed files.\n"
842
"    "
843
msgstr ""
844
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
845
#: breezy/builtins.py:1699
6252.1.1 by Vincent Ladeuil
Release 2.5b3
846
msgid "Update a working tree to a new revision."
847
msgstr ""
848
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
849
#: breezy/builtins.py:1701
6252.1.1 by Vincent Ladeuil
Release 2.5b3
850
msgid ""
851
"This will perform a merge of the destination revision (the tip of the\n"
852
"branch, or the specified revision) into the working tree, and then make\n"
853
"that revision the basis revision for the working tree.  "
854
msgstr ""
855
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
856
#: breezy/builtins.py:1705
6252.1.1 by Vincent Ladeuil
Release 2.5b3
857
msgid ""
858
"You can use this to visit an older revision, or to update a working tree\n"
859
"that is out of date from its branch."
860
msgstr ""
861
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
862
#: breezy/builtins.py:1708
6252.1.1 by Vincent Ladeuil
Release 2.5b3
863
msgid ""
864
"If there are any uncommitted changes in the tree, they will be carried\n"
865
"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.
866
"these changes, use 'brz revert'.  The uncommitted changes may conflict\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
867
"with the changes brought in by the change in basis revision."
868
msgstr ""
869
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
870
#: breezy/builtins.py:1713
6252.1.1 by Vincent Ladeuil
Release 2.5b3
871
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
872
"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
873
"the branch from the master."
874
msgstr ""
875
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
876
#: breezy/builtins.py:1716
6252.1.1 by Vincent Ladeuil
Release 2.5b3
877
msgid ""
878
"You cannot update just a single file or directory, because each Bazaar\n"
879
"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.
880
"file that has been removed locally, use 'brz revert' instead of 'brz\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
881
"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.
882
"revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
883
"out the old content of that file to a new location."
884
msgstr ""
885
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
886
#: breezy/builtins.py:1723
6252.1.1 by Vincent Ladeuil
Release 2.5b3
887
msgid ""
888
"The 'dir' argument, if given, must be the location of the root of a\n"
889
"working tree to update.  By default, the working tree that contains the \n"
890
"current working directory is used."
891
msgstr ""
892
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
893
#: breezy/builtins.py:1739
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
894
msgid "brz update --revision takes exactly one revision"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
895
msgstr ""
896
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
897
#: breezy/builtins.py:1747
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
898
msgid "brz update can only update a whole tree, not a file or subdirectory"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
899
msgstr ""
900
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
901
#: breezy/builtins.py:1778
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
902
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
903
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
904
msgstr ""
905
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
906
#: breezy/builtins.py:1794
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
907
#, python-format
908
msgid ""
909
"branch has no revision %s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
910
"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
911
msgstr ""
912
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
913
#: breezy/builtins.py:1800
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
914
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
915
msgid "Updated to revision {0} of branch {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
916
msgstr ""
917
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
918
#: breezy/builtins.py:1804
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
919
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
920
"Your local commits will now show as pending merges with 'brz status', and "
921
"can be committed with 'brz commit'."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
922
msgstr ""
923
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
924
#: breezy/builtins.py:1813
6093.2.1 by Jonathan Riddell
add .pot file to archive
925
msgid "Show information about a working tree, branch or repository."
926
msgstr ""
927
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
928
#: breezy/builtins.py:1815
6093.2.1 by Jonathan Riddell
add .pot file to archive
929
msgid ""
930
"This command will show all known locations and formats associated to the\n"
931
"tree, branch or repository."
932
msgstr ""
933
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
934
#: breezy/builtins.py:1818
6093.2.1 by Jonathan Riddell
add .pot file to archive
935
msgid ""
936
"In verbose mode, statistical information is included with each report.\n"
937
"To see extended statistic information, use a verbosity level of 2 or\n"
938
"higher by specifying the verbose option multiple times, e.g. -vv."
939
msgstr ""
940
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
941
#: breezy/builtins.py:1822
6093.2.1 by Jonathan Riddell
add .pot file to archive
942
msgid "Branches and working trees will also report any missing revisions."
943
msgstr ""
944
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
945
#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883
946
#: breezy/builtins.py:6469
6437.2.2 by Vincent Ladeuil
Release 2.5b5
947
msgid ":Examples:"
948
msgstr ""
949
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
950
#: breezy/builtins.py:1826
6093.2.1 by Jonathan Riddell
add .pot file to archive
951
msgid "  Display information on the format and related locations:"
952
msgstr ""
953
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
954
#: breezy/builtins.py:1828
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
955
msgid "    brz info"
6093.2.1 by Jonathan Riddell
add .pot file to archive
956
msgstr ""
957
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
958
#: breezy/builtins.py:1830
6093.2.1 by Jonathan Riddell
add .pot file to archive
959
msgid ""
960
"  Display the above together with extended format information and\n"
961
"  basic statistics (like the number of files in the working tree and\n"
962
"  number of revisions in the branch and repository):"
963
msgstr ""
964
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
965
#: breezy/builtins.py:1834
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
966
msgid "    brz info -v"
6093.2.1 by Jonathan Riddell
add .pot file to archive
967
msgstr ""
968
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
969
#: breezy/builtins.py:1836
6093.2.1 by Jonathan Riddell
add .pot file to archive
970
msgid "  Display the above together with number of committers to the branch:"
971
msgstr ""
972
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
973
#: breezy/builtins.py:1838
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
974
msgid "    brz info -vv"
6093.2.1 by Jonathan Riddell
add .pot file to archive
975
msgstr ""
976
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
977
#: breezy/builtins.py:1857
6093.2.1 by Jonathan Riddell
add .pot file to archive
978
msgid "Remove files or directories."
979
msgstr ""
980
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
981
#: breezy/builtins.py:1859
6093.2.1 by Jonathan Riddell
add .pot file to archive
982
msgid ""
983
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
984
"delete them if they can easily be recovered using revert otherwise they\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
985
"will be backed up (adding an extension of the form .~#~). If no options or\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
986
"parameters are given Bazaar will scan for files that are being tracked by\n"
987
"Bazaar but missing in your tree and stop tracking them for you."
988
msgstr ""
989
990
# help of 'new' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
991
#: breezy/builtins.py:1867
6093.2.1 by Jonathan Riddell
add .pot file to archive
992
msgid "Only remove files that have never been committed."
993
msgstr ""
994
995
# help of 'file-deletion-strategy' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
996
#: breezy/builtins.py:1869
6093.2.1 by Jonathan Riddell
add .pot file to archive
997
msgid "The file deletion mode to be used."
998
msgstr ""
999
1000
# title of 'file-deletion-strategy' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1001
#: breezy/builtins.py:1870
6093.2.1 by Jonathan Riddell
add .pot file to archive
1002
msgid "Deletion Strategy"
1003
msgstr ""
1004
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1005
# help of 'file-deletion-strategy=safe' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1006
#: breezy/builtins.py:1871
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1007
msgid "Backup changed files (default)."
1008
msgstr ""
1009
1010
# help of 'file-deletion-strategy=keep' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1011
#: breezy/builtins.py:1872
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1012
msgid "Delete from brz but leave the working copy."
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1013
msgstr ""
1014
1015
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1016
#: breezy/builtins.py:1873
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1017
msgid "Don't backup changed files."
1018
msgstr ""
1019
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1020
#: breezy/builtins.py:1894
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1021
msgid "No matching files."
1022
msgstr ""
1023
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1024
#: breezy/builtins.py:1955
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1025
msgid "Reconcile brz metadata in a branch."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1026
msgstr ""
1027
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1028
#: breezy/builtins.py:1957
6093.2.1 by Jonathan Riddell
add .pot file to archive
1029
msgid ""
1030
"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.
1031
"previous ghost operations or brz upgrades. You should only\n"
1032
"need to run this command if 'brz check' or a brz developer\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1033
"advises you to run it."
1034
msgstr ""
1035
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1036
#: breezy/builtins.py:1962
6093.2.1 by Jonathan Riddell
add .pot file to archive
1037
msgid ""
1038
"If a second branch is provided, cross-branch reconciliation is\n"
1039
"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.
1040
"id which was not present in very early brz versions is represented\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1041
"correctly in both branches."
1042
msgstr ""
1043
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1044
#: breezy/builtins.py:1967
6093.2.1 by Jonathan Riddell
add .pot file to archive
1045
msgid ""
1046
"At the same time it is run it may recompress data resulting in\n"
1047
"a potential saving in disk space or performance gain."
1048
msgstr ""
1049
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1050
#: breezy/builtins.py:1970
6093.2.1 by Jonathan Riddell
add .pot file to archive
1051
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1052
msgstr ""
1053
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1054
# help of 'format=2a' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1055
# help of 'format=default' option of 'init' command
1056
# help of 'format=2a' option of 'init-repository' command
1057
# help of 'format=default' option of 'init-repository' command
1058
# help of 'format=2a' option of 'upgrade' command
1059
# help of 'format=default' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1060
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1061
msgid ""
1062
"Format for the bzr 2.0 series.\n"
1063
"Uses group-compress storage.\n"
1064
"Provides rich roots which are a one-way transition.\n"
1065
msgstr ""
1066
1067
# help of 'format=pack-0.92' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1068
# help of 'format=pack-0.92' option of 'init-repository' command
1069
# help of 'format=pack-0.92' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1070
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1071
msgid ""
1072
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1073
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1074
msgstr ""
1075
1076
# help of 'format=development-colo' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1077
# help of 'format=development-colo' option of 'init-repository' command
1078
# help of 'format=development-colo' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1079
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1080
msgid "The 2a format with experimental support for colocated branches.\n"
1081
msgstr ""
1082
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1083
#: breezy/builtins.py:2038
6093.2.1 by Jonathan Riddell
add .pot file to archive
1084
msgid "Make a directory into a versioned branch."
1085
msgstr ""
1086
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1087
#: breezy/builtins.py:2040
6093.2.1 by Jonathan Riddell
add .pot file to archive
1088
msgid ""
1089
"Use this to create an empty branch, or before importing an\n"
1090
"existing project."
1091
msgstr ""
1092
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1093
#: breezy/builtins.py:2043
6093.2.1 by Jonathan Riddell
add .pot file to archive
1094
msgid ""
1095
"If there is a repository in a parent directory of the location, then\n"
1096
"the history of the branch will be stored in the repository.  Otherwise\n"
1097
"init creates a standalone branch which carries its own history\n"
1098
"in the .bzr directory."
1099
msgstr ""
1100
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1101
#: breezy/builtins.py:2048
6093.2.1 by Jonathan Riddell
add .pot file to archive
1102
msgid ""
1103
"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.
1104
"the tree can be populated with 'brz checkout'."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1105
msgstr ""
1106
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1107
#: breezy/builtins.py:2051
6093.2.1 by Jonathan Riddell
add .pot file to archive
1108
msgid "Recipe for importing a tree of files::"
1109
msgstr ""
1110
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1111
#: breezy/builtins.py:2053
6093.2.1 by Jonathan Riddell
add .pot file to archive
1112
msgid ""
1113
"    cd ~/project\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1114
"    brz init\n"
1115
"    brz add .\n"
1116
"    brz status\n"
1117
"    brz commit -m \"imported project\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
1118
msgstr ""
1119
1120
# help of 'create-prefix' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
1121
# help of 'create-prefix' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1122
#: breezy/builtins.py:2064
6093.2.1 by Jonathan Riddell
add .pot file to archive
1123
msgid "Create the path leading up to the branch if it does not already exist."
1124
msgstr ""
1125
1126
# help of 'format' option of 'init' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1127
#: breezy/builtins.py:2067
6093.2.1 by Jonathan Riddell
add .pot file to archive
1128
msgid "Specify a format for this branch. See \"help formats\"."
1129
msgstr ""
1130
1131
# help of 'append-revisions-only' option of 'init' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1132
#: breezy/builtins.py:2075
6093.2.1 by Jonathan Riddell
add .pot file to archive
1133
msgid "Never change revnos or the existing log.  Append revisions to it only."
1134
msgstr ""
1135
1136
# help of 'no-tree' option of 'init' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1137
#: breezy/builtins.py:2078
6093.2.1 by Jonathan Riddell
add .pot file to archive
1138
msgid "Create a branch without a working tree."
1139
msgstr ""
1140
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1141
#: breezy/builtins.py:2098 breezy/push.py:110
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1142
#, python-format
1143
msgid ""
1144
"Parent directory of %s does not exist.\n"
1145
"You may supply --create-prefix to create all leading parent directories."
1146
msgstr ""
1147
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1148
#: breezy/builtins.py:2132
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1149
msgid ""
1150
"This branch format cannot be set to append-revisions-only.  Try --default."
1151
msgstr ""
1152
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1153
#: breezy/builtins.py:2143
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1154
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
1155
msgid "Created a {0} (format: {1})\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1156
msgstr ""
1157
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1158
#: breezy/builtins.py:2152
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1159
#, python-format
1160
msgid "Using shared repository: %s\n"
1161
msgstr ""
1162
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1163
#: breezy/builtins.py:2156
6093.2.1 by Jonathan Riddell
add .pot file to archive
1164
msgid "Create a shared repository for branches to share storage space."
1165
msgstr ""
1166
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1167
#: breezy/builtins.py:2158
6093.2.1 by Jonathan Riddell
add .pot file to archive
1168
msgid ""
1169
"New branches created under the repository directory will store their\n"
1170
"revisions in the repository, not in the branch directory.  For branches\n"
1171
"with shared history, this reduces the amount of storage needed and \n"
1172
"speeds up the creation of new branches."
1173
msgstr ""
1174
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1175
#: breezy/builtins.py:2163
6093.2.1 by Jonathan Riddell
add .pot file to archive
1176
msgid ""
1177
"If the --no-trees option is given then the branches in the repository\n"
1178
"will not have working trees by default.  They will still exist as \n"
1179
"directories on disk, but they will not have separate copies of the \n"
1180
"files at a certain revision.  This can be useful for repositories that\n"
1181
"store branches which are interacted with through checkouts or remote\n"
1182
"branches, such as on a server."
1183
msgstr ""
1184
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1185
#: breezy/builtins.py:2170
6093.2.1 by Jonathan Riddell
add .pot file to archive
1186
msgid ""
1187
":Examples:\n"
1188
"    Create a shared repository holding just branches::"
1189
msgstr ""
1190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1191
#: breezy/builtins.py:2173
6093.2.1 by Jonathan Riddell
add .pot file to archive
1192
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1193
"        brz init-repo --no-trees repo\n"
1194
"        brz init repo/trunk"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1195
msgstr ""
1196
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1197
#: breezy/builtins.py:2176
6093.2.1 by Jonathan Riddell
add .pot file to archive
1198
msgid "    Make a lightweight checkout elsewhere::"
1199
msgstr ""
1200
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1201
#: breezy/builtins.py:2178
6093.2.1 by Jonathan Riddell
add .pot file to archive
1202
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1203
"        brz checkout --lightweight repo/trunk trunk-checkout\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1204
"        cd trunk-checkout\n"
1205
"        (add files here)"
1206
msgstr ""
1207
1208
# help of 'format' option of 'init-repository' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1209
#: breezy/builtins.py:2186
6093.2.1 by Jonathan Riddell
add .pot file to archive
1210
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1211
"Specify a format for this repository. See \"brz help formats\" for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1212
msgstr ""
1213
1214
# title of 'format' option of 'init-repository' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1215
#: breezy/builtins.py:2190
6093.2.1 by Jonathan Riddell
add .pot file to archive
1216
msgid "Repository format"
1217
msgstr ""
1218
1219
# help of 'no-trees' option of 'init-repository' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1220
#: breezy/builtins.py:2192
6093.2.1 by Jonathan Riddell
add .pot file to archive
1221
msgid "Branches in the repository will default to not having a working tree."
1222
msgstr ""
1223
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1224
#: breezy/builtins.py:2218
6093.2.1 by Jonathan Riddell
add .pot file to archive
1225
msgid "Show differences in the working tree, between revisions or branches."
1226
msgstr ""
1227
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1228
#: breezy/builtins.py:2220
6093.2.1 by Jonathan Riddell
add .pot file to archive
1229
msgid ""
1230
"If no arguments are given, all changes for the current tree are listed.\n"
1231
"If files are given, only the changes in those files are listed.\n"
1232
"Remote and multiple branches can be compared by using the --old and\n"
1233
"--new options. If not provided, the default for both is derived from\n"
1234
"the first argument, if any, or the current tree if no arguments are\n"
1235
"given."
1236
msgstr ""
1237
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1238
#: breezy/builtins.py:2227
6093.2.1 by Jonathan Riddell
add .pot file to archive
1239
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1240
"\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1241
"produces patches suitable for \"patch -p1\"."
1242
msgstr ""
1243
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1244
#: breezy/builtins.py:2230
6093.2.1 by Jonathan Riddell
add .pot file to archive
1245
msgid ""
1246
"Note that when using the -r argument with a range of revisions, the\n"
1247
"differences are computed between the two specified revisions.  That\n"
1248
"is, the command does not show the changes introduced by the first \n"
1249
"revision in the range.  This differs from the interpretation of \n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1250
"revision ranges used by \"brz log\" which includes the first revision\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1251
"in the range."
1252
msgstr ""
1253
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1254
#: breezy/builtins.py:2237
6093.2.1 by Jonathan Riddell
add .pot file to archive
1255
msgid ""
1256
":Exit values:\n"
1257
"    1 - changed\n"
1258
"    2 - unrepresentable changes\n"
1259
"    3 - error\n"
1260
"    0 - no change"
1261
msgstr ""
1262
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1263
#: breezy/builtins.py:2243
6093.2.1 by Jonathan Riddell
add .pot file to archive
1264
msgid ""
1265
":Examples:\n"
1266
"    Shows the difference in the working tree versus the last commit::"
1267
msgstr ""
1268
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1269
#: breezy/builtins.py:2246
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1270
msgid "        brz diff"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1271
msgstr ""
1272
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1273
#: breezy/builtins.py:2248
6093.2.1 by Jonathan Riddell
add .pot file to archive
1274
msgid "    Difference between the working tree and revision 1::"
1275
msgstr ""
1276
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1277
#: breezy/builtins.py:2250
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1278
msgid "        brz diff -r1"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1279
msgstr ""
1280
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1281
#: breezy/builtins.py:2252
6093.2.1 by Jonathan Riddell
add .pot file to archive
1282
msgid "    Difference between revision 3 and revision 1::"
1283
msgstr ""
1284
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1285
#: breezy/builtins.py:2254
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1286
msgid "        brz diff -r1..3"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1287
msgstr ""
1288
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1289
#: breezy/builtins.py:2256
6093.2.1 by Jonathan Riddell
add .pot file to archive
1290
msgid "    Difference between revision 3 and revision 1 for branch xxx::"
1291
msgstr ""
1292
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1293
#: breezy/builtins.py:2258
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1294
msgid "        brz diff -r1..3 xxx"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1295
msgstr ""
1296
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1297
#: breezy/builtins.py:2260
6093.2.1 by Jonathan Riddell
add .pot file to archive
1298
msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
1299
msgstr ""
1300
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1301
#: breezy/builtins.py:2262
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1302
msgid "        brz diff -c2"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1303
msgstr ""
1304
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1305
#: breezy/builtins.py:2264
6093.2.1 by Jonathan Riddell
add .pot file to archive
1306
msgid ""
1307
"    To see the changes introduced by revision X::\n"
1308
"    \n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1309
"        brz diff -cX"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1310
msgstr ""
1311
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1312
#: breezy/builtins.py:2268
6093.2.1 by Jonathan Riddell
add .pot file to archive
1313
msgid ""
1314
"    Note that in the case of a merge, the -c option shows the changes\n"
1315
"    compared to the left hand parent. To see the changes against\n"
1316
"    another parent, use::"
1317
msgstr ""
1318
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1319
#: breezy/builtins.py:2272
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1320
msgid "        brz diff -r<chosen_parent>..X"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1321
msgstr ""
1322
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1323
#: breezy/builtins.py:2274
6093.2.1 by Jonathan Riddell
add .pot file to archive
1324
msgid ""
1325
"    The changes between the current revision and the previous revision\n"
1326
"    (equivalent to -c-1 and -r-2..-1)"
1327
msgstr ""
1328
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1329
#: breezy/builtins.py:2277
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1330
msgid "        brz diff -r-2.."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1331
msgstr ""
1332
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1333
#: breezy/builtins.py:2279
6093.2.1 by Jonathan Riddell
add .pot file to archive
1334
msgid "    Show just the differences for file NEWS::"
1335
msgstr ""
1336
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1337
#: breezy/builtins.py:2281
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1338
msgid "        brz diff NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1339
msgstr ""
1340
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1341
#: breezy/builtins.py:2283
6093.2.1 by Jonathan Riddell
add .pot file to archive
1342
msgid "    Show the differences in working tree xxx for file NEWS::"
1343
msgstr ""
1344
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1345
#: breezy/builtins.py:2285
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1346
msgid "        brz diff xxx/NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1347
msgstr ""
1348
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1349
#: breezy/builtins.py:2287
6093.2.1 by Jonathan Riddell
add .pot file to archive
1350
msgid "    Show the differences from branch xxx to this working tree:"
1351
msgstr ""
1352
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1353
#: breezy/builtins.py:2289
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1354
msgid "        brz diff --old xxx"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1355
msgstr ""
1356
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1357
#: breezy/builtins.py:2291
6093.2.1 by Jonathan Riddell
add .pot file to archive
1358
msgid "    Show the differences between two branches for file NEWS::"
1359
msgstr ""
1360
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1361
#: breezy/builtins.py:2293
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1362
msgid "        brz diff --old xxx --new yyy NEWS"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1363
msgstr ""
1364
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1365
#: breezy/builtins.py:2295
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1366
msgid "    Same as 'brz diff' but prefix paths with old/ and new/::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1367
msgstr ""
1368
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1369
#: breezy/builtins.py:2297
6093.2.1 by Jonathan Riddell
add .pot file to archive
1370
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1371
"        brz diff --prefix old/:new/\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1372
"        \n"
1373
"    Show the differences using a custom diff program with options::\n"
1374
"    \n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1375
"        brz diff --using /usr/bin/diff --diff-options -wu"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1376
msgstr ""
1377
1378
# help of 'diff-options' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1379
#: breezy/builtins.py:2307
6093.2.1 by Jonathan Riddell
add .pot file to archive
1380
msgid "Pass these options to the external diff program."
1381
msgstr ""
1382
1383
# help of 'prefix' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1384
#: breezy/builtins.py:2310
6093.2.1 by Jonathan Riddell
add .pot file to archive
1385
msgid ""
1386
"Set prefixes added to old and new filenames, as two values separated by a "
1387
"colon. (eg \"old/:new/\")."
1388
msgstr ""
1389
1390
# help of 'old' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1391
#: breezy/builtins.py:2313
6093.2.1 by Jonathan Riddell
add .pot file to archive
1392
msgid "Branch/tree to compare from."
1393
msgstr ""
1394
1395
# help of 'new' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1396
#: breezy/builtins.py:2317
6093.2.1 by Jonathan Riddell
add .pot file to archive
1397
msgid "Branch/tree to compare to."
1398
msgstr ""
1399
1400
# help of 'using' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1401
#: breezy/builtins.py:2323
6093.2.1 by Jonathan Riddell
add .pot file to archive
1402
msgid "Use this command to compare files."
1403
msgstr ""
1404
1405
# help of 'format' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1406
#: breezy/builtins.py:2328
6093.2.1 by Jonathan Riddell
add .pot file to archive
1407
msgid "Diff format to use."
1408
msgstr ""
1409
1410
# title of 'format' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1411
#: breezy/builtins.py:2330
6093.2.1 by Jonathan Riddell
add .pot file to archive
1412
msgid "Diff format"
1413
msgstr ""
1414
6581.1.2 by Vincent Ladeuil
Update translation template.
1415
# help of 'context' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1416
#: breezy/builtins.py:2332
6581.1.2 by Vincent Ladeuil
Update translation template.
1417
msgid "How many lines of context to show."
1418
msgstr ""
1419
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1420
#: breezy/builtins.py:2357
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1421
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1422
msgstr ""
1423
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1424
#: breezy/builtins.py:2361
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1425
msgid "brz diff --revision takes exactly one or two revision specifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1426
msgstr ""
1427
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1428
#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776
1429
#: breezy/builtins.py:2784 breezy/builtins.py:4957
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
1430
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
1431
msgid "{0} and {1} are mutually exclusive"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1432
msgstr ""
1433
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1434
#: breezy/builtins.py:2386
6093.2.1 by Jonathan Riddell
add .pot file to archive
1435
msgid ""
1436
"List files deleted in the working tree.\n"
1437
"    "
1438
msgstr ""
1439
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1440
#: breezy/builtins.py:2463
6581.1.2 by Vincent Ladeuil
Update translation template.
1441
msgid "Show the tree root directory."
1442
msgstr ""
1443
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1444
#: breezy/builtins.py:2465
6093.2.1 by Jonathan Riddell
add .pot file to archive
1445
msgid ""
1446
"The root is the nearest enclosing directory with a .bzr control\n"
1447
"directory."
1448
msgstr ""
1449
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1450
#: breezy/builtins.py:2480
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1451
msgid "The limit argument must be an integer."
1452
msgstr ""
1453
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1454
#: breezy/builtins.py:2488
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1455
msgid "The levels argument must be an integer."
1456
msgstr ""
1457
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1458
#: breezy/builtins.py:2493
6581.1.2 by Vincent Ladeuil
Update translation template.
1459
msgid "Show historical log for a branch or subset of a branch."
1460
msgstr ""
1461
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1462
#: breezy/builtins.py:2495
6093.2.1 by Jonathan Riddell
add .pot file to archive
1463
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1464
"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
1465
"The branch to use is taken from the first parameter. If no parameters\n"
1466
"are given, the branch containing the working directory is logged.\n"
1467
"Here are some simple examples::"
1468
msgstr ""
1469
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1470
#: breezy/builtins.py:2500
6093.2.1 by Jonathan Riddell
add .pot file to archive
1471
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1472
"  brz log                       log the current branch\n"
1473
"  brz log foo.py                log a file in its branch\n"
1474
"  brz log http://server/branch  log a branch on a server"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1475
msgstr ""
1476
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1477
#: breezy/builtins.py:2504
6093.2.1 by Jonathan Riddell
add .pot file to archive
1478
msgid ""
1479
"The filtering, ordering and information shown for each revision can\n"
1480
"be controlled as explained below. By default, all revisions are\n"
1481
"shown sorted (topologically) so that newer revisions appear before\n"
1482
"older ones and descendants always appear before ancestors. If displayed,\n"
1483
"merged revisions are shown indented under the revision in which they\n"
1484
"were merged."
1485
msgstr ""
1486
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1487
#: breezy/builtins.py:2511
6581.1.2 by Vincent Ladeuil
Update translation template.
1488
msgid ":Output control:"
1489
msgstr ""
1490
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1491
#: breezy/builtins.py:2513
6093.2.1 by Jonathan Riddell
add .pot file to archive
1492
msgid ""
1493
"  The log format controls how information about each revision is\n"
1494
"  displayed. The standard log formats are called ``long``, ``short``\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1495
"  and ``line``. The default is long. See ``brz help log-formats``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1496
"  for more details on log formats."
1497
msgstr ""
1498
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1499
#: breezy/builtins.py:2518
6093.2.1 by Jonathan Riddell
add .pot file to archive
1500
msgid ""
1501
"  The following options can be used to control what information is\n"
1502
"  displayed::"
1503
msgstr ""
1504
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1505
#: breezy/builtins.py:2521
6093.2.1 by Jonathan Riddell
add .pot file to archive
1506
msgid ""
1507
"    -l N        display a maximum of N revisions\n"
1508
"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
1509
"    -v          display a status summary (delta) for each revision\n"
1510
"    -p          display a diff (patch) for each revision\n"
1511
"    --show-ids  display revision-ids (and file-ids), not just revnos"
1512
msgstr ""
1513
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1514
#: breezy/builtins.py:2527
6093.2.1 by Jonathan Riddell
add .pot file to archive
1515
msgid ""
1516
"  Note that the default number of levels to display is a function of the\n"
1517
"  log format. If the -n option is not used, the standard log formats show\n"
1518
"  just the top level (mainline)."
1519
msgstr ""
1520
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1521
#: breezy/builtins.py:2531
6093.2.1 by Jonathan Riddell
add .pot file to archive
1522
msgid ""
1523
"  Status summaries are shown using status flags like A, M, etc. To see\n"
1524
"  the changes explained using words like ``added`` and ``modified``\n"
1525
"  instead, use the -vv option."
1526
msgstr ""
1527
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1528
#: breezy/builtins.py:2535
6581.1.2 by Vincent Ladeuil
Update translation template.
1529
msgid ":Ordering control:"
1530
msgstr ""
1531
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1532
#: breezy/builtins.py:2537
6093.2.1 by Jonathan Riddell
add .pot file to archive
1533
msgid ""
1534
"  To display revisions from oldest to newest, use the --forward option.\n"
1535
"  In most cases, using this option will have little impact on the total\n"
1536
"  time taken to produce a log, though --forward does not incrementally\n"
1537
"  display revisions like --reverse does when it can."
1538
msgstr ""
1539
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1540
#: breezy/builtins.py:2542
6581.1.2 by Vincent Ladeuil
Update translation template.
1541
msgid ":Revision filtering:"
1542
msgstr ""
1543
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1544
#: breezy/builtins.py:2544
6093.2.1 by Jonathan Riddell
add .pot file to archive
1545
msgid ""
1546
"  The -r option can be used to specify what revision or range of revisions\n"
1547
"  to filter against. The various forms are shown below::"
1548
msgstr ""
1549
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1550
#: breezy/builtins.py:2547
6093.2.1 by Jonathan Riddell
add .pot file to archive
1551
msgid ""
1552
"    -rX      display revision X\n"
1553
"    -rX..    display revision X and later\n"
1554
"    -r..Y    display up to and including revision Y\n"
1555
"    -rX..Y   display from X to Y inclusive"
1556
msgstr ""
1557
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1558
#: breezy/builtins.py:2552
6093.2.1 by Jonathan Riddell
add .pot file to archive
1559
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1560
"  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
1561
"  Some common examples are given below::"
1562
msgstr ""
1563
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1564
#: breezy/builtins.py:2555
6093.2.1 by Jonathan Riddell
add .pot file to archive
1565
msgid ""
1566
"    -r-1                show just the tip\n"
1567
"    -r-10..             show the last 10 mainline revisions\n"
1568
"    -rsubmit:..         show what's new on this branch\n"
1569
"    -rancestor:path..   show changes since the common ancestor of this\n"
1570
"                        branch and the one at location path\n"
1571
"    -rdate:yesterday..  show changes since yesterday"
1572
msgstr ""
1573
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1574
#: breezy/builtins.py:2562
6093.2.1 by Jonathan Riddell
add .pot file to archive
1575
msgid ""
1576
"  When logging a range of revisions using -rX..Y, log starts at\n"
1577
"  revision Y and searches back in history through the primary\n"
1578
"  (\"left-hand\") parents until it finds X. When logging just the\n"
1579
"  top level (using -n1), an error is reported if X is not found\n"
1580
"  along the way. If multi-level logging is used (-n0), X may be\n"
1581
"  a nested merge revision and the log will be truncated accordingly."
1582
msgstr ""
1583
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1584
#: breezy/builtins.py:2569
6581.1.2 by Vincent Ladeuil
Update translation template.
1585
msgid ":Path filtering:"
1586
msgstr ""
1587
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1588
#: breezy/builtins.py:2571
6093.2.1 by Jonathan Riddell
add .pot file to archive
1589
msgid ""
1590
"  If parameters are given and the first one is not a branch, the log\n"
1591
"  will be filtered to show only those revisions that changed the\n"
1592
"  nominated files or directories."
1593
msgstr ""
1594
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1595
#: breezy/builtins.py:2575
6093.2.1 by Jonathan Riddell
add .pot file to archive
1596
msgid ""
1597
"  Filenames are interpreted within their historical context. To log a\n"
1598
"  deleted file, specify a revision range so that the file existed at\n"
1599
"  the end or start of the range."
1600
msgstr ""
1601
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1602
#: breezy/builtins.py:2579
6093.2.1 by Jonathan Riddell
add .pot file to archive
1603
msgid ""
1604
"  Historical context is also important when interpreting pathnames of\n"
1605
"  renamed files/directories. Consider the following example:"
1606
msgstr ""
1607
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1608
#: breezy/builtins.py:2582
6093.2.1 by Jonathan Riddell
add .pot file to archive
1609
msgid ""
1610
"  * revision 1: add tutorial.txt\n"
1611
"  * revision 2: modify tutorial.txt\n"
1612
"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1613
msgstr ""
1614
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1615
#: breezy/builtins.py:2586
6581.1.2 by Vincent Ladeuil
Update translation template.
1616
msgid "  In this case:"
1617
msgstr ""
1618
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1619
#: breezy/builtins.py:2588
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1620
msgid "  * ``brz log guide.txt`` will log the file added in revision 1"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1621
msgstr ""
1622
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1623
#: breezy/builtins.py:2590
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1624
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
1625
msgstr ""
1626
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1627
#: breezy/builtins.py:2592
6093.2.1 by Jonathan Riddell
add .pot file to archive
1628
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1629
"  * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1630
"    the original file in revision 2."
1631
msgstr ""
1632
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1633
#: breezy/builtins.py:2595
6093.2.1 by Jonathan Riddell
add .pot file to archive
1634
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1635
"  * ``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
1636
"    was no file called guide.txt in revision 2."
1637
msgstr ""
1638
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1639
#: breezy/builtins.py:2598
6093.2.1 by Jonathan Riddell
add .pot file to archive
1640
msgid ""
1641
"  Renames are always followed by log. By design, there is no need to\n"
1642
"  explicitly ask for this (and no way to stop logging a file back\n"
1643
"  until it was last renamed)."
1644
msgstr ""
1645
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1646
#: breezy/builtins.py:2602
6581.1.2 by Vincent Ladeuil
Update translation template.
1647
msgid ":Other filtering:"
1648
msgstr ""
1649
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1650
#: breezy/builtins.py:2604
6093.2.1 by Jonathan Riddell
add .pot file to archive
1651
msgid ""
1652
"  The --match option can be used for finding revisions that match a\n"
1653
"  regular expression in a commit message, committer, author or bug.\n"
1654
"  Specifying the option several times will match any of the supplied\n"
1655
"  expressions. --match-author, --match-bugs, --match-committer and\n"
1656
"  --match-message can be used to only match a specific field."
1657
msgstr ""
1658
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1659
#: breezy/builtins.py:2610
6581.1.2 by Vincent Ladeuil
Update translation template.
1660
msgid ":Tips & tricks:"
1661
msgstr ""
1662
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1663
#: breezy/builtins.py:2612
6093.2.1 by Jonathan Riddell
add .pot file to archive
1664
msgid ""
1665
"  GUI tools and IDEs are often better at exploring history than command\n"
1666
"  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.
1667
"  bzr-explorer shell, or the Loggerhead web interface.  See the Bazaar\n"
1668
"  Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1669
"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
1670
msgstr ""
1671
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1672
#: breezy/builtins.py:2618
6581.1.2 by Vincent Ladeuil
Update translation template.
1673
msgid "  You may find it useful to add the aliases below to ``bazaar.conf``::"
1674
msgstr ""
1675
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1676
#: breezy/builtins.py:2620
6093.2.1 by Jonathan Riddell
add .pot file to archive
1677
msgid ""
1678
"    [ALIASES]\n"
1679
"    tip = log -r-1\n"
1680
"    top = log -l10 --line\n"
1681
"    show = log -v -p"
1682
msgstr ""
1683
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1684
#: breezy/builtins.py:2625
6093.2.1 by Jonathan Riddell
add .pot file to archive
1685
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1686
"  ``brz tip`` will then show the latest revision while ``brz top``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1687
"  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.
1688
"  particular revision X,  ``brz show -rX``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1689
msgstr ""
1690
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1691
#: breezy/builtins.py:2629
6093.2.1 by Jonathan Riddell
add .pot file to archive
1692
msgid ""
1693
"  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.
1694
"  use ``brz log -n0 -rX``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1695
msgstr ""
1696
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1697
#: breezy/builtins.py:2632
6093.2.1 by Jonathan Riddell
add .pot file to archive
1698
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1699
"  ``brz log -v`` on a branch with lots of history is currently\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1700
"  very slow. A fix for this issue is currently under development.\n"
1701
"  With or without that fix, it is recommended that a revision range\n"
1702
"  be given when using the -v option."
1703
msgstr ""
1704
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1705
#: breezy/builtins.py:2637
6093.2.1 by Jonathan Riddell
add .pot file to archive
1706
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1707
"  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
1708
"  used to find revisions matching user names, commit messages, etc.\n"
1709
"  Among other features, this plugin can find all revisions containing\n"
1710
"  a list of words but not others."
1711
msgstr ""
1712
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1713
#: breezy/builtins.py:2642
6093.2.1 by Jonathan Riddell
add .pot file to archive
1714
msgid ""
1715
"  When exploring non-mainline history on large projects with deep\n"
1716
"  history, the performance of log can be greatly improved by installing\n"
1717
"  the historycache plugin. This plugin buffers historical information\n"
1718
"  trading disk space for faster speed."
1719
msgstr ""
1720
1721
# help of 'forward' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1722
#: breezy/builtins.py:2651
6093.2.1 by Jonathan Riddell
add .pot file to archive
1723
msgid "Show from oldest to newest."
1724
msgstr ""
1725
1726
# help of 'verbose' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1727
#: breezy/builtins.py:2654
6093.2.1 by Jonathan Riddell
add .pot file to archive
1728
msgid "Show files changed in each revision."
1729
msgstr ""
1730
1731
# help of 'change' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1732
#: breezy/builtins.py:2660
6093.2.1 by Jonathan Riddell
add .pot file to archive
1733
msgid "Show just the specified revision. See also \"help revisionspec\"."
1734
msgstr ""
1735
1736
# help of 'authors' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1737
#: breezy/builtins.py:2664
6093.2.1 by Jonathan Riddell
add .pot file to archive
1738
msgid "What names to list as authors - first, all or committer."
1739
msgstr ""
1740
1741
# title of 'authors' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1742
#: breezy/builtins.py:2665
6093.2.1 by Jonathan Riddell
add .pot file to archive
1743
msgid "Authors"
1744
msgstr ""
1745
1746
# help of 'levels' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1747
#: breezy/builtins.py:2670
6093.2.1 by Jonathan Riddell
add .pot file to archive
1748
msgid "Number of levels to display - 0 for all, 1 for flat."
1749
msgstr ""
1750
1751
# help of 'limit' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1752
#: breezy/builtins.py:2680
6093.2.1 by Jonathan Riddell
add .pot file to archive
1753
msgid "Limit the output to the first N revisions."
1754
msgstr ""
1755
1756
# help of 'show-diff' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1757
#: breezy/builtins.py:2685
6093.2.1 by Jonathan Riddell
add .pot file to archive
1758
msgid "Show changes made in each revision as a patch."
1759
msgstr ""
1760
6150.1.1 by Jonathan Riddell
update bzr.pot
1761
# help of 'include-merged' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1762
#: breezy/builtins.py:2687
6093.2.1 by Jonathan Riddell
add .pot file to archive
1763
msgid "Show merged revisions like --levels 0 does."
1764
msgstr ""
1765
6150.1.1 by Jonathan Riddell
update bzr.pot
1766
# help of 'omit-merges' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1767
#: breezy/builtins.py:2691
6150.1.1 by Jonathan Riddell
update bzr.pot
1768
msgid "Do not report commits with more than one parent."
1769
msgstr ""
1770
6093.2.1 by Jonathan Riddell
add .pot file to archive
1771
# help of 'exclude-common-ancestry' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1772
#: breezy/builtins.py:2693
6093.2.1 by Jonathan Riddell
add .pot file to archive
1773
msgid ""
1774
"Display only the revisions that are not part of both ancestries (require -"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1775
"rX..Y)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1776
msgstr ""
1777
1778
# help of 'signatures' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1779
#: breezy/builtins.py:2697
6349.1.1 by Vincent Ladeuil
Release 2.5b4
1780
msgid "Show digital signature validity."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1781
msgstr ""
1782
1783
# help of 'match' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1784
#: breezy/builtins.py:2700
6093.2.1 by Jonathan Riddell
add .pot file to archive
1785
msgid "Show revisions whose properties match this expression."
1786
msgstr ""
1787
1788
# help of 'match-message' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1789
#: breezy/builtins.py:2704
6093.2.1 by Jonathan Riddell
add .pot file to archive
1790
msgid "Show revisions whose message matches this expression."
1791
msgstr ""
1792
1793
# help of 'match-committer' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1794
#: breezy/builtins.py:2708
6093.2.1 by Jonathan Riddell
add .pot file to archive
1795
msgid "Show revisions whose committer matches this expression."
1796
msgstr ""
1797
1798
# help of 'match-author' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1799
#: breezy/builtins.py:2712
6093.2.1 by Jonathan Riddell
add .pot file to archive
1800
msgid "Show revisions whose authors match this expression."
1801
msgstr ""
1802
1803
# help of 'match-bugs' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1804
#: breezy/builtins.py:2716
6093.2.1 by Jonathan Riddell
add .pot file to archive
1805
msgid "Show revisions whose bugs match this expression."
1806
msgstr ""
1807
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1808
#: breezy/builtins.py:2770
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1809
msgid "--exclude-common-ancestry requires -r with two revisions"
1810
msgstr ""
1811
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1812
#: breezy/builtins.py:2798
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1813
#, python-format
1814
msgid "Path unknown at end or start of revision range: %s"
1815
msgstr ""
1816
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1817
#: breezy/builtins.py:2915
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1818
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1819
msgid "brz %s doesn't accept two revisions in different branches."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1820
msgstr ""
1821
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1822
#: breezy/builtins.py:2931
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1823
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1824
msgid "brz %s --revision takes one or two values."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1825
msgstr ""
1826
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1827
#: breezy/builtins.py:2976
6093.2.1 by Jonathan Riddell
add .pot file to archive
1828
msgid ""
1829
"List files in a tree.\n"
1830
"    "
1831
msgstr ""
1832
1833
# help of 'recursive' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1834
#: breezy/builtins.py:2985
6093.2.1 by Jonathan Riddell
add .pot file to archive
1835
msgid "Recurse into subdirectories."
1836
msgstr ""
1837
1838
# help of 'from-root' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1839
#: breezy/builtins.py:2987
6093.2.1 by Jonathan Riddell
add .pot file to archive
1840
msgid "Print paths relative to the root of the branch."
1841
msgstr ""
1842
1843
# help of 'unknown' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1844
#: breezy/builtins.py:2989
6093.2.1 by Jonathan Riddell
add .pot file to archive
1845
msgid "Print unknown files."
1846
msgstr ""
1847
1848
# help of 'versioned' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1849
#: breezy/builtins.py:2990
6093.2.1 by Jonathan Riddell
add .pot file to archive
1850
msgid "Print versioned files."
1851
msgstr ""
1852
1853
# help of 'ignored' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1854
#: breezy/builtins.py:2993
6093.2.1 by Jonathan Riddell
add .pot file to archive
1855
msgid "Print ignored files."
1856
msgstr ""
1857
1858
# help of 'kind' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1859
#: breezy/builtins.py:2995
6093.2.1 by Jonathan Riddell
add .pot file to archive
1860
msgid "List entries of a particular kind: file, directory, symlink."
1861
msgstr ""
1862
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1863
#: breezy/builtins.py:3008
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1864
msgid "invalid kind specified"
1865
msgstr ""
1866
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1867
#: breezy/builtins.py:3011
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1868
msgid "Cannot set both --verbose and --null"
1869
msgstr ""
1870
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1871
#: breezy/builtins.py:3020
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1872
msgid "cannot specify both --from-root and PATH"
1873
msgstr ""
1874
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1875
#: breezy/builtins.py:3107
6581.1.2 by Vincent Ladeuil
Update translation template.
1876
msgid "Ignore specified files or patterns."
1877
msgstr ""
1878
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1879
#: breezy/builtins.py:3109
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1880
msgid "See ``brz help patterns`` for details on the syntax of patterns."
6093.2.1 by Jonathan Riddell
add .pot file to archive
1881
msgstr ""
1882
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1883
#: breezy/builtins.py:3111
6093.2.1 by Jonathan Riddell
add .pot file to archive
1884
msgid ""
1885
"If a .bzrignore file does not exist, the ignore command\n"
1886
"will create one and add the specified files or patterns to the newly\n"
1887
"created file. The ignore command will also automatically add the \n"
1888
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1889
"the use of the ignore command will require an explicit add command."
1890
msgstr ""
1891
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1892
#: breezy/builtins.py:3117
6093.2.1 by Jonathan Riddell
add .pot file to archive
1893
msgid ""
1894
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1895
"After adding, editing or deleting that file either indirectly by\n"
1896
"using this command or directly by using an editor, be sure to commit\n"
1897
"it."
1898
msgstr ""
1899
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1900
#: breezy/builtins.py:3122
6093.2.1 by Jonathan Riddell
add .pot file to archive
1901
msgid ""
1902
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1903
"the global ignore file can be found in the application data directory as\n"
1904
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1905
"Global ignores are not touched by this command. The global ignore file\n"
1906
"can be edited directly using an editor."
1907
msgstr ""
1908
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1909
#: breezy/builtins.py:3128
6093.2.1 by Jonathan Riddell
add .pot file to archive
1910
msgid ""
1911
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1912
"precedence over regular ignores.  Such exceptions are used to specify\n"
1913
"files that should be versioned which would otherwise be ignored."
1914
msgstr ""
1915
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1916
#: breezy/builtins.py:3132
6093.2.1 by Jonathan Riddell
add .pot file to archive
1917
msgid ""
1918
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1919
"precedence over the '!' exception patterns."
1920
msgstr ""
1921
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1922
#: breezy/builtins.py:3135
6093.2.1 by Jonathan Riddell
add .pot file to archive
1923
msgid ""
1924
":Notes: \n"
1925
"    \n"
1926
"* Ignore patterns containing shell wildcards must be quoted from\n"
1927
"  the shell on Unix."
1928
msgstr ""
1929
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1930
#: breezy/builtins.py:3140
6093.2.1 by Jonathan Riddell
add .pot file to archive
1931
msgid ""
1932
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1933
"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
1934
msgstr ""
1935
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1936
#: breezy/builtins.py:3143
6093.2.1 by Jonathan Riddell
add .pot file to archive
1937
msgid ""
1938
":Examples:\n"
1939
"    Ignore the top level Makefile::"
1940
msgstr ""
1941
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1942
#: breezy/builtins.py:3146
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1943
msgid "        brz ignore ./Makefile"
6581.1.2 by Vincent Ladeuil
Update translation template.
1944
msgstr ""
1945
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1946
#: breezy/builtins.py:3148
6581.1.2 by Vincent Ladeuil
Update translation template.
1947
msgid "    Ignore .class files in all directories...::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1948
msgstr ""
1949
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1950
#: breezy/builtins.py:3150
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1951
msgid "        brz ignore \"*.class\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
1952
msgstr ""
1953
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1954
#: breezy/builtins.py:3152
6581.1.2 by Vincent Ladeuil
Update translation template.
1955
msgid "    ...but do not ignore \"special.class\"::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1956
msgstr ""
1957
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1958
#: breezy/builtins.py:3154
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1959
msgid "        brz ignore \"!special.class\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
1960
msgstr ""
1961
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1962
#: breezy/builtins.py:3156
6581.1.2 by Vincent Ladeuil
Update translation template.
1963
msgid "    Ignore files whose name begins with the \"#\" character::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1964
msgstr ""
1965
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1966
#: breezy/builtins.py:3158
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1967
msgid "        brz ignore \"RE:^#\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
1968
msgstr ""
1969
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1970
#: breezy/builtins.py:3160 breezy/builtins.py:3164
6093.2.1 by Jonathan Riddell
add .pot file to archive
1971
msgid "    Ignore .o files under the lib directory::"
1972
msgstr ""
1973
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1974
#: breezy/builtins.py:3162
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1975
msgid "        brz ignore \"lib/**/*.o\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
1976
msgstr ""
1977
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1978
#: breezy/builtins.py:3166
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1979
msgid "        brz ignore \"RE:lib/.*\\.o\""
6581.1.2 by Vincent Ladeuil
Update translation template.
1980
msgstr ""
1981
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1982
#: breezy/builtins.py:3168
6581.1.2 by Vincent Ladeuil
Update translation template.
1983
msgid "    Ignore everything but the \"debian\" toplevel directory::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1984
msgstr ""
1985
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1986
#: breezy/builtins.py:3170
6093.2.1 by Jonathan Riddell
add .pot file to archive
1987
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1988
"        brz ignore \"RE:(?!debian/).*\"\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
1989
"    \n"
1990
"    Ignore everything except the \"local\" toplevel directory,\n"
1991
"    but always ignore autosave files ending in ~, even under local/::\n"
1992
"    \n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1993
"        brz ignore \"*\"\n"
1994
"        brz ignore \"!./local\"\n"
1995
"        brz ignore \"!!*~\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
1996
msgstr ""
1997
1998
# help of 'default-rules' option of 'ignore' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1999
#: breezy/builtins.py:3184
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2000
msgid "Display the default ignore rules that brz uses."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2001
msgstr ""
2002
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2003
#: breezy/builtins.py:3196
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2004
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2005
msgstr ""
2006
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2007
#: breezy/builtins.py:3207
6143.1.7 by Jonathan Riddell
update bzr.pot
2008
#, python-format
2009
msgid "Invalid ignore pattern found. %s"
2010
msgid_plural "Invalid ignore patterns found. %s"
2011
msgstr[0] ""
2012
msgstr[1] ""
2013
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2014
#: breezy/builtins.py:3216
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2015
msgid "NAME_PATTERN should not be an absolute path"
2016
msgstr ""
2017
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2018
#: breezy/builtins.py:3229
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2019
#, python-format
2020
msgid ""
2021
"Warning: the following files are version controlled and match your ignore "
2022
"pattern:\n"
2023
"%s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2024
"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
2025
"them.\n"
2026
msgstr ""
2027
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2028
#: breezy/builtins.py:3236
6581.1.2 by Vincent Ladeuil
Update translation template.
2029
msgid "List ignored files and the patterns that matched them."
2030
msgstr ""
2031
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2032
#: breezy/builtins.py:3238
6093.2.1 by Jonathan Riddell
add .pot file to archive
2033
msgid ""
2034
"List all the ignored files and the ignore pattern that caused the file to\n"
2035
"be ignored."
2036
msgstr ""
2037
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2038
#: breezy/builtins.py:3241
6581.1.2 by Vincent Ladeuil
Update translation template.
2039
msgid "Alternatively, to list just the files::"
2040
msgstr ""
2041
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2042
#: breezy/builtins.py:3243
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2043
msgid "    brz ls --ignored"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2044
msgstr ""
2045
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2046
#: breezy/builtins.py:3277
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2047
#, python-format
2048
msgid "not a valid revision-number: %r"
2049
msgstr ""
2050
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2051
#: breezy/builtins.py:3284
6581.1.2 by Vincent Ladeuil
Update translation template.
2052
msgid "Export current or past revision to a destination directory or archive."
2053
msgstr ""
2054
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2055
#: breezy/builtins.py:3286
6581.1.2 by Vincent Ladeuil
Update translation template.
2056
msgid "If no revision is specified this exports the last committed revision."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2057
msgstr ""
2058
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2059
#: breezy/builtins.py:3288
6093.2.1 by Jonathan Riddell
add .pot file to archive
2060
msgid ""
2061
"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
2062
"given, try to find the format with the extension. If no extension\n"
2063
"is found exports to a directory (equivalent to --format=dir)."
2064
msgstr ""
2065
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2066
#: breezy/builtins.py:3292
6093.2.1 by Jonathan Riddell
add .pot file to archive
2067
msgid ""
2068
"If root is supplied, it will be used as the root directory inside\n"
2069
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2070
"to the exported filename. The root option has no effect for 'dir' format."
2071
msgstr ""
2072
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2073
#: breezy/builtins.py:3296
6093.2.1 by Jonathan Riddell
add .pot file to archive
2074
msgid ""
2075
"If branch is omitted then the branch containing the current working\n"
2076
"directory will be used."
2077
msgstr ""
2078
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2079
#: breezy/builtins.py:3299
6581.1.2 by Vincent Ladeuil
Update translation template.
2080
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2081
msgstr ""
2082
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2083
#: breezy/builtins.py:3301
6093.2.1 by Jonathan Riddell
add .pot file to archive
2084
msgid ""
2085
"  =================       =========================\n"
2086
"  Supported formats       Autodetected by extension\n"
2087
"  =================       =========================\n"
2088
"     dir                         (none)\n"
2089
"     tar                          .tar\n"
2090
"     tbz2                    .tar.bz2, .tbz2\n"
2091
"     tgz                      .tar.gz, .tgz\n"
2092
"     zip                          .zip\n"
2093
"  =================       ========================="
2094
msgstr ""
2095
2096
# help of 'format' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2097
#: breezy/builtins.py:3315
6093.2.1 by Jonathan Riddell
add .pot file to archive
2098
msgid "Type of file to export to."
2099
msgstr ""
2100
2101
# help of 'filters' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2102
#: breezy/builtins.py:3318
6093.2.1 by Jonathan Riddell
add .pot file to archive
2103
msgid "Apply content filters to export the convenient form."
2104
msgstr ""
2105
2106
# help of 'root' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2107
#: breezy/builtins.py:3322
6093.2.1 by Jonathan Riddell
add .pot file to archive
2108
msgid "Name of the root directory inside the exported file."
2109
msgstr ""
2110
2111
# help of 'per-file-timestamps' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2112
#: breezy/builtins.py:3324
6093.2.1 by Jonathan Riddell
add .pot file to archive
2113
msgid ""
2114
"Set modification time of files to that of the last revision in which it was "
2115
"changed."
2116
msgstr ""
2117
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2118
# help of 'uncommitted' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2119
#: breezy/builtins.py:3327
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2120
msgid "Export the working tree contents rather than that of the last revision."
2121
msgstr ""
2122
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2123
#: breezy/builtins.py:3346
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2124
msgid "--uncommitted requires a working tree"
2125
msgstr ""
2126
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2127
#: breezy/builtins.py:3355
6138.4.4 by Jonathan Riddell
update bzr.pot
2128
#, python-format
2129
msgid "Unsupported export format: %s"
2130
msgstr ""
2131
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2132
#: breezy/builtins.py:3359
6581.1.2 by Vincent Ladeuil
Update translation template.
2133
msgid "Write the contents of a file as of a given revision to standard output."
2134
msgstr ""
2135
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2136
#: breezy/builtins.py:3361
6581.1.2 by Vincent Ladeuil
Update translation template.
2137
msgid "If no revision is nominated, the last revision is used."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2138
msgstr ""
2139
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2140
#: breezy/builtins.py:3363
6093.2.1 by Jonathan Riddell
add .pot file to archive
2141
msgid ""
2142
"Note: Take care to redirect standard output when using this command on a\n"
2143
"binary file."
2144
msgstr ""
2145
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2146
# help of 'name-from-revision' option of 'cat' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2147
#: breezy/builtins.py:3369
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2148
msgid "The path name in the old tree."
2149
msgstr ""
2150
6093.2.1 by Jonathan Riddell
add .pot file to archive
2151
# help of 'filters' option of 'cat' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2152
#: breezy/builtins.py:3370
6093.2.1 by Jonathan Riddell
add .pot file to archive
2153
msgid "Apply content filters to display the convenience form."
2154
msgstr ""
2155
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2156
#: breezy/builtins.py:3381
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2157
msgid "brz cat --revision takes exactly one revision specifier"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2158
msgstr ""
2159
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2160
#: breezy/builtins.py:3406 breezy/builtins.py:3418
6138.2.6 by Jonathan Riddell
update bzr.pot
2161
msgid "{0!r} is not present in revision {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2162
msgstr ""
2163
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2164
#: breezy/builtins.py:3441
6581.1.2 by Vincent Ladeuil
Update translation template.
2165
msgid "Commit changes into a new revision."
2166
msgstr ""
2167
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2168
#: breezy/builtins.py:3443
6093.2.1 by Jonathan Riddell
add .pot file to archive
2169
msgid ""
2170
"An explanatory message needs to be given for each commit. This is\n"
2171
"often done by using the --message option (getting the message from the\n"
2172
"command line) or by using the --file option (getting the message from\n"
2173
"a file). If neither of these options is given, an editor is opened for\n"
2174
"the user to enter the message. To see the changed files in the\n"
2175
"boilerplate text loaded into the editor, use the --show-diff option."
2176
msgstr ""
2177
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2178
#: breezy/builtins.py:3450
6093.2.1 by Jonathan Riddell
add .pot file to archive
2179
msgid ""
2180
"By default, the entire tree is committed and the person doing the\n"
2181
"commit is assumed to be the author. These defaults can be overridden\n"
2182
"as explained below."
2183
msgstr ""
2184
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2185
#: breezy/builtins.py:3454
6581.1.2 by Vincent Ladeuil
Update translation template.
2186
msgid ":Selective commits:"
2187
msgstr ""
2188
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2189
#: breezy/builtins.py:3456
6093.2.1 by Jonathan Riddell
add .pot file to archive
2190
msgid ""
2191
"  If selected files are specified, only changes to those files are\n"
2192
"  committed.  If a directory is specified then the directory and\n"
2193
"  everything within it is committed."
2194
msgstr ""
2195
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2196
#: breezy/builtins.py:3460
6093.2.1 by Jonathan Riddell
add .pot file to archive
2197
msgid ""
2198
"  When excludes are given, they take precedence over selected files.\n"
2199
"  For example, to commit only changes within foo, but not changes\n"
2200
"  within foo/bar::"
2201
msgstr ""
2202
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2203
#: breezy/builtins.py:3464
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2204
msgid "    brz commit foo -x foo/bar"
6581.1.2 by Vincent Ladeuil
Update translation template.
2205
msgstr ""
2206
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2207
#: breezy/builtins.py:3466
6581.1.2 by Vincent Ladeuil
Update translation template.
2208
msgid "  A selective commit after a merge is not yet supported."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2209
msgstr ""
2210
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2211
#: breezy/builtins.py:3468
6581.1.2 by Vincent Ladeuil
Update translation template.
2212
msgid ":Custom authors:"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2213
msgstr ""
2214
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2215
#: breezy/builtins.py:3470
6093.2.1 by Jonathan Riddell
add .pot file to archive
2216
msgid ""
2217
"  If the author of the change is not the same person as the committer,\n"
2218
"  you can specify the author's name using the --author option. The\n"
2219
"  name should be in the same format as a committer-id, e.g.\n"
2220
"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2221
"  the change you can specify the option multiple times, once for each\n"
2222
"  author."
2223
msgstr ""
2224
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2225
#: breezy/builtins.py:3477
6581.1.2 by Vincent Ladeuil
Update translation template.
2226
msgid ":Checks:"
2227
msgstr ""
2228
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2229
#: breezy/builtins.py:3479
6093.2.1 by Jonathan Riddell
add .pot file to archive
2230
msgid ""
2231
"  A common mistake is to forget to add a new file or directory before\n"
2232
"  running the commit command. The --strict option checks for unknown\n"
2233
"  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.
2234
"  checks can be implemented by defining hooks. See ``brz help hooks``\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2235
"  for details."
2236
msgstr ""
2237
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2238
#: breezy/builtins.py:3485
6581.1.2 by Vincent Ladeuil
Update translation template.
2239
msgid ":Things to note:"
2240
msgstr ""
2241
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2242
#: breezy/builtins.py:3487
6093.2.1 by Jonathan Riddell
add .pot file to archive
2243
msgid ""
2244
"  If you accidentially commit the wrong changes or make a spelling\n"
2245
"  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.
2246
"  to undo it. See ``brz help uncommit`` for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2247
msgstr ""
2248
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2249
#: breezy/builtins.py:3491
6093.2.1 by Jonathan Riddell
add .pot file to archive
2250
msgid ""
2251
"  Hooks can also be configured to run after a commit. This allows you\n"
2252
"  to trigger updates to external systems like bug trackers. The --fixes\n"
2253
"  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.
2254
"  one or more bugs. See ``brz help bugs`` for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2255
msgstr ""
2256
2257
# help of 'exclude' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2258
#: breezy/builtins.py:3501
6093.2.1 by Jonathan Riddell
add .pot file to archive
2259
msgid "Do not consider changes made to a given path."
2260
msgstr ""
2261
2262
# help of 'message' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2263
#: breezy/builtins.py:3504
6093.2.1 by Jonathan Riddell
add .pot file to archive
2264
msgid "Description of the new revision."
2265
msgstr ""
2266
2267
# help of 'unchanged' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2268
#: breezy/builtins.py:3507
6093.2.1 by Jonathan Riddell
add .pot file to archive
2269
msgid "Commit even if nothing has changed."
2270
msgstr ""
2271
2272
# help of 'file' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2273
#: breezy/builtins.py:3511
6093.2.1 by Jonathan Riddell
add .pot file to archive
2274
msgid "Take commit message from this file."
2275
msgstr ""
2276
2277
# help of 'strict' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2278
#: breezy/builtins.py:3513
6093.2.1 by Jonathan Riddell
add .pot file to archive
2279
msgid "Refuse to commit if there are unknown files in the working tree."
2280
msgstr ""
2281
2282
# help of 'commit-time' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2283
#: breezy/builtins.py:3516
6093.2.1 by Jonathan Riddell
add .pot file to archive
2284
msgid ""
2285
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2286
"08:00:00 +0100'."
2287
msgstr ""
2288
2289
# help of 'fixes' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2290
#: breezy/builtins.py:3519
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2291
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
2292
msgstr ""
2293
2294
# help of 'author' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2295
#: breezy/builtins.py:3522
6093.2.1 by Jonathan Riddell
add .pot file to archive
2296
msgid "Set the author's name, if it's different from the committer."
2297
msgstr ""
2298
2299
# help of 'local' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2300
#: breezy/builtins.py:3525
6093.2.1 by Jonathan Riddell
add .pot file to archive
2301
msgid ""
2302
"Perform a local commit in a bound branch.  Local commits are not pushed to "
2303
"the master branch until a normal commit is performed."
2304
msgstr ""
2305
2306
# help of 'show-diff' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2307
#: breezy/builtins.py:3531
6093.2.1 by Jonathan Riddell
add .pot file to archive
2308
msgid ""
2309
"When no message is supplied, show the diff along with the status summary in "
2310
"the message editor."
2311
msgstr ""
2312
2313
# help of 'lossy' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2314
#: breezy/builtins.py:3534
6093.2.1 by Jonathan Riddell
add .pot file to archive
2315
msgid ""
2316
"When committing to a foreign version control system do not push data that "
2317
"can not be natively represented."
2318
msgstr ""
2319
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2320
#: breezy/builtins.py:3552
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2321
#, python-format
2322
msgid ""
2323
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2324
"default bug tracker using the `bugtracker` option.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2325
"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
2326
msgstr ""
2327
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2328
#: breezy/builtins.py:3561
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2329
#, python-format
2330
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2331
"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
2332
"for more information on this feature.\n"
2333
"Commit refused."
2334
msgstr ""
2335
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2336
#: breezy/builtins.py:3570
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2337
#, python-format
2338
msgid "Unrecognized bug %s. Commit refused."
2339
msgstr ""
2340
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2341
#: breezy/builtins.py:3573
6150.1.1 by Jonathan Riddell
update bzr.pot
2342
#, python-format
2343
msgid ""
2344
"%s\n"
2345
"Commit refused."
2346
msgstr ""
2347
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2348
#: breezy/builtins.py:3597
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2349
msgid "Could not parse --commit-time: "
2350
msgstr ""
2351
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2352
#: breezy/builtins.py:3637
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2353
msgid "please specify either --message or --file"
2354
msgstr ""
2355
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2356
#: breezy/builtins.py:3666
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2357
msgid "please specify a commit message with either --message or --file"
2358
msgstr ""
2359
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2360
#: breezy/builtins.py:3669
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2361
msgid ""
2362
"Empty commit message specified. Please specify a commit message with either "
2363
"--message or --file or leave a blank message with --message \"\"."
2364
msgstr ""
2365
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2366
#: breezy/builtins.py:3689
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2367
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2368
"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
2369
"--unchanged to force an empty commit."
2370
msgstr ""
2371
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2372
#: breezy/builtins.py:3693
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2373
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2374
"Conflicts detected in working tree.  Use \"brz conflicts\" to list, \"brz "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2375
"resolve FILE\" to resolve."
2376
msgstr ""
2377
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2378
#: breezy/builtins.py:3697
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2379
msgid "Commit refused because there are unknown files in the working tree."
2380
msgstr ""
2381
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2382
#: breezy/builtins.py:3700
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2383
msgid ""
2384
"\n"
2385
"To commit to master branch, run update and then commit.\n"
2386
"You can also pass --local to commit to continue working disconnected."
2387
msgstr ""
2388
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2389
#: breezy/builtins.py:3708
6581.1.2 by Vincent Ladeuil
Update translation template.
2390
msgid ""
2391
"Validate working tree structure, branch consistency and repository history."
2392
msgstr ""
2393
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2394
#: breezy/builtins.py:3710
6093.2.1 by Jonathan Riddell
add .pot file to archive
2395
msgid ""
2396
"This command checks various invariants about branch and repository storage\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2397
"to detect data corruption or brz bugs."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2398
msgstr ""
2399
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2400
#: breezy/builtins.py:3713
6093.2.1 by Jonathan Riddell
add .pot file to archive
2401
msgid ""
2402
"The working tree and branch checks will only give output if a problem is\n"
2403
"detected. The output fields of the repository check are:"
2404
msgstr ""
2405
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2406
#: breezy/builtins.py:3716
6093.2.1 by Jonathan Riddell
add .pot file to archive
2407
msgid ""
2408
"revisions\n"
2409
"    This is just the number of revisions checked.  It doesn't\n"
2410
"    indicate a problem."
2411
msgstr ""
2412
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2413
#: breezy/builtins.py:3720
6093.2.1 by Jonathan Riddell
add .pot file to archive
2414
msgid ""
2415
"versionedfiles\n"
2416
"    This is just the number of versionedfiles checked.  It\n"
2417
"    doesn't indicate a problem."
2418
msgstr ""
2419
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2420
#: breezy/builtins.py:3724
6093.2.1 by Jonathan Riddell
add .pot file to archive
2421
msgid ""
2422
"unreferenced ancestors\n"
2423
"    Texts that are ancestors of other texts, but\n"
2424
"    are not properly referenced by the revision ancestry.  This is a\n"
2425
"    subtle problem that Bazaar can work around."
2426
msgstr ""
2427
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2428
#: breezy/builtins.py:3729
6093.2.1 by Jonathan Riddell
add .pot file to archive
2429
msgid ""
2430
"unique file texts\n"
2431
"    This is the total number of unique file contents\n"
2432
"    seen in the checked revisions.  It does not indicate a problem."
2433
msgstr ""
2434
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2435
#: breezy/builtins.py:3733
6093.2.1 by Jonathan Riddell
add .pot file to archive
2436
msgid ""
2437
"repeated file texts\n"
2438
"    This is the total number of repeated texts seen\n"
2439
"    in the checked revisions.  Texts can be repeated when their file\n"
2440
"    entries are modified, but the file contents are not.  It does not\n"
2441
"    indicate a problem."
2442
msgstr ""
2443
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2444
#: breezy/builtins.py:3739
6093.2.1 by Jonathan Riddell
add .pot file to archive
2445
msgid ""
2446
"If no restrictions are specified, all Bazaar data that is found at the "
2447
"given\n"
2448
"location will be checked."
2449
msgstr ""
2450
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2451
#: breezy/builtins.py:3744
6581.1.2 by Vincent Ladeuil
Update translation template.
2452
msgid "    Check the tree and branch at 'foo'::"
2453
msgstr ""
2454
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2455
#: breezy/builtins.py:3746
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2456
msgid "        brz check --tree --branch foo"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2457
msgstr ""
2458
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2459
#: breezy/builtins.py:3748
6581.1.2 by Vincent Ladeuil
Update translation template.
2460
msgid "    Check only the repository at 'bar'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2461
msgstr ""
2462
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2463
#: breezy/builtins.py:3750
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2464
msgid "        brz check --repo bar"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2465
msgstr ""
2466
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2467
#: breezy/builtins.py:3752
6581.1.2 by Vincent Ladeuil
Update translation template.
2468
msgid "    Check everything at 'baz'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2469
msgstr ""
2470
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2471
#: breezy/builtins.py:3754
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2472
msgid "        brz check baz"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2473
msgstr ""
2474
2475
# help of 'branch' option of 'check' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2476
#: breezy/builtins.py:3760
6093.2.1 by Jonathan Riddell
add .pot file to archive
2477
msgid "Check the branch related to the current directory."
2478
msgstr ""
2479
2480
# help of 'repo' option of 'check' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2481
#: breezy/builtins.py:3762
6093.2.1 by Jonathan Riddell
add .pot file to archive
2482
msgid "Check the repository related to the current directory."
2483
msgstr ""
2484
2485
# help of 'tree' option of 'check' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2486
#: breezy/builtins.py:3764
6093.2.1 by Jonathan Riddell
add .pot file to archive
2487
msgid "Check the working tree related to the current directory."
2488
msgstr ""
2489
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2490
#: breezy/builtins.py:3778
6581.1.2 by Vincent Ladeuil
Update translation template.
2491
msgid "Upgrade a repository, branch or working tree to a newer format."
2492
msgstr ""
2493
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2494
#: breezy/builtins.py:3780
6093.2.1 by Jonathan Riddell
add .pot file to archive
2495
msgid ""
2496
"When the default format has changed after a major new release of\n"
2497
"Bazaar, you may be informed during certain operations that you\n"
2498
"should upgrade. Upgrading to a newer format may improve performance\n"
2499
"or make new features available. It may however limit interoperability\n"
2500
"with older repositories or with older versions of Bazaar."
2501
msgstr ""
2502
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2503
#: breezy/builtins.py:3786
6093.2.1 by Jonathan Riddell
add .pot file to archive
2504
msgid ""
2505
"If you wish to upgrade to a particular format rather than the\n"
2506
"current default, that can be specified using the --format option.\n"
2507
"As a consequence, you can use the upgrade command this way to\n"
2508
"\"downgrade\" to an earlier format, though some conversions are\n"
2509
"a one way process (e.g. changing from the 1.x default to the\n"
2510
"2.x default) so downgrading is not always possible."
2511
msgstr ""
2512
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2513
#: breezy/builtins.py:3793
6093.2.1 by Jonathan Riddell
add .pot file to archive
2514
msgid ""
2515
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2516
"process (where # is a number). By default, this is left there on\n"
2517
"completion. If the conversion fails, delete the new .bzr directory\n"
2518
"and rename this one back in its place. Use the --clean option to ask\n"
2519
"for the backup.bzr directory to be removed on successful conversion.\n"
2520
"Alternatively, you can delete it by hand if everything looks good\n"
2521
"afterwards."
2522
msgstr ""
2523
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2524
#: breezy/builtins.py:3801
6093.2.1 by Jonathan Riddell
add .pot file to archive
2525
msgid ""
2526
"If the location given is a shared repository, dependent branches\n"
2527
"are also converted provided the repository converts successfully.\n"
2528
"If the conversion of a branch fails, remaining branches are still\n"
2529
"tried."
2530
msgstr ""
2531
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2532
#: breezy/builtins.py:3806
6093.2.1 by Jonathan Riddell
add .pot file to archive
2533
msgid ""
2534
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2535
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2536
msgstr ""
2537
2538
# help of 'format' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2539
#: breezy/builtins.py:3814
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2540
msgid "Upgrade to a specific format.  See \"brz help formats\" for details."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2541
msgstr ""
2542
2543
# title of 'format' option of 'init' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2544
# title of 'format' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2545
#: breezy/builtins.py:3818
6093.2.1 by Jonathan Riddell
add .pot file to archive
2546
msgid "Branch format"
2547
msgstr ""
2548
2549
# help of 'clean' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2550
#: breezy/builtins.py:3820
6093.2.1 by Jonathan Riddell
add .pot file to archive
2551
msgid "Remove the backup.bzr directory if successful."
2552
msgstr ""
2553
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2554
# help of 'dry-run' option of 'add' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2555
# help of 'dry-run' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2556
#: breezy/builtins.py:3822
6349.1.1 by Vincent Ladeuil
Release 2.5b4
2557
msgid "Show what would be done, but don't actually do anything."
2558
msgstr ""
2559
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2560
#: breezy/builtins.py:3837
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2561
msgid "Show or set brz user id."
6581.1.2 by Vincent Ladeuil
Update translation template.
2562
msgstr ""
2563
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2564
#: breezy/builtins.py:3839
6093.2.1 by Jonathan Riddell
add .pot file to archive
2565
msgid ""
2566
":Examples:\n"
2567
"    Show the email of the current user::"
2568
msgstr ""
2569
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2570
#: breezy/builtins.py:3842
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2571
msgid "        brz whoami --email"
6581.1.2 by Vincent Ladeuil
Update translation template.
2572
msgstr ""
2573
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2574
#: breezy/builtins.py:3844
6581.1.2 by Vincent Ladeuil
Update translation template.
2575
msgid "    Set the current user::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2576
msgstr ""
2577
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2578
#: breezy/builtins.py:3846
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2579
msgid "        brz whoami \"Frank Chu <fchu@example.com>\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2580
msgstr ""
2581
2582
# help of 'email' option of 'whoami' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2583
#: breezy/builtins.py:3850
6093.2.1 by Jonathan Riddell
add .pot file to archive
2584
msgid "Display email address only."
2585
msgstr ""
2586
2587
# help of 'branch' option of 'whoami' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2588
#: breezy/builtins.py:3852
6093.2.1 by Jonathan Riddell
add .pot file to archive
2589
msgid "Set identity for the current branch instead of globally."
2590
msgstr ""
2591
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2592
#: breezy/builtins.py:3878
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2593
msgid "--email can only be used to display existing identity"
2594
msgstr ""
2595
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2596
#: breezy/builtins.py:3902
6581.1.2 by Vincent Ladeuil
Update translation template.
2597
msgid "Print or set the branch nickname."
2598
msgstr ""
2599
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2600
#: breezy/builtins.py:3904
6093.2.1 by Jonathan Riddell
add .pot file to archive
2601
msgid ""
6504.1.1 by Vincent Ladeuil
Update translation template
2602
"If unset, the colocated branch name is used for colocated branches, and\n"
2603
"the branch directory name is used for other branches.  To print the\n"
2604
"current nickname, execute with no argument."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2605
msgstr ""
2606
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2607
#: breezy/builtins.py:3908
6093.2.1 by Jonathan Riddell
add .pot file to archive
2608
msgid ""
2609
"Bound branches use the nickname of its master branch unless it is set\n"
2610
"locally."
2611
msgstr ""
2612
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2613
#: breezy/builtins.py:3928
6581.1.2 by Vincent Ladeuil
Update translation template.
2614
msgid "Set/unset and display aliases."
2615
msgstr ""
2616
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2617
#: breezy/builtins.py:3930
6093.2.1 by Jonathan Riddell
add .pot file to archive
2618
msgid ""
2619
":Examples:\n"
2620
"    Show the current aliases::"
2621
msgstr ""
2622
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2623
#: breezy/builtins.py:3933
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2624
msgid "        brz alias"
6581.1.2 by Vincent Ladeuil
Update translation template.
2625
msgstr ""
2626
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2627
#: breezy/builtins.py:3935
6581.1.2 by Vincent Ladeuil
Update translation template.
2628
msgid "    Show the alias specified for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2629
msgstr ""
2630
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2631
#: breezy/builtins.py:3937
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2632
msgid "        brz alias ll"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2633
msgstr ""
2634
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2635
#: breezy/builtins.py:3939
6581.1.2 by Vincent Ladeuil
Update translation template.
2636
msgid "    Set an alias for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2637
msgstr ""
2638
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2639
#: breezy/builtins.py:3941
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2640
msgid "        brz alias ll=\"log --line -r-10..-1\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2641
msgstr ""
2642
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2643
#: breezy/builtins.py:3943
6581.1.2 by Vincent Ladeuil
Update translation template.
2644
msgid "    To remove an alias for 'll'::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2645
msgstr ""
2646
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2647
#: breezy/builtins.py:3945
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2648
msgid "        brz alias --remove ll"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2649
msgstr ""
2650
2651
# help of 'remove' option of 'alias' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2652
#: breezy/builtins.py:3950
6093.2.1 by Jonathan Riddell
add .pot file to archive
2653
msgid "Remove the alias."
2654
msgstr ""
2655
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2656
#: breezy/builtins.py:3968
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2657
msgid "brz alias --remove expects an alias to remove."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2658
msgstr ""
2659
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2660
#: breezy/builtins.py:4149
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2661
msgid "subunit not available. subunit needs to be installed to use --subunit."
2662
msgstr ""
2663
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2664
#: breezy/builtins.py:4166
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2665
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2666
"--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
2667
msgstr ""
2668
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2669
#: breezy/builtins.py:4213
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2670
msgid "Show version of brz."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2671
msgstr ""
2672
2673
# help of 'short' option of 'version' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2674
#: breezy/builtins.py:4217
6093.2.1 by Jonathan Riddell
add .pot file to archive
2675
msgid "Print just the version number."
2676
msgstr ""
2677
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2678
#: breezy/builtins.py:4236
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2679
msgid "It sure does!\n"
2680
msgstr ""
2681
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2682
#: breezy/builtins.py:4260
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2683
#, python-format
2684
msgid "merge base is revision %s\n"
2685
msgstr ""
2686
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2687
#: breezy/builtins.py:4264
6581.1.2 by Vincent Ladeuil
Update translation template.
2688
msgid "Perform a three-way merge."
2689
msgstr ""
2690
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2691
#: breezy/builtins.py:4266
6093.2.1 by Jonathan Riddell
add .pot file to archive
2692
msgid ""
2693
"The source of the merge can be specified either in the form of a branch,\n"
2694
"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.
2695
"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
2696
"or the branch most recently merged using --remember.  The source of the\n"
2697
"merge may also be specified in the form of a path to a file in another\n"
2698
"branch:  in this case, only the modifications to that file are merged into\n"
2699
"the current working tree."
2700
msgstr ""
2701
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2702
#: breezy/builtins.py:4274
6093.2.1 by Jonathan Riddell
add .pot file to archive
2703
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2704
"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
2705
"work from the other branch, automatically determining an appropriate base\n"
2706
"revision.  If this fails, you may need to give an explicit base."
2707
msgstr ""
2708
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2709
#: breezy/builtins.py:4278
6093.2.1 by Jonathan Riddell
add .pot file to archive
2710
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2711
"To pick a different ending revision, pass \"--revision OTHER\".  brz will\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2712
"try to merge in all new work up to and including revision OTHER."
2713
msgstr ""
2714
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2715
#: breezy/builtins.py:4281
6093.2.1 by Jonathan Riddell
add .pot file to archive
2716
msgid ""
2717
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2718
"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
2719
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2720
"not already contain revision BASE, such a merge is commonly referred to as\n"
2721
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2722
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2723
"changes from the other branch is not stored in the commit."
2724
msgstr ""
2725
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2726
#: breezy/builtins.py:4289
6093.2.1 by Jonathan Riddell
add .pot file to archive
2727
msgid "Revision numbers are always relative to the source branch."
2728
msgstr ""
2729
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2730
#: breezy/builtins.py:4291 breezy/conflicts.py:52 breezy/conflicts.py:106
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2731
msgid ""
2732
"Merge will do its best to combine the changes in two branches, but there\n"
2733
"are some kinds of problems only a human can fix.  When it encounters those,\n"
2734
"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
2735
"before you can commit."
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2736
msgstr ""
2737
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2738
#: breezy/builtins.py:4296
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2739
msgid "Use brz resolve when you have fixed a problem.  See also brz conflicts."
6581.1.2 by Vincent Ladeuil
Update translation template.
2740
msgstr ""
2741
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2742
#: breezy/builtins.py:4298
6093.2.1 by Jonathan Riddell
add .pot file to archive
2743
msgid ""
2744
"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
2745
"--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
2746
"to use the default.  To change the default, use --remember. The value will\n"
2747
"only be saved if the remote location can be accessed."
2748
msgstr ""
2749
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2750
#: breezy/builtins.py:4303
6093.2.1 by Jonathan Riddell
add .pot file to archive
2751
msgid ""
2752
"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.
2753
"directory, where they can be reviewed (with brz diff), tested, and then\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2754
"committed to record the result of the merge."
2755
msgstr ""
2756
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2757
#: breezy/builtins.py:4307
6093.2.1 by Jonathan Riddell
add .pot file to archive
2758
msgid ""
2759
"merge refuses to run if there are any uncommitted changes, unless\n"
2760
"--force is given.  If --force is given, then the changes from the source \n"
2761
"will be merged with the current working tree, including any uncommitted\n"
2762
"changes in the tree.  The --force option can also be used to create a\n"
2763
"merge revision which has more than two parents."
2764
msgstr ""
2765
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2766
#: breezy/builtins.py:4313
6093.2.1 by Jonathan Riddell
add .pot file to archive
2767
msgid ""
2768
"If one would like to merge changes from the working tree of the other\n"
2769
"branch without merging any committed revisions, the --uncommitted option\n"
2770
"can be given."
2771
msgstr ""
2772
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2773
#: breezy/builtins.py:4317
6093.2.1 by Jonathan Riddell
add .pot file to archive
2774
msgid ""
2775
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2776
"you to apply each diff hunk and file change, similar to \"shelve\"."
2777
msgstr ""
2778
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2779
#: breezy/builtins.py:4320
6093.2.1 by Jonathan Riddell
add .pot file to archive
2780
msgid ""
2781
":Examples:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2782
"    To merge all new revisions from brz.dev::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2783
msgstr ""
2784
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2785
#: breezy/builtins.py:4323
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2786
msgid "        brz merge ../brz.dev"
6581.1.2 by Vincent Ladeuil
Update translation template.
2787
msgstr ""
2788
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2789
#: breezy/builtins.py:4325
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2790
msgid "    To merge changes up to and including revision 82 from brz.dev::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2791
msgstr ""
2792
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2793
#: breezy/builtins.py:4327
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2794
msgid "        brz merge -r 82 ../brz.dev"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2795
msgstr ""
2796
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2797
#: breezy/builtins.py:4329
6581.1.2 by Vincent Ladeuil
Update translation template.
2798
msgid "    To merge the changes introduced by 82, without previous changes::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2799
msgstr ""
2800
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2801
#: breezy/builtins.py:4331
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2802
msgid "        brz merge -r 81..82 ../brz.dev"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2803
msgstr ""
2804
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2805
#: breezy/builtins.py:4333
6581.1.2 by Vincent Ladeuil
Update translation template.
2806
msgid "    To apply a merge directive contained in /tmp/merge::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2807
msgstr ""
2808
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2809
#: breezy/builtins.py:4335
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2810
msgid "        brz merge /tmp/merge"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2811
msgstr ""
2812
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2813
#: breezy/builtins.py:4337
6093.2.1 by Jonathan Riddell
add .pot file to archive
2814
msgid ""
2815
"    To create a merge revision with three parents from two branches\n"
2816
"    feature1a and feature1b:"
2817
msgstr ""
2818
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2819
#: breezy/builtins.py:4340
6093.2.1 by Jonathan Riddell
add .pot file to archive
2820
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2821
"        brz merge ../feature1a\n"
2822
"        brz merge ../feature1b --force\n"
2823
"        brz commit -m 'revision with three parents'"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2824
msgstr ""
2825
2826
# help of 'force' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2827
#: breezy/builtins.py:4352
6093.2.1 by Jonathan Riddell
add .pot file to archive
2828
msgid "Merge even if the destination tree has uncommitted changes."
2829
msgstr ""
2830
2831
# help of 'uncommitted' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2832
#: breezy/builtins.py:4358
6093.2.1 by Jonathan Riddell
add .pot file to archive
2833
msgid ""
2834
"Apply uncommitted changes from a working copy, instead of branch changes."
2835
msgstr ""
2836
2837
# help of 'pull' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2838
#: breezy/builtins.py:4360
6093.2.1 by Jonathan Riddell
add .pot file to archive
2839
msgid ""
2840
"If the destination is already completely merged into the source, pull from "
2841
"the source rather than merging.  When this happens, you do not need to "
2842
"commit the result."
2843
msgstr ""
2844
2845
# help of 'directory' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2846
#: breezy/builtins.py:4365
6093.2.1 by Jonathan Riddell
add .pot file to archive
2847
msgid ""
2848
"Branch to merge into, rather than the one containing the working directory."
2849
msgstr ""
2850
2851
# help of 'preview' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2852
#: breezy/builtins.py:4367
6093.2.1 by Jonathan Riddell
add .pot file to archive
2853
msgid "Instead of merging, show a diff of the merge."
2854
msgstr ""
2855
2856
# help of 'interactive' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2857
#: breezy/builtins.py:4369
6093.2.1 by Jonathan Riddell
add .pot file to archive
2858
msgid "Select changes interactively."
2859
msgstr ""
2860
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2861
#: breezy/builtins.py:4391
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2862
msgid ""
2863
"Merging into empty branches not currently supported, https://bugs.launchpad."
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2864
"net/brz/+bug/308562"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2865
msgstr ""
2866
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2867
#: breezy/builtins.py:4418
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2868
msgid "Cannot use --uncommitted with bundles or merge directives."
2869
msgstr ""
2870
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2871
#: breezy/builtins.py:4429
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2872
msgid "Cannot use --uncommitted and --revision at the same time."
2873
msgstr ""
2874
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2875
#: breezy/builtins.py:4449
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2876
msgid "merger: "
2877
msgstr ""
2878
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2879
#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2880
msgid "Nothing to do."
2881
msgstr ""
2882
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2883
#: breezy/builtins.py:4455
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2884
msgid "Cannot pull individual files"
2885
msgstr ""
2886
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2887
#: breezy/builtins.py:4463
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2888
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
2889
msgstr ""
2890
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2891
#: breezy/builtins.py:4521
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2892
#, python-format
2893
msgid "Show-base is not supported for this merge type. %s"
2894
msgstr ""
2895
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2896
#: breezy/builtins.py:4530
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2897
#, python-format
2898
msgid "Conflict reduction is not supported for merge type %s."
2899
msgstr ""
2900
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2901
#: breezy/builtins.py:4534
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2902
msgid "Cannot do conflict reduction and show base."
2903
msgstr ""
2904
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2905
#: breezy/builtins.py:4645
6581.1.2 by Vincent Ladeuil
Update translation template.
2906
msgid "No location specified or remembered"
2907
msgstr ""
2908
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2909
#: breezy/builtins.py:4647
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
2910
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
2911
msgid "{0} remembered {1} location {2}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2912
msgstr ""
2913
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2914
#: breezy/builtins.py:4653
6581.1.2 by Vincent Ladeuil
Update translation template.
2915
msgid "Redo a merge."
2916
msgstr ""
2917
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2918
#: breezy/builtins.py:4655
6093.2.1 by Jonathan Riddell
add .pot file to archive
2919
msgid ""
2920
"Use this if you want to try a different merge technique while resolving\n"
2921
"conflicts.  Some merge techniques are better than others, and remerge\n"
2922
"lets you try different ones on different files."
2923
msgstr ""
2924
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2925
#: breezy/builtins.py:4659
6093.2.1 by Jonathan Riddell
add .pot file to archive
2926
msgid ""
2927
"The options for remerge have the same meaning and defaults as the ones for\n"
2928
"merge.  The difference is that remerge can (only) be run when there is a\n"
2929
"pending merge, and it lets you specify particular files."
2930
msgstr ""
2931
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2932
#: breezy/builtins.py:4663
6093.2.1 by Jonathan Riddell
add .pot file to archive
2933
msgid ""
2934
":Examples:\n"
2935
"    Re-do the merge of all conflicted files, and show the base text in\n"
2936
"    conflict regions, in addition to the usual THIS and OTHER texts::"
2937
msgstr ""
2938
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2939
#: breezy/builtins.py:4667
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2940
msgid "        brz remerge --show-base"
6581.1.2 by Vincent Ladeuil
Update translation template.
2941
msgstr ""
2942
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2943
#: breezy/builtins.py:4669
6093.2.1 by Jonathan Riddell
add .pot file to archive
2944
msgid ""
2945
"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2946
"    additional processing to reduce the size of conflict regions::"
2947
msgstr ""
2948
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2949
#: breezy/builtins.py:4672
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2950
msgid "        brz remerge --merge-type weave --reprocess foobar"
6093.2.1 by Jonathan Riddell
add .pot file to archive
2951
msgstr ""
2952
2953
# help of 'show-base' option of 'merge' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
2954
# help of 'show-base' option of 'pull' command
2955
# help of 'show-base' option of 'remerge' command
2956
# help of 'show-base' option of 'update' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2957
#: breezy/builtins.py:4679
6093.2.1 by Jonathan Riddell
add .pot file to archive
2958
msgid "Show base revision text in conflicts."
2959
msgstr ""
2960
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2961
#: breezy/builtins.py:4691
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2962
msgid ""
2963
"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
2964
"merges."
2965
msgstr ""
2966
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2967
#: breezy/builtins.py:4749
6581.1.2 by Vincent Ladeuil
Update translation template.
2968
msgid ""
2969
"Set files in the working tree back to the contents of a previous revision."
2970
msgstr ""
2971
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2972
#: breezy/builtins.py:4751
6535.1.1 by Vincent Ladeuil
Release 2.6b2
2973
msgid ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
2974
"Giving a list of files will revert only those files.  Otherwise, all files\n"
2975
"will be reverted.  If the revision is not specified with '--revision', the\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
2976
"working tree basis revision is used. A revert operation affects only the\n"
2977
"working tree, not any revision history like the branch and repository or\n"
2978
"the working tree basis revision."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2979
msgstr ""
2980
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2981
#: breezy/builtins.py:4757
6093.2.1 by Jonathan Riddell
add .pot file to archive
2982
msgid ""
2983
"To remove only some changes, without reverting to a prior version, use\n"
2984
"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2985
"will remove the changes introduced by the second last commit (-2), without\n"
2986
"affecting the changes introduced by the last commit (-1).  To remove\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
2987
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2988
"To update the branch to a specific revision or the latest revision and\n"
2989
"update the working tree accordingly while preserving local changes, see the\n"
2990
"update command."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2991
msgstr ""
2992
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2993
#: breezy/builtins.py:4766
6093.2.1 by Jonathan Riddell
add .pot file to archive
2994
msgid ""
6535.1.1 by Vincent Ladeuil
Release 2.6b2
2995
"Uncommitted changes to files that are reverted will be discarded.\n"
2996
"Howver, by default, any files that have been manually changed will be\n"
2997
"backed up first.  (Files changed only by merge are not backed up.)  Backup\n"
2998
"files have '.~#~' appended to their name, where # is a number."
6093.2.1 by Jonathan Riddell
add .pot file to archive
2999
msgstr ""
3000
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3001
#: breezy/builtins.py:4771
6093.2.1 by Jonathan Riddell
add .pot file to archive
3002
msgid ""
3003
"When you provide files, you can use their current pathname or the pathname\n"
3004
"from the target revision.  So you can use revert to \"undelete\" a file by\n"
3005
"name.  If you name a directory, all the contents of that directory will be\n"
3006
"reverted."
3007
msgstr ""
3008
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3009
#: breezy/builtins.py:4776
6093.2.1 by Jonathan Riddell
add .pot file to archive
3010
msgid ""
3011
"If you have newly added files since the target revision, they will be\n"
3012
"removed.  If the files to be removed have been changed, backups will be\n"
3013
"created as above.  Directories containing unknown files will not be\n"
3014
"deleted."
3015
msgstr ""
3016
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3017
#: breezy/builtins.py:4781
6093.2.1 by Jonathan Riddell
add .pot file to archive
3018
msgid ""
3019
"The working tree contains a list of revisions that have been merged but\n"
3020
"not yet committed. These revisions will be included as additional parents\n"
3021
"of the next commit.  Normally, using revert clears that list as well as\n"
3022
"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.
3023
"of uncommitted merges alone and reverts only the files.  Use ``brz revert\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3024
".`` 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.
3025
"and ``brz revert --forget-merges`` to clear the pending merge list without\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3026
"reverting any files."
3027
msgstr ""
3028
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3029
#: breezy/builtins.py:4790
6093.2.1 by Jonathan Riddell
add .pot file to archive
3030
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3031
"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
3032
"changes from a branch in a single revision.  To do this, perform the merge\n"
3033
"as desired.  Then doing revert with the \"--forget-merges\" option will "
3034
"keep\n"
3035
"the content of the tree as it was, but it will clear the list of pending\n"
3036
"merges.  The next commit will then contain all of the changes that are\n"
3037
"present in the other branch, but without any other parent revisions.\n"
3038
"Because this technique forgets where these changes originated, it may\n"
3039
"cause additional conflicts on later merges involving the same source and\n"
3040
"target branches."
3041
msgstr ""
3042
3043
# help of 'no-backup' option of 'revert' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3044
#: breezy/builtins.py:4804
6093.2.1 by Jonathan Riddell
add .pot file to archive
3045
msgid "Do not save backups of reverted files."
3046
msgstr ""
3047
3048
# help of 'forget-merges' option of 'revert' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3049
#: breezy/builtins.py:4806
6093.2.1 by Jonathan Riddell
add .pot file to archive
3050
msgid "Remove pending merge marker, without changing any files."
3051
msgstr ""
3052
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3053
#: breezy/builtins.py:4837
6093.2.1 by Jonathan Riddell
add .pot file to archive
3054
msgid ""
3055
"Show help on a command or other topic.\n"
3056
"    "
3057
msgstr ""
3058
3059
# help of 'long' option of 'help' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3060
#: breezy/builtins.py:4842
6093.2.1 by Jonathan Riddell
add .pot file to archive
3061
msgid "Show help on all commands."
3062
msgstr ""
3063
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3064
#: breezy/builtins.py:4871
6581.1.2 by Vincent Ladeuil
Update translation template.
3065
msgid "Show unmerged/unpulled revisions between two branches."
3066
msgstr ""
3067
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3068
#: breezy/builtins.py:4873
6581.1.2 by Vincent Ladeuil
Update translation template.
3069
msgid "OTHER_BRANCH may be local or remote."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3070
msgstr ""
3071
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3072
#: breezy/builtins.py:4875
6093.2.1 by Jonathan Riddell
add .pot file to archive
3073
msgid ""
3074
"To filter on a range of revisions, you can use the command -r begin..end\n"
3075
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3076
"also valid.\n"
3077
"        \n"
3078
":Exit values:\n"
3079
"    1 - some missing revisions\n"
3080
"    0 - no missing revisions"
3081
msgstr ""
3082
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3083
#: breezy/builtins.py:4885
6093.2.1 by Jonathan Riddell
add .pot file to archive
3084
msgid ""
3085
"    Determine the missing revisions between this and the branch at the\n"
3086
"    remembered pull location::"
3087
msgstr ""
3088
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3089
#: breezy/builtins.py:4888
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3090
msgid "        brz missing"
6581.1.2 by Vincent Ladeuil
Update translation template.
3091
msgstr ""
3092
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3093
#: breezy/builtins.py:4890
6581.1.2 by Vincent Ladeuil
Update translation template.
3094
msgid "    Determine the missing revisions between this and another branch::"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3095
msgstr ""
3096
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3097
#: breezy/builtins.py:4892
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3098
msgid "        brz missing http://server/branch"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3099
msgstr ""
3100
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3101
#: breezy/builtins.py:4894
6093.2.1 by Jonathan Riddell
add .pot file to archive
3102
msgid ""
3103
"    Determine the missing revisions up to a specific revision on the other\n"
3104
"    branch::"
3105
msgstr ""
3106
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3107
#: breezy/builtins.py:4897
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3108
msgid "        brz missing -r ..-10"
6581.1.2 by Vincent Ladeuil
Update translation template.
3109
msgstr ""
3110
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3111
#: breezy/builtins.py:4899
6093.2.1 by Jonathan Riddell
add .pot file to archive
3112
msgid ""
3113
"    Determine the missing revisions up to a specific revision on this\n"
3114
"    branch::"
3115
msgstr ""
3116
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3117
#: breezy/builtins.py:4902
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3118
msgid "        brz missing --my-revision ..-10"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3119
msgstr ""
3120
3121
# help of 'reverse' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3122
#: breezy/builtins.py:4909
6093.2.1 by Jonathan Riddell
add .pot file to archive
3123
msgid "Reverse the order of revisions."
3124
msgstr ""
3125
3126
# help of 'mine-only' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3127
#: breezy/builtins.py:4911
6093.2.1 by Jonathan Riddell
add .pot file to archive
3128
msgid "Display changes in the local branch only."
3129
msgstr ""
3130
3131
# help of 'this' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3132
#: breezy/builtins.py:4912
6093.2.1 by Jonathan Riddell
add .pot file to archive
3133
msgid "Same as --mine-only."
3134
msgstr ""
3135
3136
# help of 'theirs-only' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3137
#: breezy/builtins.py:4914
6093.2.1 by Jonathan Riddell
add .pot file to archive
3138
msgid "Display changes in the remote branch only."
3139
msgstr ""
3140
3141
# help of 'other' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3142
#: breezy/builtins.py:4915
6093.2.1 by Jonathan Riddell
add .pot file to archive
3143
msgid "Same as --theirs-only."
3144
msgstr ""
3145
3146
# help of 'revision' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3147
#: breezy/builtins.py:4920
6093.2.1 by Jonathan Riddell
add .pot file to archive
3148
msgid ""
3149
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3150
"details."
3151
msgstr ""
3152
3153
# help of 'my-revision' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3154
#: breezy/builtins.py:4924
6093.2.1 by Jonathan Riddell
add .pot file to archive
3155
msgid ""
3156
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3157
"details."
3158
msgstr ""
3159
6150.1.1 by Jonathan Riddell
update bzr.pot
3160
# help of 'include-merged' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3161
#: breezy/builtins.py:4927
6093.2.1 by Jonathan Riddell
add .pot file to archive
3162
msgid "Show all revisions in addition to the mainline ones."
3163
msgstr ""
3164
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3165
#: breezy/builtins.py:4981
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3166
msgid "No peer location known or specified."
3167
msgstr ""
3168
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3169
#: breezy/builtins.py:4985
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3170
#, python-brace-format
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3171
msgid "Using saved parent location: {0}\n"
3172
msgstr ""
3173
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3174
#: breezy/builtins.py:5018
6143.1.7 by Jonathan Riddell
update bzr.pot
3175
#, python-format
3176
msgid "You have %d extra revision:\n"
3177
msgid_plural "You have %d extra revisions:\n"
3178
msgstr[0] ""
3179
msgstr[1] ""
3180
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3181
#: breezy/builtins.py:5038
6143.1.7 by Jonathan Riddell
update bzr.pot
3182
#, python-format
3183
msgid "You are missing %d revision:\n"
3184
msgid_plural "You are missing %d revisions:\n"
3185
msgstr[0] ""
3186
msgstr[1] ""
3187
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3188
#: breezy/builtins.py:5053
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3189
msgid "This branch has no new revisions.\n"
3190
msgstr ""
3191
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3192
#: breezy/builtins.py:5056
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3193
msgid "Other branch has no new revisions.\n"
3194
msgstr ""
3195
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3196
#: breezy/builtins.py:5061
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3197
msgid "Branches are up to date.\n"
3198
msgstr ""
3199
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3200
#: breezy/builtins.py:5072
6581.1.2 by Vincent Ladeuil
Update translation template.
3201
msgid "Compress the data within a repository."
3202
msgstr ""
3203
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3204
#: breezy/builtins.py:5074
6093.2.1 by Jonathan Riddell
add .pot file to archive
3205
msgid ""
3206
"This operation compresses the data within a bazaar repository. As\n"
3207
"bazaar supports automatic packing of repository, this operation is\n"
3208
"normally not required to be done manually."
3209
msgstr ""
3210
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3211
#: breezy/builtins.py:5078
6093.2.1 by Jonathan Riddell
add .pot file to archive
3212
msgid ""
3213
"During the pack operation, bazaar takes a backup of existing repository\n"
3214
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3215
"automatically when it is safe to do so. To save disk space by removing\n"
3216
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3217
"used."
3218
msgstr ""
3219
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3220
#: breezy/builtins.py:5084
6093.2.1 by Jonathan Riddell
add .pot file to archive
3221
msgid ""
3222
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3223
"during or immediately after repacking, you may be left with a state\n"
3224
"where the deletion has been written to disk but the new packs have not\n"
3225
"been. In this case the repository may be unusable."
3226
msgstr ""
3227
3228
# help of 'clean-obsolete-packs' option of 'pack' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3229
#: breezy/builtins.py:5093
6093.2.1 by Jonathan Riddell
add .pot file to archive
3230
msgid "Delete obsolete packs to save disk space."
3231
msgstr ""
3232
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3233
#: breezy/builtins.py:5107
6581.1.2 by Vincent Ladeuil
Update translation template.
3234
msgid "List the installed plugins."
3235
msgstr ""
3236
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3237
#: breezy/builtins.py:5109
6093.2.1 by Jonathan Riddell
add .pot file to archive
3238
msgid ""
3239
"This command displays the list of installed plugins including\n"
3240
"version of plugin and a short description of each."
3241
msgstr ""
3242
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3243
#: breezy/builtins.py:5112
6581.1.2 by Vincent Ladeuil
Update translation template.
3244
msgid "--verbose shows the path where each plugin is located."
3245
msgstr ""
3246
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3247
#: breezy/builtins.py:5114
6093.2.1 by Jonathan Riddell
add .pot file to archive
3248
msgid ""
3249
"A plugin is an external component for Bazaar that extends the\n"
3250
"revision control system, by adding or replacing code in Bazaar.\n"
3251
"Plugins can do a variety of things, including overriding commands,\n"
3252
"adding new commands, providing additional network transports and\n"
3253
"customizing log output."
3254
msgstr ""
3255
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3256
#: breezy/builtins.py:5120
6093.2.1 by Jonathan Riddell
add .pot file to archive
3257
msgid ""
3258
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3259
"for further information on plugins including where to find them and how to\n"
3260
"install them. Instructions are also provided there on how to write new\n"
3261
"plugins using the Python programming language."
3262
msgstr ""
3263
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3264
#: breezy/builtins.py:5136
6093.2.1 by Jonathan Riddell
add .pot file to archive
3265
msgid "Show testament (signing-form) of a revision."
3266
msgstr ""
3267
3268
# help of 'long' option of 'testament' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3269
#: breezy/builtins.py:5139
6093.2.1 by Jonathan Riddell
add .pot file to archive
3270
msgid "Produce long-format testament."
3271
msgstr ""
3272
3273
# help of 'strict' option of 'testament' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3274
#: breezy/builtins.py:5141
6093.2.1 by Jonathan Riddell
add .pot file to archive
3275
msgid "Produce a strict-format testament."
3276
msgstr ""
3277
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3278
#: breezy/builtins.py:5168
6093.2.1 by Jonathan Riddell
add .pot file to archive
3279
msgid "Show the origin of each line in a file."
3280
msgstr ""
3281
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3282
#: breezy/builtins.py:5170
6093.2.1 by Jonathan Riddell
add .pot file to archive
3283
msgid ""
3284
"This prints out the given file with an annotation on the left side\n"
3285
"indicating which revision, author and date introduced the change."
3286
msgstr ""
3287
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3288
#: breezy/builtins.py:5173
6093.2.1 by Jonathan Riddell
add .pot file to archive
3289
msgid ""
3290
"If the origin is the same for a run of consecutive lines, it is\n"
3291
"shown only at the top, unless the --all option is given."
3292
msgstr ""
3293
3294
# help of 'all' option of 'annotate' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3295
#: breezy/builtins.py:5181
6093.2.1 by Jonathan Riddell
add .pot file to archive
3296
msgid "Show annotations on all lines."
3297
msgstr ""
3298
3299
# help of 'long' option of 'annotate' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3300
#: breezy/builtins.py:5182
6093.2.1 by Jonathan Riddell
add .pot file to archive
3301
msgid "Show commit date in annotations."
3302
msgstr ""
3303
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3304
#: breezy/builtins.py:5269
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3305
msgid "Cannot sign a range of non-revision-history revisions"
3306
msgstr ""
3307
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3308
#: breezy/builtins.py:5281
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3309
msgid "Please supply either one revision, or a range."
3310
msgstr ""
3311
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3312
#: breezy/builtins.py:5285
6093.2.1 by Jonathan Riddell
add .pot file to archive
3313
msgid ""
3314
"Convert the current branch into a checkout of the supplied branch.\n"
3315
"If no branch is supplied, rebind to the last bound location."
3316
msgstr ""
3317
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3318
#: breezy/builtins.py:5288
6093.2.1 by Jonathan Riddell
add .pot file to archive
3319
msgid ""
3320
"Once converted into a checkout, commits must succeed on the master branch\n"
3321
"before they will be applied to the local branch."
3322
msgstr ""
3323
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3324
#: breezy/builtins.py:5291
6093.2.1 by Jonathan Riddell
add .pot file to archive
3325
msgid ""
3326
"Bound branches use the nickname of its master branch unless it is set\n"
3327
"locally, in which case binding will update the local nickname to be\n"
3328
"that of the master."
3329
msgstr ""
3330
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3331
#: breezy/builtins.py:5306
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3332
msgid "No location supplied.  This format does not remember old locations."
3333
msgstr ""
3334
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3335
#: breezy/builtins.py:5312
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3336
msgid "Branch is already bound"
3337
msgstr ""
3338
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3339
#: breezy/builtins.py:5315
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3340
msgid "No location supplied and no previous location known"
3341
msgstr ""
3342
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3343
#: breezy/builtins.py:5321
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3344
msgid "These branches have diverged. Try merging, and then bind again."
3345
msgstr ""
3346
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3347
#: breezy/builtins.py:5328
6093.2.1 by Jonathan Riddell
add .pot file to archive
3348
msgid "Convert the current checkout into a regular branch."
3349
msgstr ""
3350
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3351
#: breezy/builtins.py:5330
6093.2.1 by Jonathan Riddell
add .pot file to archive
3352
msgid ""
3353
"After unbinding, the local branch is considered independent and subsequent\n"
3354
"commits will be local only."
3355
msgstr ""
3356
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3357
#: breezy/builtins.py:5341
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3358
msgid "Local branch is not bound"
3359
msgstr ""
3360
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3361
#: breezy/builtins.py:5345
6093.2.1 by Jonathan Riddell
add .pot file to archive
3362
msgid "Remove the last committed revision."
3363
msgstr ""
3364
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3365
#: breezy/builtins.py:5347
6093.2.1 by Jonathan Riddell
add .pot file to archive
3366
msgid ""
3367
"--verbose will print out what is being removed.\n"
3368
"--dry-run will go through all the motions, but not actually\n"
3369
"remove anything."
3370
msgstr ""
3371
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3372
#: breezy/builtins.py:5351
6093.2.1 by Jonathan Riddell
add .pot file to archive
3373
msgid ""
3374
"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.
3375
"specified revision.  For example, \"brz uncommit -r 15\" will leave the\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3376
"branch at revision 15."
3377
msgstr ""
3378
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3379
#: breezy/builtins.py:5355
6093.2.1 by Jonathan Riddell
add .pot file to archive
3380
msgid ""
3381
"Uncommit leaves the working tree ready for a new commit.  The only change\n"
3382
"it may make is to restore any pending merges that were present before\n"
3383
"the commit."
3384
msgstr ""
3385
3386
# help of 'dry-run' option of 'uncommit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3387
#: breezy/builtins.py:5366
6093.2.1 by Jonathan Riddell
add .pot file to archive
3388
msgid "Don't actually make changes."
3389
msgstr ""
3390
3391
# help of 'force' option of 'uncommit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3392
#: breezy/builtins.py:5367
6093.2.1 by Jonathan Riddell
add .pot file to archive
3393
msgid "Say yes to all questions."
3394
msgstr ""
3395
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
3396
# help of 'keep-tags' option of 'uncommit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3397
#: breezy/builtins.py:5369
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
3398
msgid "Keep tags that point to removed revisions."
3399
msgstr ""
3400
6093.2.1 by Jonathan Riddell
add .pot file to archive
3401
# help of 'local' option of 'uncommit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3402
#: breezy/builtins.py:5371
6093.2.1 by Jonathan Riddell
add .pot file to archive
3403
msgid "Only remove the commits from the local branch when in a checkout."
3404
msgstr ""
3405
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3406
#: breezy/builtins.py:5420
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3407
msgid "No revisions to uncommit.\n"
3408
msgstr ""
3409
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3410
#: breezy/builtins.py:5435
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3411
msgid "Dry-run, pretending to remove the above revisions.\n"
3412
msgstr ""
3413
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3414
#: breezy/builtins.py:5438
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3415
msgid "The above revision(s) will be removed.\n"
3416
msgstr ""
3417
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3418
#: breezy/builtins.py:5442
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3419
msgid "Uncommit these revisions"
3420
msgstr ""
3421
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3422
#: breezy/builtins.py:5445
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3423
msgid "Canceled\n"
3424
msgstr ""
3425
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3426
#: breezy/builtins.py:5452
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3427
#, python-format
3428
msgid ""
3429
"You can restore the old tip by running:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3430
"  brz pull . -r revid:%s\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3431
msgstr ""
3432
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3433
#: breezy/builtins.py:5457
6093.2.1 by Jonathan Riddell
add .pot file to archive
3434
msgid "Break a dead lock."
3435
msgstr ""
3436
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3437
#: breezy/builtins.py:5459
6093.2.1 by Jonathan Riddell
add .pot file to archive
3438
msgid ""
3439
"This command breaks a lock on a repository, branch, working directory or\n"
3440
"config file."
3441
msgstr ""
3442
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3443
#: breezy/builtins.py:5462
6093.2.1 by Jonathan Riddell
add .pot file to archive
3444
msgid ""
3445
"CAUTION: Locks should only be broken when you are sure that the process\n"
3446
"holding the lock has been stopped."
3447
msgstr ""
3448
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3449
#: breezy/builtins.py:5465
6093.2.1 by Jonathan Riddell
add .pot file to archive
3450
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3451
"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
3452
"[location]' command."
3453
msgstr ""
3454
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3455
#: breezy/builtins.py:5468
6093.2.1 by Jonathan Riddell
add .pot file to archive
3456
msgid ""
3457
":Examples:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3458
"    brz break-lock\n"
3459
"    brz break-lock brz+ssh://example.com/brz/foo\n"
3460
"    brz break-lock --conf ~/.bazaar"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3461
msgstr ""
3462
3463
# help of 'config' option of 'break-lock' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3464
#: breezy/builtins.py:5477
6093.2.1 by Jonathan Riddell
add .pot file to archive
3465
msgid "LOCATION is the directory where the config lock is."
3466
msgstr ""
3467
3468
# help of 'force' option of 'break-lock' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3469
#: breezy/builtins.py:5479
6093.2.1 by Jonathan Riddell
add .pot file to archive
3470
msgid "Do not ask for confirmation before breaking the lock."
3471
msgstr ""
3472
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3473
# help of 'protocol=bzr' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3474
#: breezy/builtins.py:5514
6581.1.2 by Vincent Ladeuil
Update translation template.
3475
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3476
msgstr ""
3477
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3478
#: breezy/builtins.py:5515
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3479
msgid "Run the brz server."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3480
msgstr ""
3481
3482
# help of 'inet' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3483
#: breezy/builtins.py:5521
6093.2.1 by Jonathan Riddell
add .pot file to archive
3484
msgid "Serve on stdin/out for use from inetd or sshd."
3485
msgstr ""
3486
3487
# title of 'protocol' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3488
#: breezy/builtins.py:5522
6093.2.1 by Jonathan Riddell
add .pot file to archive
3489
msgid "protocol"
3490
msgstr ""
3491
3492
# help of 'protocol' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3493
#: breezy/builtins.py:5523
6093.2.1 by Jonathan Riddell
add .pot file to archive
3494
msgid "Protocol to serve."
3495
msgstr ""
3496
6504.1.1 by Vincent Ladeuil
Update translation template
3497
# help of 'listen' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3498
#: breezy/builtins.py:5527
6504.1.1 by Vincent Ladeuil
Update translation template
3499
msgid "Listen for connections on nominated address."
3500
msgstr ""
3501
6093.2.1 by Jonathan Riddell
add .pot file to archive
3502
# help of 'port' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3503
#: breezy/builtins.py:5529
6093.2.1 by Jonathan Riddell
add .pot file to archive
3504
msgid ""
6504.1.1 by Vincent Ladeuil
Update translation template
3505
"Listen for connections on nominated port.  Passing 0 as the port number will "
3506
"result in a dynamically allocated port.  The default port depends on the "
3507
"protocol."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3508
msgstr ""
3509
3510
# help of 'directory' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3511
#: breezy/builtins.py:5534
6093.2.1 by Jonathan Riddell
add .pot file to archive
3512
msgid "Serve contents of this directory."
3513
msgstr ""
3514
3515
# help of 'allow-writes' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3516
#: breezy/builtins.py:5536
6093.2.1 by Jonathan Riddell
add .pot file to archive
3517
msgid ""
3518
"By default the server is a readonly server.  Supplying --allow-writes "
3519
"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.
3520
"Note that ``brz serve`` does not perform authentication, so unless some form "
6093.2.1 by Jonathan Riddell
add .pot file to archive
3521
"of external authentication is arranged supplying this option leads to global "
3522
"uncontrolled write access to your file system."
3523
msgstr ""
3524
6252.1.1 by Vincent Ladeuil
Release 2.5b3
3525
# help of 'client-timeout' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3526
#: breezy/builtins.py:5545
6252.1.1 by Vincent Ladeuil
Release 2.5b3
3527
msgid "Override the default idle client timeout (5min)."
3528
msgstr ""
3529
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3530
#: breezy/builtins.py:5563
6093.2.1 by Jonathan Riddell
add .pot file to archive
3531
msgid "Combine a tree into its containing tree."
3532
msgstr ""
3533
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3534
#: breezy/builtins.py:5565
6093.2.1 by Jonathan Riddell
add .pot file to archive
3535
msgid "This command requires the target tree to be in a rich-root format."
3536
msgstr ""
3537
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3538
#: breezy/builtins.py:5567
6093.2.1 by Jonathan Riddell
add .pot file to archive
3539
msgid ""
3540
"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.
3541
"not part of it.  (Such trees can be produced by \"brz split\", but also by\n"
3542
"running \"brz branch\" with the target inside a tree.)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3543
msgstr ""
3544
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3545
#: breezy/builtins.py:5571
6093.2.1 by Jonathan Riddell
add .pot file to archive
3546
msgid ""
3547
"The result is a combined tree, with the subtree no longer an independent\n"
3548
"part.  This is marked as a merge of the subtree into the containing tree,\n"
3549
"and all history is preserved."
3550
msgstr ""
3551
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3552
#: breezy/builtins.py:5589
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3553
#, python-format
3554
msgid ""
3555
"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.
3556
"You can use brz upgrade on the repository."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3557
msgstr ""
3558
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3559
#: breezy/builtins.py:5599 breezy/builtins.py:5605
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
3560
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
3561
msgid "Cannot join {0}.  {1}"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3562
msgstr ""
3563
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3564
#: breezy/builtins.py:5609
6093.2.1 by Jonathan Riddell
add .pot file to archive
3565
msgid "Split a subdirectory of a tree into a separate tree."
3566
msgstr ""
3567
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3568
#: breezy/builtins.py:5611
6093.2.1 by Jonathan Riddell
add .pot file to archive
3569
msgid ""
3570
"This command will produce a target tree in a format that supports\n"
3571
"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
3572
"converted into earlier formats like 'dirstate-tags'."
3573
msgstr ""
3574
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3575
#: breezy/builtins.py:5615
6093.2.1 by Jonathan Riddell
add .pot file to archive
3576
msgid ""
3577
"The TREE argument should be a subdirectory of a working tree.  That\n"
3578
"subdirectory will be converted into an independent tree, with its own\n"
3579
"branch.  Commits in the top-level tree will not apply to the new subtree."
3580
msgstr ""
3581
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3582
#: breezy/builtins.py:5695
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3583
msgid "No submit branch specified or known"
3584
msgstr ""
3585
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3586
#: breezy/builtins.py:5704 breezy/send.py:109
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3587
msgid "No public branch specified or known"
3588
msgstr ""
3589
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3590
#: breezy/builtins.py:5709
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3591
msgid "brz merge-directive takes at most two one revision identifiers"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3592
msgstr ""
3593
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3594
#: breezy/builtins.py:5718
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3595
msgid "No revisions to bundle."
3596
msgstr ""
3597
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3598
#: breezy/builtins.py:5737
6093.2.1 by Jonathan Riddell
add .pot file to archive
3599
msgid "Mail or create a merge-directive for submitting changes."
3600
msgstr ""
3601
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3602
#: breezy/builtins.py:5739
6093.2.1 by Jonathan Riddell
add .pot file to archive
3603
msgid "A merge directive provides many things needed for requesting merges:"
3604
msgstr ""
3605
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3606
#: breezy/builtins.py:5741
6093.2.1 by Jonathan Riddell
add .pot file to archive
3607
msgid "* A machine-readable description of the merge to perform"
3608
msgstr ""
3609
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3610
#: breezy/builtins.py:5743
6093.2.1 by Jonathan Riddell
add .pot file to archive
3611
msgid "* An optional patch that is a preview of the changes requested"
3612
msgstr ""
3613
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3614
#: breezy/builtins.py:5745
6093.2.1 by Jonathan Riddell
add .pot file to archive
3615
msgid ""
3616
"* An optional bundle of revision data, so that the changes can be applied\n"
3617
"  directly from the merge directive, without retrieving data from a\n"
3618
"  branch."
3619
msgstr ""
3620
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3621
#: breezy/builtins.py:5749
6093.2.1 by Jonathan Riddell
add .pot file to archive
3622
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3623
"`brz send` creates a compact data set that, when applied using brz\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3624
"merge, has the same effect as merging from the source branch.  "
3625
msgstr ""
3626
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3627
#: breezy/builtins.py:5752
6093.2.1 by Jonathan Riddell
add .pot file to archive
3628
msgid ""
3629
"By default the merge directive is self-contained and can be applied to any\n"
3630
"branch containing submit_branch in its ancestory without needing access to\n"
3631
"the source branch."
3632
msgstr ""
3633
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3634
#: breezy/builtins.py:5756
6093.2.1 by Jonathan Riddell
add .pot file to archive
3635
msgid ""
3636
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3637
"revisions, but only a structured request to merge from the\n"
3638
"public_location.  In that case the public_branch is needed and it must be\n"
3639
"up-to-date and accessible to the recipient.  The public_branch is always\n"
3640
"included if known, so that people can check it later."
3641
msgstr ""
3642
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3643
#: breezy/builtins.py:5762
6093.2.1 by Jonathan Riddell
add .pot file to archive
3644
msgid ""
3645
"The submit branch defaults to the parent of the source branch, but can be\n"
3646
"overridden.  Both submit branch and public branch will be remembered in\n"
3647
"branch.conf the first time they are used for a particular branch.  The\n"
3648
"source branch defaults to that containing the working directory, but can\n"
3649
"be changed using --from."
3650
msgstr ""
3651
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3652
#: breezy/builtins.py:5768
6093.2.1 by Jonathan Riddell
add .pot file to archive
3653
msgid ""
3654
"Both the submit branch and the public branch follow the usual behavior with\n"
3655
"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
3656
"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
3657
"omit the location to use the default.  To change the default, use\n"
3658
"--remember. The value will only be saved if the location can be accessed."
3659
msgstr ""
3660
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3661
#: breezy/builtins.py:5774
6093.2.1 by Jonathan Riddell
add .pot file to archive
3662
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3663
"In order to calculate those changes, brz must analyse the submit branch.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3664
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3665
"If a public location is known for the submit_branch, that location is used\n"
3666
"in the merge directive."
3667
msgstr ""
3668
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3669
#: breezy/builtins.py:5779
6093.2.1 by Jonathan Riddell
add .pot file to archive
3670
msgid ""
3671
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3672
"given, in which case it is sent to a file."
3673
msgstr ""
3674
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3675
#: breezy/builtins.py:5782
6093.2.1 by Jonathan Riddell
add .pot file to archive
3676
msgid ""
3677
"Mail is sent using your preferred mail program.  This should be transparent\n"
3678
"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
3679
"If the preferred client can't be found (or used), your editor will be used."
3680
msgstr ""
3681
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3682
#: breezy/builtins.py:5786
6093.2.1 by Jonathan Riddell
add .pot file to archive
3683
msgid ""
3684
"To use a specific mail program, set the mail_client configuration option.\n"
3685
"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
3686
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3687
"\" (MacOS X's\n"
3688
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3689
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
3690
"add\n"
3691
"supported clients."
3692
msgstr ""
3693
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3694
#: breezy/builtins.py:5793
6093.2.1 by Jonathan Riddell
add .pot file to archive
3695
msgid ""
3696
"If mail is being sent, a to address is required.  This can be supplied\n"
3697
"either on the commandline, by setting the submit_to configuration\n"
3698
"option in the branch itself or the child_submit_to configuration option\n"
3699
"in the submit branch."
3700
msgstr ""
3701
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3702
#: breezy/builtins.py:5798
6093.2.1 by Jonathan Riddell
add .pot file to archive
3703
msgid ""
3704
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3705
"and\n"
3706
"merge directive format 2.  It is significantly faster and smaller than\n"
3707
"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
3708
"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3709
"format 1.  It is compatible with Bazaar 0.12 - 0.18."
3710
msgstr ""
3711
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3712
#: breezy/builtins.py:5804
6093.2.1 by Jonathan Riddell
add .pot file to archive
3713
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3714
"The merge directives created by brz send may be applied using brz merge or\n"
3715
"brz pull by specifying a file containing a merge directive as the location."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3716
msgstr ""
3717
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3718
#: breezy/builtins.py:5807
6093.2.1 by Jonathan Riddell
add .pot file to archive
3719
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3720
"brz send makes extensive use of public locations to map local locations "
6093.2.1 by Jonathan Riddell
add .pot file to archive
3721
"into\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3722
"URLs that can be used by other people.  See `brz help configuration` to\n"
3723
"set them, and use `brz info` to display them."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3724
msgstr ""
3725
3726
# help of 'output' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3727
#: breezy/builtins.py:5831
6093.2.1 by Jonathan Riddell
add .pot file to archive
3728
msgid "Write merge directive to this file or directory; use - for stdout."
3729
msgstr ""
3730
3731
# help of 'strict' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3732
#: breezy/builtins.py:5835
6093.2.1 by Jonathan Riddell
add .pot file to archive
3733
msgid ""
3734
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3735
"strict disables the check."
3736
msgstr ""
3737
3738
# help of 'mail-to' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3739
#: breezy/builtins.py:5837
6093.2.1 by Jonathan Riddell
add .pot file to archive
3740
msgid "Mail the request to this address."
3741
msgstr ""
3742
3743
# help of 'body' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3744
#: breezy/builtins.py:5841
6093.2.1 by Jonathan Riddell
add .pot file to archive
3745
msgid "Body for the email."
3746
msgstr ""
3747
3748
# help of 'no-bundle' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3749
#: breezy/builtins.py:5894
6093.2.1 by Jonathan Riddell
add .pot file to archive
3750
msgid "Do not include a bundle in the merge directive."
3751
msgstr ""
3752
3753
# help of 'no-patch' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3754
#: breezy/builtins.py:5895
6093.2.1 by Jonathan Riddell
add .pot file to archive
3755
msgid "Do not include a preview patch in the merge directive."
3756
msgstr ""
3757
3758
# help of 'remember' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3759
#: breezy/builtins.py:5898
6093.2.1 by Jonathan Riddell
add .pot file to archive
3760
msgid "Remember submit and public branch."
3761
msgstr ""
3762
3763
# help of 'from' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3764
#: breezy/builtins.py:5900
6093.2.1 by Jonathan Riddell
add .pot file to archive
3765
msgid ""
3766
"Branch to generate the submission from, rather than the one containing the "
3767
"working directory."
3768
msgstr ""
3769
3770
# title of 'format' option of 'send' command
6437.2.2 by Vincent Ladeuil
Release 2.5b5
3771
# title of 'format' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3772
#: breezy/builtins.py:5910 breezy/cmd_version_info.py:76
6093.2.1 by Jonathan Riddell
add .pot file to archive
3773
msgid "format"
3774
msgstr ""
3775
3776
# help of 'format' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3777
#: breezy/builtins.py:5911
6093.2.1 by Jonathan Riddell
add .pot file to archive
3778
msgid "Use the specified output format."
3779
msgstr ""
3780
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3781
#: breezy/builtins.py:5933
6093.2.1 by Jonathan Riddell
add .pot file to archive
3782
msgid "Create, remove or modify a tag naming a revision."
3783
msgstr ""
3784
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3785
#: breezy/builtins.py:5935
6093.2.1 by Jonathan Riddell
add .pot file to archive
3786
msgid ""
3787
"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
3788
"(--revision) option can be given -rtag:X, where X is any previously\n"
3789
"created tag."
3790
msgstr ""
3791
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3792
#: breezy/builtins.py:5939
6093.2.1 by Jonathan Riddell
add .pot file to archive
3793
msgid ""
3794
"Tags are stored in the branch.  Tags are copied from one branch to another\n"
3795
"along when you branch, push, pull or merge."
3796
msgstr ""
3797
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3798
#: breezy/builtins.py:5942
6093.2.1 by Jonathan Riddell
add .pot file to archive
3799
msgid ""
3800
"It is an error to give a tag name that already exists unless you pass\n"
3801
"--force, in which case the tag is moved to point to the new revision."
3802
msgstr ""
3803
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3804
#: breezy/builtins.py:5945
6093.2.1 by Jonathan Riddell
add .pot file to archive
3805
msgid ""
3806
"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.
3807
"``brz\n"
3808
"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3809
msgstr ""
3810
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3811
#: breezy/builtins.py:5948
6093.2.1 by Jonathan Riddell
add .pot file to archive
3812
msgid ""
3813
"If no tag name is specified it will be determined through the \n"
3814
"'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.
3815
"upstream releases by reading configure.ac. See ``brz help hooks`` for\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3816
"details."
3817
msgstr ""
3818
3819
# help of 'delete' option of 'tag' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3820
#: breezy/builtins.py:5958
6093.2.1 by Jonathan Riddell
add .pot file to archive
3821
msgid "Delete this tag rather than placing it."
3822
msgstr ""
3823
3824
# help of 'directory' option of 'tag' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3825
#: breezy/builtins.py:5961
6093.2.1 by Jonathan Riddell
add .pot file to archive
3826
msgid "Branch in which to place the tag."
3827
msgstr ""
3828
3829
# help of 'force' option of 'tag' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3830
#: breezy/builtins.py:5963
6093.2.1 by Jonathan Riddell
add .pot file to archive
3831
msgid "Replace existing tags."
3832
msgstr ""
3833
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3834
#: breezy/builtins.py:5978
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3835
msgid "No tag specified to delete."
3836
msgstr ""
3837
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3838
#: breezy/builtins.py:5980
6504.1.1 by Vincent Ladeuil
Update translation template
3839
#, python-format
3840
msgid "Deleted tag %s."
3841
msgstr ""
3842
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3843
#: breezy/builtins.py:5985
6581.1.2 by Vincent Ladeuil
Update translation template.
3844
msgid "Tags can only be placed on a single revision, not on a range"
3845
msgstr ""
3846
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3847
#: breezy/builtins.py:5994
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3848
msgid "Please specify a tag name."
3849
msgstr ""
3850
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3851
#: breezy/builtins.py:6002
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3852
#, python-format
3853
msgid "Tag %s already exists for that revision."
3854
msgstr ""
3855
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3856
#: breezy/builtins.py:6006
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3857
#, python-format
3858
msgid "Created tag %s."
3859
msgstr ""
3860
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3861
#: breezy/builtins.py:6008
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3862
#, python-format
3863
msgid "Updated tag %s."
3864
msgstr ""
3865
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3866
#: breezy/builtins.py:6012
6093.2.1 by Jonathan Riddell
add .pot file to archive
3867
msgid "List tags."
3868
msgstr ""
3869
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3870
#: breezy/builtins.py:6014
6093.2.1 by Jonathan Riddell
add .pot file to archive
3871
msgid ""
3872
"This command shows a table of tag names and the revisions they reference."
3873
msgstr ""
3874
3875
# help of 'directory' option of 'tags' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3876
#: breezy/builtins.py:6020
6093.2.1 by Jonathan Riddell
add .pot file to archive
3877
msgid "Branch whose tags should be displayed."
3878
msgstr ""
3879
3880
# help of 'sort' option of 'tags' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3881
#: breezy/builtins.py:6022
6093.2.1 by Jonathan Riddell
add .pot file to archive
3882
msgid "Sort tags by different criteria."
3883
msgstr ""
3884
3885
# title of 'sort' option of 'tags' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3886
#: breezy/builtins.py:6022
6093.2.1 by Jonathan Riddell
add .pot file to archive
3887
msgid "Sorting"
3888
msgstr ""
3889
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3890
#: breezy/builtins.py:6091
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3891
msgid "Reconfigure the type of a brz directory."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3892
msgstr ""
3893
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3894
#: breezy/builtins.py:6093
6093.2.1 by Jonathan Riddell
add .pot file to archive
3895
msgid "A target configuration must be specified."
3896
msgstr ""
3897
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3898
#: breezy/builtins.py:6095
6093.2.1 by Jonathan Riddell
add .pot file to archive
3899
msgid ""
3900
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3901
"The order of preference is\n"
3902
"1. For a lightweight checkout, the current bound location.\n"
3903
"2. For branches that used to be checkouts, the previously-bound location.\n"
3904
"3. The push location.\n"
3905
"4. The parent location.\n"
3906
"If none of these is available, --bind-to must be specified."
3907
msgstr ""
3908
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3909
# title of 'tree_type' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3910
#: breezy/builtins.py:6109
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3911
msgid "Tree type"
6093.2.1 by Jonathan Riddell
add .pot file to archive
3912
msgstr ""
3913
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3914
# help of 'tree_type' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3915
#: breezy/builtins.py:6110
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3916
msgid "The relation between branch and tree."
3917
msgstr ""
3918
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3919
# help of 'tree_type=branch' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3920
#: breezy/builtins.py:6112
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3921
msgid "Reconfigure to be an unbound branch with no working tree."
3922
msgstr ""
3923
3924
# help of 'tree_type=tree' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3925
#: breezy/builtins.py:6113
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3926
msgid "Reconfigure to be an unbound branch with a working tree."
3927
msgstr ""
3928
3929
# help of 'tree_type=checkout' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3930
#: breezy/builtins.py:6114
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3931
msgid "Reconfigure to be a bound branch with a working tree."
3932
msgstr ""
3933
3934
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3935
#: breezy/builtins.py:6115
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3936
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3937
msgstr ""
3938
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3939
# title of 'repository_type' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3940
#: breezy/builtins.py:6120
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3941
msgid "Repository type"
3942
msgstr ""
3943
3944
# help of 'repository_type' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3945
#: breezy/builtins.py:6121
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3946
msgid "Location fo the repository."
3947
msgstr ""
3948
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3949
# help of 'repository_type=standalone' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3950
#: breezy/builtins.py:6123
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3951
msgid ""
3952
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3953
msgstr ""
3954
3955
# help of 'repository_type=use-shared' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3956
#: breezy/builtins.py:6125
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3957
msgid "Reconfigure to use a shared repository."
3958
msgstr ""
3959
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3960
# title of 'repository_trees' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3961
#: breezy/builtins.py:6129
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3962
msgid "Trees in Repository"
3963
msgstr ""
3964
3965
# help of 'repository_trees' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3966
#: breezy/builtins.py:6130
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3967
msgid "Whether new branches in the repository have trees."
6093.2.1 by Jonathan Riddell
add .pot file to archive
3968
msgstr ""
3969
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3970
# help of 'repository_trees=with-trees' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3971
#: breezy/builtins.py:6132
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3972
msgid "Reconfigure repository to create working trees on branches by default."
3973
msgstr ""
3974
3975
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3976
#: breezy/builtins.py:6134
6349.1.1 by Vincent Ladeuil
Release 2.5b4
3977
msgid ""
3978
"Reconfigure repository to not create working trees on branches by default."
3979
msgstr ""
3980
6093.2.1 by Jonathan Riddell
add .pot file to archive
3981
# help of 'bind-to' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3982
#: breezy/builtins.py:6137
6093.2.1 by Jonathan Riddell
add .pot file to archive
3983
msgid "Branch to bind checkout to."
3984
msgstr ""
3985
3986
# help of 'force' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3987
#: breezy/builtins.py:6139
6093.2.1 by Jonathan Riddell
add .pot file to archive
3988
msgid "Perform reconfiguration even if local changes will be lost."
3989
msgstr ""
3990
3991
# help of 'stacked-on' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3992
#: breezy/builtins.py:6142
6093.2.1 by Jonathan Riddell
add .pot file to archive
3993
msgid "Reconfigure a branch to be stacked on another branch."
3994
msgstr ""
3995
3996
# help of 'unstacked' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3997
#: breezy/builtins.py:6146
6093.2.1 by Jonathan Riddell
add .pot file to archive
3998
msgid ""
3999
"Reconfigure a branch to be unstacked.  This may require copying substantial "
4000
"data into it."
4001
msgstr ""
4002
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4003
#: breezy/builtins.py:6156
6504.1.1 by Vincent Ladeuil
Update translation template
4004
msgid "Can't use both --stacked-on and --unstacked"
4005
msgstr ""
4006
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4007
#: breezy/builtins.py:6170
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4008
msgid "No target configuration specified"
4009
msgstr ""
4010
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4011
#: breezy/builtins.py:6205
6093.2.1 by Jonathan Riddell
add .pot file to archive
4012
msgid "Set the branch of a checkout and update."
4013
msgstr ""
4014
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4015
#: breezy/builtins.py:6207
6093.2.1 by Jonathan Riddell
add .pot file to archive
4016
msgid ""
4017
"For lightweight checkouts, this changes the branch being referenced.\n"
4018
"For heavyweight checkouts, this checks that there are no local commits\n"
4019
"versus the current bound branch, then it makes the local branch a mirror\n"
4020
"of the new location and binds to it."
4021
msgstr ""
4022
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4023
#: breezy/builtins.py:6212
6093.2.1 by Jonathan Riddell
add .pot file to archive
4024
msgid ""
4025
"In both cases, the working tree is updated and uncommitted changes\n"
4026
"are merged. The user can commit or revert these as they desire."
4027
msgstr ""
4028
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4029
#: breezy/builtins.py:6215
6093.2.1 by Jonathan Riddell
add .pot file to archive
4030
msgid "Pending merges need to be committed or reverted before using switch."
4031
msgstr ""
4032
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4033
#: breezy/builtins.py:6217
6093.2.1 by Jonathan Riddell
add .pot file to archive
4034
msgid ""
4035
"The path to the branch to switch to can be specified relative to the parent\n"
4036
"directory of the current branch. For example, if you are currently in a\n"
4037
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4038
"/path/to/newbranch."
4039
msgstr ""
4040
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4041
#: breezy/builtins.py:6222
6093.2.1 by Jonathan Riddell
add .pot file to archive
4042
msgid ""
4043
"Bound branches use the nickname of its master branch unless it is set\n"
4044
"locally, in which case switching will update the local nickname to be\n"
4045
"that of the master."
4046
msgstr ""
4047
4048
# help of 'force' option of 'switch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4049
#: breezy/builtins.py:6230
6093.2.1 by Jonathan Riddell
add .pot file to archive
4050
msgid "Switch even if local commits will be lost."
4051
msgstr ""
4052
4053
# help of 'create-branch' option of 'switch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4054
#: breezy/builtins.py:6233
6504.1.1 by Vincent Ladeuil
Update translation template
4055
msgid "Create the target branch from this one before switching to it."
4056
msgstr ""
4057
6581.1.2 by Vincent Ladeuil
Update translation template.
4058
# help of 'store' option of 'switch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4059
#: breezy/builtins.py:6236
6581.1.2 by Vincent Ladeuil
Update translation template.
4060
msgid "Store and restore uncommitted changes in the branch."
4061
msgstr ""
4062
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4063
#: breezy/builtins.py:6250
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4064
msgid "You must supply either a revision or a location"
4065
msgstr ""
4066
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4067
#: breezy/builtins.py:6263
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4068
msgid "cannot create branch without source branch"
4069
msgstr ""
4070
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4071
#: breezy/builtins.py:6289
6093.2.1 by Jonathan Riddell
add .pot file to archive
4072
msgid "Manage filtered views."
4073
msgstr ""
4074
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4075
#: breezy/builtins.py:6291
6093.2.1 by Jonathan Riddell
add .pot file to archive
4076
msgid ""
4077
"Views provide a mask over the tree so that users can focus on\n"
4078
"a subset of a tree when doing their work. After creating a view,\n"
4079
"commands that support a list of files - status, diff, commit, etc -\n"
4080
"effectively have that list of files implicitly given each time.\n"
4081
"An explicit list of files can still be given but those files\n"
4082
"must be within the current view."
4083
msgstr ""
4084
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4085
#: breezy/builtins.py:6298
6093.2.1 by Jonathan Riddell
add .pot file to archive
4086
msgid ""
4087
"In most cases, a view has a short life-span: it is created to make\n"
4088
"a selected change and is deleted once that change is committed.\n"
4089
"At other times, you may wish to create one or more named views\n"
4090
"and switch between them."
4091
msgstr ""
4092
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4093
#: breezy/builtins.py:6303
6093.2.1 by Jonathan Riddell
add .pot file to archive
4094
msgid ""
4095
"To disable the current view without deleting it, you can switch to\n"
4096
"the pseudo view called ``off``. This can be useful when you need\n"
4097
"to see the whole tree for an operation or two (e.g. merge) but\n"
4098
"want to switch back to your view after that."
4099
msgstr ""
4100
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4101
#: breezy/builtins.py:6308
6093.2.1 by Jonathan Riddell
add .pot file to archive
4102
msgid ""
4103
":Examples:\n"
4104
"  To define the current view::"
4105
msgstr ""
4106
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4107
#: breezy/builtins.py:6311
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4108
msgid "    brz view file1 dir1 ..."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4109
msgstr ""
4110
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4111
#: breezy/builtins.py:6313
6093.2.1 by Jonathan Riddell
add .pot file to archive
4112
msgid "  To list the current view::"
4113
msgstr ""
4114
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4115
#: breezy/builtins.py:6315
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4116
msgid "    brz view"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4117
msgstr ""
4118
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4119
#: breezy/builtins.py:6317
6093.2.1 by Jonathan Riddell
add .pot file to archive
4120
msgid "  To delete the current view::"
4121
msgstr ""
4122
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4123
#: breezy/builtins.py:6319
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4124
msgid "    brz view --delete"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4125
msgstr ""
4126
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4127
#: breezy/builtins.py:6321
6093.2.1 by Jonathan Riddell
add .pot file to archive
4128
msgid "  To disable the current view without deleting it::"
4129
msgstr ""
4130
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4131
#: breezy/builtins.py:6323
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4132
msgid "    brz view --switch off"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4133
msgstr ""
4134
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4135
#: breezy/builtins.py:6325
6093.2.1 by Jonathan Riddell
add .pot file to archive
4136
msgid "  To define a named view and switch to it::"
4137
msgstr ""
4138
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4139
#: breezy/builtins.py:6327
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4140
msgid "    brz view --name view-name file1 dir1 ..."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4141
msgstr ""
4142
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4143
#: breezy/builtins.py:6329
6093.2.1 by Jonathan Riddell
add .pot file to archive
4144
msgid "  To list a named view::"
4145
msgstr ""
4146
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4147
#: breezy/builtins.py:6331
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4148
msgid "    brz view --name view-name"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4149
msgstr ""
4150
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4151
#: breezy/builtins.py:6333
6093.2.1 by Jonathan Riddell
add .pot file to archive
4152
msgid "  To delete a named view::"
4153
msgstr ""
4154
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4155
#: breezy/builtins.py:6335
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4156
msgid "    brz view --name view-name --delete"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4157
msgstr ""
4158
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4159
#: breezy/builtins.py:6337
6093.2.1 by Jonathan Riddell
add .pot file to archive
4160
msgid "  To switch to a named view::"
4161
msgstr ""
4162
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4163
#: breezy/builtins.py:6339
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4164
msgid "    brz view --switch view-name"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4165
msgstr ""
4166
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4167
#: breezy/builtins.py:6341
6093.2.1 by Jonathan Riddell
add .pot file to archive
4168
msgid "  To list all views defined::"
4169
msgstr ""
4170
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4171
#: breezy/builtins.py:6343
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4172
msgid "    brz view --all"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4173
msgstr ""
4174
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4175
#: breezy/builtins.py:6345
6093.2.1 by Jonathan Riddell
add .pot file to archive
4176
msgid "  To delete all views::"
4177
msgstr ""
4178
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4179
#: breezy/builtins.py:6347
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4180
msgid "    brz view --delete --all"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4181
msgstr ""
4182
4183
# help of 'all' option of 'view' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4184
#: breezy/builtins.py:6354
6093.2.1 by Jonathan Riddell
add .pot file to archive
4185
msgid "Apply list or delete action to all views."
4186
msgstr ""
4187
4188
# help of 'delete' option of 'view' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4189
#: breezy/builtins.py:6357
6093.2.1 by Jonathan Riddell
add .pot file to archive
4190
msgid "Delete the view."
4191
msgstr ""
4192
4193
# help of 'name' option of 'view' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4194
#: breezy/builtins.py:6360
6093.2.1 by Jonathan Riddell
add .pot file to archive
4195
msgid "Name of the view to define, list or delete."
4196
msgstr ""
4197
4198
# help of 'switch' option of 'view' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4199
#: breezy/builtins.py:6364
6093.2.1 by Jonathan Riddell
add .pot file to archive
4200
msgid "Name of the view to switch to."
4201
msgstr ""
4202
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4203
#: breezy/builtins.py:6383
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4204
msgid "Both --delete and a file list specified"
4205
msgstr ""
4206
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4207
#: breezy/builtins.py:6386
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4208
msgid "Both --delete and --switch specified"
4209
msgstr ""
4210
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4211
#: breezy/builtins.py:6389
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4212
msgid "Deleted all views.\n"
4213
msgstr ""
4214
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4215
#: breezy/builtins.py:6391
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4216
msgid "No current view to delete"
4217
msgstr ""
4218
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4219
#: breezy/builtins.py:6394
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4220
#, python-format
4221
msgid "Deleted '%s' view.\n"
4222
msgstr ""
4223
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4224
#: breezy/builtins.py:6398
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4225
msgid "Both --switch and a file list specified"
4226
msgstr ""
4227
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4228
#: breezy/builtins.py:6401
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4229
msgid "Both --switch and --all specified"
4230
msgstr ""
4231
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4232
#: breezy/builtins.py:6404
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4233
msgid "No current view to disable"
4234
msgstr ""
4235
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4236
#: breezy/builtins.py:6406
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4237
#, python-format
4238
msgid "Disabled '%s' view.\n"
4239
msgstr ""
4240
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4241
#: breezy/builtins.py:6410 breezy/builtins.py:6432
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4242
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
4243
msgid "Using '{0}' view: {1}\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4244
msgstr ""
4245
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4246
#: breezy/builtins.py:6413
6504.1.1 by Vincent Ladeuil
Update translation template
4247
msgid "Views defined:\n"
4248
msgstr ""
4249
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4250
#: breezy/builtins.py:6422
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4251
msgid "No views defined.\n"
4252
msgstr ""
4253
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4254
#: breezy/builtins.py:6429
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4255
msgid "Cannot change the 'off' pseudo view"
4256
msgstr ""
4257
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4258
#: breezy/builtins.py:6437
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4259
msgid "No current view.\n"
4260
msgstr ""
4261
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4262
#: breezy/builtins.py:6440
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4263
#, python-brace-format
6138.2.6 by Jonathan Riddell
update bzr.pot
4264
msgid "'{0}' view is: {1}\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4265
msgstr ""
4266
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4267
#: breezy/builtins.py:6460
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4268
msgid "    <no hooks installed>\n"
4269
msgstr ""
4270
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4271
#: breezy/builtins.py:6464
6093.2.1 by Jonathan Riddell
add .pot file to archive
4272
msgid "Remove a branch."
4273
msgstr ""
4274
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4275
#: breezy/builtins.py:6466
6093.2.1 by Jonathan Riddell
add .pot file to archive
4276
msgid ""
4277
"This will remove the branch from the specified location but \n"
4278
"will keep any working tree or repository in place."
4279
msgstr ""
4280
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4281
#: breezy/builtins.py:6471
6093.2.1 by Jonathan Riddell
add .pot file to archive
4282
msgid "  Remove the branch at repo/trunk::"
4283
msgstr ""
4284
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4285
#: breezy/builtins.py:6473
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4286
msgid "    brz remove-branch repo/trunk"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4287
msgstr ""
4288
6504.1.1 by Vincent Ladeuil
Update translation template
4289
# help of 'force' option of 'remove-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4290
#: breezy/builtins.py:6480
6504.1.1 by Vincent Ladeuil
Update translation template
4291
msgid "Remove branch even if it is the active branch."
4292
msgstr ""
4293
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4294
#: breezy/builtins.py:6494
6504.1.1 by Vincent Ladeuil
Update translation template
4295
msgid "Branch is active. Use --force to remove it."
4296
msgstr ""
4297
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4298
# help of 'writer=plain' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4299
#: breezy/builtins.py:6498
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4300
msgid "Plaintext diff output."
4301
msgstr ""
4302
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4303
#: breezy/builtins.py:6499
6093.2.1 by Jonathan Riddell
add .pot file to archive
4304
msgid "Temporarily set aside some changes from the current tree."
4305
msgstr ""
4306
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4307
#: breezy/builtins.py:6501
6093.2.1 by Jonathan Riddell
add .pot file to archive
4308
msgid ""
4309
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4310
"ie. out of the way, until a later time when you can bring them back from\n"
4311
"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
4312
"your working tree, and so they aren't propagated along with your branch nor\n"
4313
"will they survive its deletion."
4314
msgstr ""
4315
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4316
#: breezy/builtins.py:6507
6093.2.1 by Jonathan Riddell
add .pot file to archive
4317
msgid "If shelve --list is specified, previously-shelved changes are listed."
4318
msgstr ""
4319
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4320
#: breezy/builtins.py:6509
6093.2.1 by Jonathan Riddell
add .pot file to archive
4321
msgid ""
4322
"Shelve is intended to help separate several sets of changes that have\n"
4323
"been inappropriately mingled.  If you just want to get rid of all changes\n"
4324
"and you don't need to restore them later, use revert.  If you want to\n"
4325
"shelve all text changes at once, use shelve --all."
4326
msgstr ""
4327
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4328
#: breezy/builtins.py:6514
6093.2.1 by Jonathan Riddell
add .pot file to archive
4329
msgid ""
4330
"If filenames are specified, only the changes to those files will be\n"
4331
"shelved. Other files will be left untouched."
4332
msgstr ""
4333
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4334
#: breezy/builtins.py:6517
6093.2.1 by Jonathan Riddell
add .pot file to archive
4335
msgid ""
4336
"If a revision is specified, changes since that revision will be shelved."
4337
msgstr ""
4338
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4339
#: breezy/builtins.py:6519
6093.2.1 by Jonathan Riddell
add .pot file to archive
4340
msgid ""
4341
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4342
"restore the most recently shelved changes."
4343
msgstr ""
4344
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4345
#: breezy/builtins.py:6522
6093.2.1 by Jonathan Riddell
add .pot file to archive
4346
msgid ""
4347
"For complicated changes, it is possible to edit the changes in a separate\n"
4348
"editor program to decide what the file remaining in the working copy\n"
4349
"should look like.  To do this, add the configuration option"
4350
msgstr ""
4351
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4352
#: breezy/builtins.py:6526
6093.2.1 by Jonathan Riddell
add .pot file to archive
4353
msgid "    change_editor = PROGRAM @new_path @old_path"
4354
msgstr ""
4355
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4356
#: breezy/builtins.py:6528
6093.2.1 by Jonathan Riddell
add .pot file to archive
4357
msgid ""
4358
"where @new_path is replaced with the path of the new version of the \n"
4359
"file and @old_path is replaced with the path of the old version of \n"
4360
"the file.  The PROGRAM should save the new file with the desired \n"
4361
"contents of the file in the working tree.\n"
4362
"    "
4363
msgstr ""
4364
4365
# help of 'all' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4366
#: breezy/builtins.py:6540
6093.2.1 by Jonathan Riddell
add .pot file to archive
4367
msgid "Shelve all changes."
4368
msgstr ""
4369
4370
# help of 'writer' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4371
#: breezy/builtins.py:6542
6093.2.1 by Jonathan Riddell
add .pot file to archive
4372
msgid "Method to use for writing diffs."
4373
msgstr ""
4374
4375
# title of 'writer' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4376
#: breezy/builtins.py:6542
6093.2.1 by Jonathan Riddell
add .pot file to archive
4377
msgid "writer"
4378
msgstr ""
4379
4380
# help of 'list' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4381
#: breezy/builtins.py:6546
6093.2.1 by Jonathan Riddell
add .pot file to archive
4382
msgid "List shelved changes."
4383
msgstr ""
4384
4385
# help of 'destroy' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4386
#: breezy/builtins.py:6548
6093.2.1 by Jonathan Riddell
add .pot file to archive
4387
msgid "Destroy removed changes instead of shelving them."
4388
msgstr ""
4389
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4390
#: breezy/builtins.py:6577
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4391
msgid "No shelved changes."
4392
msgstr ""
4393
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4394
#: breezy/builtins.py:6588
6093.2.1 by Jonathan Riddell
add .pot file to archive
4395
msgid "Restore shelved changes."
4396
msgstr ""
4397
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4398
#: breezy/builtins.py:6590
6093.2.1 by Jonathan Riddell
add .pot file to archive
4399
msgid ""
4400
"By default, the most recently shelved changes are restored. However if you\n"
4401
"specify a shelf by id those changes will be restored instead.  This works\n"
4402
"best when the changes don't depend on each other."
4403
msgstr ""
4404
4405
# help of 'action' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4406
#: breezy/builtins.py:6599
6093.2.1 by Jonathan Riddell
add .pot file to archive
4407
msgid "The action to perform."
4408
msgstr ""
4409
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4410
# title of 'action' option of 'resolve' command
4411
# title of 'action' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4412
#: breezy/builtins.py:6599 breezy/conflicts.py:694
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4413
msgid "action"
4414
msgstr ""
4415
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4416
# help of 'action=apply' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4417
#: breezy/builtins.py:6601
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4418
msgid "Apply changes and remove from the shelf."
4419
msgstr ""
4420
4421
# help of 'action=dry-run' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4422
#: breezy/builtins.py:6602
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4423
msgid "Show changes, but do not apply or remove them."
4424
msgstr ""
4425
4426
# help of 'action=preview' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4427
#: breezy/builtins.py:6603
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4428
msgid ""
4429
"Instead of unshelving the changes, show the diff that would result from "
4430
"unshelving."
4431
msgstr ""
4432
4433
# help of 'action=delete-only' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4434
#: breezy/builtins.py:6605
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4435
msgid "Delete changes without applying them."
4436
msgstr ""
4437
4438
# help of 'action=keep' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4439
#: breezy/builtins.py:6606
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4440
msgid "Apply changes but don't delete them."
4441
msgstr ""
4442
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4443
#: breezy/builtins.py:6621
6093.2.1 by Jonathan Riddell
add .pot file to archive
4444
msgid "Remove unwanted files from working tree."
4445
msgstr ""
4446
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4447
#: breezy/builtins.py:6623
6093.2.1 by Jonathan Riddell
add .pot file to archive
4448
msgid ""
4449
"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
4450
"files are never deleted."
4451
msgstr ""
4452
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4453
#: breezy/builtins.py:6626
6093.2.1 by Jonathan Riddell
add .pot file to archive
4454
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4455
"Another class is 'detritus', which includes files emitted by brz during\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4456
"normal operations and selftests.  (The value of these files decreases with\n"
4457
"time.)"
4458
msgstr ""
4459
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4460
#: breezy/builtins.py:6630
6093.2.1 by Jonathan Riddell
add .pot file to archive
4461
msgid ""
4462
"If no options are specified, unknown files are deleted.  Otherwise, option\n"
4463
"flags are respected, and may be combined."
4464
msgstr ""
4465
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4466
#: breezy/builtins.py:6633
6093.2.1 by Jonathan Riddell
add .pot file to archive
4467
msgid "To check what clean-tree will do, use --dry-run."
4468
msgstr ""
4469
4470
# help of 'ignored' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4471
#: breezy/builtins.py:6636
6093.2.1 by Jonathan Riddell
add .pot file to archive
4472
msgid "Delete all ignored files."
4473
msgstr ""
4474
4475
# help of 'detritus' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4476
#: breezy/builtins.py:6637
6093.2.1 by Jonathan Riddell
add .pot file to archive
4477
msgid ""
4478
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4479
msgstr ""
4480
4481
# help of 'unknown' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4482
#: breezy/builtins.py:6640
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4483
msgid "Delete files unknown to brz (default)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
4484
msgstr ""
4485
4486
# help of 'dry-run' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4487
#: breezy/builtins.py:6641
6093.2.1 by Jonathan Riddell
add .pot file to archive
4488
msgid "Show files to delete instead of deleting them."
4489
msgstr ""
4490
4491
# help of 'force' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4492
#: breezy/builtins.py:6643
6093.2.1 by Jonathan Riddell
add .pot file to archive
4493
msgid "Do not prompt before deleting."
4494
msgstr ""
4495
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4496
#: breezy/bundle/__init__.py:59
6138.4.4 by Jonathan Riddell
update bzr.pot
4497
msgid "A directory cannot be a bundle"
4498
msgstr ""
4499
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4500
#: breezy/bundle/apply_bundle.py:40
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4501
msgid "Install revisions"
4502
msgstr ""
4503
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4504
#: breezy/bundle/commands.py:64
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4505
msgid "--verbose requires a merge directive"
4506
msgstr ""
4507
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4508
#: breezy/bundle/commands.py:67
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4509
msgid "Bundle format not supported"
4510
msgstr ""
4511
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4512
#: breezy/bundle/commands.py:77
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4513
msgid "Records\n"
4514
msgstr ""
4515
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4516
#: breezy/bundle/commands.py:81
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4517
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4518
msgid "{0}: {1} ({2} multiparent)\n"
4519
msgstr ""
4520
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4521
#: breezy/bundle/commands.py:83
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4522
#, python-format
4523
msgid "unique files: %d\n"
4524
msgstr ""
4525
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4526
#: breezy/bundle/commands.py:92
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4527
msgid "Revisions\n"
4528
msgstr ""
4529
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4530
#: breezy/bundle/commands.py:93
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4531
#, python-format
4532
msgid "nicks: %s\n"
4533
msgstr ""
4534
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4535
#: breezy/bundle/commands.py:95
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4536
#, python-format
4537
msgid ""
4538
"committers: \n"
4539
"%s\n"
4540
msgstr ""
4541
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4542
#: breezy/bundle/commands.py:103
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4543
msgid "Decoded contents\n"
4544
msgstr ""
4545
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4546
#: breezy/bundle/serializer/v4.py:327
6138.4.4 by Jonathan Riddell
update bzr.pot
4547
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
4548
msgid "Bundling %d revision."
4549
msgid_plural "Bundling %d revisions."
4550
msgstr[0] ""
4551
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
4552
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4553
#: breezy/bzrdir.py:487
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4554
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4555
msgid ""
6150.1.1 by Jonathan Riddell
update bzr.pot
4556
"making backup of {0}\n"
4557
"  to {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
4558
msgstr ""
4559
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4560
#: breezy/bzrdir.py:510
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4561
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4562
msgid "renamed {0} to {1}"
4563
msgstr ""
4564
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4565
#: breezy/bzrdir.py:1639
6138.4.4 by Jonathan Riddell
update bzr.pot
4566
#, python-format
4567
msgid ""
4568
"Source repository format does not support stacking, using format:\n"
4569
"  %s"
4570
msgstr ""
4571
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4572
#: breezy/bzrdir.py:1659
6138.4.4 by Jonathan Riddell
update bzr.pot
4573
#, python-format
4574
msgid ""
4575
"Source branch format does not support stacking, using format:\n"
4576
"  %s"
4577
msgstr ""
4578
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4579
#: breezy/bzrdir.py:1805
6138.4.4 by Jonathan Riddell
update bzr.pot
4580
msgid "starting repository conversion"
4581
msgstr ""
4582
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4583
#: breezy/bzrdir.py:2026
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4584
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4585
msgid "Using default stacking branch {0} at {1}"
4586
msgstr ""
4587
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4588
#: breezy/check.py:108
6138.4.4 by Jonathan Riddell
update bzr.pot
4589
msgid "check"
4590
msgstr ""
4591
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4592
#: breezy/check.py:110
6138.4.4 by Jonathan Riddell
update bzr.pot
4593
msgid "checking revisions"
4594
msgstr ""
4595
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4596
#: breezy/check.py:112
6138.4.4 by Jonathan Riddell
update bzr.pot
4597
msgid "checking commit contents"
4598
msgstr ""
4599
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4600
#: breezy/check.py:114
6138.4.4 by Jonathan Riddell
update bzr.pot
4601
msgid "checking file graphs"
4602
msgstr ""
4603
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4604
#: breezy/check.py:118
6138.4.4 by Jonathan Riddell
update bzr.pot
4605
msgid "checking branches and trees"
4606
msgstr ""
4607
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4608
#: breezy/check.py:205
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4609
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4610
msgid "checked repository {0} format {1}"
4611
msgstr ""
4612
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4613
#: breezy/check.py:208
6138.4.4 by Jonathan Riddell
update bzr.pot
4614
#, python-format
4615
msgid "%6d revisions"
4616
msgstr ""
4617
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4618
#: breezy/check.py:209
6138.4.4 by Jonathan Riddell
update bzr.pot
4619
#, python-format
4620
msgid "%6d file-ids"
4621
msgstr ""
4622
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4623
#: breezy/check.py:211
6138.4.4 by Jonathan Riddell
update bzr.pot
4624
#, python-format
4625
msgid "%6d unreferenced text versions"
4626
msgstr ""
4627
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4628
#: breezy/check.py:215
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4629
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4630
msgid "unreferenced version: {{{0}}} in {1}"
4631
msgstr ""
4632
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4633
#: breezy/check.py:218
6138.4.4 by Jonathan Riddell
update bzr.pot
4634
#, python-format
4635
msgid "%6d revisions are missing inventory_sha1"
4636
msgstr ""
4637
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4638
#: breezy/check.py:221
6138.4.4 by Jonathan Riddell
update bzr.pot
4639
#, python-format
4640
msgid "%6d revisions are mentioned but not present"
4641
msgstr ""
4642
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4643
#: breezy/check.py:224
6138.4.4 by Jonathan Riddell
update bzr.pot
4644
#, python-format
4645
msgid "%6d ghost revisions"
4646
msgstr ""
4647
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4648
#: breezy/check.py:229
6138.4.4 by Jonathan Riddell
update bzr.pot
4649
#, python-format
4650
msgid "%6d revisions missing parents in ancestry"
4651
msgstr ""
4652
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4653
#: breezy/check.py:233
6138.4.4 by Jonathan Riddell
update bzr.pot
4654
#, python-format
4655
msgid "      %s should be in the ancestry for:"
4656
msgstr ""
4657
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4658
#: breezy/check.py:237
6138.4.4 by Jonathan Riddell
update bzr.pot
4659
#, python-format
4660
msgid "%6d inconsistent parents"
4661
msgstr ""
4662
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4663
#: breezy/check.py:241
6138.4.4 by Jonathan Riddell
update bzr.pot
4664
msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
4665
msgstr ""
4666
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4667
#: breezy/check.py:247
6138.4.4 by Jonathan Riddell
update bzr.pot
4668
#, python-format
4669
msgid "%6d revisions have incorrect parents in the revision index"
4670
msgstr ""
4671
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4672
#: breezy/check.py:253
6138.4.4 by Jonathan Riddell
update bzr.pot
4673
msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
4674
msgstr ""
4675
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4676
#: breezy/check.py:267
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4677
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4678
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4679
msgstr ""
4680
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4681
#: breezy/check.py:296
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4682
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4683
msgid ""
4684
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4685
"{{{4}}}"
4686
msgstr ""
4687
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4688
#: breezy/check.py:354
6138.4.4 by Jonathan Riddell
update bzr.pot
4689
#, python-format
4690
msgid "Checking branch at '%s'."
4691
msgstr ""
4692
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4693
#: breezy/check.py:374
6138.4.4 by Jonathan Riddell
update bzr.pot
4694
#, python-format
4695
msgid "Checking working tree at '%s'."
4696
msgstr ""
4697
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4698
#: breezy/check.py:427 breezy/check.py:441
6138.4.4 by Jonathan Riddell
update bzr.pot
4699
msgid "No branch found at specified location."
4700
msgstr ""
4701
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4702
#: breezy/check.py:429 breezy/check.py:439
6138.4.4 by Jonathan Riddell
update bzr.pot
4703
msgid "No working tree found at specified location."
4704
msgstr ""
4705
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4706
#: breezy/check.py:432
6138.4.4 by Jonathan Riddell
update bzr.pot
4707
#, python-format
4708
msgid "Checking repository at '%s'."
4709
msgstr ""
4710
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4711
#: breezy/check.py:443
6138.4.4 by Jonathan Riddell
update bzr.pot
4712
msgid "No repository found at specified location."
4713
msgstr ""
4714
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4715
#: breezy/clean_tree.py:63
6138.4.4 by Jonathan Riddell
update bzr.pot
4716
msgid "Nothing to delete."
4717
msgstr ""
4718
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4719
#: breezy/clean_tree.py:68
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4720
msgid "Are you sure you wish to delete these"
4721
msgstr ""
4722
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4723
#: breezy/clean_tree.py:70
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4724
msgid "Canceled"
4725
msgstr ""
4726
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4727
#: breezy/clean_tree.py:107
6138.4.4 by Jonathan Riddell
update bzr.pot
4728
#, python-format
4729
msgid "unable to remove %s"
4730
msgstr ""
4731
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4732
#: breezy/clean_tree.py:111
6138.4.4 by Jonathan Riddell
update bzr.pot
4733
msgid "deleting paths:"
4734
msgstr ""
4735
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4736
#: breezy/clean_tree.py:125
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4737
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
4738
msgid "unable to remove \"{0}\": {1}."
6138.4.4 by Jonathan Riddell
update bzr.pot
4739
msgstr ""
4740
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4741
#: breezy/clean_tree.py:130
6138.4.4 by Jonathan Riddell
update bzr.pot
4742
msgid "No files deleted."
4743
msgstr ""
4744
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4745
#: breezy/cmd_version_info.py:47
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4746
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4747
msgid "No known version info format {0}. Supported types are: {1}"
4748
msgstr ""
4749
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4750
# help of 'format=custom' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4751
#: breezy/cmd_version_info.py:52
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4752
msgid "Version info in Custom template-based format."
4753
msgstr ""
4754
4755
# help of 'format=python' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4756
#: breezy/cmd_version_info.py:52
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4757
msgid "Version info in Python format."
4758
msgstr ""
4759
4760
# help of 'format=rio' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4761
#: breezy/cmd_version_info.py:52
6349.1.1 by Vincent Ladeuil
Release 2.5b4
4762
msgid "Version info in RIO (simple text) format (default)."
4763
msgstr ""
4764
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4765
#: breezy/cmd_version_info.py:53
6093.2.1 by Jonathan Riddell
add .pot file to archive
4766
msgid "Show version information about this tree."
4767
msgstr ""
4768
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4769
#: breezy/cmd_version_info.py:55
6093.2.1 by Jonathan Riddell
add .pot file to archive
4770
msgid ""
4771
"You can use this command to add information about version into\n"
4772
"source code of an application. The output can be in one of the\n"
4773
"supported formats or in a custom format based on a template."
4774
msgstr ""
4775
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4776
#: breezy/cmd_version_info.py:59 en/help_topics/configuration.txt:712
6581.1.2 by Vincent Ladeuil
Update translation template.
4777
#: en/help_topics/configuration.txt:738
6093.2.1 by Jonathan Riddell
add .pot file to archive
4778
msgid "For example::"
4779
msgstr ""
4780
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4781
#: breezy/cmd_version_info.py:61
6093.2.1 by Jonathan Riddell
add .pot file to archive
4782
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4783
"  brz version-info --custom \\\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4784
"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4785
msgstr ""
4786
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4787
#: breezy/cmd_version_info.py:64
6093.2.1 by Jonathan Riddell
add .pot file to archive
4788
msgid ""
4789
"will produce a C header file with formatted string containing the\n"
4790
"current revision number. Other supported variables in templates are:"
4791
msgstr ""
4792
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4793
#: breezy/cmd_version_info.py:67
6093.2.1 by Jonathan Riddell
add .pot file to archive
4794
msgid ""
4795
"  * {date} - date of the last revision\n"
4796
"  * {build_date} - current date\n"
4797
"  * {revno} - revision number\n"
4798
"  * {revision_id} - revision id\n"
4799
"  * {branch_nick} - branch nickname\n"
4800
"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
4801
"              otherwise 1"
4802
msgstr ""
4803
4804
# help of 'format' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4805
#: breezy/cmd_version_info.py:77
6093.2.1 by Jonathan Riddell
add .pot file to archive
4806
msgid "Select the output format."
4807
msgstr ""
4808
4809
# help of 'all' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4810
#: breezy/cmd_version_info.py:81
6093.2.1 by Jonathan Riddell
add .pot file to archive
4811
msgid "Include all possible information."
4812
msgstr ""
4813
4814
# help of 'check-clean' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4815
#: breezy/cmd_version_info.py:82
6093.2.1 by Jonathan Riddell
add .pot file to archive
4816
msgid "Check if tree is clean."
4817
msgstr ""
4818
4819
# help of 'include-history' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4820
#: breezy/cmd_version_info.py:84
6093.2.1 by Jonathan Riddell
add .pot file to archive
4821
msgid "Include the revision-history."
4822
msgstr ""
4823
4824
# help of 'include-file-revisions' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4825
#: breezy/cmd_version_info.py:86
6093.2.1 by Jonathan Riddell
add .pot file to archive
4826
msgid "Include the last revision for each file."
4827
msgstr ""
4828
4829
# help of 'template' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4830
#: breezy/cmd_version_info.py:87
6093.2.1 by Jonathan Riddell
add .pot file to archive
4831
msgid "Template for the output."
4832
msgstr ""
4833
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4834
#: breezy/cmd_version_info.py:101
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4835
msgid "brz version-info --revision takes exactly one revision specifier"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
4836
msgstr ""
4837
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4838
#: breezy/commands.py:229
6138.4.4 by Jonathan Riddell
update bzr.pot
4839
#, python-format
4840
msgid "unknown command \"%s\""
4841
msgstr ""
4842
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4843
#: breezy/commands.py:476
6093.2.1 by Jonathan Riddell
add .pot file to archive
4844
msgid "No help for this command."
4845
msgstr ""
4846
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4847
#: breezy/commands.py:489
6093.2.1 by Jonathan Riddell
add .pot file to archive
4848
#, python-format
4849
msgid ":Purpose: %s\n"
4850
msgstr ""
4851
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4852
#: breezy/commands.py:491
6093.2.1 by Jonathan Riddell
add .pot file to archive
4853
#, python-format
4854
msgid ""
4855
":Usage:\n"
4856
"%s\n"
4857
msgstr ""
4858
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4859
#: breezy/commands.py:493
6093.2.1 by Jonathan Riddell
add .pot file to archive
4860
#, python-format
4861
msgid ":Usage:   %s\n"
4862
msgstr ""
4863
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4864
#: breezy/commands.py:512
6093.2.1 by Jonathan Riddell
add .pot file to archive
4865
#, python-format
4866
msgid ":Options:%s"
4867
msgstr ""
4868
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4869
#: breezy/commands.py:523
6093.2.1 by Jonathan Riddell
add .pot file to archive
4870
#, python-format
4871
msgid ""
4872
":Description:\n"
4873
"  %s\n"
4874
"\n"
4875
msgstr ""
4876
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4877
#: breezy/commands.py:533
6093.2.1 by Jonathan Riddell
add .pot file to archive
4878
#, python-format
4879
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4880
"See brz help %s for more details and examples.\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
4881
"\n"
4882
msgstr ""
4883
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4884
#: breezy/commands.py:538
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4885
msgid ":Aliases:  "
4886
msgstr ""
4887
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4888
#: breezy/commands.py:542
6093.2.1 by Jonathan Riddell
add .pot file to archive
4889
#, python-format
4890
msgid ":From:     plugin \"%s\"\n"
4891
msgstr ""
4892
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4893
#: breezy/commands.py:554
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4894
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4895
msgid ":doc:`{0} <{1}-help>`"
4896
msgstr ""
4897
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4898
#: breezy/commands.py:558
6093.2.1 by Jonathan Riddell
add .pot file to archive
4899
#, python-format
4900
msgid ":See also: %s"
4901
msgstr ""
4902
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4903
#: breezy/commands.py:826
6138.4.4 by Jonathan Riddell
update bzr.pot
4904
msgid "Only ASCII permitted in option names"
4905
msgstr ""
4906
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4907
#: breezy/commands.py:851 breezy/commands.py:859
6138.4.4 by Jonathan Riddell
update bzr.pot
4908
msgid "command {0!r} needs one or more {1}"
4909
msgstr ""
4910
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4911
#: breezy/commands.py:868
6138.4.4 by Jonathan Riddell
update bzr.pot
4912
msgid "command {0!r} requires argument {1}"
4913
msgstr ""
4914
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4915
#: breezy/commands.py:875
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4916
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4917
msgid "extra argument to command {0}: {1}"
4918
msgstr ""
4919
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4920
#: breezy/commands.py:952
6138.4.4 by Jonathan Riddell
update bzr.pot
4921
#, python-format
4922
msgid "Profile data written to \"%s\"."
4923
msgstr ""
4924
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4925
#: breezy/commit.py:117 breezy/commit.py:740
6138.4.4 by Jonathan Riddell
update bzr.pot
4926
msgid "added"
4927
msgstr ""
4928
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4929
#: breezy/commit.py:117 breezy/commit.py:748
6138.4.4 by Jonathan Riddell
update bzr.pot
4930
msgid "modified"
4931
msgstr ""
4932
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4933
#: breezy/commit.py:131
6138.4.4 by Jonathan Riddell
update bzr.pot
4934
#, python-format
4935
msgid "Committing%s"
4936
msgstr ""
4937
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4938
#: breezy/commit.py:134
6138.4.4 by Jonathan Riddell
update bzr.pot
4939
#, python-format
4940
msgid "Committed revision %d."
4941
msgstr ""
4942
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4943
#: breezy/commit.py:143
6138.4.4 by Jonathan Riddell
update bzr.pot
4944
#, python-format
4945
msgid "deleted %s"
4946
msgstr ""
4947
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4948
#: breezy/commit.py:146
6138.4.4 by Jonathan Riddell
update bzr.pot
4949
#, python-format
4950
msgid "missing %s"
4951
msgstr ""
4952
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4953
#: breezy/commit.py:511
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4954
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4955
msgid ""
4956
"Conflicting tags in bound branch:\n"
4957
"{0}"
4958
msgstr ""
4959
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4960
#: breezy/commit.py:742
6138.4.4 by Jonathan Riddell
update bzr.pot
4961
msgid "renamed"
4962
msgstr ""
4963
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4964
#: breezy/commit.py:976
6138.4.4 by Jonathan Riddell
update bzr.pot
4965
msgid "unchanged"
4966
msgstr ""
4967
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4968
#: breezy/commit.py:998
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
4969
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
4970
msgid "{0} [{1}] - Stage"
4971
msgstr ""
4972
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4973
#: breezy/commit.py:1001
6138.4.4 by Jonathan Riddell
update bzr.pot
4974
#, python-format
4975
msgid "%s - Stage"
4976
msgstr ""
4977
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4978
#: breezy/commit_signature_commands.py:34
6504.1.1 by Vincent Ladeuil
Update translation template
4979
msgid "Sign all commits by a given committer."
4980
msgstr ""
4981
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4982
#: breezy/commit_signature_commands.py:36
6093.2.1 by Jonathan Riddell
add .pot file to archive
4983
msgid ""
4984
"If location is not specified the local tree is used.\n"
4985
"If committer is not specified the default committer is used."
4986
msgstr ""
4987
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4988
#: breezy/commit_signature_commands.py:39
6093.2.1 by Jonathan Riddell
add .pot file to archive
4989
msgid "This does not sign commits that already have signatures."
4990
msgstr ""
4991
4992
# help of 'dry-run' option of 'sign-my-commits' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4993
#: breezy/commit_signature_commands.py:47
6093.2.1 by Jonathan Riddell
add .pot file to archive
4994
msgid ""
4995
"Don't actually sign anything, just print the revisions that would be signed."
4996
msgstr ""
4997
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4998
#: breezy/commit_signature_commands.py:98
6504.1.1 by Vincent Ladeuil
Update translation template
4999
#, python-format
5000
msgid "Signed %d revision.\n"
5001
msgid_plural "Signed %d revisions.\n"
5002
msgstr[0] ""
5003
msgstr[1] ""
5004
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5005
#: breezy/commit_signature_commands.py:103
6093.2.1 by Jonathan Riddell
add .pot file to archive
5006
msgid "Verify all commit signatures."
5007
msgstr ""
5008
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5009
#: breezy/commit_signature_commands.py:105
6093.2.1 by Jonathan Riddell
add .pot file to archive
5010
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
5011
msgstr ""
5012
5013
# help of 'acceptable-keys' option of 'verify-signatures' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5014
#: breezy/commit_signature_commands.py:110
6093.2.1 by Jonathan Riddell
add .pot file to archive
5015
msgid ""
5016
"Comma separated list of GPG key patterns which are acceptable for "
5017
"verification."
5018
msgstr ""
5019
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5020
#: breezy/commit_signature_commands.py:148
6138.4.4 by Jonathan Riddell
update bzr.pot
5021
msgid "Cannot verify a range of non-revision-history revisions"
5022
msgstr ""
5023
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5024
#: breezy/commit_signature_commands.py:166
6093.2.1 by Jonathan Riddell
add .pot file to archive
5025
msgid "All commits signed with verifiable keys"
5026
msgstr ""
5027
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5028
#: breezy/config.py:438
6138.4.4 by Jonathan Riddell
update bzr.pot
5029
msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
5030
msgstr ""
5031
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5032
#: breezy/config.py:2465
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5033
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5034
msgid "{0} is not an SI unit."
5035
msgstr ""
5036
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5037
#: breezy/config.py:3013
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5038
#, python-brace-format
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5039
msgid ""
5040
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5041
"will be saved."
5042
msgstr ""
5043
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5044
#: breezy/config.py:3158
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5045
#, python-format
5046
msgid "Invalid '%s', should be of the form 'name=value'"
5047
msgstr ""
5048
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5049
#: breezy/config.py:4096
6093.2.1 by Jonathan Riddell
add .pot file to archive
5050
msgid "Display, set or remove a configuration option."
5051
msgstr ""
5052
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5053
#: breezy/config.py:4098
6581.1.2 by Vincent Ladeuil
Update translation template.
5054
msgid "Display the active value for option NAME."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5055
msgstr ""
5056
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5057
#: breezy/config.py:4100
6093.2.1 by Jonathan Riddell
add .pot file to archive
5058
msgid ""
5059
"If --all is specified, NAME is interpreted as a regular expression and all\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
5060
"matching options are displayed mentioning their scope and without resolving\n"
5061
"option references in the value). The active value that bzr will take into\n"
5062
"account is the first one displayed for each option."
5063
msgstr ""
5064
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5065
#: breezy/config.py:4105
6581.1.2 by Vincent Ladeuil
Update translation template.
5066
msgid ""
5067
"If NAME is not given, --all .* is implied (all options are displayed for "
5068
"the\n"
5069
"current scope)."
5070
msgstr ""
5071
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5072
#: breezy/config.py:4108
6581.1.2 by Vincent Ladeuil
Update translation template.
5073
msgid ""
5074
"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
5075
"is set in the most relevant scope and can be checked by displaying the\n"
5076
"option again."
5077
msgstr ""
5078
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5079
#: breezy/config.py:4112
6581.1.2 by Vincent Ladeuil
Update translation template.
5080
msgid "Removing a value is achieved by using --remove NAME."
5081
msgstr ""
5082
6093.2.1 by Jonathan Riddell
add .pot file to archive
5083
# help of 'scope' option of 'config' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5084
#: breezy/config.py:4122
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5085
msgid "Reduce the scope to the specified configuration file."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5086
msgstr ""
5087
5088
# help of 'all' option of 'config' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5089
#: breezy/config.py:4126
6093.2.1 by Jonathan Riddell
add .pot file to archive
5090
msgid "Display all the defined values for the matching options."
5091
msgstr ""
5092
5093
# help of 'remove' option of 'config' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5094
#: breezy/config.py:4128
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5095
msgid "Remove the option from the configuration file."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5096
msgstr ""
5097
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5098
#: breezy/conflicts.py:50
6093.2.1 by Jonathan Riddell
add .pot file to archive
5099
msgid "List files with conflicts."
5100
msgstr ""
5101
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5102
#: breezy/conflicts.py:57
6093.2.1 by Jonathan Riddell
add .pot file to archive
5103
msgid ""
5104
"Conflicts normally are listed as short, human-readable messages.  If --text\n"
5105
"is supplied, the pathnames of files with text conflicts are listed,\n"
5106
"instead.  (This is useful for editing all files with text conflicts.)"
5107
msgstr ""
5108
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5109
#: breezy/conflicts.py:61
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5110
msgid "Use brz resolve when you have fixed a problem."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5111
msgstr ""
5112
5113
# help of 'text' option of 'conflicts' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5114
#: breezy/conflicts.py:66
6093.2.1 by Jonathan Riddell
add .pot file to archive
5115
msgid "List paths of files with text conflicts."
5116
msgstr ""
5117
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5118
# help of 'action=done' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5119
#: breezy/conflicts.py:85
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5120
msgid "Marks the conflict as resolved."
5121
msgstr ""
5122
5123
# help of 'action=take-this' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5124
#: breezy/conflicts.py:88
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5125
msgid "Resolve the conflict preserving the version in the working tree."
5126
msgstr ""
5127
5128
# help of 'action=take-other' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5129
#: breezy/conflicts.py:91
6349.1.1 by Vincent Ladeuil
Release 2.5b4
5130
msgid "Resolve the conflict taking the merged version into account."
5131
msgstr ""
5132
6093.2.1 by Jonathan Riddell
add .pot file to archive
5133
# help of 'action' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5134
#: breezy/conflicts.py:98
6093.2.1 by Jonathan Riddell
add .pot file to archive
5135
msgid "How to resolve the conflict."
5136
msgstr ""
5137
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5138
#: breezy/conflicts.py:104
6093.2.1 by Jonathan Riddell
add .pot file to archive
5139
msgid "Mark a conflict as resolved."
5140
msgstr ""
5141
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5142
#: breezy/conflicts.py:111
6093.2.1 by Jonathan Riddell
add .pot file to archive
5143
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5144
"Once you have fixed a problem, use \"brz resolve\" to automatically mark\n"
5145
"text conflicts as fixed, \"brz resolve FILE\" to mark a specific conflict "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5146
"as\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5147
"resolved, or \"brz resolve --all\" to mark all conflicts as resolved."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5148
msgstr ""
5149
5150
# help of 'all' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5151
#: breezy/conflicts.py:119
6093.2.1 by Jonathan Riddell
add .pot file to archive
5152
msgid "Resolve all conflicts in this tree."
5153
msgstr ""
5154
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5155
#: breezy/conflicts.py:126
6138.4.4 by Jonathan Riddell
update bzr.pot
5156
msgid "If --all is specified, no FILE may be provided"
5157
msgstr ""
5158
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5159
#: breezy/conflicts.py:151
6138.4.4 by Jonathan Riddell
update bzr.pot
5160
#, python-format
6143.1.7 by Jonathan Riddell
update bzr.pot
5161
msgid "%d conflict auto-resolved."
5162
msgid_plural "%d conflicts auto-resolved."
5163
msgstr[0] ""
5164
msgstr[1] ""
6138.4.4 by Jonathan Riddell
update bzr.pot
5165
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5166
#: breezy/conflicts.py:154
6138.4.4 by Jonathan Riddell
update bzr.pot
5167
msgid "Remaining conflicts:"
5168
msgstr ""
5169
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5170
#: breezy/conflicts.py:159
6138.4.4 by Jonathan Riddell
update bzr.pot
5171
msgid "All conflicts resolved."
5172
msgstr ""
5173
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5174
#: breezy/conflicts.py:168
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5175
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
5176
msgid "{0} conflict resolved, {1} remaining"
5177
msgid_plural "{0} conflicts resolved, {1} remaining"
5178
msgstr[0] ""
5179
msgstr[1] ""
5180
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5181
#: breezy/controldir.py:712
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5182
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5183
msgid "{0} is{1} redirected to {2}"
5184
msgstr ""
5185
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5186
#: breezy/diff.py:413
6138.4.4 by Jonathan Riddell
update bzr.pot
5187
#, python-format
5188
msgid "*** Ignoring files outside view. View is %s"
5189
msgstr ""
5190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5191
#: breezy/errors.py:157
6093.2.1 by Jonathan Riddell
add .pot file to archive
5192
msgid "The tree builder is already building a tree."
5193
msgstr ""
5194
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5195
#: breezy/errors.py:178
6093.2.1 by Jonathan Riddell
add .pot file to archive
5196
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5197
msgstr ""
5198
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5199
#: breezy/errors.py:197
6093.2.1 by Jonathan Riddell
add .pot file to archive
5200
msgid ""
5201
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5202
"versions \"%(minimum)s\" to \"%(current)s\"."
5203
msgstr ""
5204
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5205
#: breezy/errors.py:209
6093.2.1 by Jonathan Riddell
add .pot file to archive
5206
msgid "The transport '%(transport)s' is only accessible within this process."
5207
msgstr ""
5208
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5209
#: breezy/errors.py:227
6093.2.1 by Jonathan Riddell
add .pot file to archive
5210
msgid "Invalid revision number %(revno)s"
5211
msgstr ""
5212
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5213
#: breezy/errors.py:236
6093.2.1 by Jonathan Riddell
add .pot file to archive
5214
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5215
msgstr ""
5216
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5217
#: breezy/errors.py:247
6093.2.1 by Jonathan Riddell
add .pot file to archive
5218
msgid "Reserved revision-id {%(revision_id)s}"
5219
msgstr ""
5220
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5221
#: breezy/errors.py:261
6093.2.1 by Jonathan Riddell
add .pot file to archive
5222
msgid "There is no public branch set for \"%(branch_url)s\"."
5223
msgstr ""
5224
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5225
#: breezy/errors.py:271
6093.2.1 by Jonathan Riddell
add .pot file to archive
5226
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5227
"No help could be found for '%(topic)s'. Please use 'brz help topics' to "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5228
"obtain a list of topics."
5229
msgstr ""
5230
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5231
#: breezy/errors.py:280
6093.2.1 by Jonathan Riddell
add .pot file to archive
5232
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5233
msgstr ""
5234
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5235
#: breezy/errors.py:290
6093.2.1 by Jonathan Riddell
add .pot file to archive
5236
msgid ""
5237
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5238
msgstr ""
5239
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5240
#: breezy/errors.py:299
6093.2.1 by Jonathan Riddell
add .pot file to archive
5241
msgid "The branch '%(branch)s' is not stacked."
5242
msgstr ""
5243
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5244
#: breezy/errors.py:313
6093.2.1 by Jonathan Riddell
add .pot file to archive
5245
msgid "No WorkingTree exists for \"%(base)s\"."
5246
msgstr ""
5247
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5248
#: breezy/errors.py:322
6093.2.1 by Jonathan Riddell
add .pot file to archive
5249
msgid "Not currently building a tree."
5250
msgstr ""
5251
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5252
#: breezy/errors.py:327
6093.2.1 by Jonathan Riddell
add .pot file to archive
5253
msgid "%(url)s is not a local path."
5254
msgstr ""
5255
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5256
#: breezy/errors.py:355
6093.2.1 by Jonathan Riddell
add .pot file to archive
5257
msgid "%(not_locked)r is not write locked but needs to be."
5258
msgstr ""
5259
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5260
#: breezy/errors.py:363
6093.2.1 by Jonathan Riddell
add .pot file to archive
5261
msgid "Error in command line options"
5262
msgstr ""
5263
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5264
#: breezy/errors.py:368
6093.2.1 by Jonathan Riddell
add .pot file to archive
5265
msgid "%(value)s is not an index of type %(_type)s."
5266
msgstr ""
5267
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5268
#: breezy/errors.py:378
6093.2.1 by Jonathan Riddell
add .pot file to archive
5269
msgid "Error in data for index %(value)s."
5270
msgstr ""
5271
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5272
#: breezy/errors.py:387
6093.2.1 by Jonathan Riddell
add .pot file to archive
5273
msgid "The key '%(key)s' is already in index '%(index)s'."
5274
msgstr ""
5275
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5276
#: breezy/errors.py:397
6093.2.1 by Jonathan Riddell
add .pot file to archive
5277
msgid "The key '%(key)s' is not a valid key."
5278
msgstr ""
5279
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5280
#: breezy/errors.py:406
6093.2.1 by Jonathan Riddell
add .pot file to archive
5281
msgid "Could not parse options for index %(value)s."
5282
msgstr ""
5283
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5284
#: breezy/errors.py:415
6093.2.1 by Jonathan Riddell
add .pot file to archive
5285
msgid "The value '%(value)s' is not a valid value."
5286
msgstr ""
5287
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5288
#: breezy/errors.py:424
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5289
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5290
msgstr ""
5291
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5292
#: breezy/errors.py:443
6093.2.1 by Jonathan Riddell
add .pot file to archive
5293
msgid "Generic path error: %(path)r%(extra)s)"
5294
msgstr ""
5295
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5296
#: breezy/errors.py:456
6093.2.1 by Jonathan Riddell
add .pot file to archive
5297
msgid "No such file: %(path)r%(extra)s"
5298
msgstr ""
5299
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5300
#: breezy/errors.py:461
6093.2.1 by Jonathan Riddell
add .pot file to archive
5301
msgid "File exists: %(path)r%(extra)s"
5302
msgstr ""
5303
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5304
#: breezy/errors.py:467
6093.2.1 by Jonathan Riddell
add .pot file to archive
5305
msgid ""
5306
"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.
5307
"after to tell brz about a rename that has already happened)%(extra)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5308
msgstr ""
5309
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5310
#: breezy/errors.py:483
6093.2.1 by Jonathan Riddell
add .pot file to archive
5311
msgid "\"%(path)s\" is not a directory %(extra)s"
5312
msgstr ""
5313
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5314
#: breezy/errors.py:488
6093.2.1 by Jonathan Riddell
add .pot file to archive
5315
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5316
msgstr ""
5317
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5318
#: breezy/errors.py:493
6093.2.1 by Jonathan Riddell
add .pot file to archive
5319
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5320
msgstr ""
5321
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5322
#: breezy/errors.py:498
6093.2.1 by Jonathan Riddell
add .pot file to archive
5323
msgid "Hard-linking \"%(path)s\" is not supported"
5324
msgstr ""
5325
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5326
#: breezy/errors.py:513
6093.2.1 by Jonathan Riddell
add .pot file to archive
5327
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5328
msgstr ""
5329
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5330
#: breezy/errors.py:518
6093.2.1 by Jonathan Riddell
add .pot file to archive
5331
msgid "Permission denied: \"%(path)s\"%(extra)s"
5332
msgstr ""
5333
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5334
#: breezy/errors.py:523
6093.2.1 by Jonathan Riddell
add .pot file to archive
5335
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5336
msgstr ""
5337
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5338
#: breezy/errors.py:528
6093.2.1 by Jonathan Riddell
add .pot file to archive
5339
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5340
msgstr ""
5341
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5342
#: breezy/errors.py:539
6093.2.1 by Jonathan Riddell
add .pot file to archive
5343
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5344
msgstr ""
5345
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5346
#: breezy/errors.py:561
5347
msgid "The %(type)s hook '%(hook)s' is unknown in this version of breezy."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5348
msgstr ""
5349
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5350
#: breezy/errors.py:571
6093.2.1 by Jonathan Riddell
add .pot file to archive
5351
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5352
msgstr ""
5353
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5354
#: breezy/errors.py:579
6093.2.1 by Jonathan Riddell
add .pot file to archive
5355
msgid ""
5356
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5357
"upgrade the branch to permit branch stacking."
5358
msgstr ""
5359
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5360
#: breezy/errors.py:590
6093.2.1 by Jonathan Riddell
add .pot file to archive
5361
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5362
msgstr ""
5363
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5364
#: breezy/errors.py:600
6093.2.1 by Jonathan Riddell
add .pot file to archive
5365
msgid ""
5366
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5367
"need to upgrade the repository to permit branch stacking."
5368
msgstr ""
5369
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5370
#: breezy/errors.py:611
6093.2.1 by Jonathan Riddell
add .pot file to archive
5371
msgid "Error reading from %(path)r."
5372
msgstr ""
5373
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5374
#: breezy/errors.py:630
6093.2.1 by Jonathan Riddell
add .pot file to archive
5375
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5376
msgstr ""
5377
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5378
#: breezy/errors.py:646
6093.2.1 by Jonathan Riddell
add .pot file to archive
5379
msgid "Path \"%(path)s\" is not unicode normalized"
5380
msgstr ""
5381
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5382
#: breezy/errors.py:654
6093.2.1 by Jonathan Riddell
add .pot file to archive
5383
msgid "Not a branch: \"%(path)s\"%(detail)s."
5384
msgstr ""
5385
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5386
#: breezy/errors.py:696
6093.2.1 by Jonathan Riddell
add .pot file to archive
5387
msgid "No submit branch available for branch \"%(path)s\""
5388
msgstr ""
5389
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5390
#: breezy/errors.py:705
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5391
msgid "A control directory already exists: \"%(path)s\"."
5392
msgstr ""
5393
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5394
#: breezy/errors.py:710
6093.2.1 by Jonathan Riddell
add .pot file to archive
5395
msgid "Already a branch: \"%(path)s\"."
5396
msgstr ""
5397
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5398
#: breezy/errors.py:715
6504.1.1 by Vincent Ladeuil
Update translation template
5399
msgid "Invalid branch name: %(name)s"
5400
msgstr ""
5401
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5402
#: breezy/errors.py:724
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5403
msgid "Parent branch already exists: \"%(path)s\"."
5404
msgstr ""
5405
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5406
#: breezy/errors.py:730
6093.2.1 by Jonathan Riddell
add .pot file to archive
5407
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5408
"Directory contains a branch, but no working tree (use brz checkout if you "
6093.2.1 by Jonathan Riddell
add .pot file to archive
5409
"wish to build a working tree): \"%(path)s\""
5410
msgstr ""
5411
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5412
#: breezy/errors.py:735
6093.2.1 by Jonathan Riddell
add .pot file to archive
5413
msgid ""
5414
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5415
msgstr ""
5416
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5417
#: breezy/errors.py:745
6093.2.1 by Jonathan Riddell
add .pot file to archive
5418
msgid ""
5419
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5420
msgstr ""
5421
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5422
#: breezy/errors.py:755
6093.2.1 by Jonathan Riddell
add .pot file to archive
5423
msgid "No repository present: \"%(path)s\""
5424
msgstr ""
5425
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5426
#: breezy/errors.py:762
6093.2.1 by Jonathan Riddell
add .pot file to archive
5427
msgid ""
5428
"Unsupported branch format: %(format)s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5429
"Please run 'brz upgrade'"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5430
msgstr ""
5431
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5432
#: breezy/errors.py:768
6093.2.1 by Jonathan Riddell
add .pot file to archive
5433
msgid "Unknown %(kind)s format: %(format)r"
5434
msgstr ""
5435
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5436
#: breezy/errors.py:777
6093.2.1 by Jonathan Riddell
add .pot file to archive
5437
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5438
msgstr ""
5439
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5440
#: breezy/errors.py:787
6437.2.2 by Vincent Ladeuil
Release 2.5b5
5441
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5442
msgstr ""
5443
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5444
#: breezy/errors.py:802
6093.2.1 by Jonathan Riddell
add .pot file to archive
5445
msgid ""
5446
"%(target)s\n"
5447
"is not compatible with\n"
5448
"%(source)s\n"
5449
"%(details)s"
5450
msgstr ""
5451
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5452
#: breezy/errors.py:818
6093.2.1 by Jonathan Riddell
add .pot file to archive
5453
msgid "Revision is not compatible with %(repo_format)s"
5454
msgstr ""
5455
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5456
#: breezy/errors.py:828
6093.2.1 by Jonathan Riddell
add .pot file to archive
5457
msgid "%(context_info)s%(path)s is already versioned."
5458
msgstr ""
5459
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5460
#: breezy/errors.py:849
6093.2.1 by Jonathan Riddell
add .pot file to archive
5461
msgid "%(context_info)s%(path)s is not versioned."
5462
msgstr ""
5463
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5464
#: breezy/errors.py:870
6093.2.1 by Jonathan Riddell
add .pot file to archive
5465
msgid "Path(s) are not versioned: %(paths_as_string)s"
5466
msgstr ""
5467
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5468
#: breezy/errors.py:881
6093.2.1 by Jonathan Riddell
add .pot file to archive
5469
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5470
msgstr ""
5471
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5472
#: breezy/errors.py:900
6093.2.1 by Jonathan Riddell
add .pot file to archive
5473
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5474
msgstr ""
5475
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5476
#: breezy/errors.py:908
6093.2.1 by Jonathan Riddell
add .pot file to archive
5477
msgid ""
5478
"Filename %(filename)r is not valid in your current filesystem encoding "
5479
"%(fs_encoding)s"
5480
msgstr ""
5481
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5482
#: breezy/errors.py:919
6093.2.1 by Jonathan Riddell
add .pot file to archive
5483
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5484
msgstr ""
5485
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5486
#: breezy/errors.py:937
6093.2.1 by Jonathan Riddell
add .pot file to archive
5487
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5488
msgstr ""
5489
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5490
#: breezy/errors.py:976
6093.2.1 by Jonathan Riddell
add .pot file to archive
5491
msgid "Cannot lock %(lock)s: %(why)s"
5492
msgstr ""
5493
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5494
#: breezy/errors.py:986
6093.2.1 by Jonathan Riddell
add .pot file to archive
5495
msgid ""
5496
"A transaction related operation was attempted after the transaction finished."
5497
msgstr ""
5498
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5499
#: breezy/errors.py:1013
6093.2.1 by Jonathan Riddell
add .pot file to archive
5500
msgid "Cannot lock: transport is read only: %(transport)s"
5501
msgstr ""
5502
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5503
#: breezy/errors.py:1021
6093.2.1 by Jonathan Riddell
add .pot file to archive
5504
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5505
msgstr ""
5506
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5507
#: breezy/errors.py:1032
6093.2.1 by Jonathan Riddell
add .pot file to archive
5508
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5509
msgstr ""
5510
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5511
#: breezy/errors.py:1043
6093.2.1 by Jonathan Riddell
add .pot file to archive
5512
msgid ""
5513
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5514
"%(holder)r, wanted to break %(target)r"
5515
msgstr ""
5516
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5517
#: breezy/errors.py:1055
6093.2.1 by Jonathan Riddell
add .pot file to archive
5518
msgid ""
5519
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5520
"Use 'brz break-lock' to clear it"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5521
msgstr ""
5522
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5523
#: breezy/errors.py:1068
6093.2.1 by Jonathan Riddell
add .pot file to archive
5524
msgid "Lock not held: %(lock)s"
5525
msgstr ""
5526
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5527
#: breezy/errors.py:1097
6093.2.1 by Jonathan Riddell
add .pot file to archive
5528
msgid "No changes to commit"
5529
msgstr ""
5530
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5531
#: breezy/errors.py:1102
6093.2.1 by Jonathan Riddell
add .pot file to archive
5532
msgid ""
5533
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5534
msgstr ""
5535
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5536
#: breezy/errors.py:1112
6093.2.1 by Jonathan Riddell
add .pot file to archive
5537
msgid ""
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
5538
"Excluding paths during commit is not supported by repository at "
5539
"%(repository)r."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5540
msgstr ""
5541
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5542
#: breezy/errors.py:1121
6093.2.1 by Jonathan Riddell
add .pot file to archive
5543
msgid ""
5544
"The specified commit message contains characters unsupported by the current "
5545
"encoding."
5546
msgstr ""
5547
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5548
#: breezy/errors.py:1127
6093.2.1 by Jonathan Riddell
add .pot file to archive
5549
msgid "Upgrade URL cannot work with readonly URLs."
5550
msgstr ""
5551
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5552
#: breezy/errors.py:1132
6093.2.1 by Jonathan Riddell
add .pot file to archive
5553
msgid "The branch format %(format)s is already at the most recent format."
5554
msgstr ""
5555
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5556
#: breezy/errors.py:1155
6093.2.1 by Jonathan Riddell
add .pot file to archive
5557
msgid "Option --change does not accept revision ranges"
5558
msgstr ""
5559
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5560
#: breezy/errors.py:1160
6093.2.1 by Jonathan Riddell
add .pot file to archive
5561
msgid "No namespace registered for string: %(spec)r"
5562
msgstr ""
5563
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5564
#: breezy/errors.py:1179
6093.2.1 by Jonathan Riddell
add .pot file to archive
5565
msgid ""
5566
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5567
"%(extra)s"
5568
msgstr ""
5569
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5570
#: breezy/errors.py:1193
6093.2.1 by Jonathan Riddell
add .pot file to archive
5571
msgid ""
5572
"Operation denied because it would change the main history, which is not "
5573
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5574
msgstr ""
5575
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5576
#: breezy/errors.py:1204
6093.2.1 by Jonathan Riddell
add .pot file to archive
5577
msgid ""
5578
"These branches have diverged. Use the missing command to see how.\n"
5579
"Use the merge command to reconcile them."
5580
msgstr ""
5581
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5582
#: breezy/errors.py:1224
6093.2.1 by Jonathan Riddell
add .pot file to archive
5583
msgid ""
5584
"Branches have no common ancestor, and no merge base revision was specified."
5585
msgstr ""
5586
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5587
#: breezy/errors.py:1230
6093.2.1 by Jonathan Riddell
add .pot file to archive
5588
msgid ""
5589
"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
5590
msgstr ""
5591
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5592
#: breezy/errors.py:1236
6093.2.1 by Jonathan Riddell
add .pot file to archive
5593
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5594
msgstr ""
5595
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5596
#: breezy/errors.py:1245
6093.2.1 by Jonathan Riddell
add .pot file to archive
5597
msgid ""
5598
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5599
msgstr ""
5600
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5601
#: breezy/errors.py:1254
6093.2.1 by Jonathan Riddell
add .pot file to archive
5602
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5603
msgstr ""
5604
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5605
#: breezy/errors.py:1263
6093.2.1 by Jonathan Riddell
add .pot file to archive
5606
msgid "Branch %(branch)s has no commits."
5607
msgstr ""
5608
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5609
#: breezy/errors.py:1281
6093.2.1 by Jonathan Riddell
add .pot file to archive
5610
msgid ""
5611
"Bound branch %(branch)s is out of date with master branch %(master)s."
5612
"%(extra_help)s"
5613
msgstr ""
5614
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5615
#: breezy/errors.py:1293
6093.2.1 by Jonathan Riddell
add .pot file to archive
5616
msgid ""
5617
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5618
"bound to %(remote)s."
5619
msgstr ""
5620
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5621
#: breezy/errors.py:1305
6093.2.1 by Jonathan Riddell
add .pot file to archive
5622
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5623
msgstr ""
5624
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5625
#: breezy/errors.py:1314
6093.2.1 by Jonathan Riddell
add .pot file to archive
5626
msgid ""
5627
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5628
"%(error)s"
5629
msgstr ""
5630
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5631
#: breezy/errors.py:1326
6093.2.1 by Jonathan Riddell
add .pot file to archive
5632
msgid "Error in processing weave: %(msg)s"
5633
msgstr ""
5634
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5635
#: breezy/errors.py:1335
6093.2.1 by Jonathan Riddell
add .pot file to archive
5636
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5637
msgstr ""
5638
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5639
#: breezy/errors.py:1346
6093.2.1 by Jonathan Riddell
add .pot file to archive
5640
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5641
msgstr ""
5642
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5643
#: breezy/errors.py:1356
6093.2.1 by Jonathan Riddell
add .pot file to archive
5644
msgid "Weave invariant violated: %(what)s"
5645
msgstr ""
5646
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5647
#: breezy/errors.py:1365
6093.2.1 by Jonathan Riddell
add .pot file to archive
5648
msgid "Parents are mismatched between two revisions. %(msg)s"
5649
msgstr ""
5650
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5651
#: breezy/errors.py:1387
6093.2.1 by Jonathan Riddell
add .pot file to archive
5652
msgid ""
5653
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5654
"%(weave_b)s"
5655
msgstr ""
5656
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5657
#: breezy/errors.py:1399
6093.2.1 by Jonathan Riddell
add .pot file to archive
5658
msgid "Versioned file error"
5659
msgstr ""
5660
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5661
#: breezy/errors.py:1404
6093.2.1 by Jonathan Riddell
add .pot file to archive
5662
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5663
msgstr ""
5664
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5665
#: breezy/errors.py:1414
6093.2.1 by Jonathan Riddell
add .pot file to archive
5666
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5667
msgstr ""
5668
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5669
#: breezy/errors.py:1424
6093.2.1 by Jonathan Riddell
add .pot file to archive
5670
msgid "Text did not match its checksum: %(msg)s"
5671
msgstr ""
5672
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5673
#: breezy/errors.py:1550
6093.2.1 by Jonathan Riddell
add .pot file to archive
5674
msgid "Export format %(format)r not supported"
5675
msgstr ""
5676
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5677
#: breezy/errors.py:1559
6093.2.1 by Jonathan Riddell
add .pot file to archive
5678
msgid "Transport error: %(msg)s %(orig_error)s"
5679
msgstr ""
5680
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5681
#: breezy/errors.py:1585
6093.2.1 by Jonathan Riddell
add .pot file to archive
5682
msgid "Generic bzr smart protocol error: %(details)s"
5683
msgstr ""
5684
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5685
#: breezy/errors.py:1593
6093.2.1 by Jonathan Riddell
add .pot file to archive
5686
msgid "Received bad protocol version marker: %(marker)r"
5687
msgstr ""
5688
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5689
#: breezy/errors.py:1625
6093.2.1 by Jonathan Riddell
add .pot file to archive
5690
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5691
msgstr ""
5692
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5693
#: breezy/errors.py:1630
6093.2.1 by Jonathan Riddell
add .pot file to archive
5694
msgid "Connection error: %(msg)s %(orig_error)s"
5695
msgstr ""
5696
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5697
#: breezy/errors.py:1635
6093.2.1 by Jonathan Riddell
add .pot file to archive
5698
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5699
msgstr ""
5700
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5701
#: breezy/errors.py:1656
6093.2.1 by Jonathan Riddell
add .pot file to archive
5702
msgid "Connection closed: %(msg)s %(orig_error)s"
5703
msgstr ""
5704
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5705
#: breezy/errors.py:1661
6252.1.1 by Vincent Ladeuil
Release 2.5b3
5706
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5707
msgstr ""
5708
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5709
#: breezy/errors.py:1666
6093.2.1 by Jonathan Riddell
add .pot file to archive
5710
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5711
msgstr ""
5712
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5713
#: breezy/errors.py:1676
6093.2.1 by Jonathan Riddell
add .pot file to archive
5714
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5715
msgstr ""
5716
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5717
#: breezy/errors.py:1691
6093.2.1 by Jonathan Riddell
add .pot file to archive
5718
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5719
msgstr ""
5720
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5721
#: breezy/errors.py:1705
6093.2.1 by Jonathan Riddell
add .pot file to archive
5722
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5723
msgstr ""
5724
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5725
#: breezy/errors.py:1713
6093.2.1 by Jonathan Riddell
add .pot file to archive
5726
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5727
msgstr ""
5728
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5729
#: breezy/errors.py:1722
6093.2.1 by Jonathan Riddell
add .pot file to archive
5730
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5731
msgstr ""
5732
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5733
#: breezy/errors.py:1736
6093.2.1 by Jonathan Riddell
add .pot file to archive
5734
msgid "Too many redirections"
5735
msgstr ""
5736
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5737
#: breezy/errors.py:1741
6093.2.1 by Jonathan Riddell
add .pot file to archive
5738
msgid "Working tree has conflicts."
5739
msgstr ""
5740
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5741
#: breezy/errors.py:1745
6093.2.1 by Jonathan Riddell
add .pot file to archive
5742
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5743
msgstr ""
5744
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5745
#: breezy/errors.py:1754
6093.2.1 by Jonathan Riddell
add .pot file to archive
5746
msgid ""
5747
"Error(s) parsing config file %(filename)s:\n"
5748
"%(errors)s"
5749
msgstr ""
5750
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5751
#: breezy/errors.py:1764
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
5752
msgid ""
5753
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5754
"See ``brz help %(name)s``"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5755
msgstr ""
5756
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5757
#: breezy/errors.py:1774
6093.2.1 by Jonathan Riddell
add .pot file to archive
5758
msgid "%(username)r does not seem to contain a reasonable email address"
5759
msgstr ""
5760
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5761
#: breezy/errors.py:1783
6093.2.1 by Jonathan Riddell
add .pot file to archive
5762
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5763
msgstr ""
5764
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5765
#: breezy/errors.py:1791
6093.2.1 by Jonathan Riddell
add .pot file to archive
5766
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5767
msgstr ""
5768
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5769
#: breezy/errors.py:1799
6093.2.1 by Jonathan Riddell
add .pot file to archive
5770
msgid "Unable to import library \"%(library)s\": %(error)s"
5771
msgstr ""
5772
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5773
#: breezy/errors.py:1807
6093.2.1 by Jonathan Riddell
add .pot file to archive
5774
msgid "python-gpgme is not installed, it is needed to verify signatures"
5775
msgstr ""
5776
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5777
#: breezy/errors.py:1815
6093.2.1 by Jonathan Riddell
add .pot file to archive
5778
msgid ""
5779
"The working tree for %(basedir)s has changed since the last commit, but "
5780
"weave merge requires that it be unchanged"
5781
msgstr ""
5782
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5783
#: breezy/errors.py:1825
6093.2.1 by Jonathan Riddell
add .pot file to archive
5784
msgid ""
5785
"Can't reprocess and show base, because reprocessing obscures the "
5786
"relationship of conflicting lines to the base"
5787
msgstr ""
5788
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5789
#: breezy/errors.py:1831
6093.2.1 by Jonathan Riddell
add .pot file to archive
5790
msgid "Cycle in graph %(graph)r"
5791
msgstr ""
5792
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5793
#: breezy/errors.py:1859
6093.2.1 by Jonathan Riddell
add .pot file to archive
5794
msgid "File %(filename)s is not conflicted."
5795
msgstr ""
5796
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5797
#: breezy/errors.py:1881
6093.2.1 by Jonathan Riddell
add .pot file to archive
5798
msgid "No bundle was found in \"%(filename)s\"."
5799
msgstr ""
5800
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5801
#: breezy/errors.py:1890
6093.2.1 by Jonathan Riddell
add .pot file to archive
5802
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5803
msgstr ""
5804
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5805
#: breezy/errors.py:1900
6093.2.1 by Jonathan Riddell
add .pot file to archive
5806
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5807
msgstr ""
5808
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5809
#: breezy/errors.py:1913
6093.2.1 by Jonathan Riddell
add .pot file to archive
5810
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5811
msgstr ""
5812
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5813
#: breezy/errors.py:1923
6093.2.1 by Jonathan Riddell
add .pot file to archive
5814
msgid "Key %(key)s is already present in map"
5815
msgstr ""
5816
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5817
#: breezy/errors.py:1928
6093.2.1 by Jonathan Riddell
add .pot file to archive
5818
msgid "The prefix %(prefix)s is in the help search path twice."
5819
msgstr ""
5820
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5821
#: breezy/errors.py:1938
6093.2.1 by Jonathan Riddell
add .pot file to archive
5822
msgid ""
5823
"No final name for trans_id %(trans_id)r\n"
5824
"file-id: %(file_id)r\n"
5825
"root trans-id: %(root_trans_id)r\n"
5826
msgstr ""
5827
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5828
#: breezy/errors.py:1970
6093.2.1 by Jonathan Riddell
add .pot file to archive
5829
msgid "Attempt to reuse a transform that has already been applied."
5830
msgstr ""
5831
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5832
#: breezy/errors.py:1975
6093.2.1 by Jonathan Riddell
add .pot file to archive
5833
msgid "Moving the root directory is not supported at this time"
5834
msgstr ""
5835
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5836
#: breezy/errors.py:1980
6093.2.1 by Jonathan Riddell
add .pot file to archive
5837
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5838
msgstr ""
5839
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5840
#: breezy/errors.py:1991
6093.2.1 by Jonathan Riddell
add .pot file to archive
5841
msgid ""
5842
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5843
msgstr ""
5844
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5845
#: breezy/errors.py:2027
6093.2.1 by Jonathan Riddell
add .pot file to archive
5846
msgid ""
5847
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5848
msgstr ""
5849
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5850
#: breezy/errors.py:2057
6093.2.1 by Jonathan Riddell
add .pot file to archive
5851
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5852
msgstr ""
5853
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5854
#: breezy/errors.py:2065
6093.2.1 by Jonathan Riddell
add .pot file to archive
5855
msgid "Nothing to merge."
5856
msgstr ""
5857
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5858
#: breezy/errors.py:2070
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5859
msgid "Format %(format)s cannot be initialised by this version of brz."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5860
msgstr ""
5861
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5862
#: breezy/errors.py:2079
6093.2.1 by Jonathan Riddell
add .pot file to archive
5863
msgid ""
5864
"Cannot convert from format %(from_format)s to format %(format)s.    "
5865
"%(problem)s"
5866
msgstr ""
5867
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5868
#: breezy/errors.py:2091
6093.2.1 by Jonathan Riddell
add .pot file to archive
5869
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5870
msgstr ""
5871
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5872
#: breezy/errors.py:2099
6093.2.1 by Jonathan Riddell
add .pot file to archive
5873
msgid "%(exe_name)s could not be found on this machine"
5874
msgstr ""
5875
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5876
#: breezy/errors.py:2107
6093.2.1 by Jonathan Riddell
add .pot file to archive
5877
msgid "Diff is not installed on this machine: %(msg)s"
5878
msgstr ""
5879
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5880
#: breezy/errors.py:2115
6093.2.1 by Jonathan Riddell
add .pot file to archive
5881
msgid "Diff3 is not installed on this machine."
5882
msgstr ""
5883
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5884
#: breezy/errors.py:2121
6093.2.1 by Jonathan Riddell
add .pot file to archive
5885
msgid "The content being inserted is already present."
5886
msgstr ""
5887
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5888
#: breezy/errors.py:2126
6093.2.1 by Jonathan Riddell
add .pot file to archive
5889
msgid ""
5890
"This tree contains left-over files from a failed operation.\n"
5891
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
5892
"to\n"
5893
"    keep, and delete it when you are done."
5894
msgstr ""
5895
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5896
#: breezy/errors.py:2137
6093.2.1 by Jonathan Riddell
add .pot file to archive
5897
msgid ""
5898
"This tree contains left-over files from a failed operation.\n"
5899
"    Please examine %(pending_deletion)s to see if it contains any files you\n"
5900
"    wish to keep, and delete it when you are done."
5901
msgstr ""
5902
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5903
#: breezy/errors.py:2147
6093.2.1 by Jonathan Riddell
add .pot file to archive
5904
msgid ""
5905
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5906
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
5907
"to\n"
5908
"    keep, and delete it when you are done."
5909
msgstr ""
5910
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5911
#: breezy/errors.py:2158
6093.2.1 by Jonathan Riddell
add .pot file to archive
5912
msgid ""
5913
"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
5914
"examine %(pending_deletion)s to see if it contains any files you wish to "
5915
"keep, and delete it when you are done."
5916
msgstr ""
5917
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5918
#: breezy/errors.py:2168
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
5919
msgid "Working tree is out of date, please run 'brz update'.%(more)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
5920
msgstr ""
5921
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5922
#: breezy/errors.py:2182
6093.2.1 by Jonathan Riddell
add .pot file to archive
5923
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5924
msgstr ""
5925
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5926
#: breezy/errors.py:2195
6093.2.1 by Jonathan Riddell
add .pot file to archive
5927
msgid "Error in merge modified format"
5928
msgstr ""
5929
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5930
#: breezy/errors.py:2200
6093.2.1 by Jonathan Riddell
add .pot file to archive
5931
msgid "Format error in conflict listings"
5932
msgstr ""
5933
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5934
#: breezy/errors.py:2204
6093.2.1 by Jonathan Riddell
add .pot file to archive
5935
msgid ""
5936
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5937
"Error: %(description)s"
5938
msgstr ""
5939
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5940
#: breezy/errors.py:2215
6093.2.1 by Jonathan Riddell
add .pot file to archive
5941
msgid ""
5942
"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.
5943
"Please run brz reconcile on this repository."
6093.2.1 by Jonathan Riddell
add .pot file to archive
5944
msgstr ""
5945
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5946
#: breezy/errors.py:2226
6093.2.1 by Jonathan Riddell
add .pot file to archive
5947
msgid ""
5948
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5949
"reason: %(reason)s"
5950
msgstr ""
5951
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5952
#: breezy/errors.py:2239
6093.2.1 by Jonathan Riddell
add .pot file to archive
5953
msgid ""
5954
"An inconsistent delta was supplied: %(delta)r\n"
5955
"reason: %(reason)s"
5956
msgstr ""
5957
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5958
#: breezy/errors.py:2251
6093.2.1 by Jonathan Riddell
add .pot file to archive
5959
msgid "To use this feature you must upgrade your branch at %(path)s."
5960
msgstr ""
5961
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5962
#: breezy/errors.py:2260
6093.2.1 by Jonathan Riddell
add .pot file to archive
5963
msgid "To use this feature you must upgrade your repository at %(path)s."
5964
msgstr ""
5965
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5966
#: breezy/errors.py:2265
6093.2.1 by Jonathan Riddell
add .pot file to archive
5967
msgid ""
5968
"To use this feature you must upgrade your branch at %(path)s to a format "
5969
"which supports rich roots."
5970
msgstr ""
5971
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5972
#: breezy/errors.py:2271
6093.2.1 by Jonathan Riddell
add .pot file to archive
5973
msgid "Cannot perform local-only commits on unbound branches."
5974
msgstr ""
5975
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5976
#: breezy/errors.py:2276
6093.2.1 by Jonathan Riddell
add .pot file to archive
5977
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5978
msgstr ""
5979
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5980
#: breezy/errors.py:2297
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
5981
msgid "Ghost tags not supported by format %(format)r."
5982
msgstr ""
5983
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5984
#: breezy/errors.py:2305
6093.2.1 by Jonathan Riddell
add .pot file to archive
5985
msgid "File is binary but should be text."
5986
msgstr ""
5987
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5988
#: breezy/errors.py:2310
6093.2.1 by Jonathan Riddell
add .pot file to archive
5989
msgid "The path %(path)s is not permitted on this platform"
5990
msgstr ""
5991
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5992
#: breezy/errors.py:2319
6093.2.1 by Jonathan Riddell
add .pot file to archive
5993
msgid ""
5994
"Testament did not match expected value.\n"
5995
"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5996
"       {%(measured)s}"
5997
msgstr ""
5998
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5999
#: breezy/errors.py:2331
6093.2.1 by Jonathan Riddell
add .pot file to archive
6000
msgid "Not a bzr revision-bundle: %(text)r"
6001
msgstr ""
6002
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6003
#: breezy/errors.py:2340
6093.2.1 by Jonathan Riddell
add .pot file to archive
6004
msgid "Bad bzr revision-bundle: %(text)r"
6005
msgstr ""
6006
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6007
#: breezy/errors.py:2349
6093.2.1 by Jonathan Riddell
add .pot file to archive
6008
msgid "Malformed bzr revision-bundle header: %(text)r"
6009
msgstr ""
6010
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6011
#: breezy/errors.py:2354
6093.2.1 by Jonathan Riddell
add .pot file to archive
6012
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6013
msgstr ""
6014
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6015
#: breezy/errors.py:2359
6093.2.1 by Jonathan Riddell
add .pot file to archive
6016
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6017
msgstr ""
6018
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6019
#: breezy/errors.py:2364
6093.2.1 by Jonathan Riddell
add .pot file to archive
6020
msgid "End of line marker was not \\n in bzr revision-bundle"
6021
msgstr ""
6022
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6023
#: breezy/errors.py:2374
6093.2.1 by Jonathan Riddell
add .pot file to archive
6024
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6025
msgstr ""
6026
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6027
#: breezy/errors.py:2384
6093.2.1 by Jonathan Riddell
add .pot file to archive
6028
msgid "Root class for inventory serialization errors"
6029
msgstr ""
6030
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6031
#: breezy/errors.py:2388
6093.2.1 by Jonathan Riddell
add .pot file to archive
6032
msgid ""
6033
"The inventory was not in the expected format:\n"
6034
" %(msg)s"
6035
msgstr ""
6036
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6037
#: breezy/errors.py:2397
6093.2.1 by Jonathan Riddell
add .pot file to archive
6038
msgid "This operation requires rich root data storage"
6039
msgstr ""
6040
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6041
#: breezy/errors.py:2410
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6042
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6043
msgstr ""
6044
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6045
#: breezy/errors.py:2419
6093.2.1 by Jonathan Riddell
add .pot file to archive
6046
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6047
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6048
"variable."
6049
msgstr ""
6050
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6051
#: breezy/errors.py:2426
6093.2.1 by Jonathan Riddell
add .pot file to archive
6052
msgid ""
6053
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6054
"ghost at {%(ghost_revision_id)s}"
6055
msgstr ""
6056
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6057
#: breezy/errors.py:2436
6093.2.1 by Jonathan Riddell
add .pot file to archive
6058
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6059
msgstr ""
6060
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6061
#: breezy/errors.py:2487
6093.2.1 by Jonathan Riddell
add .pot file to archive
6062
msgid ""
6063
"A merge directive must provide either a bundle or a public branch location."
6064
msgstr ""
6065
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6066
#: breezy/errors.py:2494
6093.2.1 by Jonathan Riddell
add .pot file to archive
6067
msgid "Bad merge directive payload %(start)r"
6068
msgstr ""
6069
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6070
#: breezy/errors.py:2504
6093.2.1 by Jonathan Riddell
add .pot file to archive
6071
msgid "Preview patch does not match requested changes."
6072
msgstr ""
6073
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6074
#: breezy/errors.py:2510
6093.2.1 by Jonathan Riddell
add .pot file to archive
6075
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6076
msgstr ""
6077
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6078
#: breezy/errors.py:2520
6093.2.1 by Jonathan Riddell
add .pot file to archive
6079
msgid ""
6080
"Your branch does not have all of the revisions required in order to merge "
6081
"this merge directive and the target location specified in the merge "
6082
"directive is not a branch: %(location)s."
6083
msgstr ""
6084
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6085
#: breezy/errors.py:2532
6093.2.1 by Jonathan Riddell
add .pot file to archive
6086
msgid "Unsupported entry kind %(kind)s"
6087
msgstr ""
6088
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6089
#: breezy/errors.py:2540
6093.2.1 by Jonathan Riddell
add .pot file to archive
6090
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6091
msgstr ""
6092
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6093
#: breezy/errors.py:2550
6093.2.1 by Jonathan Riddell
add .pot file to archive
6094
msgid "Subsume target %(other_tree)s needs to be upgraded."
6095
msgstr ""
6096
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6097
#: breezy/errors.py:2569
6093.2.1 by Jonathan Riddell
add .pot file to archive
6098
msgid "No such tag: %(tag_name)s"
6099
msgstr ""
6100
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6101
#: breezy/errors.py:2577
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6102
msgid "Tags not supported by %(branch)s; you may be able to use brz upgrade."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6103
msgstr ""
6104
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6105
#: breezy/errors.py:2586
6093.2.1 by Jonathan Riddell
add .pot file to archive
6106
msgid "Tag %(tag_name)s already exists."
6107
msgstr ""
6108
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6109
#: breezy/errors.py:2594
6093.2.1 by Jonathan Riddell
add .pot file to archive
6110
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6111
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"brz help bugs"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6112
"\" for more information on this feature."
6113
msgstr ""
6114
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6115
#: breezy/errors.py:2604
6093.2.1 by Jonathan Riddell
add .pot file to archive
6116
msgid ""
6117
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6118
msgstr ""
6119
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6120
#: breezy/errors.py:2614
6093.2.1 by Jonathan Riddell
add .pot file to archive
6121
msgid ""
6122
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6123
msgstr ""
6124
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6125
#: breezy/errors.py:2624
6093.2.1 by Jonathan Riddell
add .pot file to archive
6126
msgid "Invalid line in bugs property: '%(line)s'"
6127
msgstr ""
6128
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6129
#: breezy/errors.py:2632
6093.2.1 by Jonathan Riddell
add .pot file to archive
6130
msgid "Invalid bug status: '%(status)s'"
6131
msgstr ""
6132
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6133
#: breezy/errors.py:2640
6093.2.1 by Jonathan Riddell
add .pot file to archive
6134
msgid "Could not understand response from smart server: %(response_tuple)r"
6135
msgstr ""
6136
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6137
#: breezy/errors.py:2679
6093.2.1 by Jonathan Riddell
add .pot file to archive
6138
msgid "Server sent an unexpected error: %(error_tuple)r"
6139
msgstr ""
6140
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6141
#: breezy/errors.py:2698
6093.2.1 by Jonathan Riddell
add .pot file to archive
6142
msgid "Unrecognised container format: %(container_format)r"
6143
msgstr ""
6144
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6145
#: breezy/errors.py:2706
6093.2.1 by Jonathan Riddell
add .pot file to archive
6146
msgid "Unexpected end of container stream"
6147
msgstr ""
6148
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6149
#: breezy/errors.py:2711
6093.2.1 by Jonathan Riddell
add .pot file to archive
6150
msgid "Unknown record type: %(record_type)r"
6151
msgstr ""
6152
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6153
#: breezy/errors.py:2719
6093.2.1 by Jonathan Riddell
add .pot file to archive
6154
msgid "Invalid record: %(reason)s"
6155
msgstr ""
6156
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6157
#: breezy/errors.py:2727
6093.2.1 by Jonathan Riddell
add .pot file to archive
6158
msgid "Container has data after end marker: %(excess)r"
6159
msgstr ""
6160
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6161
#: breezy/errors.py:2735
6093.2.1 by Jonathan Riddell
add .pot file to archive
6162
msgid "Container has multiple records with the same name: %(name)s"
6163
msgstr ""
6164
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6165
#: breezy/errors.py:2748
6093.2.1 by Jonathan Riddell
add .pot file to archive
6166
msgid "Corrupt or incompatible data stream: %(reason)s"
6167
msgstr ""
6168
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6169
#: breezy/errors.py:2756
6093.2.1 by Jonathan Riddell
add .pot file to archive
6170
msgid "SMTP error: %(error)s"
6171
msgstr ""
6172
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6173
#: breezy/errors.py:2764
6093.2.1 by Jonathan Riddell
add .pot file to archive
6174
msgid "No message supplied."
6175
msgstr ""
6176
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6177
#: breezy/errors.py:2769
6093.2.1 by Jonathan Riddell
add .pot file to archive
6178
msgid "No mail-to address (--mail-to) or output (-o) specified."
6179
msgstr ""
6180
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6181
#: breezy/errors.py:2774
6093.2.1 by Jonathan Riddell
add .pot file to archive
6182
msgid ""
6183
"Unable to find mail client with the following names: "
6184
"%(mail_command_list_string)s"
6185
msgstr ""
6186
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6187
#: breezy/errors.py:2784
6093.2.1 by Jonathan Riddell
add .pot file to archive
6188
msgid "SMTP connection to %(host)s refused"
6189
msgstr ""
6190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6191
#: breezy/errors.py:2793
6093.2.1 by Jonathan Riddell
add .pot file to archive
6192
msgid "Please specify smtp_server.  No server at default %(host)s."
6193
msgstr ""
6194
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6195
#: breezy/errors.py:2807
6093.2.1 by Jonathan Riddell
add .pot file to archive
6196
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6197
"'%(display_url)s' is not in sync with %(target_url)s.  See brz help sync-for-"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6198
"reconfigure."
6199
msgstr ""
6200
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6201
#: breezy/errors.py:2819
6093.2.1 by Jonathan Riddell
add .pot file to archive
6202
msgid "'%(display_url)s' is already a branch."
6203
msgstr ""
6204
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6205
#: breezy/errors.py:2824
6093.2.1 by Jonathan Riddell
add .pot file to archive
6206
msgid "'%(display_url)s' is already a tree."
6207
msgstr ""
6208
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6209
#: breezy/errors.py:2829
6093.2.1 by Jonathan Riddell
add .pot file to archive
6210
msgid "'%(display_url)s' is already a checkout."
6211
msgstr ""
6212
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6213
#: breezy/errors.py:2834
6093.2.1 by Jonathan Riddell
add .pot file to archive
6214
msgid "'%(display_url)s' is already a lightweight checkout."
6215
msgstr ""
6216
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6217
#: breezy/errors.py:2839
6093.2.1 by Jonathan Riddell
add .pot file to archive
6218
msgid "'%(display_url)s' is already using a shared repository."
6219
msgstr ""
6220
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6221
#: breezy/errors.py:2844
6093.2.1 by Jonathan Riddell
add .pot file to archive
6222
msgid "'%(display_url)s' is already standalone."
6223
msgstr ""
6224
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6225
#: breezy/errors.py:2849
6093.2.1 by Jonathan Riddell
add .pot file to archive
6226
msgid "Shared repository '%(display_url)s' already creates working trees."
6227
msgstr ""
6228
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6229
#: breezy/errors.py:2855
6093.2.1 by Jonathan Riddell
add .pot file to archive
6230
msgid ""
6231
"Shared repository '%(display_url)s' already doesn't create working trees."
6232
msgstr ""
6233
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6234
#: breezy/errors.py:2861
6093.2.1 by Jonathan Riddell
add .pot file to archive
6235
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6236
msgstr ""
6237
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6238
#: breezy/errors.py:2866
6093.2.1 by Jonathan Riddell
add .pot file to archive
6239
msgid "No location could be found to bind to at %(display_url)s."
6240
msgstr ""
6241
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6242
#: breezy/errors.py:2871
6093.2.1 by Jonathan Riddell
add .pot file to archive
6243
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6244
"Working tree \"%(display_url)s\" has uncommitted changes (See brz status)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6245
"%(more)s"
6246
msgstr ""
6247
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6248
#: breezy/errors.py:2890
6093.2.1 by Jonathan Riddell
add .pot file to archive
6249
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
6250
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6251
msgstr ""
6252
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6253
#: breezy/errors.py:2905
6581.1.2 by Vincent Ladeuil
Update translation template.
6254
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6255
"Working tree \"%(display_url)s\" has shelved changes (See brz shelve --list)."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6256
"%(more)s"
6257
msgstr ""
6258
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6259
#: breezy/errors.py:2911
6093.2.1 by Jonathan Riddell
add .pot file to archive
6260
msgid "Variable {%(name)s} is not available."
6261
msgstr ""
6262
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6263
#: breezy/errors.py:2919
6093.2.1 by Jonathan Riddell
add .pot file to archive
6264
msgid "No template specified."
6265
msgstr ""
6266
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6267
#: breezy/errors.py:2924
6093.2.1 by Jonathan Riddell
add .pot file to archive
6268
msgid "Unable to create symlink %(path_str)son this platform"
6269
msgstr ""
6270
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6271
#: breezy/errors.py:2939
6093.2.1 by Jonathan Riddell
add .pot file to archive
6272
msgid ""
6273
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6274
"\", \"local\"."
6275
msgstr ""
6276
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6277
#: breezy/errors.py:2973
6093.2.1 by Jonathan Riddell
add .pot file to archive
6278
msgid ""
6279
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6280
msgstr ""
6281
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6282
#: breezy/errors.py:2985
6093.2.1 by Jonathan Riddell
add .pot file to archive
6283
msgid "The \"%(config_id)s\" configuration does not exist."
6284
msgstr ""
6285
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6286
#: breezy/errors.py:2993
6093.2.1 by Jonathan Riddell
add .pot file to archive
6287
msgid "The \"%(option_name)s\" configuration option does not exist."
6288
msgstr ""
6289
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6290
#: breezy/errors.py:3001
6093.2.1 by Jonathan Riddell
add .pot file to archive
6291
msgid "The alias \"%(alias_name)s\" does not exist."
6292
msgstr ""
6293
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6294
#: breezy/errors.py:3015
6093.2.1 by Jonathan Riddell
add .pot file to archive
6295
msgid "\"%(alias_name)s\" is not a valid location alias."
6296
msgstr ""
6297
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6298
#: breezy/errors.py:3023
6093.2.1 by Jonathan Riddell
add .pot file to archive
6299
msgid "No %(alias_name)s location assigned."
6300
msgstr ""
6301
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6302
#: breezy/errors.py:3031
6093.2.1 by Jonathan Riddell
add .pot file to archive
6303
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6304
msgstr ""
6305
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6306
#: breezy/errors.py:3041
6093.2.1 by Jonathan Riddell
add .pot file to archive
6307
msgid "Unknown rules detected: %(unknowns_str)s."
6308
msgstr ""
6309
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6310
#: breezy/errors.py:3052
6093.2.1 by Jonathan Riddell
add .pot file to archive
6311
msgid "Tip change rejected: %(msg)s"
6312
msgstr ""
6313
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6314
#: breezy/errors.py:3060
6093.2.1 by Jonathan Riddell
add .pot file to archive
6315
msgid "Shelf corrupt."
6316
msgstr ""
6317
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6318
#: breezy/errors.py:3065
6093.2.1 by Jonathan Riddell
add .pot file to archive
6319
msgid "Corruption while decompressing repository file%(orig_error)s"
6320
msgstr ""
6321
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6322
#: breezy/errors.py:3077
6093.2.1 by Jonathan Riddell
add .pot file to archive
6323
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6324
msgstr ""
6325
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6326
#: breezy/errors.py:3085
6093.2.1 by Jonathan Riddell
add .pot file to archive
6327
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6328
msgstr ""
6329
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6330
#: breezy/errors.py:3093
6093.2.1 by Jonathan Riddell
add .pot file to archive
6331
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6332
msgstr ""
6333
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6334
#: breezy/errors.py:3101
6093.2.1 by Jonathan Riddell
add .pot file to archive
6335
msgid "The user aborted the operation."
6336
msgstr ""
6337
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6338
#: breezy/errors.py:3106
6093.2.1 by Jonathan Riddell
add .pot file to archive
6339
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6340
msgstr ""
6341
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6342
#: breezy/errors.py:3116
6093.2.1 by Jonathan Riddell
add .pot file to archive
6343
msgid "No such view: %(view_name)s."
6344
msgstr ""
6345
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6346
#: breezy/errors.py:3126
6093.2.1 by Jonathan Riddell
add .pot file to archive
6347
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6348
"Views are not supported by %(tree)s; use 'brz upgrade' to change your tree "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6349
"to a later format."
6350
msgstr ""
6351
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6352
#: breezy/errors.py:3135
6093.2.1 by Jonathan Riddell
add .pot file to archive
6353
msgid ""
6354
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6355
msgstr ""
6356
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6357
#: breezy/errors.py:3202
6093.2.1 by Jonathan Riddell
add .pot file to archive
6358
msgid "%(bzrdir)r does not support co-located branches."
6359
msgstr ""
6360
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6361
#: breezy/errors.py:3208
6093.2.1 by Jonathan Riddell
add .pot file to archive
6362
msgid ""
6363
"Unable to determine your name.\n"
6364
"Please, set your name with the 'whoami' command.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6365
"E.g. brz whoami \"Your Name <name@example.com>\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
6366
msgstr ""
6367
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6368
#: breezy/errors.py:3217
6093.2.1 by Jonathan Riddell
add .pot file to archive
6369
msgid "Invalid pattern(s) found. %(msg)s"
6370
msgstr ""
6371
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6372
#: breezy/errors.py:3225
6093.2.1 by Jonathan Riddell
add .pot file to archive
6373
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6374
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `brz "
6093.2.1 by Jonathan Riddell
add .pot file to archive
6375
"unbind` to fix."
6376
msgstr ""
6377
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6378
#: breezy/errors.py:3236
6093.2.1 by Jonathan Riddell
add .pot file to archive
6379
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6380
msgstr ""
6381
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6382
#: breezy/errors.py:3245
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6383
msgid "Option \"%(name)s\" is not defined while expanding \"%(string)s\"."
6384
msgstr ""
6385
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6386
#: breezy/errors.py:3254
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6387
msgid "Option \"%(name)s\" is not allowed."
6388
msgstr ""
6389
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6390
#: breezy/errors.py:3262
6093.2.1 by Jonathan Riddell
add .pot file to archive
6391
msgid ""
6392
"No compatible object available for operations from %(source)r to %(target)r."
6393
msgstr ""
6394
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6395
#: breezy/errors.py:3272
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
6396
msgid ""
6397
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6398
"%(arguments)s."
6399
msgstr ""
6400
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6401
#: breezy/errors.py:3282
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6402
msgid ""
6403
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6404
"format %(format)r"
6405
msgstr ""
6406
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6407
#: breezy/errors.py:3294
6437.2.2 by Vincent Ladeuil
Release 2.5b5
6408
msgid ""
6409
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6410
"plugin."
6411
msgstr ""
6412
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6413
#: breezy/errors.py:3307
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6414
msgid "Binary files section encountered."
6415
msgstr ""
6416
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6417
#: breezy/errors.py:3315
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6418
msgid ""
6419
"Malformed patch header.  %(desc)s\n"
6420
"%(line)r"
6421
msgstr ""
6422
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6423
#: breezy/errors.py:3324
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6424
msgid ""
6425
"Malformed hunk header.  %(desc)s\n"
6426
"%(line)r"
6427
msgstr ""
6428
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6429
#: breezy/errors.py:3333
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6430
msgid ""
6431
"Malformed line.  %(desc)s\n"
6432
"%(line)r"
6433
msgstr ""
6434
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6435
#: breezy/errors.py:3343
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6436
msgid ""
6437
"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
6438
"but patch says it should be \"%(patch_line)s\""
6439
msgstr ""
6440
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6441
#: breezy/errors.py:3354
6437.2.2 by Vincent Ladeuil
Release 2.5b5
6442
msgid "The feature %(feature)s has already been registered."
6443
msgstr ""
6444
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6445
#: breezy/errors.py:3362
6581.1.2 by Vincent Ladeuil
Update translation template.
6446
msgid ""
6447
"Cannot store uncommitted changes because this branch already stores "
6448
"uncommitted changes."
6449
msgstr ""
6450
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6451
#: breezy/export_pot.py:252
6138.4.4 by Jonathan Riddell
update bzr.pot
6452
#, python-format
6453
msgid "Exporting messages from builtin command: %s"
6454
msgstr ""
6455
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6456
#: breezy/export_pot.py:271
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6457
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
6458
msgid "Exporting messages from plugin command: {0} in {1}"
6459
msgstr ""
6460
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6461
#: breezy/export_pot.py:292
6138.4.4 by Jonathan Riddell
update bzr.pot
6462
#, python-format
6463
msgid "Exporting message from error: %s"
6464
msgstr ""
6465
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6466
#: breezy/fetch.py:98
6138.4.4 by Jonathan Riddell
update bzr.pot
6467
msgid "Finding revisions"
6468
msgstr ""
6469
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6470
#: breezy/fetch.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
6471
msgid "Fetching revisions"
6472
msgstr ""
6473
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6474
#: breezy/foreign.py:262
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6475
msgid "Push into a different VCS without any custom bzr metadata."
6476
msgstr ""
6477
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6478
#: breezy/foreign.py:264
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6479
msgid ""
6480
"This will afterwards rebase the local branch on the remote\n"
6481
"branch unless the --no-rebase option is used, in which case \n"
6482
"the two branches will be out of sync after the push. "
6483
msgstr ""
6484
6485
# help of 'no-rebase' option of 'dpush' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6486
#: breezy/foreign.py:277
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6487
msgid "Do not rebase after push."
6488
msgstr ""
6489
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6490
#: breezy/foreign.py:311
6138.4.4 by Jonathan Riddell
update bzr.pot
6491
#, python-format
6492
msgid "Using saved location: %s\n"
6493
msgstr ""
6494
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6495
#: breezy/foreign.py:321
6138.4.4 by Jonathan Riddell
update bzr.pot
6496
msgid ""
6497
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6498
"regular push."
6499
msgstr ""
6500
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6501
#: breezy/gpg.py:358
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6502
#, python-brace-format
6504.1.1 by Vincent Ladeuil
Update translation template
6503
msgid "No GnuPG key results for pattern: {0}"
6504
msgstr ""
6505
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6506
#: breezy/gpg.py:431
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6507
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6508
msgid "{0} commits with valid signatures"
6509
msgstr ""
6510
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6511
#: breezy/gpg.py:437
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6512
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6513
msgid "{0} commit with unknown key"
6514
msgid_plural "{0} commits with unknown keys"
6515
msgstr[0] ""
6516
msgstr[1] ""
6517
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6518
#: breezy/gpg.py:445
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6519
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6520
msgid "{0} commit not valid"
6521
msgid_plural "{0} commits not valid"
6522
msgstr[0] ""
6523
msgstr[1] ""
6524
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6525
#: breezy/gpg.py:453
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6526
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6527
msgid "{0} commit not signed"
6528
msgid_plural "{0} commits not signed"
6529
msgstr[0] ""
6530
msgstr[1] ""
6531
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6532
#: breezy/gpg.py:461
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6533
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6534
msgid "{0} commit with key now expired"
6535
msgid_plural "{0} commits with key now expired"
6536
msgstr[0] ""
6537
msgstr[1] ""
6538
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6539
#: breezy/gpg.py:481
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6540
#, python-brace-format
6504.1.1 by Vincent Ladeuil
Update translation template
6541
msgid "{0} commit by author {1} with key {2} now expired"
6542
msgid_plural "{0} commits by author {1} with key {2} now expired"
6543
msgstr[0] ""
6544
msgstr[1] ""
6093.2.1 by Jonathan Riddell
add .pot file to archive
6545
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6546
#: breezy/gpg.py:497
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6547
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6548
msgid "{0} signed {1} commit"
6549
msgid_plural "{0} signed {1} commits"
6550
msgstr[0] ""
6551
msgstr[1] ""
6552
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6553
#: breezy/gpg.py:514 breezy/gpg.py:531
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6554
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6555
msgid "{0} commit by author {1}"
6556
msgid_plural "{0} commits by author {1}"
6557
msgstr[0] ""
6558
msgstr[1] ""
6559
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6560
#: breezy/gpg.py:546
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6561
#, python-brace-format
6093.2.1 by Jonathan Riddell
add .pot file to archive
6562
msgid "Unknown key {0} signed {1} commit"
6563
msgid_plural "Unknown key {0} signed {1} commits"
6564
msgstr[0] ""
6565
msgstr[1] ""
6566
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6567
#: breezy/groupcompress.py:1739
6138.4.4 by Jonathan Riddell
update bzr.pot
6568
#, python-format
6569
msgid "Insert claimed random_id=True, but then inserted %r two times"
6570
msgstr ""
6571
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6572
#: breezy/hooks.py:313
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6573
#, python-format
6574
msgid "Introduced in: %s"
6575
msgstr ""
6576
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6577
#: breezy/hooks.py:316
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6578
#, python-format
6579
msgid "Deprecated in: %s"
6580
msgstr ""
6581
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6582
#: breezy/knit.py:1766 breezy/knit.py:1802
6138.4.4 by Jonathan Riddell
update bzr.pot
6583
msgid "Walking content"
6584
msgstr ""
6585
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6586
#: breezy/knit.py:3330
6138.4.4 by Jonathan Riddell
update bzr.pot
6587
msgid "annotating"
6588
msgstr ""
6589
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6590
#: breezy/lock.py:549
6150.1.1 by Jonathan Riddell
update bzr.pot
6591
msgid "{0!r} was {1} locked again"
6138.4.4 by Jonathan Riddell
update bzr.pot
6592
msgstr ""
6593
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6594
#: breezy/lockdir.py:321
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6595
#, python-format
6596
msgid "error removing pending lock: %s"
6597
msgstr ""
6598
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6599
#: breezy/lockdir.py:616
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6600
msgid "Unable to obtain"
6601
msgstr ""
6602
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6603
#: breezy/lockdir.py:618
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6604
msgid "Lock owner changed for"
6605
msgstr ""
6606
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6607
#: breezy/lockdir.py:620
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
6608
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6609
msgid "{0} lock {1} {2}."
6610
msgstr ""
6611
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6612
#: breezy/lockdir.py:627
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6613
#, python-format
6614
msgid "Will continue to try until %s, unless you press Ctrl-C."
6615
msgstr ""
6616
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6617
#: breezy/lockdir.py:629
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6618
msgid "See \"bzr help break-lock\" for more."
6619
msgstr ""
6620
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6621
#: breezy/lockdir.py:739
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6622
#, python-format
6623
msgid ""
6624
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6625
msgstr ""
6626
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6627
#: breezy/log.py:563
6138.4.4 by Jonathan Riddell
update bzr.pot
6628
msgid "--exclude-common-ancestry requires two different revisions"
6629
msgstr ""
6630
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6631
#: breezy/log.py:565
6138.4.4 by Jonathan Riddell
update bzr.pot
6632
#, python-format
6633
msgid "invalid direction %r"
6634
msgstr ""
6635
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6636
#: breezy/log.py:653
6138.4.4 by Jonathan Riddell
update bzr.pot
6637
msgid "Start revision not found in history of end revision."
6638
msgstr ""
6639
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6640
#: breezy/log.py:1071 breezy/log.py:1129
6138.4.4 by Jonathan Riddell
update bzr.pot
6641
msgid "Logging revision 0 is invalid."
6642
msgstr ""
6643
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6644
#: breezy/log.py:1073 breezy/log.py:1131
6138.4.4 by Jonathan Riddell
update bzr.pot
6645
msgid "Start revision must be older than the end revision."
6646
msgstr ""
6647
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6648
#: breezy/log.py:1818
6138.4.4 by Jonathan Riddell
update bzr.pot
6649
#, python-format
6650
msgid "unknown log formatter: %r"
6651
msgstr ""
6652
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6653
#: breezy/log.py:2114
6143.1.7 by Jonathan Riddell
update bzr.pot
6654
msgid "fixes bug"
6150.1.1 by Jonathan Riddell
update bzr.pot
6655
msgid_plural "fixes bugs"
6143.1.7 by Jonathan Riddell
update bzr.pot
6656
msgstr[0] ""
6657
msgstr[1] ""
6658
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6659
#: breezy/merge.py:689
6138.4.4 by Jonathan Riddell
update bzr.pot
6660
msgid "All changes applied successfully."
6661
msgstr ""
6662
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6663
#: breezy/merge.py:691
6138.4.4 by Jonathan Riddell
update bzr.pot
6664
#, python-format
6665
msgid "%d conflicts encountered."
6666
msgstr ""
6667
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6668
#: breezy/merge.py:845 breezy/merge.py:1868
6138.4.4 by Jonathan Riddell
update bzr.pot
6669
msgid "Preparing file merge"
6670
msgstr ""
6671
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6672
#: breezy/multiparent.py:426
6138.4.4 by Jonathan Riddell
update bzr.pot
6673
msgid "Importing revisions"
6674
msgstr ""
6675
6093.2.1 by Jonathan Riddell
add .pot file to archive
6676
# help of 'help' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6677
#: breezy/option.py:526
6093.2.1 by Jonathan Riddell
add .pot file to archive
6678
msgid "Show help message."
6679
msgstr ""
6680
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6681
# help of 'quiet' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6682
#: breezy/option.py:528
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6683
msgid "Only display errors and warnings."
6684
msgstr ""
6685
6093.2.1 by Jonathan Riddell
add .pot file to archive
6686
# help of 'usage' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6687
#: breezy/option.py:531
6093.2.1 by Jonathan Riddell
add .pot file to archive
6688
msgid "Show usage message and options."
6689
msgstr ""
6690
6691
# help of 'verbose' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6692
#: breezy/option.py:533
6093.2.1 by Jonathan Riddell
add .pot file to archive
6693
msgid "Display more information."
6694
msgstr ""
6695
6696
# help of 'change' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6697
#: breezy/option.py:541
6093.2.1 by Jonathan Riddell
add .pot file to archive
6698
msgid ""
6699
"Select changes introduced by the specified revision. See also \"help "
6700
"revisionspec\"."
6701
msgstr ""
6702
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6703
# help of 'directory' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6704
#: breezy/option.py:543
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6705
msgid "Branch to operate on, instead of working directory."
6706
msgstr ""
6707
6708
# help of 'log-format=long' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6709
#: breezy/option.py:545
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6710
msgid "Detailed log format."
6711
msgstr ""
6712
6713
# help of 'log-format=gnu-changelog' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6714
#: breezy/option.py:545
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6715
msgid "Format used by GNU ChangeLog files."
6716
msgstr ""
6717
6718
# help of 'log-format=line' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6719
#: breezy/option.py:545
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6720
msgid "Log format with one line per revision."
6721
msgstr ""
6722
6723
# help of 'log-format=short' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6724
#: breezy/option.py:545
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6725
msgid "Moderately short log format."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6726
msgstr ""
6727
6728
# help of 'log-format' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6729
#: breezy/option.py:545
6093.2.1 by Jonathan Riddell
add .pot file to archive
6730
msgid "Use specified log format."
6731
msgstr ""
6732
6733
# title of 'log-format' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6734
#: breezy/option.py:547
6093.2.1 by Jonathan Riddell
add .pot file to archive
6735
msgid "Log format"
6736
msgstr ""
6737
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6738
# help of 'merge-type=lca' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6739
#: breezy/option.py:549
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6740
msgid "LCA-newness merge."
6741
msgstr ""
6742
6743
# help of 'merge-type=diff3' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6744
#: breezy/option.py:549
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6745
msgid "Merge using external diff3."
6746
msgstr ""
6747
6748
# help of 'merge-type=merge3' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6749
#: breezy/option.py:549
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6750
msgid "Native diff3-style merge."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6751
msgstr ""
6752
6753
# help of 'merge-type' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6754
#: breezy/option.py:549
6093.2.1 by Jonathan Riddell
add .pot file to archive
6755
msgid "Select a particular merge algorithm."
6756
msgstr ""
6757
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6758
# help of 'merge-type=weave' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6759
#: breezy/option.py:549
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6760
msgid "Weave-based merge."
6761
msgstr ""
6762
6093.2.1 by Jonathan Riddell
add .pot file to archive
6763
# title of 'merge-type' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6764
#: breezy/option.py:551
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6765
msgid "Merge algorithm"
6766
msgstr ""
6767
6768
# help of 'message' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6769
#: breezy/option.py:554
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6770
msgid "Message string."
6771
msgstr ""
6772
6773
# help of 'null' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6774
#: breezy/option.py:556
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6775
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6776
msgstr ""
6777
6778
# help of 'overwrite' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6779
#: breezy/option.py:558
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6780
msgid "Ignore differences between branches and overwrite unconditionally."
6781
msgstr ""
6782
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6783
# help of 'remember' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6784
#: breezy/option.py:560
6349.1.1 by Vincent Ladeuil
Release 2.5b4
6785
msgid "Remember the specified location as a default."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6786
msgstr ""
6787
6788
# help of 'reprocess' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6789
#: breezy/option.py:562
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6790
msgid "Reprocess to reduce spurious conflicts."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6791
msgstr ""
6792
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6793
# help of 'revision' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6794
#: breezy/option.py:566
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6795
msgid "See \"help revisionspec\" for details."
6796
msgstr ""
6797
6798
# help of 'show-ids' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6799
#: breezy/option.py:568
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6800
msgid "Show internal object ids."
6801
msgstr ""
6802
6803
# help of 'timezone' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6804
#: breezy/option.py:571
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6805
msgid "Display timezone as local, original, or utc."
6093.2.1 by Jonathan Riddell
add .pot file to archive
6806
msgstr ""
6807
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6808
#: breezy/osutils.py:101
6138.4.4 by Jonathan Riddell
update bzr.pot
6809
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6810
msgstr ""
6811
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6812
#: breezy/osutils.py:221
6138.4.4 by Jonathan Riddell
update bzr.pot
6813
msgid "lstat/stat of ({0!r}): {1!r}"
6814
msgstr ""
6815
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6816
#: breezy/osutils.py:1041 breezy/osutils.py:1052
6138.4.4 by Jonathan Riddell
update bzr.pot
6817
#, python-format
6818
msgid "sorry, %r not allowed in path"
6819
msgstr ""
6820
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6821
#: breezy/osutils.py:1270
6138.4.4 by Jonathan Riddell
update bzr.pot
6822
#, python-format
6823
msgid "%r is too short to calculate a relative path"
6824
msgstr ""
6825
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6826
#: breezy/plugin.py:143
6252.1.1 by Vincent Ladeuil
Release 2.5b3
6827
#, python-format
6828
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6829
msgstr ""
6830
6093.2.1 by Jonathan Riddell
add .pot file to archive
6831
# help of 'plugin' option of 'bash-completion' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6832
#: breezy/plugins/bash_completion/bashcomp.py:411
6093.2.1 by Jonathan Riddell
add .pot file to archive
6833
msgid "Enable completions for the selected plugin (default: all plugins)"
6834
msgstr ""
6835
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6836
#: breezy/plugins/bash_completion/bashcomp.py:412
6093.2.1 by Jonathan Riddell
add .pot file to archive
6837
msgid "Generate a shell function for bash command line completion."
6838
msgstr ""
6839
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6840
#: breezy/plugins/bash_completion/bashcomp.py:414
6093.2.1 by Jonathan Riddell
add .pot file to archive
6841
msgid ""
6842
"This command generates a shell function which can be used by bash to\n"
6843
"automatically complete the currently typed command when the user presses\n"
6844
"the completion key (usually tab)."
6845
msgstr ""
6846
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6847
#: breezy/plugins/bash_completion/bashcomp.py:418
6093.2.1 by Jonathan Riddell
add .pot file to archive
6848
msgid ""
6849
"Commonly used like this:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6850
"    eval \"`brz bash-completion`\""
6093.2.1 by Jonathan Riddell
add .pot file to archive
6851
msgstr ""
6852
6853
# help of 'function-name' option of 'bash-completion' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6854
#: breezy/plugins/bash_completion/bashcomp.py:424
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6855
msgid "Name of the generated function (default: _brz)"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6856
msgstr ""
6857
6858
# help of 'function-only' option of 'bash-completion' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6859
#: breezy/plugins/bash_completion/bashcomp.py:426
6093.2.1 by Jonathan Riddell
add .pot file to archive
6860
msgid "Generate only the shell function, don't enable it"
6861
msgstr ""
6862
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6863
#: breezy/plugins/grep/cmds.py:77
6581.1.2 by Vincent Ladeuil
Update translation template.
6864
msgid "Print lines matching PATTERN for specified files and revisions."
6865
msgstr ""
6866
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6867
#: breezy/plugins/grep/cmds.py:79
6581.1.2 by Vincent Ladeuil
Update translation template.
6868
msgid ""
6869
"This command searches the specified files and revisions for a given\n"
6870
"pattern.  The pattern is specified as a Python regular expressions[1]."
6871
msgstr ""
6872
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6873
#: breezy/plugins/grep/cmds.py:82
6581.1.2 by Vincent Ladeuil
Update translation template.
6874
msgid ""
6875
"If the file name is not specified, the revisions starting with the\n"
6876
"current directory are searched recursively. If the revision number is\n"
6877
"not specified, the working copy is searched. To search the last committed\n"
6878
"revision, use the '-r -1' or '-r last:1' option."
6879
msgstr ""
6880
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6881
#: breezy/plugins/grep/cmds.py:87
6581.1.2 by Vincent Ladeuil
Update translation template.
6882
msgid ""
6883
"Unversioned files are not searched unless explicitly specified on the\n"
6884
"command line. Unversioned directores are not searched."
6885
msgstr ""
6886
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6887
#: breezy/plugins/grep/cmds.py:90
6581.1.2 by Vincent Ladeuil
Update translation template.
6888
msgid ""
6889
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6890
"format. If a revision is explicitly searched, the output is shown as\n"
6891
"'filepath~N:string', where N is the revision number."
6892
msgstr ""
6893
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6894
#: breezy/plugins/grep/cmds.py:94
6581.1.2 by Vincent Ladeuil
Update translation template.
6895
msgid ""
6896
"--include and --exclude options can be used to search only (or exclude\n"
6897
"from search) files with base name matches the specified Unix style GLOB\n"
6898
"pattern.  The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6899
"to quote wildcard or backslash character literally. Note that the glob\n"
6900
"pattern is not a regular expression."
6901
msgstr ""
6902
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6903
#: breezy/plugins/grep/cmds.py:100
6581.1.2 by Vincent Ladeuil
Update translation template.
6904
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6905
msgstr ""
6906
6907
# help of 'color' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6908
#: breezy/plugins/grep/cmds.py:109
6581.1.2 by Vincent Ladeuil
Update translation template.
6909
msgid "Show match in color. WHEN is never, always or auto."
6910
msgstr ""
6911
6912
# help of 'diff' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6913
#: breezy/plugins/grep/cmds.py:111
6581.1.2 by Vincent Ladeuil
Update translation template.
6914
msgid "Grep for pattern in changeset for each revision."
6915
msgstr ""
6916
6917
# help of 'exclude' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6918
#: breezy/plugins/grep/cmds.py:113
6581.1.2 by Vincent Ladeuil
Update translation template.
6919
msgid "Skip files whose base name matches GLOB."
6920
msgstr ""
6921
6922
# help of 'include' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6923
#: breezy/plugins/grep/cmds.py:115
6581.1.2 by Vincent Ladeuil
Update translation template.
6924
msgid "Search only files whose base name matches GLOB."
6925
msgstr ""
6926
6927
# help of 'files-with-matches' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6928
#: breezy/plugins/grep/cmds.py:117
6581.1.2 by Vincent Ladeuil
Update translation template.
6929
msgid "Print only the name of each input file in which PATTERN is found."
6930
msgstr ""
6931
6932
# help of 'files-without-match' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6933
#: breezy/plugins/grep/cmds.py:120
6581.1.2 by Vincent Ladeuil
Update translation template.
6934
msgid "Print only the name of each input file in which PATTERN is not found."
6935
msgstr ""
6936
6937
# help of 'fixed-string' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6938
#: breezy/plugins/grep/cmds.py:123
6581.1.2 by Vincent Ladeuil
Update translation template.
6939
msgid "Interpret PATTERN is a single fixed string (not regex)."
6940
msgstr ""
6941
6942
# help of 'from-root' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6943
#: breezy/plugins/grep/cmds.py:125
6581.1.2 by Vincent Ladeuil
Update translation template.
6944
msgid ""
6945
"Search for pattern starting from the root of the branch. (implies --"
6946
"recursive)"
6947
msgstr ""
6948
6949
# help of 'ignore-case' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6950
#: breezy/plugins/grep/cmds.py:128
6581.1.2 by Vincent Ladeuil
Update translation template.
6951
msgid "ignore case distinctions while matching."
6952
msgstr ""
6953
6954
# help of 'levels' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6955
#: breezy/plugins/grep/cmds.py:130
6581.1.2 by Vincent Ladeuil
Update translation template.
6956
msgid ""
6957
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6958
msgstr ""
6959
6960
# help of 'line-number' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6961
#: breezy/plugins/grep/cmds.py:135
6581.1.2 by Vincent Ladeuil
Update translation template.
6962
msgid "show 1-based line number."
6963
msgstr ""
6964
6965
# help of 'no-recursive' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6966
#: breezy/plugins/grep/cmds.py:137
6581.1.2 by Vincent Ladeuil
Update translation template.
6967
msgid "Don't recurse into subdirectories. (default is --recursive)"
6968
msgstr ""
6969
6970
# help of 'null' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6971
#: breezy/plugins/grep/cmds.py:139
6581.1.2 by Vincent Ladeuil
Update translation template.
6972
msgid ""
6973
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6974
"newline."
6975
msgstr ""
6976
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6977
#: breezy/plugins/launchpad/account.py:66
6504.1.1 by Vincent Ladeuil
Update translation template
6978
msgid "Setting ssh/sftp usernames for launchpad.net."
6979
msgstr ""
6980
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6981
#: breezy/plugins/launchpad/cmds.py:43
6093.2.1 by Jonathan Riddell
add .pot file to archive
6982
msgid "Register a branch with launchpad.net."
6983
msgstr ""
6984
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6985
#: breezy/plugins/launchpad/cmds.py:45
6093.2.1 by Jonathan Riddell
add .pot file to archive
6986
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6987
"This command lists a brz branch in the directory of branches on\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
6988
"launchpad.net.  Registration allows the branch to be associated with\n"
6989
"bugs or specifications."
6990
msgstr ""
6991
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6992
#: breezy/plugins/launchpad/cmds.py:49
6093.2.1 by Jonathan Riddell
add .pot file to archive
6993
msgid ""
6994
"Before using this command you must register the project to which the\n"
6995
"branch belongs, and create an account for yourself on launchpad.net."
6996
msgstr ""
6997
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6998
#: breezy/plugins/launchpad/cmds.py:52
6093.2.1 by Jonathan Riddell
add .pot file to archive
6999
msgid ""
7000
"arguments:\n"
7001
"    public_url: The publicly visible url for the branch to register.\n"
7002
"                This must be an http or https url (which Launchpad can read\n"
7003
"                from to access the branch). Local file urls, SFTP urls, and\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7004
"                brz+ssh urls will not work.\n"
7005
"                If no public_url is provided, brz will use the configured\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7006
"                public_url if there is one for the current branch, and\n"
7007
"                otherwise error."
7008
msgstr ""
7009
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7010
#: breezy/plugins/launchpad/cmds.py:61
6093.2.1 by Jonathan Riddell
add .pot file to archive
7011
msgid ""
7012
"example:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7013
"    brz register-branch http://foo.com/brz/fooproject.mine \\\n"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7014
"            --project fooproject"
7015
msgstr ""
7016
7017
# help of 'project' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7018
#: breezy/plugins/launchpad/cmds.py:68
6093.2.1 by Jonathan Riddell
add .pot file to archive
7019
msgid "Launchpad project short name to associate with the branch."
7020
msgstr ""
7021
7022
# help of 'branch-name' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7023
#: breezy/plugins/launchpad/cmds.py:75
6093.2.1 by Jonathan Riddell
add .pot file to archive
7024
msgid ""
7025
"Short name for the branch; by default taken from the last component of the "
7026
"url."
7027
msgstr ""
7028
7029
# help of 'branch-title' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7030
#: breezy/plugins/launchpad/cmds.py:79
6093.2.1 by Jonathan Riddell
add .pot file to archive
7031
msgid "One-sentence description of the branch."
7032
msgstr ""
7033
7034
# help of 'branch-description' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7035
#: breezy/plugins/launchpad/cmds.py:82
6093.2.1 by Jonathan Riddell
add .pot file to archive
7036
msgid "Longer description of the purpose or contents of the branch."
7037
msgstr ""
7038
7039
# help of 'author' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7040
#: breezy/plugins/launchpad/cmds.py:85
6093.2.1 by Jonathan Riddell
add .pot file to archive
7041
msgid "Branch author's email address, if not yourself."
7042
msgstr ""
7043
7044
# help of 'link-bug' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7045
#: breezy/plugins/launchpad/cmds.py:88
6093.2.1 by Jonathan Riddell
add .pot file to archive
7046
msgid "The bug this branch fixes."
7047
msgstr ""
7048
7049
# help of 'dry-run' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7050
#: breezy/plugins/launchpad/cmds.py:91
6093.2.1 by Jonathan Riddell
add .pot file to archive
7051
msgid "Prepare the request but don't actually send it."
7052
msgstr ""
7053
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7054
#: breezy/plugins/launchpad/cmds.py:113
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7055
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7056
"register-branch requires a public branch url - see brz help register-branch."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7057
msgstr ""
7058
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7059
#: breezy/plugins/launchpad/cmds.py:121
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7060
msgid "--product is deprecated; please use --project."
7061
msgstr ""
7062
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7063
#: breezy/plugins/launchpad/cmds.py:151
6093.2.1 by Jonathan Riddell
add .pot file to archive
7064
msgid "Open a Launchpad branch page in your web browser."
7065
msgstr ""
7066
7067
# help of 'dry-run' option of 'launchpad-open' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7068
#: breezy/plugins/launchpad/cmds.py:156
6093.2.1 by Jonathan Riddell
add .pot file to archive
7069
msgid "Do not actually open the browser. Just say the URL we would use."
7070
msgstr ""
7071
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7072
#: breezy/plugins/launchpad/cmds.py:191
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7073
#, python-format
7074
msgid "Opening %s in web browser"
7075
msgstr ""
7076
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7077
#: breezy/plugins/launchpad/cmds.py:199
6093.2.1 by Jonathan Riddell
add .pot file to archive
7078
msgid "Show or set the Launchpad user ID."
7079
msgstr ""
7080
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7081
#: breezy/plugins/launchpad/cmds.py:201
6093.2.1 by Jonathan Riddell
add .pot file to archive
7082
msgid ""
7083
"When communicating with Launchpad, some commands need to know your\n"
7084
"Launchpad user ID.  This command can be used to set or show the\n"
7085
"user ID that Bazaar will use for such communication."
7086
msgstr ""
7087
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7088
#: breezy/plugins/launchpad/cmds.py:205
6093.2.1 by Jonathan Riddell
add .pot file to archive
7089
msgid ""
7090
":Examples:\n"
7091
"  Show the Launchpad ID of the current user::"
7092
msgstr ""
7093
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7094
#: breezy/plugins/launchpad/cmds.py:208
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7095
msgid "      brz launchpad-login"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7096
msgstr ""
7097
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7098
#: breezy/plugins/launchpad/cmds.py:210
6093.2.1 by Jonathan Riddell
add .pot file to archive
7099
msgid "  Set the Launchpad ID of the current user to 'bob'::"
7100
msgstr ""
7101
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7102
#: breezy/plugins/launchpad/cmds.py:212
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7103
msgid "      brz launchpad-login bob"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7104
msgstr ""
7105
7106
# help of 'no-check' option of 'launchpad-login' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7107
#: breezy/plugins/launchpad/cmds.py:219
6093.2.1 by Jonathan Riddell
add .pot file to archive
7108
msgid "Don't check that the user name is valid."
7109
msgstr ""
7110
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7111
#: breezy/plugins/launchpad/cmds.py:234 breezy/plugins/launchpad/cmds.py:245
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7112
msgid "Launchpad user ID exists and has SSH keys.\n"
7113
msgstr ""
7114
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7115
#: breezy/plugins/launchpad/cmds.py:237
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7116
msgid "No Launchpad user ID configured.\n"
7117
msgstr ""
7118
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7119
#: breezy/plugins/launchpad/cmds.py:248
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7120
#, python-format
7121
msgid "Launchpad user ID set to '%s'.\n"
7122
msgstr ""
7123
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7124
#: breezy/plugins/launchpad/cmds.py:254
6093.2.1 by Jonathan Riddell
add .pot file to archive
7125
msgid "Ask Launchpad to mirror a branch now."
7126
msgstr ""
7127
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7128
#: breezy/plugins/launchpad/cmds.py:271
6093.2.1 by Jonathan Riddell
add .pot file to archive
7129
msgid "Propose merging a branch on Launchpad."
7130
msgstr ""
7131
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7132
#: breezy/plugins/launchpad/cmds.py:273
6093.2.1 by Jonathan Riddell
add .pot file to archive
7133
msgid ""
7134
"This will open your usual editor to provide the initial comment.  When it\n"
7135
"has created the proposal, it will open it in your default web browser."
7136
msgstr ""
7137
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7138
#: breezy/plugins/launchpad/cmds.py:276
6093.2.1 by Jonathan Riddell
add .pot file to archive
7139
msgid ""
7140
"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
7141
"is not supplied, the remembered submit branch will be used.  If no submit\n"
7142
"branch is remembered, the development focus will be used."
7143
msgstr ""
7144
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7145
#: breezy/plugins/launchpad/cmds.py:280
6093.2.1 by Jonathan Riddell
add .pot file to archive
7146
msgid ""
7147
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7148
"the merge proposal.  This can be overriden by specifying --review (-R).\n"
7149
"The parameter the launchpad account name of the desired reviewer.  This\n"
7150
"may optionally be followed by '=' and the review type.  For example:"
7151
msgstr ""
7152
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7153
#: breezy/plugins/launchpad/cmds.py:285
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7154
msgid "  brz lp-propose-merge --review jrandom --review review-team=qa"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7155
msgstr ""
7156
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7157
#: breezy/plugins/launchpad/cmds.py:287
6093.2.1 by Jonathan Riddell
add .pot file to archive
7158
msgid ""
7159
"This will propose a merge,  request \"jrandom\" to perform a review of\n"
7160
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7161
msgstr ""
7162
7163
# help of 'staging' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7164
#: breezy/plugins/launchpad/cmds.py:292
6093.2.1 by Jonathan Riddell
add .pot file to archive
7165
msgid "Propose the merge on staging."
7166
msgstr ""
7167
7168
# help of 'message' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7169
#: breezy/plugins/launchpad/cmds.py:294
6093.2.1 by Jonathan Riddell
add .pot file to archive
7170
msgid "Commit message."
7171
msgstr ""
7172
7173
# help of 'approve' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7174
#: breezy/plugins/launchpad/cmds.py:296
6581.1.2 by Vincent Ladeuil
Update translation template.
7175
msgid ""
7176
"Mark the proposal as approved immediately, setting the approved revision to "
7177
"tip."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7178
msgstr ""
7179
6504.1.1 by Vincent Ladeuil
Update translation template
7180
# help of 'fixes' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7181
#: breezy/plugins/launchpad/cmds.py:298
6504.1.1 by Vincent Ladeuil
Update translation template
7182
msgid "The bug this proposal fixes."
7183
msgstr ""
7184
6093.2.1 by Jonathan Riddell
add .pot file to archive
7185
# help of 'review' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7186
#: breezy/plugins/launchpad/cmds.py:300
6093.2.1 by Jonathan Riddell
add .pot file to archive
7187
msgid "Requested reviewer and optional type."
7188
msgstr ""
7189
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7190
#: breezy/plugins/launchpad/cmds.py:335
6093.2.1 by Jonathan Riddell
add .pot file to archive
7191
msgid "Find the proposal to merge this revision."
7192
msgstr ""
7193
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7194
#: breezy/plugins/launchpad/cmds.py:337
6093.2.1 by Jonathan Riddell
add .pot file to archive
7195
msgid ""
7196
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
7197
"This works only if the if the merged_revno was recorded for the merge\n"
7198
"proposal.  The proposal(s) are opened in a web browser."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7199
msgstr ""
7200
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7201
#: breezy/plugins/launchpad/cmds.py:341
6093.2.1 by Jonathan Riddell
add .pot file to archive
7202
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
7203
"Only the revision specified is searched for.  To find the mainline\n"
7204
"revision that merged it into mainline, use the \"mainline\" revision spec."
6093.2.1 by Jonathan Riddell
add .pot file to archive
7205
msgstr ""
7206
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7207
#: breezy/plugins/launchpad/cmds.py:344
6093.2.1 by Jonathan Riddell
add .pot file to archive
7208
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7209
msgstr ""
7210
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7211
#: breezy/plugins/launchpad/cmds.py:346
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7212
msgid "  brz lp-find-proposal -r mainline:annotate:README:1"
6093.2.1 by Jonathan Riddell
add .pot file to archive
7213
msgstr ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
7214
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7215
#: breezy/plugins/launchpad/cmds.py:365
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7216
msgid "No review found."
7217
msgstr ""
7218
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7219
#: breezy/plugins/launchpad/cmds.py:366
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7220
#, python-format
7221
msgid "%d proposals(s) found."
7222
msgstr ""
7223
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7224
#: breezy/plugins/launchpad/cmds.py:378
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7225
msgid "Finding proposals"
7226
msgstr ""
7227
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7228
#: breezy/plugins/launchpad/lp_api.py:231
7229
#: breezy/plugins/launchpad/lp_api.py:236
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7230
#, python-format
7231
msgid "%s is not registered on Launchpad"
7232
msgstr ""
7233
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7234
#: breezy/plugins/launchpad/lp_api.py:246
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7235
#, python-format
7236
msgid "%s has no development focus."
7237
msgstr ""
7238
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7239
#: breezy/plugins/launchpad/lp_api.py:251
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7240
#, python-format
7241
msgid "development focus %s has no branch."
7242
msgstr ""
7243
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7244
#: breezy/plugins/launchpad/lp_api.py:256
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7245
#, python-format
7246
msgid "source package %s has no branch."
7247
msgstr ""
7248
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7249
#: breezy/plugins/launchpad/lp_api.py:260
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7250
#, python-format
7251
msgid "%s has no associated product or source package."
7252
msgstr ""
7253
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7254
#: breezy/plugins/launchpad/lp_api.py:272
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7255
#, python-format
7256
msgid "%s is already up-to-date."
7257
msgstr ""
7258
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7259
#: breezy/plugins/launchpad/lp_api.py:279
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7260
#, python-format
7261
msgid "Pushing to %s"
7262
msgstr ""
7263
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7264
#: breezy/plugins/launchpad/lp_directory.py:170
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7265
#, python-brace-format
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7266
msgid ""
7267
"resolution for {0}\n"
7268
"  local: {1}\n"
7269
" remote: {2}"
7270
msgstr ""
7271
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7272
#: breezy/plugins/launchpad/lp_propose.py:161
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7273
#, python-format
7274
msgid "There is already a branch merge proposal: %s"
7275
msgstr ""
7276
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7277
#: breezy/plugins/weave_fmt/bzrdir.py:237
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7278
msgid "pb parameter to convert() is deprecated"
7279
msgstr ""
7280
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7281
#: breezy/plugins/weave_fmt/bzrdir.py:240
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7282
msgid "starting upgrade from format 4 to 5"
7283
msgstr ""
7284
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7285
#: breezy/plugins/weave_fmt/bzrdir.py:250
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7286
msgid "note: upgrade may be faster if all store files are ungzipped first"
7287
msgstr ""
7288
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7289
#: breezy/plugins/weave_fmt/bzrdir.py:279
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7290
msgid "converting revision"
7291
msgstr ""
7292
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7293
#: breezy/plugins/weave_fmt/bzrdir.py:284
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7294
msgid "upgraded to weaves:"
7295
msgstr ""
7296
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7297
#: breezy/plugins/weave_fmt/bzrdir.py:285
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7298
#, python-format
7299
msgid "%6d revisions and inventories"
7300
msgstr ""
7301
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7302
#: breezy/plugins/weave_fmt/bzrdir.py:287
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7303
#, python-format
7304
msgid "%6d revisions not present"
7305
msgstr ""
7306
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7307
#: breezy/plugins/weave_fmt/bzrdir.py:289
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7308
#, python-format
7309
msgid "%6d texts"
7310
msgstr ""
7311
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7312
#: breezy/plugins/weave_fmt/bzrdir.py:325
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7313
msgid "writing weave"
7314
msgstr ""
7315
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7316
#: breezy/plugins/weave_fmt/bzrdir.py:329
7317
#: breezy/plugins/weave_fmt/bzrdir.py:331
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7318
msgid "inventory"
7319
msgstr ""
7320
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7321
#: breezy/plugins/weave_fmt/bzrdir.py:348
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7322
msgid "write revision"
7323
msgstr ""
7324
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7325
#: breezy/plugins/weave_fmt/bzrdir.py:362
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7326
msgid "loading revision"
7327
msgstr ""
7328
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7329
#: breezy/plugins/weave_fmt/bzrdir.py:367
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7330
#, python-format
7331
msgid "revision {%s} not present in branch; will be converted as a ghost"
7332
msgstr ""
7333
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7334
#: breezy/plugins/weave_fmt/bzrdir.py:507
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7335
msgid "starting upgrade from format 5 to 6"
7336
msgstr ""
7337
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7338
#: breezy/plugins/weave_fmt/bzrdir.py:517
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7339
#, python-format
7340
msgid "adding prefixes to %s"
7341
msgstr ""
7342
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7343
#: breezy/plugins/weave_fmt/bzrdir.py:557
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7344
msgid "starting upgrade from format 6 to metadir"
7345
msgstr ""
7346
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7347
#: breezy/plugins/weave_fmt/bzrdir.py:565
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7348
msgid "Removing ancestry.weave"
7349
msgstr ""
7350
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7351
#: breezy/plugins/weave_fmt/bzrdir.py:570
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7352
msgid "Finding branch files"
7353
msgstr ""
7354
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7355
#: breezy/plugins/weave_fmt/bzrdir.py:580
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7356
msgid "Upgrading repository"
7357
msgstr ""
7358
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7359
#: breezy/plugins/weave_fmt/bzrdir.py:590
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7360
msgid "Upgrading branch"
7361
msgstr ""
7362
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7363
#: breezy/plugins/weave_fmt/bzrdir.py:613
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7364
msgid "No working tree."
7365
msgstr ""
7366
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7367
#: breezy/plugins/weave_fmt/bzrdir.py:620
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7368
msgid "Upgrading working tree"
7369
msgstr ""
7370
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7371
#: breezy/plugins/weave_fmt/bzrdir.py:641
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7372
#, python-format
7373
msgid "Make %s lock"
7374
msgstr ""
7375
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7376
#: breezy/plugins/weave_fmt/bzrdir.py:652
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7377
#, python-format
7378
msgid "Moving %s"
7379
msgstr ""
7380
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7381
#: breezy/push.py:56
6138.4.4 by Jonathan Riddell
update bzr.pot
7382
msgid "Created new branch."
7383
msgstr ""
7384
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7385
#: breezy/push.py:97
6138.4.4 by Jonathan Riddell
update bzr.pot
7386
#, python-format
7387
msgid ""
7388
"Target directory %s already contains a .bzr directory, but it is not valid."
7389
msgstr ""
7390
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7391
#: breezy/push.py:101
6138.4.4 by Jonathan Riddell
update bzr.pot
7392
#, python-format
7393
msgid ""
7394
"Target directory %s already exists, but does not have a .bzr directory. "
7395
"Supply --use-existing-dir to push there anyway."
7396
msgstr ""
7397
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7398
#: breezy/push.py:122
6138.4.4 by Jonathan Riddell
update bzr.pot
7399
#, python-format
7400
msgid "Too many redirections trying to make %s."
7401
msgstr ""
7402
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7403
#: breezy/push.py:148
6138.4.4 by Jonathan Riddell
update bzr.pot
7404
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7405
"These branches have diverged.  See \"brz help diverged-branches\" for more "
6138.4.4 by Jonathan Riddell
update bzr.pot
7406
"information."
7407
msgstr ""
7408
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7409
#: breezy/push.py:152
6138.4.4 by Jonathan Riddell
update bzr.pot
7410
#, python-format
7411
msgid ""
7412
"It is not possible to losslessly push to %s. You may want to use dpush "
7413
"instead."
7414
msgstr ""
7415
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7416
#: breezy/push.py:158
6138.4.4 by Jonathan Riddell
update bzr.pot
7417
#, python-format
7418
msgid ""
7419
"At %s you have a valid .bzr control directory, but not a branch or "
7420
"repository. This is an unsupported configuration. Please move the target "
7421
"directory out of the way and try again."
7422
msgstr ""
7423
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7424
#: breezy/reconcile.py:97
6138.4.4 by Jonathan Riddell
update bzr.pot
7425
#, python-format
7426
msgid "Reconciling branch %s"
7427
msgstr ""
7428
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7429
#: breezy/reconcile.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
7430
#, python-format
7431
msgid "Reconciling repository %s"
7432
msgstr ""
7433
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7434
#: breezy/reconcile.py:105
6138.4.4 by Jonathan Riddell
update bzr.pot
7435
msgid "Reconciling repository"
7436
msgstr ""
7437
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7438
#: breezy/reconcile.py:111
6138.4.4 by Jonathan Riddell
update bzr.pot
7439
#, python-format
7440
msgid "%s cannot canonicalize CHKs."
7441
msgstr ""
7442
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7443
#: breezy/reconcile.py:119
6138.4.4 by Jonathan Riddell
update bzr.pot
7444
msgid "Reconcile aborted: revision index has inconsistent parents."
7445
msgstr ""
7446
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7447
#: breezy/reconcile.py:121
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7448
msgid "Run \"brz check\" for more details."
6138.4.4 by Jonathan Riddell
update bzr.pot
7449
msgstr ""
7450
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7451
#: breezy/reconcile.py:123
6138.4.4 by Jonathan Riddell
update bzr.pot
7452
msgid "Reconciliation complete."
7453
msgstr ""
7454
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7455
#: breezy/reconcile.py:166
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7456
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
7457
msgid "Fixing last revision info {0}  => {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
7458
msgstr ""
7459
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7460
#: breezy/reconcile.py:173
6138.4.4 by Jonathan Riddell
update bzr.pot
7461
msgid "revision_history ok."
7462
msgstr ""
7463
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7464
#: breezy/reconcile.py:234
6138.4.4 by Jonathan Riddell
update bzr.pot
7465
msgid "Reading inventory data"
7466
msgstr ""
7467
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7468
#: breezy/reconcile.py:254 breezy/reconcile.py:384
6138.4.4 by Jonathan Riddell
update bzr.pot
7469
msgid "Inventory ok."
7470
msgstr ""
7471
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7472
#: breezy/reconcile.py:256 breezy/reconcile.py:386
6138.4.4 by Jonathan Riddell
update bzr.pot
7473
msgid "Backing up inventory"
7474
msgstr ""
7475
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7476
#: breezy/reconcile.py:258
6138.4.4 by Jonathan Riddell
update bzr.pot
7477
msgid "Backup inventory created."
7478
msgstr ""
7479
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7480
#: breezy/reconcile.py:274 breezy/reconcile.py:405
6138.4.4 by Jonathan Riddell
update bzr.pot
7481
msgid "Writing weave"
7482
msgstr ""
7483
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7484
#: breezy/reconcile.py:277 breezy/reconcile.py:408
6138.4.4 by Jonathan Riddell
update bzr.pot
7485
msgid "Inventory regenerated."
7486
msgstr ""
7487
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7488
#: breezy/reconcile.py:371 breezy/reconcile.py:373 breezy/reconcile.py:376
6138.4.4 by Jonathan Riddell
update bzr.pot
7489
msgid "Reading indexes"
7490
msgstr ""
7491
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7492
#: breezy/reconcile.py:380 breezy/reconcile.py:382
6138.4.4 by Jonathan Riddell
update bzr.pot
7493
msgid "Checking unused inventories"
7494
msgstr ""
7495
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7496
#: breezy/reconcile.py:388
6138.4.4 by Jonathan Riddell
update bzr.pot
7497
msgid "Backup Inventory created"
7498
msgstr ""
7499
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7500
#: breezy/reconcile.py:446
6138.4.4 by Jonathan Riddell
update bzr.pot
7501
msgid "Fixing text parents"
7502
msgstr ""
7503
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7504
#: breezy/reconfigure.py:54
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7505
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
7506
msgid "{0} is now stacked on {1}\n"
7507
msgstr ""
7508
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7509
#: breezy/reconfigure.py:69
6138.4.4 by Jonathan Riddell
update bzr.pot
7510
#, python-format
7511
msgid "%s is now not stacked\n"
7512
msgstr ""
7513
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7514
#: breezy/remote.py:1228 breezy/repository.py:289
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7515
#, python-format
7516
msgid "bzr: ERROR (ignored): %s"
7517
msgstr ""
7518
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7519
#: breezy/remote.py:2534
6138.4.4 by Jonathan Riddell
update bzr.pot
7520
msgid "Copying repository content as tarball..."
7521
msgstr ""
7522
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7523
#: breezy/rename_map.py:69
6138.4.4 by Jonathan Riddell
update bzr.pot
7524
msgid "Calculating hashes"
7525
msgstr ""
7526
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7527
#: breezy/rename_map.py:107
6138.4.4 by Jonathan Riddell
update bzr.pot
7528
msgid "Determining hash hits"
7529
msgstr ""
7530
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7531
#: breezy/rename_map.py:242
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7532
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
7533
msgid "{0} => {1}"
7534
msgstr ""
7535
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7536
#: breezy/repository.py:1738
6138.4.4 by Jonathan Riddell
update bzr.pot
7537
msgid "Moving repository to repository.backup"
7538
msgstr ""
7539
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7540
#: breezy/repository.py:1745
6138.4.4 by Jonathan Riddell
update bzr.pot
7541
msgid "Creating new repository"
7542
msgstr ""
7543
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7544
#: breezy/repository.py:1750
6138.4.4 by Jonathan Riddell
update bzr.pot
7545
msgid "Copying content"
7546
msgstr ""
7547
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7548
#: breezy/repository.py:1754
6138.4.4 by Jonathan Riddell
update bzr.pot
7549
msgid "Deleting old repository content"
7550
msgstr ""
7551
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7552
#: breezy/repository.py:1756
6138.4.4 by Jonathan Riddell
update bzr.pot
7553
msgid "repository converted"
7554
msgstr ""
7555
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7556
#: breezy/revisionspec.py:903
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7557
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
7558
msgid "Using {0} {1}"
6138.4.4 by Jonathan Riddell
update bzr.pot
7559
msgstr ""
7560
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7561
#: breezy/send.py:59
6138.4.4 by Jonathan Riddell
update bzr.pot
7562
#, python-format
7563
msgid "Mail client \"%s\" does not support specifying body"
7564
msgstr ""
7565
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7566
#: breezy/send.py:63
6138.4.4 by Jonathan Riddell
update bzr.pot
7567
msgid "--remember requires a branch to be specified."
7568
msgstr ""
7569
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7570
#: breezy/send.py:78
6138.4.4 by Jonathan Riddell
update bzr.pot
7571
msgid "No submit branch known or specified"
7572
msgstr ""
7573
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7574
#: breezy/send.py:81
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7575
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
7576
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6138.4.4 by Jonathan Riddell
update bzr.pot
7577
msgstr ""
7578
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7579
#: breezy/send.py:99
6138.4.4 by Jonathan Riddell
update bzr.pot
7580
#, python-format
7581
msgid "No such send format '%s'."
7582
msgstr ""
7583
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7584
#: breezy/send.py:115
6138.4.4 by Jonathan Riddell
update bzr.pot
7585
msgid "bzr send takes at most two one revision identifiers"
7586
msgstr ""
7587
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7588
#: breezy/send.py:128
6138.4.4 by Jonathan Riddell
update bzr.pot
7589
msgid "No revisions to submit."
7590
msgstr ""
7591
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7592
#: breezy/send.py:140
6138.4.4 by Jonathan Riddell
update bzr.pot
7593
msgid ""
7594
"- not supported for merge directives that use more than one output file."
7595
msgstr ""
7596
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7597
#: breezy/send.py:186
6138.4.4 by Jonathan Riddell
update bzr.pot
7598
msgid "Format 0.9 does not permit bundle with no patch"
7599
msgstr ""
7600
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7601
#: breezy/shelf_ui.py:46
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7602
#, python-format
7603
msgid "Shelve adding file \"%(path)s\"?"
7604
msgstr ""
7605
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7606
#: breezy/shelf_ui.py:47
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7607
msgid "Shelve binary changes?"
6143.1.7 by Jonathan Riddell
update bzr.pot
7608
msgstr ""
7609
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7610
#: breezy/shelf_ui.py:48
6143.1.7 by Jonathan Riddell
update bzr.pot
7611
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7612
msgstr ""
7613
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7614
#: breezy/shelf_ui.py:50
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7615
#, python-format
7616
msgid "Shelve removing file \"%(path)s\"?"
7617
msgstr ""
7618
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7619
#: breezy/shelf_ui.py:51
6143.1.7 by Jonathan Riddell
update bzr.pot
7620
#, python-format
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7621
msgid "Shelve %d change(s)?"
6143.1.7 by Jonathan Riddell
update bzr.pot
7622
msgstr ""
7623
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7624
#: breezy/shelf_ui.py:52
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7625
msgid "Shelve?"
6143.1.7 by Jonathan Riddell
update bzr.pot
7626
msgstr ""
7627
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7628
#: breezy/shelf_ui.py:53
6143.1.7 by Jonathan Riddell
update bzr.pot
7629
#, python-format
7630
msgid ""
7631
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7632
msgstr ""
7633
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7634
#: breezy/shelf_ui.py:55
6143.1.7 by Jonathan Riddell
update bzr.pot
7635
#, python-format
7636
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7637
msgstr ""
7638
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7639
#: breezy/shelf_ui.py:70
6138.4.4 by Jonathan Riddell
update bzr.pot
7640
#, python-format
7641
msgid "Changes shelved with id \"%d\"."
7642
msgstr ""
7643
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7644
#: breezy/shelf_ui.py:74
6138.4.4 by Jonathan Riddell
update bzr.pot
7645
msgid "Selected changes destroyed."
7646
msgstr ""
7647
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7648
#: breezy/shelf_ui.py:78
6138.4.4 by Jonathan Riddell
update bzr.pot
7649
msgid "Selected changes:"
7650
msgstr ""
7651
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7652
#: breezy/shelf_ui.py:98
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7653
#, python-format
7654
msgid "Delete file \"%(path)s\"?"
7655
msgstr ""
7656
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7657
#: breezy/shelf_ui.py:99
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7658
msgid "Apply binary changes?"
6143.1.7 by Jonathan Riddell
update bzr.pot
7659
msgstr ""
7660
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7661
#: breezy/shelf_ui.py:100
6143.1.7 by Jonathan Riddell
update bzr.pot
7662
#, python-format
7663
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7664
msgstr ""
7665
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7666
#: breezy/shelf_ui.py:102
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7667
#, python-format
7668
msgid "Add file \"%(path)s\"?"
7669
msgstr ""
7670
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7671
#: breezy/shelf_ui.py:103
6143.1.7 by Jonathan Riddell
update bzr.pot
7672
#, python-format
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7673
msgid "Apply %d change(s)?"
6143.1.7 by Jonathan Riddell
update bzr.pot
7674
msgstr ""
7675
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7676
#: breezy/shelf_ui.py:104
6349.1.1 by Vincent Ladeuil
Release 2.5b4
7677
msgid "Apply change?"
6143.1.7 by Jonathan Riddell
update bzr.pot
7678
msgstr ""
7679
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7680
#: breezy/shelf_ui.py:105
6143.1.7 by Jonathan Riddell
update bzr.pot
7681
#, python-format
7682
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7683
msgstr ""
7684
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7685
#: breezy/shelf_ui.py:107
6143.1.7 by Jonathan Riddell
update bzr.pot
7686
#, python-format
7687
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7688
msgstr ""
7689
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7690
#: breezy/shelf_ui.py:402
6138.4.4 by Jonathan Riddell
update bzr.pot
7691
msgid "No changes are shelved."
7692
msgstr ""
7693
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7694
#: breezy/shelf_ui.py:460
6138.4.4 by Jonathan Riddell
update bzr.pot
7695
#, python-format
7696
msgid "Using changes with id \"%d\"."
7697
msgstr ""
7698
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7699
#: breezy/shelf_ui.py:464
6138.4.4 by Jonathan Riddell
update bzr.pot
7700
#, python-format
7701
msgid "Message: %s"
7702
msgstr ""
7703
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7704
#: breezy/shelf_ui.py:476
6138.4.4 by Jonathan Riddell
update bzr.pot
7705
#, python-format
7706
msgid "Deleted changes with id \"%d\"."
7707
msgstr ""
7708
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7709
#: breezy/smart/medium.py:714
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7710
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
7711
msgid "HPSS calls: {0} ({1} vfs) {2}"
7712
msgstr ""
7713
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7714
#: breezy/smart/ping.py:32
6581.1.2 by Vincent Ladeuil
Update translation template.
7715
msgid "Pings a Bazaar smart server."
7716
msgstr ""
7717
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7718
#: breezy/smart/ping.py:34
6581.1.2 by Vincent Ladeuil
Update translation template.
7719
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
7720
"This command sends a 'hello' request to the given location using the brz\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
7721
"smart protocol, and reports the response."
7722
msgstr ""
7723
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7724
#: breezy/smart/server.py:169
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7725
msgid "Requested to stop gracefully"
7726
msgstr ""
7727
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7728
#: breezy/smart/server.py:179
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7729
#, python-format
7730
msgid "Waiting for %d client(s) to finish"
7731
msgstr ""
7732
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7733
#: breezy/smart/server.py:185
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7734
#, python-format
7735
msgid "Still waiting for %d client(s) to finish"
7736
msgstr ""
7737
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7738
#: breezy/smart/server.py:219
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7739
#, python-format
7740
msgid "listening socket error: %s"
7741
msgstr ""
7742
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7743
#: breezy/smart/server.py:452
6138.4.4 by Jonathan Riddell
update bzr.pot
7744
#, python-format
7745
msgid "listening on port: %s"
7746
msgstr ""
7747
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7748
#: breezy/switch.py:84
6138.4.4 by Jonathan Riddell
update bzr.pot
7749
msgid "Pending merges must be committed or reverted before using switch."
7750
msgstr ""
7751
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7752
#: breezy/switch.py:111
6138.4.4 by Jonathan Riddell
update bzr.pot
7753
msgid ""
7754
"Cannot switch as local commits found in the checkout. Commit these to the "
7755
"bound branch or use --force to throw them away."
7756
msgstr ""
7757
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7758
#: breezy/switch.py:116
6138.4.4 by Jonathan Riddell
update bzr.pot
7759
#, python-format
7760
msgid ""
7761
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7762
"anyway, use --force."
7763
msgstr ""
7764
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7765
#: breezy/switch.py:140
6138.4.4 by Jonathan Riddell
update bzr.pot
7766
msgid "Cannot switch a branch, only a checkout."
7767
msgstr ""
7768
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7769
#: breezy/switch.py:183
6138.4.4 by Jonathan Riddell
update bzr.pot
7770
#, python-format
7771
msgid "Tree is up to date at revision %d."
7772
msgstr ""
7773
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7774
#: breezy/switch.py:190
6138.4.4 by Jonathan Riddell
update bzr.pot
7775
#, python-format
7776
msgid "Updated to revision %d."
7777
msgstr ""
7778
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7779
#: breezy/transform.py:1723 breezy/transform.py:1734 breezy/transform.py:1736
6138.4.4 by Jonathan Riddell
update bzr.pot
7780
msgid "Apply phase"
7781
msgstr ""
7782
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7783
#: breezy/transform.py:1762 breezy/transform.py:1830
6138.4.4 by Jonathan Riddell
update bzr.pot
7784
msgid "removing file"
7785
msgstr ""
7786
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7787
#: breezy/transform.py:1780 breezy/transform.py:1865
6138.4.4 by Jonathan Riddell
update bzr.pot
7788
msgid "adding file"
7789
msgstr ""
7790
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7791
#: breezy/transform.py:2598
6138.4.4 by Jonathan Riddell
update bzr.pot
7792
msgid "Building tree"
7793
msgstr ""
7794
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7795
#: breezy/transform.py:2688 breezy/transform.py:2715
6138.4.4 by Jonathan Riddell
update bzr.pot
7796
msgid "Adding file contents"
7797
msgstr ""
7798
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7799
#: breezy/transform.py:3017
6138.4.4 by Jonathan Riddell
update bzr.pot
7800
msgid "Resolution pass"
7801
msgstr ""
7802
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7803
#: breezy/transport/ftp/_gssapi.py:88
6252.1.1 by Vincent Ladeuil
Release 2.5b3
7804
#, python-format
7805
msgid "Authenticated as %s"
7806
msgstr ""
7807
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7808
#: breezy/tree.py:647
6138.4.4 by Jonathan Riddell
update bzr.pot
7809
msgid "*** {0} content-filter: {1} => {2!r}"
7810
msgstr ""
7811
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7812
#: breezy/upgrade.py:77
6138.4.4 by Jonathan Riddell
update bzr.pot
7813
#, python-format
7814
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7815
msgstr ""
7816
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7817
#: breezy/upgrade.py:100
6138.4.4 by Jonathan Riddell
update bzr.pot
7818
#, python-format
7819
msgid "cannot upgrade from bzrdir format %s"
7820
msgstr ""
7821
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7822
#: breezy/upgrade.py:103
6138.4.4 by Jonathan Riddell
update bzr.pot
7823
#, python-format
7824
msgid "starting upgrade of %s"
7825
msgstr ""
7826
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7827
#: breezy/upgrade.py:110
6138.4.4 by Jonathan Riddell
update bzr.pot
7828
msgid "finished"
7829
msgstr ""
7830
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7831
#: breezy/upgrade.py:120
6138.4.4 by Jonathan Riddell
update bzr.pot
7832
msgid "Deleting backup.bzr"
7833
msgstr ""
7834
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7835
#: breezy/upgrade.py:151
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7836
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
7837
msgid ""
7838
"\n"
7839
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7840
msgstr ""
7841
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7842
#: breezy/upgrade.py:208
6138.4.4 by Jonathan Riddell
update bzr.pot
7843
#, python-format
7844
msgid "Found %d dependent branches - upgrading ..."
7845
msgstr ""
7846
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7847
#: breezy/upgrade.py:276
6138.4.4 by Jonathan Riddell
update bzr.pot
7848
msgid "Upgrading bzrdirs"
7849
msgstr ""
7850
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7851
#: breezy/upgrade.py:282
6138.4.4 by Jonathan Riddell
update bzr.pot
7852
#, python-format
7853
msgid "Upgrading %s"
7854
msgstr ""
7855
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7856
#: breezy/upgrade.py:283
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7857
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
7858
msgid "Upgrading {0} {1} ..."
7859
msgstr ""
7860
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7861
#: breezy/upgrade.py:301
6138.4.4 by Jonathan Riddell
update bzr.pot
7862
msgid "Removing backup ..."
7863
msgstr ""
7864
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7865
#: breezy/upgrade.py:305
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7866
#, python-brace-format
6138.4.4 by Jonathan Riddell
update bzr.pot
7867
msgid "failed to clean-up {0}: {1}"
7868
msgstr ""
7869
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7870
#: breezy/vf_repository.py:1091
6138.4.4 by Jonathan Riddell
update bzr.pot
7871
msgid "inventories"
7872
msgstr ""
7873
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7874
#: breezy/vf_repository.py:1117
6138.4.4 by Jonathan Riddell
update bzr.pot
7875
msgid "texts"
7876
msgstr ""
7877
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7878
#: breezy/vf_repository.py:1622 breezy/vf_repository.py:1631
6138.4.4 by Jonathan Riddell
update bzr.pot
7879
msgid "Calculating text parents"
7880
msgstr ""
7881
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7882
#: breezy/vf_repository.py:1707
6138.4.4 by Jonathan Riddell
update bzr.pot
7883
msgid "Fetch texts"
7884
msgstr ""
7885
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7886
#: breezy/vf_repository.py:2536
6138.4.4 by Jonathan Riddell
update bzr.pot
7887
msgid "loading text store"
7888
msgstr ""
7889
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7890
#: breezy/vf_repository.py:2542
6138.4.4 by Jonathan Riddell
update bzr.pot
7891
msgid "checking text graph"
7892
msgstr ""
7893
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7894
#: breezy/vf_repository.py:2998 breezy/vf_repository.py:3012
7895
#: breezy/vf_repository.py:3127
6138.4.4 by Jonathan Riddell
update bzr.pot
7896
msgid "Transferring revisions"
7897
msgstr ""
7898
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7899
#: breezy/win32utils.py:146
6138.4.4 by Jonathan Riddell
update bzr.pot
7900
msgid "Failed to GetProcessMemoryInfo()"
7901
msgstr ""
7902
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7903
#: breezy/win32utils.py:167
6138.4.4 by Jonathan Riddell
update bzr.pot
7904
msgid "Cannot debug memory on win32 without ctypes or win32process"
7905
msgstr ""
7906
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7907
#: breezy/win32utils.py:172
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7908
#, python-brace-format
6150.1.1 by Jonathan Riddell
update bzr.pot
7909
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6138.4.4 by Jonathan Riddell
update bzr.pot
7910
msgstr ""
7911
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7912
#: breezy/win32utils.py:180
6138.4.4 by Jonathan Riddell
update bzr.pot
7913
#, python-format
7914
msgid "WorkingSize       %8d KiB"
7915
msgstr ""
7916
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7917
#: breezy/win32utils.py:181
6138.4.4 by Jonathan Riddell
update bzr.pot
7918
#, python-format
7919
msgid "PeakWorking       %8d KiB"
7920
msgstr ""
7921
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7922
#: breezy/win32utils.py:182
6138.4.4 by Jonathan Riddell
update bzr.pot
7923
#, python-format
7924
msgid "PagefileUsage     %8d KiB"
7925
msgstr ""
7926
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7927
#: breezy/win32utils.py:183
6138.4.4 by Jonathan Riddell
update bzr.pot
7928
#, python-format
7929
msgid "PeakPagefileUsage %8d KiB"
7930
msgstr ""
7931
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7932
#: breezy/win32utils.py:185
6138.4.4 by Jonathan Riddell
update bzr.pot
7933
#, python-format
7934
msgid "PrivateUsage      %8d KiB"
7935
msgstr ""
7936
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7937
#: breezy/win32utils.py:186
6138.4.4 by Jonathan Riddell
update bzr.pot
7938
#, python-format
7939
msgid "PageFaultCount    %8d"
7940
msgstr ""
7941
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7942
#: breezy/workingtree.py:1516
6138.4.4 by Jonathan Riddell
update bzr.pot
7943
msgid "Rerun update after fixing the conflicts."
7944
msgstr ""
7945
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
7946
#: dummy/help_topics/authentication/summary.txt:1
7947
msgid "Information on configuring authentication"
7948
msgstr ""
7949
7950
#: dummy/help_topics/basic/detail.txt:1
7951
msgid ""
6622.1.19 by Jelmer Vernooij
Rename brz.pot.
7952
"Bazaar 2.8.0dev1 -- a free distributed version-control tool\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
7953
"http://bazaar.canonical.com/"
7954
msgstr ""
7955
7956
#: dummy/help_topics/basic/detail.txt:4
7957
msgid ""
7958
"Basic commands:\n"
7959
"  bzr init           makes this directory a versioned branch\n"
7960
"  bzr branch         make a copy of another branch"
7961
msgstr ""
7962
7963
#: dummy/help_topics/basic/detail.txt:8
7964
msgid ""
7965
"  bzr add            make files or directories versioned\n"
7966
"  bzr ignore         ignore a file or pattern\n"
7967
"  bzr mv             move or rename a versioned file"
7968
msgstr ""
7969
7970
#: dummy/help_topics/basic/detail.txt:12
7971
msgid ""
7972
"  bzr status         summarize changes in working copy\n"
7973
"  bzr diff           show detailed diffs"
7974
msgstr ""
7975
7976
#: dummy/help_topics/basic/detail.txt:15
7977
msgid ""
7978
"  bzr merge          pull in changes from another branch\n"
7979
"  bzr commit         save some or all changes\n"
7980
"  bzr send           send changes via email"
7981
msgstr ""
7982
7983
#: dummy/help_topics/basic/detail.txt:19
7984
msgid ""
7985
"  bzr log            show history of changes\n"
7986
"  bzr check          validate storage"
7987
msgstr ""
7988
7989
#: dummy/help_topics/basic/detail.txt:22
7990
msgid ""
7991
"  bzr help init      more help on e.g. init command\n"
7992
"  bzr help commands  list all commands\n"
7993
"  bzr help topics    list all help topics\n"
7994
msgstr ""
7995
7996
#: dummy/help_topics/basic/summary.txt:1
7997
msgid "Basic commands"
7998
msgstr ""
7999
8000
#: dummy/help_topics/branches/detail.txt:1
8001
msgid "Branches"
8002
msgstr ""
8003
8004
#: dummy/help_topics/branches/detail.txt:3
8005
msgid ""
8006
"A branch consists of the state of a project, including all of its\n"
8007
"history. All branches have a repository associated (which is where the\n"
8008
"branch history is stored), but multiple branches may share the same\n"
8009
"repository (a shared repository). Branches can be copied and merged."
8010
msgstr ""
8011
8012
#: dummy/help_topics/branches/detail.txt:8
8013
msgid ""
8014
"In addition, one branch may be bound to another one.  Binding to another\n"
8015
"branch indicates that commits which happen in this branch must also \n"
8016
"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
8017
"commits when the two branches are out of date.  In order for a commit \n"
8018
"to succeed, it may be necessary to update the current branch using \n"
8019
"``bzr update``."
8020
msgstr ""
8021
8022
#: dummy/help_topics/branches/detail.txt:15
6437.2.2 by Vincent Ladeuil
Release 2.5b5
8023
#: dummy/help_topics/checkouts/detail.txt:66
8024
#: dummy/help_topics/repositories/detail.txt:36
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8025
msgid "Related commands::"
8026
msgstr ""
8027
8028
#: dummy/help_topics/branches/detail.txt:17
8029
msgid ""
8030
"  init    Change a directory into a versioned branch.\n"
8031
"  branch  Create a new branch that is a copy of an existing branch.\n"
8032
"  merge   Perform a three-way merge.\n"
8033
"  bind    Bind a branch to another one.\n"
8034
msgstr ""
8035
8036
#: dummy/help_topics/branches/summary.txt:1
8037
msgid "Information on what a branch is"
8038
msgstr ""
8039
8040
#: dummy/help_topics/bugs/summary.txt:1
8041
msgid "Bug tracker settings"
8042
msgstr ""
8043
8044
#: dummy/help_topics/checkouts/detail.txt:1
8045
msgid "Checkouts"
8046
msgstr ""
8047
8048
#: dummy/help_topics/checkouts/detail.txt:3
8049
msgid ""
8050
"Checkouts are source trees that are connected to a branch, so that when\n"
8051
"you commit in the source tree, the commit goes into that branch.  They\n"
8052
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8053
"Bazaar's decentralized features until you want them. Using checkouts\n"
8054
"with shared repositories is very similar to working with SVN or CVS, but\n"
8055
"doesn't have the same restrictions.  And using checkouts still allows\n"
8056
"others working on the project to use whatever workflow they like."
8057
msgstr ""
8058
8059
#: dummy/help_topics/checkouts/detail.txt:11
8060
msgid ""
8061
"A checkout is created with the bzr checkout command (see \"help checkout"
8062
"\").\n"
8063
"You pass it a reference to another branch, and it will create a local copy\n"
8064
"for you that still contains a reference to the branch you created the\n"
8065
"checkout from (the master branch). Then if you make any commits they will "
8066
"be\n"
8067
"made on the other branch first. This creates an instant mirror of your work, "
8068
"or\n"
8069
"facilitates lockstep development, where each developer is working together,\n"
8070
"continuously integrating the changes of others."
8071
msgstr ""
8072
8073
#: dummy/help_topics/checkouts/detail.txt:19
8074
msgid ""
8075
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8076
"you have the full history locally.  As you have a first class branch you "
8077
"can\n"
8078
"also commit locally if you want, for instance due to the temporary loss af "
8079
"a\n"
8080
"network connection. Use the --local option to commit to do this. All the "
8081
"local\n"
8082
"commits will then be made on the master branch the next time you do a non-"
8083
"local\n"
8084
"commit."
8085
msgstr ""
8086
8087
#: dummy/help_topics/checkouts/detail.txt:26
8088
msgid ""
8089
"If you are using a checkout from a shared branch you will periodically want "
8090
"to\n"
8091
"pull in all the changes made by others. This is done using the \"update\"\n"
8092
"command. The changes need to be applied before any non-local commit, but\n"
8093
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8094
"command when needed."
8095
msgstr ""
8096
8097
#: dummy/help_topics/checkouts/detail.txt:32
8098
msgid ""
8099
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8100
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8101
"SVN checkout in that it is not a first class branch, it mainly consists of "
8102
"the\n"
8103
"working tree. This means that any history operations must query the master\n"
8104
"branch, which could be slow if a network connection is involved. Also, as "
8105
"you\n"
8106
"don't have a local branch, then you cannot commit locally."
8107
msgstr ""
8108
8109
#: dummy/help_topics/checkouts/detail.txt:39
8110
msgid ""
8111
"Lightweight checkouts work best when you have fast reliable access to the\n"
8112
"master branch. This means that if the master branch is on the same disk or "
8113
"LAN\n"
8114
"a lightweight checkout will be faster than a heavyweight one for any "
8115
"commands\n"
8116
"that modify the revision history (as only one copy of the branch needs to\n"
8117
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8118
"that uses the history but does not change it, but if the master branch is "
8119
"on\n"
8120
"the same disk then there won't be a noticeable difference."
8121
msgstr ""
8122
8123
#: dummy/help_topics/checkouts/detail.txt:47
8124
msgid ""
8125
"Another possible use for a checkout is to use it with a treeless repository\n"
8126
"containing your branches, where you maintain only one working tree by\n"
8127
"switching the master branch that the checkout points to when you want to\n"
8128
"work on a different branch."
8129
msgstr ""
8130
8131
#: dummy/help_topics/checkouts/detail.txt:52
8132
msgid ""
8133
"Obviously to commit on a checkout you need to be able to write to the "
8134
"master\n"
8135
"branch. This means that the master branch must be accessible over a "
8136
"writeable\n"
8137
"protocol , such as sftp://, and that you have write permissions at the "
8138
"other\n"
8139
"end. Checkouts also work on the local file system, so that all that matters "
8140
"is\n"
8141
"file permissions."
8142
msgstr ""
8143
8144
#: dummy/help_topics/checkouts/detail.txt:58
8145
msgid ""
8146
"You can change the master of a checkout by using the \"switch\" command "
8147
"(see\n"
8148
"\"help switch\").  This will change the location that the commits are sent "
8149
"to.\n"
8150
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8151
"checkout. If you would like to convert your heavy checkout into a normal\n"
8152
"branch so that every commit is local, you can use the \"unbind\" command. To "
8153
"see\n"
8154
"whether or not a branch is bound or not you can use the \"info\" command. If "
8155
"the\n"
8156
"branch is bound it will tell you the location of the bound branch."
8157
msgstr ""
8158
8159
#: dummy/help_topics/checkouts/detail.txt:68
8160
msgid ""
8161
"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
8162
"              checkout\n"
8163
"  update      Pull any changes in the master branch in to your checkout\n"
8164
"  commit      Make a commit that is sent to the master branch. If you have\n"
8165
"              a heavy checkout then the --local option will commit to the\n"
8166
"              checkout without sending the commit to the master\n"
8167
"  switch      Change the master branch that the commits in the checkout "
8168
"will\n"
8169
"              be sent to\n"
8170
"  bind        Turn a standalone branch into a heavy checkout so that any\n"
8171
"              commits will be sent to the master branch\n"
8172
"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
8173
"              commits are only made locally\n"
8174
"  info        Displays whether a branch is bound or unbound. If the branch "
8175
"is\n"
8176
"              bound, then it will also display the location of the bound "
8177
"branch\n"
8178
msgstr ""
8179
8180
#: dummy/help_topics/checkouts/summary.txt:1
8181
msgid "Information on what a checkout is"
8182
msgstr ""
8183
8184
#: dummy/help_topics/commands/summary.txt:1
8185
msgid "Basic help for all commands"
8186
msgstr ""
8187
8188
#: dummy/help_topics/configuration/summary.txt:1
8189
msgid "Details on the configuration settings available"
8190
msgstr ""
8191
8192
#: dummy/help_topics/conflict-types/summary.txt:1
8193
msgid "Types of conflicts and what to do about them"
8194
msgstr ""
8195
8196
#: dummy/help_topics/content-filters/summary.txt:1
8197
msgid "Conversion of content into/from working trees"
8198
msgstr ""
8199
8200
#: dummy/help_topics/criss-cross/detail.txt:1
8201
msgid "Criss-Cross"
8202
msgstr ""
8203
8204
#: dummy/help_topics/criss-cross/detail.txt:3
8205
msgid ""
8206
"A criss-cross in the branch history can cause the default merge technique\n"
8207
"to emit more conflicts than would normally be expected."
8208
msgstr ""
8209
8210
#: dummy/help_topics/criss-cross/detail.txt:6
8211
msgid ""
8212
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8213
"give\n"
8214
"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
8215
"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
8216
msgstr ""
8217
8218
#: dummy/help_topics/criss-cross/detail.txt:10
8219
msgid ""
8220
"Criss-crosses occur in a branch's history if two branches merge the same "
8221
"thing\n"
8222
"and then merge one another, or if two branches merge one another at the "
8223
"same\n"
8224
"time.  They can be avoided by having each branch only merge from or into a\n"
8225
"designated central branch (a \"star topology\")."
8226
msgstr ""
8227
8228
#: dummy/help_topics/criss-cross/detail.txt:15
8229
msgid ""
8230
"Criss-crosses cause problems because of the way merge works.  Bazaar's "
8231
"default\n"
8232
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8233
"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
8234
"differences between THIS and OTHER are due to one side adding lines, or\n"
8235
"from another side removing lines."
8236
msgstr ""
8237
8238
#: dummy/help_topics/criss-cross/detail.txt:21
8239
msgid ""
8240
"Criss-crosses mean there is no good choice for a base.  Selecting the "
8241
"recent\n"
8242
"merge points could cause one side's changes to be silently discarded.\n"
8243
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8244
"are emitted."
8245
msgstr ""
8246
8247
#: dummy/help_topics/criss-cross/detail.txt:26
8248
msgid ""
8249
"The ``weave`` merge type is not affected by this problem because it uses\n"
8250
"line-origin detection instead of a basis revision to determine the cause of\n"
8251
"differences.\n"
8252
msgstr ""
8253
8254
#: dummy/help_topics/criss-cross/summary.txt:1
8255
msgid "Information on criss-cross merging"
8256
msgstr ""
8257
8258
#: dummy/help_topics/current-formats/summary.txt:1
8259
msgid "Current storage formats"
8260
msgstr ""
8261
8262
#: dummy/help_topics/debug-flags/summary.txt:1
8263
msgid "Options to show or record debug information"
8264
msgstr ""
8265
8266
#: dummy/help_topics/diverged-branches/summary.txt:1
8267
msgid "How to fix diverged branches"
8268
msgstr ""
8269
8270
#: dummy/help_topics/env-variables/summary.txt:1
8271
msgid "Environment variable names and values"
8272
msgstr ""
8273
8274
#: dummy/help_topics/eol/summary.txt:1
8275
msgid "Information on end-of-line handling"
8276
msgstr ""
8277
8278
#: dummy/help_topics/files/detail.txt:1
8279
msgid "Files"
8280
msgstr ""
8281
8282
#: dummy/help_topics/files/detail.txt:3
8283
msgid ""
8284
":On Unix:   ~/.bazaar/bazaar.conf\n"
8285
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8286
"\\bazaar\\\\2.0\\\\bazaar.conf"
8287
msgstr ""
8288
8289
#: dummy/help_topics/files/detail.txt:6
8290
msgid ""
8291
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8292
"used to define general configuration that will be applied everywhere.\n"
8293
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8294
"commonly used options."
8295
msgstr ""
8296
8297
#: dummy/help_topics/files/detail.txt:11
8298
msgid "A typical config file might look something like::"
8299
msgstr ""
8300
8301
#: dummy/help_topics/files/detail.txt:13
8302
msgid ""
8303
"  [DEFAULT]\n"
8304
"  email=John Doe <jdoe@isp.com>"
8305
msgstr ""
8306
8307
#: dummy/help_topics/files/detail.txt:16
8308
msgid ""
8309
"  [ALIASES]\n"
8310
"  commit = commit --strict\n"
8311
"  log10 = log --short -r -10..-1\n"
8312
msgstr ""
8313
8314
#: dummy/help_topics/files/summary.txt:1
8315
msgid "Information on configuration and log files"
8316
msgstr ""
8317
8318
#: dummy/help_topics/formats/detail.txt:1
8319
msgid "Storage Formats"
8320
msgstr ""
8321
8322
#: dummy/help_topics/formats/detail.txt:3
8323
msgid ""
8324
"To ensure that older clients do not access data incorrectly,\n"
8325
"Bazaar's policy is to introduce a new storage format whenever\n"
8326
"new features requiring new metadata are added. New storage\n"
8327
"formats may also be introduced to improve performance and\n"
8328
"scalability."
8329
msgstr ""
8330
8331
#: dummy/help_topics/formats/detail.txt:9
8332
msgid ""
8333
"The newest format, 2a, is highly recommended. If your\n"
8334
"project is not using 2a, then you should suggest to the\n"
8335
"project owner to upgrade."
8336
msgstr ""
8337
8338
#: dummy/help_topics/formats/detail.txt:13
8339
msgid ""
8340
"\n"
8341
".. note::"
8342
msgstr ""
8343
8344
#: dummy/help_topics/formats/detail.txt:16
8345
msgid ""
8346
"   Some of the older formats have two variants:\n"
8347
"   a plain one and a rich-root one. The latter include an additional\n"
8348
"   field about the root of the tree. There is no performance cost\n"
8349
"   for using a rich-root format but you cannot easily merge changes\n"
8350
"   from a rich-root format into a plain format. As a consequence,\n"
8351
"   moving a project to a rich-root format takes some co-ordination\n"
8352
"   in that all contributors need to upgrade their repositories\n"
8353
"   around the same time. 2a and all future formats will be\n"
8354
"   implicitly rich-root."
8355
msgstr ""
8356
8357
#: dummy/help_topics/formats/detail.txt:26
8358
msgid ""
8359
"See :doc:`current-formats-help` for the complete list of\n"
8360
"currently supported formats. See :doc:`other-formats-help` for\n"
8361
"descriptions of any available experimental and deprecated formats.\n"
8362
msgstr ""
8363
8364
#: dummy/help_topics/formats/summary.txt:1
8365
msgid "Information on choosing a storage format"
8366
msgstr ""
8367
8368
#: dummy/help_topics/global-options/detail.txt:1
8369
msgid "Global Options"
8370
msgstr ""
8371
8372
#: dummy/help_topics/global-options/detail.txt:3
8373
msgid ""
8374
"These options may be used with any command, and may appear in front of any\n"
8375
"command.  (e.g. ``bzr --profile help``)."
8376
msgstr ""
8377
8378
#: dummy/help_topics/global-options/detail.txt:6
8379
msgid ""
8380
"--version      Print the version number. Must be supplied before the "
8381
"command.\n"
8382
"--no-aliases   Do not process command aliases when running this command.\n"
8383
"--builtin      Use the built-in version of a command, not the plugin "
8384
"version.\n"
8385
"               This does not suppress other plugin effects.\n"
8386
"--no-plugins   Do not process any plugins.\n"
8387
"--no-l10n      Do not translate messages.\n"
8388
"--concurrency  Number of processes that can be run concurrently (selftest)."
8389
msgstr ""
8390
8391
#: dummy/help_topics/global-options/detail.txt:14
8392
msgid ""
8393
"--profile      Profile execution using the hotshot profiler.\n"
8394
"--lsprof       Profile execution using the lsprof profiler.\n"
8395
"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
8396
"               results to a specified file.  If the filename ends with \".txt"
8397
"\",\n"
8398
"               text format will be used.  If the filename either starts "
8399
"with\n"
8400
"               \"callgrind.out\" or end with \".callgrind\", the output will "
8401
"be\n"
8402
"               formatted for use with KCacheGrind. Otherwise, the output\n"
8403
"               will be a pickle.\n"
8404
"--coverage     Generate line coverage report in the specified directory."
8405
msgstr ""
8406
8407
#: dummy/help_topics/global-options/detail.txt:24
8408
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8409
"-Oname=value   Override the ``name`` config option setting it to ``value`` "
8410
"for\n"
8411
"               the duration of the command.  This can be used multiple times "
8412
"if\n"
8413
"               several options need to be overridden."
8414
msgstr ""
8415
8416
#: dummy/help_topics/global-options/detail.txt:28
8417
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8418
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8419
"information on profiling."
8420
msgstr ""
8421
6252.1.1 by Vincent Ladeuil
Release 2.5b3
8422
#: dummy/help_topics/global-options/detail.txt:31
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8423
msgid ""
8424
"A number of debug flags are also available to assist troubleshooting and\n"
8425
"development.  See :doc:`debug-flags-help`.\n"
8426
msgstr ""
8427
8428
#: dummy/help_topics/global-options/summary.txt:1
8429
msgid "Options that control how Bazaar runs"
8430
msgstr ""
8431
8432
#: dummy/help_topics/hidden-commands/summary.txt:1
8433
msgid "All hidden commands"
8434
msgstr ""
8435
8436
#: dummy/help_topics/hooks/summary.txt:1
8437
msgid "Points at which custom processing can be added"
8438
msgstr ""
8439
8440
#: dummy/help_topics/launchpad/detail.txt:1
8441
msgid "Integration with Launchpad.net"
8442
msgstr ""
8443
8444
#: dummy/help_topics/launchpad/detail.txt:3
8445
msgid ""
8446
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8447
"specification tracking."
8448
msgstr ""
8449
8450
#: dummy/help_topics/launchpad/detail.txt:6
8451
msgid ""
8452
"The bzr client (through the plugin called 'launchpad') has special\n"
8453
"features to communicate with Launchpad:"
8454
msgstr ""
8455
8456
#: dummy/help_topics/launchpad/detail.txt:9
8457
msgid ""
8458
"    * The launchpad-login command tells Bazaar your Launchpad user name. "
8459
"This\n"
8460
"      is then used by the 'lp:' transport to download your branches using\n"
8461
"      bzr+ssh://."
8462
msgstr ""
8463
8464
#: dummy/help_topics/launchpad/detail.txt:13
8465
msgid ""
8466
"    * The 'lp:' transport uses Launchpad as a directory service: for "
8467
"example\n"
8468
"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8469
"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8470
"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8471
msgstr ""
8472
8473
#: dummy/help_topics/launchpad/detail.txt:18
8474
msgid ""
8475
"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8476
"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8477
"lp:12345'\n"
8478
"      will record a revision property that marks that revision as fixing\n"
8479
"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8480
"      automatically be linked to the bug report."
8481
msgstr ""
8482
8483
#: dummy/help_topics/launchpad/detail.txt:24
8484
msgid ""
8485
"    * The register-branch command tells Launchpad about the url of a\n"
8486
"      public branch.  Launchpad will then mirror the branch, display\n"
8487
"      its contents and allow it to be attached to bugs and other\n"
8488
"      objects."
8489
msgstr ""
8490
8491
#: dummy/help_topics/launchpad/detail.txt:29
8492
msgid "For more information see http://help.launchpad.net/\n"
8493
msgstr ""
8494
8495
#: dummy/help_topics/launchpad/summary.txt:1
8496
msgid "Using Bazaar with Launchpad.net"
8497
msgstr ""
8498
8499
#: dummy/help_topics/location-alias/summary.txt:1
8500
msgid "Aliases for remembered locations"
8501
msgstr ""
8502
8503
#: dummy/help_topics/log-formats/summary.txt:1
8504
msgid "Details on the logging formats available"
8505
msgstr ""
8506
8507
#: dummy/help_topics/other-formats/summary.txt:1
8508
msgid "Experimental and deprecated storage formats"
8509
msgstr ""
8510
8511
#: dummy/help_topics/patterns/summary.txt:1
8512
msgid "Information on the pattern syntax"
8513
msgstr ""
8514
8515
#: dummy/help_topics/repositories/detail.txt:1
8516
msgid "Repositories"
8517
msgstr ""
8518
8519
#: dummy/help_topics/repositories/detail.txt:3
8520
msgid ""
8521
"Repositories in Bazaar are where committed information is stored. There is\n"
8522
"a repository associated with every branch."
8523
msgstr ""
8524
8525
#: dummy/help_topics/repositories/detail.txt:6
8526
msgid ""
8527
"Repositories are a form of database. Bzr will usually maintain this for\n"
8528
"good performance automatically, but in some situations (e.g. when doing\n"
8529
"very many commits in a short time period) you may want to ask bzr to\n"
8530
"optimise the database indices. This can be done by the 'bzr pack' command."
8531
msgstr ""
8532
8533
#: dummy/help_topics/repositories/detail.txt:11
8534
msgid ""
8535
"By default just running 'bzr init' will create a repository within the new\n"
8536
"branch but it is possible to create a shared repository which allows "
8537
"multiple\n"
8538
"branches to share their information in the same location. When a new branch "
8539
"is\n"
8540
"created it will first look to see if there is a containing shared repository "
8541
"it\n"
8542
"can use."
8543
msgstr ""
8544
8545
#: dummy/help_topics/repositories/detail.txt:17
8546
msgid ""
8547
"When two branches of the same project share a repository, there is\n"
8548
"generally a large space saving. For some operations (e.g. branching\n"
8549
"within the repository) this translates in to a large time saving."
8550
msgstr ""
8551
8552
#: dummy/help_topics/repositories/detail.txt:21
8553
msgid ""
8554
"To create a shared repository use the init-repository command (or the alias\n"
8555
"init-repo). This command takes the location of the repository to create. "
8556
"This\n"
8557
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8558
"which contains a shared repository. Any new branches that are created in "
8559
"this\n"
8560
"directory will then use it for storage."
8561
msgstr ""
8562
8563
#: dummy/help_topics/repositories/detail.txt:27
8564
msgid ""
8565
"It is a good idea to create a repository whenever you might create more\n"
8566
"than one branch of a project. This is true for both working areas where you\n"
8567
"are doing the development, and any server areas that you use for hosting\n"
8568
"projects. In the latter case, it is common to want branches without working\n"
8569
"trees. Since the files in the branch will not be edited directly there is "
8570
"no\n"
8571
"need to use up disk space for a working tree. To create a repository in "
8572
"which\n"
8573
"the branches will not have working trees pass the '--no-trees' option to\n"
8574
"'init-repository'."
8575
msgstr ""
8576
8577
#: dummy/help_topics/repositories/detail.txt:38
8578
msgid ""
8579
"  init-repository   Create a shared repository. Use --no-trees to create "
8580
"one\n"
8581
"                    in which new branches won't get a working tree.\n"
8582
msgstr ""
8583
8584
#: dummy/help_topics/repositories/summary.txt:1
8585
msgid "Basic information on shared repositories."
8586
msgstr ""
8587
8588
#: dummy/help_topics/revisionspec/summary.txt:1
8589
msgid "Explain how to use --revision"
8590
msgstr ""
8591
8592
#: dummy/help_topics/rules/summary.txt:1
8593
msgid "Information on defining rule-based preferences"
8594
msgstr ""
8595
8596
#: dummy/help_topics/standalone-trees/detail.txt:1
8597
msgid "Standalone Trees"
8598
msgstr ""
8599
8600
#: dummy/help_topics/standalone-trees/detail.txt:3
8601
msgid ""
8602
"A standalone tree is a working tree with an associated repository. It\n"
8603
"is an independently usable branch, with no dependencies on any other.\n"
8604
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8605
"an existing project under version control."
8606
msgstr ""
8607
8608
#: dummy/help_topics/standalone-trees/detail.txt:8
8609
msgid "Related Commands::"
8610
msgstr ""
8611
8612
#: dummy/help_topics/standalone-trees/detail.txt:10
8613
msgid "  init    Make a directory into a versioned branch.\n"
8614
msgstr ""
8615
8616
#: dummy/help_topics/standalone-trees/summary.txt:1
8617
msgid "Information on what a standalone tree is"
8618
msgstr ""
8619
8620
#: dummy/help_topics/standard-options/detail.txt:1
8621
msgid "Standard Options"
8622
msgstr ""
8623
8624
#: dummy/help_topics/standard-options/detail.txt:3
8625
msgid "Standard options are legal for all commands."
8626
msgstr ""
8627
8628
#: dummy/help_topics/standard-options/detail.txt:5
8629
msgid ""
8630
"--help, -h     Show help message.\n"
8631
"--verbose, -v  Display more information.\n"
8632
"--quiet, -q    Only display errors and warnings."
8633
msgstr ""
8634
8635
#: dummy/help_topics/standard-options/detail.txt:9
8636
msgid "Unlike global options, standard options can be used in aliases.\n"
8637
msgstr ""
8638
8639
#: dummy/help_topics/standard-options/summary.txt:1
8640
msgid "Options that can be used with any command"
8641
msgstr ""
8642
8643
#: dummy/help_topics/status-flags/detail.txt:1
8644
msgid "Status Flags"
8645
msgstr ""
8646
8647
#: dummy/help_topics/status-flags/detail.txt:3
8648
msgid ""
8649
"Status flags are used to summarise changes to the working tree in a concise\n"
8650
"manner.  They are in the form::"
8651
msgstr ""
8652
8653
#: dummy/help_topics/status-flags/detail.txt:6
8654
msgid "   xxx   <filename>"
8655
msgstr ""
8656
8657
#: dummy/help_topics/status-flags/detail.txt:8
8658
msgid "where the columns' meanings are as follows."
8659
msgstr ""
8660
8661
#: dummy/help_topics/status-flags/detail.txt:10
8662
msgid "Column 1 - versioning/renames::"
8663
msgstr ""
8664
8665
#: dummy/help_topics/status-flags/detail.txt:12
8666
msgid ""
8667
"  + File versioned\n"
8668
"  - File unversioned\n"
8669
"  R File renamed\n"
8670
"  ? File unknown\n"
8671
"  X File nonexistent (and unknown to bzr)\n"
8672
"  C File has conflicts\n"
8673
"  P Entry for a pending merge (not a file)"
8674
msgstr ""
8675
8676
#: dummy/help_topics/status-flags/detail.txt:20
8677
msgid "Column 2 - contents::"
8678
msgstr ""
8679
8680
#: dummy/help_topics/status-flags/detail.txt:22
8681
msgid ""
8682
"  N File created\n"
8683
"  D File deleted\n"
8684
"  K File kind changed\n"
8685
"  M File modified"
8686
msgstr ""
8687
8688
#: dummy/help_topics/status-flags/detail.txt:27
8689
msgid "Column 3 - execute::"
8690
msgstr ""
8691
8692
#: dummy/help_topics/status-flags/detail.txt:29
8693
msgid "  * The execute bit was changed\n"
8694
msgstr ""
8695
8696
#: dummy/help_topics/status-flags/summary.txt:1
8697
msgid "Help on status flags"
8698
msgstr ""
8699
8700
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8701
msgid "Branches Out of Sync"
8702
msgstr ""
8703
8704
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8705
msgid ""
8706
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8707
"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
8708
"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
8709
"have the same last revision as the new reference branch for the lightweight\n"
8710
"checkout, data could be lost, so Bazaar refuses."
8711
msgstr ""
8712
8713
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8714
msgid "How you deal with this depends on *why* the branches are out of sync."
8715
msgstr ""
8716
8717
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8718
msgid ""
8719
"If you have a checkout and have done local commits, you can get back in "
8720
"sync\n"
8721
"by running \"bzr update\" (and possibly \"bzr commit\")."
8722
msgstr ""
8723
8724
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8725
msgid ""
8726
"If you have a branch and the remote branch is out-of-date, you can push\n"
8727
"the local changes using \"bzr push\".  If the local branch is out of date, "
8728
"you\n"
8729
"can do \"bzr pull\".  If both branches have had changes, you can merge, "
8730
"commit\n"
8731
"and then push your changes.  If you decide that some of the changes aren't\n"
8732
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8733
msgstr ""
8734
8735
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8736
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8737
msgstr ""
8738
8739
#: dummy/help_topics/topics/summary.txt:1
8740
msgid "Topics list"
8741
msgstr ""
8742
8743
#: dummy/help_topics/url-special-chars/summary.txt:1
8744
msgid "Special character handling in URLs"
8745
msgstr ""
8746
8747
#: dummy/help_topics/urlspec/summary.txt:1
8748
msgid "Supported transport protocols"
8749
msgstr ""
8750
8751
#: dummy/help_topics/working-trees/detail.txt:1
8752
msgid "Working Trees"
8753
msgstr ""
8754
8755
#: dummy/help_topics/working-trees/detail.txt:3
8756
msgid ""
8757
"A working tree is the contents of a branch placed on disk so that you can\n"
8758
"see the files and edit them. The working tree is where you make changes to "
8759
"a\n"
8760
"branch, and when you commit the current state of the working tree is the\n"
8761
"snapshot that is recorded in the commit."
8762
msgstr ""
8763
8764
#: dummy/help_topics/working-trees/detail.txt:8
8765
msgid ""
8766
"When you push a branch to a remote system, a working tree will not be\n"
8767
"created. If one is already present the files will not be updated. The\n"
8768
"branch information will be updated and the working tree will be marked\n"
8769
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8770
"may be uncommitted changes or the update may cause content conflicts that "
8771
"are\n"
8772
"difficult to deal with remotely."
8773
msgstr ""
8774
8775
#: dummy/help_topics/working-trees/detail.txt:15
8776
msgid ""
8777
"If you have a branch with no working tree you can use the 'checkout' "
8778
"command\n"
8779
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8780
"will\n"
8781
"create the working tree. If the branch is updated remotely, you can update "
8782
"the\n"
8783
"working tree by running 'bzr update' in that directory."
8784
msgstr ""
8785
8786
#: dummy/help_topics/working-trees/detail.txt:20
8787
msgid ""
8788
"If you have a branch with a working tree that you do not want the 'remove-"
8789
"tree'\n"
8790
"command will remove the tree if it is safe. This can be done to avoid the\n"
8791
"warning about the remote working tree not being updated when pushing to the\n"
8792
"branch. It can also be useful when working with a '--no-trees' repository\n"
8793
"(see 'bzr help repositories')."
8794
msgstr ""
8795
8796
#: dummy/help_topics/working-trees/detail.txt:26
8797
msgid ""
8798
"If you want to have a working tree on a remote machine that you push to you\n"
8799
"can either run 'bzr update' in the remote branch after each push, or use "
8800
"some\n"
8801
"other method to update the tree during the push. There is an 'rspush' "
8802
"plugin\n"
8803
"that will update the working tree using rsync as well as doing a push. "
8804
"There\n"
8805
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8806
"SSH\n"
8807
"after each push."
8808
msgstr ""
8809
8810
#: dummy/help_topics/working-trees/detail.txt:33
8811
msgid "Useful commands::"
8812
msgstr ""
8813
8814
#: dummy/help_topics/working-trees/detail.txt:35
8815
msgid ""
8816
"  checkout     Create a working tree when a branch does not have one.\n"
8817
"  remove-tree  Removes the working tree from a branch when it is safe to do "
8818
"so.\n"
8819
"  update       When a working tree is out of sync with its associated "
8820
"branch\n"
8821
"               this will update the tree to match the branch.\n"
8822
msgstr ""
8823
8824
#: dummy/help_topics/working-trees/summary.txt:1
8825
msgid "Information on working trees"
8826
msgstr ""
8827
8828
#: en/help_topics/authentication.txt:1
8829
msgid ""
8830
"Authentication Settings\n"
8831
"======================="
8832
msgstr ""
8833
8834
#: en/help_topics/authentication.txt:4
8835
msgid ""
8836
"\n"
8837
"Intent\n"
8838
"------"
8839
msgstr ""
8840
8841
#: en/help_topics/authentication.txt:8
8842
msgid ""
8843
"Many different authentication policies can be described in the\n"
8844
"``authentication.conf`` file but a particular user should need only a few\n"
8845
"definitions to cover his needs without having to specify a user and a "
8846
"password\n"
8847
"for every branch he uses."
8848
msgstr ""
8849
8850
#: en/help_topics/authentication.txt:13
8851
msgid ""
8852
"The definitions found in this file are used to find the credentials to use "
8853
"for\n"
8854
"a given url. The same credentials can generally be used for as many branches "
8855
"as\n"
8856
"possible by grouping their declaration around the remote servers that need\n"
8857
"them. It's even possible to declare credentials that will be used by "
8858
"different\n"
8859
"servers."
8860
msgstr ""
8861
8862
#: en/help_topics/authentication.txt:19
8863
msgid ""
8864
"The intent is to make this file as small as possible to minimize maintenance."
8865
msgstr ""
8866
8867
#: en/help_topics/authentication.txt:21
8868
msgid ""
8869
"Once the relevant credentials are declared in this file you may use branch "
8870
"urls\n"
8871
"without embedding passwords (security hazard) or even users (enabling "
8872
"sharing\n"
8873
"of your urls with others)."
8874
msgstr ""
8875
8876
#: en/help_topics/authentication.txt:25
8877
msgid "Instead of using::"
8878
msgstr ""
8879
8880
#: en/help_topics/authentication.txt:27
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8881
msgid "  brz branch ftp://joe:secret@host.com/path/to/my/branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8882
msgstr ""
8883
8884
#: en/help_topics/authentication.txt:29
8885
msgid "you simply use::"
8886
msgstr ""
8887
8888
#: en/help_topics/authentication.txt:31
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8889
msgid "  brz branch ftp://host.com/path/to/my/branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8890
msgstr ""
8891
8892
#: en/help_topics/authentication.txt:33
8893
msgid "provided you have created the following ``authentication.conf`` file::"
8894
msgstr ""
8895
8896
#: en/help_topics/authentication.txt:35
8897
msgid ""
8898
"  [myprojects]\n"
8899
"  scheme=ftp\n"
8900
"  host=host.com\n"
8901
"  user=joe\n"
8902
"  password=secret\n"
8903
"  "
8904
msgstr ""
8905
8906
#: en/help_topics/authentication.txt:42
8907
msgid ""
8908
"Authentication definitions\n"
8909
"--------------------------"
8910
msgstr ""
8911
8912
#: en/help_topics/authentication.txt:45
8913
msgid ""
8914
"There are two kinds of authentication used by the various schemes supported "
8915
"by\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8916
"brz:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8917
msgstr ""
8918
8919
#: en/help_topics/authentication.txt:48
8920
msgid "1. user and password"
8921
msgstr ""
8922
8923
#: en/help_topics/authentication.txt:50
8924
msgid ""
8925
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8926
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8927
"ssh agents are a better, more secure solution. So we have chosen to not "
8928
"provide\n"
8929
"our own less secure method."
8930
msgstr ""
8931
8932
#: en/help_topics/authentication.txt:55
8933
msgid "2. user, realm and password"
8934
msgstr ""
8935
8936
#: en/help_topics/authentication.txt:57
8937
msgid ""
8938
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8939
"against a host. But, by using ``.htaccess`` files, for example, it is "
8940
"possible\n"
8941
"to define several (``user, realm, password``) for a given ``host``. So what "
8942
"is\n"
8943
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8944
"is\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8945
"not taken into account in the definitions, but will displayed if brz "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8946
"prompts\n"
8947
"you for a password."
8948
msgstr ""
8949
8950
#: en/help_topics/authentication.txt:64
8951
msgid ""
8952
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8953
"specifying the appropriate port."
8954
msgstr ""
8955
8956
#: en/help_topics/authentication.txt:67
8957
msgid ""
8958
"To take all schemes into account, the password will be deduced from a set "
8959
"of\n"
8960
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8961
"``user``,\n"
8962
"``password``)."
8963
msgstr ""
8964
8965
#: en/help_topics/authentication.txt:71
8966
msgid ""
8967
"  * ``scheme``: can be empty (meaning the rest of the definition can be "
8968
"used\n"
8969
"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8970
"``ssh``\n"
8971
"    should be used instead since this is the real scheme regarding\n"
8972
"    authentication,"
8973
msgstr ""
8974
8975
#: en/help_topics/authentication.txt:76
8976
msgid "  * ``host``: can be empty (to act as a default for any host),"
8977
msgstr ""
8978
8979
#: en/help_topics/authentication.txt:78
8980
msgid ""
8981
"  * ``port`` can be empty (useful when an host provides several servers for "
8982
"the\n"
8983
"    same scheme), only numerical values are allowed, this should be used "
8984
"only\n"
8985
"    when the server uses a port different than the scheme standard port,"
8986
msgstr ""
8987
8988
#: en/help_topics/authentication.txt:82
8989
msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
8990
msgstr ""
8991
8992
#: en/help_topics/authentication.txt:84
8993
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8994
"  * ``user``: can be empty (``bzr`` will default to python's\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
8995
"    ``getpass.get_user()``),"
8996
msgstr ""
8997
8998
#: en/help_topics/authentication.txt:87
8999
msgid ""
9000
"  * ``password``: can be empty if you prefer to always be prompted for your\n"
9001
"    password."
9002
msgstr ""
9003
9004
#: en/help_topics/authentication.txt:90
9005
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9006
"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
9007
"a\n"
9008
"(``user`` [, ``password``]) based on the following rules :"
9009
msgstr ""
9010
9011
#: en/help_topics/authentication.txt:93
9012
msgid " 1. the first match wins,"
9013
msgstr ""
9014
9015
#: en/help_topics/authentication.txt:95
9016
msgid " 2. empty fields match everything,"
9017
msgstr ""
9018
9019
#: en/help_topics/authentication.txt:97
9020
msgid ""
9021
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9022
msgstr ""
9023
9024
#: en/help_topics/authentication.txt:99
9025
msgid ""
9026
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9027
"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
9028
"net``\n"
9029
"    will not match ``bzr.sf.net``)."
9030
msgstr ""
9031
9032
#: en/help_topics/authentication.txt:103
9033
msgid ""
9034
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9035
msgstr ""
9036
9037
#: en/help_topics/authentication.txt:105
9038
msgid ""
9039
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9040
"above,\n"
9041
"    empty paths will match any provided path)."
9042
msgstr ""
9043
9044
#: en/help_topics/authentication.txt:110
9045
msgid ""
9046
"File format\n"
9047
"-----------"
9048
msgstr ""
9049
9050
#: en/help_topics/authentication.txt:113
9051
msgid ""
9052
"The general rules for :doc:`configuration files <configuration-help>`\n"
9053
"apply except for the variable policies."
9054
msgstr ""
9055
9056
#: en/help_topics/authentication.txt:116
9057
msgid "Each section describes an authentication definition."
9058
msgstr ""
9059
9060
#: en/help_topics/authentication.txt:118
9061
msgid ""
9062
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9063
"reserved\n"
9064
"and should appear as the *last* section."
9065
msgstr ""
9066
9067
#: en/help_topics/authentication.txt:121
9068
msgid "Each section should define:"
9069
msgstr ""
9070
9071
#: en/help_topics/authentication.txt:123
9072
msgid "* ``user``: the login to be used,"
9073
msgstr ""
9074
9075
#: en/help_topics/authentication.txt:125
9076
msgid "Each section could define:"
9077
msgstr ""
9078
9079
#: en/help_topics/authentication.txt:127
9080
msgid "* ``host``: the remote server,"
9081
msgstr ""
9082
9083
#: en/help_topics/authentication.txt:129
9084
msgid "* ``port``: the port the server is listening,"
9085
msgstr ""
9086
9087
#: en/help_topics/authentication.txt:131
9088
msgid "* ``path``: the branch location,"
9089
msgstr ""
9090
9091
#: en/help_topics/authentication.txt:133
9092
msgid "* ``password``: the password."
9093
msgstr ""
9094
9095
#: en/help_topics/authentication.txt:135
9096
msgid ""
9097
"\n"
9098
"Examples\n"
9099
"--------"
9100
msgstr ""
9101
9102
#: en/help_topics/authentication.txt:139
9103
msgid ""
9104
"\n"
9105
"Personal projects hosted outside\n"
9106
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9107
msgstr ""
9108
9109
#: en/help_topics/authentication.txt:143
9110
msgid ""
9111
"All connections are done with the same ``user`` (the remote one for which "
9112
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9113
"default brz one is not appropriate) and the password is always prompted "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9114
"with\n"
9115
"some exceptions::"
9116
msgstr ""
9117
9118
#: en/help_topics/authentication.txt:147
9119
msgid ""
9120
"        # Pet projects on hobby.net\n"
9121
"        [hobby]\n"
9122
"        host=r.hobby.net\n"
9123
"        user=jim\n"
9124
"        password=obvious1234\n"
9125
"        \n"
9126
"        # Home server\n"
9127
"        [home]\n"
9128
"        scheme=https\n"
9129
"        host=home.net\n"
9130
"        user=joe\n"
9131
"        password=1essobV10us\n"
9132
"        \n"
9133
"        [DEFAULT]\n"
9134
"        # Our local user is barbaz, on all remote sites we're known as "
9135
"foobar\n"
9136
"        user=foobar"
9137
msgstr ""
9138
9139
#: en/help_topics/authentication.txt:164
9140
msgid ""
9141
"\n"
9142
"Source hosting provider\n"
9143
"~~~~~~~~~~~~~~~~~~~~~~~"
9144
msgstr ""
9145
9146
#: en/help_topics/authentication.txt:168
9147
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9148
msgstr ""
9149
9150
#: en/help_topics/authentication.txt:170
9151
msgid ""
9152
"        [shpnet domain]\n"
9153
"        # we use sftp, but ssh is the scheme used for authentication\n"
9154
"        scheme=ssh\n"
9155
"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9156
"        host=.shp.net\n"
9157
"        user=joe\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9158
"        # brz doesn't support supplying a password for sftp,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9159
"        # consider using an ssh agent if you don't want to supply\n"
9160
"        # a password interactively. (pageant, ssh-agent, etc)"
9161
msgstr ""
9162
9163
#: en/help_topics/authentication.txt:180
9164
msgid ""
9165
"HTTPS, SFTP servers and their proxy\n"
9166
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9167
msgstr ""
9168
9169
#: en/help_topics/authentication.txt:183
9170
msgid ""
9171
"At company.com, the server hosting release and integration branches is "
9172
"behind a\n"
9173
"proxy, and the two branches use different authentication policies::"
9174
msgstr ""
9175
9176
#: en/help_topics/authentication.txt:186
9177
msgid ""
9178
"        [reference code]\n"
9179
"        scheme=https\n"
9180
"        host=dev.company.com\n"
9181
"        path=/dev\n"
9182
"        user=user1\n"
9183
"        password=pass1"
9184
msgstr ""
9185
9186
#: en/help_topics/authentication.txt:193
9187
msgid ""
9188
"        # development branches on dev server\n"
9189
"        [dev]\n"
9190
"        scheme=ssh # bzr+ssh and sftp are available here\n"
9191
"        host=dev.company.com\n"
9192
"        path=/dev/integration\n"
9193
"        user=user2\n"
9194
"        \n"
9195
"        # proxy\n"
9196
"        [proxy]\n"
9197
"        scheme=http\n"
9198
"        host=proxy.company.com\n"
9199
"        port=3128\n"
9200
"        user=proxyuser1\n"
9201
"        password=proxypass1"
9202
msgstr ""
9203
9204
#: en/help_topics/authentication.txt:208
9205
msgid ""
9206
"\n"
9207
"Planned enhancements\n"
9208
"--------------------"
9209
msgstr ""
9210
9211
#: en/help_topics/authentication.txt:212
9212
msgid ""
9213
"The following are not yet implemented but planned as parts of a work in\n"
9214
"progress:"
9215
msgstr ""
9216
9217
#: en/help_topics/authentication.txt:215
9218
msgid "* add a  ``password_encoding`` field allowing:"
9219
msgstr ""
9220
9221
#: en/help_topics/authentication.txt:217
9222
msgid ""
9223
"  - storing the passwords in various obfuscating encodings (base64 for one),"
9224
msgstr ""
9225
9226
#: en/help_topics/authentication.txt:219
9227
msgid "  - delegate password storage to plugins (.netrc for example)."
9228
msgstr ""
9229
9230
#: en/help_topics/authentication.txt:221
9231
msgid ""
9232
"* update the credentials when the user is prompted for user or password,"
9233
msgstr ""
9234
9235
#: en/help_topics/authentication.txt:223
9236
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9237
msgstr ""
9238
9239
#: en/help_topics/authentication.txt:225
9240
msgid ""
9241
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9242
"but\n"
9243
"ignored in the actual implementation.\n"
9244
msgstr ""
9245
9246
#: en/help_topics/bugs.txt:1
9247
msgid "Bug Tracker Settings"
9248
msgstr ""
9249
9250
#: en/help_topics/bugs.txt:3
9251
msgid ""
9252
"When making a commit, metadata about bugs fixed by that change can be\n"
9253
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9254
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9255
"(The only ``status`` value currently supported is ``fixed.``)"
9256
msgstr ""
9257
9258
#: en/help_topics/bugs.txt:8
9259
msgid ""
9260
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9261
"identifier\n"
9262
"rather than a full URL. This looks like::"
9263
msgstr ""
9264
9265
#: en/help_topics/bugs.txt:11
9266
msgid "    bzr commit --fixes <tracker>:<id>"
9267
msgstr ""
9268
6535.1.1 by Vincent Ladeuil
Release 2.6b2
9269
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9270
msgid "or::"
9271
msgstr ""
9272
9273
#: en/help_topics/bugs.txt:15
9274
msgid "    bzr commit --fixes <id>"
9275
msgstr ""
9276
9277
#: en/help_topics/bugs.txt:17
9278
msgid ""
9279
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9280
"the\n"
9281
"identifier for that bug within the bugtracker, usually the bug number.\n"
9282
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9283
"or global configuration is used."
9284
msgstr ""
9285
9286
#: en/help_topics/bugs.txt:22
9287
msgid ""
9288
"Bazaar knows about a few bug trackers that have many users. If\n"
9289
"you use one of these bug trackers then there is no setup required to\n"
9290
"use this feature, you just need to know the tracker identifier to use.\n"
9291
"These are the bugtrackers that are built in:"
9292
msgstr ""
9293
9294
#: en/help_topics/bugs.txt:27
9295
msgid ""
9296
"  ============================ ============ ============\n"
9297
"  URL                          Abbreviation Example\n"
9298
"  ============================ ============ ============\n"
9299
"  https://bugs.launchpad.net/  lp           lp:12345\n"
9300
"  http://bugs.debian.org/      deb          deb:12345\n"
9301
"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
9302
"  ============================ ============ ============"
9303
msgstr ""
9304
9305
#: en/help_topics/bugs.txt:35
9306
msgid ""
9307
"For the bug trackers not listed above configuration is required.\n"
9308
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9309
"is built in, along with a template mechanism for other bugtrackers with\n"
9310
"simple URL schemes. If your bug tracker can't be described by one\n"
9311
"of the schemes described below then you can write a plugin to support\n"
9312
"it."
9313
msgstr ""
9314
9315
#: en/help_topics/bugs.txt:42
9316
msgid ""
9317
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9318
"variable which contains the base URL of the bug tracker. These options\n"
9319
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9320
"configuration section in ``locations.conf``.  You can set up these values\n"
9321
"for each of the projects you work on."
9322
msgstr ""
9323
9324
#: en/help_topics/bugs.txt:48
9325
msgid ""
9326
"Note: As you provide a short name for each tracker, you can specify one or\n"
9327
"more bugs in one or more trackers at commit time if you wish."
9328
msgstr ""
9329
9330
#: en/help_topics/bugs.txt:51
9331
msgid ""
9332
"Launchpad\n"
9333
"---------"
9334
msgstr ""
9335
9336
#: en/help_topics/bugs.txt:54
9337
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9338
msgstr ""
9339
9340
#: en/help_topics/bugs.txt:56
9341
msgid ""
9342
"bugzilla_<tracker>_url\n"
9343
"----------------------"
9344
msgstr ""
9345
9346
#: en/help_topics/bugs.txt:59
9347
msgid ""
9348
"If present, the location of the Bugzilla bug tracker referred to by\n"
9349
"<tracker>. This option can then be used together with ``bzr commit\n"
9350
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9351
"example::"
9352
msgstr ""
9353
9354
#: en/help_topics/bugs.txt:64
9355
msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
9356
msgstr ""
9357
9358
#: en/help_topics/bugs.txt:66
9359
msgid ""
9360
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9361
"fixed."
9362
msgstr ""
9363
9364
#: en/help_topics/bugs.txt:69
9365
msgid ""
9366
"trac_<tracker>_url\n"
9367
"------------------"
9368
msgstr ""
9369
9370
#: en/help_topics/bugs.txt:72
9371
msgid ""
9372
"If present, the location of the Trac instance referred to by\n"
9373
"<tracker>. This option can then be used together with ``bzr commit\n"
9374
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9375
"example::"
9376
msgstr ""
9377
9378
#: en/help_topics/bugs.txt:77
9379
msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
9380
msgstr ""
9381
9382
#: en/help_topics/bugs.txt:79
9383
msgid ""
9384
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9385
"as\n"
9386
"fixed."
9387
msgstr ""
9388
9389
#: en/help_topics/bugs.txt:82
9390
msgid ""
9391
"bugtracker_<tracker>_url\n"
9392
"------------------------"
9393
msgstr ""
9394
9395
#: en/help_topics/bugs.txt:85
9396
msgid ""
9397
"If present, the location of a generic bug tracker instance referred to by\n"
9398
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9399
"which will be replaced by a specific bug ID. This option can then be used\n"
9400
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9401
"fixed by that commit. For example::"
9402
msgstr ""
9403
9404
#: en/help_topics/bugs.txt:91
9405
msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
9406
msgstr ""
9407
9408
#: en/help_topics/bugs.txt:93
9409
msgid ""
9410
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9411
"Roundup bug tracker as fixed, or::"
9412
msgstr ""
9413
9414
#: en/help_topics/bugs.txt:96
9415
msgid ""
9416
"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9417
msgstr ""
9418
9419
#: en/help_topics/bugs.txt:98
9420
msgid ""
9421
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9422
"RT bug tracker as fixed, or::"
9423
msgstr ""
9424
9425
#: en/help_topics/bugs.txt:101
9426
msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9427
msgstr ""
9428
9429
#: en/help_topics/bugs.txt:103
9430
msgid ""
9431
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9432
"HUDSON-1234\n"
9433
"in Hudson's JIRA bug tracker as fixed.\n"
9434
msgstr ""
9435
9436
#: en/help_topics/commands.txt:1
9437
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9438
"add               Add specified files or directories.\n"
9439
"alias             Set/unset and display aliases.\n"
9440
"annotate          Show the origin of each line in a file.\n"
9441
"bash-completion   Generate a shell function for bash command line "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9442
"completion.\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9443
"                  [bash_completion]\n"
9444
"bind              Convert the current branch into a checkout of the "
9445
"supplied\n"
9446
"                  branch.\n"
9447
"branch            Create a new branch that is a copy of an existing branch.\n"
9448
"branches          List the branches available at the current location.\n"
9449
"break-lock        Break a dead lock.\n"
9450
"cat               Write the contents of a file as of a given revision to\n"
9451
"                  standard output.\n"
9452
"check             Validate working tree structure, branch consistency and\n"
9453
"                  repository history.\n"
9454
"checkout          Create a new checkout of an existing branch.\n"
9455
"clean-tree        Remove unwanted files from working tree.\n"
9456
"commit            Commit changes into a new revision.\n"
9457
"config            Display, set or remove a configuration option.\n"
9458
"conflicts         List files with conflicts.\n"
9459
"deleted           List files deleted in the working tree.\n"
9460
"diff              Show differences in the working tree, between revisions "
9461
"or\n"
9462
"                  branches.\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
9463
"dpush             Push into a different VCS without any custom bzr "
9464
"metadata.\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9465
"export            Export current or past revision to a destination directory "
9466
"or\n"
9467
"                  archive.\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
9468
"grep              Print lines matching PATTERN for specified files and\n"
9469
"                  revisions. [grep]\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9470
"help              Show help on a command or other topic.\n"
9471
"ignore            Ignore specified files or patterns.\n"
9472
"ignored           List ignored files and the patterns that matched them.\n"
9473
"info              Show information about a working tree, branch or "
9474
"repository.\n"
9475
"init              Make a directory into a versioned branch.\n"
9476
"init-repository   Create a shared repository for branches to share storage\n"
9477
"                  space.\n"
9478
"join              Combine a tree into its containing tree.\n"
9479
"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
9480
"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
9481
"launchpad-open    Open a Launchpad branch page in your web browser. "
9482
"[launchpad]\n"
9483
"log               Show historical log for a branch or subset of a branch.\n"
9484
"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
9485
"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
9486
"ls                List files in a tree.\n"
9487
"merge             Perform a three-way merge.\n"
9488
"missing           Show unmerged/unpulled revisions between two branches.\n"
9489
"mkdir             Create a new versioned directory.\n"
9490
"mv                Move or rename a file.\n"
9491
"nick              Print or set the branch nickname.\n"
9492
"pack              Compress the data within a repository.\n"
6581.1.2 by Vincent Ladeuil
Update translation template.
9493
"ping              Pings a Bazaar smart server.\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9494
"plugins           List the installed plugins.\n"
9495
"pull              Turn this branch into a mirror of another branch.\n"
9496
"push              Update a mirror of this branch.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9497
"reconcile         Reconcile brz metadata in a branch.\n"
9498
"reconfigure       Reconfigure the type of a brz directory.\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9499
"register-branch   Register a branch with launchpad.net. [launchpad]\n"
9500
"remerge           Redo a merge.\n"
9501
"remove            Remove files or directories.\n"
9502
"remove-branch     Remove a branch.\n"
9503
"remove-tree       Remove the working tree from a given branch/checkout.\n"
9504
"renames           Show list of renamed files.\n"
9505
"resolve           Mark a conflict as resolved.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
9506
"revert            Set files in the working tree back to the contents of a\n"
9507
"                  previous revision.\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9508
"revno             Show current revision number.\n"
9509
"root              Show the tree root directory.\n"
9510
"send              Mail or create a merge-directive for submitting changes.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9511
"serve             Run the brz server.\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9512
"shelve            Temporarily set aside some changes from the current tree.\n"
9513
"sign-my-commits   Sign all commits by a given committer.\n"
9514
"split             Split a subdirectory of a tree into a separate tree.\n"
9515
"status            Display status summary.\n"
9516
"switch            Set the branch of a checkout and update.\n"
9517
"tag               Create, remove or modify a tag naming a revision.\n"
9518
"tags              List tags.\n"
9519
"testament         Show testament (signing-form) of a revision.\n"
9520
"unbind            Convert the current checkout into a regular branch.\n"
9521
"uncommit          Remove the last committed revision.\n"
9522
"unshelve          Restore shelved changes.\n"
9523
"update            Update a working tree to a new revision.\n"
9524
"upgrade           Upgrade a repository, branch or working tree to a newer\n"
9525
"                  format.\n"
9526
"verify-signatures Verify all commit signatures.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9527
"version           Show version of brz.\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9528
"version-info      Show version information about this tree.\n"
9529
"view              Manage filtered views.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9530
"whoami            Show or set brz user id.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9531
msgstr ""
9532
9533
#: en/help_topics/configuration.txt:1
9534
msgid ""
9535
"Configuration Settings\n"
9536
"======================="
9537
msgstr ""
9538
9539
#: en/help_topics/configuration.txt:4
9540
msgid ""
9541
"Environment settings\n"
9542
"---------------------"
9543
msgstr ""
9544
9545
#: en/help_topics/configuration.txt:7
9546
msgid ""
9547
"While most configuration is handled by configuration files, some options\n"
9548
"which may be semi-permanent can also be controlled through the environment."
9549
msgstr ""
9550
9551
#: en/help_topics/configuration.txt:10
9552
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9553
"BRZ_EMAIL\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9554
"~~~~~~~~~"
9555
msgstr ""
9556
9557
#: en/help_topics/configuration.txt:13
9558
msgid "Override the email id used by Bazaar.  Typical format::"
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:15
9562
msgid "  \"John Doe <jdoe@example.com>\""
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:17
9566
msgid "See also the ``email`` configuration option."
9567
msgstr ""
9568
9569
#: en/help_topics/configuration.txt:19
9570
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9571
"BRZ_PROGRESS_BAR\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9572
"~~~~~~~~~~~~~~~~"
9573
msgstr ""
9574
9575
#: en/help_topics/configuration.txt:22
9576
msgid ""
9577
"Override the progress display.  Possible values are \"none\" or \"text\".  "
9578
"If\n"
9579
"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
9580
"draws\n"
9581
"the ordinary command line progress bar."
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:26
9585
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9586
"BRZ_SIGQUIT_PDB\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9587
"~~~~~~~~~~~~~~~"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:29
9591
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:31
9595
msgid ""
9596
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9597
"* 1 = Invoke breakin debugger (default)"
9598
msgstr ""
9599
9600
#: en/help_topics/configuration.txt:34
9601
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9602
"BRZ_HOME\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9603
"~~~~~~~~"
9604
msgstr ""
9605
9606
#: en/help_topics/configuration.txt:37
9607
msgid "Override the home directory used by Bazaar."
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:39
9611
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9612
"BRZ_SSH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9613
"~~~~~~~"
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:42
9617
msgid "Select a different SSH implementation."
9618
msgstr ""
9619
9620
#: en/help_topics/configuration.txt:44
9621
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9622
"BRZ_PDB\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9623
"~~~~~~~"
9624
msgstr ""
9625
9626
#: en/help_topics/configuration.txt:47
9627
msgid "Control whether to launch a debugger on error."
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:49
9631
msgid ""
9632
"* 0 = Standard behavior\n"
9633
"* 1 = Launch debugger"
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:52
9637
msgid ""
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
9638
"BZR_REMOTE_PATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9639
"~~~~~~~~~~~~~~~"
9640
msgstr ""
9641
9642
#: en/help_topics/configuration.txt:55
9643
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:57
9647
msgid "See also the ``bzr_remote_path`` configuration option."
9648
msgstr ""
9649
9650
#: en/help_topics/configuration.txt:59
9651
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9652
"BRZ_EDITOR\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9653
"~~~~~~~~~~"
9654
msgstr ""
9655
9656
#: en/help_topics/configuration.txt:62
9657
msgid "Path to the editor Bazaar should use for commit messages, etc."
9658
msgstr ""
9659
9660
#: en/help_topics/configuration.txt:64
9661
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9662
"BRZ_LOG\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9663
"~~~~~~~"
9664
msgstr ""
9665
9666
#: en/help_topics/configuration.txt:67
9667
msgid ""
9668
"Location of the Bazaar log file. You can check the current location by\n"
9669
"running ``bzr version``."
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:70
9673
msgid ""
9674
"The log file contains debug information that is useful for diagnosing or\n"
9675
"reporting problems with Bazaar."
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:73
9679
msgid ""
9680
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9681
"will disable logging."
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:76
9685
msgid ""
9686
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9687
"BRZ_PLUGIN_PATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9688
"~~~~~~~~~~~~~~~"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:80
9692
msgid ""
9693
"The path to the plugins directory that Bazaar should use.\n"
9694
"If not set, Bazaar will search for plugins in:"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:83
9698
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:85
9702
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9703
msgstr ""
9704
9705
#: en/help_topics/configuration.txt:87
9706
msgid ""
9707
"* the site specific plugin directory if applicable (containing\n"
9708
"  the ``site`` plugins)."
9709
msgstr ""
9710
9711
#: en/help_topics/configuration.txt:90
9712
msgid ""
9713
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9714
"the way the plugin are searched. "
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:93
9718
msgid ""
9719
"As for the ``PATH`` variables, if multiple directories are\n"
9720
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9721
"platform specific appropriate character (':' on Unix,\n"
9722
"';' on windows)"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:98
9726
msgid ""
9727
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9728
"in ``user``.  However it will continue to search in ``core`` and\n"
9729
"``site`` unless they are explicitly removed."
9730
msgstr ""
9731
9732
#: en/help_topics/configuration.txt:102
9733
msgid ""
9734
"If you need to change the order or remove one of these\n"
9735
"directories, you should use special values:"
9736
msgstr ""
9737
9738
#: en/help_topics/configuration.txt:105
9739
msgid ""
9740
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9741
"  path from the default values,"
9742
msgstr ""
9743
9744
#: en/help_topics/configuration.txt:108
9745
msgid ""
9746
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9747
"  before the remaining default values (and also remove it from\n"
9748
"  the default values)."
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:112
9752
msgid ""
9753
"Note that the special values 'user', 'core' and 'site' should be\n"
9754
"used literally, they will be substituted by the corresponding,\n"
9755
"platform specific, values."
9756
msgstr ""
9757
9758
#: en/help_topics/configuration.txt:116
9759
msgid ""
9760
"The examples below use ':' as the separator, windows users\n"
9761
"should use ';'."
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:119
9765
msgid "Overriding the default user plugin directory::"
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:121
9769
msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:123
9773
msgid "Disabling the site directory while retaining the user directory::"
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:125
9777
msgid "  BZR_PLUGIN_PATH='-site:+user'"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:127
9781
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:129
9785
msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:131
9789
msgid "Overriding the default site plugin directory::"
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:133
9793
msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9794
msgstr ""
9795
9796
#: en/help_topics/configuration.txt:135
9797
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9798
"BRZ_DISABLE_PLUGINS\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9799
"~~~~~~~~~~~~~~~~~~~"
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:138
9803
msgid ""
9804
"Under special circumstances (mostly when trying to diagnose a\n"
9805
"bug), it's better to disable a plugin (or several) rather than\n"
9806
"uninstalling them completely. Such plugins can be specified in\n"
9807
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:143
9811
msgid ""
9812
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9813
"will raise an import error if they are explicitly imported (by\n"
9814
"another plugin that depends on them for example)."
9815
msgstr ""
9816
9817
#: en/help_topics/configuration.txt:147
9818
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9819
msgstr ""
9820
9821
#: en/help_topics/configuration.txt:149
9822
msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:151
9826
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9827
"BRZ_PLUGINS_AT\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9828
"~~~~~~~~~~~~~~"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:154
9832
msgid ""
9833
"When adding a new feature or working on a bug in a plugin,\n"
9834
"developers often need to use a specific version of a given\n"
9835
"plugin. Since python requires that the directory containing the\n"
9836
"code is named like the plugin itself this make it impossible to\n"
9837
"use arbitrary directory names (using a two-level directory scheme\n"
9838
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9839
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9840
msgstr ""
9841
9842
#: en/help_topics/configuration.txt:162
9843
msgid ""
9844
"Plugins specified in this environment variable takes precedence\n"
9845
"over the ones in ``BZR_PLUGIN_PATH``."
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:165
9849
msgid ""
9850
"The variable specified a list of ``plugin_name@plugin path``,\n"
9851
"``plugin_name`` being the name of the plugin as it appears in\n"
9852
"python module paths, ``plugin_path`` being the path to the\n"
9853
"directory containing the plugin code itself\n"
9854
"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
9855
"separator, use ';' on windows."
9856
msgstr ""
9857
9858
#: en/help_topics/configuration.txt:172
9859
msgid ""
9860
"Example:\n"
9861
"~~~~~~~~"
9862
msgstr ""
9863
9864
#: en/help_topics/configuration.txt:175
9865
msgid ""
9866
"Using a specific version of ``myplugin``:\n"
9867
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9868
msgstr ""
9869
9870
#: en/help_topics/configuration.txt:178
9871
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9872
"BRZPATH\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9873
"~~~~~~~"
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:181
9877
msgid "The path where Bazaar should look for shell plugin external commands."
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:183
9881
msgid ""
9882
"\n"
9883
"http_proxy, https_proxy\n"
9884
"~~~~~~~~~~~~~~~~~~~~~~~"
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:187
9888
msgid "Specifies the network proxy for outgoing connections, for example::"
9889
msgstr ""
9890
9891
#: en/help_topics/configuration.txt:189
9892
msgid ""
9893
"  http_proxy=http://proxy.example.com:3128/ \n"
9894
"  https_proxy=http://proxy.example.com:3128/"
9895
msgstr ""
9896
9897
#: en/help_topics/configuration.txt:192
9898
msgid ""
9899
"\n"
9900
"Configuration files\n"
9901
"-------------------"
9902
msgstr ""
9903
9904
#: en/help_topics/configuration.txt:196
9905
msgid ""
9906
"Location\n"
9907
"~~~~~~~~"
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:199
9911
msgid ""
9912
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9913
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9914
"on\n"
9915
"Windows. (You can check the location for your system by using\n"
9916
"``bzr version``.)"
9917
msgstr ""
9918
9919
#: en/help_topics/configuration.txt:204
9920
msgid "There are three primary configuration files in this location:"
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:206
9924
msgid "* ``bazaar.conf`` describes default configuration options,"
9925
msgstr ""
9926
9927
#: en/help_topics/configuration.txt:208
9928
msgid ""
9929
"* ``locations.conf`` describes configuration information for\n"
9930
"  specific branch locations,"
9931
msgstr ""
9932
9933
#: en/help_topics/configuration.txt:211
9934
msgid ""
9935
"* ``authentication.conf`` describes credential information for\n"
9936
"  remote servers."
9937
msgstr ""
9938
9939
#: en/help_topics/configuration.txt:214
9940
msgid ""
9941
"Each branch can also contain a configuration file that sets values specific\n"
9942
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9943
"the\n"
9944
"branch. This file is visible to all users of a branch, if you wish to "
9945
"override\n"
9946
"one of the values for a branch with a setting that is specific to you then "
9947
"you\n"
9948
"can do so in ``locations.conf``."
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:220
9952
msgid ""
9953
"General format\n"
9954
"~~~~~~~~~~~~~~"
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:223
9958
msgid ""
9959
"An ini file has three types of contructs: section headers, section\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9960
"options and comments."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:226
9964
msgid ""
9965
"Comments\n"
9966
"^^^^^^^^"
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:229
9970
msgid ""
9971
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9972
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9973
"Bazaar when parsing ini files."
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:233
9977
msgid ""
9978
"Section headers\n"
9979
"^^^^^^^^^^^^^^^"
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:236
9983
msgid ""
9984
"A section header is a word enclosed in brackets that starts at the begining\n"
9985
"of a line.  A typical section header looks like this::"
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:239
9989
msgid "    [DEFAULT]"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:241
9993
msgid ""
9994
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9995
"[ALIASES].  Section headers are case sensitive. The default section provides "
9996
"for\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
9997
"setting options which can be overridden with the branch config file."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:245
10001
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10002
"For ``locations.conf``, the options from the section with the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10003
"longest matching section header are used to the exclusion of other\n"
10004
"potentially valid section headers. A section header uses the path for\n"
10005
"the branch as the section header. Some examples include::"
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:250
10009
msgid ""
10010
"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
10011
"    [/home/jdoe/branches/]"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:253
10015
msgid ""
10016
"\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10017
"Section options\n"
10018
"^^^^^^^^^^^^^^^"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10019
msgstr ""
10020
10021
#: en/help_topics/configuration.txt:257
10022
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10023
"A section option resides within a section. A section option contains an\n"
10024
"option name, an equals sign and a value.  For example::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10025
msgstr ""
10026
10027
#: en/help_topics/configuration.txt:260
10028
msgid ""
10029
"    email            = John Doe <jdoe@isp.com>\n"
10030
"    gpg_signing_key  = Amy Pond <amy@example.com>"
10031
msgstr ""
10032
10033
#: en/help_topics/configuration.txt:263
10034
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10035
"A option can reference other options by enclosing them in curly brackets::"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10036
msgstr ""
10037
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10038
#: en/help_topics/configuration.txt:265
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10039
msgid ""
10040
"    my_branch_name = feature_x\n"
10041
"    my_server      = bzr+ssh://example.com\n"
10042
"    push_location   = {my_server}/project/{my_branch_name}"
10043
msgstr ""
10044
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10045
#: en/help_topics/configuration.txt:269
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10046
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10047
"Option policies\n"
10048
"^^^^^^^^^^^^^^^"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10049
msgstr ""
10050
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10051
#: en/help_topics/configuration.txt:272
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10052
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10053
"Options defined in a section affect the named directory or URL plus\n"
10054
"any locations they contain.  Policies can be used to change how an\n"
10055
"option value is interpreted for contained locations.  Currently\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10056
"there are three policies available:"
10057
msgstr ""
10058
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10059
#: en/help_topics/configuration.txt:277
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10060
msgid ""
10061
" none:\n"
10062
"   the value is interpreted the same for contained locations.  This is\n"
10063
"   the default behaviour.\n"
10064
" norecurse:\n"
10065
"   the value is only used for the exact location specified by the\n"
10066
"   section name.\n"
10067
" appendpath:\n"
10068
"   for contained locations, any additional path components are\n"
10069
"   appended to the value."
10070
msgstr ""
10071
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10072
#: en/help_topics/configuration.txt:287
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10073
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10074
"Policies are specified by keys with names of the form \"<option_name>:policy"
10075
"\".\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10076
"For example, to define the push location for a tree of branches, the\n"
10077
"following could be used::"
10078
msgstr ""
10079
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10080
#: en/help_topics/configuration.txt:291
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10081
msgid ""
10082
"  [/top/location]\n"
10083
"  push_location = sftp://example.com/location\n"
10084
"  push_location:policy = appendpath"
10085
msgstr ""
10086
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10087
#: en/help_topics/configuration.txt:295
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10088
msgid ""
10089
"With this configuration, the push location for ``/top/location/branch1``\n"
10090
"would be ``sftp://example.com/location/branch1``."
10091
msgstr ""
10092
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10093
#: en/help_topics/configuration.txt:298
10094
msgid ""
10095
"Section local options\n"
10096
"^^^^^^^^^^^^^^^^^^^^^"
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:301
10100
msgid ""
10101
"Some options are defined automatically inside a given section and can be\n"
10102
"refered to in this section only. "
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:304
10106
msgid "For example, the ``appendpath`` policy can be used like this::"
10107
msgstr ""
10108
10109
#: en/help_topics/configuration.txt:306
10110
msgid ""
10111
"  [/home/vila/src/bzr/bugs]\n"
10112
"  mypush = lp:~vila/bzr\n"
10113
"  mypush:policy=appendpath"
10114
msgstr ""
10115
10116
#: en/help_topics/configuration.txt:310
10117
msgid "Using ``relpath`` to achieve the same result is done like this::"
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:312
10121
msgid ""
10122
"  [/home/vila/src/bzr/bugs]\n"
10123
"  mypush = lp:~vila/bzr/{relpath}"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:315
10127
msgid ""
10128
"In both cases, when used in a directory like\n"
10129
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10130
msgstr ""
10131
6437.2.2 by Vincent Ladeuil
Release 2.5b5
10132
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10133
msgid ""
10134
"   $ bzr config mypush\n"
10135
"   lp:~vila/bzr/832013-expand-in-stack"
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:321
6349.1.1 by Vincent Ladeuil
Release 2.5b4
10139
msgid "Another such option is ``basename`` which can be used like this::"
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:323
10143
msgid ""
10144
"  [/home/vila/src/bzr]\n"
10145
"  mypush = lp:~vila/bzr/{basename}"
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:326
10149
msgid ""
10150
"When used in a directory like\n"
10151
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:332
10155
msgid ""
10156
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10157
"itself is defined as the relative path between the section name and the\n"
10158
"location it matches."
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:336
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10162
msgid ""
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10163
"Another such option is ``branchname``, which refers to the name of a "
10164
"colocated\n"
10165
"branch.  For non-colocated branches, it behaves like basename.  It can be "
10166
"used\n"
10167
"like this::"
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:340
10171
msgid ""
10172
"  [/home/vila/src/bzr/bugs]\n"
10173
"  mypush = lp:~vila/bzr/{branchname}"
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:343
10177
msgid ""
10178
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10179
"get::"
10180
msgstr ""
10181
10182
#: en/help_topics/configuration.txt:345
10183
msgid ""
10184
"  bzr config mypush\n"
10185
"  lp:~vila/bzr/832013-expand-in-stack"
10186
msgstr ""
10187
10188
#: en/help_topics/configuration.txt:348
10189
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10190
"When an option is local to a Section, it cannot be referred to from option\n"
10191
"values in any other section from the same ``Store`` nor from any other\n"
10192
"``Store``."
10193
msgstr ""
10194
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10195
#: en/help_topics/configuration.txt:352
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10196
msgid ""
10197
"\n"
10198
"The main configuration file, bazaar.conf\n"
10199
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10200
msgstr ""
10201
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10202
#: en/help_topics/configuration.txt:356
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10203
msgid ""
10204
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10205
"The default section contains the default\n"
10206
"configuration options for all branches. The default section can be\n"
10207
"overriden by providing a branch-specific section in ``locations.conf``."
10208
msgstr ""
10209
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10210
#: en/help_topics/configuration.txt:361
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10211
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10212
msgstr ""
10213
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10214
#: en/help_topics/configuration.txt:363
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10215
msgid ""
10216
"    [DEFAULT]\n"
10217
"    email             = John Doe <jdoe@isp.com>\n"
10218
"    editor            = /usr/bin/vim\n"
10219
"    create_signatures = when-required"
10220
msgstr ""
10221
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10222
#: en/help_topics/configuration.txt:368
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10223
msgid ""
10224
"\n"
10225
"The branch location configuration file, locations.conf\n"
10226
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10227
msgstr ""
10228
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10229
#: en/help_topics/configuration.txt:372
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10230
msgid ""
10231
"``locations.conf`` allows one to specify overriding settings for\n"
10232
"a specific branch. The format is almost identical to the default section in\n"
10233
"bazaar.conf with one significant change: The section header, instead of "
10234
"saying\n"
10235
"default, will be the path to a branch that you wish to override a value\n"
10236
"for. The '?' and '*' wildcards are supported::"
10237
msgstr ""
10238
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10239
#: en/help_topics/configuration.txt:378
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10240
msgid ""
10241
"    [/home/jdoe/branches/nethack]\n"
10242
"    email = Nethack Admin <nethack@nethack.com>"
10243
msgstr ""
10244
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10245
#: en/help_topics/configuration.txt:381
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10246
msgid ""
10247
"    [http://hypothetical.site.com/branches/devel-branch]\n"
10248
"    create_signatures = always"
10249
msgstr ""
10250
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10251
#: en/help_topics/configuration.txt:384
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10252
msgid ""
10253
"The authentication configuration file, authentication.conf\n"
10254
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10255
msgstr ""
10256
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10257
#: en/help_topics/configuration.txt:387
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10258
msgid ""
10259
"``authentication.conf`` allows one to specify credentials for\n"
10260
"remote servers. This can be used for all the supported transports and any "
10261
"part\n"
10262
"of bzr that requires authentication (smtp for example)."
10263
msgstr ""
10264
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10265
#: en/help_topics/configuration.txt:391
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10266
msgid ""
10267
"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
10268
"option policies which don't apply."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10269
msgstr ""
10270
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10271
#: en/help_topics/configuration.txt:394
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10272
msgid ""
10273
"For more information on the possible uses of the authentication "
10274
"configuration\n"
10275
"file see :doc:`authentication-help`."
10276
msgstr ""
10277
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10278
#: en/help_topics/configuration.txt:397
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10279
msgid ""
10280
"\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
10281
"Common options\n"
10282
"--------------"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10283
msgstr ""
10284
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10285
#: en/help_topics/configuration.txt:401
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10286
msgid ""
10287
"debug_flags\n"
10288
"~~~~~~~~~~~"
10289
msgstr ""
10290
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10291
#: en/help_topics/configuration.txt:404
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10292
msgid ""
10293
"A comma-separated list of debugging options to turn on.  The same values\n"
10294
"can be used as with the -D command-line option (see `help global-options`).\n"
10295
"For example::"
10296
msgstr ""
10297
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10298
#: en/help_topics/configuration.txt:408
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10299
msgid "    debug_flags = hpss"
10300
msgstr ""
10301
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10302
#: en/help_topics/configuration.txt:412
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10303
msgid "    debug_flags = hpss,evil"
10304
msgstr ""
10305
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10306
#: en/help_topics/configuration.txt:414
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10307
msgid ""
10308
"email\n"
10309
"~~~~~"
10310
msgstr ""
10311
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10312
#: en/help_topics/configuration.txt:417
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10313
msgid ""
10314
"The email address to use when committing a branch. Typically takes the form\n"
10315
"of::"
10316
msgstr ""
10317
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10318
#: en/help_topics/configuration.txt:420
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10319
msgid "    email = Full Name <account@hostname.tld>"
10320
msgstr ""
10321
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10322
#: en/help_topics/configuration.txt:422
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10323
msgid ""
10324
"editor\n"
10325
"~~~~~~"
10326
msgstr ""
10327
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10328
#: en/help_topics/configuration.txt:425
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10329
msgid ""
10330
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10331
"a commit message. This setting is trumped by the environment variable\n"
10332
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10333
"variables."
10334
msgstr ""
10335
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10336
#: en/help_topics/configuration.txt:430
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10337
msgid ""
10338
"log_format\n"
10339
"~~~~~~~~~~"
10340
msgstr ""
10341
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10342
#: en/help_topics/configuration.txt:433
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10343
msgid ""
10344
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10345
"and ``line``. Additional formats may be provided by plugins. The default\n"
10346
"value is ``long``."
10347
msgstr ""
10348
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10349
#: en/help_topics/configuration.txt:437
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10350
msgid ""
10351
"check_signatures\n"
10352
"~~~~~~~~~~~~~~~~"
10353
msgstr ""
10354
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10355
#: en/help_topics/configuration.txt:440
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10356
msgid ""
10357
"Reserved for future use.  These options will allow a policy for branches to\n"
10358
"require signatures."
10359
msgstr ""
10360
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10361
#: en/help_topics/configuration.txt:443
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10362
msgid ""
10363
"require\n"
10364
"    The gnupg signature for revisions must be present and must be valid."
10365
msgstr ""
10366
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10367
#: en/help_topics/configuration.txt:446
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10368
msgid ""
10369
"ignore\n"
10370
"    Do not check gnupg signatures of revisions."
10371
msgstr ""
10372
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10373
#: en/help_topics/configuration.txt:449
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10374
msgid ""
10375
"check-available\n"
10376
"    (default) If gnupg signatures for revisions are present, check them.\n"
10377
"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
10378
"    no signature is present."
10379
msgstr ""
10380
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10381
#: en/help_topics/configuration.txt:454
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10382
msgid ""
10383
"create_signatures\n"
10384
"~~~~~~~~~~~~~~~~~"
10385
msgstr ""
10386
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10387
#: en/help_topics/configuration.txt:457
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10388
msgid ""
10389
"Defines the behaviour of signing revisions on commits.  By default bzr will "
10390
"not\n"
10391
"sign new commits."
10392
msgstr ""
10393
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10394
#: en/help_topics/configuration.txt:460
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10395
msgid ""
10396
"always\n"
10397
"    Sign every new revision that is committed.  If the signing fails then "
10398
"the\n"
10399
"    commit will not be made."
10400
msgstr ""
10401
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10402
#: en/help_topics/configuration.txt:464
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10403
msgid ""
10404
"when-required\n"
10405
"    Reserved for future use."
10406
msgstr ""
10407
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10408
#: en/help_topics/configuration.txt:467
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10409
msgid ""
10410
"never\n"
10411
"    Reserved for future use."
10412
msgstr ""
10413
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10414
#: en/help_topics/configuration.txt:470
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10415
msgid ""
10416
"In future it is planned that ``when-required`` will sign newly\n"
10417
"committed revisions only when the branch requires them.  ``never`` will "
10418
"refuse\n"
10419
"to sign newly committed revisions, even if the branch requires signatures."
10420
msgstr ""
10421
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10422
#: en/help_topics/configuration.txt:474
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10423
msgid ""
10424
"dirstate.fdatasync\n"
10425
"~~~~~~~~~~~~~~~~~~"
10426
msgstr ""
10427
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10428
#: en/help_topics/configuration.txt:477
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10429
msgid ""
10430
"If true (default), working tree metadata changes are flushed through the\n"
10431
"OS buffers to physical disk.  This is somewhat slower, but means data\n"
10432
"should not be lost if the machine crashes.  See also repository.fdatasync."
10433
msgstr ""
10434
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10435
#: en/help_topics/configuration.txt:481
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10436
msgid ""
10437
"gpg_signing_key\n"
10438
"~~~~~~~~~~~~~~~"
10439
msgstr ""
10440
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10441
#: en/help_topics/configuration.txt:484
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10442
msgid ""
10443
"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
10444
"address, key fingerprint or full key ID.  When unset or when set to\n"
10445
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10446
msgstr ""
10447
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10448
#: en/help_topics/configuration.txt:488
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10449
msgid ""
10450
"recurse\n"
10451
"~~~~~~~"
10452
msgstr ""
10453
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10454
#: en/help_topics/configuration.txt:491
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10455
msgid ""
10456
"Only useful in ``locations.conf``. Defines whether or not the\n"
10457
"configuration for this section applies to subdirectories:"
10458
msgstr ""
10459
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10460
#: en/help_topics/configuration.txt:494
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10461
msgid ""
10462
"true\n"
10463
"    (default) This section applies to subdirectories as well."
10464
msgstr ""
10465
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10466
#: en/help_topics/configuration.txt:497
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10467
msgid ""
10468
"false\n"
10469
"    This section only applies to the branch at this directory and not\n"
10470
"    branches below it."
10471
msgstr ""
10472
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10473
#: en/help_topics/configuration.txt:501
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10474
msgid ""
10475
"gpg_signing_command\n"
10476
"~~~~~~~~~~~~~~~~~~~"
10477
msgstr ""
10478
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10479
#: en/help_topics/configuration.txt:504
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10480
msgid ""
10481
"(Default: \"gpg\"). Which program should be used to sign and check "
10482
"revisions.\n"
10483
"For example::"
10484
msgstr ""
10485
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10486
#: en/help_topics/configuration.txt:507
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10487
msgid "    gpg_signing_command = /usr/bin/gnpg"
10488
msgstr ""
10489
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10490
#: en/help_topics/configuration.txt:509
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10491
msgid ""
10492
"The specified command must accept the options \"--clearsign\" and \"-u "
10493
"<email>\"."
10494
msgstr ""
10495
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10496
#: en/help_topics/configuration.txt:511
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10497
msgid ""
10498
"bzr_remote_path\n"
10499
"~~~~~~~~~~~~~~~"
10500
msgstr ""
10501
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10502
#: en/help_topics/configuration.txt:514
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10503
msgid ""
10504
"(Default: \"bzr\").  The path to the command that should be used to run the "
10505
"smart\n"
10506
"server for bzr.  This value may only be specified in locations.conf, because:"
10507
msgstr ""
10508
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10509
#: en/help_topics/configuration.txt:517
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10510
msgid ""
10511
"- it's needed before branch.conf is accessible\n"
10512
"- allowing remote branch.conf files to specify commands would be a security\n"
10513
"  risk"
10514
msgstr ""
10515
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10516
#: en/help_topics/configuration.txt:521
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10517
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10518
msgstr ""
10519
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10520
#: en/help_topics/configuration.txt:523
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10521
msgid ""
10522
"smtp_server\n"
10523
"~~~~~~~~~~~"
10524
msgstr ""
10525
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10526
#: en/help_topics/configuration.txt:526
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10527
msgid ""
10528
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10529
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10530
msgstr ""
10531
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10532
#: en/help_topics/configuration.txt:529
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10533
msgid ""
10534
"smtp_username, smtp_password\n"
10535
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10536
msgstr ""
10537
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10538
#: en/help_topics/configuration.txt:532
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10539
msgid ""
10540
"User and password to authenticate to the SMTP server. If smtp_username\n"
10541
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10542
"These settings are only needed if the SMTP server requires authentication\n"
10543
"to send mail."
10544
msgstr ""
10545
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10546
#: en/help_topics/configuration.txt:537
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10547
msgid ""
10548
"locks.steal_dead\n"
10549
"~~~~~~~~~~~~~~~~"
10550
msgstr ""
10551
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10552
#: en/help_topics/configuration.txt:540
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10553
msgid ""
10554
"If set to true, bzr will automatically break locks held by processes from\n"
10555
"the same machine and user that are no longer alive.  Otherwise, it will\n"
10556
"print a message and you can break the lock manually, if you are satisfied\n"
10557
"the object is no longer in use."
10558
msgstr ""
10559
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10560
#: en/help_topics/configuration.txt:545
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10561
msgid ""
10562
"mail_client\n"
10563
"~~~~~~~~~~~"
10564
msgstr ""
10565
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10566
#: en/help_topics/configuration.txt:548
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10567
msgid ""
10568
"A mail client to use for sending merge requests.\n"
10569
"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
10570
"it\n"
10571
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10572
"``editor``."
10573
msgstr ""
10574
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10575
#: en/help_topics/configuration.txt:553
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10576
msgid "Supported values for specific clients:"
10577
msgstr ""
10578
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10579
#: en/help_topics/configuration.txt:555
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10580
msgid ""
10581
":claws: Use Claws.  This skips a dialog for attaching files.\n"
10582
":evolution: Use Evolution.\n"
10583
":kmail: Use KMail.\n"
10584
":mutt: Use Mutt.\n"
10585
":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
10586
"1.5,\n"
10587
"    this works around some bugs that xdg-email doesn't handle."
10588
msgstr ""
10589
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10590
#: en/help_topics/configuration.txt:562
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10591
msgid "Supported generic values are:"
10592
msgstr ""
10593
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10594
#: en/help_topics/configuration.txt:564
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10595
msgid ""
10596
":default: See above.\n"
10597
":editor: Use your editor to compose the merge request.  This also uses\n"
10598
"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10599
"    smtp_username and smtp_password.\n"
10600
":mapi: Use your preferred e-mail client on Windows.\n"
10601
":xdg-email: Use xdg-email to run your preferred mail program"
10602
msgstr ""
10603
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10604
#: en/help_topics/configuration.txt:571
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10605
msgid ""
10606
"repository.fdatasync\n"
10607
"~~~~~~~~~~~~~~~~~~~~"
10608
msgstr ""
10609
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10610
#: en/help_topics/configuration.txt:574
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10611
msgid ""
10612
"If true (default), repository changes are flushed through the OS buffers\n"
10613
"to physical disk.  This is somewhat slower, but means data should not be\n"
10614
"lost if the machine crashes.  See also dirstate.fdatasync."
10615
msgstr ""
10616
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10617
#: en/help_topics/configuration.txt:578
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10618
msgid ""
10619
"submit_branch\n"
10620
"~~~~~~~~~~~~~"
10621
msgstr ""
10622
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10623
#: en/help_topics/configuration.txt:581
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10624
msgid ""
10625
"The branch you intend to submit your current work to.  This is "
10626
"automatically\n"
10627
"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
10628
"This\n"
10629
"should usually be set on a per-branch or per-location basis."
10630
msgstr ""
10631
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10632
#: en/help_topics/configuration.txt:585
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10633
msgid ""
10634
"public_branch\n"
10635
"~~~~~~~~~~~~~"
10636
msgstr ""
10637
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10638
#: en/help_topics/configuration.txt:588
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10639
msgid ""
10640
"A publically-accessible version of this branch (implying that this version "
10641
"is\n"
10642
"not publically-accessible).  Used (and set) by ``bzr send``."
10643
msgstr ""
10644
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10645
#: en/help_topics/configuration.txt:591
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10646
msgid ""
10647
"suppress_warnings\n"
10648
"~~~~~~~~~~~~~~~~~"
10649
msgstr ""
10650
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10651
#: en/help_topics/configuration.txt:594
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10652
msgid ""
10653
"A list of strings, each string represent a warning that can be emitted by\n"
10654
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10655
msgstr ""
10656
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10657
#: en/help_topics/configuration.txt:597
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10658
msgid "Valid values:"
10659
msgstr ""
10660
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10661
#: en/help_topics/configuration.txt:599
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10662
msgid ""
10663
"* ``format_deprecation``:\n"
10664
"    whether the format deprecation warning is shown on repositories that "
10665
"are\n"
10666
"    using deprecated formats."
10667
msgstr ""
10668
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10669
#: en/help_topics/configuration.txt:603
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10670
msgid ""
10671
"default_format\n"
10672
"~~~~~~~~~~~~~~"
10673
msgstr ""
10674
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10675
#: en/help_topics/configuration.txt:606
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10676
msgid ""
10677
"A format name for the default format used when creating branches.  See "
10678
"``bzr\n"
10679
"help formats`` for possible values."
10680
msgstr ""
10681
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10682
#: en/help_topics/configuration.txt:609
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10683
msgid ""
10684
"\n"
10685
"Unicode options\n"
10686
"---------------"
10687
msgstr ""
10688
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10689
#: en/help_topics/configuration.txt:613
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10690
msgid ""
10691
"output_encoding\n"
10692
"~~~~~~~~~~~~~~~"
10693
msgstr ""
10694
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10695
#: en/help_topics/configuration.txt:616
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10696
msgid ""
10697
"A Python unicode encoding name for text output from bzr, such as log\n"
10698
"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
10699
"is the terminal encoding prefered by the operating system."
10700
msgstr ""
10701
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10702
#: en/help_topics/configuration.txt:620
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10703
msgid ""
10704
"\n"
10705
"Branch type specific options\n"
10706
"----------------------------"
10707
msgstr ""
10708
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10709
#: en/help_topics/configuration.txt:624
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10710
msgid ""
10711
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10712
"later format.  They\n"
10713
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10714
"manually set in ``locations.conf`` or ``bazaar.conf``."
10715
msgstr ""
10716
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10717
#: en/help_topics/configuration.txt:629
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10718
msgid ""
10719
"append_revisions_only\n"
10720
"~~~~~~~~~~~~~~~~~~~~~"
10721
msgstr ""
10722
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10723
#: en/help_topics/configuration.txt:632
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10724
msgid ""
10725
"If set to \"True\" then revisions can only be appended to the log, not\n"
10726
"removed.  A branch with this setting enabled can only pull from another\n"
10727
"branch if the other branch's log is a longer version of its own.  This is\n"
10728
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10729
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10730
"compatibility with previous bzr versions (older than 2.2)."
10731
msgstr ""
10732
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10733
#: en/help_topics/configuration.txt:639
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10734
msgid ""
10735
"parent_location\n"
10736
"~~~~~~~~~~~~~~~"
10737
msgstr ""
10738
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10739
#: en/help_topics/configuration.txt:642
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10740
msgid ""
10741
"If present, the location of the default branch for pull or merge.  This "
10742
"option\n"
10743
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10744
"--remember``."
10745
msgstr ""
10746
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10747
#: en/help_topics/configuration.txt:646
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10748
msgid ""
10749
"push_location\n"
10750
"~~~~~~~~~~~~~"
10751
msgstr ""
10752
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10753
#: en/help_topics/configuration.txt:649
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10754
msgid ""
10755
"If present, the location of the default branch for push.  This option\n"
10756
"is normally set by the first ``push`` or ``push --remember``."
10757
msgstr ""
10758
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10759
#: en/help_topics/configuration.txt:652
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10760
msgid ""
10761
"push_strict\n"
10762
"~~~~~~~~~~~"
10763
msgstr ""
10764
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10765
#: en/help_topics/configuration.txt:655
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10766
msgid ""
10767
"If present, defines the ``--strict`` option default value for checking\n"
10768
"uncommitted changes before pushing."
10769
msgstr ""
10770
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10771
#: en/help_topics/configuration.txt:658
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10772
msgid ""
10773
"dpush_strict\n"
10774
"~~~~~~~~~~~~"
10775
msgstr ""
10776
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10777
#: en/help_topics/configuration.txt:661
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10778
msgid ""
10779
"If present, defines the ``--strict`` option default value for checking\n"
10780
"uncommitted changes before pushing into a different VCS without any\n"
10781
"custom bzr metadata."
10782
msgstr ""
10783
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10784
#: en/help_topics/configuration.txt:665
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10785
msgid ""
10786
"bound_location\n"
10787
"~~~~~~~~~~~~~~"
10788
msgstr ""
10789
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10790
#: en/help_topics/configuration.txt:668
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10791
msgid ""
10792
"The location that commits should go to when acting as a checkout.\n"
10793
"This option is normally set by ``bind``."
10794
msgstr ""
10795
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10796
#: en/help_topics/configuration.txt:671
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10797
msgid ""
10798
"bound\n"
10799
"~~~~~"
10800
msgstr ""
10801
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10802
#: en/help_topics/configuration.txt:674
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10803
msgid ""
10804
"If set to \"True\", the branch should act as a checkout, and push each "
10805
"commit to\n"
10806
"the bound_location.  This option is normally set by ``bind``/``unbind``."
10807
msgstr ""
10808
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10809
#: en/help_topics/configuration.txt:677
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10810
msgid ""
10811
"send_strict\n"
10812
"~~~~~~~~~~~"
10813
msgstr ""
10814
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10815
#: en/help_topics/configuration.txt:680
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10816
msgid ""
10817
"If present, defines the ``--strict`` option default value for checking\n"
10818
"uncommitted changes before sending a merge directive."
10819
msgstr ""
10820
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10821
#: en/help_topics/configuration.txt:683
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10822
msgid ""
10823
"add.maximum_file_size\n"
10824
"~~~~~~~~~~~~~~~~~~~~~"
10825
msgstr ""
10826
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10827
#: en/help_topics/configuration.txt:686
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10828
msgid ""
10829
"Defines the maximum file size the command line \"add\" operation will allow\n"
10830
"in recursive mode, with files larger than this value being skipped. You "
10831
"may \n"
10832
"specify this value as an integer (in which case it is interpreted as "
10833
"bytes), \n"
10834
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10835
"0 \n"
10836
"will disable skipping."
10837
msgstr ""
10838
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10839
#: en/help_topics/configuration.txt:692
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10840
msgid ""
10841
"External Merge Tools\n"
10842
"--------------------"
10843
msgstr ""
10844
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10845
#: en/help_topics/configuration.txt:695
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10846
msgid ""
10847
"bzr.mergetool.<name>\n"
10848
"~~~~~~~~~~~~~~~~~~~~"
10849
msgstr ""
10850
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10851
#: en/help_topics/configuration.txt:698
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10852
msgid ""
10853
"Defines an external merge tool called <name> with the given command-line.\n"
10854
"Arguments containing spaces should be quoted using single or double quotes. "
10855
"The\n"
10856
"executable may omit its path if it can be found on the PATH."
10857
msgstr ""
10858
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10859
#: en/help_topics/configuration.txt:702
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10860
msgid ""
10861
"The following markers can be used in the command-line to substitute "
10862
"filenames\n"
10863
"involved in the merge conflict::"
10864
msgstr ""
10865
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10866
#: en/help_topics/configuration.txt:705
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10867
msgid ""
10868
"  {base}      file.BASE\n"
10869
"  {this}      file.THIS\n"
10870
"  {other}     file.OTHER\n"
10871
"  {result}    output file\n"
10872
"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
10873
"merge\n"
10874
"              succeeds."
10875
msgstr ""
10876
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10877
#: en/help_topics/configuration.txt:714
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10878
msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10879
msgstr ""
10880
6535.1.1 by Vincent Ladeuil
Release 2.6b2
10881
#: en/help_topics/configuration.txt:716
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10882
msgid ""
6581.1.2 by Vincent Ladeuil
Update translation template.
10883
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10884
"interpolation markers, trying to display the mergetool line results in the\n"
10885
"following problem::"
10886
msgstr ""
10887
10888
#: en/help_topics/configuration.txt:720
10889
msgid ""
10890
"\n"
10891
"  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10892
"{result}'\n"
10893
"  $ bzr config bzr.mergetool.kdiff3\n"
10894
"  bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10895
"{this} {other} -o {result}\"."
10896
msgstr ""
10897
10898
#: en/help_topics/configuration.txt:725
10899
msgid ""
10900
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10901
msgstr ""
10902
10903
#: en/help_topics/configuration.txt:727
10904
msgid ""
10905
"  $ bzr config --all bzr.mergetool.kdiff3\n"
10906
"  branch:\n"
10907
"    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10908
msgstr ""
10909
10910
#: en/help_topics/configuration.txt:731
10911
msgid ""
10912
"\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10913
"bzr.default_mergetool\n"
10914
"~~~~~~~~~~~~~~~~~~~~~"
10915
msgstr ""
10916
6581.1.2 by Vincent Ladeuil
Update translation template.
10917
#: en/help_topics/configuration.txt:735
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10918
msgid ""
10919
"Specifies which external merge tool (as defined above) should be selected "
10920
"by\n"
10921
"default in tools such as ``bzr qconflicts``."
10922
msgstr ""
10923
6581.1.2 by Vincent Ladeuil
Update translation template.
10924
#: en/help_topics/configuration.txt:740
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10925
msgid "  bzr.default_mergetool = kdiff3\n"
10926
msgstr ""
10927
10928
#: en/help_topics/conflict-types.txt:1
10929
msgid ""
10930
"Conflict Types\n"
10931
"=============="
10932
msgstr ""
10933
10934
#: en/help_topics/conflict-types.txt:4
10935
msgid ""
10936
"Some operations, like merge, revert and pull, modify the contents of your\n"
10937
"working tree.  These modifications are programmatically generated, and so "
10938
"they\n"
10939
"may conflict with the current state of your working tree. "
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:8
10943
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10944
"When conflicts are present in your working tree (as shown by ``brz\n"
10945
"conflicts``), you should resolve them and then inform brz that the "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10946
"conflicts\n"
10947
"have been resolved."
10948
msgstr ""
10949
10950
#: en/help_topics/conflict-types.txt:12
10951
msgid ""
10952
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10953
"should resolve them is not the one responsible for their occurrence, as is "
10954
"the\n"
10955
"case when merging other people's work or because some conflicts are "
10956
"presented\n"
10957
"in a way that is not easy to understand."
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:17
10961
msgid ""
10962
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10963
"conflict if and only if there's an actual conceptual conflict in the source\n"
10964
"tree.  Because Bazaar doesn't understand the real meaning of the files "
10965
"being\n"
10966
"versioned, it can, when faced with ambiguities, fall short in either "
10967
"direction\n"
10968
"trying to resolve the conflict itself. Many kinds of changes can be "
10969
"combined\n"
10970
"programmatically, but sometimes only a human can determine the right thing "
10971
"to\n"
10972
"do."
10973
msgstr ""
10974
10975
#: en/help_topics/conflict-types.txt:25
10976
msgid ""
10977
"When Bazaar generates a conflict, it adds information into the working tree "
10978
"to\n"
10979
"present the conflicting versions, and it's up to you to find the correct\n"
10980
"resolution."
10981
msgstr ""
10982
10983
#: en/help_topics/conflict-types.txt:29
10984
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10985
msgstr ""
10986
10987
#: en/help_topics/conflict-types.txt:31
10988
msgid ""
10989
"1. Modify the working tree content so that the conflicted item is now in "
10990
"the\n"
10991
"   state you want to keep, then"
10992
msgstr ""
10993
10994
#: en/help_topics/conflict-types.txt:34
10995
msgid ""
10996
"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.
10997
"   remaining generated information (``brz resolve <item>``)."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
10998
msgstr ""
10999
11000
#: en/help_topics/conflict-types.txt:37
11001
msgid ""
11002
"For most conflict types, there are some obvious ways to modify the working\n"
11003
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11004
"itself already made a choice, when possible."
11005
msgstr ""
11006
11007
#: en/help_topics/conflict-types.txt:41
11008
msgid ""
11009
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11010
"different ways to resolve the conflict."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:44
11014
msgid ""
11015
"Each type of conflict is explained below, and the action which must be done "
11016
"to\n"
11017
"resolve the conflict is outlined."
11018
msgstr ""
11019
11020
#: en/help_topics/conflict-types.txt:47
11021
msgid ""
11022
"Various actions are available depending on the kind of conflict, for some "
11023
"of\n"
11024
"these actions, Bazaar can provide some help. In the end you should at least\n"
11025
"inform Bazaar that you're done with the conflict with::"
11026
msgstr ""
11027
11028
#: en/help_topics/conflict-types.txt:51
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11029
msgid "  ``brz resolve FILE --action=done'"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:53
11033
msgid ""
11034
"Note that this is the default action when a single file is involved so you "
11035
"can\n"
11036
"simply use::"
11037
msgstr ""
11038
11039
#: en/help_topics/conflict-types.txt:56
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11040
msgid "   ``brz resolve FILE``"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11041
msgstr ""
11042
11043
#: en/help_topics/conflict-types.txt:58
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11044
msgid "See ``brz help resolve`` for more details."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11045
msgstr ""
11046
11047
#: en/help_topics/conflict-types.txt:60
11048
msgid ""
11049
"Text conflicts\n"
11050
"--------------"
11051
msgstr ""
11052
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11053
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11054
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11055
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11056
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11057
#: 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
11058
msgid "Typical message::"
11059
msgstr ""
11060
11061
#: en/help_topics/conflict-types.txt:65
11062
msgid "  Text conflict in FILE"
11063
msgstr ""
11064
11065
#: en/help_topics/conflict-types.txt:67
11066
msgid ""
11067
"These are produced when a text merge cannot completely reconcile two sets "
11068
"of\n"
11069
"text changes.  Bazaar will emit files for each version with the extensions\n"
11070
"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
11071
"tree,\n"
11072
"i.e. the tree that you are merging changes into.  OTHER is the version that "
11073
"you\n"
11074
"are merging into the target.  BASE is an older version that is used as a "
11075
"basis\n"
11076
"for comparison."
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:74
11080
msgid ""
11081
"In the main copy of the file, Bazaar will include all the changes that it\n"
11082
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11083
"\"herringbone\" markers like ``<<<<<<<``."
11084
msgstr ""
11085
11086
#: en/help_topics/conflict-types.txt:78
11087
msgid ""
11088
"Say the initial text is \"The project leader released it.\", and THIS "
11089
"modifies it\n"
11090
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11091
"leader\n"
11092
"released Bazaar.\"  A conflict would look like this::"
11093
msgstr ""
11094
11095
#: en/help_topics/conflict-types.txt:82
11096
msgid ""
11097
"  <<<<<<< TREE\n"
11098
"  Martin Pool released it.\n"
11099
"  =======\n"
11100
"  The project leader released Bazaar.\n"
11101
"  >>>>>>> MERGE-SOURCE"
11102
msgstr ""
11103
11104
#: en/help_topics/conflict-types.txt:88
11105
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:90
11109
msgid ""
11110
"You can handle text conflicts either by editing the main copy of the file,\n"
11111
"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
11112
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11113
"set of changes over the other (but see below when you encounter these\n"
11114
"cases).  More often, the two sets of changes must be intelligently combined."
11115
msgstr ""
11116
11117
#: en/help_topics/conflict-types.txt:96
11118
msgid ""
11119
"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
11120
"you are done editing, the file should look like it never had a conflict, and "
11121
"be\n"
11122
"ready to commit."
11123
msgstr ""
11124
11125
#: en/help_topics/conflict-types.txt:100
11126
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11127
"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
11128
"Bazaar will auto-detect which conflicts you have resolved."
11129
msgstr ""
11130
11131
#: en/help_topics/conflict-types.txt:103
11132
msgid ""
11133
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11134
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11135
"working tree."
11136
msgstr ""
11137
11138
#: en/help_topics/conflict-types.txt:107
11139
msgid ""
11140
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11141
"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
11142
"resolve`` with one of the following actions:"
11143
msgstr ""
11144
11145
#: en/help_topics/conflict-types.txt:111
11146
msgid ""
11147
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11148
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11149
msgstr ""
11150
11151
#: en/help_topics/conflict-types.txt:114
11152
msgid ""
11153
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11154
"modifications will be taken into account."
11155
msgstr ""
11156
11157
#: en/help_topics/conflict-types.txt:117
11158
msgid ""
11159
"Content conflicts\n"
11160
"-----------------"
11161
msgstr ""
11162
11163
#: en/help_topics/conflict-types.txt:122
11164
msgid "  Contents conflict in FILE"
11165
msgstr ""
11166
11167
#: en/help_topics/conflict-types.txt:124
11168
msgid ""
11169
"This conflict happens when there are conflicting changes in the working "
11170
"tree\n"
11171
"and the merge source, but the conflicted items are not text files.  They "
11172
"may\n"
11173
"be binary files, or symlinks, or directories.  It can even happen with "
11174
"files\n"
11175
"that are deleted on one side, and modified on the other."
11176
msgstr ""
11177
11178
#: en/help_topics/conflict-types.txt:129
11179
msgid ""
11180
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
11181
"be\n"
11182
"regular files, symlinks or directories).  But it will not include a \"main "
11183
"copy\"\n"
11184
"of the file with herringbone conflict markers.  It will appear that the "
11185
"\"main\n"
11186
"copy\" has been renamed to THIS or OTHER."
11187
msgstr ""
11188
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11189
#: 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
11190
msgid ""
11191
"To resolve that kind of conflict, you should rebuild FILE from either "
11192
"version\n"
11193
"or a combination of both."
11194
msgstr ""
11195
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11196
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11197
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11198
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11199
#: en/help_topics/conflict-types.txt:361
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11200
msgid "``brz resolve`` recognizes the following actions:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11201
msgstr ""
11202
11203
#: en/help_topics/conflict-types.txt:139
11204
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11205
"* ``--action=take-this`` will issue ``brz mv FILE.THIS FILE``,\n"
11206
"* ``--action=take-other`` will issue ``brz mv FILE.OTHER FILE``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11207
"* ``--action=done`` will just mark the conflict as resolved."
11208
msgstr ""
11209
11210
#: en/help_topics/conflict-types.txt:143
11211
msgid ""
11212
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11213
"and\n"
11214
"``.OTHER`` files if they are still present in the working tree."
11215
msgstr ""
11216
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11217
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11218
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11219
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11220
#: en/help_topics/conflict-types.txt:369
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11221
msgid ""
11222
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11223
msgstr ""
11224
11225
#: en/help_topics/conflict-types.txt:148
11226
msgid ""
11227
"Tag conflicts\n"
11228
"-------------"
11229
msgstr ""
11230
11231
#: en/help_topics/conflict-types.txt:153
11232
msgid ""
11233
"  Conflicting tags:\n"
11234
"      version-0.1"
11235
msgstr ""
11236
11237
#: en/help_topics/conflict-types.txt:156
11238
msgid ""
11239
"When pulling from or pushing to another branch, Bazaar informs you about "
11240
"tags\n"
11241
"that conflict between the two branches; that is the same tag points to two\n"
11242
"different revisions.  You need not resolve these conflicts, but subsequent\n"
11243
"uses of pull or push will result in the same message."
11244
msgstr ""
11245
11246
#: en/help_topics/conflict-types.txt:161
11247
msgid ""
11248
"To resolve the conflict, you must apply the correct tags to either the "
11249
"target\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11250
"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
11251
"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
11252
"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.
11253
"``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
11254
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11255
"source\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11256
"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
11257
"favor of the target branch, you need to similarly use ``tag --force`` in "
11258
"the\n"
11259
"source branch.  (Note that pulling or pushing using --overwrite will "
11260
"overwrite\n"
11261
"all tags as well.)"
11262
msgstr ""
11263
11264
#: en/help_topics/conflict-types.txt:172
11265
msgid ""
11266
"Duplicate paths\n"
11267
"---------------"
11268
msgstr ""
11269
11270
#: en/help_topics/conflict-types.txt:177
11271
msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
11272
msgstr ""
11273
11274
#: en/help_topics/conflict-types.txt:179
11275
msgid ""
11276
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11277
"already been used.  The existing file will be renamed to \"FILE.moved\".  "
11278
msgstr ""
11279
11280
#: en/help_topics/conflict-types.txt:187
11281
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11282
"* ``--action=take-this`` will issue ``brz rm FILE ; brz mv FILE.moved "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11283
"FILE``,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11284
"* ``--action=take-other`` will issue ``brz rm FILE.moved``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11285
"* ``--action=done`` will just mark the conflict as resolved."
11286
msgstr ""
11287
11288
#: en/help_topics/conflict-types.txt:191
11289
msgid ""
11290
"Note that you must get rid of FILE.moved before using ``--action=done``."
11291
msgstr ""
11292
11293
#: en/help_topics/conflict-types.txt:195
11294
msgid ""
11295
"Unversioned parent\n"
11296
"------------------"
11297
msgstr ""
11298
11299
#: en/help_topics/conflict-types.txt:200
11300
msgid "    Conflict because FILE is not versioned, but has versioned children."
11301
msgstr ""
11302
11303
#: en/help_topics/conflict-types.txt:202
11304
msgid ""
11305
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11306
"not\n"
11307
"versioned.  This happens when the directory has been deleted in the target,\n"
11308
"but has a new child in the source, or vice versa.  In this situation, "
11309
"Bazaar\n"
11310
"will version the parent directory as well.  Resolving this issue depends\n"
11311
"very much on the particular scenario.  You may wish to rename or delete "
11312
"either\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11313
"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
11314
"resolve\n"
11315
"FILE\" to mark the conflict as resolved."
11316
msgstr ""
11317
11318
#: en/help_topics/conflict-types.txt:210
11319
msgid ""
11320
"Missing parent\n"
11321
"--------------"
11322
msgstr ""
11323
11324
#: en/help_topics/conflict-types.txt:215
11325
msgid "  Conflict adding files to FILE.  Created directory."
11326
msgstr ""
11327
11328
#: en/help_topics/conflict-types.txt:217
11329
msgid ""
11330
"This happens when a directory has been deleted in the target, but has new\n"
11331
"children in the source.  This is similar to the \"unversioned parent\" "
11332
"conflict,\n"
11333
"except that the parent directory does not *exist*, instead of just being\n"
11334
"unversioned.  In this situation, Bazaar will create the missing parent.\n"
11335
"Resolving this issue depends very much on the particular scenario."
11336
msgstr ""
11337
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11338
#: 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
11339
msgid ""
11340
"To resolve that kind of conflict, you should either remove or rename the\n"
11341
"children or the directory or a combination of both."
11342
msgstr ""
11343
11344
#: en/help_topics/conflict-types.txt:228
11345
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11346
"* ``--action=take-this`` will issue ``brz rm directory`` including the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11347
"  children,\n"
11348
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11349
"children\n"
11350
"  and restoring the directory,\n"
11351
"* ``--action=done`` will just mark the conflict as resolved."
11352
msgstr ""
11353
11354
#: en/help_topics/conflict-types.txt:236
11355
msgid ""
11356
"Deleting parent\n"
11357
"---------------"
11358
msgstr ""
11359
11360
#: en/help_topics/conflict-types.txt:241
11361
msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
11362
msgstr ""
11363
11364
#: en/help_topics/conflict-types.txt:243
11365
msgid ""
11366
"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
11367
"source, but has new children in the target (either because a directory\n"
11368
"deletion is merged or because the merge introduce new children).  Bazaar\n"
11369
"will retain the directory.  Resolving this issue depends very much on the\n"
11370
"particular scenario."
11371
msgstr ""
11372
11373
#: en/help_topics/conflict-types.txt:254
11374
msgid ""
11375
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11376
"directory,"
11377
msgstr ""
11378
11379
#: en/help_topics/conflict-types.txt:256
11380
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11381
"* ``--action=take-other`` will issue ``brz rm directory`` including the \n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11382
"  children,"
11383
msgstr ""
11384
11385
#: en/help_topics/conflict-types.txt:259
11386
msgid "* ``--action=done`` will just mark the conflict as resolved."
11387
msgstr ""
11388
11389
#: en/help_topics/conflict-types.txt:261
11390
msgid ""
11391
"Note that when merging a directory deletion, if unversioned files are\n"
11392
"present, they become potential orphans has they don't have a directory\n"
11393
"parent anymore."
11394
msgstr ""
11395
11396
#: en/help_topics/conflict-types.txt:265
11397
msgid ""
11398
"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.
11399
"setting the ``brz.transform.orphan_policy`` configuration option."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11400
msgstr ""
11401
11402
#: en/help_topics/conflict-types.txt:268
11403
msgid "There are two possible values for this option:"
11404
msgstr ""
11405
11406
#: en/help_topics/conflict-types.txt:270
11407
msgid ""
11408
"* ``conflict`` (the default): will leave the orphans in place and\n"
11409
"  generate a conflicts,"
11410
msgstr ""
11411
11412
#: en/help_topics/conflict-types.txt:273
11413
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11414
"* ``move``: will move the orphans to a ``brz-orphans`` directory at the "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11415
"root\n"
11416
"  of the working tree with names like ``<file>.~#~``."
11417
msgstr ""
11418
11419
#: en/help_topics/conflict-types.txt:278
11420
msgid ""
11421
"Path conflict\n"
11422
"-------------"
11423
msgstr ""
11424
11425
#: en/help_topics/conflict-types.txt:283
11426
msgid "  Path conflict: PATH1 / PATH2"
11427
msgstr ""
11428
11429
#: en/help_topics/conflict-types.txt:285
11430
msgid ""
11431
"This happens when the source and target have each modified the name or "
11432
"parent\n"
11433
"directory of a file.  Bazaar will use the path elements from the source."
11434
msgstr ""
11435
11436
#: en/help_topics/conflict-types.txt:288
11437
msgid ""
11438
"To resolve that kind of conflict, you just have to decide what name should "
11439
"be\n"
11440
"retained for the file involved."
11441
msgstr ""
11442
11443
#: en/help_topics/conflict-types.txt:293
11444
msgid ""
11445
"* ``--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.
11446
"  issuing ``brz mv PATH2 PATH1``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11447
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11448
"``PATH2``,\n"
11449
"* ``--action=done`` will just mark the conflict as resolved."
11450
msgstr ""
11451
11452
#: en/help_topics/conflict-types.txt:300
11453
msgid ""
11454
"Parent loop\n"
11455
"-----------"
11456
msgstr ""
11457
11458
#: en/help_topics/conflict-types.txt:305
11459
msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
11460
msgstr ""
11461
11462
#: en/help_topics/conflict-types.txt:307
11463
msgid ""
11464
"This happens when the source and the target have each moved directories, so\n"
11465
"that, if the change could be applied, a directory would be contained by "
11466
"itself.\n"
11467
"For example::"
11468
msgstr ""
11469
11470
#: en/help_topics/conflict-types.txt:311
11471
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11472
"  $ brz init\n"
11473
"  $ brz mkdir white\n"
11474
"  $ brz mkdir black\n"
11475
"  $ brz commit -m \"BASE\"\n"
11476
"  $ brz branch . ../other\n"
11477
"  $ brz mv white black\n"
11478
"  $ brz commit -m \"THIS\"\n"
11479
"  $ brz mv ../other/black ../other/white\n"
11480
"  $ brz commit ../other -m \"OTHER\"\n"
11481
"  $ brz merge ../other"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11482
msgstr ""
11483
11484
#: en/help_topics/conflict-types.txt:322
11485
msgid ""
11486
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11487
"``black``.  To resolve that kind of conflict, you just have to decide what\n"
11488
"name should be retained for the directories involved."
11489
msgstr ""
11490
11491
#: en/help_topics/conflict-types.txt:328
11492
msgid ""
11493
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11494
"``white`` \n"
11495
"  in ``black``,\n"
11496
"* ``--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.
11497
"   ``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
11498
"* ``--action=done`` will just mark the conflict as resolved."
11499
msgstr ""
11500
11501
#: en/help_topics/conflict-types.txt:336
11502
msgid ""
11503
"Non-directory parent\n"
11504
"--------------------"
11505
msgstr ""
11506
11507
#: en/help_topics/conflict-types.txt:341
11508
msgid ""
11509
"  Conflict: foo.new is not a directory, but has files in it.\n"
11510
"  Created directory."
11511
msgstr ""
11512
11513
#: en/help_topics/conflict-types.txt:344
11514
msgid ""
11515
"This happens when one side has added files to a directory, and the other "
11516
"side\n"
11517
"has changed the directory into a file or symlink.  For example::"
11518
msgstr ""
11519
11520
#: en/help_topics/conflict-types.txt:347
11521
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11522
"  $ brz init\n"
11523
"  $ brz mkdir foo\n"
11524
"  $ brz commit -m \"BASE\"\n"
11525
"  $ brz branch . ../other\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11526
"  $ rmdir foo\n"
11527
"  $ touch foo\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11528
"  $ brz commit -m \"THIS\"\n"
11529
"  $ brz mkdir ../other/foo/bar\n"
11530
"  $ brz commit ../other -m \"OTHER\"\n"
11531
"  $ brz merge ../other"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11532
msgstr ""
11533
11534
#: en/help_topics/conflict-types.txt:358
11535
msgid ""
11536
"To resolve that kind of conflict, you have to decide what name should be\n"
11537
"retained for the file, directory or symlink involved."
11538
msgstr ""
11539
11540
#: en/help_topics/conflict-types.txt:363
11541
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11542
"* ``--action=take-this`` will issue ``brz rm --force foo.new`` and \n"
11543
"  ``brz add foo``,\n"
11544
"* ``--action=take-other`` will issue ``brz rm --force foo`` and \n"
11545
"  ``brz mv foo.new foo``,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11546
"* ``--action=done`` will just mark the conflict as resolved."
11547
msgstr ""
11548
11549
#: en/help_topics/conflict-types.txt:371
11550
msgid ""
11551
"MalformedTransform\n"
11552
"------------------"
11553
msgstr ""
11554
11555
#: en/help_topics/conflict-types.txt:374
11556
msgid ""
11557
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11558
"exception.  This means that Bazaar encountered a filesystem conflict that it "
11559
"was\n"
11560
"unable to resolve.  This usually indicates a bug.  Please let us know if "
11561
"you\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11562
"encounter this.  Our bug tracker is at https://launchpad.net/brz/+bugs\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11563
msgstr ""
11564
11565
#: en/help_topics/content-filters.txt:1
11566
msgid ""
11567
"Content Filters\n"
11568
"==============="
11569
msgstr ""
11570
11571
#: en/help_topics/content-filters.txt:4
11572
msgid ""
11573
"Content formats\n"
11574
"---------------"
11575
msgstr ""
11576
11577
#: en/help_topics/content-filters.txt:7
11578
msgid ""
11579
"Bazaar's content filtering allows you to store files in a different\n"
11580
"format from the copy in your working tree.  This lets you, or your\n"
11581
"co-developers, use Windows development tools that expect CRLF files\n"
11582
"on projects that use other line-ending conventions. Among other things,\n"
11583
"content filters also let Unix developers more easily work on projects\n"
11584
"using Windows line-ending conventions, keyword expansion/compression,\n"
11585
"and trailing spaces on lines in text files to be implicitly stripped\n"
11586
"when committed."
11587
msgstr ""
11588
11589
#: en/help_topics/content-filters.txt:16
11590
msgid "To generalize, there are two content formats supported by Bazaar:"
11591
msgstr ""
11592
11593
#: en/help_topics/content-filters.txt:18
11594
msgid ""
11595
"* a canonical format - how files are stored internally\n"
11596
"* a convenience format - how files are created in a working tree."
11597
msgstr ""
11598
11599
#: en/help_topics/content-filters.txt:21
11600
msgid ""
11601
"\n"
11602
"Format conversion\n"
11603
"-----------------"
11604
msgstr ""
11605
11606
#: en/help_topics/content-filters.txt:25
11607
msgid ""
11608
"The conversion between these formats is done by content filters.\n"
11609
"A content filter has two parts:"
11610
msgstr ""
11611
11612
#: en/help_topics/content-filters.txt:28
11613
msgid ""
11614
"* a read converter - converts from convenience to canonical format\n"
11615
"* a write converter - converts from canonical to convenience format."
11616
msgstr ""
11617
11618
#: en/help_topics/content-filters.txt:31
11619
msgid ""
11620
"Many of these converters will provide *round-trip* conversion,\n"
11621
"i.e. applying the read converter followed by the write converter\n"
11622
"gives back the original content. However, others may provide an\n"
11623
"asymmetric conversion. For example, a read converter might strip\n"
11624
"trailing whitespace off lines in source code while the matching\n"
11625
"write converter might pass content through unchanged."
11626
msgstr ""
11627
11628
#: en/help_topics/content-filters.txt:38
11629
msgid ""
11630
"\n"
11631
"Enabling content filters\n"
11632
"------------------------"
11633
msgstr ""
11634
11635
#: en/help_topics/content-filters.txt:42
11636
msgid ""
11637
"Content filters are typically provided by plugins, so the first step\n"
11638
"in using them is to install the relevant plugins and read their\n"
11639
"documentation. Some plugins may be very specific about which files\n"
11640
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11641
"In other cases, the plugin may leave it in the user's hands to\n"
11642
"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.
11643
"using rule-based preferences. See ``brz help rules`` for general\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11644
"information about defining these."
11645
msgstr ""
11646
11647
#: en/help_topics/content-filters.txt:51
11648
msgid ""
11649
"\n"
11650
"Impact on commands\n"
11651
"------------------"
11652
msgstr ""
11653
11654
#: en/help_topics/content-filters.txt:55
11655
msgid ""
11656
"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.
11657
"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
11658
"will apply read converters to files in the working tree, then compare\n"
11659
"the results to the content last committed."
11660
msgstr ""
11661
11662
#: en/help_topics/content-filters.txt:60
11663
msgid ""
11664
"Write converters are only applied by commands that **create files in a\n"
11665
"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.
11666
"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
11667
"respectively."
11668
msgstr ""
11669
11670
#: en/help_topics/content-filters.txt:65
11671
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11672
"Note: ``brz commit`` does not implicitly apply write converters after\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11673
"comitting files. If this makes sense for a given plugin providing\n"
11674
"a content filter, the plugin can usually achieve this effect by using a\n"
11675
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11676
"for more information on hooks."
11677
msgstr ""
11678
11679
#: en/help_topics/content-filters.txt:71
11680
msgid ""
11681
"\n"
11682
"Refreshing your working tree\n"
11683
"----------------------------"
11684
msgstr ""
11685
11686
#: en/help_topics/content-filters.txt:75
11687
msgid ""
11688
"For performance reasons, Bazaar caches the timestamps of files in\n"
11689
"a working tree, and assumes files are unchanged if their timestamps\n"
11690
"match the cached values. As a consequence, there are times when\n"
11691
"you may need to explicitly ask for content filtering to be reapplied\n"
11692
"in one or both directions, e.g. after installing or reconfiguring\n"
11693
"plugins providing it."
11694
msgstr ""
11695
11696
#: en/help_topics/content-filters.txt:82
11697
msgid "Here are some general guidelines for doing this:"
11698
msgstr ""
11699
11700
#: en/help_topics/content-filters.txt:84
11701
msgid ""
11702
" * To reapply read converters, ``touch`` files, i.e. update their\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11703
"   timestamp. Operations like ``brz status`` should then reapply the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11704
"   relevant read converters and compare the end result with the\n"
11705
"   canonical format."
11706
msgstr ""
11707
11708
#: en/help_topics/content-filters.txt:89
11709
msgid ""
11710
" * To reapply write converters, ensure there are no local changes,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11711
"   delete the relevant files and run ``brz revert`` on those files."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11712
msgstr ""
11713
11714
#: en/help_topics/content-filters.txt:92
11715
msgid ""
11716
"Note: In the future, it is likely that additional options will be added\n"
11717
"to commands to make this refreshing process faster and safer.\n"
11718
msgstr ""
11719
11720
#: en/help_topics/current-formats.txt:1
11721
msgid "Current Storage Formats"
11722
msgstr ""
11723
11724
#: en/help_topics/current-formats.txt:3
11725
msgid ""
11726
":2a:\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
11727
"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11728
"    compress storage. Provides rich roots which are a one-way\n"
11729
"    transition."
11730
msgstr ""
11731
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11732
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11733
msgid ""
11734
"\n"
11735
"See :doc:`formats-help` for more about storage formats."
11736
msgstr ""
11737
11738
#: en/help_topics/debug-flags.txt:1
11739
msgid ""
11740
"Debug Flags\n"
11741
"==========="
11742
msgstr ""
11743
11744
#: en/help_topics/debug-flags.txt:4
11745
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11746
"These flags can be passed on the brz command line or (without the ``-D``\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11747
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11748
msgstr ""
11749
11750
#: en/help_topics/debug-flags.txt:7
11751
msgid ""
11752
"-Dauth            Trace authentication sections used.\n"
11753
"-Dbytes           Print out how many bytes were transferred\n"
11754
"-Ddirstate        Trace dirstate activity (verbose!)\n"
11755
"-Derror           Instead of normal error handling, always print a "
11756
"traceback\n"
11757
"                  on error.\n"
11758
"-Devil            Capture call sites that do expensive or badly-scaling\n"
11759
"                  operations.\n"
11760
"-Dfetch           Trace history copying between repositories.\n"
11761
"-Dfilters         Emit information for debugging content filtering.\n"
11762
"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
11763
"fetch.\n"
11764
"-Dgraph           Trace graph traversal.\n"
11765
"-Dhashcache       Log every time a working file is read to determine its "
11766
"hash.\n"
11767
"-Dhooks           Trace hook execution.\n"
11768
"-Dhpss            Trace smart protocol requests and responses.\n"
11769
"-Dhpssdetail      More hpss details.\n"
11770
"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
11771
"-Dhttp            Trace http connections, requests and responses.\n"
11772
"-Dindex           Trace major index operations.\n"
11773
"-Dknit            Trace knit operations.\n"
11774
"-Dlock            Trace when lockdir locks are taken or released.\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
11775
"-Dnoretry         If a connection is reset, fail immediately rather than\n"
11776
"                  retrying the request.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11777
"-Dprogress        Trace progress bar operations.\n"
11778
"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
11779
"-Dmerge           Emit information for debugging merges.\n"
11780
"-Dno_apport       Don't use apport to report crashes.\n"
11781
"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
11782
"-Dpack            Emit information about pack operations.\n"
11783
"-Drelock          Emit a message every time a branch or repository object "
11784
"is\n"
11785
"                  unlocked then relocked the same way.\n"
11786
"-Dsftp            Trace SFTP internals.\n"
11787
"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
11788
"expected\n"
11789
"-Dstream          Trace fetch streams.\n"
11790
"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
11791
"portable\n"
11792
"                  manner.\n"
11793
"-Dunlock          Some errors during unlock are treated as warnings.\n"
11794
"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
11795
"-DIDS_always      Always use InterDifferingSerializer to fetch if "
11796
"appropriate\n"
11797
"                  for the format, even for non-local fetches.\n"
11798
msgstr ""
11799
11800
#: en/help_topics/diverged-branches.txt:1
11801
msgid ""
11802
"Diverged Branches\n"
11803
"================="
11804
msgstr ""
11805
11806
#: en/help_topics/diverged-branches.txt:4
11807
msgid ""
11808
"When Bazaar tries to push one branch onto another, it requires that the\n"
11809
"destination branch must be ready to receive the source branch.  If this "
11810
"isn't\n"
11811
"the case, then we say that the branches have ``diverged``.  Branches are\n"
11812
"considered diverged if the destination branch's most recent commit is one "
11813
"that\n"
11814
"has not been merged (directly or indirectly) by the source branch.  To "
11815
"recover\n"
11816
"from diverged branches, one must merge the missing revisions into the "
11817
"source\n"
11818
"branch."
11819
msgstr ""
11820
11821
#: en/help_topics/diverged-branches.txt:12
11822
msgid ""
11823
"This situation commonly arises when using a centralized workflow with local\n"
11824
"commits.  If someone else has committed new work to the mainline since your\n"
11825
"last pull and you have local commits that have not yet been pushed to the\n"
11826
"mainline, then your local branch and the mainline have diverged."
11827
msgstr ""
11828
11829
#: en/help_topics/diverged-branches.txt:17
11830
msgid ""
11831
"Discovering What Has Diverged\n"
11832
"-----------------------------"
11833
msgstr ""
11834
11835
#: en/help_topics/diverged-branches.txt:20
11836
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11837
"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
11838
"another\n"
11839
"branch that are not present in the current branch, and vice-versa.  It shows "
11840
"a\n"
11841
"summary of  which extra revisions exist in each branch.  If you want to see "
11842
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11843
"precise effects of those revisions, you can use ``brz diff --"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11844
"old=other_branch``\n"
11845
"to show the differences between other_branch and your current branch."
11846
msgstr ""
11847
11848
#: en/help_topics/diverged-branches.txt:26
11849
msgid ""
11850
"A Solution\n"
11851
"----------"
11852
msgstr ""
11853
11854
#: en/help_topics/diverged-branches.txt:29
11855
msgid ""
11856
"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.
11857
"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
11858
"mainline.  This merge may result in conflicts if the other developer's "
11859
"changes\n"
11860
"overlap with your changes.  These conflicts should be resolved before\n"
11861
"continuing. After any conflicts have been resolved, or even if there were "
11862
"no\n"
11863
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11864
"to your local branch.  This requirement gives you an opportunity to test "
11865
"the\n"
11866
"resulting working tree for correctness, since the merged revisions could "
11867
"have\n"
11868
"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.
11869
"``brz commit``.  This clears up the diverged branches situation.  Your "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11870
"local\n"
11871
"branch can now be pushed to the mainline.\n"
11872
msgstr ""
11873
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11874
#: en/help_topics/env-variables.txt:1
11875
msgid "Environment Variables"
11876
msgstr ""
11877
11878
#: en/help_topics/env-variables.txt:3
6581.1.2 by Vincent Ladeuil
Update translation template.
11879
msgid "See bzr help configuration for more details."
11880
msgstr ""
11881
11882
#: en/help_topics/env-variables.txt:5
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11883
msgid ""
11884
"=================== "
11885
"===========================================================\n"
11886
"BZRPATH             Path where bzr is to look for shell plugin external\n"
11887
"                    commands.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11888
"BRZ_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11889
"EMAIL               E-Mail address of the user.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11890
"BRZ_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11891
"EDITOR              Editor for editing commit messages.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11892
"BRZ_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
11893
"BRZ_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11894
"BRZ_PLUGINS_AT      Plugins to load from a directory not in "
11895
"BRZ_PLUGIN_PATH.\n"
11896
"BRZ_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
11897
"BRZ_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11898
"and\n"
11899
"                    HOME.\n"
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
11900
"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11901
"URLs).\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11902
"BRZ_SSH             Path to SSH client, or one of paramiko, openssh, "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11903
"sshcorp,\n"
11904
"                    plink or lsh.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11905
"BRZ_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
11906
"BRZ_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
11907
"BRZ_COLUMNS         Override implicit terminal width.\n"
11908
"BRZ_CONCURRENCY     Number of processes that can be run concurrently "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11909
"(selftest)\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11910
"BRZ_PROGRESS_BAR    Override the progress display. Values are 'none' or "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11911
"'text'.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11912
"BRZ_PDB             Control whether to launch a debugger on error.\n"
11913
"BRZ_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11914
"                    breakin debugger.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11915
"BRZ_TEXTUI_INPUT    Force console input mode for prompts to line-based "
6535.1.1 by Vincent Ladeuil
Release 2.6b2
11916
"(instead\n"
11917
"                    of char-based).\n"
11918
"=================== "
11919
"===========================================================\n"
11920
msgstr ""
11921
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11922
#: en/help_topics/eol.txt:1
11923
msgid ""
11924
"End of Line Conversion\n"
11925
"======================"
11926
msgstr ""
11927
11928
#: en/help_topics/eol.txt:4
11929
msgid ""
11930
"EOL conversion is provided as a content filter where Bazaar internally\n"
11931
"stores a canonical format but outputs a convenience format. See\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11932
"``brz help content-filters`` for general information about using these."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11933
msgstr ""
11934
11935
#: en/help_topics/eol.txt:8
11936
msgid ""
11937
"Note: Content filtering is only supported in recently added formats,\n"
11938
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11939
"in a recent format. (Just setting the format on the repository\n"
11940
"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.
11941
"'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
11942
"or later."
11943
msgstr ""
11944
11945
#: en/help_topics/eol.txt:15
11946
msgid ""
11947
"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.
11948
"rules. See ``brz help rules`` for general information on defining rules.\n"
11949
"Currently, rules are only supported in $brz_HOME/.bazaar/rules (or\n"
11950
"%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
11951
"supported in a future verison of Bazaar."
11952
msgstr ""
11953
11954
#: en/help_topics/eol.txt:21
11955
msgid ""
11956
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11957
"(If a value is not set, ``exact`` is the default.)"
11958
msgstr ""
11959
11960
#: en/help_topics/eol.txt:24
11961
msgid ""
11962
" ========== ===================================== ======================\n"
11963
" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
11964
" ========== ===================================== ======================\n"
11965
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11966
" ---------- ------------------------------------- ----------------------\n"
11967
" ``lf``     ``lf``                                ``lf``\n"
11968
" ---------- ------------------------------------- ----------------------\n"
11969
" ``crlf``   ``crlf``                              ``lf``\n"
11970
" ---------- ------------------------------------- ----------------------\n"
11971
" ``exact``  No conversion                         Exactly as in file\n"
11972
" ========== ===================================== ======================"
11973
msgstr ""
11974
11975
#: en/help_topics/eol.txt:36
11976
msgid ""
11977
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11978
"byte is detected in the file."
11979
msgstr ""
11980
11981
#: en/help_topics/eol.txt:39
11982
msgid ""
11983
"For users working on a cross-platform project, here is a suggested rule\n"
11984
"to use as a starting point::"
11985
msgstr ""
11986
6437.2.2 by Vincent Ladeuil
Release 2.5b5
11987
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11988
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
11989
msgid ""
11990
"  [name *]\n"
11991
"  eol = native"
11992
msgstr ""
11993
11994
#: en/help_topics/eol.txt:45
11995
msgid ""
11996
"If you have binary files that do not contain a null byte though, be\n"
11997
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11998
"by giving more explicit patterns earlier in the rules file. For example::"
11999
msgstr ""
12000
12001
#: en/help_topics/eol.txt:49
12002
msgid ""
12003
"  [name *.png]\n"
12004
"  eol = exact"
12005
msgstr ""
12006
12007
#: en/help_topics/eol.txt:55
12008
msgid ""
12009
"If your working tree is on a network drive shared by users on different\n"
12010
"operating systems, you typically want to force certain conventions for\n"
12011
"certain files. In that way, if a file is created with the wrong line\n"
12012
"endings or line endings get mixed during editing, it gets committed\n"
12013
"correctly and gets checked out correctly. For example::"
12014
msgstr ""
12015
12016
#: en/help_topics/eol.txt:61
12017
msgid ""
12018
"  [name *.bat]\n"
12019
"  eol = crlf"
12020
msgstr ""
12021
12022
#: en/help_topics/eol.txt:64
12023
msgid ""
12024
"  [name *.sh]\n"
12025
"  eol = lf"
12026
msgstr ""
12027
12028
#: en/help_topics/eol.txt:70
12029
msgid ""
12030
"If you take the care to create files with their required endings, you can\n"
12031
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12032
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12033
"introducing mixed line endings will be corrected during commit for files\n"
12034
"with those settings."
12035
msgstr ""
12036
12037
#: en/help_topics/eol.txt:76
12038
msgid ""
12039
"If you have sample test data that deliberately has text files with mixed\n"
12040
"newline conventions, you can ask for those to be left alone like this::"
12041
msgstr ""
12042
12043
#: en/help_topics/eol.txt:79
12044
msgid ""
12045
"  [name test_data/]\n"
12046
"  eol = exact"
12047
msgstr ""
12048
12049
#: en/help_topics/eol.txt:85
12050
msgid ""
12051
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12052
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12053
"of content analysis to detect binary files for commands like ``diff``.\n"
12054
"In the future, a ``binary = true`` rule may be added but it is not\n"
12055
"supported yet.)"
12056
msgstr ""
12057
12058
#: en/help_topics/eol.txt:91
12059
msgid ""
12060
"If you have an existing repository with text files already stored using\n"
12061
"Windows newline conventions (``crlf``), then you may want to keep using "
12062
"that\n"
12063
"convention in the repository. Forcing certain files to this convention\n"
12064
"may also help users who do not have rules configured. To do this, set\n"
12065
"``eol`` to one of the values below."
12066
msgstr ""
12067
12068
#: en/help_topics/eol.txt:97
12069
msgid ""
12070
" ============================ ======================== "
12071
"======================\n"
12072
" Value                        Checkout end-of-lines as Commit end-of-lines "
12073
"as\n"
12074
" ============================ ======================== "
12075
"======================\n"
12076
" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
12077
"                              ``lf`` otherwise\n"
12078
" ---------------------------- ------------------------ "
12079
"----------------------\n"
12080
" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
12081
" ---------------------------- ------------------------ "
12082
"----------------------\n"
12083
" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
12084
" ============================ ======================== ======================"
12085
msgstr ""
12086
12087
#: en/help_topics/eol.txt:108
12088
msgid ""
12089
"For users working on an existing project that uses Windows newline\n"
12090
"conventions in their Bazaar repository, this rule is suggested as a\n"
12091
"starting point::"
12092
msgstr ""
12093
12094
#: en/help_topics/eol.txt:112
12095
msgid ""
12096
"  [name *]\n"
12097
"  eol = native-with-crlf-in-repo"
12098
msgstr ""
12099
12100
#: en/help_topics/eol.txt:115
12101
msgid ""
12102
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12103
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12104
"``crlf`` and ``exact``."
12105
msgstr ""
12106
12107
#: en/help_topics/eol.txt:119
12108
msgid ""
12109
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12110
"never reject files because a given line ending or mixed line endings\n"
12111
"are found. A precommit hook should be used if you wish to validate\n"
12112
"(and not just convert) content before committing.\n"
12113
msgstr ""
12114
12115
#: en/help_topics/hidden-commands.txt:1
12116
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12117
"added                List files added in working tree.\n"
12118
"ancestry             List all revisions merged into this branch.\n"
12119
"assert-fail          Test reporting of assertion failures\n"
12120
"bundle-info          Output interesting stats about a bundle\n"
12121
"bundle-revisions     Create a merge-directive for submitting changes.\n"
12122
"cat-revision         Write out metadata for a revision.\n"
12123
"dump-btree           Dump the contents of a btree index file to stdout.\n"
12124
"export-pot           Export command helps and error messages in po format.\n"
12125
"file-id              Print file_id of a particular file or directory.\n"
12126
"file-path            Print path of file_ids to a file or directory.\n"
12127
"find-merge-base      Find and print a base revision for merging two "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12128
"branches.\n"
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12129
"hooks                Show hooks.\n"
12130
"inventory            Show inventory of the current working copy or a "
12131
"revision.\n"
12132
"local-time-offset    Show the offset in seconds from GMT to local time.\n"
12133
"lookup-revision      Lookup the revision-id from a revision-number\n"
12134
"merge-directive      Generate a merge directive for auto-merge tools.\n"
12135
"modified             List files modified in working tree.\n"
12136
"re-sign              Create a digital signature for an existing revision.\n"
12137
"reference            list, view and set branch locations for nested trees.\n"
12138
"relpath              Show path of a file relative to root\n"
12139
"repair-workingtree   Reset the working tree state file.\n"
12140
"revision-history     Display the list of revision ids on a branch.\n"
12141
"revision-info        Show revision number and revision id for a given "
12142
"revision\n"
12143
"                     identifier.\n"
12144
"rocks                Statement of optimism.\n"
12145
"selftest             Run internal test suite.\n"
12146
"shell-complete       Show appropriate completions for context.\n"
12147
"test-script          Run a shell-like test from a file.\n"
12148
"touching-revisions   Return revision-ids which affected a particular file.\n"
12149
"unknowns             List unknown files.\n"
12150
"wait-until-signalled Test helper for\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12151
"                     test_start_and_stop_brz_subprocess_send_signal.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:1
12155
msgid ""
12156
"\n"
12157
"Hooks\n"
12158
"====="
12159
msgstr ""
12160
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12161
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12162
msgid ""
12163
"Introduction\n"
12164
"------------"
12165
msgstr ""
12166
12167
#: en/help_topics/hooks.txt:8
12168
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12169
msgstr ""
12170
12171
#: en/help_topics/hooks.txt:10
12172
msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
12173
msgstr ""
12174
12175
#: en/help_topics/hooks.txt:12
12176
msgid ""
12177
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12178
msgstr ""
12179
12180
#: en/help_topics/hooks.txt:14
12181
msgid ""
12182
"The class that contains each hook is given before the hooks it supplies. "
12183
"For\n"
12184
"instance, BranchHooks as the class is the hooks class for\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12185
"`breezy.branch.Branch.hooks`."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12186
msgstr ""
12187
12188
#: en/help_topics/hooks.txt:18
12189
msgid ""
12190
"Each description also indicates whether the hook runs on the client (the\n"
12191
"machine where bzr was invoked) or the server (the machine addressed by\n"
12192
"the branch URL).  These may be, but are not necessarily, the same machine."
12193
msgstr ""
12194
12195
#: en/help_topics/hooks.txt:22
12196
msgid ""
12197
"Plugins (including hooks) are run on the server if all of these is true:"
12198
msgstr ""
12199
12200
#: en/help_topics/hooks.txt:24
12201
msgid ""
12202
"  * The connection is via a smart server (accessed with a URL starting with\n"
12203
"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12204
"\"http://\"\n"
12205
"    URL when a smart server is available via HTTP)."
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:28
12209
msgid ""
12210
"  * The hook is either server specific or part of general infrastructure "
12211
"rather\n"
12212
"    than client specific code (such as commit)."
12213
msgstr ""
12214
12215
#: en/help_topics/hooks.txt:31
12216
msgid ""
12217
"\n"
12218
"BranchHooks\n"
12219
"-----------"
12220
msgstr ""
12221
12222
#: en/help_topics/hooks.txt:35
12223
msgid ""
12224
"automatic_tag_name\n"
12225
"~~~~~~~~~~~~~~~~~~"
12226
msgstr ""
12227
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12228
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
6504.1.1 by Vincent Ladeuil
Update translation template
12229
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12230
msgid "Introduced in: 2.2"
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:40
12234
msgid ""
12235
"Called to determine an automatic tag name for a revision.\n"
12236
"automatic_tag_name is called with (branch, revision_id) and should\n"
12237
"return a tag name or None if no tag name could be determined. The\n"
12238
"first non-None tag name returned will be used."
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:45
12242
msgid ""
12243
"open\n"
12244
"~~~~"
12245
msgstr ""
12246
6504.1.1 by Vincent Ladeuil
Update translation template
12247
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12248
#: en/help_topics/hooks.txt:307
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12249
msgid "Introduced in: 1.8"
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:50
12253
msgid ""
12254
"Called with the Branch object that has been opened after a branch is\n"
12255
"opened."
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:53
12259
msgid ""
12260
"post_branch_init\n"
12261
"~~~~~~~~~~~~~~~~"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:58
12265
msgid ""
12266
"Called after new branch initialization completes. post_branch_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12267
"called with a breezy.branch.BranchInitHookParams. Note that init,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12268
"branch and checkout (both heavyweight and lightweight) will all\n"
12269
"trigger this hook."
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:63
12273
msgid ""
12274
"post_change_branch_tip\n"
12275
"~~~~~~~~~~~~~~~~~~~~~~"
12276
msgstr ""
12277
6504.1.1 by Vincent Ladeuil
Update translation template
12278
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12279
msgid "Introduced in: 1.4"
12280
msgstr ""
12281
12282
#: en/help_topics/hooks.txt:68
12283
msgid ""
12284
"Called in bzr client and server after a change to the tip of a branch\n"
12285
"is made. post_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12286
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12287
"uncommit will all trigger this hook."
12288
msgstr ""
12289
6504.1.1 by Vincent Ladeuil
Update translation template
12290
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12291
msgid ""
12292
"post_commit\n"
12293
"~~~~~~~~~~~"
12294
msgstr ""
12295
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12296
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12297
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12298
msgid "Introduced in: 0.15"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:78
12302
msgid ""
12303
"Called in the bzr client after a commit has completed. post_commit is\n"
12304
"called with (local, master, old_revno, old_revid, new_revno,\n"
12305
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12306
"branch."
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:83
12310
msgid ""
12311
"post_pull\n"
12312
"~~~~~~~~~"
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:88
12316
msgid ""
12317
"Called after a pull operation completes. post_pull is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12318
"breezy.branch.PullResult object and only runs in the bzr client."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:91
12322
msgid ""
12323
"post_push\n"
12324
"~~~~~~~~~"
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:96
12328
msgid ""
12329
"Called after a push operation completes. post_push is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12330
"breezy.branch.BranchPushResult object and only runs in the bzr client."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:99
12334
msgid ""
12335
"post_switch\n"
12336
"~~~~~~~~~~~"
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:104
12340
msgid ""
12341
"Called after a checkout switches branch. post_switch is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12342
"breezy.branch.SwitchHookParams."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:107
12346
msgid ""
12347
"post_uncommit\n"
12348
"~~~~~~~~~~~~~"
12349
msgstr ""
12350
12351
#: en/help_topics/hooks.txt:112
12352
msgid ""
12353
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12354
"called with (local, master, old_revno, old_revid, new_revno,\n"
12355
"new_revid) where local is the local branch or None, master is the\n"
12356
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12357
"of None."
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:118
12361
msgid ""
12362
"pre_change_branch_tip\n"
12363
"~~~~~~~~~~~~~~~~~~~~~"
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:121
12367
msgid "Introduced in: 1.6"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:123
12371
msgid ""
12372
"Called in bzr client and server before a change to the tip of a branch\n"
12373
"is made. pre_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12374
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12375
"uncommit will all trigger this hook."
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:128
12379
msgid ""
12380
"pre_commit\n"
12381
"~~~~~~~~~~"
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:131
12385
msgid "Introduced in: 0.91"
12386
msgstr ""
12387
12388
#: en/help_topics/hooks.txt:133
12389
msgid ""
12390
"Called after a commit is calculated but before it is completed.\n"
12391
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12392
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12393
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12394
"TreeDelta object describing changes from the basis revision. hooks\n"
12395
"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
12396
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12397
"tree."
12398
msgstr ""
12399
12400
#: en/help_topics/hooks.txt:142
12401
msgid ""
12402
"transform_fallback_location\n"
12403
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12404
msgstr ""
12405
6504.1.1 by Vincent Ladeuil
Update translation template
12406
#: en/help_topics/hooks.txt:145
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12407
msgid "Introduced in: 1.9"
12408
msgstr ""
12409
6504.1.1 by Vincent Ladeuil
Update translation template
12410
#: en/help_topics/hooks.txt:147
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12411
msgid ""
12412
"Called when a stacked branch is activating its fallback locations.\n"
12413
"transform_fallback_location is called with (branch, url), and should\n"
12414
"return a new url. Returning the same url allows it to be used as-is,\n"
12415
"returning a different one can be used to cause the branch to stack on\n"
12416
"a closer copy of that fallback_location. Note that the branch cannot\n"
12417
"have history accessing methods called on it during this hook because\n"
12418
"the fallback locations have not been activated. When there are\n"
12419
"multiple hooks installed for transform_fallback_location, all are\n"
12420
"called with the url returned from the previous hook.The order is\n"
12421
"however undefined."
12422
msgstr ""
12423
6504.1.1 by Vincent Ladeuil
Update translation template
12424
#: en/help_topics/hooks.txt:158
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12425
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12426
"CommandHooks\n"
12427
"------------"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12428
msgstr ""
12429
6504.1.1 by Vincent Ladeuil
Update translation template
12430
#: en/help_topics/hooks.txt:161
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12431
msgid ""
12432
"extend_command\n"
12433
"~~~~~~~~~~~~~~"
12434
msgstr ""
12435
6504.1.1 by Vincent Ladeuil
Update translation template
12436
#: en/help_topics/hooks.txt:164
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12437
msgid "Introduced in: 1.13"
12438
msgstr ""
12439
6504.1.1 by Vincent Ladeuil
Update translation template
12440
#: en/help_topics/hooks.txt:166
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12441
msgid ""
12442
"Called after creating a command object to allow modifications such as\n"
12443
"adding or removing options, docs etc. Called with the new\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12444
"breezy.commands.Command object."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12445
msgstr ""
12446
6504.1.1 by Vincent Ladeuil
Update translation template
12447
#: en/help_topics/hooks.txt:170
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12448
msgid ""
12449
"get_command\n"
12450
"~~~~~~~~~~~"
12451
msgstr ""
12452
6504.1.1 by Vincent Ladeuil
Update translation template
12453
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12454
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12455
msgid "Introduced in: 1.17"
12456
msgstr ""
12457
6504.1.1 by Vincent Ladeuil
Update translation template
12458
#: en/help_topics/hooks.txt:175
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12459
msgid ""
12460
"Called when creating a single command. Called with (cmd_or_None,\n"
12461
"command_name). get_command should either return the cmd_or_None\n"
12462
"parameter, or a replacement Command object that should be used for the\n"
12463
"command. Note that the Command.hooks hooks are core infrastructure.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12464
"Many users will prefer to use breezy.commands.register_command or\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12465
"plugin_cmds.register_lazy."
12466
msgstr ""
12467
6504.1.1 by Vincent Ladeuil
Update translation template
12468
#: en/help_topics/hooks.txt:182
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12469
msgid ""
12470
"get_missing_command\n"
12471
"~~~~~~~~~~~~~~~~~~~"
12472
msgstr ""
12473
6504.1.1 by Vincent Ladeuil
Update translation template
12474
#: en/help_topics/hooks.txt:187
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12475
msgid ""
12476
"Called when creating a single command if no command could be found.\n"
12477
"Called with (command_name). get_missing_command should either return\n"
12478
"None, or a Command object to be used for the command."
12479
msgstr ""
12480
6504.1.1 by Vincent Ladeuil
Update translation template
12481
#: en/help_topics/hooks.txt:191
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12482
msgid ""
12483
"list_commands\n"
12484
"~~~~~~~~~~~~~"
12485
msgstr ""
12486
6504.1.1 by Vincent Ladeuil
Update translation template
12487
#: en/help_topics/hooks.txt:196
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12488
msgid ""
12489
"Called when enumerating commands. Called with a set of cmd_name\n"
12490
"strings for all the commands found so far. This set  is safe to mutate\n"
12491
"- e.g. to remove a command. list_commands should return the updated\n"
12492
"set of command names."
12493
msgstr ""
12494
6504.1.1 by Vincent Ladeuil
Update translation template
12495
#: en/help_topics/hooks.txt:201
12496
msgid ""
12497
"post_command\n"
12498
"~~~~~~~~~~~~"
12499
msgstr ""
12500
12501
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12502
msgid "Introduced in: 2.6"
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:206
12506
msgid "Called after executing a command. Called with the command object."
12507
msgstr ""
12508
12509
#: en/help_topics/hooks.txt:208
12510
msgid ""
12511
"pre_command\n"
12512
"~~~~~~~~~~~"
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:213
12516
msgid "Called prior to executing a command. Called with the command object."
12517
msgstr ""
12518
12519
#: en/help_topics/hooks.txt:215
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12520
msgid ""
12521
"_ConfigHooks\n"
12522
"------------"
12523
msgstr ""
12524
6504.1.1 by Vincent Ladeuil
Update translation template
12525
#: en/help_topics/hooks.txt:218
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12526
msgid ""
12527
"get\n"
12528
"~~~"
12529
msgstr ""
12530
6504.1.1 by Vincent Ladeuil
Update translation template
12531
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12532
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12533
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12534
#: en/help_topics/hooks.txt:446
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12535
msgid "Introduced in: 2.4"
12536
msgstr ""
12537
6504.1.1 by Vincent Ladeuil
Update translation template
12538
#: en/help_topics/hooks.txt:223
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12539
msgid ""
12540
"Invoked when a config option is read. The signature is (stack, name,\n"
12541
"value)."
12542
msgstr ""
12543
6504.1.1 by Vincent Ladeuil
Update translation template
12544
#: en/help_topics/hooks.txt:226
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12545
msgid ""
12546
"load\n"
12547
"~~~~"
12548
msgstr ""
12549
6504.1.1 by Vincent Ladeuil
Update translation template
12550
#: en/help_topics/hooks.txt:231
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12551
msgid "Invoked when a config store is loaded. The signature is (store)."
12552
msgstr ""
12553
6504.1.1 by Vincent Ladeuil
Update translation template
12554
#: en/help_topics/hooks.txt:233
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12555
msgid ""
12556
"remove\n"
12557
"~~~~~~"
12558
msgstr ""
12559
6504.1.1 by Vincent Ladeuil
Update translation template
12560
#: en/help_topics/hooks.txt:238
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12561
msgid ""
12562
"Invoked when a config option is removed. The signature is (stack,\n"
12563
"name)."
12564
msgstr ""
12565
6504.1.1 by Vincent Ladeuil
Update translation template
12566
#: en/help_topics/hooks.txt:241
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12567
msgid ""
12568
"save\n"
12569
"~~~~"
12570
msgstr ""
12571
6504.1.1 by Vincent Ladeuil
Update translation template
12572
#: en/help_topics/hooks.txt:246
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12573
msgid "Invoked when a config store is saved. The signature is (store)."
12574
msgstr ""
12575
6504.1.1 by Vincent Ladeuil
Update translation template
12576
#: en/help_topics/hooks.txt:248
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12577
msgid ""
12578
"set\n"
12579
"~~~"
12580
msgstr ""
12581
6504.1.1 by Vincent Ladeuil
Update translation template
12582
#: en/help_topics/hooks.txt:253
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12583
msgid ""
12584
"Invoked when a config option is set. The signature is (stack, name,\n"
12585
"value)."
12586
msgstr ""
12587
6504.1.1 by Vincent Ladeuil
Update translation template
12588
#: en/help_topics/hooks.txt:256
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12589
msgid ""
12590
"ControlDirHooks\n"
12591
"---------------"
12592
msgstr ""
12593
6504.1.1 by Vincent Ladeuil
Update translation template
12594
#: en/help_topics/hooks.txt:259
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12595
msgid ""
12596
"post_repo_init\n"
12597
"~~~~~~~~~~~~~~"
12598
msgstr ""
12599
6504.1.1 by Vincent Ladeuil
Update translation template
12600
#: en/help_topics/hooks.txt:264
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12601
msgid ""
12602
"Invoked after a repository has been initialized. post_repo_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12603
"called with a breezy.controldir.RepoInitHookParams."
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12604
msgstr ""
12605
6504.1.1 by Vincent Ladeuil
Update translation template
12606
#: en/help_topics/hooks.txt:267
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12607
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12608
"pre_open\n"
12609
"~~~~~~~~"
12610
msgstr ""
12611
6504.1.1 by Vincent Ladeuil
Update translation template
12612
#: en/help_topics/hooks.txt:270
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12613
msgid "Introduced in: 1.14"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12614
msgstr ""
12615
6504.1.1 by Vincent Ladeuil
Update translation template
12616
#: en/help_topics/hooks.txt:272
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12617
msgid ""
6252.1.1 by Vincent Ladeuil
Release 2.5b3
12618
"Invoked before attempting to open a ControlDir with the transport that\n"
12619
"the open will use."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12620
msgstr ""
12621
6504.1.1 by Vincent Ladeuil
Update translation template
12622
#: en/help_topics/hooks.txt:275
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12623
msgid ""
12624
"InfoHooks\n"
12625
"---------"
12626
msgstr ""
12627
6504.1.1 by Vincent Ladeuil
Update translation template
12628
#: en/help_topics/hooks.txt:278
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12629
msgid ""
12630
"repository\n"
12631
"~~~~~~~~~~"
12632
msgstr ""
12633
6504.1.1 by Vincent Ladeuil
Update translation template
12634
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12635
#: en/help_topics/hooks.txt:524
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12636
msgid "Introduced in: 1.15"
12637
msgstr ""
12638
6504.1.1 by Vincent Ladeuil
Update translation template
12639
#: en/help_topics/hooks.txt:283
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12640
msgid ""
12641
"Invoked when displaying the statistics for a repository. repository is\n"
12642
"called with a statistics dictionary as returned by the repository and\n"
12643
"a file-like object to write to."
12644
msgstr ""
12645
6504.1.1 by Vincent Ladeuil
Update translation template
12646
#: en/help_topics/hooks.txt:287
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12647
msgid ""
12648
"LockHooks\n"
12649
"---------"
12650
msgstr ""
12651
6504.1.1 by Vincent Ladeuil
Update translation template
12652
#: en/help_topics/hooks.txt:290
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12653
msgid ""
12654
"lock_acquired\n"
12655
"~~~~~~~~~~~~~"
12656
msgstr ""
12657
6504.1.1 by Vincent Ladeuil
Update translation template
12658
#: en/help_topics/hooks.txt:295
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12659
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
12660
msgstr ""
12661
6504.1.1 by Vincent Ladeuil
Update translation template
12662
#: en/help_topics/hooks.txt:297
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12663
msgid ""
12664
"lock_broken\n"
12665
"~~~~~~~~~~~"
12666
msgstr ""
12667
6504.1.1 by Vincent Ladeuil
Update translation template
12668
#: en/help_topics/hooks.txt:302
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12669
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
12670
msgstr ""
12671
6504.1.1 by Vincent Ladeuil
Update translation template
12672
#: en/help_topics/hooks.txt:304
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12673
msgid ""
12674
"lock_released\n"
12675
"~~~~~~~~~~~~~"
12676
msgstr ""
12677
6504.1.1 by Vincent Ladeuil
Update translation template
12678
#: en/help_topics/hooks.txt:309
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12679
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
12680
msgstr ""
12681
6504.1.1 by Vincent Ladeuil
Update translation template
12682
#: en/help_topics/hooks.txt:311
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12683
msgid ""
12684
"MergeHooks\n"
12685
"----------"
12686
msgstr ""
12687
6504.1.1 by Vincent Ladeuil
Update translation template
12688
#: en/help_topics/hooks.txt:314
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12689
msgid ""
12690
"merge_file_content\n"
12691
"~~~~~~~~~~~~~~~~~~"
12692
msgstr ""
12693
6504.1.1 by Vincent Ladeuil
Update translation template
12694
#: en/help_topics/hooks.txt:317
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12695
msgid "Introduced in: 2.1"
12696
msgstr ""
12697
6504.1.1 by Vincent Ladeuil
Update translation template
12698
#: en/help_topics/hooks.txt:319
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12699
msgid ""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12700
"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
12701
"object when starting a merge. Should return either None or a subclass\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12702
"of ``breezy.merge.AbstractPerFileMerger``. Such objects will then be\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12703
"called per file that needs to be merged (including when one side has\n"
12704
"deleted the file and the other has changed it). See the\n"
12705
"AbstractPerFileMerger API docs for details on how it is used by merge."
12706
msgstr ""
12707
6504.1.1 by Vincent Ladeuil
Update translation template
12708
#: en/help_topics/hooks.txt:326
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12709
msgid ""
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12710
"post_merge\n"
12711
"~~~~~~~~~~"
12712
msgstr ""
12713
6504.1.1 by Vincent Ladeuil
Update translation template
12714
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12715
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12716
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12717
msgid "Introduced in: 2.5"
12718
msgstr ""
12719
6504.1.1 by Vincent Ladeuil
Update translation template
12720
#: en/help_topics/hooks.txt:331
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12721
msgid ""
12722
"Called after a merge. Receives a Merger object as the single argument.\n"
12723
"The return value is ignored."
12724
msgstr ""
12725
6504.1.1 by Vincent Ladeuil
Update translation template
12726
#: en/help_topics/hooks.txt:334
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12727
msgid ""
12728
"pre_merge\n"
12729
"~~~~~~~~~"
12730
msgstr ""
12731
6504.1.1 by Vincent Ladeuil
Update translation template
12732
#: en/help_topics/hooks.txt:339
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12733
msgid ""
12734
"Called before a merge. Receives a Merger object as the single\n"
12735
"argument."
12736
msgstr ""
12737
6504.1.1 by Vincent Ladeuil
Update translation template
12738
#: en/help_topics/hooks.txt:342
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12739
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12740
"MergeDirectiveHooks\n"
12741
"-------------------"
12742
msgstr ""
12743
6504.1.1 by Vincent Ladeuil
Update translation template
12744
#: en/help_topics/hooks.txt:345
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12745
msgid ""
12746
"merge_request_body\n"
12747
"~~~~~~~~~~~~~~~~~~"
12748
msgstr ""
12749
6504.1.1 by Vincent Ladeuil
Update translation template
12750
#: en/help_topics/hooks.txt:348
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12751
msgid "Introduced in: 1.15.0"
12752
msgstr ""
12753
6504.1.1 by Vincent Ladeuil
Update translation template
12754
#: en/help_topics/hooks.txt:350
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12755
msgid ""
12756
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12757
"request.  Callbacks must return a body.  If more than one callback is\n"
12758
"registered, the output of one callback is provided to the next."
12759
msgstr ""
12760
6504.1.1 by Vincent Ladeuil
Update translation template
12761
#: en/help_topics/hooks.txt:354
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12762
msgid ""
12763
"MessageEditorHooks\n"
12764
"------------------"
12765
msgstr ""
12766
6504.1.1 by Vincent Ladeuil
Update translation template
12767
#: en/help_topics/hooks.txt:357
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12768
msgid ""
12769
"commit_message_template\n"
12770
"~~~~~~~~~~~~~~~~~~~~~~~"
12771
msgstr ""
12772
6504.1.1 by Vincent Ladeuil
Update translation template
12773
#: en/help_topics/hooks.txt:360
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12774
msgid "Introduced in: 1.10"
12775
msgstr ""
12776
6504.1.1 by Vincent Ladeuil
Update translation template
12777
#: en/help_topics/hooks.txt:362
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12778
msgid ""
12779
"Called when a commit message is being generated.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12780
"commit_message_template is called with the breezy.commit.Commit object\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12781
"and the message that is known so far. commit_message_template must\n"
12782
"return a new message to use (which could be the same as it was given).\n"
12783
"When there are multiple hooks registered for commit_message_template,\n"
12784
"they are chained with the result from the first passed into the\n"
12785
"second, and so on."
12786
msgstr ""
12787
6504.1.1 by Vincent Ladeuil
Update translation template
12788
#: en/help_topics/hooks.txt:370
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12789
msgid ""
12790
"set_commit_message\n"
12791
"~~~~~~~~~~~~~~~~~~"
12792
msgstr ""
12793
6504.1.1 by Vincent Ladeuil
Update translation template
12794
#: en/help_topics/hooks.txt:375
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12795
msgid ""
12796
"Set a fixed commit message. set_commit_message is called with the\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12797
"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
12798
"properties by editing commit.builder._revprops) and the message so\n"
12799
"far. set_commit_message must return the message to use or None if it\n"
12800
"should use the message editor as normal."
12801
msgstr ""
12802
6504.1.1 by Vincent Ladeuil
Update translation template
12803
#: en/help_topics/hooks.txt:381
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12804
msgid ""
12805
"MutableTreeHooks\n"
12806
"----------------"
12807
msgstr ""
12808
6504.1.1 by Vincent Ladeuil
Update translation template
12809
#: en/help_topics/hooks.txt:384
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12810
msgid ""
12811
"post_build_tree\n"
12812
"~~~~~~~~~~~~~~~"
12813
msgstr ""
12814
6504.1.1 by Vincent Ladeuil
Update translation template
12815
#: en/help_topics/hooks.txt:389
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12816
msgid ""
12817
"Called after a completely new tree is built. The hook is called with\n"
12818
"the tree as its only argument."
12819
msgstr ""
12820
6504.1.1 by Vincent Ladeuil
Update translation template
12821
#: en/help_topics/hooks.txt:395
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12822
msgid "Introduced in: 2.0"
12823
msgstr ""
12824
6504.1.1 by Vincent Ladeuil
Update translation template
12825
#: en/help_topics/hooks.txt:397
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12826
msgid ""
12827
"Called after a commit is performed on a tree. The hook is called with\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12828
"a breezy.mutabletree.PostCommitHookParams object. The mutable tree the\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12829
"commit was performed on is available via the mutable_tree attribute of\n"
12830
"that object."
12831
msgstr ""
12832
6504.1.1 by Vincent Ladeuil
Update translation template
12833
#: en/help_topics/hooks.txt:402
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12834
msgid ""
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
12835
"post_transform\n"
12836
"~~~~~~~~~~~~~~"
12837
msgstr ""
12838
6504.1.1 by Vincent Ladeuil
Update translation template
12839
#: en/help_topics/hooks.txt:407
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
12840
msgid ""
12841
"Called after a tree transform has been performed on a tree. The hook\n"
12842
"is called with the tree that is being transformed and the transform."
12843
msgstr ""
12844
6504.1.1 by Vincent Ladeuil
Update translation template
12845
#: en/help_topics/hooks.txt:410
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
12846
msgid ""
12847
"pre_transform\n"
12848
"~~~~~~~~~~~~~"
12849
msgstr ""
12850
6504.1.1 by Vincent Ladeuil
Update translation template
12851
#: en/help_topics/hooks.txt:415
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
12852
msgid ""
12853
"Called before a tree transform on this tree. The hook is called with\n"
12854
"the tree that is being transformed and the transform."
12855
msgstr ""
12856
6504.1.1 by Vincent Ladeuil
Update translation template
12857
#: en/help_topics/hooks.txt:418
6437.28.1 by Vincent Ladeuil
Release bzr-2.5b6
12858
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12859
"start_commit\n"
12860
"~~~~~~~~~~~~"
12861
msgstr ""
12862
6504.1.1 by Vincent Ladeuil
Update translation template
12863
#: en/help_topics/hooks.txt:423
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12864
msgid ""
12865
"Called before a commit is performed on a tree. The start commit hook\n"
12866
"is able to change the tree before the commit takes place. start_commit\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12867
"is called with the breezy.mutabletree.MutableTree that the commit is\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12868
"being performed on."
12869
msgstr ""
12870
6504.1.1 by Vincent Ladeuil
Update translation template
12871
#: en/help_topics/hooks.txt:428
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12872
msgid ""
12873
"SmartClientHooks\n"
12874
"----------------"
12875
msgstr ""
12876
6504.1.1 by Vincent Ladeuil
Update translation template
12877
#: en/help_topics/hooks.txt:431
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12878
msgid ""
12879
"call\n"
12880
"~~~~"
12881
msgstr ""
12882
6504.1.1 by Vincent Ladeuil
Update translation template
12883
#: en/help_topics/hooks.txt:434
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12884
msgid "Introduced in: unknown"
12885
msgstr ""
12886
6504.1.1 by Vincent Ladeuil
Update translation template
12887
#: en/help_topics/hooks.txt:436
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12888
msgid ""
12889
"Called when the smart client is submitting a request to the smart\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12890
"server. Called with a breezy.smart.client.CallHookParams object.\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12891
"Streaming request bodies, and responses, are not accessible."
12892
msgstr ""
12893
6504.1.1 by Vincent Ladeuil
Update translation template
12894
#: en/help_topics/hooks.txt:440
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12895
msgid ""
12896
"SmartServerHooks\n"
12897
"----------------"
12898
msgstr ""
12899
6504.1.1 by Vincent Ladeuil
Update translation template
12900
#: en/help_topics/hooks.txt:443
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12901
msgid ""
12902
"server_exception\n"
12903
"~~~~~~~~~~~~~~~~"
12904
msgstr ""
12905
6504.1.1 by Vincent Ladeuil
Update translation template
12906
#: en/help_topics/hooks.txt:448
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12907
msgid ""
12908
"Called by the bzr server when an exception occurs. server_exception is\n"
12909
"called with the sys.exc_info() tuple return true for the hook if the\n"
12910
"exception has been handled, in which case the server will exit\n"
12911
"normally."
12912
msgstr ""
12913
6504.1.1 by Vincent Ladeuil
Update translation template
12914
#: en/help_topics/hooks.txt:453
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12915
msgid ""
12916
"server_started\n"
12917
"~~~~~~~~~~~~~~"
12918
msgstr ""
12919
6504.1.1 by Vincent Ladeuil
Update translation template
12920
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12921
msgid "Introduced in: 0.16"
12922
msgstr ""
12923
6504.1.1 by Vincent Ladeuil
Update translation template
12924
#: en/help_topics/hooks.txt:458
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12925
msgid ""
12926
"Called by the bzr server when it starts serving a directory.\n"
12927
"server_started is called with (backing urls, public url), where\n"
12928
"backing_url is a list of URLs giving the server-specific directory\n"
12929
"locations, and public_url is the public URL for the directory being\n"
12930
"served."
12931
msgstr ""
12932
6504.1.1 by Vincent Ladeuil
Update translation template
12933
#: en/help_topics/hooks.txt:464
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12934
msgid ""
12935
"server_started_ex\n"
12936
"~~~~~~~~~~~~~~~~~"
12937
msgstr ""
12938
6504.1.1 by Vincent Ladeuil
Update translation template
12939
#: en/help_topics/hooks.txt:469
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12940
msgid ""
12941
"Called by the bzr server when it starts serving a directory.\n"
12942
"server_started is called with (backing_urls, server_obj)."
12943
msgstr ""
12944
6504.1.1 by Vincent Ladeuil
Update translation template
12945
#: en/help_topics/hooks.txt:472
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12946
msgid ""
12947
"server_stopped\n"
12948
"~~~~~~~~~~~~~~"
12949
msgstr ""
12950
6504.1.1 by Vincent Ladeuil
Update translation template
12951
#: en/help_topics/hooks.txt:477
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12952
msgid ""
12953
"Called by the bzr server when it stops serving a directory.\n"
12954
"server_stopped is called with the same parameters as the\n"
12955
"server_started hook: (backing_urls, public_url)."
12956
msgstr ""
12957
6504.1.1 by Vincent Ladeuil
Update translation template
12958
#: en/help_topics/hooks.txt:481
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12959
msgid ""
12960
"StatusHooks\n"
12961
"-----------"
12962
msgstr ""
12963
6504.1.1 by Vincent Ladeuil
Update translation template
12964
#: en/help_topics/hooks.txt:484
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12965
msgid ""
12966
"post_status\n"
12967
"~~~~~~~~~~~"
12968
msgstr ""
12969
6504.1.1 by Vincent Ladeuil
Update translation template
12970
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12971
msgid "Introduced in: 2.3"
12972
msgstr ""
12973
6504.1.1 by Vincent Ladeuil
Update translation template
12974
#: en/help_topics/hooks.txt:489
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12975
msgid ""
12976
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12977
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12978
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12979
"correspond to the command line options specified by the user for the\n"
12980
"status command. to_file is the output stream for writing."
12981
msgstr ""
12982
6504.1.1 by Vincent Ladeuil
Update translation template
12983
#: en/help_topics/hooks.txt:495
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12984
msgid ""
12985
"pre_status\n"
12986
"~~~~~~~~~~"
12987
msgstr ""
12988
6504.1.1 by Vincent Ladeuil
Update translation template
12989
#: en/help_topics/hooks.txt:500
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
12990
msgid ""
12991
"Called with argument StatusHookParams before Bazaar displays the\n"
12992
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12993
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12994
"correspond to the command line options specified by the user for the\n"
12995
"status command. to_file is the output stream for writing."
12996
msgstr ""
12997
6504.1.1 by Vincent Ladeuil
Update translation template
12998
#: en/help_topics/hooks.txt:506
6437.2.2 by Vincent Ladeuil
Release 2.5b5
12999
msgid ""
13000
"TransportHooks\n"
13001
"--------------"
13002
msgstr ""
13003
6504.1.1 by Vincent Ladeuil
Update translation template
13004
#: en/help_topics/hooks.txt:509
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13005
msgid ""
13006
"post_connect\n"
13007
"~~~~~~~~~~~~"
13008
msgstr ""
13009
6504.1.1 by Vincent Ladeuil
Update translation template
13010
#: en/help_topics/hooks.txt:514
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13011
msgid ""
13012
"Called after a new connection is established or a reconnect occurs.\n"
13013
"The sole argument passed is either the connected transport or smart\n"
13014
"medium instance."
13015
msgstr ""
13016
6504.1.1 by Vincent Ladeuil
Update translation template
13017
#: en/help_topics/hooks.txt:518
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13018
msgid ""
13019
"RioVersionInfoBuilderHooks\n"
13020
"--------------------------"
13021
msgstr ""
13022
6504.1.1 by Vincent Ladeuil
Update translation template
13023
#: en/help_topics/hooks.txt:521
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13024
msgid ""
13025
"revision\n"
13026
"~~~~~~~~"
13027
msgstr ""
13028
6504.1.1 by Vincent Ladeuil
Update translation template
13029
#: en/help_topics/hooks.txt:526
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13030
msgid ""
13031
"Invoked when adding information about a revision to the RIO stanza\n"
13032
"that is printed. revision is called with a revision object and a RIO\n"
13033
"stanza.\n"
13034
msgstr ""
13035
13036
#: en/help_topics/location-alias.txt:1
13037
msgid ""
13038
"Location aliases\n"
13039
"================"
13040
msgstr ""
13041
13042
#: en/help_topics/location-alias.txt:4
13043
msgid ""
13044
"Bazaar defines several aliases for locations associated with a branch.  "
13045
"These\n"
13046
"can be used with most commands that expect a location, such as `bzr push`."
13047
msgstr ""
13048
13049
#: en/help_topics/location-alias.txt:7
13050
msgid "The aliases are::"
13051
msgstr ""
13052
13053
#: en/help_topics/location-alias.txt:9
13054
msgid ""
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13055
"  :bound     The branch this branch is bound to, for bound branches.\n"
13056
"  :parent    The parent of this branch.\n"
13057
"  :public    The public location of this branch.\n"
13058
"  :push      The saved location used for `bzr push` with no arguments.\n"
13059
"  :submit    The submit branch for this branch.\n"
13060
"  :this      This branch."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13061
msgstr ""
13062
13063
#: en/help_topics/location-alias.txt:16
13064
msgid "For example, to push to the parent location::"
13065
msgstr ""
13066
13067
#: en/help_topics/location-alias.txt:18
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13068
msgid "    bzr push :parent\n"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13069
msgstr ""
13070
13071
#: en/help_topics/log-formats.txt:1
13072
msgid ""
13073
"Log Formats\n"
13074
"==========="
13075
msgstr ""
13076
13077
#: en/help_topics/log-formats.txt:4
13078
msgid ""
13079
"A log format controls how information about each revision is displayed.\n"
13080
"The standard log formats are compared below::"
13081
msgstr ""
13082
13083
#: en/help_topics/log-formats.txt:7
13084
msgid ""
13085
"  Feature                 long           short         line\n"
13086
"  ----------------------  -------------  ------------  -------------------\n"
13087
"  design goal             detailed view  concise view  1 revision per line\n"
13088
"  committer               name+email     name only     name only\n"
13089
"  author                  name+email     -             -\n"
13090
"  date-time format        full           date only     date only\n"
13091
"  commit message          full           full          top line\n"
13092
"  tags                    yes            yes           yes\n"
13093
"  merges indicator        -              yes           -\n"
13094
"  status/delta            optional       optional      -\n"
13095
"  diff/patch              optional       optional      -\n"
13096
"  revision-id             optional       optional      -\n"
13097
"  branch nick             yes            -             -\n"
13098
"  foreign vcs properties  yes            yes           -\n"
13099
"  preferred levels        all            1             1\n"
13100
"  digital signature       optional       -             -"
13101
msgstr ""
13102
13103
#: en/help_topics/log-formats.txt:24
13104
msgid ""
13105
"The default format is ``long``. To change this, define the ``log_format``\n"
13106
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13107
msgstr ""
13108
13109
#: en/help_topics/log-formats.txt:27
13110
msgid ""
13111
"  [DEFAULT]\n"
13112
"  log_format = short"
13113
msgstr ""
13114
13115
#: en/help_topics/log-formats.txt:30
13116
msgid ""
13117
"Alternatively, to change the log format used for a given query, use the\n"
13118
"--long, --short or --line options."
13119
msgstr ""
13120
13121
#: en/help_topics/log-formats.txt:33
13122
msgid ""
13123
"If one of the standard log formats does not meet your needs, additional\n"
13124
"formats can be provided by plugins.\n"
13125
msgstr ""
13126
13127
#: en/help_topics/other-formats.txt:1
13128
msgid "Other Storage Formats"
13129
msgstr ""
13130
13131
#: en/help_topics/other-formats.txt:3
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13132
msgid "Experimental formats are shown below."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13133
msgstr ""
13134
13135
#: en/help_topics/other-formats.txt:5
13136
msgid ""
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13137
":development-colo:\n"
13138
"    (native) The 2a format with experimental support for colocated\n"
13139
"    branches."
13140
msgstr ""
13141
13142
#: en/help_topics/other-formats.txt:9
13143
msgid ""
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13144
"\n"
6349.1.1 by Vincent Ladeuil
Release 2.5b4
13145
"Deprecated formats are shown below."
13146
msgstr ""
13147
13148
#: en/help_topics/other-formats.txt:12
13149
msgid ""
13150
":pack-0.92:\n"
13151
"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13152
"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
13153
"    by bzr < 0.92."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13154
msgstr ""
13155
13156
#: en/help_topics/patterns.txt:1
13157
msgid ""
13158
"Patterns\n"
13159
"========"
13160
msgstr ""
13161
13162
#: en/help_topics/patterns.txt:4
13163
msgid ""
13164
"Bazaar uses patterns to match files at various times. For example,\n"
13165
"the ``add`` command skips over files that match ignore patterns\n"
13166
"and preferences can be associated with files using rule patterns.\n"
13167
"The pattern syntax is described below."
13168
msgstr ""
13169
13170
#: en/help_topics/patterns.txt:9
13171
msgid ""
13172
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13173
"slash or is a regular expression, it is compared to the whole path\n"
13174
"from the branch root. Otherwise, it is compared to only the last\n"
13175
"component of the path. To match a file only in the root directory,\n"
13176
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13177
msgstr ""
13178
13179
#: en/help_topics/patterns.txt:15
13180
msgid "Patterns may include globbing wildcards such as::"
13181
msgstr ""
13182
13183
#: en/help_topics/patterns.txt:17
13184
msgid ""
13185
"  ? - Matches any single character except '/'\n"
13186
"  * - Matches 0 or more characters except '/'\n"
13187
"  /**/ - Matches 0 or more directories in a path\n"
13188
"  [a-z] - Matches a single character from within a group of characters"
13189
msgstr ""
13190
13191
#: en/help_topics/patterns.txt:22
13192
msgid ""
13193
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13194
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13195
"expression.  Regular expression patterns may not include named or\n"
13196
"numbered groups."
13197
msgstr ""
13198
13199
#: en/help_topics/patterns.txt:27
13200
msgid ""
13201
"Case insensitive ignore patterns can be specified with regular expressions\n"
13202
"by using the ``i`` (for ignore case) flag in the pattern."
13203
msgstr ""
13204
13205
#: en/help_topics/patterns.txt:30
13206
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
13207
msgstr ""
13208
13209
#: en/help_topics/patterns.txt:32
13210
msgid "  RE:(?i)foo"
13211
msgstr ""
13212
13213
#: en/help_topics/patterns.txt:34
13214
msgid ""
13215
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13216
"matched by that pattern will not be ignored."
13217
msgstr ""
13218
13219
#: en/help_topics/patterns.txt:37
13220
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
13221
msgstr ""
13222
13223
#: en/help_topics/revisionspec.txt:1
13224
msgid "Revision Identifiers"
13225
msgstr ""
13226
13227
#: en/help_topics/revisionspec.txt:3
13228
msgid ""
13229
"A revision identifier refers to a specific state of a branch's history.  It\n"
13230
"can be expressed in several ways.  It can begin with a keyword to\n"
13231
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13232
"'before:yesterday' and 'submit:'."
13233
msgstr ""
13234
13235
#: en/help_topics/revisionspec.txt:8
13236
msgid ""
13237
"Alternately, it can be given without a keyword, in which case it will be\n"
13238
"checked as a revision number, a tag, a revision id, a date specification, or "
13239
"a\n"
13240
"branch specification, in that order.  For example, 'date:today' could be\n"
13241
"written as simply 'today', though if you have a tag called 'today' that "
13242
"will\n"
13243
"be found first."
13244
msgstr ""
13245
13246
#: en/help_topics/revisionspec.txt:14
13247
msgid ""
13248
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13249
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13250
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13251
"or\n"
13252
"spaces around the '..')."
13253
msgstr ""
13254
13255
#: en/help_topics/revisionspec.txt:19
13256
msgid ""
13257
"Ranges are interpreted differently by different commands. To the \"log\" "
13258
"command,\n"
13259
"a range is a sequence of log messages, but to the \"diff\" command, the "
13260
"range\n"
13261
"denotes a change between revisions (and not a sequence of changes).  In\n"
13262
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13263
"consider it\n"
13264
"to be open-ended, that is, they include one end but not the other.  For "
13265
"example:\n"
13266
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13267
"3649,\n"
13268
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13269
"and\n"
13270
"3649, but not 3647."
13271
msgstr ""
13272
13273
#: en/help_topics/revisionspec.txt:28
13274
msgid "The keywords used as revision selection methods are the following:"
13275
msgstr ""
13276
13277
#: en/help_topics/revisionspec.txt:30
13278
msgid ""
13279
":revid:\n"
13280
"\tSelects a revision using the revision id.\n"
13281
":submit:\n"
13282
"\tSelects a common ancestor with the submit branch.\n"
13283
":ancestor:\n"
13284
"\tSelects a common ancestor with a second branch.\n"
13285
":date:\n"
13286
"\tSelects a revision on the basis of a datestamp.\n"
13287
":branch:\n"
13288
"\tSelects the last revision of a specified branch.\n"
13289
":tag:\n"
13290
"\tSelects a revision identified by a tag name.\n"
13291
":revno:\n"
13292
"\tSelects a revision using a number.\n"
13293
":before:\n"
13294
"\tSelects the parent of the revision specified.\n"
13295
":annotate:\n"
13296
"\tSelect the revision that last modified the specified line.\n"
13297
":mainline:\n"
13298
"\tSelect mainline revision that merged the specified revision.\n"
13299
":last:\n"
13300
"\tSelects the nth revision from the end."
13301
msgstr ""
13302
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13303
#: en/help_topics/revisionspec.txt:53
13304
msgid "In addition, plugins can provide other keywords."
13305
msgstr ""
13306
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13307
#: en/help_topics/revisionspec.txt:55
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13308
msgid "A detailed description of each keyword is given below."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13309
msgstr ""
13310
13311
#: en/help_topics/revisionspec.txt:57
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13312
msgid ":revid:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13313
msgstr ""
13314
13315
#: en/help_topics/revisionspec.txt:59
13316
msgid ""
13317
"    Supply a specific revision id, that can be used to specify any\n"
13318
"    revision id in the ancestry of the branch.\n"
13319
"    Including merges, and pending merges.\n"
13320
"    Examples::"
13321
msgstr ""
13322
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13323
#: en/help_topics/revisionspec.txt:64
13324
msgid ""
13325
"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13326
msgstr ""
13327
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13328
#: en/help_topics/revisionspec.txt:66
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13329
msgid ":submit:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13330
msgstr ""
13331
13332
#: en/help_topics/revisionspec.txt:68
13333
msgid ""
13334
"    Diffing against this shows all the changes that were made in this "
13335
"branch,\n"
13336
"    and is a good predictor of what merge will do.  The submit branch is\n"
13337
"    used by the bundle and merge directive commands.  If no submit branch\n"
13338
"    is specified, the parent branch is used instead."
13339
msgstr ""
13340
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13341
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13342
msgid ""
13343
"    The common ancestor is the last revision that existed in both\n"
13344
"    branches. Usually this is the branch point, but it could also be\n"
13345
"    a revision that was merged."
13346
msgstr ""
13347
6437.2.2 by Vincent Ladeuil
Release 2.5b5
13348
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13349
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13350
#: en/help_topics/revisionspec.txt:153
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13351
msgid "    Examples::"
13352
msgstr ""
13353
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13354
#: en/help_topics/revisionspec.txt:79
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13355
msgid "      $ bzr diff -r submit:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13356
msgstr ""
13357
13358
#: en/help_topics/revisionspec.txt:81
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13359
msgid ":ancestor:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13360
msgstr ""
13361
13362
#: en/help_topics/revisionspec.txt:83
13363
msgid "    Supply the path to a branch to select the common ancestor."
13364
msgstr ""
13365
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13366
#: en/help_topics/revisionspec.txt:89
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13367
msgid ""
13368
"    This is frequently used with 'diff' to return all of the changes\n"
13369
"    that your branch introduces, while excluding the changes that you\n"
13370
"    have not merged from the remote branch."
13371
msgstr ""
13372
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13373
#: en/help_topics/revisionspec.txt:95
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13374
msgid ""
13375
"      ancestor:/path/to/branch\n"
13376
"      $ bzr diff -r ancestor:../../mainline/branch"
13377
msgstr ""
13378
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13379
#: en/help_topics/revisionspec.txt:98
13380
msgid ":date:"
13381
msgstr ""
13382
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13383
#: en/help_topics/revisionspec.txt:100
13384
msgid ""
13385
"    Supply a datestamp to select the first revision that matches the date.\n"
13386
"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13387
"    Matches the first entry after a given date (either at midnight or\n"
13388
"    at a specified time)."
13389
msgstr ""
13390
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13391
#: en/help_topics/revisionspec.txt:105
13392
msgid "    One way to display all the changes since yesterday would be::"
13393
msgstr ""
13394
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13395
#: en/help_topics/revisionspec.txt:107
13396
msgid "        bzr log -r date:yesterday.."
13397
msgstr ""
13398
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13399
#: en/help_topics/revisionspec.txt:111
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13400
msgid ""
13401
"      date:yesterday            -> select the first revision since "
13402
"yesterday\n"
13403
"      date:2006-08-14,17:10:14  -> select the first revision after\n"
13404
"                                   August 14th, 2006 at 5:10pm."
13405
msgstr ""
13406
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13407
#: en/help_topics/revisionspec.txt:115
13408
msgid ":branch:"
13409
msgstr ""
13410
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13411
#: en/help_topics/revisionspec.txt:117
13412
msgid "    Supply the path to a branch to select its last revision."
13413
msgstr ""
13414
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13415
#: en/help_topics/revisionspec.txt:121
13416
msgid "      branch:/path/to/branch"
13417
msgstr ""
13418
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13419
#: en/help_topics/revisionspec.txt:123
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13420
msgid ":tag:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13421
msgstr ""
13422
13423
#: en/help_topics/revisionspec.txt:125
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13424
msgid "    Tags are stored in the branch and created by the 'tag' command."
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13425
msgstr ""
13426
13427
#: en/help_topics/revisionspec.txt:127
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13428
msgid ":revno:"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13429
msgstr ""
13430
13431
#: en/help_topics/revisionspec.txt:129
13432
msgid ""
13433
"    Use an integer to specify a revision in the history of the branch.\n"
13434
"    Optionally a branch can be specified.  A negative number will count\n"
13435
"    from the end of the branch (-1 is the last revision, -2 the previous\n"
13436
"    one). If the negative number is larger than the branch's history, the\n"
13437
"    first revision is returned.\n"
13438
"    Examples::"
13439
msgstr ""
13440
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13441
#: en/help_topics/revisionspec.txt:136
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13442
msgid ""
13443
"      revno:1                   -> return the first revision of this branch\n"
13444
"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
13445
"                                   the branch '/path/to/branch'\n"
13446
"      revno:-1                  -> The last revision in a branch.\n"
13447
"      -2:http://other/branch    -> The second to last revision in the\n"
13448
"                                   remote branch.\n"
13449
"      -1000000                  -> Most likely the first revision, unless\n"
13450
"                                   your history is very long."
13451
msgstr ""
13452
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13453
#: en/help_topics/revisionspec.txt:145
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13454
msgid ":before:"
13455
msgstr ""
13456
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13457
#: en/help_topics/revisionspec.txt:147
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13458
msgid ""
13459
"    Supply any revision spec to return the parent of that revision.  This "
13460
"is\n"
13461
"    mostly useful when inspecting revisions that are not in the revision "
13462
"history\n"
13463
"    of a branch."
13464
msgstr ""
13465
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13466
#: en/help_topics/revisionspec.txt:151
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13467
msgid ""
13468
"    It is an error to request the parent of the null revision (before:0)."
13469
msgstr ""
13470
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13471
#: en/help_topics/revisionspec.txt:155
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13472
msgid ""
13473
"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
13474
"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
13475
"                                            aaaa@bbbb-1234567890\n"
13476
"      bzr diff -r before:1913..1913\n"
13477
"            -> Find the changes between revision 1913 and its parent "
13478
"(1912).\n"
13479
"               (What changes did revision 1913 introduce).\n"
13480
"               This is equivalent to:  bzr diff -c 1913"
13481
msgstr ""
13482
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13483
#: en/help_topics/revisionspec.txt:163
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13484
msgid ":annotate:"
13485
msgstr ""
13486
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13487
#: en/help_topics/revisionspec.txt:165
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13488
msgid ""
13489
"    Select the revision that last modified the specified line.  Line is\n"
13490
"    specified as path:number.  Path is a relative path to the file.  "
13491
"Numbers\n"
13492
"    start at 1, and are relative to the current version, not the last-\n"
13493
"    committed version of the file."
13494
msgstr ""
13495
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13496
#: en/help_topics/revisionspec.txt:170
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13497
msgid ":mainline:"
13498
msgstr ""
13499
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13500
#: en/help_topics/revisionspec.txt:172
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13501
msgid ""
13502
"    Select the revision that merged the specified revision into mainline."
13503
msgstr ""
13504
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13505
#: en/help_topics/revisionspec.txt:174
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13506
msgid ":last:"
13507
msgstr ""
13508
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13509
#: en/help_topics/revisionspec.txt:176
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13510
msgid ""
13511
"    Supply a positive number to get the nth revision from the end.\n"
13512
"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
13513
"    Examples::"
13514
msgstr ""
13515
6252.1.1 by Vincent Ladeuil
Release 2.5b3
13516
#: en/help_topics/revisionspec.txt:180
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13517
msgid ""
13518
"      last:1        -> return the last revision\n"
13519
"      last:3        -> return the revision 2 before the end.\n"
13520
msgstr ""
13521
13522
#: en/help_topics/rules.txt:1
13523
msgid ""
13524
"Rules\n"
13525
"====="
13526
msgstr ""
13527
13528
#: en/help_topics/rules.txt:7
13529
msgid ""
13530
"Rules are defined in ini file format where the sections are file glob\n"
13531
"patterns and the contents of each section are the preferences for files\n"
13532
"matching that pattern(s). For example::"
13533
msgstr ""
13534
13535
#: en/help_topics/rules.txt:11
13536
msgid ""
13537
"    [name *.bat]\n"
13538
"    eol = native"
13539
msgstr ""
13540
13541
#: en/help_topics/rules.txt:14
13542
msgid ""
13543
"    [name *.html *.xml]\n"
13544
"    keywords = xml_escape"
13545
msgstr ""
13546
13547
#: en/help_topics/rules.txt:17
13548
msgid ""
13549
"Preferences like these are useful for commands and plugins wishing to\n"
13550
"provide custom behaviour for selected files.  For more information on \n"
13551
"end of line conversion see :doc:`eol-help`.\n"
13552
"Keyword support is provided by the `keywords plugin\n"
13553
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13554
msgstr ""
13555
13556
#: en/help_topics/rules.txt:23
13557
msgid ""
13558
"Files\n"
13559
"-----"
13560
msgstr ""
13561
13562
#: en/help_topics/rules.txt:26
13563
msgid ""
13564
"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.
13565
"``BRZ_HOME/rules``. "
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13566
msgstr ""
13567
13568
#: en/help_topics/rules.txt:29
13569
msgid ""
13570
"Rule Patterns\n"
13571
"-------------"
13572
msgstr ""
13573
13574
#: en/help_topics/rules.txt:32
13575
msgid ""
13576
"Patterns are ordered and searching stops as soon as one matches.\n"
13577
"As a consequence, more explicit patterns should be placed towards\n"
13578
"the top of the file. Rule patterns use exactly the same conventions\n"
13579
"as ignore patterns. See :doc:`patterns-help` for details."
13580
msgstr ""
13581
13582
#: en/help_topics/rules.txt:37
13583
msgid ".. note::"
13584
msgstr ""
13585
13586
#: en/help_topics/rules.txt:39
13587
msgid ""
13588
"   Patterns containing square brackets or spaces should be\n"
13589
"   surrounded in quotes to ensure they are correctly parsed.\n"
13590
msgstr ""
13591
13592
#: en/help_topics/topics.txt:1
13593
msgid ""
13594
"authentication       Information on configuring authentication\n"
13595
"basic                Basic commands\n"
13596
"branches             Information on what a branch is\n"
13597
"bugs                 Bug tracker settings\n"
13598
"checkouts            Information on what a checkout is\n"
13599
"commands             Basic help for all commands\n"
13600
"configuration        Details on the configuration settings available\n"
13601
"conflict-types       Types of conflicts and what to do about them\n"
13602
"content-filters      Conversion of content into/from working trees\n"
13603
"criss-cross          Information on criss-cross merging\n"
13604
"current-formats      Current storage formats\n"
13605
"debug-flags          Options to show or record debug information\n"
13606
"diverged-branches    How to fix diverged branches\n"
13607
"env-variables        Environment variable names and values\n"
13608
"eol                  Information on end-of-line handling\n"
13609
"files                Information on configuration and log files\n"
13610
"formats              Information on choosing a storage format\n"
13611
"global-options       Options that control how Bazaar runs\n"
13612
"hidden-commands      All hidden commands\n"
13613
"hooks                Points at which custom processing can be added\n"
13614
"launchpad            Using Bazaar with Launchpad.net\n"
13615
"location-alias       Aliases for remembered locations\n"
13616
"log-formats          Details on the logging formats available\n"
13617
"other-formats        Experimental and deprecated storage formats\n"
13618
"patterns             Information on the pattern syntax\n"
13619
"repositories         Basic information on shared repositories.\n"
13620
"revisionspec         Explain how to use --revision\n"
13621
"rules                Information on defining rule-based preferences\n"
13622
"standalone-trees     Information on what a standalone tree is\n"
13623
"standard-options     Options that can be used with any command\n"
13624
"status-flags         Help on status flags\n"
13625
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13626
"topics               Topics list\n"
13627
"url-special-chars    Special character handling in URLs\n"
13628
"urlspec              Supported transport protocols\n"
13629
"working-trees        Information on working trees\n"
13630
msgstr ""
13631
13632
#: en/help_topics/url-special-chars.txt:1
13633
msgid ""
13634
"Special character handling in URLs\n"
13635
"=================================="
13636
msgstr ""
13637
13638
#: en/help_topics/url-special-chars.txt:4
13639
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13640
msgstr ""
13641
13642
#: en/help_topics/url-special-chars.txt:6
13643
msgid " * Fully qualified URLs"
13644
msgstr ""
13645
13646
#: en/help_topics/url-special-chars.txt:8
13647
msgid " * File system paths, relative or absolute"
13648
msgstr ""
13649
13650
#: en/help_topics/url-special-chars.txt:10
13651
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13652
"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
13653
"that are specified it will automatically determine the appropriate URL\n"
13654
"representation, and escape special characters where necessary."
13655
msgstr ""
13656
13657
#: en/help_topics/url-special-chars.txt:14
13658
msgid ""
13659
"There are a few characters which have special meaning in URLs and need "
13660
"careful\n"
13661
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13662
"value in URLs. Any non-ASCII characters in a file path will automatically "
13663
"be\n"
13664
"urlencoded when the path is converted to a URL."
13665
msgstr ""
13666
13667
#: en/help_topics/url-special-chars.txt:19
13668
msgid ""
13669
"URLs represent non-ASCII characters in an encoding defined by the server, "
13670
"but\n"
13671
"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
13672
"be\n"
13673
"generous in what it accepts as a URL and to print them in a way that\n"
13674
"will be readable."
13675
msgstr ""
13676
13677
#: en/help_topics/url-special-chars.txt:24
13678
msgid ""
13679
"For example, if you have a directory named '/tmp/%2False' these are all "
13680
"valid\n"
13681
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13682
"slash)::"
13683
msgstr ""
13684
13685
#: en/help_topics/url-special-chars.txt:27
13686
msgid ""
13687
"  cd /tmp\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13688
"  brz log /tmp/%2False\n"
13689
"  brz log %2False\n"
13690
"  brz log file:///tmp/%252False\n"
13691
"  brz log file://localhost/tmp/%252False\n"
13692
"  brz log file:%252False"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13693
msgstr ""
13694
13695
#: en/help_topics/url-special-chars.txt:34
13696
msgid "These are valid but do not refer to the same file::"
13697
msgstr ""
13698
13699
#: en/help_topics/url-special-chars.txt:36
13700
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13701
"  brz log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13702
"  brz log %252False (refers to a file called /tmp/%252False)"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13703
msgstr ""
13704
13705
#: en/help_topics/url-special-chars.txt:39
13706
msgid ""
13707
"Comma also has special meaning in URLs, because it denotes `segment "
13708
"parameters`_"
13709
msgstr ""
13710
13711
#: en/help_topics/url-special-chars.txt:41
13712
msgid ""
13713
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13714
msgstr ""
13715
13716
#: en/help_topics/url-special-chars.txt:43
13717
msgid ""
13718
"Comma is also special in any file system paths that are specified. To use a "
13719
"literal\n"
13720
"comma in a file system path, specify a URL and URL encode the comma::"
13721
msgstr ""
13722
13723
#: en/help_topics/url-special-chars.txt:46
13724
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13725
"  brz log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13726
"\" set to \"bla\"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13727
"  brz log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13728
"  brz log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
6110.7.9 by Jonathan Riddell
update bzr.pot for topic help
13729
"\" set to \"bla\"\n"
13730
msgstr ""
13731
13732
#: en/help_topics/urlspec.txt:1
13733
msgid "URL Identifiers"
13734
msgstr ""
13735
13736
#: en/help_topics/urlspec.txt:3
13737
msgid "Supported URL prefixes::"
13738
msgstr ""
13739
13740
#: en/help_topics/urlspec.txt:5
13741
msgid ""
13742
"  aftp://             Access using active FTP.\n"
13743
"  bzr://              Fast access using the Bazaar smart server.\n"
13744
"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
13745
"  file://             Access using the standard filesystem (default)\n"
13746
"  ftp://              Access using passive FTP.\n"
13747
"  http://             Read-only access of branches exported on the web.\n"
13748
"  https://            Read-only access of branches exported on the web using "
13749
"SSL.\n"
13750
"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
13751
msgstr ""
13752
13753
#: en/help_topics/urlspec.txt:14
13754
msgid "Supported modifiers::"
13755
msgstr ""
13756
13757
#: en/help_topics/urlspec.txt:16
13758
msgid "  gio+                Access using any GIO supported protocols."
13759
msgstr ""
13760
13761
#: en/help_topics/urlspec.txt:18
13762
msgid "Bazaar supports all of the standard parts within the URL::"
13763
msgstr ""
13764
13765
#: en/help_topics/urlspec.txt:20
13766
msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
13767
msgstr ""
13768
13769
#: en/help_topics/urlspec.txt:22
13770
msgid "allowing URLs such as::"
13771
msgstr ""
13772
13773
#: en/help_topics/urlspec.txt:24
13774
msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13775
msgstr ""
13776
13777
#: en/help_topics/urlspec.txt:26
13778
msgid ""
13779
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13780
"with '~' as meaning that the rest of the path should be interpreted\n"
13781
"relative to the remote user's home directory.  For example if the user\n"
13782
"``remote`` has a  home directory of ``/home/remote`` on the server\n"
13783
"shell.example.com, then::"
13784
msgstr ""
13785
13786
#: en/help_topics/urlspec.txt:32
13787
msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13788
msgstr ""
13789
13790
#: en/help_topics/urlspec.txt:34
13791
msgid "would refer to ``/home/remote/myproject/trunk``."
13792
msgstr ""
13793
13794
#: en/help_topics/urlspec.txt:36
13795
msgid ""
13796
"Many commands that accept URLs also accept location aliases too.\n"
13797
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13798
msgstr ""