/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1
#: breezy/add.py:93
6622.1.22 by Jelmer Vernooij
Update po files.
2
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3
msgid "skipping {0} (larger than {1} of {2} bytes)"
4
msgstr ""
5
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6
#: breezy/branch.py:872
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7
msgid "Unstacking"
8
msgstr ""
9
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
10
#: breezy/branch.py:3012
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11
#, python-format
12
msgid "Pushed up to revision %d."
13
msgstr ""
14
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
15
#: breezy/branch.py:3014
6524.1.1 by Jelmer Vernooij
Merge 2.5.
16
#, python-format
17
msgid "%d tag updated."
18
msgid_plural "%d tags updated."
19
msgstr[0] ""
20
msgstr[1] ""
21
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
22
#: breezy/branch.py:3017
6524.1.1 by Jelmer Vernooij
Merge 2.5.
23
msgid "No new revisions or tags to push."
24
msgstr ""
25
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
26
#: breezy/branch.py:3019
6524.1.1 by Jelmer Vernooij
Merge 2.5.
27
msgid "No new revisions to push."
28
msgstr ""
29
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
30
#: breezy/branch.py:3039
6622.1.22 by Jelmer Vernooij
Update po files.
31
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
32
msgid "checked branch {0} format {1}"
33
msgstr ""
34
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
35
#: breezy/branch.py:3042
6524.1.1 by Jelmer Vernooij
Merge 2.5.
36
#, python-format
37
msgid "found error:%s"
38
msgstr ""
39
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
40
#: breezy/builtins.py:251 breezy/builtins.py:3043 breezy/workingtree.py:324
6524.1.1 by Jelmer Vernooij
Merge 2.5.
41
#, python-format
42
msgid "Ignoring files outside view. View is %s"
43
msgstr ""
44
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
45
#: breezy/builtins.py:260
6524.1.1 by Jelmer Vernooij
Merge 2.5.
46
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
47
msgid "brz %s --revision takes exactly one revision identifier"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
48
msgstr ""
49
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
50
#: breezy/builtins.py:315
6524.1.1 by Jelmer Vernooij
Merge 2.5.
51
msgid "Display status summary."
52
msgstr ""
53
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
54
#: breezy/builtins.py:317
6524.1.1 by Jelmer Vernooij
Merge 2.5.
55
msgid ""
56
"This reports on versioned and unknown files, reporting them\n"
57
"grouped by state.  Possible states are:"
58
msgstr ""
59
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
60
#: breezy/builtins.py:320
6524.1.1 by Jelmer Vernooij
Merge 2.5.
61
msgid ""
62
"added\n"
63
"    Versioned in the working copy but not in the previous revision."
64
msgstr ""
65
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
66
#: breezy/builtins.py:323
6524.1.1 by Jelmer Vernooij
Merge 2.5.
67
msgid ""
68
"removed\n"
69
"    Versioned in the previous revision but removed or deleted\n"
70
"    in the working copy."
71
msgstr ""
72
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
73
#: breezy/builtins.py:327
6524.1.1 by Jelmer Vernooij
Merge 2.5.
74
msgid ""
75
"renamed\n"
76
"    Path of this file changed from the previous revision;\n"
77
"    the text may also have changed.  This includes files whose\n"
78
"    parent directory was renamed."
79
msgstr ""
80
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
81
#: breezy/builtins.py:332
6524.1.1 by Jelmer Vernooij
Merge 2.5.
82
msgid ""
83
"modified\n"
84
"    Text has changed since the previous revision."
85
msgstr ""
86
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
87
#: breezy/builtins.py:335
6524.1.1 by Jelmer Vernooij
Merge 2.5.
88
msgid ""
89
"kind changed\n"
90
"    File kind has been changed (e.g. from file to directory)."
91
msgstr ""
92
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
93
#: breezy/builtins.py:338
6524.1.1 by Jelmer Vernooij
Merge 2.5.
94
msgid ""
95
"unknown\n"
96
"    Not versioned and not matching an ignore pattern."
97
msgstr ""
98
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
99
#: breezy/builtins.py:341
6524.1.1 by Jelmer Vernooij
Merge 2.5.
100
msgid ""
101
"Additionally for directories, symlinks and files with a changed\n"
102
"executable bit, Bazaar indicates their type using a trailing\n"
103
"character: '/', '@' or '*' respectively. These decorations can be\n"
104
"disabled using the '--no-classify' option."
105
msgstr ""
106
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
107
#: breezy/builtins.py:346
6524.1.1 by Jelmer Vernooij
Merge 2.5.
108
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
109
"To see ignored files use 'brz ignored'.  For details on the\n"
110
"changes to file texts, use 'brz diff'."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
111
msgstr ""
112
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
113
#: breezy/builtins.py:349
6524.1.1 by Jelmer Vernooij
Merge 2.5.
114
msgid ""
115
"Note that --short or -S gives status flags for each item, similar\n"
116
"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.
117
"use brz status -SV."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
118
msgstr ""
119
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
120
#: breezy/builtins.py:353
6524.1.1 by Jelmer Vernooij
Merge 2.5.
121
msgid ""
122
"If no arguments are specified, the status of the entire working\n"
123
"directory is shown.  Otherwise, only the status of the specified\n"
124
"files or directories is reported.  If a directory is given, status\n"
125
"is reported for everything inside that directory."
126
msgstr ""
127
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
128
#: breezy/builtins.py:358
6524.1.1 by Jelmer Vernooij
Merge 2.5.
129
msgid ""
130
"Before merges are committed, the pending merge tip revisions are\n"
131
"shown. To see all pending merge revisions, use the -v option.\n"
132
"To skip the display of pending merge information altogether, use\n"
133
"the no-pending option or specify a file/directory."
134
msgstr ""
135
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
136
#: breezy/builtins.py:363
6524.1.1 by Jelmer Vernooij
Merge 2.5.
137
msgid ""
138
"To compare the working directory to a specific revision, pass a\n"
139
"single revision to the revision argument."
140
msgstr ""
141
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
142
#: breezy/builtins.py:366
6524.1.1 by Jelmer Vernooij
Merge 2.5.
143
msgid ""
144
"To see which files have changed in a specific revision, or between\n"
145
"two revisions, pass a revision range to the revision argument.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
146
"This will produce the same results as calling 'brz diff --summarize'."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
147
msgstr ""
148
6622.1.22 by Jelmer Vernooij
Update po files.
149
# help of 'short' option of 'status' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
150
#: breezy/builtins.py:375
6524.1.1 by Jelmer Vernooij
Merge 2.5.
151
msgid "Use short status indicators."
152
msgstr ""
153
6622.1.22 by Jelmer Vernooij
Update po files.
154
# help of 'versioned' option of 'status' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
155
#: breezy/builtins.py:377
6524.1.1 by Jelmer Vernooij
Merge 2.5.
156
msgid "Only show versioned files."
157
msgstr ""
158
6622.1.22 by Jelmer Vernooij
Update po files.
159
# help of 'no-pending' option of 'status' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
160
#: breezy/builtins.py:379
6524.1.1 by Jelmer Vernooij
Merge 2.5.
161
msgid "Don't show pending merges."
162
msgstr ""
163
6622.1.22 by Jelmer Vernooij
Update po files.
164
# help of 'no-classify' option of 'status' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
165
#: breezy/builtins.py:382
6524.1.1 by Jelmer Vernooij
Merge 2.5.
166
msgid "Do not mark object type using indicator."
167
msgstr ""
168
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
169
#: breezy/builtins.py:397
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
170
msgid "brz status --revision takes exactly one or two revision specifiers"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
171
msgstr ""
172
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
173
#: breezy/builtins.py:441 breezy/builtins.py:5229
6524.1.1 by Jelmer Vernooij
Merge 2.5.
174
msgid "You can only supply one of revision_id or --revision"
175
msgstr ""
176
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
177
#: breezy/builtins.py:444 breezy/builtins.py:5231
6524.1.1 by Jelmer Vernooij
Merge 2.5.
178
msgid "You must supply either --revision or a revision_id"
179
msgstr ""
180
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
181
#: breezy/builtins.py:451
6524.1.1 by Jelmer Vernooij
Merge 2.5.
182
#, python-format
183
msgid "Repository %r does not support access to raw revision texts"
184
msgstr ""
185
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
186
#: breezy/builtins.py:462
6622.1.22 by Jelmer Vernooij
Update po files.
187
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
188
msgid "The repository {0} contains no revision {1}."
189
msgstr ""
190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
191
#: breezy/builtins.py:469
6524.1.1 by Jelmer Vernooij
Merge 2.5.
192
msgid "You cannot specify a NULL revision."
193
msgstr ""
194
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
195
#: breezy/builtins.py:561
6524.1.1 by Jelmer Vernooij
Merge 2.5.
196
msgid "Remove the working tree from a given branch/checkout."
197
msgstr ""
198
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
199
#: breezy/builtins.py:563
6524.1.1 by Jelmer Vernooij
Merge 2.5.
200
msgid ""
201
"Since a lightweight checkout is little more than a working tree\n"
202
"this will refuse to run against one."
203
msgstr ""
204
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
205
#: breezy/builtins.py:566
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
206
msgid "To re-create the working tree, use \"brz checkout\"."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
207
msgstr ""
208
6622.1.22 by Jelmer Vernooij
Update po files.
209
# help of 'force' option of 'remove-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
210
#: breezy/builtins.py:572
6622.1.22 by Jelmer Vernooij
Update po files.
211
msgid "Remove the working tree even if it has uncommitted or shelved changes."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
212
msgstr ""
213
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
214
#: breezy/builtins.py:586
6524.1.1 by Jelmer Vernooij
Merge 2.5.
215
msgid "No working tree to remove"
216
msgstr ""
217
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
218
#: breezy/builtins.py:588
6524.1.1 by Jelmer Vernooij
Merge 2.5.
219
msgid "You cannot remove the working tree of a remote path"
220
msgstr ""
221
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
222
#: breezy/builtins.py:597
6524.1.1 by Jelmer Vernooij
Merge 2.5.
223
msgid "You cannot remove the working tree from a lightweight checkout"
224
msgstr ""
225
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
226
#: breezy/builtins.py:637
6524.1.1 by Jelmer Vernooij
Merge 2.5.
227
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
228
"The tree does not appear to be corrupt. You probably want \"brz revert\" "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
229
"instead. Use \"--force\" if you are sure you want to reset the working tree."
230
msgstr ""
231
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
232
#: breezy/builtins.py:648
6524.1.1 by Jelmer Vernooij
Merge 2.5.
233
msgid ""
234
", the header appears corrupt, try passing -r -1 to set the state to the last "
235
"commit"
236
msgstr ""
237
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
238
#: breezy/builtins.py:652
6622.1.22 by Jelmer Vernooij
Update po files.
239
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
240
msgid "failed to reset the tree state{0}"
241
msgstr ""
242
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
243
#: breezy/builtins.py:656
6524.1.1 by Jelmer Vernooij
Merge 2.5.
244
msgid "Show current revision number."
245
msgstr ""
246
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
247
#: breezy/builtins.py:658
6524.1.1 by Jelmer Vernooij
Merge 2.5.
248
msgid "This is equal to the number of revisions on this branch."
249
msgstr ""
250
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
251
#: breezy/builtins.py:671
6524.1.1 by Jelmer Vernooij
Merge 2.5.
252
msgid "--tree and --revision can not be used together"
253
msgstr ""
254
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
255
#: breezy/builtins.py:688
6622.1.22 by Jelmer Vernooij
Update po files.
256
msgid "Revision numbers only make sense for single revisions, not ranges"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
257
msgstr ""
258
6622.1.22 by Jelmer Vernooij
Update po files.
259
# help of 'tree' option of 'revno' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
260
#: breezy/builtins.py:712
6524.1.1 by Jelmer Vernooij
Merge 2.5.
261
msgid "Show revno of working tree."
262
msgstr ""
263
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
264
#: breezy/builtins.py:760
6524.1.1 by Jelmer Vernooij
Merge 2.5.
265
msgid "Add specified files or directories."
266
msgstr ""
267
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
268
#: breezy/builtins.py:762
6524.1.1 by Jelmer Vernooij
Merge 2.5.
269
msgid ""
270
"In non-recursive mode, all the named items are added, regardless\n"
271
"of whether they were previously ignored.  A warning is given if\n"
272
"any of the named files are already versioned."
273
msgstr ""
274
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
275
#: breezy/builtins.py:766
6524.1.1 by Jelmer Vernooij
Merge 2.5.
276
msgid ""
277
"In recursive mode (the default), files are treated the same way\n"
278
"but the behaviour for directories is different.  Directories that\n"
279
"are already versioned do not give a warning.  All directories,\n"
280
"whether already versioned or not, are searched for files or\n"
281
"subdirectories that are neither versioned or ignored, and these\n"
282
"are added.  This search proceeds recursively into versioned\n"
283
"directories.  If no names are given '.' is assumed."
284
msgstr ""
285
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
286
#: breezy/builtins.py:774
6524.1.1 by Jelmer Vernooij
Merge 2.5.
287
msgid ""
288
"A warning will be printed when nested trees are encountered,\n"
289
"unless they are explicitly ignored."
290
msgstr ""
291
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
292
#: breezy/builtins.py:777
6524.1.1 by Jelmer Vernooij
Merge 2.5.
293
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
294
"Therefore simply saying 'brz add' will version all files that\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
295
"are currently unknown."
296
msgstr ""
297
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
298
#: breezy/builtins.py:780
6524.1.1 by Jelmer Vernooij
Merge 2.5.
299
msgid ""
300
"Adding a file whose parent directory is not versioned will\n"
301
"implicitly add the parent, and so on up to the root. This means\n"
302
"you should never need to explicitly add a directory, they'll just\n"
303
"get added when you add a file in the directory."
304
msgstr ""
305
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
306
#: breezy/builtins.py:785
6524.1.1 by Jelmer Vernooij
Merge 2.5.
307
msgid ""
308
"--dry-run will show which files would be added, but not actually\n"
309
"add them."
310
msgstr ""
311
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
312
#: breezy/builtins.py:788
6524.1.1 by Jelmer Vernooij
Merge 2.5.
313
msgid ""
314
"--file-ids-from will try to use the file ids from the supplied path.\n"
315
"It looks up ids trying to find a matching parent directory with the\n"
316
"same filename, and then by pure path. This option is rarely needed\n"
317
"but can be useful when adding the same logical file into two\n"
318
"branches that will be merged later (without showing the two different\n"
319
"adds as a conflict). It is also useful when merging another project\n"
320
"into a subdirectory of this one."
321
msgstr ""
322
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
323
#: breezy/builtins.py:796
6524.1.1 by Jelmer Vernooij
Merge 2.5.
324
msgid ""
325
"Any files matching patterns in the ignore list will not be added\n"
326
"unless they are explicitly mentioned."
327
msgstr ""
328
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
329
#: breezy/builtins.py:799
6524.1.1 by Jelmer Vernooij
Merge 2.5.
330
msgid ""
331
"In recursive mode, files larger than the configuration option \n"
332
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
333
"to file size."
334
msgstr ""
335
6622.1.22 by Jelmer Vernooij
Update po files.
336
# help of 'no-recurse' option of 'add' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
337
#: breezy/builtins.py:806
6524.1.1 by Jelmer Vernooij
Merge 2.5.
338
msgid "Don't recursively add the contents of directories."
339
msgstr ""
340
6622.1.22 by Jelmer Vernooij
Update po files.
341
# help of 'file-ids-from' option of 'add' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
342
#: breezy/builtins.py:813
6524.1.1 by Jelmer Vernooij
Merge 2.5.
343
msgid "Lookup file ids from this tree."
344
msgstr ""
345
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
346
#: breezy/builtins.py:849
6622.1.22 by Jelmer Vernooij
Update po files.
347
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
348
msgid "ignored {0} matching \"{1}\"\n"
349
msgstr ""
350
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
351
#: breezy/builtins.py:854
6524.1.1 by Jelmer Vernooij
Merge 2.5.
352
msgid "Create a new versioned directory."
353
msgstr ""
354
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
355
#: breezy/builtins.py:856
6524.1.1 by Jelmer Vernooij
Merge 2.5.
356
msgid "This is equivalent to creating the directory and then adding it."
357
msgstr ""
358
6622.1.22 by Jelmer Vernooij
Update po files.
359
# help of 'parents' option of 'mkdir' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
360
#: breezy/builtins.py:863
6524.1.1 by Jelmer Vernooij
Merge 2.5.
361
msgid "No error if existing, make parent directories as needed."
362
msgstr ""
363
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
364
#: breezy/builtins.py:897
6524.1.1 by Jelmer Vernooij
Merge 2.5.
365
#, python-format
366
msgid "added %s\n"
367
msgstr ""
368
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
369
#: breezy/builtins.py:939
6524.1.1 by Jelmer Vernooij
Merge 2.5.
370
#, python-format
371
msgid "invalid kind %r specified"
372
msgstr ""
373
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
374
#: breezy/builtins.py:976
6524.1.1 by Jelmer Vernooij
Merge 2.5.
375
msgid "Move or rename a file."
376
msgstr ""
377
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
378
#: breezy/builtins.py:978
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
379
msgid "    brz mv SOURCE... DESTINATION"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
380
msgstr ""
381
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
382
#: breezy/builtins.py:980
6524.1.1 by Jelmer Vernooij
Merge 2.5.
383
msgid ""
384
"If the last argument is a versioned directory, all the other names\n"
385
"are moved into it.  Otherwise, there must be exactly two arguments\n"
386
"and the file is changed to a new name."
387
msgstr ""
388
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
389
#: breezy/builtins.py:984
6524.1.1 by Jelmer Vernooij
Merge 2.5.
390
msgid ""
391
"If OLDNAME does not exist on the filesystem but is versioned and\n"
392
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
393
"assumes that the file has been manually moved and only updates\n"
394
"its internal inventory to reflect that change.\n"
395
"The same is valid when moving many SOURCE files to a DESTINATION."
396
msgstr ""
397
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
398
#: breezy/builtins.py:990
6524.1.1 by Jelmer Vernooij
Merge 2.5.
399
msgid "Files cannot be moved between branches."
400
msgstr ""
401
6622.1.22 by Jelmer Vernooij
Update po files.
402
# help of 'after' option of 'mv' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
403
#: breezy/builtins.py:997
6524.1.1 by Jelmer Vernooij
Merge 2.5.
404
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
405
"Move only the brz identifier of the file, because the file has already been "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
406
"moved."
407
msgstr ""
408
6622.1.22 by Jelmer Vernooij
Update po files.
409
# help of 'auto' option of 'mv' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
410
#: breezy/builtins.py:999
6524.1.1 by Jelmer Vernooij
Merge 2.5.
411
msgid "Automatically guess renames."
412
msgstr ""
413
6622.1.22 by Jelmer Vernooij
Update po files.
414
# help of 'dry-run' option of 'mv' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
415
#: breezy/builtins.py:1000
6524.1.1 by Jelmer Vernooij
Merge 2.5.
416
msgid "Avoid making changes when guessing renames."
417
msgstr ""
418
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
419
#: breezy/builtins.py:1009
6524.1.1 by Jelmer Vernooij
Merge 2.5.
420
msgid "--dry-run requires --auto."
421
msgstr ""
422
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
423
#: breezy/builtins.py:1013
6524.1.1 by Jelmer Vernooij
Merge 2.5.
424
msgid "missing file argument"
425
msgstr ""
426
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
427
#: breezy/builtins.py:1017
6524.1.1 by Jelmer Vernooij
Merge 2.5.
428
msgid "can not move root of branch"
429
msgstr ""
430
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
431
#: breezy/builtins.py:1023
6524.1.1 by Jelmer Vernooij
Merge 2.5.
432
msgid "Only one path may be specified to --auto."
433
msgstr ""
434
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
435
#: breezy/builtins.py:1026
6524.1.1 by Jelmer Vernooij
Merge 2.5.
436
msgid "--after cannot be specified with --auto."
437
msgstr ""
438
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
439
#: breezy/builtins.py:1062
6524.1.1 by Jelmer Vernooij
Merge 2.5.
440
msgid "to mv multiple files the destination must be a versioned directory"
441
msgstr ""
442
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
443
#: breezy/builtins.py:1114
6524.1.1 by Jelmer Vernooij
Merge 2.5.
444
msgid "Turn this branch into a mirror of another branch."
445
msgstr ""
446
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
447
#: breezy/builtins.py:1116
6524.1.1 by Jelmer Vernooij
Merge 2.5.
448
msgid ""
449
"By default, this command only works on branches that have not diverged.\n"
450
"Branches are considered diverged if the destination branch's most recent \n"
451
"commit is one that has not been merged (directly or indirectly) into the \n"
452
"parent."
453
msgstr ""
454
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
455
#: breezy/builtins.py:1121
6524.1.1 by Jelmer Vernooij
Merge 2.5.
456
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
457
"If branches have diverged, you can use 'brz merge' to integrate the changes\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
458
"from one into the other.  Once one branch has merged, the other should\n"
459
"be able to pull it again."
460
msgstr ""
461
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
462
#: breezy/builtins.py:1125
6524.1.1 by Jelmer Vernooij
Merge 2.5.
463
msgid ""
464
"If you want to replace your local changes and just want your branch to\n"
465
"match the remote one, use pull --overwrite. This will work even if the two\n"
466
"branches have diverged."
467
msgstr ""
468
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
469
#: breezy/builtins.py:1129
6524.1.1 by Jelmer Vernooij
Merge 2.5.
470
msgid ""
471
"If there is no default location set, the first pull will set it (use\n"
472
"--no-remember to avoid setting it). After that, you can omit the\n"
473
"location to use the default.  To change the default, use --remember. The\n"
474
"value will only be saved if the remote location can be accessed."
475
msgstr ""
476
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
477
#: breezy/builtins.py:1134
6524.1.1 by Jelmer Vernooij
Merge 2.5.
478
msgid ""
479
"The --verbose option will display the revisions pulled using the log_format\n"
480
"configuration option. You can use a different format by overriding it with\n"
481
"-Olog_format=<other_format>."
482
msgstr ""
483
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
484
#: breezy/builtins.py:1138
6524.1.1 by Jelmer Vernooij
Merge 2.5.
485
msgid ""
486
"Note: The location can be specified either in the form of a branch,\n"
487
"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.
488
"with brz send."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
489
msgstr ""
490
6622.1.22 by Jelmer Vernooij
Update po files.
491
# help of 'verbose' option of 'pull' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
492
#: breezy/builtins.py:1146
6524.1.1 by Jelmer Vernooij
Merge 2.5.
493
msgid "Show logs of pulled revisions."
494
msgstr ""
495
6622.1.22 by Jelmer Vernooij
Update po files.
496
# help of 'directory' option of 'pull' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
497
#: breezy/builtins.py:1148
6524.1.1 by Jelmer Vernooij
Merge 2.5.
498
msgid ""
499
"Branch to pull into, rather than the one containing the working directory."
500
msgstr ""
501
6622.1.22 by Jelmer Vernooij
Update po files.
502
# help of 'local' option of 'pull' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
503
#: breezy/builtins.py:1151
6524.1.1 by Jelmer Vernooij
Merge 2.5.
504
msgid ""
505
"Perform a local pull in a bound branch.  Local pulls are not applied to the "
506
"master branch."
507
msgstr ""
508
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
509
#: breezy/builtins.py:1188
6622.1.22 by Jelmer Vernooij
Update po files.
510
msgid "No working tree, ignoring --show-base"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
511
msgstr ""
512
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
513
#: breezy/builtins.py:1204
6524.1.1 by Jelmer Vernooij
Merge 2.5.
514
msgid "No pull location known or specified."
515
msgstr ""
516
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
517
#: breezy/builtins.py:1210
6524.1.1 by Jelmer Vernooij
Merge 2.5.
518
#, python-format
519
msgid "Using saved parent location: %s\n"
520
msgstr ""
521
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
522
#: breezy/builtins.py:1217 breezy/builtins.py:4423
6524.1.1 by Jelmer Vernooij
Merge 2.5.
523
msgid "Cannot use -r with merge directives or bundles"
524
msgstr ""
525
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
526
#: breezy/builtins.py:1260
6524.1.1 by Jelmer Vernooij
Merge 2.5.
527
msgid "Update a mirror of this branch."
528
msgstr ""
529
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
530
#: breezy/builtins.py:1262
6524.1.1 by Jelmer Vernooij
Merge 2.5.
531
msgid ""
532
"The target branch will not have its working tree populated because this\n"
533
"is both expensive, and is not supported on remote file systems."
534
msgstr ""
535
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
536
#: breezy/builtins.py:1265
6524.1.1 by Jelmer Vernooij
Merge 2.5.
537
msgid ""
538
"Some smart servers or protocols *may* put the working tree in place in\n"
539
"the future."
540
msgstr ""
541
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
542
#: breezy/builtins.py:1268
6524.1.1 by Jelmer Vernooij
Merge 2.5.
543
msgid ""
544
"This command only works on branches that have not diverged.  Branches are\n"
545
"considered diverged if the destination branch's most recent commit is one\n"
546
"that has not been merged (directly or indirectly) by the source branch."
547
msgstr ""
548
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
549
#: breezy/builtins.py:1272
6524.1.1 by Jelmer Vernooij
Merge 2.5.
550
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
551
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
552
"the other branch completely, discarding its unmerged changes."
553
msgstr ""
554
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
555
#: breezy/builtins.py:1275
6524.1.1 by Jelmer Vernooij
Merge 2.5.
556
msgid ""
557
"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.
558
"do a merge (see brz help merge) from the other branch, and commit that.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
559
"After that you will be able to do a push without '--overwrite'."
560
msgstr ""
561
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
562
#: breezy/builtins.py:1279
6524.1.1 by Jelmer Vernooij
Merge 2.5.
563
msgid ""
564
"If there is no default push location set, the first push will set it (use\n"
565
"--no-remember to avoid setting it).  After that, you can omit the\n"
566
"location to use the default.  To change the default, use --remember. The\n"
567
"value will only be saved if the remote location can be accessed."
568
msgstr ""
569
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
570
#: breezy/builtins.py:1284
6524.1.1 by Jelmer Vernooij
Merge 2.5.
571
msgid ""
572
"The --verbose option will display the revisions pushed using the log_format\n"
573
"configuration option. You can use a different format by overriding it with\n"
574
"-Olog_format=<other_format>."
575
msgstr ""
576
6622.1.22 by Jelmer Vernooij
Update po files.
577
# help of 'directory' option of 'dpush' command
578
# help of 'directory' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
579
#: breezy/builtins.py:1295 breezy/foreign.py:272
6524.1.1 by Jelmer Vernooij
Merge 2.5.
580
msgid ""
581
"Branch to push from, rather than the one containing the working directory."
582
msgstr ""
583
6622.1.22 by Jelmer Vernooij
Update po files.
584
# help of 'use-existing-dir' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
585
#: breezy/builtins.py:1298
6524.1.1 by Jelmer Vernooij
Merge 2.5.
586
msgid ""
587
"By default push will fail if the target directory exists, but does not "
588
"already have a control directory.  This flag will allow push to proceed."
589
msgstr ""
590
6622.1.22 by Jelmer Vernooij
Update po files.
591
# help of 'stacked' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
592
#: breezy/builtins.py:1303
6524.1.1 by Jelmer Vernooij
Merge 2.5.
593
msgid ""
594
"Create a stacked branch that references the public location of the parent "
595
"branch."
596
msgstr ""
597
6622.1.22 by Jelmer Vernooij
Update po files.
598
# help of 'stacked-on' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
599
#: breezy/builtins.py:1306
6524.1.1 by Jelmer Vernooij
Merge 2.5.
600
msgid ""
601
"Create a stacked branch that refers to another branch for the commit "
602
"history. Only the work not present in the referenced branch is included in "
603
"the branch created."
604
msgstr ""
605
6622.1.22 by Jelmer Vernooij
Update po files.
606
# help of 'strict' option of 'dpush' command
607
# help of 'strict' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
608
#: breezy/builtins.py:1311 breezy/foreign.py:279
6524.1.1 by Jelmer Vernooij
Merge 2.5.
609
msgid ""
610
"Refuse to push if there are uncommitted changes in the working tree, --no-"
611
"strict disables the check."
612
msgstr ""
613
6622.1.22 by Jelmer Vernooij
Update po files.
614
# help of 'no-tree' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
615
#: breezy/builtins.py:1314
6524.1.1 by Jelmer Vernooij
Merge 2.5.
616
msgid "Don't populate the working tree, even for protocols that support it."
617
msgstr ""
618
6622.1.22 by Jelmer Vernooij
Update po files.
619
# help of 'overwrite-tags' option of 'pull' command
620
# help of 'overwrite-tags' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
621
#: breezy/builtins.py:1317
6622.1.22 by Jelmer Vernooij
Update po files.
622
msgid "Overwrite tags only."
623
msgstr ""
624
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
625
#: breezy/builtins.py:1368
6524.1.1 by Jelmer Vernooij
Merge 2.5.
626
msgid "Could not determine branch to refer to."
627
msgstr ""
628
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
629
#: breezy/builtins.py:1377
6524.1.1 by Jelmer Vernooij
Merge 2.5.
630
#, python-format
631
msgid ""
632
"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.
633
"use 'brz push :parent'."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
634
msgstr ""
635
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
636
#: breezy/builtins.py:1383 breezy/foreign.py:306
6524.1.1 by Jelmer Vernooij
Merge 2.5.
637
msgid "No push location known or specified."
638
msgstr ""
639
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
640
#: breezy/builtins.py:1387
6524.1.1 by Jelmer Vernooij
Merge 2.5.
641
#, python-format
642
msgid "Using saved push location: %s"
643
msgstr ""
644
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
645
#: breezy/builtins.py:1397
6524.1.1 by Jelmer Vernooij
Merge 2.5.
646
msgid "Create a new branch that is a copy of an existing branch."
647
msgstr ""
648
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
649
#: breezy/builtins.py:1399
6524.1.1 by Jelmer Vernooij
Merge 2.5.
650
msgid ""
651
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
6622.1.22 by Jelmer Vernooij
Update po files.
652
"be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
653
"bar.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
654
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
655
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
656
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
657
"create ./foo-bar."
658
msgstr ""
659
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
660
#: breezy/builtins.py:1406
6524.1.1 by Jelmer Vernooij
Merge 2.5.
661
msgid ""
662
"To retrieve the branch as of a particular revision, supply the --revision\n"
663
"parameter, as in \"branch foo/bar -r 5\"."
664
msgstr ""
665
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
666
#: breezy/builtins.py:1409
6524.1.1 by Jelmer Vernooij
Merge 2.5.
667
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
668
msgstr ""
669
6622.1.22 by Jelmer Vernooij
Update po files.
670
# help of 'no-tree' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
671
#: breezy/builtins.py:1419
6524.1.1 by Jelmer Vernooij
Merge 2.5.
672
msgid "Create a branch without a working-tree."
673
msgstr ""
674
6622.1.22 by Jelmer Vernooij
Update po files.
675
# help of 'switch' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
676
#: breezy/builtins.py:1421
6524.1.1 by Jelmer Vernooij
Merge 2.5.
677
msgid "Switch the checkout in the current directory to the new branch."
678
msgstr ""
679
6622.1.22 by Jelmer Vernooij
Update po files.
680
# help of 'stacked' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
681
#: breezy/builtins.py:1424
6524.1.1 by Jelmer Vernooij
Merge 2.5.
682
msgid ""
683
"Create a stacked branch referring to the source branch. The new branch will "
684
"depend on the availability of the source branch for all operations."
685
msgstr ""
686
6622.1.22 by Jelmer Vernooij
Update po files.
687
# help of 'standalone' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
688
#: breezy/builtins.py:1428
6524.1.1 by Jelmer Vernooij
Merge 2.5.
689
msgid "Do not use a shared repository, even if available."
690
msgstr ""
691
6622.1.22 by Jelmer Vernooij
Update po files.
692
# help of 'use-existing-dir' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
693
#: breezy/builtins.py:1430
6524.1.1 by Jelmer Vernooij
Merge 2.5.
694
msgid ""
695
"By default branch will fail if the target directory exists, but does not "
696
"already have a control directory.  This flag will allow branch to proceed."
697
msgstr ""
698
6622.1.22 by Jelmer Vernooij
Update po files.
699
# help of 'bind' option of 'branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
700
#: breezy/builtins.py:1435
6524.1.1 by Jelmer Vernooij
Merge 2.5.
701
msgid "Bind new branch to from location."
702
msgstr ""
703
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
704
#: breezy/builtins.py:1482
6524.1.1 by Jelmer Vernooij
Merge 2.5.
705
#, python-format
706
msgid "Target directory \"%s\" already exists."
707
msgstr ""
708
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
709
#: breezy/builtins.py:1494
6524.1.1 by Jelmer Vernooij
Merge 2.5.
710
#, python-format
711
msgid "Parent of \"%s\" does not exist."
712
msgstr ""
713
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
714
#: breezy/builtins.py:1513
6622.1.22 by Jelmer Vernooij
Update po files.
715
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
716
msgid "The branch {0} has no revision {1}."
717
msgstr ""
718
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
719
#: breezy/builtins.py:1528 breezy/push.py:53
6524.1.1 by Jelmer Vernooij
Merge 2.5.
720
#, python-format
721
msgid "Created new stacked branch referring to %s."
722
msgstr ""
723
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
724
#: breezy/builtins.py:1532
6524.1.1 by Jelmer Vernooij
Merge 2.5.
725
#, python-format
726
msgid "Branched %d revision."
727
msgid_plural "Branched %d revisions."
728
msgstr[0] ""
729
msgstr[1] ""
730
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
731
#: breezy/builtins.py:1537
6524.1.1 by Jelmer Vernooij
Merge 2.5.
732
#, python-format
733
msgid "New branch bound to %s"
734
msgstr ""
735
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
736
#: breezy/builtins.py:1542 breezy/builtins.py:6283
6524.1.1 by Jelmer Vernooij
Merge 2.5.
737
#, python-format
738
msgid "Switched to branch: %s"
739
msgstr ""
740
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
741
#: breezy/builtins.py:1547
6524.1.1 by Jelmer Vernooij
Merge 2.5.
742
msgid "List the branches available at the current location."
743
msgstr ""
744
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
745
#: breezy/builtins.py:1549
6524.1.1 by Jelmer Vernooij
Merge 2.5.
746
msgid ""
747
"This command will print the names of all the branches at the current\n"
748
"location."
749
msgstr ""
750
6622.1.22 by Jelmer Vernooij
Update po files.
751
# help of 'recursive' option of 'branches' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
752
#: breezy/builtins.py:1556
6524.1.1 by Jelmer Vernooij
Merge 2.5.
753
msgid ""
754
"Recursively scan for branches rather than just looking in the specified "
755
"location."
756
msgstr ""
757
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
758
#: breezy/builtins.py:1585
6524.1.1 by Jelmer Vernooij
Merge 2.5.
759
msgid "(default)"
760
msgstr ""
761
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
762
#: breezy/builtins.py:1597
6524.1.1 by Jelmer Vernooij
Merge 2.5.
763
msgid "Create a new checkout of an existing branch."
764
msgstr ""
765
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
766
#: breezy/builtins.py:1599
6524.1.1 by Jelmer Vernooij
Merge 2.5.
767
msgid ""
768
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
769
"for\n"
770
"the branch found in '.'. This is useful if you have removed the working "
771
"tree\n"
772
"or if it was never created - i.e. if you pushed the branch to its current\n"
773
"location using SFTP."
774
msgstr ""
775
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
776
#: breezy/builtins.py:1604
6524.1.1 by Jelmer Vernooij
Merge 2.5.
777
msgid ""
778
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
779
"will\n"
6622.1.22 by Jelmer Vernooij
Update po files.
780
"be used.  In other words, \"checkout ../foo/bar\" will attempt to create ./"
781
"bar.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
782
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
783
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
784
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
785
"create ./foo-bar."
786
msgstr ""
787
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
788
#: breezy/builtins.py:1611
6524.1.1 by Jelmer Vernooij
Merge 2.5.
789
msgid ""
790
"To retrieve the branch as of a particular revision, supply the --revision\n"
791
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
792
"immediately\n"
793
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
794
"old\n"
795
"code.)"
796
msgstr ""
797
6622.1.22 by Jelmer Vernooij
Update po files.
798
# help of 'lightweight' option of 'checkout' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
799
#: breezy/builtins.py:1621
6524.1.1 by Jelmer Vernooij
Merge 2.5.
800
msgid ""
801
"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
802
"the branch for every operation.  Normal checkouts can perform common "
803
"operations like diff and status without such access, and also support local "
804
"commits."
805
msgstr ""
806
6622.1.22 by Jelmer Vernooij
Update po files.
807
# help of 'files-from' option of 'branch' command
808
# help of 'files-from' option of 'checkout' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
809
#: breezy/builtins.py:1628
6524.1.1 by Jelmer Vernooij
Merge 2.5.
810
msgid "Get file contents from this tree."
811
msgstr ""
812
6622.1.22 by Jelmer Vernooij
Update po files.
813
# help of 'hardlink' option of 'branch' command
814
# help of 'hardlink' option of 'checkout' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
815
#: breezy/builtins.py:1630
6524.1.1 by Jelmer Vernooij
Merge 2.5.
816
msgid "Hard-link working tree files where possible."
817
msgstr ""
818
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
819
#: breezy/builtins.py:1671
6524.1.1 by Jelmer Vernooij
Merge 2.5.
820
msgid ""
821
"Show list of renamed files.\n"
822
"    "
823
msgstr ""
824
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
825
#: breezy/builtins.py:1699
6524.1.1 by Jelmer Vernooij
Merge 2.5.
826
msgid "Update a working tree to a new revision."
827
msgstr ""
828
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
829
#: breezy/builtins.py:1701
6524.1.1 by Jelmer Vernooij
Merge 2.5.
830
msgid ""
831
"This will perform a merge of the destination revision (the tip of the\n"
832
"branch, or the specified revision) into the working tree, and then make\n"
833
"that revision the basis revision for the working tree.  "
834
msgstr ""
835
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
836
#: breezy/builtins.py:1705
6524.1.1 by Jelmer Vernooij
Merge 2.5.
837
msgid ""
838
"You can use this to visit an older revision, or to update a working tree\n"
839
"that is out of date from its branch."
840
msgstr ""
841
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
842
#: breezy/builtins.py:1708
6524.1.1 by Jelmer Vernooij
Merge 2.5.
843
msgid ""
844
"If there are any uncommitted changes in the tree, they will be carried\n"
845
"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.
846
"these changes, use 'brz revert'.  The uncommitted changes may conflict\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
847
"with the changes brought in by the change in basis revision."
848
msgstr ""
849
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
850
#: breezy/builtins.py:1713
6524.1.1 by Jelmer Vernooij
Merge 2.5.
851
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
852
"If the tree's branch is bound to a master branch, brz will also update\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
853
"the branch from the master."
854
msgstr ""
855
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
856
#: breezy/builtins.py:1716
6524.1.1 by Jelmer Vernooij
Merge 2.5.
857
msgid ""
858
"You cannot update just a single file or directory, because each Bazaar\n"
859
"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.
860
"file that has been removed locally, use 'brz revert' instead of 'brz\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
861
"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.
862
"revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
863
"out the old content of that file to a new location."
864
msgstr ""
865
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
866
#: breezy/builtins.py:1723
6524.1.1 by Jelmer Vernooij
Merge 2.5.
867
msgid ""
868
"The 'dir' argument, if given, must be the location of the root of a\n"
869
"working tree to update.  By default, the working tree that contains the \n"
870
"current working directory is used."
871
msgstr ""
872
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
873
#: breezy/builtins.py:1739
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
874
msgid "brz update --revision takes exactly one revision"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
875
msgstr ""
876
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
877
#: breezy/builtins.py:1747
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
878
msgid "brz update can only update a whole tree, not a file or subdirectory"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
879
msgstr ""
880
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
881
#: breezy/builtins.py:1778
6622.1.22 by Jelmer Vernooij
Update po files.
882
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
883
msgid "Tree is up to date at revision {0} of branch {1}"
884
msgstr ""
885
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
886
#: breezy/builtins.py:1794
6524.1.1 by Jelmer Vernooij
Merge 2.5.
887
#, python-format
888
msgid ""
889
"branch has no revision %s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
890
"brz update --revision only works for a revision in the branch history"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
891
msgstr ""
892
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
893
#: breezy/builtins.py:1800
6622.1.22 by Jelmer Vernooij
Update po files.
894
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
895
msgid "Updated to revision {0} of branch {1}"
896
msgstr ""
897
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
898
#: breezy/builtins.py:1804
6524.1.1 by Jelmer Vernooij
Merge 2.5.
899
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
900
"Your local commits will now show as pending merges with 'brz status', and "
901
"can be committed with 'brz commit'."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
902
msgstr ""
903
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
904
#: breezy/builtins.py:1813
6524.1.1 by Jelmer Vernooij
Merge 2.5.
905
msgid "Show information about a working tree, branch or repository."
906
msgstr ""
907
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
908
#: breezy/builtins.py:1815
6524.1.1 by Jelmer Vernooij
Merge 2.5.
909
msgid ""
910
"This command will show all known locations and formats associated to the\n"
911
"tree, branch or repository."
912
msgstr ""
913
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
914
#: breezy/builtins.py:1818
6524.1.1 by Jelmer Vernooij
Merge 2.5.
915
msgid ""
916
"In verbose mode, statistical information is included with each report.\n"
917
"To see extended statistic information, use a verbosity level of 2 or\n"
918
"higher by specifying the verbose option multiple times, e.g. -vv."
919
msgstr ""
920
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
921
#: breezy/builtins.py:1822
6524.1.1 by Jelmer Vernooij
Merge 2.5.
922
msgid "Branches and working trees will also report any missing revisions."
923
msgstr ""
924
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
925
#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883
926
#: breezy/builtins.py:6469
6524.1.1 by Jelmer Vernooij
Merge 2.5.
927
msgid ":Examples:"
928
msgstr ""
929
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
930
#: breezy/builtins.py:1826
6524.1.1 by Jelmer Vernooij
Merge 2.5.
931
msgid "  Display information on the format and related locations:"
932
msgstr ""
933
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
934
#: breezy/builtins.py:1828
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
935
msgid "    brz info"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
936
msgstr ""
937
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
938
#: breezy/builtins.py:1830
6524.1.1 by Jelmer Vernooij
Merge 2.5.
939
msgid ""
940
"  Display the above together with extended format information and\n"
941
"  basic statistics (like the number of files in the working tree and\n"
942
"  number of revisions in the branch and repository):"
943
msgstr ""
944
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
945
#: breezy/builtins.py:1834
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
946
msgid "    brz info -v"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
947
msgstr ""
948
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
949
#: breezy/builtins.py:1836
6524.1.1 by Jelmer Vernooij
Merge 2.5.
950
msgid "  Display the above together with number of committers to the branch:"
951
msgstr ""
952
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
953
#: breezy/builtins.py:1838
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
954
msgid "    brz info -vv"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
955
msgstr ""
956
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
957
#: breezy/builtins.py:1857
6524.1.1 by Jelmer Vernooij
Merge 2.5.
958
msgid "Remove files or directories."
959
msgstr ""
960
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
961
#: breezy/builtins.py:1859
6524.1.1 by Jelmer Vernooij
Merge 2.5.
962
msgid ""
963
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
964
"delete them if they can easily be recovered using revert otherwise they\n"
6622.1.22 by Jelmer Vernooij
Update po files.
965
"will be backed up (adding an extension of the form .~#~). If no options or\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
966
"parameters are given Bazaar will scan for files that are being tracked by\n"
967
"Bazaar but missing in your tree and stop tracking them for you."
968
msgstr ""
969
6622.1.22 by Jelmer Vernooij
Update po files.
970
# help of 'new' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
971
#: breezy/builtins.py:1867
6524.1.1 by Jelmer Vernooij
Merge 2.5.
972
msgid "Only remove files that have never been committed."
973
msgstr ""
974
6622.1.22 by Jelmer Vernooij
Update po files.
975
# help of 'file-deletion-strategy' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
976
#: breezy/builtins.py:1869
6524.1.1 by Jelmer Vernooij
Merge 2.5.
977
msgid "The file deletion mode to be used."
978
msgstr ""
979
6622.1.22 by Jelmer Vernooij
Update po files.
980
# title of 'file-deletion-strategy' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
981
#: breezy/builtins.py:1870
6524.1.1 by Jelmer Vernooij
Merge 2.5.
982
msgid "Deletion Strategy"
983
msgstr ""
984
6622.1.22 by Jelmer Vernooij
Update po files.
985
# help of 'file-deletion-strategy=safe' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
986
#: breezy/builtins.py:1871
6524.1.1 by Jelmer Vernooij
Merge 2.5.
987
msgid "Backup changed files (default)."
988
msgstr ""
989
6622.1.22 by Jelmer Vernooij
Update po files.
990
# help of 'file-deletion-strategy=keep' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
991
#: breezy/builtins.py:1872
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
992
msgid "Delete from brz but leave the working copy."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
993
msgstr ""
994
6622.1.22 by Jelmer Vernooij
Update po files.
995
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
996
#: breezy/builtins.py:1873
6524.1.1 by Jelmer Vernooij
Merge 2.5.
997
msgid "Don't backup changed files."
998
msgstr ""
999
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1000
#: breezy/builtins.py:1894
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1001
msgid "No matching files."
1002
msgstr ""
1003
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1004
#: breezy/builtins.py:1955
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1005
msgid "Reconcile brz metadata in a branch."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1006
msgstr ""
1007
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1008
#: breezy/builtins.py:1957
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1009
msgid ""
1010
"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.
1011
"previous ghost operations or brz upgrades. You should only\n"
1012
"need to run this command if 'brz check' or a brz developer\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1013
"advises you to run it."
1014
msgstr ""
1015
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1016
#: breezy/builtins.py:1962
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1017
msgid ""
1018
"If a second branch is provided, cross-branch reconciliation is\n"
1019
"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.
1020
"id which was not present in very early brz versions is represented\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1021
"correctly in both branches."
1022
msgstr ""
1023
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1024
#: breezy/builtins.py:1967
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1025
msgid ""
1026
"At the same time it is run it may recompress data resulting in\n"
1027
"a potential saving in disk space or performance gain."
1028
msgstr ""
1029
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1030
#: breezy/builtins.py:1970
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1031
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1032
msgstr ""
1033
6622.1.22 by Jelmer Vernooij
Update po files.
1034
# help of 'format=2a' option of 'init' command
1035
# help of 'format=default' option of 'init' command
1036
# help of 'format=2a' option of 'init-repository' command
1037
# help of 'format=default' option of 'init-repository' command
1038
# help of 'format=2a' option of 'upgrade' command
1039
# help of 'format=default' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1040
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1041
msgid ""
1042
"Format for the bzr 2.0 series.\n"
1043
"Uses group-compress storage.\n"
1044
"Provides rich roots which are a one-way transition.\n"
1045
msgstr ""
1046
6622.1.22 by Jelmer Vernooij
Update po files.
1047
# help of 'format=pack-0.92' option of 'init' command
1048
# help of 'format=pack-0.92' option of 'init-repository' command
1049
# help of 'format=pack-0.92' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1050
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1051
msgid ""
1052
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1053
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1054
msgstr ""
1055
6622.1.22 by Jelmer Vernooij
Update po files.
1056
# help of 'format=development-colo' option of 'init' command
1057
# help of 'format=development-colo' option of 'init-repository' command
1058
# help of 'format=development-colo' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1059
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1060
msgid "The 2a format with experimental support for colocated branches.\n"
1061
msgstr ""
1062
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1063
#: breezy/builtins.py:2038
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1064
msgid "Make a directory into a versioned branch."
1065
msgstr ""
1066
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1067
#: breezy/builtins.py:2040
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1068
msgid ""
1069
"Use this to create an empty branch, or before importing an\n"
1070
"existing project."
1071
msgstr ""
1072
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1073
#: breezy/builtins.py:2043
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1074
msgid ""
1075
"If there is a repository in a parent directory of the location, then\n"
1076
"the history of the branch will be stored in the repository.  Otherwise\n"
1077
"init creates a standalone branch which carries its own history\n"
1078
"in the .bzr directory."
1079
msgstr ""
1080
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1081
#: breezy/builtins.py:2048
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1082
msgid ""
1083
"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.
1084
"the tree can be populated with 'brz checkout'."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1085
msgstr ""
1086
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1087
#: breezy/builtins.py:2051
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1088
msgid "Recipe for importing a tree of files::"
1089
msgstr ""
1090
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1091
#: breezy/builtins.py:2053
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1092
msgid ""
1093
"    cd ~/project\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1094
"    brz init\n"
1095
"    brz add .\n"
1096
"    brz status\n"
1097
"    brz commit -m \"imported project\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1098
msgstr ""
1099
6622.1.22 by Jelmer Vernooij
Update po files.
1100
# help of 'create-prefix' option of 'init' command
1101
# help of 'create-prefix' option of 'push' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1102
#: breezy/builtins.py:2064
6622.1.22 by Jelmer Vernooij
Update po files.
1103
msgid "Create the path leading up to the branch if it does not already exist."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1104
msgstr ""
1105
6622.1.22 by Jelmer Vernooij
Update po files.
1106
# help of 'format' option of 'init' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1107
#: breezy/builtins.py:2067
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1108
msgid "Specify a format for this branch. See \"help formats\"."
1109
msgstr ""
1110
6622.1.22 by Jelmer Vernooij
Update po files.
1111
# help of 'append-revisions-only' option of 'init' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1112
#: breezy/builtins.py:2075
6622.1.22 by Jelmer Vernooij
Update po files.
1113
msgid "Never change revnos or the existing log.  Append revisions to it only."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1114
msgstr ""
1115
6622.1.22 by Jelmer Vernooij
Update po files.
1116
# help of 'no-tree' option of 'init' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1117
#: breezy/builtins.py:2078
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1118
msgid "Create a branch without a working tree."
1119
msgstr ""
1120
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1121
#: breezy/builtins.py:2098 breezy/push.py:110
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1122
#, python-format
1123
msgid ""
1124
"Parent directory of %s does not exist.\n"
1125
"You may supply --create-prefix to create all leading parent directories."
1126
msgstr ""
1127
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1128
#: breezy/builtins.py:2132
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1129
msgid ""
1130
"This branch format cannot be set to append-revisions-only.  Try --default."
1131
msgstr ""
1132
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1133
#: breezy/builtins.py:2143
6622.1.22 by Jelmer Vernooij
Update po files.
1134
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1135
msgid "Created a {0} (format: {1})\n"
1136
msgstr ""
1137
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1138
#: breezy/builtins.py:2152
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1139
#, python-format
1140
msgid "Using shared repository: %s\n"
1141
msgstr ""
1142
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1143
#: breezy/builtins.py:2156
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1144
msgid "Create a shared repository for branches to share storage space."
1145
msgstr ""
1146
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1147
#: breezy/builtins.py:2158
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1148
msgid ""
1149
"New branches created under the repository directory will store their\n"
1150
"revisions in the repository, not in the branch directory.  For branches\n"
1151
"with shared history, this reduces the amount of storage needed and \n"
1152
"speeds up the creation of new branches."
1153
msgstr ""
1154
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1155
#: breezy/builtins.py:2163
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1156
msgid ""
1157
"If the --no-trees option is given then the branches in the repository\n"
1158
"will not have working trees by default.  They will still exist as \n"
1159
"directories on disk, but they will not have separate copies of the \n"
1160
"files at a certain revision.  This can be useful for repositories that\n"
1161
"store branches which are interacted with through checkouts or remote\n"
1162
"branches, such as on a server."
1163
msgstr ""
1164
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1165
#: breezy/builtins.py:2170
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1166
msgid ""
1167
":Examples:\n"
1168
"    Create a shared repository holding just branches::"
1169
msgstr ""
1170
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1171
#: breezy/builtins.py:2173
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1172
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1173
"        brz init-repo --no-trees repo\n"
1174
"        brz init repo/trunk"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1175
msgstr ""
1176
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1177
#: breezy/builtins.py:2176
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1178
msgid "    Make a lightweight checkout elsewhere::"
1179
msgstr ""
1180
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1181
#: breezy/builtins.py:2178
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1182
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1183
"        brz checkout --lightweight repo/trunk trunk-checkout\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1184
"        cd trunk-checkout\n"
1185
"        (add files here)"
1186
msgstr ""
1187
6622.1.22 by Jelmer Vernooij
Update po files.
1188
# help of 'format' option of 'init-repository' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1189
#: breezy/builtins.py:2186
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1190
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1191
"Specify a format for this repository. See \"brz help formats\" for details."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1192
msgstr ""
1193
6622.1.22 by Jelmer Vernooij
Update po files.
1194
# title of 'format' option of 'init-repository' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1195
#: breezy/builtins.py:2190
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1196
msgid "Repository format"
1197
msgstr ""
1198
6622.1.22 by Jelmer Vernooij
Update po files.
1199
# help of 'no-trees' option of 'init-repository' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1200
#: breezy/builtins.py:2192
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1201
msgid "Branches in the repository will default to not having a working tree."
1202
msgstr ""
1203
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1204
#: breezy/builtins.py:2218
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1205
msgid "Show differences in the working tree, between revisions or branches."
1206
msgstr ""
1207
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1208
#: breezy/builtins.py:2220
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1209
msgid ""
1210
"If no arguments are given, all changes for the current tree are listed.\n"
1211
"If files are given, only the changes in those files are listed.\n"
1212
"Remote and multiple branches can be compared by using the --old and\n"
1213
"--new options. If not provided, the default for both is derived from\n"
1214
"the first argument, if any, or the current tree if no arguments are\n"
1215
"given."
1216
msgstr ""
1217
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1218
#: breezy/builtins.py:2227
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1219
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1220
"\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1221
"produces patches suitable for \"patch -p1\"."
1222
msgstr ""
1223
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1224
#: breezy/builtins.py:2230
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1225
msgid ""
1226
"Note that when using the -r argument with a range of revisions, the\n"
1227
"differences are computed between the two specified revisions.  That\n"
1228
"is, the command does not show the changes introduced by the first \n"
1229
"revision in the range.  This differs from the interpretation of \n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1230
"revision ranges used by \"brz log\" which includes the first revision\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1231
"in the range."
1232
msgstr ""
1233
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1234
#: breezy/builtins.py:2237
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1235
msgid ""
1236
":Exit values:\n"
1237
"    1 - changed\n"
1238
"    2 - unrepresentable changes\n"
1239
"    3 - error\n"
1240
"    0 - no change"
1241
msgstr ""
1242
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1243
#: breezy/builtins.py:2243
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1244
msgid ""
1245
":Examples:\n"
1246
"    Shows the difference in the working tree versus the last commit::"
1247
msgstr ""
1248
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1249
#: breezy/builtins.py:2246
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1250
msgid "        brz diff"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1251
msgstr ""
1252
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1253
#: breezy/builtins.py:2248
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1254
msgid "    Difference between the working tree and revision 1::"
1255
msgstr ""
1256
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1257
#: breezy/builtins.py:2250
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1258
msgid "        brz diff -r1"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1259
msgstr ""
1260
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1261
#: breezy/builtins.py:2252
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1262
msgid "    Difference between revision 3 and revision 1::"
1263
msgstr ""
1264
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1265
#: breezy/builtins.py:2254
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1266
msgid "        brz diff -r1..3"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1267
msgstr ""
1268
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1269
#: breezy/builtins.py:2256
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1270
msgid "    Difference between revision 3 and revision 1 for branch xxx::"
1271
msgstr ""
1272
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1273
#: breezy/builtins.py:2258
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1274
msgid "        brz diff -r1..3 xxx"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1275
msgstr ""
1276
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1277
#: breezy/builtins.py:2260
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1278
msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
1279
msgstr ""
1280
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1281
#: breezy/builtins.py:2262
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1282
msgid "        brz diff -c2"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1283
msgstr ""
1284
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1285
#: breezy/builtins.py:2264
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1286
msgid ""
1287
"    To see the changes introduced by revision X::\n"
1288
"    \n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1289
"        brz diff -cX"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1290
msgstr ""
1291
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1292
#: breezy/builtins.py:2268
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1293
msgid ""
1294
"    Note that in the case of a merge, the -c option shows the changes\n"
1295
"    compared to the left hand parent. To see the changes against\n"
1296
"    another parent, use::"
1297
msgstr ""
1298
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1299
#: breezy/builtins.py:2272
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1300
msgid "        brz diff -r<chosen_parent>..X"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1301
msgstr ""
1302
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1303
#: breezy/builtins.py:2274
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1304
msgid ""
1305
"    The changes between the current revision and the previous revision\n"
1306
"    (equivalent to -c-1 and -r-2..-1)"
1307
msgstr ""
1308
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1309
#: breezy/builtins.py:2277
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1310
msgid "        brz diff -r-2.."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1311
msgstr ""
1312
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1313
#: breezy/builtins.py:2279
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1314
msgid "    Show just the differences for file NEWS::"
1315
msgstr ""
1316
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1317
#: breezy/builtins.py:2281
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1318
msgid "        brz diff NEWS"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1319
msgstr ""
1320
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1321
#: breezy/builtins.py:2283
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1322
msgid "    Show the differences in working tree xxx for file NEWS::"
1323
msgstr ""
1324
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1325
#: breezy/builtins.py:2285
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1326
msgid "        brz diff xxx/NEWS"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1327
msgstr ""
1328
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1329
#: breezy/builtins.py:2287
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1330
msgid "    Show the differences from branch xxx to this working tree:"
1331
msgstr ""
1332
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1333
#: breezy/builtins.py:2289
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1334
msgid "        brz diff --old xxx"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1335
msgstr ""
1336
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1337
#: breezy/builtins.py:2291
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1338
msgid "    Show the differences between two branches for file NEWS::"
1339
msgstr ""
1340
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1341
#: breezy/builtins.py:2293
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1342
msgid "        brz diff --old xxx --new yyy NEWS"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1343
msgstr ""
1344
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1345
#: breezy/builtins.py:2295
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1346
msgid "    Same as 'brz diff' but prefix paths with old/ and new/::"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1347
msgstr ""
1348
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1349
#: breezy/builtins.py:2297
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1350
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1351
"        brz diff --prefix old/:new/\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1352
"        \n"
1353
"    Show the differences using a custom diff program with options::\n"
1354
"    \n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1355
"        brz diff --using /usr/bin/diff --diff-options -wu"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1356
msgstr ""
1357
6622.1.22 by Jelmer Vernooij
Update po files.
1358
# help of 'diff-options' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1359
#: breezy/builtins.py:2307
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1360
msgid "Pass these options to the external diff program."
1361
msgstr ""
1362
6622.1.22 by Jelmer Vernooij
Update po files.
1363
# help of 'prefix' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1364
#: breezy/builtins.py:2310
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1365
msgid ""
1366
"Set prefixes added to old and new filenames, as two values separated by a "
1367
"colon. (eg \"old/:new/\")."
1368
msgstr ""
1369
6622.1.22 by Jelmer Vernooij
Update po files.
1370
# help of 'old' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1371
#: breezy/builtins.py:2313
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1372
msgid "Branch/tree to compare from."
1373
msgstr ""
1374
6622.1.22 by Jelmer Vernooij
Update po files.
1375
# help of 'new' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1376
#: breezy/builtins.py:2317
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1377
msgid "Branch/tree to compare to."
1378
msgstr ""
1379
6622.1.22 by Jelmer Vernooij
Update po files.
1380
# help of 'using' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1381
#: breezy/builtins.py:2323
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1382
msgid "Use this command to compare files."
1383
msgstr ""
1384
6622.1.22 by Jelmer Vernooij
Update po files.
1385
# help of 'format' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1386
#: breezy/builtins.py:2328
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1387
msgid "Diff format to use."
1388
msgstr ""
1389
6622.1.22 by Jelmer Vernooij
Update po files.
1390
# title of 'format' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1391
#: breezy/builtins.py:2330
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1392
msgid "Diff format"
1393
msgstr ""
1394
6622.1.22 by Jelmer Vernooij
Update po files.
1395
# help of 'context' option of 'diff' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1396
#: breezy/builtins.py:2332
6622.1.22 by Jelmer Vernooij
Update po files.
1397
msgid "How many lines of context to show."
1398
msgstr ""
1399
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1400
#: breezy/builtins.py:2357
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1401
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1402
msgstr ""
1403
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1404
#: breezy/builtins.py:2361
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1405
msgid "brz diff --revision takes exactly one or two revision specifiers"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1406
msgstr ""
1407
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1408
#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776
1409
#: breezy/builtins.py:2784 breezy/builtins.py:4957
6622.1.22 by Jelmer Vernooij
Update po files.
1410
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1411
msgid "{0} and {1} are mutually exclusive"
1412
msgstr ""
1413
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1414
#: breezy/builtins.py:2386
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1415
msgid ""
1416
"List files deleted in the working tree.\n"
1417
"    "
1418
msgstr ""
1419
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1420
#: breezy/builtins.py:2463
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1421
msgid "Show the tree root directory."
1422
msgstr ""
1423
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1424
#: breezy/builtins.py:2465
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1425
msgid ""
1426
"The root is the nearest enclosing directory with a .bzr control\n"
1427
"directory."
1428
msgstr ""
1429
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1430
#: breezy/builtins.py:2480
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1431
msgid "The limit argument must be an integer."
1432
msgstr ""
1433
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1434
#: breezy/builtins.py:2488
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1435
msgid "The levels argument must be an integer."
1436
msgstr ""
1437
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1438
#: breezy/builtins.py:2493
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1439
msgid "Show historical log for a branch or subset of a branch."
1440
msgstr ""
1441
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1442
#: breezy/builtins.py:2495
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1443
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1444
"log is brz's default tool for exploring the history of a branch.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1445
"The branch to use is taken from the first parameter. If no parameters\n"
1446
"are given, the branch containing the working directory is logged.\n"
1447
"Here are some simple examples::"
1448
msgstr ""
1449
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1450
#: breezy/builtins.py:2500
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1451
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1452
"  brz log                       log the current branch\n"
1453
"  brz log foo.py                log a file in its branch\n"
1454
"  brz log http://server/branch  log a branch on a server"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1455
msgstr ""
1456
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1457
#: breezy/builtins.py:2504
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1458
msgid ""
1459
"The filtering, ordering and information shown for each revision can\n"
1460
"be controlled as explained below. By default, all revisions are\n"
1461
"shown sorted (topologically) so that newer revisions appear before\n"
1462
"older ones and descendants always appear before ancestors. If displayed,\n"
1463
"merged revisions are shown indented under the revision in which they\n"
1464
"were merged."
1465
msgstr ""
1466
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1467
#: breezy/builtins.py:2511
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1468
msgid ":Output control:"
1469
msgstr ""
1470
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1471
#: breezy/builtins.py:2513
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1472
msgid ""
1473
"  The log format controls how information about each revision is\n"
1474
"  displayed. The standard log formats are called ``long``, ``short``\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1475
"  and ``line``. The default is long. See ``brz help log-formats``\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1476
"  for more details on log formats."
1477
msgstr ""
1478
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1479
#: breezy/builtins.py:2518
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1480
msgid ""
1481
"  The following options can be used to control what information is\n"
1482
"  displayed::"
1483
msgstr ""
1484
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1485
#: breezy/builtins.py:2521
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1486
msgid ""
1487
"    -l N        display a maximum of N revisions\n"
1488
"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
1489
"    -v          display a status summary (delta) for each revision\n"
1490
"    -p          display a diff (patch) for each revision\n"
1491
"    --show-ids  display revision-ids (and file-ids), not just revnos"
1492
msgstr ""
1493
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1494
#: breezy/builtins.py:2527
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1495
msgid ""
1496
"  Note that the default number of levels to display is a function of the\n"
1497
"  log format. If the -n option is not used, the standard log formats show\n"
1498
"  just the top level (mainline)."
1499
msgstr ""
1500
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1501
#: breezy/builtins.py:2531
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1502
msgid ""
1503
"  Status summaries are shown using status flags like A, M, etc. To see\n"
1504
"  the changes explained using words like ``added`` and ``modified``\n"
1505
"  instead, use the -vv option."
1506
msgstr ""
1507
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1508
#: breezy/builtins.py:2535
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1509
msgid ":Ordering control:"
1510
msgstr ""
1511
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1512
#: breezy/builtins.py:2537
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1513
msgid ""
1514
"  To display revisions from oldest to newest, use the --forward option.\n"
1515
"  In most cases, using this option will have little impact on the total\n"
1516
"  time taken to produce a log, though --forward does not incrementally\n"
1517
"  display revisions like --reverse does when it can."
1518
msgstr ""
1519
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1520
#: breezy/builtins.py:2542
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1521
msgid ":Revision filtering:"
1522
msgstr ""
1523
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1524
#: breezy/builtins.py:2544
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1525
msgid ""
1526
"  The -r option can be used to specify what revision or range of revisions\n"
1527
"  to filter against. The various forms are shown below::"
1528
msgstr ""
1529
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1530
#: breezy/builtins.py:2547
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1531
msgid ""
1532
"    -rX      display revision X\n"
1533
"    -rX..    display revision X and later\n"
1534
"    -r..Y    display up to and including revision Y\n"
1535
"    -rX..Y   display from X to Y inclusive"
1536
msgstr ""
1537
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1538
#: breezy/builtins.py:2552
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1539
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1540
"  See ``brz help revisionspec`` for details on how to specify X and Y.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1541
"  Some common examples are given below::"
1542
msgstr ""
1543
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1544
#: breezy/builtins.py:2555
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1545
msgid ""
1546
"    -r-1                show just the tip\n"
1547
"    -r-10..             show the last 10 mainline revisions\n"
1548
"    -rsubmit:..         show what's new on this branch\n"
1549
"    -rancestor:path..   show changes since the common ancestor of this\n"
1550
"                        branch and the one at location path\n"
1551
"    -rdate:yesterday..  show changes since yesterday"
1552
msgstr ""
1553
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1554
#: breezy/builtins.py:2562
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1555
msgid ""
1556
"  When logging a range of revisions using -rX..Y, log starts at\n"
1557
"  revision Y and searches back in history through the primary\n"
1558
"  (\"left-hand\") parents until it finds X. When logging just the\n"
1559
"  top level (using -n1), an error is reported if X is not found\n"
1560
"  along the way. If multi-level logging is used (-n0), X may be\n"
1561
"  a nested merge revision and the log will be truncated accordingly."
1562
msgstr ""
1563
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1564
#: breezy/builtins.py:2569
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1565
msgid ":Path filtering:"
1566
msgstr ""
1567
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1568
#: breezy/builtins.py:2571
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1569
msgid ""
1570
"  If parameters are given and the first one is not a branch, the log\n"
1571
"  will be filtered to show only those revisions that changed the\n"
1572
"  nominated files or directories."
1573
msgstr ""
1574
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1575
#: breezy/builtins.py:2575
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1576
msgid ""
1577
"  Filenames are interpreted within their historical context. To log a\n"
1578
"  deleted file, specify a revision range so that the file existed at\n"
1579
"  the end or start of the range."
1580
msgstr ""
1581
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1582
#: breezy/builtins.py:2579
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1583
msgid ""
1584
"  Historical context is also important when interpreting pathnames of\n"
1585
"  renamed files/directories. Consider the following example:"
1586
msgstr ""
1587
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1588
#: breezy/builtins.py:2582
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1589
msgid ""
1590
"  * revision 1: add tutorial.txt\n"
1591
"  * revision 2: modify tutorial.txt\n"
1592
"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1593
msgstr ""
1594
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1595
#: breezy/builtins.py:2586
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1596
msgid "  In this case:"
1597
msgstr ""
1598
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1599
#: breezy/builtins.py:2588
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1600
msgid "  * ``brz log guide.txt`` will log the file added in revision 1"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1601
msgstr ""
1602
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1603
#: breezy/builtins.py:2590
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1604
msgid "  * ``brz log tutorial.txt`` will log the new file added in revision 3"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1605
msgstr ""
1606
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1607
#: breezy/builtins.py:2592
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1608
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1609
"  * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1610
"    the original file in revision 2."
1611
msgstr ""
1612
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1613
#: breezy/builtins.py:2595
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1614
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1615
"  * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1616
"    was no file called guide.txt in revision 2."
1617
msgstr ""
1618
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1619
#: breezy/builtins.py:2598
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1620
msgid ""
1621
"  Renames are always followed by log. By design, there is no need to\n"
1622
"  explicitly ask for this (and no way to stop logging a file back\n"
1623
"  until it was last renamed)."
1624
msgstr ""
1625
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1626
#: breezy/builtins.py:2602
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1627
msgid ":Other filtering:"
1628
msgstr ""
1629
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1630
#: breezy/builtins.py:2604
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1631
msgid ""
1632
"  The --match option can be used for finding revisions that match a\n"
1633
"  regular expression in a commit message, committer, author or bug.\n"
1634
"  Specifying the option several times will match any of the supplied\n"
1635
"  expressions. --match-author, --match-bugs, --match-committer and\n"
1636
"  --match-message can be used to only match a specific field."
1637
msgstr ""
1638
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1639
#: breezy/builtins.py:2610
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1640
msgid ":Tips & tricks:"
1641
msgstr ""
1642
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1643
#: breezy/builtins.py:2612
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1644
msgid ""
1645
"  GUI tools and IDEs are often better at exploring history than command\n"
1646
"  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.
1647
"  bzr-explorer shell, or the Loggerhead web interface.  See the Bazaar\n"
1648
"  Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1649
"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
1650
msgstr ""
1651
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1652
#: breezy/builtins.py:2618
6622.1.22 by Jelmer Vernooij
Update po files.
1653
msgid "  You may find it useful to add the aliases below to ``bazaar.conf``::"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1654
msgstr ""
1655
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1656
#: breezy/builtins.py:2620
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1657
msgid ""
1658
"    [ALIASES]\n"
1659
"    tip = log -r-1\n"
1660
"    top = log -l10 --line\n"
1661
"    show = log -v -p"
1662
msgstr ""
1663
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1664
#: breezy/builtins.py:2625
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1665
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1666
"  ``brz tip`` will then show the latest revision while ``brz top``\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1667
"  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.
1668
"  particular revision X,  ``brz show -rX``."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1669
msgstr ""
1670
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1671
#: breezy/builtins.py:2629
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1672
msgid ""
1673
"  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.
1674
"  use ``brz log -n0 -rX``."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1675
msgstr ""
1676
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1677
#: breezy/builtins.py:2632
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1678
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1679
"  ``brz log -v`` on a branch with lots of history is currently\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1680
"  very slow. A fix for this issue is currently under development.\n"
1681
"  With or without that fix, it is recommended that a revision range\n"
1682
"  be given when using the -v option."
1683
msgstr ""
1684
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1685
#: breezy/builtins.py:2637
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1686
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1687
"  brz has a generic full-text matching plugin, brz-search, that can be\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1688
"  used to find revisions matching user names, commit messages, etc.\n"
1689
"  Among other features, this plugin can find all revisions containing\n"
1690
"  a list of words but not others."
1691
msgstr ""
1692
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1693
#: breezy/builtins.py:2642
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1694
msgid ""
1695
"  When exploring non-mainline history on large projects with deep\n"
1696
"  history, the performance of log can be greatly improved by installing\n"
1697
"  the historycache plugin. This plugin buffers historical information\n"
1698
"  trading disk space for faster speed."
1699
msgstr ""
1700
6622.1.22 by Jelmer Vernooij
Update po files.
1701
# help of 'forward' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1702
#: breezy/builtins.py:2651
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1703
msgid "Show from oldest to newest."
1704
msgstr ""
1705
6622.1.22 by Jelmer Vernooij
Update po files.
1706
# help of 'verbose' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1707
#: breezy/builtins.py:2654
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1708
msgid "Show files changed in each revision."
1709
msgstr ""
1710
6622.1.22 by Jelmer Vernooij
Update po files.
1711
# help of 'change' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1712
#: breezy/builtins.py:2660
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1713
msgid "Show just the specified revision. See also \"help revisionspec\"."
1714
msgstr ""
1715
6622.1.22 by Jelmer Vernooij
Update po files.
1716
# help of 'authors' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1717
#: breezy/builtins.py:2664
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1718
msgid "What names to list as authors - first, all or committer."
1719
msgstr ""
1720
6622.1.22 by Jelmer Vernooij
Update po files.
1721
# title of 'authors' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1722
#: breezy/builtins.py:2665
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1723
msgid "Authors"
1724
msgstr ""
1725
6622.1.22 by Jelmer Vernooij
Update po files.
1726
# help of 'levels' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1727
#: breezy/builtins.py:2670
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1728
msgid "Number of levels to display - 0 for all, 1 for flat."
1729
msgstr ""
1730
6622.1.22 by Jelmer Vernooij
Update po files.
1731
# help of 'limit' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1732
#: breezy/builtins.py:2680
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1733
msgid "Limit the output to the first N revisions."
1734
msgstr ""
1735
6622.1.22 by Jelmer Vernooij
Update po files.
1736
# help of 'show-diff' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1737
#: breezy/builtins.py:2685
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1738
msgid "Show changes made in each revision as a patch."
1739
msgstr ""
1740
6622.1.22 by Jelmer Vernooij
Update po files.
1741
# help of 'include-merged' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1742
#: breezy/builtins.py:2687
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1743
msgid "Show merged revisions like --levels 0 does."
1744
msgstr ""
1745
6622.1.22 by Jelmer Vernooij
Update po files.
1746
# help of 'omit-merges' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1747
#: breezy/builtins.py:2691
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1748
msgid "Do not report commits with more than one parent."
1749
msgstr ""
1750
6622.1.22 by Jelmer Vernooij
Update po files.
1751
# help of 'exclude-common-ancestry' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1752
#: breezy/builtins.py:2693
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1753
msgid ""
1754
"Display only the revisions that are not part of both ancestries (require -"
1755
"rX..Y)."
1756
msgstr ""
1757
6622.1.22 by Jelmer Vernooij
Update po files.
1758
# help of 'signatures' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1759
#: breezy/builtins.py:2697
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1760
msgid "Show digital signature validity."
1761
msgstr ""
1762
6622.1.22 by Jelmer Vernooij
Update po files.
1763
# help of 'match' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1764
#: breezy/builtins.py:2700
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1765
msgid "Show revisions whose properties match this expression."
1766
msgstr ""
1767
6622.1.22 by Jelmer Vernooij
Update po files.
1768
# help of 'match-message' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1769
#: breezy/builtins.py:2704
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1770
msgid "Show revisions whose message matches this expression."
1771
msgstr ""
1772
6622.1.22 by Jelmer Vernooij
Update po files.
1773
# help of 'match-committer' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1774
#: breezy/builtins.py:2708
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1775
msgid "Show revisions whose committer matches this expression."
1776
msgstr ""
1777
6622.1.22 by Jelmer Vernooij
Update po files.
1778
# help of 'match-author' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1779
#: breezy/builtins.py:2712
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1780
msgid "Show revisions whose authors match this expression."
1781
msgstr ""
1782
6622.1.22 by Jelmer Vernooij
Update po files.
1783
# help of 'match-bugs' option of 'log' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1784
#: breezy/builtins.py:2716
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1785
msgid "Show revisions whose bugs match this expression."
1786
msgstr ""
1787
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1788
#: breezy/builtins.py:2770
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1789
msgid "--exclude-common-ancestry requires -r with two revisions"
1790
msgstr ""
1791
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1792
#: breezy/builtins.py:2798
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1793
#, python-format
1794
msgid "Path unknown at end or start of revision range: %s"
1795
msgstr ""
1796
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1797
#: breezy/builtins.py:2915
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1798
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1799
msgid "brz %s doesn't accept two revisions in different branches."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1800
msgstr ""
1801
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1802
#: breezy/builtins.py:2931
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1803
#, python-format
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1804
msgid "brz %s --revision takes one or two values."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1805
msgstr ""
1806
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1807
#: breezy/builtins.py:2976
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1808
msgid ""
1809
"List files in a tree.\n"
1810
"    "
1811
msgstr ""
1812
6622.1.22 by Jelmer Vernooij
Update po files.
1813
# help of 'recursive' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1814
#: breezy/builtins.py:2985
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1815
msgid "Recurse into subdirectories."
1816
msgstr ""
1817
6622.1.22 by Jelmer Vernooij
Update po files.
1818
# help of 'from-root' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1819
#: breezy/builtins.py:2987
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1820
msgid "Print paths relative to the root of the branch."
1821
msgstr ""
1822
6622.1.22 by Jelmer Vernooij
Update po files.
1823
# help of 'unknown' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1824
#: breezy/builtins.py:2989
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1825
msgid "Print unknown files."
1826
msgstr ""
1827
6622.1.22 by Jelmer Vernooij
Update po files.
1828
# help of 'versioned' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1829
#: breezy/builtins.py:2990
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1830
msgid "Print versioned files."
1831
msgstr ""
1832
6622.1.22 by Jelmer Vernooij
Update po files.
1833
# help of 'ignored' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1834
#: breezy/builtins.py:2993
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1835
msgid "Print ignored files."
1836
msgstr ""
1837
6622.1.22 by Jelmer Vernooij
Update po files.
1838
# help of 'kind' option of 'ls' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1839
#: breezy/builtins.py:2995
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1840
msgid "List entries of a particular kind: file, directory, symlink."
1841
msgstr ""
1842
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1843
#: breezy/builtins.py:3008
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1844
msgid "invalid kind specified"
1845
msgstr ""
1846
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1847
#: breezy/builtins.py:3011
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1848
msgid "Cannot set both --verbose and --null"
1849
msgstr ""
1850
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1851
#: breezy/builtins.py:3020
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1852
msgid "cannot specify both --from-root and PATH"
1853
msgstr ""
1854
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1855
#: breezy/builtins.py:3107
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1856
msgid "Ignore specified files or patterns."
1857
msgstr ""
1858
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1859
#: breezy/builtins.py:3109
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1860
msgid "See ``brz help patterns`` for details on the syntax of patterns."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1861
msgstr ""
1862
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1863
#: breezy/builtins.py:3111
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1864
msgid ""
1865
"If a .bzrignore file does not exist, the ignore command\n"
1866
"will create one and add the specified files or patterns to the newly\n"
1867
"created file. The ignore command will also automatically add the \n"
1868
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1869
"the use of the ignore command will require an explicit add command."
1870
msgstr ""
1871
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1872
#: breezy/builtins.py:3117
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1873
msgid ""
1874
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1875
"After adding, editing or deleting that file either indirectly by\n"
1876
"using this command or directly by using an editor, be sure to commit\n"
1877
"it."
1878
msgstr ""
1879
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1880
#: breezy/builtins.py:3122
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1881
msgid ""
1882
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1883
"the global ignore file can be found in the application data directory as\n"
1884
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1885
"Global ignores are not touched by this command. The global ignore file\n"
1886
"can be edited directly using an editor."
1887
msgstr ""
1888
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1889
#: breezy/builtins.py:3128
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1890
msgid ""
1891
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1892
"precedence over regular ignores.  Such exceptions are used to specify\n"
1893
"files that should be versioned which would otherwise be ignored."
1894
msgstr ""
1895
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1896
#: breezy/builtins.py:3132
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1897
msgid ""
1898
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1899
"precedence over the '!' exception patterns."
1900
msgstr ""
1901
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1902
#: breezy/builtins.py:3135
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1903
msgid ""
1904
":Notes: \n"
1905
"    \n"
1906
"* Ignore patterns containing shell wildcards must be quoted from\n"
1907
"  the shell on Unix."
1908
msgstr ""
1909
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1910
#: breezy/builtins.py:3140
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1911
msgid ""
1912
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1913
"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
1914
msgstr ""
1915
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1916
#: breezy/builtins.py:3143
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1917
msgid ""
1918
":Examples:\n"
1919
"    Ignore the top level Makefile::"
1920
msgstr ""
1921
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1922
#: breezy/builtins.py:3146
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1923
msgid "        brz ignore ./Makefile"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1924
msgstr ""
1925
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1926
#: breezy/builtins.py:3148
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1927
msgid "    Ignore .class files in all directories...::"
1928
msgstr ""
1929
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1930
#: breezy/builtins.py:3150
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1931
msgid "        brz ignore \"*.class\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1932
msgstr ""
1933
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1934
#: breezy/builtins.py:3152
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1935
msgid "    ...but do not ignore \"special.class\"::"
1936
msgstr ""
1937
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1938
#: breezy/builtins.py:3154
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1939
msgid "        brz ignore \"!special.class\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1940
msgstr ""
1941
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1942
#: breezy/builtins.py:3156
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1943
msgid "    Ignore files whose name begins with the \"#\" character::"
1944
msgstr ""
1945
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1946
#: breezy/builtins.py:3158
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1947
msgid "        brz ignore \"RE:^#\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1948
msgstr ""
1949
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1950
#: breezy/builtins.py:3160 breezy/builtins.py:3164
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1951
msgid "    Ignore .o files under the lib directory::"
1952
msgstr ""
1953
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1954
#: breezy/builtins.py:3162
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1955
msgid "        brz ignore \"lib/**/*.o\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1956
msgstr ""
1957
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1958
#: breezy/builtins.py:3166
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1959
msgid "        brz ignore \"RE:lib/.*\\.o\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1960
msgstr ""
1961
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1962
#: breezy/builtins.py:3168
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1963
msgid "    Ignore everything but the \"debian\" toplevel directory::"
1964
msgstr ""
1965
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1966
#: breezy/builtins.py:3170
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1967
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1968
"        brz ignore \"RE:(?!debian/).*\"\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1969
"    \n"
1970
"    Ignore everything except the \"local\" toplevel directory,\n"
1971
"    but always ignore autosave files ending in ~, even under local/::\n"
1972
"    \n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1973
"        brz ignore \"*\"\n"
1974
"        brz ignore \"!./local\"\n"
1975
"        brz ignore \"!!*~\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1976
msgstr ""
1977
6622.1.22 by Jelmer Vernooij
Update po files.
1978
# help of 'default-rules' option of 'ignore' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1979
#: breezy/builtins.py:3184
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1980
msgid "Display the default ignore rules that brz uses."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1981
msgstr ""
1982
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1983
#: breezy/builtins.py:3196
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1984
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1985
msgstr ""
1986
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1987
#: breezy/builtins.py:3207
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1988
#, python-format
1989
msgid "Invalid ignore pattern found. %s"
1990
msgid_plural "Invalid ignore patterns found. %s"
1991
msgstr[0] ""
1992
msgstr[1] ""
1993
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1994
#: breezy/builtins.py:3216
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1995
msgid "NAME_PATTERN should not be an absolute path"
1996
msgstr ""
1997
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1998
#: breezy/builtins.py:3229
6524.1.1 by Jelmer Vernooij
Merge 2.5.
1999
#, python-format
2000
msgid ""
2001
"Warning: the following files are version controlled and match your ignore "
2002
"pattern:\n"
2003
"%s\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2004
"These files will continue to be version controlled unless you 'brz remove' "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2005
"them.\n"
2006
msgstr ""
2007
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2008
#: breezy/builtins.py:3236
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2009
msgid "List ignored files and the patterns that matched them."
2010
msgstr ""
2011
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2012
#: breezy/builtins.py:3238
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2013
msgid ""
2014
"List all the ignored files and the ignore pattern that caused the file to\n"
2015
"be ignored."
2016
msgstr ""
2017
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2018
#: breezy/builtins.py:3241
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2019
msgid "Alternatively, to list just the files::"
2020
msgstr ""
2021
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2022
#: breezy/builtins.py:3243
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2023
msgid "    brz ls --ignored"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2024
msgstr ""
2025
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2026
#: breezy/builtins.py:3277
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2027
#, python-format
2028
msgid "not a valid revision-number: %r"
2029
msgstr ""
2030
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2031
#: breezy/builtins.py:3284
6622.1.22 by Jelmer Vernooij
Update po files.
2032
msgid "Export current or past revision to a destination directory or archive."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2033
msgstr ""
2034
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2035
#: breezy/builtins.py:3286
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2036
msgid "If no revision is specified this exports the last committed revision."
2037
msgstr ""
2038
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2039
#: breezy/builtins.py:3288
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2040
msgid ""
2041
"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
2042
"given, try to find the format with the extension. If no extension\n"
2043
"is found exports to a directory (equivalent to --format=dir)."
2044
msgstr ""
2045
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2046
#: breezy/builtins.py:3292
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2047
msgid ""
2048
"If root is supplied, it will be used as the root directory inside\n"
2049
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2050
"to the exported filename. The root option has no effect for 'dir' format."
2051
msgstr ""
2052
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2053
#: breezy/builtins.py:3296
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2054
msgid ""
2055
"If branch is omitted then the branch containing the current working\n"
2056
"directory will be used."
2057
msgstr ""
2058
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2059
#: breezy/builtins.py:3299
6622.1.22 by Jelmer Vernooij
Update po files.
2060
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2061
msgstr ""
2062
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2063
#: breezy/builtins.py:3301
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2064
msgid ""
2065
"  =================       =========================\n"
2066
"  Supported formats       Autodetected by extension\n"
2067
"  =================       =========================\n"
2068
"     dir                         (none)\n"
2069
"     tar                          .tar\n"
2070
"     tbz2                    .tar.bz2, .tbz2\n"
2071
"     tgz                      .tar.gz, .tgz\n"
2072
"     zip                          .zip\n"
2073
"  =================       ========================="
2074
msgstr ""
2075
6622.1.22 by Jelmer Vernooij
Update po files.
2076
# help of 'format' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2077
#: breezy/builtins.py:3315
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2078
msgid "Type of file to export to."
2079
msgstr ""
2080
6622.1.22 by Jelmer Vernooij
Update po files.
2081
# help of 'filters' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2082
#: breezy/builtins.py:3318
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2083
msgid "Apply content filters to export the convenient form."
2084
msgstr ""
2085
6622.1.22 by Jelmer Vernooij
Update po files.
2086
# help of 'root' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2087
#: breezy/builtins.py:3322
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2088
msgid "Name of the root directory inside the exported file."
2089
msgstr ""
2090
6622.1.22 by Jelmer Vernooij
Update po files.
2091
# help of 'per-file-timestamps' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2092
#: breezy/builtins.py:3324
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2093
msgid ""
2094
"Set modification time of files to that of the last revision in which it was "
2095
"changed."
2096
msgstr ""
2097
6622.1.22 by Jelmer Vernooij
Update po files.
2098
# help of 'uncommitted' option of 'export' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2099
#: breezy/builtins.py:3327
6622.1.22 by Jelmer Vernooij
Update po files.
2100
msgid "Export the working tree contents rather than that of the last revision."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2101
msgstr ""
2102
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2103
#: breezy/builtins.py:3346
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2104
msgid "--uncommitted requires a working tree"
2105
msgstr ""
2106
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2107
#: breezy/builtins.py:3355
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2108
#, python-format
2109
msgid "Unsupported export format: %s"
2110
msgstr ""
2111
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2112
#: breezy/builtins.py:3359
6622.1.22 by Jelmer Vernooij
Update po files.
2113
msgid "Write the contents of a file as of a given revision to standard output."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2114
msgstr ""
2115
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2116
#: breezy/builtins.py:3361
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2117
msgid "If no revision is nominated, the last revision is used."
2118
msgstr ""
2119
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2120
#: breezy/builtins.py:3363
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2121
msgid ""
2122
"Note: Take care to redirect standard output when using this command on a\n"
2123
"binary file."
2124
msgstr ""
2125
6622.1.22 by Jelmer Vernooij
Update po files.
2126
# help of 'name-from-revision' option of 'cat' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2127
#: breezy/builtins.py:3369
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2128
msgid "The path name in the old tree."
2129
msgstr ""
2130
6622.1.22 by Jelmer Vernooij
Update po files.
2131
# help of 'filters' option of 'cat' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2132
#: breezy/builtins.py:3370
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2133
msgid "Apply content filters to display the convenience form."
2134
msgstr ""
2135
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2136
#: breezy/builtins.py:3381
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2137
msgid "brz cat --revision takes exactly one revision specifier"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2138
msgstr ""
2139
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2140
#: breezy/builtins.py:3406 breezy/builtins.py:3418
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2141
msgid "{0!r} is not present in revision {1}"
2142
msgstr ""
2143
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2144
#: breezy/builtins.py:3441
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2145
msgid "Commit changes into a new revision."
2146
msgstr ""
2147
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2148
#: breezy/builtins.py:3443
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2149
msgid ""
2150
"An explanatory message needs to be given for each commit. This is\n"
2151
"often done by using the --message option (getting the message from the\n"
2152
"command line) or by using the --file option (getting the message from\n"
2153
"a file). If neither of these options is given, an editor is opened for\n"
2154
"the user to enter the message. To see the changed files in the\n"
2155
"boilerplate text loaded into the editor, use the --show-diff option."
2156
msgstr ""
2157
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2158
#: breezy/builtins.py:3450
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2159
msgid ""
2160
"By default, the entire tree is committed and the person doing the\n"
2161
"commit is assumed to be the author. These defaults can be overridden\n"
2162
"as explained below."
2163
msgstr ""
2164
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2165
#: breezy/builtins.py:3454
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2166
msgid ":Selective commits:"
2167
msgstr ""
2168
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2169
#: breezy/builtins.py:3456
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2170
msgid ""
2171
"  If selected files are specified, only changes to those files are\n"
2172
"  committed.  If a directory is specified then the directory and\n"
2173
"  everything within it is committed."
2174
msgstr ""
2175
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2176
#: breezy/builtins.py:3460
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2177
msgid ""
2178
"  When excludes are given, they take precedence over selected files.\n"
2179
"  For example, to commit only changes within foo, but not changes\n"
2180
"  within foo/bar::"
2181
msgstr ""
2182
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2183
#: breezy/builtins.py:3464
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2184
msgid "    brz commit foo -x foo/bar"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2185
msgstr ""
2186
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2187
#: breezy/builtins.py:3466
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2188
msgid "  A selective commit after a merge is not yet supported."
2189
msgstr ""
2190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2191
#: breezy/builtins.py:3468
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2192
msgid ":Custom authors:"
2193
msgstr ""
2194
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2195
#: breezy/builtins.py:3470
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2196
msgid ""
2197
"  If the author of the change is not the same person as the committer,\n"
2198
"  you can specify the author's name using the --author option. The\n"
2199
"  name should be in the same format as a committer-id, e.g.\n"
2200
"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2201
"  the change you can specify the option multiple times, once for each\n"
2202
"  author."
2203
msgstr ""
2204
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2205
#: breezy/builtins.py:3477
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2206
msgid ":Checks:"
2207
msgstr ""
2208
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2209
#: breezy/builtins.py:3479
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2210
msgid ""
2211
"  A common mistake is to forget to add a new file or directory before\n"
2212
"  running the commit command. The --strict option checks for unknown\n"
2213
"  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.
2214
"  checks can be implemented by defining hooks. See ``brz help hooks``\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2215
"  for details."
2216
msgstr ""
2217
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2218
#: breezy/builtins.py:3485
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2219
msgid ":Things to note:"
2220
msgstr ""
2221
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2222
#: breezy/builtins.py:3487
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2223
msgid ""
2224
"  If you accidentially commit the wrong changes or make a spelling\n"
2225
"  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.
2226
"  to undo it. See ``brz help uncommit`` for details."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2227
msgstr ""
2228
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2229
#: breezy/builtins.py:3491
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2230
msgid ""
2231
"  Hooks can also be configured to run after a commit. This allows you\n"
2232
"  to trigger updates to external systems like bug trackers. The --fixes\n"
2233
"  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.
2234
"  one or more bugs. See ``brz help bugs`` for details."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2235
msgstr ""
2236
6622.1.22 by Jelmer Vernooij
Update po files.
2237
# help of 'exclude' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2238
#: breezy/builtins.py:3501
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2239
msgid "Do not consider changes made to a given path."
2240
msgstr ""
2241
6622.1.22 by Jelmer Vernooij
Update po files.
2242
# help of 'message' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2243
#: breezy/builtins.py:3504
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2244
msgid "Description of the new revision."
2245
msgstr ""
2246
6622.1.22 by Jelmer Vernooij
Update po files.
2247
# help of 'unchanged' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2248
#: breezy/builtins.py:3507
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2249
msgid "Commit even if nothing has changed."
2250
msgstr ""
2251
6622.1.22 by Jelmer Vernooij
Update po files.
2252
# help of 'file' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2253
#: breezy/builtins.py:3511
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2254
msgid "Take commit message from this file."
2255
msgstr ""
2256
6622.1.22 by Jelmer Vernooij
Update po files.
2257
# help of 'strict' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2258
#: breezy/builtins.py:3513
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2259
msgid "Refuse to commit if there are unknown files in the working tree."
2260
msgstr ""
2261
6622.1.22 by Jelmer Vernooij
Update po files.
2262
# help of 'commit-time' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2263
#: breezy/builtins.py:3516
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2264
msgid ""
2265
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2266
"08:00:00 +0100'."
2267
msgstr ""
2268
6622.1.22 by Jelmer Vernooij
Update po files.
2269
# help of 'fixes' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2270
#: breezy/builtins.py:3519
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2271
msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2272
msgstr ""
2273
6622.1.22 by Jelmer Vernooij
Update po files.
2274
# help of 'author' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2275
#: breezy/builtins.py:3522
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2276
msgid "Set the author's name, if it's different from the committer."
2277
msgstr ""
2278
6622.1.22 by Jelmer Vernooij
Update po files.
2279
# help of 'local' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2280
#: breezy/builtins.py:3525
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2281
msgid ""
2282
"Perform a local commit in a bound branch.  Local commits are not pushed to "
2283
"the master branch until a normal commit is performed."
2284
msgstr ""
2285
6622.1.22 by Jelmer Vernooij
Update po files.
2286
# help of 'show-diff' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2287
#: breezy/builtins.py:3531
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2288
msgid ""
2289
"When no message is supplied, show the diff along with the status summary in "
2290
"the message editor."
2291
msgstr ""
2292
6622.1.22 by Jelmer Vernooij
Update po files.
2293
# help of 'lossy' option of 'commit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2294
#: breezy/builtins.py:3534
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2295
msgid ""
2296
"When committing to a foreign version control system do not push data that "
2297
"can not be natively represented."
2298
msgstr ""
2299
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2300
#: breezy/builtins.py:3552
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2301
#, python-format
2302
msgid ""
2303
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2304
"default bug tracker using the `bugtracker` option.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2305
"See \"brz help bugs\" for more information on this feature. Commit refused."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2306
msgstr ""
2307
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2308
#: breezy/builtins.py:3561
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2309
#, python-format
2310
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2311
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2312
"for more information on this feature.\n"
2313
"Commit refused."
2314
msgstr ""
2315
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2316
#: breezy/builtins.py:3570
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2317
#, python-format
2318
msgid "Unrecognized bug %s. Commit refused."
2319
msgstr ""
2320
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2321
#: breezy/builtins.py:3573
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2322
#, python-format
2323
msgid ""
2324
"%s\n"
2325
"Commit refused."
2326
msgstr ""
2327
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2328
#: breezy/builtins.py:3597
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2329
msgid "Could not parse --commit-time: "
2330
msgstr ""
2331
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2332
#: breezy/builtins.py:3637
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2333
msgid "please specify either --message or --file"
2334
msgstr ""
2335
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2336
#: breezy/builtins.py:3666
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2337
msgid "please specify a commit message with either --message or --file"
2338
msgstr ""
2339
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2340
#: breezy/builtins.py:3669
6622.1.22 by Jelmer Vernooij
Update po files.
2341
msgid ""
2342
"Empty commit message specified. Please specify a commit message with either "
2343
"--message or --file or leave a blank message with --message \"\"."
2344
msgstr ""
2345
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2346
#: breezy/builtins.py:3689
6622.1.22 by Jelmer Vernooij
Update po files.
2347
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2348
"No changes to commit. Please 'brz add' the files you want to commit, or use "
6622.1.22 by Jelmer Vernooij
Update po files.
2349
"--unchanged to force an empty commit."
2350
msgstr ""
2351
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2352
#: breezy/builtins.py:3693
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2353
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2354
"Conflicts detected in working tree.  Use \"brz conflicts\" to list, \"brz "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2355
"resolve FILE\" to resolve."
2356
msgstr ""
2357
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2358
#: breezy/builtins.py:3697
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2359
msgid "Commit refused because there are unknown files in the working tree."
2360
msgstr ""
2361
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2362
#: breezy/builtins.py:3700
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2363
msgid ""
2364
"\n"
2365
"To commit to master branch, run update and then commit.\n"
2366
"You can also pass --local to commit to continue working disconnected."
2367
msgstr ""
2368
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2369
#: breezy/builtins.py:3708
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2370
msgid ""
2371
"Validate working tree structure, branch consistency and repository history."
2372
msgstr ""
2373
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2374
#: breezy/builtins.py:3710
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2375
msgid ""
2376
"This command checks various invariants about branch and repository storage\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2377
"to detect data corruption or brz bugs."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2378
msgstr ""
2379
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2380
#: breezy/builtins.py:3713
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2381
msgid ""
2382
"The working tree and branch checks will only give output if a problem is\n"
2383
"detected. The output fields of the repository check are:"
2384
msgstr ""
2385
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2386
#: breezy/builtins.py:3716
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2387
msgid ""
2388
"revisions\n"
2389
"    This is just the number of revisions checked.  It doesn't\n"
2390
"    indicate a problem."
2391
msgstr ""
2392
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2393
#: breezy/builtins.py:3720
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2394
msgid ""
2395
"versionedfiles\n"
2396
"    This is just the number of versionedfiles checked.  It\n"
2397
"    doesn't indicate a problem."
2398
msgstr ""
2399
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2400
#: breezy/builtins.py:3724
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2401
msgid ""
2402
"unreferenced ancestors\n"
2403
"    Texts that are ancestors of other texts, but\n"
2404
"    are not properly referenced by the revision ancestry.  This is a\n"
2405
"    subtle problem that Bazaar can work around."
2406
msgstr ""
2407
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2408
#: breezy/builtins.py:3729
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2409
msgid ""
2410
"unique file texts\n"
2411
"    This is the total number of unique file contents\n"
2412
"    seen in the checked revisions.  It does not indicate a problem."
2413
msgstr ""
2414
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2415
#: breezy/builtins.py:3733
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2416
msgid ""
2417
"repeated file texts\n"
2418
"    This is the total number of repeated texts seen\n"
2419
"    in the checked revisions.  Texts can be repeated when their file\n"
2420
"    entries are modified, but the file contents are not.  It does not\n"
2421
"    indicate a problem."
2422
msgstr ""
2423
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2424
#: breezy/builtins.py:3739
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2425
msgid ""
2426
"If no restrictions are specified, all Bazaar data that is found at the "
2427
"given\n"
2428
"location will be checked."
2429
msgstr ""
2430
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2431
#: breezy/builtins.py:3744
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2432
msgid "    Check the tree and branch at 'foo'::"
2433
msgstr ""
2434
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2435
#: breezy/builtins.py:3746
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2436
msgid "        brz check --tree --branch foo"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2437
msgstr ""
2438
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2439
#: breezy/builtins.py:3748
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2440
msgid "    Check only the repository at 'bar'::"
2441
msgstr ""
2442
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2443
#: breezy/builtins.py:3750
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2444
msgid "        brz check --repo bar"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2445
msgstr ""
2446
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2447
#: breezy/builtins.py:3752
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2448
msgid "    Check everything at 'baz'::"
2449
msgstr ""
2450
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2451
#: breezy/builtins.py:3754
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2452
msgid "        brz check baz"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2453
msgstr ""
2454
6622.1.22 by Jelmer Vernooij
Update po files.
2455
# help of 'branch' option of 'check' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2456
#: breezy/builtins.py:3760
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2457
msgid "Check the branch related to the current directory."
2458
msgstr ""
2459
6622.1.22 by Jelmer Vernooij
Update po files.
2460
# help of 'repo' option of 'check' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2461
#: breezy/builtins.py:3762
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2462
msgid "Check the repository related to the current directory."
2463
msgstr ""
2464
6622.1.22 by Jelmer Vernooij
Update po files.
2465
# help of 'tree' option of 'check' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2466
#: breezy/builtins.py:3764
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2467
msgid "Check the working tree related to the current directory."
2468
msgstr ""
2469
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2470
#: breezy/builtins.py:3778
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2471
msgid "Upgrade a repository, branch or working tree to a newer format."
2472
msgstr ""
2473
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2474
#: breezy/builtins.py:3780
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2475
msgid ""
2476
"When the default format has changed after a major new release of\n"
2477
"Bazaar, you may be informed during certain operations that you\n"
2478
"should upgrade. Upgrading to a newer format may improve performance\n"
2479
"or make new features available. It may however limit interoperability\n"
2480
"with older repositories or with older versions of Bazaar."
2481
msgstr ""
2482
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2483
#: breezy/builtins.py:3786
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2484
msgid ""
2485
"If you wish to upgrade to a particular format rather than the\n"
2486
"current default, that can be specified using the --format option.\n"
2487
"As a consequence, you can use the upgrade command this way to\n"
2488
"\"downgrade\" to an earlier format, though some conversions are\n"
2489
"a one way process (e.g. changing from the 1.x default to the\n"
2490
"2.x default) so downgrading is not always possible."
2491
msgstr ""
2492
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2493
#: breezy/builtins.py:3793
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2494
msgid ""
2495
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2496
"process (where # is a number). By default, this is left there on\n"
2497
"completion. If the conversion fails, delete the new .bzr directory\n"
2498
"and rename this one back in its place. Use the --clean option to ask\n"
2499
"for the backup.bzr directory to be removed on successful conversion.\n"
2500
"Alternatively, you can delete it by hand if everything looks good\n"
2501
"afterwards."
2502
msgstr ""
2503
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2504
#: breezy/builtins.py:3801
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2505
msgid ""
2506
"If the location given is a shared repository, dependent branches\n"
2507
"are also converted provided the repository converts successfully.\n"
2508
"If the conversion of a branch fails, remaining branches are still\n"
2509
"tried."
2510
msgstr ""
2511
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2512
#: breezy/builtins.py:3806
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2513
msgid ""
2514
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2515
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2516
msgstr ""
2517
6622.1.22 by Jelmer Vernooij
Update po files.
2518
# help of 'format' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2519
#: breezy/builtins.py:3814
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2520
msgid "Upgrade to a specific format.  See \"brz help formats\" for details."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2521
msgstr ""
2522
6622.1.22 by Jelmer Vernooij
Update po files.
2523
# title of 'format' option of 'init' command
2524
# title of 'format' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2525
#: breezy/builtins.py:3818
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2526
msgid "Branch format"
2527
msgstr ""
2528
6622.1.22 by Jelmer Vernooij
Update po files.
2529
# help of 'clean' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2530
#: breezy/builtins.py:3820
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2531
msgid "Remove the backup.bzr directory if successful."
2532
msgstr ""
2533
6622.1.22 by Jelmer Vernooij
Update po files.
2534
# help of 'dry-run' option of 'add' command
2535
# help of 'dry-run' option of 'upgrade' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2536
#: breezy/builtins.py:3822
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2537
msgid "Show what would be done, but don't actually do anything."
2538
msgstr ""
2539
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2540
#: breezy/builtins.py:3837
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2541
msgid "Show or set brz user id."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2542
msgstr ""
2543
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2544
#: breezy/builtins.py:3839
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2545
msgid ""
2546
":Examples:\n"
2547
"    Show the email of the current user::"
2548
msgstr ""
2549
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2550
#: breezy/builtins.py:3842
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2551
msgid "        brz whoami --email"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2552
msgstr ""
2553
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2554
#: breezy/builtins.py:3844
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2555
msgid "    Set the current user::"
2556
msgstr ""
2557
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2558
#: breezy/builtins.py:3846
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2559
msgid "        brz whoami \"Frank Chu <fchu@example.com>\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2560
msgstr ""
2561
6622.1.22 by Jelmer Vernooij
Update po files.
2562
# help of 'email' option of 'whoami' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2563
#: breezy/builtins.py:3850
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2564
msgid "Display email address only."
2565
msgstr ""
2566
6622.1.22 by Jelmer Vernooij
Update po files.
2567
# help of 'branch' option of 'whoami' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2568
#: breezy/builtins.py:3852
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2569
msgid "Set identity for the current branch instead of globally."
2570
msgstr ""
2571
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2572
#: breezy/builtins.py:3878
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2573
msgid "--email can only be used to display existing identity"
2574
msgstr ""
2575
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2576
#: breezy/builtins.py:3902
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2577
msgid "Print or set the branch nickname."
2578
msgstr ""
2579
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2580
#: breezy/builtins.py:3904
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2581
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
2582
"If unset, the colocated branch name is used for colocated branches, and\n"
2583
"the branch directory name is used for other branches.  To print the\n"
2584
"current nickname, execute with no argument."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2585
msgstr ""
2586
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2587
#: breezy/builtins.py:3908
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2588
msgid ""
2589
"Bound branches use the nickname of its master branch unless it is set\n"
2590
"locally."
2591
msgstr ""
2592
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2593
#: breezy/builtins.py:3928
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2594
msgid "Set/unset and display aliases."
2595
msgstr ""
2596
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2597
#: breezy/builtins.py:3930
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2598
msgid ""
2599
":Examples:\n"
2600
"    Show the current aliases::"
2601
msgstr ""
2602
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2603
#: breezy/builtins.py:3933
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2604
msgid "        brz alias"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2605
msgstr ""
2606
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2607
#: breezy/builtins.py:3935
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2608
msgid "    Show the alias specified for 'll'::"
2609
msgstr ""
2610
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2611
#: breezy/builtins.py:3937
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2612
msgid "        brz alias ll"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2613
msgstr ""
2614
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2615
#: breezy/builtins.py:3939
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2616
msgid "    Set an alias for 'll'::"
2617
msgstr ""
2618
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2619
#: breezy/builtins.py:3941
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2620
msgid "        brz alias ll=\"log --line -r-10..-1\""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2621
msgstr ""
2622
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2623
#: breezy/builtins.py:3943
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2624
msgid "    To remove an alias for 'll'::"
2625
msgstr ""
2626
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2627
#: breezy/builtins.py:3945
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2628
msgid "        brz alias --remove ll"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2629
msgstr ""
2630
6622.1.22 by Jelmer Vernooij
Update po files.
2631
# help of 'remove' option of 'alias' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2632
#: breezy/builtins.py:3950
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2633
msgid "Remove the alias."
2634
msgstr ""
2635
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2636
#: breezy/builtins.py:3968
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2637
msgid "brz alias --remove expects an alias to remove."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2638
msgstr ""
2639
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2640
#: breezy/builtins.py:4149
6622.1.22 by Jelmer Vernooij
Update po files.
2641
msgid "subunit not available. subunit needs to be installed to use --subunit."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2642
msgstr ""
2643
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2644
#: breezy/builtins.py:4166
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2645
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2646
"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2647
msgstr ""
2648
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2649
#: breezy/builtins.py:4213
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2650
msgid "Show version of brz."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2651
msgstr ""
2652
6622.1.22 by Jelmer Vernooij
Update po files.
2653
# help of 'short' option of 'version' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2654
#: breezy/builtins.py:4217
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2655
msgid "Print just the version number."
2656
msgstr ""
2657
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2658
#: breezy/builtins.py:4236
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2659
msgid "It sure does!\n"
2660
msgstr ""
2661
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2662
#: breezy/builtins.py:4260
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2663
#, python-format
2664
msgid "merge base is revision %s\n"
2665
msgstr ""
2666
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2667
#: breezy/builtins.py:4264
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2668
msgid "Perform a three-way merge."
2669
msgstr ""
2670
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2671
#: breezy/builtins.py:4266
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2672
msgid ""
2673
"The source of the merge can be specified either in the form of a branch,\n"
2674
"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.
2675
"with brz send. If neither is specified, the default is the upstream branch\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2676
"or the branch most recently merged using --remember.  The source of the\n"
2677
"merge may also be specified in the form of a path to a file in another\n"
2678
"branch:  in this case, only the modifications to that file are merged into\n"
2679
"the current working tree."
2680
msgstr ""
2681
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2682
#: breezy/builtins.py:4274
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2683
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2684
"When merging from a branch, by default brz will try to merge in all new\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2685
"work from the other branch, automatically determining an appropriate base\n"
2686
"revision.  If this fails, you may need to give an explicit base."
2687
msgstr ""
2688
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2689
#: breezy/builtins.py:4278
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2690
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2691
"To pick a different ending revision, pass \"--revision OTHER\".  brz will\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2692
"try to merge in all new work up to and including revision OTHER."
2693
msgstr ""
2694
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2695
#: breezy/builtins.py:4281
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2696
msgid ""
2697
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2698
"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
2699
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2700
"not already contain revision BASE, such a merge is commonly referred to as\n"
2701
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2702
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2703
"changes from the other branch is not stored in the commit."
2704
msgstr ""
2705
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2706
#: breezy/builtins.py:4289
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2707
msgid "Revision numbers are always relative to the source branch."
2708
msgstr ""
2709
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2710
#: breezy/builtins.py:4291 breezy/conflicts.py:52 breezy/conflicts.py:106
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2711
msgid ""
2712
"Merge will do its best to combine the changes in two branches, but there\n"
2713
"are some kinds of problems only a human can fix.  When it encounters those,\n"
2714
"it will mark a conflict.  A conflict means that you need to fix something,\n"
2715
"before you can commit."
2716
msgstr ""
2717
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2718
#: breezy/builtins.py:4296
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2719
msgid "Use brz resolve when you have fixed a problem.  See also brz conflicts."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2720
msgstr ""
2721
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2722
#: breezy/builtins.py:4298
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2723
msgid ""
2724
"If there is no default branch set, the first merge will set it (use\n"
2725
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2726
"to use the default.  To change the default, use --remember. The value will\n"
2727
"only be saved if the remote location can be accessed."
2728
msgstr ""
2729
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2730
#: breezy/builtins.py:4303
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2731
msgid ""
2732
"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.
2733
"directory, where they can be reviewed (with brz diff), tested, and then\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2734
"committed to record the result of the merge."
2735
msgstr ""
2736
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2737
#: breezy/builtins.py:4307
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2738
msgid ""
2739
"merge refuses to run if there are any uncommitted changes, unless\n"
2740
"--force is given.  If --force is given, then the changes from the source \n"
2741
"will be merged with the current working tree, including any uncommitted\n"
2742
"changes in the tree.  The --force option can also be used to create a\n"
2743
"merge revision which has more than two parents."
2744
msgstr ""
2745
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2746
#: breezy/builtins.py:4313
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2747
msgid ""
2748
"If one would like to merge changes from the working tree of the other\n"
2749
"branch without merging any committed revisions, the --uncommitted option\n"
2750
"can be given."
2751
msgstr ""
2752
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2753
#: breezy/builtins.py:4317
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2754
msgid ""
2755
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2756
"you to apply each diff hunk and file change, similar to \"shelve\"."
2757
msgstr ""
2758
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2759
#: breezy/builtins.py:4320
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2760
msgid ""
2761
":Examples:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2762
"    To merge all new revisions from brz.dev::"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2763
msgstr ""
2764
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2765
#: breezy/builtins.py:4323
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2766
msgid "        brz merge ../brz.dev"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2767
msgstr ""
2768
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2769
#: breezy/builtins.py:4325
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2770
msgid "    To merge changes up to and including revision 82 from brz.dev::"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2771
msgstr ""
2772
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2773
#: breezy/builtins.py:4327
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2774
msgid "        brz merge -r 82 ../brz.dev"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2775
msgstr ""
2776
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2777
#: breezy/builtins.py:4329
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2778
msgid "    To merge the changes introduced by 82, without previous changes::"
2779
msgstr ""
2780
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2781
#: breezy/builtins.py:4331
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2782
msgid "        brz merge -r 81..82 ../brz.dev"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2783
msgstr ""
2784
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2785
#: breezy/builtins.py:4333
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2786
msgid "    To apply a merge directive contained in /tmp/merge::"
2787
msgstr ""
2788
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2789
#: breezy/builtins.py:4335
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2790
msgid "        brz merge /tmp/merge"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2791
msgstr ""
2792
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2793
#: breezy/builtins.py:4337
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2794
msgid ""
2795
"    To create a merge revision with three parents from two branches\n"
2796
"    feature1a and feature1b:"
2797
msgstr ""
2798
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2799
#: breezy/builtins.py:4340
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2800
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2801
"        brz merge ../feature1a\n"
2802
"        brz merge ../feature1b --force\n"
2803
"        brz commit -m 'revision with three parents'"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2804
msgstr ""
2805
6622.1.22 by Jelmer Vernooij
Update po files.
2806
# help of 'force' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2807
#: breezy/builtins.py:4352
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2808
msgid "Merge even if the destination tree has uncommitted changes."
2809
msgstr ""
2810
6622.1.22 by Jelmer Vernooij
Update po files.
2811
# help of 'uncommitted' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2812
#: breezy/builtins.py:4358
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2813
msgid ""
2814
"Apply uncommitted changes from a working copy, instead of branch changes."
2815
msgstr ""
2816
6622.1.22 by Jelmer Vernooij
Update po files.
2817
# help of 'pull' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2818
#: breezy/builtins.py:4360
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2819
msgid ""
2820
"If the destination is already completely merged into the source, pull from "
2821
"the source rather than merging.  When this happens, you do not need to "
2822
"commit the result."
2823
msgstr ""
2824
6622.1.22 by Jelmer Vernooij
Update po files.
2825
# help of 'directory' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2826
#: breezy/builtins.py:4365
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2827
msgid ""
2828
"Branch to merge into, rather than the one containing the working directory."
2829
msgstr ""
2830
6622.1.22 by Jelmer Vernooij
Update po files.
2831
# help of 'preview' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2832
#: breezy/builtins.py:4367
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2833
msgid "Instead of merging, show a diff of the merge."
2834
msgstr ""
2835
6622.1.22 by Jelmer Vernooij
Update po files.
2836
# help of 'interactive' option of 'merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2837
#: breezy/builtins.py:4369
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2838
msgid "Select changes interactively."
2839
msgstr ""
2840
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2841
#: breezy/builtins.py:4391
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2842
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
2843
"Merging into empty branches not currently supported, https://bugs.launchpad."
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2844
"net/brz/+bug/308562"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2845
msgstr ""
2846
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2847
#: breezy/builtins.py:4418
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2848
msgid "Cannot use --uncommitted with bundles or merge directives."
2849
msgstr ""
2850
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2851
#: breezy/builtins.py:4429
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2852
msgid "Cannot use --uncommitted and --revision at the same time."
2853
msgstr ""
2854
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2855
#: breezy/builtins.py:4449
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2856
msgid "merger: "
2857
msgstr ""
2858
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2859
#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2860
msgid "Nothing to do."
2861
msgstr ""
2862
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2863
#: breezy/builtins.py:4455
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2864
msgid "Cannot pull individual files"
2865
msgstr ""
2866
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2867
#: breezy/builtins.py:4463
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2868
msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2869
msgstr ""
2870
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2871
#: breezy/builtins.py:4521
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2872
#, python-format
2873
msgid "Show-base is not supported for this merge type. %s"
2874
msgstr ""
2875
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2876
#: breezy/builtins.py:4530
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2877
#, python-format
2878
msgid "Conflict reduction is not supported for merge type %s."
2879
msgstr ""
2880
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2881
#: breezy/builtins.py:4534
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2882
msgid "Cannot do conflict reduction and show base."
2883
msgstr ""
2884
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2885
#: breezy/builtins.py:4645
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2886
msgid "No location specified or remembered"
2887
msgstr ""
2888
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2889
#: breezy/builtins.py:4647
6622.1.22 by Jelmer Vernooij
Update po files.
2890
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2891
msgid "{0} remembered {1} location {2}"
2892
msgstr ""
2893
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2894
#: breezy/builtins.py:4653
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2895
msgid "Redo a merge."
2896
msgstr ""
2897
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2898
#: breezy/builtins.py:4655
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2899
msgid ""
2900
"Use this if you want to try a different merge technique while resolving\n"
2901
"conflicts.  Some merge techniques are better than others, and remerge\n"
2902
"lets you try different ones on different files."
2903
msgstr ""
2904
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2905
#: breezy/builtins.py:4659
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2906
msgid ""
2907
"The options for remerge have the same meaning and defaults as the ones for\n"
2908
"merge.  The difference is that remerge can (only) be run when there is a\n"
2909
"pending merge, and it lets you specify particular files."
2910
msgstr ""
2911
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2912
#: breezy/builtins.py:4663
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2913
msgid ""
2914
":Examples:\n"
2915
"    Re-do the merge of all conflicted files, and show the base text in\n"
2916
"    conflict regions, in addition to the usual THIS and OTHER texts::"
2917
msgstr ""
2918
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2919
#: breezy/builtins.py:4667
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2920
msgid "        brz remerge --show-base"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2921
msgstr ""
2922
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2923
#: breezy/builtins.py:4669
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2924
msgid ""
2925
"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2926
"    additional processing to reduce the size of conflict regions::"
2927
msgstr ""
2928
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2929
#: breezy/builtins.py:4672
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2930
msgid "        brz remerge --merge-type weave --reprocess foobar"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2931
msgstr ""
2932
6622.1.22 by Jelmer Vernooij
Update po files.
2933
# help of 'show-base' option of 'merge' command
2934
# help of 'show-base' option of 'pull' command
2935
# help of 'show-base' option of 'remerge' command
2936
# help of 'show-base' option of 'update' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2937
#: breezy/builtins.py:4679
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2938
msgid "Show base revision text in conflicts."
2939
msgstr ""
2940
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2941
#: breezy/builtins.py:4691
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2942
msgid ""
2943
"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
2944
"merges."
2945
msgstr ""
2946
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2947
#: breezy/builtins.py:4749
6622.1.22 by Jelmer Vernooij
Update po files.
2948
msgid ""
2949
"Set files in the working tree back to the contents of a previous revision."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2950
msgstr ""
2951
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2952
#: breezy/builtins.py:4751
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2953
msgid ""
2954
"Giving a list of files will revert only those files.  Otherwise, all files\n"
2955
"will be reverted.  If the revision is not specified with '--revision', the\n"
6622.1.22 by Jelmer Vernooij
Update po files.
2956
"working tree basis revision is used. A revert operation affects only the\n"
2957
"working tree, not any revision history like the branch and repository or\n"
2958
"the working tree basis revision."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2959
msgstr ""
2960
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2961
#: breezy/builtins.py:4757
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2962
msgid ""
2963
"To remove only some changes, without reverting to a prior version, use\n"
2964
"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2965
"will remove the changes introduced by the second last commit (-2), without\n"
2966
"affecting the changes introduced by the last commit (-1).  To remove\n"
6622.1.22 by Jelmer Vernooij
Update po files.
2967
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2968
"To update the branch to a specific revision or the latest revision and\n"
2969
"update the working tree accordingly while preserving local changes, see the\n"
2970
"update command."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2971
msgstr ""
2972
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2973
#: breezy/builtins.py:4766
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2974
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
2975
"Uncommitted changes to files that are reverted will be discarded.\n"
2976
"Howver, by default, any files that have been manually changed will be\n"
2977
"backed up first.  (Files changed only by merge are not backed up.)  Backup\n"
2978
"files have '.~#~' appended to their name, where # is a number."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2979
msgstr ""
2980
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2981
#: breezy/builtins.py:4771
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2982
msgid ""
2983
"When you provide files, you can use their current pathname or the pathname\n"
2984
"from the target revision.  So you can use revert to \"undelete\" a file by\n"
2985
"name.  If you name a directory, all the contents of that directory will be\n"
2986
"reverted."
2987
msgstr ""
2988
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2989
#: breezy/builtins.py:4776
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2990
msgid ""
2991
"If you have newly added files since the target revision, they will be\n"
2992
"removed.  If the files to be removed have been changed, backups will be\n"
2993
"created as above.  Directories containing unknown files will not be\n"
2994
"deleted."
2995
msgstr ""
2996
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2997
#: breezy/builtins.py:4781
6524.1.1 by Jelmer Vernooij
Merge 2.5.
2998
msgid ""
2999
"The working tree contains a list of revisions that have been merged but\n"
3000
"not yet committed. These revisions will be included as additional parents\n"
3001
"of the next commit.  Normally, using revert clears that list as well as\n"
3002
"reverting the files.  If any files are specified, revert leaves the list\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3003
"of uncommitted merges alone and reverts only the files.  Use ``brz revert\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3004
".`` 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.
3005
"and ``brz revert --forget-merges`` to clear the pending merge list without\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3006
"reverting any files."
3007
msgstr ""
3008
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3009
#: breezy/builtins.py:4790
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3010
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3011
"Using \"brz revert --forget-merges\", it is possible to apply all of the\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3012
"changes from a branch in a single revision.  To do this, perform the merge\n"
3013
"as desired.  Then doing revert with the \"--forget-merges\" option will "
3014
"keep\n"
3015
"the content of the tree as it was, but it will clear the list of pending\n"
3016
"merges.  The next commit will then contain all of the changes that are\n"
3017
"present in the other branch, but without any other parent revisions.\n"
3018
"Because this technique forgets where these changes originated, it may\n"
3019
"cause additional conflicts on later merges involving the same source and\n"
3020
"target branches."
3021
msgstr ""
3022
6622.1.22 by Jelmer Vernooij
Update po files.
3023
# help of 'no-backup' option of 'revert' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3024
#: breezy/builtins.py:4804
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3025
msgid "Do not save backups of reverted files."
3026
msgstr ""
3027
6622.1.22 by Jelmer Vernooij
Update po files.
3028
# help of 'forget-merges' option of 'revert' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3029
#: breezy/builtins.py:4806
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3030
msgid "Remove pending merge marker, without changing any files."
3031
msgstr ""
3032
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3033
#: breezy/builtins.py:4837
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3034
msgid ""
3035
"Show help on a command or other topic.\n"
3036
"    "
3037
msgstr ""
3038
6622.1.22 by Jelmer Vernooij
Update po files.
3039
# help of 'long' option of 'help' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3040
#: breezy/builtins.py:4842
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3041
msgid "Show help on all commands."
3042
msgstr ""
3043
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3044
#: breezy/builtins.py:4871
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3045
msgid "Show unmerged/unpulled revisions between two branches."
3046
msgstr ""
3047
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3048
#: breezy/builtins.py:4873
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3049
msgid "OTHER_BRANCH may be local or remote."
3050
msgstr ""
3051
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3052
#: breezy/builtins.py:4875
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3053
msgid ""
3054
"To filter on a range of revisions, you can use the command -r begin..end\n"
3055
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3056
"also valid.\n"
3057
"        \n"
3058
":Exit values:\n"
3059
"    1 - some missing revisions\n"
3060
"    0 - no missing revisions"
3061
msgstr ""
3062
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3063
#: breezy/builtins.py:4885
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3064
msgid ""
3065
"    Determine the missing revisions between this and the branch at the\n"
3066
"    remembered pull location::"
3067
msgstr ""
3068
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3069
#: breezy/builtins.py:4888
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3070
msgid "        brz missing"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3071
msgstr ""
3072
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3073
#: breezy/builtins.py:4890
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3074
msgid "    Determine the missing revisions between this and another branch::"
3075
msgstr ""
3076
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3077
#: breezy/builtins.py:4892
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3078
msgid "        brz missing http://server/branch"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3079
msgstr ""
3080
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3081
#: breezy/builtins.py:4894
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3082
msgid ""
3083
"    Determine the missing revisions up to a specific revision on the other\n"
3084
"    branch::"
3085
msgstr ""
3086
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3087
#: breezy/builtins.py:4897
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3088
msgid "        brz missing -r ..-10"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3089
msgstr ""
3090
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3091
#: breezy/builtins.py:4899
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3092
msgid ""
3093
"    Determine the missing revisions up to a specific revision on this\n"
3094
"    branch::"
3095
msgstr ""
3096
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3097
#: breezy/builtins.py:4902
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3098
msgid "        brz missing --my-revision ..-10"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3099
msgstr ""
3100
6622.1.22 by Jelmer Vernooij
Update po files.
3101
# help of 'reverse' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3102
#: breezy/builtins.py:4909
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3103
msgid "Reverse the order of revisions."
3104
msgstr ""
3105
6622.1.22 by Jelmer Vernooij
Update po files.
3106
# help of 'mine-only' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3107
#: breezy/builtins.py:4911
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3108
msgid "Display changes in the local branch only."
3109
msgstr ""
3110
6622.1.22 by Jelmer Vernooij
Update po files.
3111
# help of 'this' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3112
#: breezy/builtins.py:4912
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3113
msgid "Same as --mine-only."
3114
msgstr ""
3115
6622.1.22 by Jelmer Vernooij
Update po files.
3116
# help of 'theirs-only' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3117
#: breezy/builtins.py:4914
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3118
msgid "Display changes in the remote branch only."
3119
msgstr ""
3120
6622.1.22 by Jelmer Vernooij
Update po files.
3121
# help of 'other' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3122
#: breezy/builtins.py:4915
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3123
msgid "Same as --theirs-only."
3124
msgstr ""
3125
6622.1.22 by Jelmer Vernooij
Update po files.
3126
# help of 'revision' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3127
#: breezy/builtins.py:4920
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3128
msgid ""
3129
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3130
"details."
3131
msgstr ""
3132
6622.1.22 by Jelmer Vernooij
Update po files.
3133
# help of 'my-revision' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3134
#: breezy/builtins.py:4924
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3135
msgid ""
3136
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3137
"details."
3138
msgstr ""
3139
6622.1.22 by Jelmer Vernooij
Update po files.
3140
# help of 'include-merged' option of 'missing' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3141
#: breezy/builtins.py:4927
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3142
msgid "Show all revisions in addition to the mainline ones."
3143
msgstr ""
3144
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3145
#: breezy/builtins.py:4981
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3146
msgid "No peer location known or specified."
3147
msgstr ""
3148
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3149
#: breezy/builtins.py:4985
6622.1.22 by Jelmer Vernooij
Update po files.
3150
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3151
msgid "Using saved parent location: {0}\n"
3152
msgstr ""
3153
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3154
#: breezy/builtins.py:5018
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3155
#, python-format
3156
msgid "You have %d extra revision:\n"
3157
msgid_plural "You have %d extra revisions:\n"
3158
msgstr[0] ""
3159
msgstr[1] ""
3160
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3161
#: breezy/builtins.py:5038
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3162
#, python-format
3163
msgid "You are missing %d revision:\n"
3164
msgid_plural "You are missing %d revisions:\n"
3165
msgstr[0] ""
3166
msgstr[1] ""
3167
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3168
#: breezy/builtins.py:5053
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3169
msgid "This branch has no new revisions.\n"
3170
msgstr ""
3171
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3172
#: breezy/builtins.py:5056
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3173
msgid "Other branch has no new revisions.\n"
3174
msgstr ""
3175
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3176
#: breezy/builtins.py:5061
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3177
msgid "Branches are up to date.\n"
3178
msgstr ""
3179
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3180
#: breezy/builtins.py:5072
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3181
msgid "Compress the data within a repository."
3182
msgstr ""
3183
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3184
#: breezy/builtins.py:5074
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3185
msgid ""
3186
"This operation compresses the data within a bazaar repository. As\n"
3187
"bazaar supports automatic packing of repository, this operation is\n"
3188
"normally not required to be done manually."
3189
msgstr ""
3190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3191
#: breezy/builtins.py:5078
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3192
msgid ""
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3195
"automatically when it is safe to do so. To save disk space by removing\n"
3196
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3197
"used."
3198
msgstr ""
3199
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3200
#: breezy/builtins.py:5084
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3201
msgid ""
3202
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3203
"during or immediately after repacking, you may be left with a state\n"
3204
"where the deletion has been written to disk but the new packs have not\n"
3205
"been. In this case the repository may be unusable."
3206
msgstr ""
3207
6622.1.22 by Jelmer Vernooij
Update po files.
3208
# help of 'clean-obsolete-packs' option of 'pack' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3209
#: breezy/builtins.py:5093
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3210
msgid "Delete obsolete packs to save disk space."
3211
msgstr ""
3212
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3213
#: breezy/builtins.py:5107
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3214
msgid "List the installed plugins."
3215
msgstr ""
3216
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3217
#: breezy/builtins.py:5109
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3218
msgid ""
3219
"This command displays the list of installed plugins including\n"
3220
"version of plugin and a short description of each."
3221
msgstr ""
3222
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3223
#: breezy/builtins.py:5112
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3224
msgid "--verbose shows the path where each plugin is located."
3225
msgstr ""
3226
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3227
#: breezy/builtins.py:5114
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3228
msgid ""
3229
"A plugin is an external component for Bazaar that extends the\n"
3230
"revision control system, by adding or replacing code in Bazaar.\n"
3231
"Plugins can do a variety of things, including overriding commands,\n"
3232
"adding new commands, providing additional network transports and\n"
3233
"customizing log output."
3234
msgstr ""
3235
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3236
#: breezy/builtins.py:5120
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3237
msgid ""
3238
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3239
"for further information on plugins including where to find them and how to\n"
3240
"install them. Instructions are also provided there on how to write new\n"
3241
"plugins using the Python programming language."
3242
msgstr ""
3243
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3244
#: breezy/builtins.py:5136
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3245
msgid "Show testament (signing-form) of a revision."
3246
msgstr ""
3247
6622.1.22 by Jelmer Vernooij
Update po files.
3248
# help of 'long' option of 'testament' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3249
#: breezy/builtins.py:5139
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3250
msgid "Produce long-format testament."
3251
msgstr ""
3252
6622.1.22 by Jelmer Vernooij
Update po files.
3253
# help of 'strict' option of 'testament' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3254
#: breezy/builtins.py:5141
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3255
msgid "Produce a strict-format testament."
3256
msgstr ""
3257
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3258
#: breezy/builtins.py:5168
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3259
msgid "Show the origin of each line in a file."
3260
msgstr ""
3261
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3262
#: breezy/builtins.py:5170
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3263
msgid ""
3264
"This prints out the given file with an annotation on the left side\n"
3265
"indicating which revision, author and date introduced the change."
3266
msgstr ""
3267
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3268
#: breezy/builtins.py:5173
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3269
msgid ""
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3271
"shown only at the top, unless the --all option is given."
3272
msgstr ""
3273
6622.1.22 by Jelmer Vernooij
Update po files.
3274
# help of 'all' option of 'annotate' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3275
#: breezy/builtins.py:5181
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3276
msgid "Show annotations on all lines."
3277
msgstr ""
3278
6622.1.22 by Jelmer Vernooij
Update po files.
3279
# help of 'long' option of 'annotate' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3280
#: breezy/builtins.py:5182
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3281
msgid "Show commit date in annotations."
3282
msgstr ""
3283
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3284
#: breezy/builtins.py:5269
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3285
msgid "Cannot sign a range of non-revision-history revisions"
3286
msgstr ""
3287
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3288
#: breezy/builtins.py:5281
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3289
msgid "Please supply either one revision, or a range."
3290
msgstr ""
3291
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3292
#: breezy/builtins.py:5285
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3293
msgid ""
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3295
"If no branch is supplied, rebind to the last bound location."
3296
msgstr ""
3297
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3298
#: breezy/builtins.py:5288
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3299
msgid ""
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3301
"before they will be applied to the local branch."
3302
msgstr ""
3303
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3304
#: breezy/builtins.py:5291
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3305
msgid ""
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3307
"locally, in which case binding will update the local nickname to be\n"
3308
"that of the master."
3309
msgstr ""
3310
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3311
#: breezy/builtins.py:5306
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3312
msgid "No location supplied.  This format does not remember old locations."
3313
msgstr ""
3314
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3315
#: breezy/builtins.py:5312
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3316
msgid "Branch is already bound"
3317
msgstr ""
3318
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3319
#: breezy/builtins.py:5315
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3320
msgid "No location supplied and no previous location known"
3321
msgstr ""
3322
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3323
#: breezy/builtins.py:5321
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3324
msgid "These branches have diverged. Try merging, and then bind again."
3325
msgstr ""
3326
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3327
#: breezy/builtins.py:5328
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3328
msgid "Convert the current checkout into a regular branch."
3329
msgstr ""
3330
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3331
#: breezy/builtins.py:5330
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3332
msgid ""
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3334
"commits will be local only."
3335
msgstr ""
3336
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3337
#: breezy/builtins.py:5341
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3338
msgid "Local branch is not bound"
3339
msgstr ""
3340
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3341
#: breezy/builtins.py:5345
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3342
msgid "Remove the last committed revision."
3343
msgstr ""
3344
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3345
#: breezy/builtins.py:5347
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3346
msgid ""
3347
"--verbose will print out what is being removed.\n"
3348
"--dry-run will go through all the motions, but not actually\n"
3349
"remove anything."
3350
msgstr ""
3351
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3352
#: breezy/builtins.py:5351
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3353
msgid ""
3354
"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.
3355
"specified revision.  For example, \"brz uncommit -r 15\" will leave the\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3356
"branch at revision 15."
3357
msgstr ""
3358
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3359
#: breezy/builtins.py:5355
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3360
msgid ""
3361
"Uncommit leaves the working tree ready for a new commit.  The only change\n"
3362
"it may make is to restore any pending merges that were present before\n"
3363
"the commit."
3364
msgstr ""
3365
6622.1.22 by Jelmer Vernooij
Update po files.
3366
# help of 'dry-run' option of 'uncommit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3367
#: breezy/builtins.py:5366
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3368
msgid "Don't actually make changes."
3369
msgstr ""
3370
6622.1.22 by Jelmer Vernooij
Update po files.
3371
# help of 'force' option of 'uncommit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3372
#: breezy/builtins.py:5367
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3373
msgid "Say yes to all questions."
3374
msgstr ""
3375
6622.1.22 by Jelmer Vernooij
Update po files.
3376
# help of 'keep-tags' option of 'uncommit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3377
#: breezy/builtins.py:5369
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3378
msgid "Keep tags that point to removed revisions."
3379
msgstr ""
3380
6622.1.22 by Jelmer Vernooij
Update po files.
3381
# help of 'local' option of 'uncommit' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3382
#: breezy/builtins.py:5371
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3383
msgid "Only remove the commits from the local branch when in a checkout."
3384
msgstr ""
3385
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3386
#: breezy/builtins.py:5420
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3387
msgid "No revisions to uncommit.\n"
3388
msgstr ""
3389
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3390
#: breezy/builtins.py:5435
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3392
msgstr ""
3393
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3394
#: breezy/builtins.py:5438
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3395
msgid "The above revision(s) will be removed.\n"
3396
msgstr ""
3397
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3398
#: breezy/builtins.py:5442
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3399
msgid "Uncommit these revisions"
3400
msgstr ""
3401
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3402
#: breezy/builtins.py:5445
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3403
msgid "Canceled\n"
3404
msgstr ""
3405
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3406
#: breezy/builtins.py:5452
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3407
#, python-format
3408
msgid ""
3409
"You can restore the old tip by running:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3410
"  brz pull . -r revid:%s\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3411
msgstr ""
3412
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3413
#: breezy/builtins.py:5457
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3414
msgid "Break a dead lock."
3415
msgstr ""
3416
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3417
#: breezy/builtins.py:5459
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3418
msgid ""
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3420
"config file."
3421
msgstr ""
3422
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3423
#: breezy/builtins.py:5462
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3424
msgid ""
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3426
"holding the lock has been stopped."
3427
msgstr ""
3428
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3429
#: breezy/builtins.py:5465
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3430
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3431
"You can get information on what locks are open via the 'brz info\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3432
"[location]' command."
3433
msgstr ""
3434
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3435
#: breezy/builtins.py:5468
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3436
msgid ""
3437
":Examples:\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3438
"    brz break-lock\n"
3439
"    brz break-lock brz+ssh://example.com/brz/foo\n"
3440
"    brz break-lock --conf ~/.bazaar"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3441
msgstr ""
3442
6622.1.22 by Jelmer Vernooij
Update po files.
3443
# help of 'config' option of 'break-lock' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3444
#: breezy/builtins.py:5477
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3445
msgid "LOCATION is the directory where the config lock is."
3446
msgstr ""
3447
6622.1.22 by Jelmer Vernooij
Update po files.
3448
# help of 'force' option of 'break-lock' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3449
#: breezy/builtins.py:5479
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3450
msgid "Do not ask for confirmation before breaking the lock."
3451
msgstr ""
3452
6622.1.22 by Jelmer Vernooij
Update po files.
3453
# help of 'protocol=bzr' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3454
#: breezy/builtins.py:5514
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3456
msgstr ""
3457
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3458
#: breezy/builtins.py:5515
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3459
msgid "Run the brz server."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3460
msgstr ""
3461
6622.1.22 by Jelmer Vernooij
Update po files.
3462
# help of 'inet' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3463
#: breezy/builtins.py:5521
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3465
msgstr ""
3466
6622.1.22 by Jelmer Vernooij
Update po files.
3467
# title of 'protocol' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3468
#: breezy/builtins.py:5522
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3469
msgid "protocol"
3470
msgstr ""
3471
6622.1.22 by Jelmer Vernooij
Update po files.
3472
# help of 'protocol' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3473
#: breezy/builtins.py:5523
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3474
msgid "Protocol to serve."
3475
msgstr ""
3476
6622.1.22 by Jelmer Vernooij
Update po files.
3477
# help of 'listen' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3478
#: breezy/builtins.py:5527
6622.1.22 by Jelmer Vernooij
Update po files.
3479
msgid "Listen for connections on nominated address."
3480
msgstr ""
3481
3482
# help of 'port' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3483
#: breezy/builtins.py:5529
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3484
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
3485
"Listen for connections on nominated port.  Passing 0 as the port number will "
3486
"result in a dynamically allocated port.  The default port depends on the "
3487
"protocol."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3488
msgstr ""
3489
6622.1.22 by Jelmer Vernooij
Update po files.
3490
# help of 'directory' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3491
#: breezy/builtins.py:5534
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3492
msgid "Serve contents of this directory."
3493
msgstr ""
3494
6622.1.22 by Jelmer Vernooij
Update po files.
3495
# help of 'allow-writes' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3496
#: breezy/builtins.py:5536
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3497
msgid ""
3498
"By default the server is a readonly server.  Supplying --allow-writes "
3499
"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.
3500
"Note that ``brz serve`` does not perform authentication, so unless some form "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3501
"of external authentication is arranged supplying this option leads to global "
3502
"uncontrolled write access to your file system."
3503
msgstr ""
3504
6622.1.22 by Jelmer Vernooij
Update po files.
3505
# help of 'client-timeout' option of 'serve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3506
#: breezy/builtins.py:5545
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3507
msgid "Override the default idle client timeout (5min)."
3508
msgstr ""
3509
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3510
#: breezy/builtins.py:5563
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3511
msgid "Combine a tree into its containing tree."
3512
msgstr ""
3513
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3514
#: breezy/builtins.py:5565
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3515
msgid "This command requires the target tree to be in a rich-root format."
3516
msgstr ""
3517
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3518
#: breezy/builtins.py:5567
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3519
msgid ""
3520
"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.
3521
"not part of it.  (Such trees can be produced by \"brz split\", but also by\n"
3522
"running \"brz branch\" with the target inside a tree.)"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3523
msgstr ""
3524
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3525
#: breezy/builtins.py:5571
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3526
msgid ""
3527
"The result is a combined tree, with the subtree no longer an independent\n"
3528
"part.  This is marked as a merge of the subtree into the containing tree,\n"
3529
"and all history is preserved."
3530
msgstr ""
3531
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3532
#: breezy/builtins.py:5589
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3533
#, python-format
3534
msgid ""
3535
"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.
3536
"You can use brz upgrade on the repository."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3537
msgstr ""
3538
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3539
#: breezy/builtins.py:5599 breezy/builtins.py:5605
6622.1.22 by Jelmer Vernooij
Update po files.
3540
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3541
msgid "Cannot join {0}.  {1}"
3542
msgstr ""
3543
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3544
#: breezy/builtins.py:5609
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3545
msgid "Split a subdirectory of a tree into a separate tree."
3546
msgstr ""
3547
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3548
#: breezy/builtins.py:5611
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3549
msgid ""
3550
"This command will produce a target tree in a format that supports\n"
3551
"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
3552
"converted into earlier formats like 'dirstate-tags'."
3553
msgstr ""
3554
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3555
#: breezy/builtins.py:5615
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3556
msgid ""
3557
"The TREE argument should be a subdirectory of a working tree.  That\n"
3558
"subdirectory will be converted into an independent tree, with its own\n"
3559
"branch.  Commits in the top-level tree will not apply to the new subtree."
3560
msgstr ""
3561
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3562
#: breezy/builtins.py:5695
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3563
msgid "No submit branch specified or known"
3564
msgstr ""
3565
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3566
#: breezy/builtins.py:5704 breezy/send.py:109
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3567
msgid "No public branch specified or known"
3568
msgstr ""
3569
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3570
#: breezy/builtins.py:5709
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3571
msgid "brz merge-directive takes at most two one revision identifiers"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3572
msgstr ""
3573
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3574
#: breezy/builtins.py:5718
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3575
msgid "No revisions to bundle."
3576
msgstr ""
3577
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3578
#: breezy/builtins.py:5737
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3579
msgid "Mail or create a merge-directive for submitting changes."
3580
msgstr ""
3581
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3582
#: breezy/builtins.py:5739
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3583
msgid "A merge directive provides many things needed for requesting merges:"
3584
msgstr ""
3585
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3586
#: breezy/builtins.py:5741
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3587
msgid "* A machine-readable description of the merge to perform"
3588
msgstr ""
3589
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3590
#: breezy/builtins.py:5743
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3591
msgid "* An optional patch that is a preview of the changes requested"
3592
msgstr ""
3593
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3594
#: breezy/builtins.py:5745
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3595
msgid ""
3596
"* An optional bundle of revision data, so that the changes can be applied\n"
3597
"  directly from the merge directive, without retrieving data from a\n"
3598
"  branch."
3599
msgstr ""
3600
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3601
#: breezy/builtins.py:5749
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3602
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3603
"`brz send` creates a compact data set that, when applied using brz\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3604
"merge, has the same effect as merging from the source branch.  "
3605
msgstr ""
3606
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3607
#: breezy/builtins.py:5752
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3608
msgid ""
3609
"By default the merge directive is self-contained and can be applied to any\n"
3610
"branch containing submit_branch in its ancestory without needing access to\n"
3611
"the source branch."
3612
msgstr ""
3613
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3614
#: breezy/builtins.py:5756
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3615
msgid ""
3616
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3617
"revisions, but only a structured request to merge from the\n"
3618
"public_location.  In that case the public_branch is needed and it must be\n"
3619
"up-to-date and accessible to the recipient.  The public_branch is always\n"
3620
"included if known, so that people can check it later."
3621
msgstr ""
3622
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3623
#: breezy/builtins.py:5762
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3624
msgid ""
3625
"The submit branch defaults to the parent of the source branch, but can be\n"
3626
"overridden.  Both submit branch and public branch will be remembered in\n"
3627
"branch.conf the first time they are used for a particular branch.  The\n"
3628
"source branch defaults to that containing the working directory, but can\n"
3629
"be changed using --from."
3630
msgstr ""
3631
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3632
#: breezy/builtins.py:5768
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3633
msgid ""
3634
"Both the submit branch and the public branch follow the usual behavior with\n"
3635
"respect to --remember: If there is no default location set, the first send\n"
3636
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3637
"omit the location to use the default.  To change the default, use\n"
3638
"--remember. The value will only be saved if the location can be accessed."
3639
msgstr ""
3640
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3641
#: breezy/builtins.py:5774
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3642
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3643
"In order to calculate those changes, brz must analyse the submit branch.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3644
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3645
"If a public location is known for the submit_branch, that location is used\n"
3646
"in the merge directive."
3647
msgstr ""
3648
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3649
#: breezy/builtins.py:5779
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3650
msgid ""
3651
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3652
"given, in which case it is sent to a file."
3653
msgstr ""
3654
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3655
#: breezy/builtins.py:5782
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3656
msgid ""
3657
"Mail is sent using your preferred mail program.  This should be transparent\n"
3658
"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
3659
"If the preferred client can't be found (or used), your editor will be used."
3660
msgstr ""
3661
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3662
#: breezy/builtins.py:5786
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3663
msgid ""
3664
"To use a specific mail program, set the mail_client configuration option.\n"
3665
"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
6622.1.22 by Jelmer Vernooij
Update po files.
3666
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3667
"\" (MacOS X's\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3668
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3669
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
3670
"add\n"
3671
"supported clients."
3672
msgstr ""
3673
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3674
#: breezy/builtins.py:5793
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3675
msgid ""
3676
"If mail is being sent, a to address is required.  This can be supplied\n"
3677
"either on the commandline, by setting the submit_to configuration\n"
3678
"option in the branch itself or the child_submit_to configuration option\n"
3679
"in the submit branch."
3680
msgstr ""
3681
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3682
#: breezy/builtins.py:5798
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3683
msgid ""
3684
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3685
"and\n"
3686
"merge directive format 2.  It is significantly faster and smaller than\n"
3687
"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
3688
"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3689
"format 1.  It is compatible with Bazaar 0.12 - 0.18."
3690
msgstr ""
3691
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3692
#: breezy/builtins.py:5804
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3693
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3694
"The merge directives created by brz send may be applied using brz merge or\n"
3695
"brz pull by specifying a file containing a merge directive as the location."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3696
msgstr ""
3697
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3698
#: breezy/builtins.py:5807
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3699
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3700
"brz send makes extensive use of public locations to map local locations "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3701
"into\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3702
"URLs that can be used by other people.  See `brz help configuration` to\n"
3703
"set them, and use `brz info` to display them."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3704
msgstr ""
3705
6622.1.22 by Jelmer Vernooij
Update po files.
3706
# help of 'output' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3707
#: breezy/builtins.py:5831
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3708
msgid "Write merge directive to this file or directory; use - for stdout."
3709
msgstr ""
3710
6622.1.22 by Jelmer Vernooij
Update po files.
3711
# help of 'strict' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3712
#: breezy/builtins.py:5835
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3713
msgid ""
3714
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3715
"strict disables the check."
3716
msgstr ""
3717
6622.1.22 by Jelmer Vernooij
Update po files.
3718
# help of 'mail-to' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3719
#: breezy/builtins.py:5837
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3720
msgid "Mail the request to this address."
3721
msgstr ""
3722
6622.1.22 by Jelmer Vernooij
Update po files.
3723
# help of 'body' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3724
#: breezy/builtins.py:5841
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3725
msgid "Body for the email."
3726
msgstr ""
3727
6622.1.22 by Jelmer Vernooij
Update po files.
3728
# help of 'no-bundle' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3729
#: breezy/builtins.py:5894
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3730
msgid "Do not include a bundle in the merge directive."
3731
msgstr ""
3732
6622.1.22 by Jelmer Vernooij
Update po files.
3733
# help of 'no-patch' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3734
#: breezy/builtins.py:5895
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3735
msgid "Do not include a preview patch in the merge directive."
3736
msgstr ""
3737
6622.1.22 by Jelmer Vernooij
Update po files.
3738
# help of 'remember' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3739
#: breezy/builtins.py:5898
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3740
msgid "Remember submit and public branch."
3741
msgstr ""
3742
6622.1.22 by Jelmer Vernooij
Update po files.
3743
# help of 'from' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3744
#: breezy/builtins.py:5900
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3745
msgid ""
3746
"Branch to generate the submission from, rather than the one containing the "
3747
"working directory."
3748
msgstr ""
3749
6622.1.22 by Jelmer Vernooij
Update po files.
3750
# title of 'format' option of 'send' command
3751
# title of 'format' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3752
#: breezy/builtins.py:5910 breezy/cmd_version_info.py:76
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3753
msgid "format"
3754
msgstr ""
3755
6622.1.22 by Jelmer Vernooij
Update po files.
3756
# help of 'format' option of 'send' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3757
#: breezy/builtins.py:5911
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3758
msgid "Use the specified output format."
3759
msgstr ""
3760
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3761
#: breezy/builtins.py:5933
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3762
msgid "Create, remove or modify a tag naming a revision."
3763
msgstr ""
3764
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3765
#: breezy/builtins.py:5935
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3766
msgid ""
3767
"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
3768
"(--revision) option can be given -rtag:X, where X is any previously\n"
3769
"created tag."
3770
msgstr ""
3771
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3772
#: breezy/builtins.py:5939
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3773
msgid ""
3774
"Tags are stored in the branch.  Tags are copied from one branch to another\n"
3775
"along when you branch, push, pull or merge."
3776
msgstr ""
3777
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3778
#: breezy/builtins.py:5942
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3779
msgid ""
3780
"It is an error to give a tag name that already exists unless you pass\n"
3781
"--force, in which case the tag is moved to point to the new revision."
3782
msgstr ""
3783
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3784
#: breezy/builtins.py:5945
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3785
msgid ""
3786
"To rename a tag (change the name but keep it on the same revsion), run "
3787
"``bzr\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3788
"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3789
msgstr ""
3790
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3791
#: breezy/builtins.py:5948
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3792
msgid ""
3793
"If no tag name is specified it will be determined through the \n"
3794
"'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.
3795
"upstream releases by reading configure.ac. See ``brz help hooks`` for\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3796
"details."
3797
msgstr ""
3798
6622.1.22 by Jelmer Vernooij
Update po files.
3799
# help of 'delete' option of 'tag' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3800
#: breezy/builtins.py:5958
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3801
msgid "Delete this tag rather than placing it."
3802
msgstr ""
3803
6622.1.22 by Jelmer Vernooij
Update po files.
3804
# help of 'directory' option of 'tag' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3805
#: breezy/builtins.py:5961
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3806
msgid "Branch in which to place the tag."
3807
msgstr ""
3808
6622.1.22 by Jelmer Vernooij
Update po files.
3809
# help of 'force' option of 'tag' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3810
#: breezy/builtins.py:5963
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3811
msgid "Replace existing tags."
3812
msgstr ""
3813
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3814
#: breezy/builtins.py:5978
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3815
msgid "No tag specified to delete."
3816
msgstr ""
3817
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3818
#: breezy/builtins.py:5980
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3819
#, python-format
3820
msgid "Deleted tag %s."
3821
msgstr ""
3822
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3823
#: breezy/builtins.py:5985
6622.1.22 by Jelmer Vernooij
Update po files.
3824
msgid "Tags can only be placed on a single revision, not on a range"
3825
msgstr ""
3826
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3827
#: breezy/builtins.py:5994
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3828
msgid "Please specify a tag name."
3829
msgstr ""
3830
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3831
#: breezy/builtins.py:6002
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3832
#, python-format
3833
msgid "Tag %s already exists for that revision."
3834
msgstr ""
3835
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3836
#: breezy/builtins.py:6006
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3837
#, python-format
3838
msgid "Created tag %s."
3839
msgstr ""
3840
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3841
#: breezy/builtins.py:6008
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3842
#, python-format
3843
msgid "Updated tag %s."
3844
msgstr ""
3845
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3846
#: breezy/builtins.py:6012
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3847
msgid "List tags."
3848
msgstr ""
3849
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3850
#: breezy/builtins.py:6014
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3851
msgid ""
3852
"This command shows a table of tag names and the revisions they reference."
3853
msgstr ""
3854
6622.1.22 by Jelmer Vernooij
Update po files.
3855
# help of 'directory' option of 'tags' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3856
#: breezy/builtins.py:6020
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3857
msgid "Branch whose tags should be displayed."
3858
msgstr ""
3859
6622.1.22 by Jelmer Vernooij
Update po files.
3860
# help of 'sort' option of 'tags' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3861
#: breezy/builtins.py:6022
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3862
msgid "Sort tags by different criteria."
3863
msgstr ""
3864
6622.1.22 by Jelmer Vernooij
Update po files.
3865
# title of 'sort' option of 'tags' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3866
#: breezy/builtins.py:6022
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3867
msgid "Sorting"
3868
msgstr ""
3869
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3870
#: breezy/builtins.py:6091
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
3871
msgid "Reconfigure the type of a brz directory."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3872
msgstr ""
3873
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3874
#: breezy/builtins.py:6093
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3875
msgid "A target configuration must be specified."
3876
msgstr ""
3877
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3878
#: breezy/builtins.py:6095
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3879
msgid ""
3880
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3881
"The order of preference is\n"
3882
"1. For a lightweight checkout, the current bound location.\n"
3883
"2. For branches that used to be checkouts, the previously-bound location.\n"
3884
"3. The push location.\n"
3885
"4. The parent location.\n"
3886
"If none of these is available, --bind-to must be specified."
3887
msgstr ""
3888
6622.1.22 by Jelmer Vernooij
Update po files.
3889
# title of 'tree_type' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3890
#: breezy/builtins.py:6109
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3891
msgid "Tree type"
3892
msgstr ""
3893
6622.1.22 by Jelmer Vernooij
Update po files.
3894
# help of 'tree_type' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3895
#: breezy/builtins.py:6110
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3896
msgid "The relation between branch and tree."
3897
msgstr ""
3898
6622.1.22 by Jelmer Vernooij
Update po files.
3899
# help of 'tree_type=branch' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3900
#: breezy/builtins.py:6112
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3901
msgid "Reconfigure to be an unbound branch with no working tree."
3902
msgstr ""
3903
6622.1.22 by Jelmer Vernooij
Update po files.
3904
# help of 'tree_type=tree' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3905
#: breezy/builtins.py:6113
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3906
msgid "Reconfigure to be an unbound branch with a working tree."
3907
msgstr ""
3908
6622.1.22 by Jelmer Vernooij
Update po files.
3909
# help of 'tree_type=checkout' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3910
#: breezy/builtins.py:6114
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3911
msgid "Reconfigure to be a bound branch with a working tree."
3912
msgstr ""
3913
6622.1.22 by Jelmer Vernooij
Update po files.
3914
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3915
#: breezy/builtins.py:6115
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3916
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3917
msgstr ""
3918
6622.1.22 by Jelmer Vernooij
Update po files.
3919
# title of 'repository_type' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3920
#: breezy/builtins.py:6120
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3921
msgid "Repository type"
3922
msgstr ""
3923
6622.1.22 by Jelmer Vernooij
Update po files.
3924
# help of 'repository_type' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3925
#: breezy/builtins.py:6121
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3926
msgid "Location fo the repository."
3927
msgstr ""
3928
6622.1.22 by Jelmer Vernooij
Update po files.
3929
# help of 'repository_type=standalone' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3930
#: breezy/builtins.py:6123
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3931
msgid ""
3932
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3933
msgstr ""
3934
6622.1.22 by Jelmer Vernooij
Update po files.
3935
# help of 'repository_type=use-shared' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3936
#: breezy/builtins.py:6125
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3937
msgid "Reconfigure to use a shared repository."
3938
msgstr ""
3939
6622.1.22 by Jelmer Vernooij
Update po files.
3940
# title of 'repository_trees' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3941
#: breezy/builtins.py:6129
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3942
msgid "Trees in Repository"
3943
msgstr ""
3944
6622.1.22 by Jelmer Vernooij
Update po files.
3945
# help of 'repository_trees' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3946
#: breezy/builtins.py:6130
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3947
msgid "Whether new branches in the repository have trees."
3948
msgstr ""
3949
6622.1.22 by Jelmer Vernooij
Update po files.
3950
# help of 'repository_trees=with-trees' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3951
#: breezy/builtins.py:6132
6622.1.22 by Jelmer Vernooij
Update po files.
3952
msgid "Reconfigure repository to create working trees on branches by default."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3953
msgstr ""
3954
6622.1.22 by Jelmer Vernooij
Update po files.
3955
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3956
#: breezy/builtins.py:6134
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3957
msgid ""
3958
"Reconfigure repository to not create working trees on branches by default."
3959
msgstr ""
3960
6622.1.22 by Jelmer Vernooij
Update po files.
3961
# help of 'bind-to' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3962
#: breezy/builtins.py:6137
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3963
msgid "Branch to bind checkout to."
3964
msgstr ""
3965
6622.1.22 by Jelmer Vernooij
Update po files.
3966
# help of 'force' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3967
#: breezy/builtins.py:6139
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3968
msgid "Perform reconfiguration even if local changes will be lost."
3969
msgstr ""
3970
6622.1.22 by Jelmer Vernooij
Update po files.
3971
# help of 'stacked-on' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3972
#: breezy/builtins.py:6142
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3973
msgid "Reconfigure a branch to be stacked on another branch."
3974
msgstr ""
3975
6622.1.22 by Jelmer Vernooij
Update po files.
3976
# help of 'unstacked' option of 'reconfigure' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3977
#: breezy/builtins.py:6146
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3978
msgid ""
3979
"Reconfigure a branch to be unstacked.  This may require copying substantial "
3980
"data into it."
3981
msgstr ""
3982
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3983
#: breezy/builtins.py:6156
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3984
msgid "Can't use both --stacked-on and --unstacked"
3985
msgstr ""
3986
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3987
#: breezy/builtins.py:6170
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3988
msgid "No target configuration specified"
3989
msgstr ""
3990
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3991
#: breezy/builtins.py:6205
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3992
msgid "Set the branch of a checkout and update."
3993
msgstr ""
3994
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3995
#: breezy/builtins.py:6207
6524.1.1 by Jelmer Vernooij
Merge 2.5.
3996
msgid ""
3997
"For lightweight checkouts, this changes the branch being referenced.\n"
3998
"For heavyweight checkouts, this checks that there are no local commits\n"
3999
"versus the current bound branch, then it makes the local branch a mirror\n"
4000
"of the new location and binds to it."
4001
msgstr ""
4002
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4003
#: breezy/builtins.py:6212
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4004
msgid ""
4005
"In both cases, the working tree is updated and uncommitted changes\n"
4006
"are merged. The user can commit or revert these as they desire."
4007
msgstr ""
4008
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4009
#: breezy/builtins.py:6215
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4010
msgid "Pending merges need to be committed or reverted before using switch."
4011
msgstr ""
4012
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4013
#: breezy/builtins.py:6217
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4014
msgid ""
4015
"The path to the branch to switch to can be specified relative to the parent\n"
4016
"directory of the current branch. For example, if you are currently in a\n"
4017
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4018
"/path/to/newbranch."
4019
msgstr ""
4020
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4021
#: breezy/builtins.py:6222
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4022
msgid ""
4023
"Bound branches use the nickname of its master branch unless it is set\n"
4024
"locally, in which case switching will update the local nickname to be\n"
4025
"that of the master."
4026
msgstr ""
4027
6622.1.22 by Jelmer Vernooij
Update po files.
4028
# help of 'force' option of 'switch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4029
#: breezy/builtins.py:6230
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4030
msgid "Switch even if local commits will be lost."
4031
msgstr ""
4032
6622.1.22 by Jelmer Vernooij
Update po files.
4033
# help of 'create-branch' option of 'switch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4034
#: breezy/builtins.py:6233
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4035
msgid "Create the target branch from this one before switching to it."
4036
msgstr ""
4037
6622.1.22 by Jelmer Vernooij
Update po files.
4038
# help of 'store' option of 'switch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4039
#: breezy/builtins.py:6236
6622.1.22 by Jelmer Vernooij
Update po files.
4040
msgid "Store and restore uncommitted changes in the branch."
4041
msgstr ""
4042
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4043
#: breezy/builtins.py:6250
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4044
msgid "You must supply either a revision or a location"
4045
msgstr ""
4046
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4047
#: breezy/builtins.py:6263
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4048
msgid "cannot create branch without source branch"
4049
msgstr ""
4050
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4051
#: breezy/builtins.py:6289
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4052
msgid "Manage filtered views."
4053
msgstr ""
4054
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4055
#: breezy/builtins.py:6291
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4056
msgid ""
4057
"Views provide a mask over the tree so that users can focus on\n"
4058
"a subset of a tree when doing their work. After creating a view,\n"
4059
"commands that support a list of files - status, diff, commit, etc -\n"
4060
"effectively have that list of files implicitly given each time.\n"
4061
"An explicit list of files can still be given but those files\n"
4062
"must be within the current view."
4063
msgstr ""
4064
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4065
#: breezy/builtins.py:6298
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4066
msgid ""
4067
"In most cases, a view has a short life-span: it is created to make\n"
4068
"a selected change and is deleted once that change is committed.\n"
4069
"At other times, you may wish to create one or more named views\n"
4070
"and switch between them."
4071
msgstr ""
4072
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4073
#: breezy/builtins.py:6303
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4074
msgid ""
4075
"To disable the current view without deleting it, you can switch to\n"
4076
"the pseudo view called ``off``. This can be useful when you need\n"
4077
"to see the whole tree for an operation or two (e.g. merge) but\n"
4078
"want to switch back to your view after that."
4079
msgstr ""
4080
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4081
#: breezy/builtins.py:6308
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4082
msgid ""
4083
":Examples:\n"
4084
"  To define the current view::"
4085
msgstr ""
4086
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4087
#: breezy/builtins.py:6311
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4088
msgid "    brz view file1 dir1 ..."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4089
msgstr ""
4090
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4091
#: breezy/builtins.py:6313
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4092
msgid "  To list the current view::"
4093
msgstr ""
4094
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4095
#: breezy/builtins.py:6315
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4096
msgid "    brz view"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4097
msgstr ""
4098
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4099
#: breezy/builtins.py:6317
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4100
msgid "  To delete the current view::"
4101
msgstr ""
4102
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4103
#: breezy/builtins.py:6319
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4104
msgid "    brz view --delete"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4105
msgstr ""
4106
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4107
#: breezy/builtins.py:6321
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4108
msgid "  To disable the current view without deleting it::"
4109
msgstr ""
4110
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4111
#: breezy/builtins.py:6323
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4112
msgid "    brz view --switch off"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4113
msgstr ""
4114
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4115
#: breezy/builtins.py:6325
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4116
msgid "  To define a named view and switch to it::"
4117
msgstr ""
4118
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4119
#: breezy/builtins.py:6327
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4120
msgid "    brz view --name view-name file1 dir1 ..."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4121
msgstr ""
4122
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4123
#: breezy/builtins.py:6329
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4124
msgid "  To list a named view::"
4125
msgstr ""
4126
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4127
#: breezy/builtins.py:6331
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4128
msgid "    brz view --name view-name"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4129
msgstr ""
4130
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4131
#: breezy/builtins.py:6333
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4132
msgid "  To delete a named view::"
4133
msgstr ""
4134
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4135
#: breezy/builtins.py:6335
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4136
msgid "    brz view --name view-name --delete"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4137
msgstr ""
4138
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4139
#: breezy/builtins.py:6337
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4140
msgid "  To switch to a named view::"
4141
msgstr ""
4142
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4143
#: breezy/builtins.py:6339
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4144
msgid "    brz view --switch view-name"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4145
msgstr ""
4146
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4147
#: breezy/builtins.py:6341
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4148
msgid "  To list all views defined::"
4149
msgstr ""
4150
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4151
#: breezy/builtins.py:6343
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4152
msgid "    brz view --all"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4153
msgstr ""
4154
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4155
#: breezy/builtins.py:6345
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4156
msgid "  To delete all views::"
4157
msgstr ""
4158
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4159
#: breezy/builtins.py:6347
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4160
msgid "    brz view --delete --all"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4161
msgstr ""
4162
6622.1.22 by Jelmer Vernooij
Update po files.
4163
# help of 'all' option of 'view' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4164
#: breezy/builtins.py:6354
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4165
msgid "Apply list or delete action to all views."
4166
msgstr ""
4167
6622.1.22 by Jelmer Vernooij
Update po files.
4168
# help of 'delete' option of 'view' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4169
#: breezy/builtins.py:6357
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4170
msgid "Delete the view."
4171
msgstr ""
4172
6622.1.22 by Jelmer Vernooij
Update po files.
4173
# help of 'name' option of 'view' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4174
#: breezy/builtins.py:6360
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4175
msgid "Name of the view to define, list or delete."
4176
msgstr ""
4177
6622.1.22 by Jelmer Vernooij
Update po files.
4178
# help of 'switch' option of 'view' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4179
#: breezy/builtins.py:6364
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4180
msgid "Name of the view to switch to."
4181
msgstr ""
4182
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4183
#: breezy/builtins.py:6383
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4184
msgid "Both --delete and a file list specified"
4185
msgstr ""
4186
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4187
#: breezy/builtins.py:6386
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4188
msgid "Both --delete and --switch specified"
4189
msgstr ""
4190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4191
#: breezy/builtins.py:6389
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4192
msgid "Deleted all views.\n"
4193
msgstr ""
4194
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4195
#: breezy/builtins.py:6391
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4196
msgid "No current view to delete"
4197
msgstr ""
4198
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4199
#: breezy/builtins.py:6394
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4200
#, python-format
4201
msgid "Deleted '%s' view.\n"
4202
msgstr ""
4203
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4204
#: breezy/builtins.py:6398
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4205
msgid "Both --switch and a file list specified"
4206
msgstr ""
4207
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4208
#: breezy/builtins.py:6401
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4209
msgid "Both --switch and --all specified"
4210
msgstr ""
4211
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4212
#: breezy/builtins.py:6404
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4213
msgid "No current view to disable"
4214
msgstr ""
4215
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4216
#: breezy/builtins.py:6406
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4217
#, python-format
4218
msgid "Disabled '%s' view.\n"
4219
msgstr ""
4220
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4221
#: breezy/builtins.py:6410 breezy/builtins.py:6432
6622.1.22 by Jelmer Vernooij
Update po files.
4222
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4223
msgid "Using '{0}' view: {1}\n"
4224
msgstr ""
4225
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4226
#: breezy/builtins.py:6413
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4227
msgid "Views defined:\n"
4228
msgstr ""
4229
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4230
#: breezy/builtins.py:6422
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4231
msgid "No views defined.\n"
4232
msgstr ""
4233
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4234
#: breezy/builtins.py:6429
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4235
msgid "Cannot change the 'off' pseudo view"
4236
msgstr ""
4237
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4238
#: breezy/builtins.py:6437
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4239
msgid "No current view.\n"
4240
msgstr ""
4241
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4242
#: breezy/builtins.py:6440
6622.1.22 by Jelmer Vernooij
Update po files.
4243
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4244
msgid "'{0}' view is: {1}\n"
4245
msgstr ""
4246
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4247
#: breezy/builtins.py:6460
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4248
msgid "    <no hooks installed>\n"
4249
msgstr ""
4250
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4251
#: breezy/builtins.py:6464
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4252
msgid "Remove a branch."
4253
msgstr ""
4254
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4255
#: breezy/builtins.py:6466
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4256
msgid ""
4257
"This will remove the branch from the specified location but \n"
4258
"will keep any working tree or repository in place."
4259
msgstr ""
4260
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4261
#: breezy/builtins.py:6471
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4262
msgid "  Remove the branch at repo/trunk::"
4263
msgstr ""
4264
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4265
#: breezy/builtins.py:6473
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4266
msgid "    bzr remove-branch repo/trunk"
4267
msgstr ""
4268
6622.1.22 by Jelmer Vernooij
Update po files.
4269
# help of 'force' option of 'remove-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4270
#: breezy/builtins.py:6480
6622.1.22 by Jelmer Vernooij
Update po files.
4271
msgid "Remove branch even if it is the active branch."
4272
msgstr ""
4273
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4274
#: breezy/builtins.py:6494
6622.1.22 by Jelmer Vernooij
Update po files.
4275
msgid "Branch is active. Use --force to remove it."
4276
msgstr ""
4277
4278
# help of 'writer=plain' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4279
#: breezy/builtins.py:6498
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4280
msgid "Plaintext diff output."
4281
msgstr ""
4282
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4283
#: breezy/builtins.py:6499
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4284
msgid "Temporarily set aside some changes from the current tree."
4285
msgstr ""
4286
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4287
#: breezy/builtins.py:6501
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4288
msgid ""
4289
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4290
"ie. out of the way, until a later time when you can bring them back from\n"
4291
"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
4292
"your working tree, and so they aren't propagated along with your branch nor\n"
4293
"will they survive its deletion."
4294
msgstr ""
4295
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4296
#: breezy/builtins.py:6507
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4297
msgid "If shelve --list is specified, previously-shelved changes are listed."
4298
msgstr ""
4299
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4300
#: breezy/builtins.py:6509
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4301
msgid ""
4302
"Shelve is intended to help separate several sets of changes that have\n"
4303
"been inappropriately mingled.  If you just want to get rid of all changes\n"
4304
"and you don't need to restore them later, use revert.  If you want to\n"
4305
"shelve all text changes at once, use shelve --all."
4306
msgstr ""
4307
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4308
#: breezy/builtins.py:6514
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4309
msgid ""
4310
"If filenames are specified, only the changes to those files will be\n"
4311
"shelved. Other files will be left untouched."
4312
msgstr ""
4313
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4314
#: breezy/builtins.py:6517
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4315
msgid ""
4316
"If a revision is specified, changes since that revision will be shelved."
4317
msgstr ""
4318
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4319
#: breezy/builtins.py:6519
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4320
msgid ""
4321
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4322
"restore the most recently shelved changes."
4323
msgstr ""
4324
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4325
#: breezy/builtins.py:6522
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4326
msgid ""
4327
"For complicated changes, it is possible to edit the changes in a separate\n"
4328
"editor program to decide what the file remaining in the working copy\n"
4329
"should look like.  To do this, add the configuration option"
4330
msgstr ""
4331
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4332
#: breezy/builtins.py:6526
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4333
msgid "    change_editor = PROGRAM @new_path @old_path"
4334
msgstr ""
4335
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4336
#: breezy/builtins.py:6528
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4337
msgid ""
4338
"where @new_path is replaced with the path of the new version of the \n"
4339
"file and @old_path is replaced with the path of the old version of \n"
4340
"the file.  The PROGRAM should save the new file with the desired \n"
4341
"contents of the file in the working tree.\n"
4342
"    "
4343
msgstr ""
4344
6622.1.22 by Jelmer Vernooij
Update po files.
4345
# help of 'all' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4346
#: breezy/builtins.py:6540
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4347
msgid "Shelve all changes."
4348
msgstr ""
4349
6622.1.22 by Jelmer Vernooij
Update po files.
4350
# help of 'writer' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4351
#: breezy/builtins.py:6542
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4352
msgid "Method to use for writing diffs."
4353
msgstr ""
4354
6622.1.22 by Jelmer Vernooij
Update po files.
4355
# title of 'writer' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4356
#: breezy/builtins.py:6542
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4357
msgid "writer"
4358
msgstr ""
4359
6622.1.22 by Jelmer Vernooij
Update po files.
4360
# help of 'list' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4361
#: breezy/builtins.py:6546
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4362
msgid "List shelved changes."
4363
msgstr ""
4364
6622.1.22 by Jelmer Vernooij
Update po files.
4365
# help of 'destroy' option of 'shelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4366
#: breezy/builtins.py:6548
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4367
msgid "Destroy removed changes instead of shelving them."
4368
msgstr ""
4369
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4370
#: breezy/builtins.py:6577
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4371
msgid "No shelved changes."
4372
msgstr ""
4373
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4374
#: breezy/builtins.py:6588
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4375
msgid "Restore shelved changes."
4376
msgstr ""
4377
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4378
#: breezy/builtins.py:6590
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4379
msgid ""
4380
"By default, the most recently shelved changes are restored. However if you\n"
4381
"specify a shelf by id those changes will be restored instead.  This works\n"
4382
"best when the changes don't depend on each other."
4383
msgstr ""
4384
6622.1.22 by Jelmer Vernooij
Update po files.
4385
# help of 'action' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4386
#: breezy/builtins.py:6599
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4387
msgid "The action to perform."
4388
msgstr ""
4389
6622.1.22 by Jelmer Vernooij
Update po files.
4390
# title of 'action' option of 'resolve' command
4391
# title of 'action' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4392
#: breezy/builtins.py:6599 breezy/conflicts.py:694
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4393
msgid "action"
4394
msgstr ""
4395
6622.1.22 by Jelmer Vernooij
Update po files.
4396
# help of 'action=apply' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4397
#: breezy/builtins.py:6601
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4398
msgid "Apply changes and remove from the shelf."
4399
msgstr ""
4400
6622.1.22 by Jelmer Vernooij
Update po files.
4401
# help of 'action=dry-run' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4402
#: breezy/builtins.py:6602
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4403
msgid "Show changes, but do not apply or remove them."
4404
msgstr ""
4405
6622.1.22 by Jelmer Vernooij
Update po files.
4406
# help of 'action=preview' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4407
#: breezy/builtins.py:6603
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4408
msgid ""
4409
"Instead of unshelving the changes, show the diff that would result from "
4410
"unshelving."
4411
msgstr ""
4412
6622.1.22 by Jelmer Vernooij
Update po files.
4413
# help of 'action=delete-only' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4414
#: breezy/builtins.py:6605
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4415
msgid "Delete changes without applying them."
4416
msgstr ""
4417
6622.1.22 by Jelmer Vernooij
Update po files.
4418
# help of 'action=keep' option of 'unshelve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4419
#: breezy/builtins.py:6606
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4420
msgid "Apply changes but don't delete them."
4421
msgstr ""
4422
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4423
#: breezy/builtins.py:6621
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4424
msgid "Remove unwanted files from working tree."
4425
msgstr ""
4426
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4427
#: breezy/builtins.py:6623
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4428
msgid ""
4429
"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
4430
"files are never deleted."
4431
msgstr ""
4432
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4433
#: breezy/builtins.py:6626
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4434
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4435
"Another class is 'detritus', which includes files emitted by brz during\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4436
"normal operations and selftests.  (The value of these files decreases with\n"
4437
"time.)"
4438
msgstr ""
4439
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4440
#: breezy/builtins.py:6630
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4441
msgid ""
4442
"If no options are specified, unknown files are deleted.  Otherwise, option\n"
4443
"flags are respected, and may be combined."
4444
msgstr ""
4445
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4446
#: breezy/builtins.py:6633
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4447
msgid "To check what clean-tree will do, use --dry-run."
4448
msgstr ""
4449
6622.1.22 by Jelmer Vernooij
Update po files.
4450
# help of 'ignored' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4451
#: breezy/builtins.py:6636
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4452
msgid "Delete all ignored files."
4453
msgstr ""
4454
6622.1.22 by Jelmer Vernooij
Update po files.
4455
# help of 'detritus' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4456
#: breezy/builtins.py:6637
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4457
msgid ""
4458
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4459
msgstr ""
4460
6622.1.22 by Jelmer Vernooij
Update po files.
4461
# help of 'unknown' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4462
#: breezy/builtins.py:6640
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
4463
msgid "Delete files unknown to brz (default)."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4464
msgstr ""
4465
6622.1.22 by Jelmer Vernooij
Update po files.
4466
# help of 'dry-run' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4467
#: breezy/builtins.py:6641
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4468
msgid "Show files to delete instead of deleting them."
4469
msgstr ""
4470
6622.1.22 by Jelmer Vernooij
Update po files.
4471
# help of 'force' option of 'clean-tree' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4472
#: breezy/builtins.py:6643
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4473
msgid "Do not prompt before deleting."
4474
msgstr ""
4475
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4476
#: breezy/bundle/__init__.py:59
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4477
msgid "A directory cannot be a bundle"
4478
msgstr ""
4479
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4480
#: breezy/bundle/apply_bundle.py:40
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4481
msgid "Install revisions"
4482
msgstr ""
4483
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4484
#: breezy/bundle/commands.py:64
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4485
msgid "--verbose requires a merge directive"
4486
msgstr ""
4487
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4488
#: breezy/bundle/commands.py:67
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4489
msgid "Bundle format not supported"
4490
msgstr ""
4491
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4492
#: breezy/bundle/commands.py:77
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4493
msgid "Records\n"
4494
msgstr ""
4495
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4496
#: breezy/bundle/commands.py:81
6622.1.22 by Jelmer Vernooij
Update po files.
4497
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4498
msgid "{0}: {1} ({2} multiparent)\n"
4499
msgstr ""
4500
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4501
#: breezy/bundle/commands.py:83
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4502
#, python-format
4503
msgid "unique files: %d\n"
4504
msgstr ""
4505
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4506
#: breezy/bundle/commands.py:92
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4507
msgid "Revisions\n"
4508
msgstr ""
4509
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4510
#: breezy/bundle/commands.py:93
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4511
#, python-format
4512
msgid "nicks: %s\n"
4513
msgstr ""
4514
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4515
#: breezy/bundle/commands.py:95
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4516
#, python-format
4517
msgid ""
4518
"committers: \n"
4519
"%s\n"
4520
msgstr ""
4521
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4522
#: breezy/bundle/commands.py:103
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4523
msgid "Decoded contents\n"
4524
msgstr ""
4525
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4526
#: breezy/bundle/serializer/v4.py:327
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4527
#, python-format
4528
msgid "Bundling %d revision."
4529
msgid_plural "Bundling %d revisions."
4530
msgstr[0] ""
4531
msgstr[1] ""
4532
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4533
#: breezy/bzrdir.py:487
6622.1.22 by Jelmer Vernooij
Update po files.
4534
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4535
msgid ""
4536
"making backup of {0}\n"
4537
"  to {1}"
4538
msgstr ""
4539
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4540
#: breezy/bzrdir.py:510
6622.1.22 by Jelmer Vernooij
Update po files.
4541
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4542
msgid "renamed {0} to {1}"
4543
msgstr ""
4544
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4545
#: breezy/bzrdir.py:1639
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4546
#, python-format
4547
msgid ""
4548
"Source repository format does not support stacking, using format:\n"
4549
"  %s"
4550
msgstr ""
4551
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4552
#: breezy/bzrdir.py:1659
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4553
#, python-format
4554
msgid ""
4555
"Source branch format does not support stacking, using format:\n"
4556
"  %s"
4557
msgstr ""
4558
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4559
#: breezy/bzrdir.py:1805
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4560
msgid "starting repository conversion"
4561
msgstr ""
4562
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4563
#: breezy/bzrdir.py:2026
6622.1.22 by Jelmer Vernooij
Update po files.
4564
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4565
msgid "Using default stacking branch {0} at {1}"
4566
msgstr ""
4567
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4568
#: breezy/check.py:108
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4569
msgid "check"
4570
msgstr ""
4571
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4572
#: breezy/check.py:110
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4573
msgid "checking revisions"
4574
msgstr ""
4575
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4576
#: breezy/check.py:112
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4577
msgid "checking commit contents"
4578
msgstr ""
4579
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4580
#: breezy/check.py:114
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4581
msgid "checking file graphs"
4582
msgstr ""
4583
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4584
#: breezy/check.py:118
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4585
msgid "checking branches and trees"
4586
msgstr ""
4587
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4588
#: breezy/check.py:205
6622.1.22 by Jelmer Vernooij
Update po files.
4589
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4590
msgid "checked repository {0} format {1}"
4591
msgstr ""
4592
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4593
#: breezy/check.py:208
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4594
#, python-format
4595
msgid "%6d revisions"
4596
msgstr ""
4597
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4598
#: breezy/check.py:209
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4599
#, python-format
4600
msgid "%6d file-ids"
4601
msgstr ""
4602
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4603
#: breezy/check.py:211
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4604
#, python-format
4605
msgid "%6d unreferenced text versions"
4606
msgstr ""
4607
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4608
#: breezy/check.py:215
6622.1.22 by Jelmer Vernooij
Update po files.
4609
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4610
msgid "unreferenced version: {{{0}}} in {1}"
4611
msgstr ""
4612
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4613
#: breezy/check.py:218
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4614
#, python-format
4615
msgid "%6d revisions are missing inventory_sha1"
4616
msgstr ""
4617
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4618
#: breezy/check.py:221
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4619
#, python-format
4620
msgid "%6d revisions are mentioned but not present"
4621
msgstr ""
4622
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4623
#: breezy/check.py:224
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4624
#, python-format
4625
msgid "%6d ghost revisions"
4626
msgstr ""
4627
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4628
#: breezy/check.py:229
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4629
#, python-format
4630
msgid "%6d revisions missing parents in ancestry"
4631
msgstr ""
4632
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4633
#: breezy/check.py:233
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4634
#, python-format
4635
msgid "      %s should be in the ancestry for:"
4636
msgstr ""
4637
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4638
#: breezy/check.py:237
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4639
#, python-format
4640
msgid "%6d inconsistent parents"
4641
msgstr ""
4642
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4643
#: breezy/check.py:241
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4644
msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
4645
msgstr ""
4646
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4647
#: breezy/check.py:247
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4648
#, python-format
4649
msgid "%6d revisions have incorrect parents in the revision index"
4650
msgstr ""
4651
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4652
#: breezy/check.py:253
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4653
msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
4654
msgstr ""
4655
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4656
#: breezy/check.py:267
6622.1.22 by Jelmer Vernooij
Update po files.
4657
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4658
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4659
msgstr ""
4660
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4661
#: breezy/check.py:296
6622.1.22 by Jelmer Vernooij
Update po files.
4662
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4663
msgid ""
4664
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4665
"{{{4}}}"
4666
msgstr ""
4667
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4668
#: breezy/check.py:354
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4669
#, python-format
4670
msgid "Checking branch at '%s'."
4671
msgstr ""
4672
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4673
#: breezy/check.py:374
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4674
#, python-format
4675
msgid "Checking working tree at '%s'."
4676
msgstr ""
4677
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4678
#: breezy/check.py:427 breezy/check.py:441
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4679
msgid "No branch found at specified location."
4680
msgstr ""
4681
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4682
#: breezy/check.py:429 breezy/check.py:439
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4683
msgid "No working tree found at specified location."
4684
msgstr ""
4685
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4686
#: breezy/check.py:432
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4687
#, python-format
4688
msgid "Checking repository at '%s'."
4689
msgstr ""
4690
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4691
#: breezy/check.py:443
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4692
msgid "No repository found at specified location."
4693
msgstr ""
4694
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4695
#: breezy/clean_tree.py:63
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4696
msgid "Nothing to delete."
4697
msgstr ""
4698
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4699
#: breezy/clean_tree.py:68
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4700
msgid "Are you sure you wish to delete these"
4701
msgstr ""
4702
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4703
#: breezy/clean_tree.py:70
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4704
msgid "Canceled"
4705
msgstr ""
4706
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4707
#: breezy/clean_tree.py:107
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4708
#, python-format
4709
msgid "unable to remove %s"
4710
msgstr ""
4711
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4712
#: breezy/clean_tree.py:111
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4713
msgid "deleting paths:"
4714
msgstr ""
4715
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4716
#: breezy/clean_tree.py:125
6622.1.22 by Jelmer Vernooij
Update po files.
4717
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4718
msgid "unable to remove \"{0}\": {1}."
4719
msgstr ""
4720
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4721
#: breezy/clean_tree.py:130
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4722
msgid "No files deleted."
4723
msgstr ""
4724
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4725
#: breezy/cmd_version_info.py:47
6622.1.22 by Jelmer Vernooij
Update po files.
4726
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4727
msgid "No known version info format {0}. Supported types are: {1}"
4728
msgstr ""
4729
6622.1.22 by Jelmer Vernooij
Update po files.
4730
# help of 'format=custom' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4731
#: breezy/cmd_version_info.py:52
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4732
msgid "Version info in Custom template-based format."
4733
msgstr ""
4734
6622.1.22 by Jelmer Vernooij
Update po files.
4735
# help of 'format=python' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4736
#: breezy/cmd_version_info.py:52
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4737
msgid "Version info in Python format."
4738
msgstr ""
4739
6622.1.22 by Jelmer Vernooij
Update po files.
4740
# help of 'format=rio' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4741
#: breezy/cmd_version_info.py:52
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4742
msgid "Version info in RIO (simple text) format (default)."
4743
msgstr ""
4744
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4745
#: breezy/cmd_version_info.py:53
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4746
msgid "Show version information about this tree."
4747
msgstr ""
4748
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4749
#: breezy/cmd_version_info.py:55
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4750
msgid ""
4751
"You can use this command to add information about version into\n"
4752
"source code of an application. The output can be in one of the\n"
4753
"supported formats or in a custom format based on a template."
4754
msgstr ""
4755
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4756
#: breezy/cmd_version_info.py:59 en/help_topics/configuration.txt:712
6622.1.22 by Jelmer Vernooij
Update po files.
4757
#: en/help_topics/configuration.txt:738
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4758
msgid "For example::"
4759
msgstr ""
4760
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4761
#: breezy/cmd_version_info.py:61
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4762
msgid ""
4763
"  bzr version-info --custom \\\n"
4764
"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4765
msgstr ""
4766
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4767
#: breezy/cmd_version_info.py:64
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4768
msgid ""
4769
"will produce a C header file with formatted string containing the\n"
4770
"current revision number. Other supported variables in templates are:"
4771
msgstr ""
4772
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4773
#: breezy/cmd_version_info.py:67
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4774
msgid ""
4775
"  * {date} - date of the last revision\n"
4776
"  * {build_date} - current date\n"
4777
"  * {revno} - revision number\n"
4778
"  * {revision_id} - revision id\n"
4779
"  * {branch_nick} - branch nickname\n"
4780
"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
4781
"              otherwise 1"
4782
msgstr ""
4783
6622.1.22 by Jelmer Vernooij
Update po files.
4784
# help of 'format' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4785
#: breezy/cmd_version_info.py:77
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4786
msgid "Select the output format."
4787
msgstr ""
4788
6622.1.22 by Jelmer Vernooij
Update po files.
4789
# help of 'all' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4790
#: breezy/cmd_version_info.py:81
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4791
msgid "Include all possible information."
4792
msgstr ""
4793
6622.1.22 by Jelmer Vernooij
Update po files.
4794
# help of 'check-clean' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4795
#: breezy/cmd_version_info.py:82
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4796
msgid "Check if tree is clean."
4797
msgstr ""
4798
6622.1.22 by Jelmer Vernooij
Update po files.
4799
# help of 'include-history' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4800
#: breezy/cmd_version_info.py:84
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4801
msgid "Include the revision-history."
4802
msgstr ""
4803
6622.1.22 by Jelmer Vernooij
Update po files.
4804
# help of 'include-file-revisions' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4805
#: breezy/cmd_version_info.py:86
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4806
msgid "Include the last revision for each file."
4807
msgstr ""
4808
6622.1.22 by Jelmer Vernooij
Update po files.
4809
# help of 'template' option of 'version-info' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4810
#: breezy/cmd_version_info.py:87
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4811
msgid "Template for the output."
4812
msgstr ""
4813
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4814
#: breezy/cmd_version_info.py:101
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4815
msgid "bzr version-info --revision takes exactly one revision specifier"
4816
msgstr ""
4817
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4818
#: breezy/commands.py:229
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4819
#, python-format
4820
msgid "unknown command \"%s\""
4821
msgstr ""
4822
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4823
#: breezy/commands.py:476
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4824
msgid "No help for this command."
4825
msgstr ""
4826
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4827
#: breezy/commands.py:489
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4828
#, python-format
4829
msgid ":Purpose: %s\n"
4830
msgstr ""
4831
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4832
#: breezy/commands.py:491
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4833
#, python-format
4834
msgid ""
4835
":Usage:\n"
4836
"%s\n"
4837
msgstr ""
4838
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4839
#: breezy/commands.py:493
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4840
#, python-format
4841
msgid ":Usage:   %s\n"
4842
msgstr ""
4843
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4844
#: breezy/commands.py:512
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4845
#, python-format
4846
msgid ":Options:%s"
4847
msgstr ""
4848
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4849
#: breezy/commands.py:523
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4850
#, python-format
4851
msgid ""
4852
":Description:\n"
4853
"  %s\n"
4854
"\n"
4855
msgstr ""
4856
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4857
#: breezy/commands.py:533
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4858
#, python-format
4859
msgid ""
4860
"See bzr help %s for more details and examples.\n"
4861
"\n"
4862
msgstr ""
4863
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4864
#: breezy/commands.py:538
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4865
msgid ":Aliases:  "
4866
msgstr ""
4867
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4868
#: breezy/commands.py:542
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4869
#, python-format
4870
msgid ":From:     plugin \"%s\"\n"
4871
msgstr ""
4872
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4873
#: breezy/commands.py:554
6622.1.22 by Jelmer Vernooij
Update po files.
4874
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4875
msgid ":doc:`{0} <{1}-help>`"
4876
msgstr ""
4877
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4878
#: breezy/commands.py:558
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4879
#, python-format
4880
msgid ":See also: %s"
4881
msgstr ""
4882
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4883
#: breezy/commands.py:826
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4884
msgid "Only ASCII permitted in option names"
4885
msgstr ""
4886
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4887
#: breezy/commands.py:851 breezy/commands.py:859
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4888
msgid "command {0!r} needs one or more {1}"
4889
msgstr ""
4890
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4891
#: breezy/commands.py:868
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4892
msgid "command {0!r} requires argument {1}"
4893
msgstr ""
4894
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4895
#: breezy/commands.py:875
6622.1.22 by Jelmer Vernooij
Update po files.
4896
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4897
msgid "extra argument to command {0}: {1}"
4898
msgstr ""
4899
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4900
#: breezy/commands.py:952
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4901
#, python-format
4902
msgid "Profile data written to \"%s\"."
4903
msgstr ""
4904
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4905
#: breezy/commit.py:117 breezy/commit.py:740
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4906
msgid "added"
4907
msgstr ""
4908
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4909
#: breezy/commit.py:117 breezy/commit.py:748
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4910
msgid "modified"
4911
msgstr ""
4912
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4913
#: breezy/commit.py:131
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4914
#, python-format
4915
msgid "Committing%s"
4916
msgstr ""
4917
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4918
#: breezy/commit.py:134
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4919
#, python-format
4920
msgid "Committed revision %d."
4921
msgstr ""
4922
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4923
#: breezy/commit.py:143
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4924
#, python-format
4925
msgid "deleted %s"
4926
msgstr ""
4927
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4928
#: breezy/commit.py:146
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4929
#, python-format
4930
msgid "missing %s"
4931
msgstr ""
4932
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4933
#: breezy/commit.py:511
6622.1.22 by Jelmer Vernooij
Update po files.
4934
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4935
msgid ""
4936
"Conflicting tags in bound branch:\n"
4937
"{0}"
4938
msgstr ""
4939
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4940
#: breezy/commit.py:742
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4941
msgid "renamed"
4942
msgstr ""
4943
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4944
#: breezy/commit.py:976
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4945
msgid "unchanged"
4946
msgstr ""
4947
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4948
#: breezy/commit.py:998
6622.1.22 by Jelmer Vernooij
Update po files.
4949
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4950
msgid "{0} [{1}] - Stage"
4951
msgstr ""
4952
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4953
#: breezy/commit.py:1001
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4954
#, python-format
4955
msgid "%s - Stage"
4956
msgstr ""
4957
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4958
#: breezy/commit_signature_commands.py:34
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4959
msgid "Sign all commits by a given committer."
4960
msgstr ""
4961
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4962
#: breezy/commit_signature_commands.py:36
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4963
msgid ""
4964
"If location is not specified the local tree is used.\n"
4965
"If committer is not specified the default committer is used."
4966
msgstr ""
4967
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4968
#: breezy/commit_signature_commands.py:39
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4969
msgid "This does not sign commits that already have signatures."
4970
msgstr ""
4971
6622.1.22 by Jelmer Vernooij
Update po files.
4972
# help of 'dry-run' option of 'sign-my-commits' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4973
#: breezy/commit_signature_commands.py:47
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4974
msgid ""
4975
"Don't actually sign anything, just print the revisions that would be signed."
4976
msgstr ""
4977
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4978
#: breezy/commit_signature_commands.py:98
6622.1.22 by Jelmer Vernooij
Update po files.
4979
#, python-format
4980
msgid "Signed %d revision.\n"
4981
msgid_plural "Signed %d revisions.\n"
4982
msgstr[0] ""
4983
msgstr[1] ""
4984
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4985
#: breezy/commit_signature_commands.py:103
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4986
msgid "Verify all commit signatures."
4987
msgstr ""
4988
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4989
#: breezy/commit_signature_commands.py:105
6622.1.22 by Jelmer Vernooij
Update po files.
4990
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4991
msgstr ""
4992
6622.1.22 by Jelmer Vernooij
Update po files.
4993
# help of 'acceptable-keys' option of 'verify-signatures' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4994
#: breezy/commit_signature_commands.py:110
6524.1.1 by Jelmer Vernooij
Merge 2.5.
4995
msgid ""
4996
"Comma separated list of GPG key patterns which are acceptable for "
4997
"verification."
4998
msgstr ""
4999
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5000
#: breezy/commit_signature_commands.py:148
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5001
msgid "Cannot verify a range of non-revision-history revisions"
5002
msgstr ""
5003
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5004
#: breezy/commit_signature_commands.py:166
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5005
msgid "All commits signed with verifiable keys"
5006
msgstr ""
5007
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5008
#: breezy/config.py:438
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5009
msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
5010
msgstr ""
5011
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5012
#: breezy/config.py:2465
6622.1.22 by Jelmer Vernooij
Update po files.
5013
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5014
msgid "{0} is not an SI unit."
5015
msgstr ""
5016
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5017
#: breezy/config.py:3013
6622.1.22 by Jelmer Vernooij
Update po files.
5018
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5019
msgid ""
5020
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5021
"will be saved."
5022
msgstr ""
5023
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5024
#: breezy/config.py:3158
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5025
#, python-format
5026
msgid "Invalid '%s', should be of the form 'name=value'"
5027
msgstr ""
5028
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5029
#: breezy/config.py:4096
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5030
msgid "Display, set or remove a configuration option."
5031
msgstr ""
5032
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5033
#: breezy/config.py:4098
6622.1.22 by Jelmer Vernooij
Update po files.
5034
msgid "Display the active value for option NAME."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5035
msgstr ""
5036
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5037
#: breezy/config.py:4100
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5038
msgid ""
5039
"If --all is specified, NAME is interpreted as a regular expression and all\n"
6622.1.22 by Jelmer Vernooij
Update po files.
5040
"matching options are displayed mentioning their scope and without resolving\n"
5041
"option references in the value). The active value that bzr will take into\n"
5042
"account is the first one displayed for each option."
5043
msgstr ""
5044
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5045
#: breezy/config.py:4105
6622.1.22 by Jelmer Vernooij
Update po files.
5046
msgid ""
5047
"If NAME is not given, --all .* is implied (all options are displayed for "
5048
"the\n"
5049
"current scope)."
5050
msgstr ""
5051
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5052
#: breezy/config.py:4108
6622.1.22 by Jelmer Vernooij
Update po files.
5053
msgid ""
5054
"Setting a value is achieved by using NAME=value without spaces. The value\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5055
"is set in the most relevant scope and can be checked by displaying the\n"
5056
"option again."
5057
msgstr ""
5058
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5059
#: breezy/config.py:4112
6622.1.22 by Jelmer Vernooij
Update po files.
5060
msgid "Removing a value is achieved by using --remove NAME."
5061
msgstr ""
5062
5063
# help of 'scope' option of 'config' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5064
#: breezy/config.py:4122
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5065
msgid "Reduce the scope to the specified configuration file."
5066
msgstr ""
5067
6622.1.22 by Jelmer Vernooij
Update po files.
5068
# help of 'all' option of 'config' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5069
#: breezy/config.py:4126
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5070
msgid "Display all the defined values for the matching options."
5071
msgstr ""
5072
6622.1.22 by Jelmer Vernooij
Update po files.
5073
# help of 'remove' option of 'config' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5074
#: breezy/config.py:4128
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5075
msgid "Remove the option from the configuration file."
5076
msgstr ""
5077
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5078
#: breezy/conflicts.py:50
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5079
msgid "List files with conflicts."
5080
msgstr ""
5081
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5082
#: breezy/conflicts.py:57
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5083
msgid ""
5084
"Conflicts normally are listed as short, human-readable messages.  If --text\n"
5085
"is supplied, the pathnames of files with text conflicts are listed,\n"
5086
"instead.  (This is useful for editing all files with text conflicts.)"
5087
msgstr ""
5088
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5089
#: breezy/conflicts.py:61
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5090
msgid "Use bzr resolve when you have fixed a problem."
5091
msgstr ""
5092
6622.1.22 by Jelmer Vernooij
Update po files.
5093
# help of 'text' option of 'conflicts' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5094
#: breezy/conflicts.py:66
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5095
msgid "List paths of files with text conflicts."
5096
msgstr ""
5097
6622.1.22 by Jelmer Vernooij
Update po files.
5098
# help of 'action=done' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5099
#: breezy/conflicts.py:85
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5100
msgid "Marks the conflict as resolved."
5101
msgstr ""
5102
6622.1.22 by Jelmer Vernooij
Update po files.
5103
# help of 'action=take-this' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5104
#: breezy/conflicts.py:88
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5105
msgid "Resolve the conflict preserving the version in the working tree."
5106
msgstr ""
5107
6622.1.22 by Jelmer Vernooij
Update po files.
5108
# help of 'action=take-other' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5109
#: breezy/conflicts.py:91
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5110
msgid "Resolve the conflict taking the merged version into account."
5111
msgstr ""
5112
6622.1.22 by Jelmer Vernooij
Update po files.
5113
# help of 'action' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5114
#: breezy/conflicts.py:98
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5115
msgid "How to resolve the conflict."
5116
msgstr ""
5117
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5118
#: breezy/conflicts.py:104
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5119
msgid "Mark a conflict as resolved."
5120
msgstr ""
5121
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5122
#: breezy/conflicts.py:111
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5123
msgid ""
5124
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5125
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5126
"as\n"
5127
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5128
msgstr ""
5129
6622.1.22 by Jelmer Vernooij
Update po files.
5130
# help of 'all' option of 'resolve' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5131
#: breezy/conflicts.py:119
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5132
msgid "Resolve all conflicts in this tree."
5133
msgstr ""
5134
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5135
#: breezy/conflicts.py:126
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5136
msgid "If --all is specified, no FILE may be provided"
5137
msgstr ""
5138
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5139
#: breezy/conflicts.py:151
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5140
#, python-format
5141
msgid "%d conflict auto-resolved."
5142
msgid_plural "%d conflicts auto-resolved."
5143
msgstr[0] ""
5144
msgstr[1] ""
5145
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5146
#: breezy/conflicts.py:154
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5147
msgid "Remaining conflicts:"
5148
msgstr ""
5149
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5150
#: breezy/conflicts.py:159
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5151
msgid "All conflicts resolved."
5152
msgstr ""
5153
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5154
#: breezy/conflicts.py:168
6622.1.22 by Jelmer Vernooij
Update po files.
5155
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5156
msgid "{0} conflict resolved, {1} remaining"
5157
msgid_plural "{0} conflicts resolved, {1} remaining"
5158
msgstr[0] ""
5159
msgstr[1] ""
5160
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5161
#: breezy/controldir.py:712
6622.1.22 by Jelmer Vernooij
Update po files.
5162
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5163
msgid "{0} is{1} redirected to {2}"
5164
msgstr ""
5165
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5166
#: breezy/diff.py:413
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5167
#, python-format
5168
msgid "*** Ignoring files outside view. View is %s"
5169
msgstr ""
5170
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5171
#: breezy/errors.py:157
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5172
msgid "The tree builder is already building a tree."
5173
msgstr ""
5174
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5175
#: breezy/errors.py:178
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5176
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5177
msgstr ""
5178
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5179
#: breezy/errors.py:197
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5180
msgid ""
5181
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5182
"versions \"%(minimum)s\" to \"%(current)s\"."
5183
msgstr ""
5184
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5185
#: breezy/errors.py:209
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5186
msgid "The transport '%(transport)s' is only accessible within this process."
5187
msgstr ""
5188
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5189
#: breezy/errors.py:227
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5190
msgid "Invalid revision number %(revno)s"
5191
msgstr ""
5192
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5193
#: breezy/errors.py:236
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5194
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5195
msgstr ""
5196
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5197
#: breezy/errors.py:247
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5198
msgid "Reserved revision-id {%(revision_id)s}"
5199
msgstr ""
5200
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5201
#: breezy/errors.py:261
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5202
msgid "There is no public branch set for \"%(branch_url)s\"."
5203
msgstr ""
5204
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5205
#: breezy/errors.py:271
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5206
msgid ""
5207
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5208
"obtain a list of topics."
5209
msgstr ""
5210
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5211
#: breezy/errors.py:280
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5212
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5213
msgstr ""
5214
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5215
#: breezy/errors.py:290
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5216
msgid ""
5217
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5218
msgstr ""
5219
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5220
#: breezy/errors.py:299
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5221
msgid "The branch '%(branch)s' is not stacked."
5222
msgstr ""
5223
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5224
#: breezy/errors.py:313
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5225
msgid "No WorkingTree exists for \"%(base)s\"."
5226
msgstr ""
5227
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5228
#: breezy/errors.py:322
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5229
msgid "Not currently building a tree."
5230
msgstr ""
5231
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5232
#: breezy/errors.py:327
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5233
msgid "%(url)s is not a local path."
5234
msgstr ""
5235
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5236
#: breezy/errors.py:355
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5237
msgid "%(not_locked)r is not write locked but needs to be."
5238
msgstr ""
5239
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5240
#: breezy/errors.py:363
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5241
msgid "Error in command line options"
5242
msgstr ""
5243
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5244
#: breezy/errors.py:368
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5245
msgid "%(value)s is not an index of type %(_type)s."
5246
msgstr ""
5247
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5248
#: breezy/errors.py:378
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5249
msgid "Error in data for index %(value)s."
5250
msgstr ""
5251
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5252
#: breezy/errors.py:387
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5253
msgid "The key '%(key)s' is already in index '%(index)s'."
5254
msgstr ""
5255
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5256
#: breezy/errors.py:397
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5257
msgid "The key '%(key)s' is not a valid key."
5258
msgstr ""
5259
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5260
#: breezy/errors.py:406
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5261
msgid "Could not parse options for index %(value)s."
5262
msgstr ""
5263
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5264
#: breezy/errors.py:415
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5265
msgid "The value '%(value)s' is not a valid value."
5266
msgstr ""
5267
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5268
#: breezy/errors.py:424
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5269
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5270
msgstr ""
5271
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5272
#: breezy/errors.py:443
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5273
msgid "Generic path error: %(path)r%(extra)s)"
5274
msgstr ""
5275
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5276
#: breezy/errors.py:456
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5277
msgid "No such file: %(path)r%(extra)s"
5278
msgstr ""
5279
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5280
#: breezy/errors.py:461
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5281
msgid "File exists: %(path)r%(extra)s"
5282
msgstr ""
5283
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5284
#: breezy/errors.py:467
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5285
msgid ""
5286
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5287
"after to tell bzr about a rename that has already happened)%(extra)s"
5288
msgstr ""
5289
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5290
#: breezy/errors.py:483
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5291
msgid "\"%(path)s\" is not a directory %(extra)s"
5292
msgstr ""
5293
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5294
#: breezy/errors.py:488
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5295
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5296
msgstr ""
5297
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5298
#: breezy/errors.py:493
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5299
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5300
msgstr ""
5301
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5302
#: breezy/errors.py:498
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5303
msgid "Hard-linking \"%(path)s\" is not supported"
5304
msgstr ""
5305
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5306
#: breezy/errors.py:513
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5307
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5308
msgstr ""
5309
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5310
#: breezy/errors.py:518
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5311
msgid "Permission denied: \"%(path)s\"%(extra)s"
5312
msgstr ""
5313
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5314
#: breezy/errors.py:523
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5315
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5316
msgstr ""
5317
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5318
#: breezy/errors.py:528
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5319
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5320
msgstr ""
5321
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5322
#: breezy/errors.py:539
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5323
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5324
msgstr ""
5325
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5326
#: breezy/errors.py:561
5327
msgid "The %(type)s hook '%(hook)s' is unknown in this version of breezy."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5328
msgstr ""
5329
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5330
#: breezy/errors.py:571
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5331
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5332
msgstr ""
5333
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5334
#: breezy/errors.py:579
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5335
msgid ""
5336
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5337
"upgrade the branch to permit branch stacking."
5338
msgstr ""
5339
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5340
#: breezy/errors.py:590
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5341
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5342
msgstr ""
5343
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5344
#: breezy/errors.py:600
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5345
msgid ""
5346
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5347
"need to upgrade the repository to permit branch stacking."
5348
msgstr ""
5349
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5350
#: breezy/errors.py:611
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5351
msgid "Error reading from %(path)r."
5352
msgstr ""
5353
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5354
#: breezy/errors.py:630
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5355
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5356
msgstr ""
5357
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5358
#: breezy/errors.py:646
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5359
msgid "Path \"%(path)s\" is not unicode normalized"
5360
msgstr ""
5361
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5362
#: breezy/errors.py:654
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5363
msgid "Not a branch: \"%(path)s\"%(detail)s."
5364
msgstr ""
5365
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5366
#: breezy/errors.py:696
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5367
msgid "No submit branch available for branch \"%(path)s\""
5368
msgstr ""
5369
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5370
#: breezy/errors.py:705
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5371
msgid "A control directory already exists: \"%(path)s\"."
5372
msgstr ""
5373
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5374
#: breezy/errors.py:710
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5375
msgid "Already a branch: \"%(path)s\"."
5376
msgstr ""
5377
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5378
#: breezy/errors.py:715
6622.1.22 by Jelmer Vernooij
Update po files.
5379
msgid "Invalid branch name: %(name)s"
5380
msgstr ""
5381
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5382
#: breezy/errors.py:724
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5383
msgid "Parent branch already exists: \"%(path)s\"."
5384
msgstr ""
5385
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5386
#: breezy/errors.py:730
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5387
msgid ""
5388
"Directory contains a branch, but no working tree (use bzr checkout if you "
5389
"wish to build a working tree): \"%(path)s\""
5390
msgstr ""
5391
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5392
#: breezy/errors.py:735
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5393
msgid ""
5394
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5395
msgstr ""
5396
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5397
#: breezy/errors.py:745
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5398
msgid ""
5399
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5400
msgstr ""
5401
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5402
#: breezy/errors.py:755
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5403
msgid "No repository present: \"%(path)s\""
5404
msgstr ""
5405
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5406
#: breezy/errors.py:762
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5407
msgid ""
5408
"Unsupported branch format: %(format)s\n"
5409
"Please run 'bzr upgrade'"
5410
msgstr ""
5411
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5412
#: breezy/errors.py:768
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5413
msgid "Unknown %(kind)s format: %(format)r"
5414
msgstr ""
5415
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5416
#: breezy/errors.py:777
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5417
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5418
msgstr ""
5419
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5420
#: breezy/errors.py:787
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5421
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5422
msgstr ""
5423
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5424
#: breezy/errors.py:802
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5425
msgid ""
5426
"%(target)s\n"
5427
"is not compatible with\n"
5428
"%(source)s\n"
5429
"%(details)s"
5430
msgstr ""
5431
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5432
#: breezy/errors.py:818
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5433
msgid "Revision is not compatible with %(repo_format)s"
5434
msgstr ""
5435
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5436
#: breezy/errors.py:828
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5437
msgid "%(context_info)s%(path)s is already versioned."
5438
msgstr ""
5439
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5440
#: breezy/errors.py:849
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5441
msgid "%(context_info)s%(path)s is not versioned."
5442
msgstr ""
5443
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5444
#: breezy/errors.py:870
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5445
msgid "Path(s) are not versioned: %(paths_as_string)s"
5446
msgstr ""
5447
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5448
#: breezy/errors.py:881
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5449
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5450
msgstr ""
5451
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5452
#: breezy/errors.py:900
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5453
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5454
msgstr ""
5455
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5456
#: breezy/errors.py:908
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5457
msgid ""
5458
"Filename %(filename)r is not valid in your current filesystem encoding "
5459
"%(fs_encoding)s"
5460
msgstr ""
5461
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5462
#: breezy/errors.py:919
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5463
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5464
msgstr ""
5465
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5466
#: breezy/errors.py:937
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5467
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5468
msgstr ""
5469
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5470
#: breezy/errors.py:976
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5471
msgid "Cannot lock %(lock)s: %(why)s"
5472
msgstr ""
5473
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5474
#: breezy/errors.py:986
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5475
msgid ""
5476
"A transaction related operation was attempted after the transaction finished."
5477
msgstr ""
5478
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5479
#: breezy/errors.py:1013
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5480
msgid "Cannot lock: transport is read only: %(transport)s"
5481
msgstr ""
5482
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5483
#: breezy/errors.py:1021
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5484
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5485
msgstr ""
5486
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5487
#: breezy/errors.py:1032
6622.1.22 by Jelmer Vernooij
Update po files.
5488
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5489
msgstr ""
5490
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5491
#: breezy/errors.py:1043
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5492
msgid ""
5493
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5494
"%(holder)r, wanted to break %(target)r"
5495
msgstr ""
5496
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5497
#: breezy/errors.py:1055
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5498
msgid ""
5499
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5500
"Use 'bzr break-lock' to clear it"
5501
msgstr ""
5502
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5503
#: breezy/errors.py:1068
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5504
msgid "Lock not held: %(lock)s"
5505
msgstr ""
5506
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5507
#: breezy/errors.py:1097
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5508
msgid "No changes to commit"
5509
msgstr ""
5510
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5511
#: breezy/errors.py:1102
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5512
msgid ""
5513
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5514
msgstr ""
5515
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5516
#: breezy/errors.py:1112
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5517
msgid ""
5518
"Excluding paths during commit is not supported by repository at "
5519
"%(repository)r."
5520
msgstr ""
5521
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5522
#: breezy/errors.py:1121
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5523
msgid ""
5524
"The specified commit message contains characters unsupported by the current "
5525
"encoding."
5526
msgstr ""
5527
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5528
#: breezy/errors.py:1127
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5529
msgid "Upgrade URL cannot work with readonly URLs."
5530
msgstr ""
5531
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5532
#: breezy/errors.py:1132
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5533
msgid "The branch format %(format)s is already at the most recent format."
5534
msgstr ""
5535
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5536
#: breezy/errors.py:1155
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5537
msgid "Option --change does not accept revision ranges"
5538
msgstr ""
5539
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5540
#: breezy/errors.py:1160
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5541
msgid "No namespace registered for string: %(spec)r"
5542
msgstr ""
5543
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5544
#: breezy/errors.py:1179
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5545
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
5546
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5547
"%(extra)s"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5548
msgstr ""
5549
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5550
#: breezy/errors.py:1193
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5551
msgid ""
5552
"Operation denied because it would change the main history, which is not "
5553
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5554
msgstr ""
5555
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5556
#: breezy/errors.py:1204
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5557
msgid ""
5558
"These branches have diverged. Use the missing command to see how.\n"
5559
"Use the merge command to reconcile them."
5560
msgstr ""
5561
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5562
#: breezy/errors.py:1224
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5563
msgid ""
5564
"Branches have no common ancestor, and no merge base revision was specified."
5565
msgstr ""
5566
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5567
#: breezy/errors.py:1230
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5568
msgid ""
5569
"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
5570
msgstr ""
5571
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5572
#: breezy/errors.py:1236
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5573
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5574
msgstr ""
5575
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5576
#: breezy/errors.py:1245
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5577
msgid ""
5578
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5579
msgstr ""
5580
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5581
#: breezy/errors.py:1254
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5582
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5583
msgstr ""
5584
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5585
#: breezy/errors.py:1263
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5586
msgid "Branch %(branch)s has no commits."
5587
msgstr ""
5588
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5589
#: breezy/errors.py:1281
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5590
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
5591
"Bound branch %(branch)s is out of date with master branch %(master)s."
5592
"%(extra_help)s"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5593
msgstr ""
5594
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5595
#: breezy/errors.py:1293
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5596
msgid ""
5597
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5598
"bound to %(remote)s."
5599
msgstr ""
5600
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5601
#: breezy/errors.py:1305
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5602
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5603
msgstr ""
5604
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5605
#: breezy/errors.py:1314
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5606
msgid ""
5607
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5608
"%(error)s"
5609
msgstr ""
5610
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5611
#: breezy/errors.py:1326
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5612
msgid "Error in processing weave: %(msg)s"
5613
msgstr ""
5614
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5615
#: breezy/errors.py:1335
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5616
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5617
msgstr ""
5618
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5619
#: breezy/errors.py:1346
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5620
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5621
msgstr ""
5622
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5623
#: breezy/errors.py:1356
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5624
msgid "Weave invariant violated: %(what)s"
5625
msgstr ""
5626
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5627
#: breezy/errors.py:1365
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5628
msgid "Parents are mismatched between two revisions. %(msg)s"
5629
msgstr ""
5630
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5631
#: breezy/errors.py:1387
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5632
msgid ""
5633
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5634
"%(weave_b)s"
5635
msgstr ""
5636
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5637
#: breezy/errors.py:1399
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5638
msgid "Versioned file error"
5639
msgstr ""
5640
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5641
#: breezy/errors.py:1404
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5642
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5643
msgstr ""
5644
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5645
#: breezy/errors.py:1414
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5646
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5647
msgstr ""
5648
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5649
#: breezy/errors.py:1424
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5650
msgid "Text did not match its checksum: %(msg)s"
5651
msgstr ""
5652
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5653
#: breezy/errors.py:1550
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5654
msgid "Export format %(format)r not supported"
5655
msgstr ""
5656
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5657
#: breezy/errors.py:1559
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5658
msgid "Transport error: %(msg)s %(orig_error)s"
5659
msgstr ""
5660
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5661
#: breezy/errors.py:1585
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5662
msgid "Generic bzr smart protocol error: %(details)s"
5663
msgstr ""
5664
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5665
#: breezy/errors.py:1593
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5666
msgid "Received bad protocol version marker: %(marker)r"
5667
msgstr ""
5668
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5669
#: breezy/errors.py:1625
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5670
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5671
msgstr ""
5672
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5673
#: breezy/errors.py:1630
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5674
msgid "Connection error: %(msg)s %(orig_error)s"
5675
msgstr ""
5676
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5677
#: breezy/errors.py:1635
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5678
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5679
msgstr ""
5680
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5681
#: breezy/errors.py:1656
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5682
msgid "Connection closed: %(msg)s %(orig_error)s"
5683
msgstr ""
5684
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5685
#: breezy/errors.py:1661
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5686
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5687
msgstr ""
5688
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5689
#: breezy/errors.py:1666
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5690
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5691
msgstr ""
5692
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5693
#: breezy/errors.py:1676
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5694
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5695
msgstr ""
5696
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5697
#: breezy/errors.py:1691
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5698
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5699
msgstr ""
5700
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5701
#: breezy/errors.py:1705
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5702
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5703
msgstr ""
5704
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5705
#: breezy/errors.py:1713
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5706
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5707
msgstr ""
5708
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5709
#: breezy/errors.py:1722
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5710
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5711
msgstr ""
5712
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5713
#: breezy/errors.py:1736
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5714
msgid "Too many redirections"
5715
msgstr ""
5716
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5717
#: breezy/errors.py:1741
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5718
msgid "Working tree has conflicts."
5719
msgstr ""
5720
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5721
#: breezy/errors.py:1745
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5722
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5723
msgstr ""
5724
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5725
#: breezy/errors.py:1754
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5726
msgid ""
5727
"Error(s) parsing config file %(filename)s:\n"
5728
"%(errors)s"
5729
msgstr ""
5730
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5731
#: breezy/errors.py:1764
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5732
msgid ""
5733
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5734
"See ``bzr help %(name)s``"
5735
msgstr ""
5736
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5737
#: breezy/errors.py:1774
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5738
msgid "%(username)r does not seem to contain a reasonable email address"
5739
msgstr ""
5740
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5741
#: breezy/errors.py:1783
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5742
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5743
msgstr ""
5744
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5745
#: breezy/errors.py:1791
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5746
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5747
msgstr ""
5748
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5749
#: breezy/errors.py:1799
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5750
msgid "Unable to import library \"%(library)s\": %(error)s"
5751
msgstr ""
5752
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5753
#: breezy/errors.py:1807
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5754
msgid "python-gpgme is not installed, it is needed to verify signatures"
5755
msgstr ""
5756
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5757
#: breezy/errors.py:1815
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5758
msgid ""
5759
"The working tree for %(basedir)s has changed since the last commit, but "
5760
"weave merge requires that it be unchanged"
5761
msgstr ""
5762
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5763
#: breezy/errors.py:1825
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5764
msgid ""
5765
"Can't reprocess and show base, because reprocessing obscures the "
5766
"relationship of conflicting lines to the base"
5767
msgstr ""
5768
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5769
#: breezy/errors.py:1831
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5770
msgid "Cycle in graph %(graph)r"
5771
msgstr ""
5772
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5773
#: breezy/errors.py:1859
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5774
msgid "File %(filename)s is not conflicted."
5775
msgstr ""
5776
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5777
#: breezy/errors.py:1881
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5778
msgid "No bundle was found in \"%(filename)s\"."
5779
msgstr ""
5780
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5781
#: breezy/errors.py:1890
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5782
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5783
msgstr ""
5784
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5785
#: breezy/errors.py:1900
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5786
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5787
msgstr ""
5788
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5789
#: breezy/errors.py:1913
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5790
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5791
msgstr ""
5792
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5793
#: breezy/errors.py:1923
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5794
msgid "Key %(key)s is already present in map"
5795
msgstr ""
5796
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5797
#: breezy/errors.py:1928
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5798
msgid "The prefix %(prefix)s is in the help search path twice."
5799
msgstr ""
5800
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5801
#: breezy/errors.py:1938
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5802
msgid ""
5803
"No final name for trans_id %(trans_id)r\n"
5804
"file-id: %(file_id)r\n"
5805
"root trans-id: %(root_trans_id)r\n"
5806
msgstr ""
5807
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5808
#: breezy/errors.py:1970
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5809
msgid "Attempt to reuse a transform that has already been applied."
5810
msgstr ""
5811
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5812
#: breezy/errors.py:1975
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5813
msgid "Moving the root directory is not supported at this time"
5814
msgstr ""
5815
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5816
#: breezy/errors.py:1980
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5817
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5818
msgstr ""
5819
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5820
#: breezy/errors.py:1991
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5821
msgid ""
5822
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5823
msgstr ""
5824
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5825
#: breezy/errors.py:2027
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5826
msgid ""
5827
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5828
msgstr ""
5829
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5830
#: breezy/errors.py:2057
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5831
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5832
msgstr ""
5833
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5834
#: breezy/errors.py:2065
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5835
msgid "Nothing to merge."
5836
msgstr ""
5837
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5838
#: breezy/errors.py:2070
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5839
msgid "Format %(format)s cannot be initialised by this version of bzr."
5840
msgstr ""
5841
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5842
#: breezy/errors.py:2079
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5843
msgid ""
5844
"Cannot convert from format %(from_format)s to format %(format)s.    "
5845
"%(problem)s"
5846
msgstr ""
5847
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5848
#: breezy/errors.py:2091
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5849
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5850
msgstr ""
5851
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5852
#: breezy/errors.py:2099
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5853
msgid "%(exe_name)s could not be found on this machine"
5854
msgstr ""
5855
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5856
#: breezy/errors.py:2107
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5857
msgid "Diff is not installed on this machine: %(msg)s"
5858
msgstr ""
5859
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5860
#: breezy/errors.py:2115
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5861
msgid "Diff3 is not installed on this machine."
5862
msgstr ""
5863
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5864
#: breezy/errors.py:2121
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5865
msgid "The content being inserted is already present."
5866
msgstr ""
5867
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5868
#: breezy/errors.py:2126
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5869
msgid ""
5870
"This tree contains left-over files from a failed operation.\n"
5871
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
5872
"to\n"
5873
"    keep, and delete it when you are done."
5874
msgstr ""
5875
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5876
#: breezy/errors.py:2137
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5877
msgid ""
5878
"This tree contains left-over files from a failed operation.\n"
5879
"    Please examine %(pending_deletion)s to see if it contains any files you\n"
5880
"    wish to keep, and delete it when you are done."
5881
msgstr ""
5882
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5883
#: breezy/errors.py:2147
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5884
msgid ""
5885
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5886
"    Please examine %(limbo_dir)s to see if it contains any files you wish "
5887
"to\n"
5888
"    keep, and delete it when you are done."
5889
msgstr ""
5890
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5891
#: breezy/errors.py:2158
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5892
msgid ""
5893
"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
5894
"examine %(pending_deletion)s to see if it contains any files you wish to "
5895
"keep, and delete it when you are done."
5896
msgstr ""
5897
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5898
#: breezy/errors.py:2168
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5899
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5900
msgstr ""
5901
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5902
#: breezy/errors.py:2182
6622.1.22 by Jelmer Vernooij
Update po files.
5903
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5904
msgstr ""
5905
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5906
#: breezy/errors.py:2195
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5907
msgid "Error in merge modified format"
5908
msgstr ""
5909
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5910
#: breezy/errors.py:2200
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5911
msgid "Format error in conflict listings"
5912
msgstr ""
5913
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5914
#: breezy/errors.py:2204
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5915
msgid ""
5916
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5917
"Error: %(description)s"
5918
msgstr ""
5919
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5920
#: breezy/errors.py:2215
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5921
msgid ""
5922
"An error has been detected in the repository %(repo_path)s.\n"
5923
"Please run bzr reconcile on this repository."
5924
msgstr ""
5925
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5926
#: breezy/errors.py:2226
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5927
msgid ""
5928
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5929
"reason: %(reason)s"
5930
msgstr ""
5931
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5932
#: breezy/errors.py:2239
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5933
msgid ""
5934
"An inconsistent delta was supplied: %(delta)r\n"
5935
"reason: %(reason)s"
5936
msgstr ""
5937
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5938
#: breezy/errors.py:2251
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5939
msgid "To use this feature you must upgrade your branch at %(path)s."
5940
msgstr ""
5941
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5942
#: breezy/errors.py:2260
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5943
msgid "To use this feature you must upgrade your repository at %(path)s."
5944
msgstr ""
5945
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5946
#: breezy/errors.py:2265
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5947
msgid ""
5948
"To use this feature you must upgrade your branch at %(path)s to a format "
5949
"which supports rich roots."
5950
msgstr ""
5951
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5952
#: breezy/errors.py:2271
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5953
msgid "Cannot perform local-only commits on unbound branches."
5954
msgstr ""
5955
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5956
#: breezy/errors.py:2276
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5957
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5958
msgstr ""
5959
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5960
#: breezy/errors.py:2297
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5961
msgid "Ghost tags not supported by format %(format)r."
5962
msgstr ""
5963
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5964
#: breezy/errors.py:2305
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5965
msgid "File is binary but should be text."
5966
msgstr ""
5967
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5968
#: breezy/errors.py:2310
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5969
msgid "The path %(path)s is not permitted on this platform"
5970
msgstr ""
5971
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5972
#: breezy/errors.py:2319
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5973
msgid ""
5974
"Testament did not match expected value.\n"
5975
"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5976
"       {%(measured)s}"
5977
msgstr ""
5978
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5979
#: breezy/errors.py:2331
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5980
msgid "Not a bzr revision-bundle: %(text)r"
5981
msgstr ""
5982
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5983
#: breezy/errors.py:2340
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5984
msgid "Bad bzr revision-bundle: %(text)r"
5985
msgstr ""
5986
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5987
#: breezy/errors.py:2349
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5988
msgid "Malformed bzr revision-bundle header: %(text)r"
5989
msgstr ""
5990
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5991
#: breezy/errors.py:2354
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5992
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5993
msgstr ""
5994
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5995
#: breezy/errors.py:2359
6524.1.1 by Jelmer Vernooij
Merge 2.5.
5996
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5997
msgstr ""
5998
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
5999
#: breezy/errors.py:2364
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6000
msgid "End of line marker was not \\n in bzr revision-bundle"
6001
msgstr ""
6002
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6003
#: breezy/errors.py:2374
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6004
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6005
msgstr ""
6006
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6007
#: breezy/errors.py:2384
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6008
msgid "Root class for inventory serialization errors"
6009
msgstr ""
6010
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6011
#: breezy/errors.py:2388
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6012
msgid ""
6013
"The inventory was not in the expected format:\n"
6014
" %(msg)s"
6015
msgstr ""
6016
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6017
#: breezy/errors.py:2397
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6018
msgid "This operation requires rich root data storage"
6019
msgstr ""
6020
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6021
#: breezy/errors.py:2410
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6022
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6023
msgstr ""
6024
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6025
#: breezy/errors.py:2419
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6026
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
6027
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6028
"variable."
6029
msgstr ""
6030
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6031
#: breezy/errors.py:2426
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6032
msgid ""
6033
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6034
"ghost at {%(ghost_revision_id)s}"
6035
msgstr ""
6036
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6037
#: breezy/errors.py:2436
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6038
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6039
msgstr ""
6040
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6041
#: breezy/errors.py:2487
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6042
msgid ""
6043
"A merge directive must provide either a bundle or a public branch location."
6044
msgstr ""
6045
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6046
#: breezy/errors.py:2494
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6047
msgid "Bad merge directive payload %(start)r"
6048
msgstr ""
6049
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6050
#: breezy/errors.py:2504
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6051
msgid "Preview patch does not match requested changes."
6052
msgstr ""
6053
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6054
#: breezy/errors.py:2510
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6055
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6056
msgstr ""
6057
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6058
#: breezy/errors.py:2520
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6059
msgid ""
6060
"Your branch does not have all of the revisions required in order to merge "
6061
"this merge directive and the target location specified in the merge "
6062
"directive is not a branch: %(location)s."
6063
msgstr ""
6064
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6065
#: breezy/errors.py:2532
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6066
msgid "Unsupported entry kind %(kind)s"
6067
msgstr ""
6068
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6069
#: breezy/errors.py:2540
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6070
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6071
msgstr ""
6072
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6073
#: breezy/errors.py:2550
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6074
msgid "Subsume target %(other_tree)s needs to be upgraded."
6075
msgstr ""
6076
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6077
#: breezy/errors.py:2569
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6078
msgid "No such tag: %(tag_name)s"
6079
msgstr ""
6080
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6081
#: breezy/errors.py:2577
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6082
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6083
msgstr ""
6084
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6085
#: breezy/errors.py:2586
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6086
msgid "Tag %(tag_name)s already exists."
6087
msgstr ""
6088
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6089
#: breezy/errors.py:2594
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6090
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
6091
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6092
"\" for more information on this feature."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6093
msgstr ""
6094
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6095
#: breezy/errors.py:2604
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6096
msgid ""
6097
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6098
msgstr ""
6099
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6100
#: breezy/errors.py:2614
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6101
msgid ""
6102
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6103
msgstr ""
6104
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6105
#: breezy/errors.py:2624
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6106
msgid "Invalid line in bugs property: '%(line)s'"
6107
msgstr ""
6108
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6109
#: breezy/errors.py:2632
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6110
msgid "Invalid bug status: '%(status)s'"
6111
msgstr ""
6112
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6113
#: breezy/errors.py:2640
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6114
msgid "Could not understand response from smart server: %(response_tuple)r"
6115
msgstr ""
6116
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6117
#: breezy/errors.py:2679
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6118
msgid "Server sent an unexpected error: %(error_tuple)r"
6119
msgstr ""
6120
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6121
#: breezy/errors.py:2698
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6122
msgid "Unrecognised container format: %(container_format)r"
6123
msgstr ""
6124
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6125
#: breezy/errors.py:2706
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6126
msgid "Unexpected end of container stream"
6127
msgstr ""
6128
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6129
#: breezy/errors.py:2711
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6130
msgid "Unknown record type: %(record_type)r"
6131
msgstr ""
6132
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6133
#: breezy/errors.py:2719
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6134
msgid "Invalid record: %(reason)s"
6135
msgstr ""
6136
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6137
#: breezy/errors.py:2727
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6138
msgid "Container has data after end marker: %(excess)r"
6139
msgstr ""
6140
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6141
#: breezy/errors.py:2735
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6142
msgid "Container has multiple records with the same name: %(name)s"
6143
msgstr ""
6144
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6145
#: breezy/errors.py:2748
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6146
msgid "Corrupt or incompatible data stream: %(reason)s"
6147
msgstr ""
6148
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6149
#: breezy/errors.py:2756
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6150
msgid "SMTP error: %(error)s"
6151
msgstr ""
6152
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6153
#: breezy/errors.py:2764
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6154
msgid "No message supplied."
6155
msgstr ""
6156
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6157
#: breezy/errors.py:2769
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6158
msgid "No mail-to address (--mail-to) or output (-o) specified."
6159
msgstr ""
6160
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6161
#: breezy/errors.py:2774
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6162
msgid ""
6163
"Unable to find mail client with the following names: "
6164
"%(mail_command_list_string)s"
6165
msgstr ""
6166
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6167
#: breezy/errors.py:2784
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6168
msgid "SMTP connection to %(host)s refused"
6169
msgstr ""
6170
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6171
#: breezy/errors.py:2793
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6172
msgid "Please specify smtp_server.  No server at default %(host)s."
6173
msgstr ""
6174
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6175
#: breezy/errors.py:2807
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6176
msgid ""
6177
"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
6178
"reconfigure."
6179
msgstr ""
6180
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6181
#: breezy/errors.py:2819
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6182
msgid "'%(display_url)s' is already a branch."
6183
msgstr ""
6184
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6185
#: breezy/errors.py:2824
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6186
msgid "'%(display_url)s' is already a tree."
6187
msgstr ""
6188
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6189
#: breezy/errors.py:2829
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6190
msgid "'%(display_url)s' is already a checkout."
6191
msgstr ""
6192
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6193
#: breezy/errors.py:2834
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6194
msgid "'%(display_url)s' is already a lightweight checkout."
6195
msgstr ""
6196
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6197
#: breezy/errors.py:2839
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6198
msgid "'%(display_url)s' is already using a shared repository."
6199
msgstr ""
6200
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6201
#: breezy/errors.py:2844
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6202
msgid "'%(display_url)s' is already standalone."
6203
msgstr ""
6204
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6205
#: breezy/errors.py:2849
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6206
msgid "Shared repository '%(display_url)s' already creates working trees."
6207
msgstr ""
6208
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6209
#: breezy/errors.py:2855
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6210
msgid ""
6211
"Shared repository '%(display_url)s' already doesn't create working trees."
6212
msgstr ""
6213
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6214
#: breezy/errors.py:2861
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6215
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6216
msgstr ""
6217
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6218
#: breezy/errors.py:2866
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6219
msgid "No location could be found to bind to at %(display_url)s."
6220
msgstr ""
6221
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6222
#: breezy/errors.py:2871
6622.1.22 by Jelmer Vernooij
Update po files.
6223
msgid ""
6224
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6225
"%(more)s"
6226
msgstr ""
6227
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6228
#: breezy/errors.py:2890
6622.1.22 by Jelmer Vernooij
Update po files.
6229
msgid ""
6230
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6231
msgstr ""
6232
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6233
#: breezy/errors.py:2905
6622.1.22 by Jelmer Vernooij
Update po files.
6234
msgid ""
6235
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6236
"%(more)s"
6237
msgstr ""
6238
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6239
#: breezy/errors.py:2911
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6240
msgid "Variable {%(name)s} is not available."
6241
msgstr ""
6242
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6243
#: breezy/errors.py:2919
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6244
msgid "No template specified."
6245
msgstr ""
6246
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6247
#: breezy/errors.py:2924
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6248
msgid "Unable to create symlink %(path_str)son this platform"
6249
msgstr ""
6250
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6251
#: breezy/errors.py:2939
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6252
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
6253
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6254
"\", \"local\"."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6255
msgstr ""
6256
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6257
#: breezy/errors.py:2973
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6258
msgid ""
6259
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6260
msgstr ""
6261
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6262
#: breezy/errors.py:2985
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6263
msgid "The \"%(config_id)s\" configuration does not exist."
6264
msgstr ""
6265
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6266
#: breezy/errors.py:2993
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6267
msgid "The \"%(option_name)s\" configuration option does not exist."
6268
msgstr ""
6269
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6270
#: breezy/errors.py:3001
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6271
msgid "The alias \"%(alias_name)s\" does not exist."
6272
msgstr ""
6273
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6274
#: breezy/errors.py:3015
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6275
msgid "\"%(alias_name)s\" is not a valid location alias."
6276
msgstr ""
6277
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6278
#: breezy/errors.py:3023
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6279
msgid "No %(alias_name)s location assigned."
6280
msgstr ""
6281
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6282
#: breezy/errors.py:3031
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6283
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6284
msgstr ""
6285
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6286
#: breezy/errors.py:3041
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6287
msgid "Unknown rules detected: %(unknowns_str)s."
6288
msgstr ""
6289
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6290
#: breezy/errors.py:3052
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6291
msgid "Tip change rejected: %(msg)s"
6292
msgstr ""
6293
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6294
#: breezy/errors.py:3060
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6295
msgid "Shelf corrupt."
6296
msgstr ""
6297
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6298
#: breezy/errors.py:3065
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6299
msgid "Corruption while decompressing repository file%(orig_error)s"
6300
msgstr ""
6301
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6302
#: breezy/errors.py:3077
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6303
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6304
msgstr ""
6305
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6306
#: breezy/errors.py:3085
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6307
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6308
msgstr ""
6309
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6310
#: breezy/errors.py:3093
6622.1.22 by Jelmer Vernooij
Update po files.
6311
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6312
msgstr ""
6313
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6314
#: breezy/errors.py:3101
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6315
msgid "The user aborted the operation."
6316
msgstr ""
6317
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6318
#: breezy/errors.py:3106
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6319
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6320
msgstr ""
6321
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6322
#: breezy/errors.py:3116
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6323
msgid "No such view: %(view_name)s."
6324
msgstr ""
6325
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6326
#: breezy/errors.py:3126
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6327
msgid ""
6328
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6329
"to a later format."
6330
msgstr ""
6331
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6332
#: breezy/errors.py:3135
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6333
msgid ""
6334
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6335
msgstr ""
6336
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6337
#: breezy/errors.py:3202
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6338
msgid "%(bzrdir)r does not support co-located branches."
6339
msgstr ""
6340
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6341
#: breezy/errors.py:3208
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6342
msgid ""
6343
"Unable to determine your name.\n"
6344
"Please, set your name with the 'whoami' command.\n"
6345
"E.g. bzr whoami \"Your Name <name@example.com>\""
6346
msgstr ""
6347
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6348
#: breezy/errors.py:3217
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6349
msgid "Invalid pattern(s) found. %(msg)s"
6350
msgstr ""
6351
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6352
#: breezy/errors.py:3225
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6353
msgid ""
6354
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6355
"unbind` to fix."
6356
msgstr ""
6357
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6358
#: breezy/errors.py:3236
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6359
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6360
msgstr ""
6361
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6362
#: breezy/errors.py:3245
6622.1.22 by Jelmer Vernooij
Update po files.
6363
msgid "Option \"%(name)s\" is not defined while expanding \"%(string)s\"."
6364
msgstr ""
6365
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6366
#: breezy/errors.py:3254
6622.1.22 by Jelmer Vernooij
Update po files.
6367
msgid "Option \"%(name)s\" is not allowed."
6368
msgstr ""
6369
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6370
#: breezy/errors.py:3262
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6371
msgid ""
6372
"No compatible object available for operations from %(source)r to %(target)r."
6373
msgstr ""
6374
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6375
#: breezy/errors.py:3272
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6376
msgid ""
6377
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6378
"%(arguments)s."
6379
msgstr ""
6380
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6381
#: breezy/errors.py:3282
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6382
msgid ""
6383
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6384
"format %(format)r"
6385
msgstr ""
6386
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6387
#: breezy/errors.py:3294
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6388
msgid ""
6389
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6390
"plugin."
6391
msgstr ""
6392
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6393
#: breezy/errors.py:3307
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6394
msgid "Binary files section encountered."
6395
msgstr ""
6396
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6397
#: breezy/errors.py:3315
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6398
msgid ""
6399
"Malformed patch header.  %(desc)s\n"
6400
"%(line)r"
6401
msgstr ""
6402
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6403
#: breezy/errors.py:3324
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6404
msgid ""
6405
"Malformed hunk header.  %(desc)s\n"
6406
"%(line)r"
6407
msgstr ""
6408
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6409
#: breezy/errors.py:3333
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6410
msgid ""
6411
"Malformed line.  %(desc)s\n"
6412
"%(line)r"
6413
msgstr ""
6414
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6415
#: breezy/errors.py:3343
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6416
msgid ""
6417
"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
6418
"but patch says it should be \"%(patch_line)s\""
6419
msgstr ""
6420
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6421
#: breezy/errors.py:3354
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6422
msgid "The feature %(feature)s has already been registered."
6423
msgstr ""
6424
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6425
#: breezy/errors.py:3362
6622.1.22 by Jelmer Vernooij
Update po files.
6426
msgid ""
6427
"Cannot store uncommitted changes because this branch already stores "
6428
"uncommitted changes."
6429
msgstr ""
6430
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6431
#: breezy/export_pot.py:252
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6432
#, python-format
6433
msgid "Exporting messages from builtin command: %s"
6434
msgstr ""
6435
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6436
#: breezy/export_pot.py:271
6622.1.22 by Jelmer Vernooij
Update po files.
6437
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6438
msgid "Exporting messages from plugin command: {0} in {1}"
6439
msgstr ""
6440
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6441
#: breezy/export_pot.py:292
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6442
#, python-format
6443
msgid "Exporting message from error: %s"
6444
msgstr ""
6445
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6446
#: breezy/fetch.py:98
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6447
msgid "Finding revisions"
6448
msgstr ""
6449
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6450
#: breezy/fetch.py:103
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6451
msgid "Fetching revisions"
6452
msgstr ""
6453
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6454
#: breezy/foreign.py:262
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6455
msgid "Push into a different VCS without any custom bzr metadata."
6456
msgstr ""
6457
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6458
#: breezy/foreign.py:264
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6459
msgid ""
6460
"This will afterwards rebase the local branch on the remote\n"
6461
"branch unless the --no-rebase option is used, in which case \n"
6462
"the two branches will be out of sync after the push. "
6463
msgstr ""
6464
6622.1.22 by Jelmer Vernooij
Update po files.
6465
# help of 'no-rebase' option of 'dpush' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6466
#: breezy/foreign.py:277
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6467
msgid "Do not rebase after push."
6468
msgstr ""
6469
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6470
#: breezy/foreign.py:311
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6471
#, python-format
6472
msgid "Using saved location: %s\n"
6473
msgstr ""
6474
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6475
#: breezy/foreign.py:321
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6476
msgid ""
6477
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6478
"regular push."
6479
msgstr ""
6480
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6481
#: breezy/gpg.py:358
6622.1.22 by Jelmer Vernooij
Update po files.
6482
#, python-brace-format
6483
msgid "No GnuPG key results for pattern: {0}"
6484
msgstr ""
6485
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6486
#: breezy/gpg.py:431
6622.1.22 by Jelmer Vernooij
Update po files.
6487
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6488
msgid "{0} commits with valid signatures"
6489
msgstr ""
6490
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6491
#: breezy/gpg.py:437
6622.1.22 by Jelmer Vernooij
Update po files.
6492
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6493
msgid "{0} commit with unknown key"
6494
msgid_plural "{0} commits with unknown keys"
6495
msgstr[0] ""
6496
msgstr[1] ""
6497
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6498
#: breezy/gpg.py:445
6622.1.22 by Jelmer Vernooij
Update po files.
6499
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6500
msgid "{0} commit not valid"
6501
msgid_plural "{0} commits not valid"
6502
msgstr[0] ""
6503
msgstr[1] ""
6504
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6505
#: breezy/gpg.py:453
6622.1.22 by Jelmer Vernooij
Update po files.
6506
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6507
msgid "{0} commit not signed"
6508
msgid_plural "{0} commits not signed"
6509
msgstr[0] ""
6510
msgstr[1] ""
6511
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6512
#: breezy/gpg.py:461
6622.1.22 by Jelmer Vernooij
Update po files.
6513
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6514
msgid "{0} commit with key now expired"
6515
msgid_plural "{0} commits with key now expired"
6516
msgstr[0] ""
6517
msgstr[1] ""
6518
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6519
#: breezy/gpg.py:481
6622.1.22 by Jelmer Vernooij
Update po files.
6520
#, python-brace-format
6521
msgid "{0} commit by author {1} with key {2} now expired"
6522
msgid_plural "{0} commits by author {1} with key {2} now expired"
6523
msgstr[0] ""
6524
msgstr[1] ""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6525
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6526
#: breezy/gpg.py:497
6622.1.22 by Jelmer Vernooij
Update po files.
6527
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6528
msgid "{0} signed {1} commit"
6529
msgid_plural "{0} signed {1} commits"
6530
msgstr[0] ""
6531
msgstr[1] ""
6532
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6533
#: breezy/gpg.py:514 breezy/gpg.py:531
6622.1.22 by Jelmer Vernooij
Update po files.
6534
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6535
msgid "{0} commit by author {1}"
6536
msgid_plural "{0} commits by author {1}"
6537
msgstr[0] ""
6538
msgstr[1] ""
6539
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6540
#: breezy/gpg.py:546
6622.1.22 by Jelmer Vernooij
Update po files.
6541
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6542
msgid "Unknown key {0} signed {1} commit"
6543
msgid_plural "Unknown key {0} signed {1} commits"
6544
msgstr[0] ""
6545
msgstr[1] ""
6546
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6547
#: breezy/groupcompress.py:1739
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6548
#, python-format
6549
msgid "Insert claimed random_id=True, but then inserted %r two times"
6550
msgstr ""
6551
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6552
#: breezy/hooks.py:313
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6553
#, python-format
6554
msgid "Introduced in: %s"
6555
msgstr ""
6556
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6557
#: breezy/hooks.py:316
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6558
#, python-format
6559
msgid "Deprecated in: %s"
6560
msgstr ""
6561
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6562
#: breezy/knit.py:1766 breezy/knit.py:1802
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6563
msgid "Walking content"
6564
msgstr ""
6565
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6566
#: breezy/knit.py:3330
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6567
msgid "annotating"
6568
msgstr ""
6569
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6570
#: breezy/lock.py:549
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6571
msgid "{0!r} was {1} locked again"
6572
msgstr ""
6573
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6574
#: breezy/lockdir.py:321
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6575
#, python-format
6576
msgid "error removing pending lock: %s"
6577
msgstr ""
6578
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6579
#: breezy/lockdir.py:616
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6580
msgid "Unable to obtain"
6581
msgstr ""
6582
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6583
#: breezy/lockdir.py:618
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6584
msgid "Lock owner changed for"
6585
msgstr ""
6586
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6587
#: breezy/lockdir.py:620
6622.1.22 by Jelmer Vernooij
Update po files.
6588
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6589
msgid "{0} lock {1} {2}."
6590
msgstr ""
6591
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6592
#: breezy/lockdir.py:627
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6593
#, python-format
6594
msgid "Will continue to try until %s, unless you press Ctrl-C."
6595
msgstr ""
6596
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6597
#: breezy/lockdir.py:629
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6598
msgid "See \"bzr help break-lock\" for more."
6599
msgstr ""
6600
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6601
#: breezy/lockdir.py:739
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6602
#, python-format
6603
msgid ""
6604
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6605
msgstr ""
6606
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6607
#: breezy/log.py:563
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6608
msgid "--exclude-common-ancestry requires two different revisions"
6609
msgstr ""
6610
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6611
#: breezy/log.py:565
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6612
#, python-format
6613
msgid "invalid direction %r"
6614
msgstr ""
6615
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6616
#: breezy/log.py:653
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6617
msgid "Start revision not found in history of end revision."
6618
msgstr ""
6619
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6620
#: breezy/log.py:1071 breezy/log.py:1129
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6621
msgid "Logging revision 0 is invalid."
6622
msgstr ""
6623
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6624
#: breezy/log.py:1073 breezy/log.py:1131
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6625
msgid "Start revision must be older than the end revision."
6626
msgstr ""
6627
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6628
#: breezy/log.py:1818
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6629
#, python-format
6630
msgid "unknown log formatter: %r"
6631
msgstr ""
6632
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6633
#: breezy/log.py:2114
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6634
msgid "fixes bug"
6635
msgid_plural "fixes bugs"
6636
msgstr[0] ""
6637
msgstr[1] ""
6638
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6639
#: breezy/merge.py:689
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6640
msgid "All changes applied successfully."
6641
msgstr ""
6642
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6643
#: breezy/merge.py:691
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6644
#, python-format
6645
msgid "%d conflicts encountered."
6646
msgstr ""
6647
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6648
#: breezy/merge.py:845 breezy/merge.py:1868
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6649
msgid "Preparing file merge"
6650
msgstr ""
6651
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6652
#: breezy/multiparent.py:426
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6653
msgid "Importing revisions"
6654
msgstr ""
6655
6622.1.22 by Jelmer Vernooij
Update po files.
6656
# help of 'help' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6657
#: breezy/option.py:526
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6658
msgid "Show help message."
6659
msgstr ""
6660
6622.1.22 by Jelmer Vernooij
Update po files.
6661
# help of 'quiet' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6662
#: breezy/option.py:528
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6663
msgid "Only display errors and warnings."
6664
msgstr ""
6665
6622.1.22 by Jelmer Vernooij
Update po files.
6666
# help of 'usage' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6667
#: breezy/option.py:531
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6668
msgid "Show usage message and options."
6669
msgstr ""
6670
6622.1.22 by Jelmer Vernooij
Update po files.
6671
# help of 'verbose' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6672
#: breezy/option.py:533
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6673
msgid "Display more information."
6674
msgstr ""
6675
6622.1.22 by Jelmer Vernooij
Update po files.
6676
# help of 'change' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6677
#: breezy/option.py:541
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6678
msgid ""
6679
"Select changes introduced by the specified revision. See also \"help "
6680
"revisionspec\"."
6681
msgstr ""
6682
6622.1.22 by Jelmer Vernooij
Update po files.
6683
# help of 'directory' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6684
#: breezy/option.py:543
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6685
msgid "Branch to operate on, instead of working directory."
6686
msgstr ""
6687
6622.1.22 by Jelmer Vernooij
Update po files.
6688
# help of 'log-format=long' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6689
#: breezy/option.py:545
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6690
msgid "Detailed log format."
6691
msgstr ""
6692
6622.1.22 by Jelmer Vernooij
Update po files.
6693
# help of 'log-format=gnu-changelog' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6694
#: breezy/option.py:545
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6695
msgid "Format used by GNU ChangeLog files."
6696
msgstr ""
6697
6622.1.22 by Jelmer Vernooij
Update po files.
6698
# help of 'log-format=line' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6699
#: breezy/option.py:545
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6700
msgid "Log format with one line per revision."
6701
msgstr ""
6702
6622.1.22 by Jelmer Vernooij
Update po files.
6703
# help of 'log-format=short' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6704
#: breezy/option.py:545
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6705
msgid "Moderately short log format."
6706
msgstr ""
6707
6622.1.22 by Jelmer Vernooij
Update po files.
6708
# help of 'log-format' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6709
#: breezy/option.py:545
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6710
msgid "Use specified log format."
6711
msgstr ""
6712
6622.1.22 by Jelmer Vernooij
Update po files.
6713
# title of 'log-format' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6714
#: breezy/option.py:547
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6715
msgid "Log format"
6716
msgstr ""
6717
6622.1.22 by Jelmer Vernooij
Update po files.
6718
# help of 'merge-type=lca' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6719
#: breezy/option.py:549
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6720
msgid "LCA-newness merge."
6721
msgstr ""
6722
6622.1.22 by Jelmer Vernooij
Update po files.
6723
# help of 'merge-type=diff3' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6724
#: breezy/option.py:549
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6725
msgid "Merge using external diff3."
6726
msgstr ""
6727
6622.1.22 by Jelmer Vernooij
Update po files.
6728
# help of 'merge-type=merge3' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6729
#: breezy/option.py:549
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6730
msgid "Native diff3-style merge."
6731
msgstr ""
6732
6622.1.22 by Jelmer Vernooij
Update po files.
6733
# help of 'merge-type' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6734
#: breezy/option.py:549
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6735
msgid "Select a particular merge algorithm."
6736
msgstr ""
6737
6622.1.22 by Jelmer Vernooij
Update po files.
6738
# help of 'merge-type=weave' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6739
#: breezy/option.py:549
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6740
msgid "Weave-based merge."
6741
msgstr ""
6742
6622.1.22 by Jelmer Vernooij
Update po files.
6743
# title of 'merge-type' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6744
#: breezy/option.py:551
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6745
msgid "Merge algorithm"
6746
msgstr ""
6747
6622.1.22 by Jelmer Vernooij
Update po files.
6748
# help of 'message' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6749
#: breezy/option.py:554
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6750
msgid "Message string."
6751
msgstr ""
6752
6622.1.22 by Jelmer Vernooij
Update po files.
6753
# help of 'null' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6754
#: breezy/option.py:556
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6755
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6756
msgstr ""
6757
6622.1.22 by Jelmer Vernooij
Update po files.
6758
# help of 'overwrite' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6759
#: breezy/option.py:558
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6760
msgid "Ignore differences between branches and overwrite unconditionally."
6761
msgstr ""
6762
6622.1.22 by Jelmer Vernooij
Update po files.
6763
# help of 'remember' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6764
#: breezy/option.py:560
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6765
msgid "Remember the specified location as a default."
6766
msgstr ""
6767
6622.1.22 by Jelmer Vernooij
Update po files.
6768
# help of 'reprocess' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6769
#: breezy/option.py:562
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6770
msgid "Reprocess to reduce spurious conflicts."
6771
msgstr ""
6772
6622.1.22 by Jelmer Vernooij
Update po files.
6773
# help of 'revision' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6774
#: breezy/option.py:566
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6775
msgid "See \"help revisionspec\" for details."
6776
msgstr ""
6777
6622.1.22 by Jelmer Vernooij
Update po files.
6778
# help of 'show-ids' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6779
#: breezy/option.py:568
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6780
msgid "Show internal object ids."
6781
msgstr ""
6782
6622.1.22 by Jelmer Vernooij
Update po files.
6783
# help of 'timezone' option
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6784
#: breezy/option.py:571
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6785
msgid "Display timezone as local, original, or utc."
6786
msgstr ""
6787
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6788
#: breezy/osutils.py:101
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6789
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6790
msgstr ""
6791
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6792
#: breezy/osutils.py:221
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6793
msgid "lstat/stat of ({0!r}): {1!r}"
6794
msgstr ""
6795
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6796
#: breezy/osutils.py:1041 breezy/osutils.py:1052
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6797
#, python-format
6798
msgid "sorry, %r not allowed in path"
6799
msgstr ""
6800
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6801
#: breezy/osutils.py:1270
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6802
#, python-format
6803
msgid "%r is too short to calculate a relative path"
6804
msgstr ""
6805
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6806
#: breezy/plugin.py:143
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6807
#, python-format
6808
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6809
msgstr ""
6810
6622.1.22 by Jelmer Vernooij
Update po files.
6811
# help of 'plugin' option of 'bash-completion' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6812
#: breezy/plugins/bash_completion/bashcomp.py:411
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6813
msgid "Enable completions for the selected plugin (default: all plugins)"
6814
msgstr ""
6815
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6816
#: breezy/plugins/bash_completion/bashcomp.py:412
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6817
msgid "Generate a shell function for bash command line completion."
6818
msgstr ""
6819
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6820
#: breezy/plugins/bash_completion/bashcomp.py:414
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6821
msgid ""
6822
"This command generates a shell function which can be used by bash to\n"
6823
"automatically complete the currently typed command when the user presses\n"
6824
"the completion key (usually tab)."
6825
msgstr ""
6826
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6827
#: breezy/plugins/bash_completion/bashcomp.py:418
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6828
msgid ""
6829
"Commonly used like this:\n"
6830
"    eval \"`bzr bash-completion`\""
6831
msgstr ""
6832
6622.1.22 by Jelmer Vernooij
Update po files.
6833
# help of 'function-name' option of 'bash-completion' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6834
#: breezy/plugins/bash_completion/bashcomp.py:424
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6835
msgid "Name of the generated function (default: _bzr)"
6836
msgstr ""
6837
6622.1.22 by Jelmer Vernooij
Update po files.
6838
# help of 'function-only' option of 'bash-completion' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6839
#: breezy/plugins/bash_completion/bashcomp.py:426
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6840
msgid "Generate only the shell function, don't enable it"
6841
msgstr ""
6842
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6843
#: breezy/plugins/grep/cmds.py:77
6622.1.22 by Jelmer Vernooij
Update po files.
6844
msgid "Print lines matching PATTERN for specified files and revisions."
6845
msgstr ""
6846
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6847
#: breezy/plugins/grep/cmds.py:79
6622.1.22 by Jelmer Vernooij
Update po files.
6848
msgid ""
6849
"This command searches the specified files and revisions for a given\n"
6850
"pattern.  The pattern is specified as a Python regular expressions[1]."
6851
msgstr ""
6852
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6853
#: breezy/plugins/grep/cmds.py:82
6622.1.22 by Jelmer Vernooij
Update po files.
6854
msgid ""
6855
"If the file name is not specified, the revisions starting with the\n"
6856
"current directory are searched recursively. If the revision number is\n"
6857
"not specified, the working copy is searched. To search the last committed\n"
6858
"revision, use the '-r -1' or '-r last:1' option."
6859
msgstr ""
6860
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6861
#: breezy/plugins/grep/cmds.py:87
6622.1.22 by Jelmer Vernooij
Update po files.
6862
msgid ""
6863
"Unversioned files are not searched unless explicitly specified on the\n"
6864
"command line. Unversioned directores are not searched."
6865
msgstr ""
6866
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6867
#: breezy/plugins/grep/cmds.py:90
6622.1.22 by Jelmer Vernooij
Update po files.
6868
msgid ""
6869
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6870
"format. If a revision is explicitly searched, the output is shown as\n"
6871
"'filepath~N:string', where N is the revision number."
6872
msgstr ""
6873
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6874
#: breezy/plugins/grep/cmds.py:94
6622.1.22 by Jelmer Vernooij
Update po files.
6875
msgid ""
6876
"--include and --exclude options can be used to search only (or exclude\n"
6877
"from search) files with base name matches the specified Unix style GLOB\n"
6878
"pattern.  The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6879
"to quote wildcard or backslash character literally. Note that the glob\n"
6880
"pattern is not a regular expression."
6881
msgstr ""
6882
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6883
#: breezy/plugins/grep/cmds.py:100
6622.1.22 by Jelmer Vernooij
Update po files.
6884
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6885
msgstr ""
6886
6887
# help of 'color' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6888
#: breezy/plugins/grep/cmds.py:109
6622.1.22 by Jelmer Vernooij
Update po files.
6889
msgid "Show match in color. WHEN is never, always or auto."
6890
msgstr ""
6891
6892
# help of 'diff' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6893
#: breezy/plugins/grep/cmds.py:111
6622.1.22 by Jelmer Vernooij
Update po files.
6894
msgid "Grep for pattern in changeset for each revision."
6895
msgstr ""
6896
6897
# help of 'exclude' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6898
#: breezy/plugins/grep/cmds.py:113
6622.1.22 by Jelmer Vernooij
Update po files.
6899
msgid "Skip files whose base name matches GLOB."
6900
msgstr ""
6901
6902
# help of 'include' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6903
#: breezy/plugins/grep/cmds.py:115
6622.1.22 by Jelmer Vernooij
Update po files.
6904
msgid "Search only files whose base name matches GLOB."
6905
msgstr ""
6906
6907
# help of 'files-with-matches' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6908
#: breezy/plugins/grep/cmds.py:117
6622.1.22 by Jelmer Vernooij
Update po files.
6909
msgid "Print only the name of each input file in which PATTERN is found."
6910
msgstr ""
6911
6912
# help of 'files-without-match' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6913
#: breezy/plugins/grep/cmds.py:120
6622.1.22 by Jelmer Vernooij
Update po files.
6914
msgid "Print only the name of each input file in which PATTERN is not found."
6915
msgstr ""
6916
6917
# help of 'fixed-string' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6918
#: breezy/plugins/grep/cmds.py:123
6622.1.22 by Jelmer Vernooij
Update po files.
6919
msgid "Interpret PATTERN is a single fixed string (not regex)."
6920
msgstr ""
6921
6922
# help of 'from-root' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6923
#: breezy/plugins/grep/cmds.py:125
6622.1.22 by Jelmer Vernooij
Update po files.
6924
msgid ""
6925
"Search for pattern starting from the root of the branch. (implies --"
6926
"recursive)"
6927
msgstr ""
6928
6929
# help of 'ignore-case' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6930
#: breezy/plugins/grep/cmds.py:128
6622.1.22 by Jelmer Vernooij
Update po files.
6931
msgid "ignore case distinctions while matching."
6932
msgstr ""
6933
6934
# help of 'levels' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6935
#: breezy/plugins/grep/cmds.py:130
6622.1.22 by Jelmer Vernooij
Update po files.
6936
msgid ""
6937
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6938
msgstr ""
6939
6940
# help of 'line-number' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6941
#: breezy/plugins/grep/cmds.py:135
6622.1.22 by Jelmer Vernooij
Update po files.
6942
msgid "show 1-based line number."
6943
msgstr ""
6944
6945
# help of 'no-recursive' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6946
#: breezy/plugins/grep/cmds.py:137
6622.1.22 by Jelmer Vernooij
Update po files.
6947
msgid "Don't recurse into subdirectories. (default is --recursive)"
6948
msgstr ""
6949
6950
# help of 'null' option of 'grep' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6951
#: breezy/plugins/grep/cmds.py:139
6622.1.22 by Jelmer Vernooij
Update po files.
6952
msgid ""
6953
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6954
"newline."
6955
msgstr ""
6956
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6957
#: breezy/plugins/launchpad/account.py:66
6622.1.22 by Jelmer Vernooij
Update po files.
6958
msgid "Setting ssh/sftp usernames for launchpad.net."
6959
msgstr ""
6960
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6961
#: breezy/plugins/launchpad/cmds.py:43
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6962
msgid "Register a branch with launchpad.net."
6963
msgstr ""
6964
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6965
#: breezy/plugins/launchpad/cmds.py:45
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6966
msgid ""
6967
"This command lists a bzr branch in the directory of branches on\n"
6968
"launchpad.net.  Registration allows the branch to be associated with\n"
6969
"bugs or specifications."
6970
msgstr ""
6971
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6972
#: breezy/plugins/launchpad/cmds.py:49
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6973
msgid ""
6974
"Before using this command you must register the project to which the\n"
6975
"branch belongs, and create an account for yourself on launchpad.net."
6976
msgstr ""
6977
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6978
#: breezy/plugins/launchpad/cmds.py:52
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6979
msgid ""
6980
"arguments:\n"
6981
"    public_url: The publicly visible url for the branch to register.\n"
6982
"                This must be an http or https url (which Launchpad can read\n"
6983
"                from to access the branch). Local file urls, SFTP urls, and\n"
6984
"                bzr+ssh urls will not work.\n"
6985
"                If no public_url is provided, bzr will use the configured\n"
6986
"                public_url if there is one for the current branch, and\n"
6987
"                otherwise error."
6988
msgstr ""
6989
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6990
#: breezy/plugins/launchpad/cmds.py:61
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6991
msgid ""
6992
"example:\n"
6993
"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6994
"            --project fooproject"
6995
msgstr ""
6996
6622.1.22 by Jelmer Vernooij
Update po files.
6997
# help of 'project' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
6998
#: breezy/plugins/launchpad/cmds.py:68
6524.1.1 by Jelmer Vernooij
Merge 2.5.
6999
msgid "Launchpad project short name to associate with the branch."
7000
msgstr ""
7001
6622.1.22 by Jelmer Vernooij
Update po files.
7002
# help of 'branch-name' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7003
#: breezy/plugins/launchpad/cmds.py:75
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7004
msgid ""
7005
"Short name for the branch; by default taken from the last component of the "
7006
"url."
7007
msgstr ""
7008
6622.1.22 by Jelmer Vernooij
Update po files.
7009
# help of 'branch-title' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7010
#: breezy/plugins/launchpad/cmds.py:79
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7011
msgid "One-sentence description of the branch."
7012
msgstr ""
7013
6622.1.22 by Jelmer Vernooij
Update po files.
7014
# help of 'branch-description' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7015
#: breezy/plugins/launchpad/cmds.py:82
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7016
msgid "Longer description of the purpose or contents of the branch."
7017
msgstr ""
7018
6622.1.22 by Jelmer Vernooij
Update po files.
7019
# help of 'author' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7020
#: breezy/plugins/launchpad/cmds.py:85
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7021
msgid "Branch author's email address, if not yourself."
7022
msgstr ""
7023
6622.1.22 by Jelmer Vernooij
Update po files.
7024
# help of 'link-bug' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7025
#: breezy/plugins/launchpad/cmds.py:88
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7026
msgid "The bug this branch fixes."
7027
msgstr ""
7028
6622.1.22 by Jelmer Vernooij
Update po files.
7029
# help of 'dry-run' option of 'register-branch' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7030
#: breezy/plugins/launchpad/cmds.py:91
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7031
msgid "Prepare the request but don't actually send it."
7032
msgstr ""
7033
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7034
#: breezy/plugins/launchpad/cmds.py:113
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7035
msgid ""
7036
"register-branch requires a public branch url - see bzr help register-branch."
7037
msgstr ""
7038
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7039
#: breezy/plugins/launchpad/cmds.py:121
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7040
msgid "--product is deprecated; please use --project."
7041
msgstr ""
7042
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7043
#: breezy/plugins/launchpad/cmds.py:151
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7044
msgid "Open a Launchpad branch page in your web browser."
7045
msgstr ""
7046
6622.1.22 by Jelmer Vernooij
Update po files.
7047
# help of 'dry-run' option of 'launchpad-open' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7048
#: breezy/plugins/launchpad/cmds.py:156
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7049
msgid "Do not actually open the browser. Just say the URL we would use."
7050
msgstr ""
7051
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7052
#: breezy/plugins/launchpad/cmds.py:191
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7053
#, python-format
7054
msgid "Opening %s in web browser"
7055
msgstr ""
7056
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7057
#: breezy/plugins/launchpad/cmds.py:199
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7058
msgid "Show or set the Launchpad user ID."
7059
msgstr ""
7060
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7061
#: breezy/plugins/launchpad/cmds.py:201
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7062
msgid ""
7063
"When communicating with Launchpad, some commands need to know your\n"
7064
"Launchpad user ID.  This command can be used to set or show the\n"
7065
"user ID that Bazaar will use for such communication."
7066
msgstr ""
7067
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7068
#: breezy/plugins/launchpad/cmds.py:205
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7069
msgid ""
7070
":Examples:\n"
7071
"  Show the Launchpad ID of the current user::"
7072
msgstr ""
7073
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7074
#: breezy/plugins/launchpad/cmds.py:208
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7075
msgid "      bzr launchpad-login"
7076
msgstr ""
7077
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7078
#: breezy/plugins/launchpad/cmds.py:210
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7079
msgid "  Set the Launchpad ID of the current user to 'bob'::"
7080
msgstr ""
7081
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7082
#: breezy/plugins/launchpad/cmds.py:212
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7083
msgid "      bzr launchpad-login bob"
7084
msgstr ""
7085
6622.1.22 by Jelmer Vernooij
Update po files.
7086
# help of 'no-check' option of 'launchpad-login' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7087
#: breezy/plugins/launchpad/cmds.py:219
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7088
msgid "Don't check that the user name is valid."
7089
msgstr ""
7090
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7091
#: breezy/plugins/launchpad/cmds.py:234 breezy/plugins/launchpad/cmds.py:245
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7092
msgid "Launchpad user ID exists and has SSH keys.\n"
7093
msgstr ""
7094
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7095
#: breezy/plugins/launchpad/cmds.py:237
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7096
msgid "No Launchpad user ID configured.\n"
7097
msgstr ""
7098
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7099
#: breezy/plugins/launchpad/cmds.py:248
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7100
#, python-format
7101
msgid "Launchpad user ID set to '%s'.\n"
7102
msgstr ""
7103
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7104
#: breezy/plugins/launchpad/cmds.py:254
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7105
msgid "Ask Launchpad to mirror a branch now."
7106
msgstr ""
7107
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7108
#: breezy/plugins/launchpad/cmds.py:271
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7109
msgid "Propose merging a branch on Launchpad."
7110
msgstr ""
7111
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7112
#: breezy/plugins/launchpad/cmds.py:273
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7113
msgid ""
7114
"This will open your usual editor to provide the initial comment.  When it\n"
7115
"has created the proposal, it will open it in your default web browser."
7116
msgstr ""
7117
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7118
#: breezy/plugins/launchpad/cmds.py:276
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7119
msgid ""
7120
"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
7121
"is not supplied, the remembered submit branch will be used.  If no submit\n"
7122
"branch is remembered, the development focus will be used."
7123
msgstr ""
7124
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7125
#: breezy/plugins/launchpad/cmds.py:280
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7126
msgid ""
7127
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7128
"the merge proposal.  This can be overriden by specifying --review (-R).\n"
7129
"The parameter the launchpad account name of the desired reviewer.  This\n"
7130
"may optionally be followed by '=' and the review type.  For example:"
7131
msgstr ""
7132
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7133
#: breezy/plugins/launchpad/cmds.py:285
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7134
msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
7135
msgstr ""
7136
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7137
#: breezy/plugins/launchpad/cmds.py:287
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7138
msgid ""
7139
"This will propose a merge,  request \"jrandom\" to perform a review of\n"
7140
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7141
msgstr ""
7142
6622.1.22 by Jelmer Vernooij
Update po files.
7143
# help of 'staging' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7144
#: breezy/plugins/launchpad/cmds.py:292
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7145
msgid "Propose the merge on staging."
7146
msgstr ""
7147
6622.1.22 by Jelmer Vernooij
Update po files.
7148
# help of 'message' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7149
#: breezy/plugins/launchpad/cmds.py:294
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7150
msgid "Commit message."
7151
msgstr ""
7152
6622.1.22 by Jelmer Vernooij
Update po files.
7153
# help of 'approve' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7154
#: breezy/plugins/launchpad/cmds.py:296
6622.1.22 by Jelmer Vernooij
Update po files.
7155
msgid ""
7156
"Mark the proposal as approved immediately, setting the approved revision to "
7157
"tip."
7158
msgstr ""
7159
7160
# help of 'fixes' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7161
#: breezy/plugins/launchpad/cmds.py:298
6622.1.22 by Jelmer Vernooij
Update po files.
7162
msgid "The bug this proposal fixes."
7163
msgstr ""
7164
7165
# help of 'review' option of 'lp-propose-merge' command
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7166
#: breezy/plugins/launchpad/cmds.py:300
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7167
msgid "Requested reviewer and optional type."
7168
msgstr ""
7169
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7170
#: breezy/plugins/launchpad/cmds.py:335
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7171
msgid "Find the proposal to merge this revision."
7172
msgstr ""
7173
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7174
#: breezy/plugins/launchpad/cmds.py:337
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7175
msgid ""
7176
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6622.1.22 by Jelmer Vernooij
Update po files.
7177
"This works only if the if the merged_revno was recorded for the merge\n"
7178
"proposal.  The proposal(s) are opened in a web browser."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7179
msgstr ""
7180
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7181
#: breezy/plugins/launchpad/cmds.py:341
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7182
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
7183
"Only the revision specified is searched for.  To find the mainline\n"
7184
"revision that merged it into mainline, use the \"mainline\" revision spec."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7185
msgstr ""
7186
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7187
#: breezy/plugins/launchpad/cmds.py:344
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7188
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7189
msgstr ""
7190
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7191
#: breezy/plugins/launchpad/cmds.py:346
6622.1.22 by Jelmer Vernooij
Update po files.
7192
msgid "  bzr lp-find-proposal -r mainline:annotate:README:1"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7193
msgstr ""
7194
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7195
#: breezy/plugins/launchpad/cmds.py:365
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7196
msgid "No review found."
7197
msgstr ""
7198
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7199
#: breezy/plugins/launchpad/cmds.py:366
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7200
#, python-format
7201
msgid "%d proposals(s) found."
7202
msgstr ""
7203
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7204
#: breezy/plugins/launchpad/cmds.py:378
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7205
msgid "Finding proposals"
7206
msgstr ""
7207
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7208
#: breezy/plugins/launchpad/lp_api.py:231
7209
#: breezy/plugins/launchpad/lp_api.py:236
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7210
#, python-format
7211
msgid "%s is not registered on Launchpad"
7212
msgstr ""
7213
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7214
#: breezy/plugins/launchpad/lp_api.py:246
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7215
#, python-format
7216
msgid "%s has no development focus."
7217
msgstr ""
7218
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7219
#: breezy/plugins/launchpad/lp_api.py:251
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7220
#, python-format
7221
msgid "development focus %s has no branch."
7222
msgstr ""
7223
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7224
#: breezy/plugins/launchpad/lp_api.py:256
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7225
#, python-format
7226
msgid "source package %s has no branch."
7227
msgstr ""
7228
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7229
#: breezy/plugins/launchpad/lp_api.py:260
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7230
#, python-format
7231
msgid "%s has no associated product or source package."
7232
msgstr ""
7233
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7234
#: breezy/plugins/launchpad/lp_api.py:272
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7235
#, python-format
7236
msgid "%s is already up-to-date."
7237
msgstr ""
7238
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7239
#: breezy/plugins/launchpad/lp_api.py:279
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7240
#, python-format
7241
msgid "Pushing to %s"
7242
msgstr ""
7243
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7244
#: breezy/plugins/launchpad/lp_directory.py:170
6622.1.22 by Jelmer Vernooij
Update po files.
7245
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7246
msgid ""
7247
"resolution for {0}\n"
7248
"  local: {1}\n"
7249
" remote: {2}"
7250
msgstr ""
7251
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7252
#: breezy/plugins/launchpad/lp_propose.py:161
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7253
#, python-format
7254
msgid "There is already a branch merge proposal: %s"
7255
msgstr ""
7256
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7257
#: breezy/plugins/weave_fmt/bzrdir.py:237
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7258
msgid "pb parameter to convert() is deprecated"
7259
msgstr ""
7260
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7261
#: breezy/plugins/weave_fmt/bzrdir.py:240
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7262
msgid "starting upgrade from format 4 to 5"
7263
msgstr ""
7264
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7265
#: breezy/plugins/weave_fmt/bzrdir.py:250
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7266
msgid "note: upgrade may be faster if all store files are ungzipped first"
7267
msgstr ""
7268
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7269
#: breezy/plugins/weave_fmt/bzrdir.py:279
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7270
msgid "converting revision"
7271
msgstr ""
7272
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7273
#: breezy/plugins/weave_fmt/bzrdir.py:284
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7274
msgid "upgraded to weaves:"
7275
msgstr ""
7276
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7277
#: breezy/plugins/weave_fmt/bzrdir.py:285
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7278
#, python-format
7279
msgid "%6d revisions and inventories"
7280
msgstr ""
7281
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7282
#: breezy/plugins/weave_fmt/bzrdir.py:287
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7283
#, python-format
7284
msgid "%6d revisions not present"
7285
msgstr ""
7286
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7287
#: breezy/plugins/weave_fmt/bzrdir.py:289
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7288
#, python-format
7289
msgid "%6d texts"
7290
msgstr ""
7291
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7292
#: breezy/plugins/weave_fmt/bzrdir.py:325
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7293
msgid "writing weave"
7294
msgstr ""
7295
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7296
#: breezy/plugins/weave_fmt/bzrdir.py:329
7297
#: breezy/plugins/weave_fmt/bzrdir.py:331
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7298
msgid "inventory"
7299
msgstr ""
7300
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7301
#: breezy/plugins/weave_fmt/bzrdir.py:348
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7302
msgid "write revision"
7303
msgstr ""
7304
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7305
#: breezy/plugins/weave_fmt/bzrdir.py:362
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7306
msgid "loading revision"
7307
msgstr ""
7308
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7309
#: breezy/plugins/weave_fmt/bzrdir.py:367
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7310
#, python-format
7311
msgid "revision {%s} not present in branch; will be converted as a ghost"
7312
msgstr ""
7313
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7314
#: breezy/plugins/weave_fmt/bzrdir.py:507
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7315
msgid "starting upgrade from format 5 to 6"
7316
msgstr ""
7317
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7318
#: breezy/plugins/weave_fmt/bzrdir.py:517
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7319
#, python-format
7320
msgid "adding prefixes to %s"
7321
msgstr ""
7322
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7323
#: breezy/plugins/weave_fmt/bzrdir.py:557
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7324
msgid "starting upgrade from format 6 to metadir"
7325
msgstr ""
7326
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7327
#: breezy/plugins/weave_fmt/bzrdir.py:565
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7328
msgid "Removing ancestry.weave"
7329
msgstr ""
7330
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7331
#: breezy/plugins/weave_fmt/bzrdir.py:570
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7332
msgid "Finding branch files"
7333
msgstr ""
7334
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7335
#: breezy/plugins/weave_fmt/bzrdir.py:580
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7336
msgid "Upgrading repository"
7337
msgstr ""
7338
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7339
#: breezy/plugins/weave_fmt/bzrdir.py:590
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7340
msgid "Upgrading branch"
7341
msgstr ""
7342
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7343
#: breezy/plugins/weave_fmt/bzrdir.py:613
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7344
msgid "No working tree."
7345
msgstr ""
7346
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7347
#: breezy/plugins/weave_fmt/bzrdir.py:620
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7348
msgid "Upgrading working tree"
7349
msgstr ""
7350
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7351
#: breezy/plugins/weave_fmt/bzrdir.py:641
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7352
#, python-format
7353
msgid "Make %s lock"
7354
msgstr ""
7355
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7356
#: breezy/plugins/weave_fmt/bzrdir.py:652
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7357
#, python-format
7358
msgid "Moving %s"
7359
msgstr ""
7360
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7361
#: breezy/push.py:56
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7362
msgid "Created new branch."
7363
msgstr ""
7364
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7365
#: breezy/push.py:97
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7366
#, python-format
7367
msgid ""
7368
"Target directory %s already contains a .bzr directory, but it is not valid."
7369
msgstr ""
7370
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7371
#: breezy/push.py:101
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7372
#, python-format
7373
msgid ""
7374
"Target directory %s already exists, but does not have a .bzr directory. "
7375
"Supply --use-existing-dir to push there anyway."
7376
msgstr ""
7377
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7378
#: breezy/push.py:122
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7379
#, python-format
7380
msgid "Too many redirections trying to make %s."
7381
msgstr ""
7382
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7383
#: breezy/push.py:148
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7384
msgid ""
7385
"These branches have diverged.  See \"bzr help diverged-branches\" for more "
7386
"information."
7387
msgstr ""
7388
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7389
#: breezy/push.py:152
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7390
#, python-format
7391
msgid ""
7392
"It is not possible to losslessly push to %s. You may want to use dpush "
7393
"instead."
7394
msgstr ""
7395
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7396
#: breezy/push.py:158
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7397
#, python-format
7398
msgid ""
7399
"At %s you have a valid .bzr control directory, but not a branch or "
7400
"repository. This is an unsupported configuration. Please move the target "
7401
"directory out of the way and try again."
7402
msgstr ""
7403
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7404
#: breezy/reconcile.py:97
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7405
#, python-format
7406
msgid "Reconciling branch %s"
7407
msgstr ""
7408
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7409
#: breezy/reconcile.py:103
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7410
#, python-format
7411
msgid "Reconciling repository %s"
7412
msgstr ""
7413
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7414
#: breezy/reconcile.py:105
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7415
msgid "Reconciling repository"
7416
msgstr ""
7417
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7418
#: breezy/reconcile.py:111
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7419
#, python-format
7420
msgid "%s cannot canonicalize CHKs."
7421
msgstr ""
7422
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7423
#: breezy/reconcile.py:119
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7424
msgid "Reconcile aborted: revision index has inconsistent parents."
7425
msgstr ""
7426
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7427
#: breezy/reconcile.py:121
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7428
msgid "Run \"bzr check\" for more details."
7429
msgstr ""
7430
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7431
#: breezy/reconcile.py:123
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7432
msgid "Reconciliation complete."
7433
msgstr ""
7434
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7435
#: breezy/reconcile.py:166
6622.1.22 by Jelmer Vernooij
Update po files.
7436
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7437
msgid "Fixing last revision info {0}  => {1}"
7438
msgstr ""
7439
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7440
#: breezy/reconcile.py:173
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7441
msgid "revision_history ok."
7442
msgstr ""
7443
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7444
#: breezy/reconcile.py:234
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7445
msgid "Reading inventory data"
7446
msgstr ""
7447
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7448
#: breezy/reconcile.py:254 breezy/reconcile.py:384
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7449
msgid "Inventory ok."
7450
msgstr ""
7451
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7452
#: breezy/reconcile.py:256 breezy/reconcile.py:386
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7453
msgid "Backing up inventory"
7454
msgstr ""
7455
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7456
#: breezy/reconcile.py:258
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7457
msgid "Backup inventory created."
7458
msgstr ""
7459
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7460
#: breezy/reconcile.py:274 breezy/reconcile.py:405
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7461
msgid "Writing weave"
7462
msgstr ""
7463
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7464
#: breezy/reconcile.py:277 breezy/reconcile.py:408
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7465
msgid "Inventory regenerated."
7466
msgstr ""
7467
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7468
#: breezy/reconcile.py:371 breezy/reconcile.py:373 breezy/reconcile.py:376
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7469
msgid "Reading indexes"
7470
msgstr ""
7471
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7472
#: breezy/reconcile.py:380 breezy/reconcile.py:382
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7473
msgid "Checking unused inventories"
7474
msgstr ""
7475
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7476
#: breezy/reconcile.py:388
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7477
msgid "Backup Inventory created"
7478
msgstr ""
7479
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7480
#: breezy/reconcile.py:446
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7481
msgid "Fixing text parents"
7482
msgstr ""
7483
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7484
#: breezy/reconfigure.py:54
6622.1.22 by Jelmer Vernooij
Update po files.
7485
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7486
msgid "{0} is now stacked on {1}\n"
7487
msgstr ""
7488
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7489
#: breezy/reconfigure.py:69
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7490
#, python-format
7491
msgid "%s is now not stacked\n"
7492
msgstr ""
7493
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7494
#: breezy/remote.py:1228 breezy/repository.py:289
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7495
#, python-format
7496
msgid "bzr: ERROR (ignored): %s"
7497
msgstr ""
7498
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7499
#: breezy/remote.py:2534
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7500
msgid "Copying repository content as tarball..."
7501
msgstr ""
7502
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7503
#: breezy/rename_map.py:69
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7504
msgid "Calculating hashes"
7505
msgstr ""
7506
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7507
#: breezy/rename_map.py:107
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7508
msgid "Determining hash hits"
7509
msgstr ""
7510
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7511
#: breezy/rename_map.py:242
6622.1.22 by Jelmer Vernooij
Update po files.
7512
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7513
msgid "{0} => {1}"
7514
msgstr ""
7515
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7516
#: breezy/repository.py:1738
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7517
msgid "Moving repository to repository.backup"
7518
msgstr ""
7519
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7520
#: breezy/repository.py:1745
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7521
msgid "Creating new repository"
7522
msgstr ""
7523
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7524
#: breezy/repository.py:1750
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7525
msgid "Copying content"
7526
msgstr ""
7527
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7528
#: breezy/repository.py:1754
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7529
msgid "Deleting old repository content"
7530
msgstr ""
7531
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7532
#: breezy/repository.py:1756
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7533
msgid "repository converted"
7534
msgstr ""
7535
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7536
#: breezy/revisionspec.py:903
6622.1.22 by Jelmer Vernooij
Update po files.
7537
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7538
msgid "Using {0} {1}"
7539
msgstr ""
7540
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7541
#: breezy/send.py:59
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7542
#, python-format
7543
msgid "Mail client \"%s\" does not support specifying body"
7544
msgstr ""
7545
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7546
#: breezy/send.py:63
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7547
msgid "--remember requires a branch to be specified."
7548
msgstr ""
7549
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7550
#: breezy/send.py:78
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7551
msgid "No submit branch known or specified"
7552
msgstr ""
7553
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7554
#: breezy/send.py:81
6622.1.22 by Jelmer Vernooij
Update po files.
7555
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7556
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7557
msgstr ""
7558
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7559
#: breezy/send.py:99
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7560
#, python-format
7561
msgid "No such send format '%s'."
7562
msgstr ""
7563
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7564
#: breezy/send.py:115
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7565
msgid "bzr send takes at most two one revision identifiers"
7566
msgstr ""
7567
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7568
#: breezy/send.py:128
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7569
msgid "No revisions to submit."
7570
msgstr ""
7571
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7572
#: breezy/send.py:140
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7573
msgid ""
7574
"- not supported for merge directives that use more than one output file."
7575
msgstr ""
7576
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7577
#: breezy/send.py:186
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7578
msgid "Format 0.9 does not permit bundle with no patch"
7579
msgstr ""
7580
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7581
#: breezy/shelf_ui.py:46
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7582
#, python-format
7583
msgid "Shelve adding file \"%(path)s\"?"
7584
msgstr ""
7585
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7586
#: breezy/shelf_ui.py:47
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7587
msgid "Shelve binary changes?"
7588
msgstr ""
7589
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7590
#: breezy/shelf_ui.py:48
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7591
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7592
msgstr ""
7593
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7594
#: breezy/shelf_ui.py:50
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7595
#, python-format
7596
msgid "Shelve removing file \"%(path)s\"?"
7597
msgstr ""
7598
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7599
#: breezy/shelf_ui.py:51
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7600
#, python-format
7601
msgid "Shelve %d change(s)?"
7602
msgstr ""
7603
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7604
#: breezy/shelf_ui.py:52
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7605
msgid "Shelve?"
7606
msgstr ""
7607
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7608
#: breezy/shelf_ui.py:53
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7609
#, python-format
7610
msgid ""
7611
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7612
msgstr ""
7613
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7614
#: breezy/shelf_ui.py:55
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7615
#, python-format
7616
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7617
msgstr ""
7618
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7619
#: breezy/shelf_ui.py:70
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7620
#, python-format
7621
msgid "Changes shelved with id \"%d\"."
7622
msgstr ""
7623
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7624
#: breezy/shelf_ui.py:74
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7625
msgid "Selected changes destroyed."
7626
msgstr ""
7627
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7628
#: breezy/shelf_ui.py:78
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7629
msgid "Selected changes:"
7630
msgstr ""
7631
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7632
#: breezy/shelf_ui.py:98
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7633
#, python-format
7634
msgid "Delete file \"%(path)s\"?"
7635
msgstr ""
7636
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7637
#: breezy/shelf_ui.py:99
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7638
msgid "Apply binary changes?"
7639
msgstr ""
7640
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7641
#: breezy/shelf_ui.py:100
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7642
#, python-format
7643
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7644
msgstr ""
7645
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7646
#: breezy/shelf_ui.py:102
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7647
#, python-format
7648
msgid "Add file \"%(path)s\"?"
7649
msgstr ""
7650
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7651
#: breezy/shelf_ui.py:103
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7652
#, python-format
7653
msgid "Apply %d change(s)?"
7654
msgstr ""
7655
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7656
#: breezy/shelf_ui.py:104
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7657
msgid "Apply change?"
7658
msgstr ""
7659
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7660
#: breezy/shelf_ui.py:105
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7661
#, python-format
7662
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7663
msgstr ""
7664
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7665
#: breezy/shelf_ui.py:107
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7666
#, python-format
7667
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7668
msgstr ""
7669
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7670
#: breezy/shelf_ui.py:402
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7671
msgid "No changes are shelved."
7672
msgstr ""
7673
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7674
#: breezy/shelf_ui.py:460
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7675
#, python-format
7676
msgid "Using changes with id \"%d\"."
7677
msgstr ""
7678
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7679
#: breezy/shelf_ui.py:464
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7680
#, python-format
7681
msgid "Message: %s"
7682
msgstr ""
7683
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7684
#: breezy/shelf_ui.py:476
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7685
#, python-format
7686
msgid "Deleted changes with id \"%d\"."
7687
msgstr ""
7688
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7689
#: breezy/smart/medium.py:714
6622.1.22 by Jelmer Vernooij
Update po files.
7690
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7691
msgid "HPSS calls: {0} ({1} vfs) {2}"
7692
msgstr ""
7693
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7694
#: breezy/smart/ping.py:32
6622.1.22 by Jelmer Vernooij
Update po files.
7695
msgid "Pings a Bazaar smart server."
7696
msgstr ""
7697
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7698
#: breezy/smart/ping.py:34
6622.1.22 by Jelmer Vernooij
Update po files.
7699
msgid ""
7700
"This command sends a 'hello' request to the given location using the bzr\n"
7701
"smart protocol, and reports the response."
7702
msgstr ""
7703
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7704
#: breezy/smart/server.py:169
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7705
msgid "Requested to stop gracefully"
7706
msgstr ""
7707
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7708
#: breezy/smart/server.py:179
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7709
#, python-format
7710
msgid "Waiting for %d client(s) to finish"
7711
msgstr ""
7712
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7713
#: breezy/smart/server.py:185
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7714
#, python-format
7715
msgid "Still waiting for %d client(s) to finish"
7716
msgstr ""
7717
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7718
#: breezy/smart/server.py:219
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7719
#, python-format
7720
msgid "listening socket error: %s"
7721
msgstr ""
7722
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7723
#: breezy/smart/server.py:452
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7724
#, python-format
7725
msgid "listening on port: %s"
7726
msgstr ""
7727
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7728
#: breezy/switch.py:84
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7729
msgid "Pending merges must be committed or reverted before using switch."
7730
msgstr ""
7731
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7732
#: breezy/switch.py:111
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7733
msgid ""
7734
"Cannot switch as local commits found in the checkout. Commit these to the "
7735
"bound branch or use --force to throw them away."
7736
msgstr ""
7737
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7738
#: breezy/switch.py:116
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7739
#, python-format
7740
msgid ""
7741
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7742
"anyway, use --force."
7743
msgstr ""
7744
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7745
#: breezy/switch.py:140
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7746
msgid "Cannot switch a branch, only a checkout."
7747
msgstr ""
7748
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7749
#: breezy/switch.py:183
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7750
#, python-format
7751
msgid "Tree is up to date at revision %d."
7752
msgstr ""
7753
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7754
#: breezy/switch.py:190
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7755
#, python-format
7756
msgid "Updated to revision %d."
7757
msgstr ""
7758
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7759
#: breezy/transform.py:1723 breezy/transform.py:1734 breezy/transform.py:1736
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7760
msgid "Apply phase"
7761
msgstr ""
7762
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7763
#: breezy/transform.py:1762 breezy/transform.py:1830
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7764
msgid "removing file"
7765
msgstr ""
7766
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7767
#: breezy/transform.py:1780 breezy/transform.py:1865
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7768
msgid "adding file"
7769
msgstr ""
7770
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7771
#: breezy/transform.py:2598
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7772
msgid "Building tree"
7773
msgstr ""
7774
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7775
#: breezy/transform.py:2688 breezy/transform.py:2715
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7776
msgid "Adding file contents"
7777
msgstr ""
7778
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7779
#: breezy/transform.py:3017
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7780
msgid "Resolution pass"
7781
msgstr ""
7782
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7783
#: breezy/transport/ftp/_gssapi.py:88
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7784
#, python-format
7785
msgid "Authenticated as %s"
7786
msgstr ""
7787
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7788
#: breezy/tree.py:647
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7789
msgid "*** {0} content-filter: {1} => {2!r}"
7790
msgstr ""
7791
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7792
#: breezy/upgrade.py:77
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7793
#, python-format
7794
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7795
msgstr ""
7796
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7797
#: breezy/upgrade.py:100
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7798
#, python-format
7799
msgid "cannot upgrade from bzrdir format %s"
7800
msgstr ""
7801
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7802
#: breezy/upgrade.py:103
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7803
#, python-format
7804
msgid "starting upgrade of %s"
7805
msgstr ""
7806
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7807
#: breezy/upgrade.py:110
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7808
msgid "finished"
7809
msgstr ""
7810
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7811
#: breezy/upgrade.py:120
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7812
msgid "Deleting backup.bzr"
7813
msgstr ""
7814
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7815
#: breezy/upgrade.py:151
6622.1.22 by Jelmer Vernooij
Update po files.
7816
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7817
msgid ""
7818
"\n"
7819
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7820
msgstr ""
7821
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7822
#: breezy/upgrade.py:208
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7823
#, python-format
7824
msgid "Found %d dependent branches - upgrading ..."
7825
msgstr ""
7826
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7827
#: breezy/upgrade.py:276
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7828
msgid "Upgrading bzrdirs"
7829
msgstr ""
7830
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7831
#: breezy/upgrade.py:282
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7832
#, python-format
7833
msgid "Upgrading %s"
7834
msgstr ""
7835
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7836
#: breezy/upgrade.py:283
6622.1.22 by Jelmer Vernooij
Update po files.
7837
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7838
msgid "Upgrading {0} {1} ..."
7839
msgstr ""
7840
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7841
#: breezy/upgrade.py:301
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7842
msgid "Removing backup ..."
7843
msgstr ""
7844
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7845
#: breezy/upgrade.py:305
6622.1.22 by Jelmer Vernooij
Update po files.
7846
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7847
msgid "failed to clean-up {0}: {1}"
7848
msgstr ""
7849
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7850
#: breezy/vf_repository.py:1091
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7851
msgid "inventories"
7852
msgstr ""
7853
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7854
#: breezy/vf_repository.py:1117
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7855
msgid "texts"
7856
msgstr ""
7857
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7858
#: breezy/vf_repository.py:1622 breezy/vf_repository.py:1631
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7859
msgid "Calculating text parents"
7860
msgstr ""
7861
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7862
#: breezy/vf_repository.py:1707
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7863
msgid "Fetch texts"
7864
msgstr ""
7865
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7866
#: breezy/vf_repository.py:2536
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7867
msgid "loading text store"
7868
msgstr ""
7869
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7870
#: breezy/vf_repository.py:2542
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7871
msgid "checking text graph"
7872
msgstr ""
7873
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7874
#: breezy/vf_repository.py:2998 breezy/vf_repository.py:3012
7875
#: breezy/vf_repository.py:3127
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7876
msgid "Transferring revisions"
7877
msgstr ""
7878
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7879
#: breezy/win32utils.py:146
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7880
msgid "Failed to GetProcessMemoryInfo()"
7881
msgstr ""
7882
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7883
#: breezy/win32utils.py:167
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7884
msgid "Cannot debug memory on win32 without ctypes or win32process"
7885
msgstr ""
7886
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7887
#: breezy/win32utils.py:172
6622.1.22 by Jelmer Vernooij
Update po files.
7888
#, python-brace-format
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7889
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7890
msgstr ""
7891
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7892
#: breezy/win32utils.py:180
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7893
#, python-format
7894
msgid "WorkingSize       %8d KiB"
7895
msgstr ""
7896
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7897
#: breezy/win32utils.py:181
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7898
#, python-format
7899
msgid "PeakWorking       %8d KiB"
7900
msgstr ""
7901
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7902
#: breezy/win32utils.py:182
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7903
#, python-format
7904
msgid "PagefileUsage     %8d KiB"
7905
msgstr ""
7906
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7907
#: breezy/win32utils.py:183
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7908
#, python-format
7909
msgid "PeakPagefileUsage %8d KiB"
7910
msgstr ""
7911
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7912
#: breezy/win32utils.py:185
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7913
#, python-format
7914
msgid "PrivateUsage      %8d KiB"
7915
msgstr ""
7916
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7917
#: breezy/win32utils.py:186
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7918
#, python-format
7919
msgid "PageFaultCount    %8d"
7920
msgstr ""
7921
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
7922
#: breezy/workingtree.py:1516
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7923
msgid "Rerun update after fixing the conflicts."
7924
msgstr ""
7925
7926
#: dummy/help_topics/authentication/summary.txt:1
7927
msgid "Information on configuring authentication"
7928
msgstr ""
7929
7930
#: dummy/help_topics/basic/detail.txt:1
7931
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
7932
"Bazaar 2.8.0dev1 -- a free distributed version-control tool\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
7933
"http://bazaar.canonical.com/"
7934
msgstr ""
7935
7936
#: dummy/help_topics/basic/detail.txt:4
7937
msgid ""
7938
"Basic commands:\n"
7939
"  bzr init           makes this directory a versioned branch\n"
7940
"  bzr branch         make a copy of another branch"
7941
msgstr ""
7942
7943
#: dummy/help_topics/basic/detail.txt:8
7944
msgid ""
7945
"  bzr add            make files or directories versioned\n"
7946
"  bzr ignore         ignore a file or pattern\n"
7947
"  bzr mv             move or rename a versioned file"
7948
msgstr ""
7949
7950
#: dummy/help_topics/basic/detail.txt:12
7951
msgid ""
7952
"  bzr status         summarize changes in working copy\n"
7953
"  bzr diff           show detailed diffs"
7954
msgstr ""
7955
7956
#: dummy/help_topics/basic/detail.txt:15
7957
msgid ""
7958
"  bzr merge          pull in changes from another branch\n"
7959
"  bzr commit         save some or all changes\n"
7960
"  bzr send           send changes via email"
7961
msgstr ""
7962
7963
#: dummy/help_topics/basic/detail.txt:19
7964
msgid ""
7965
"  bzr log            show history of changes\n"
7966
"  bzr check          validate storage"
7967
msgstr ""
7968
7969
#: dummy/help_topics/basic/detail.txt:22
7970
msgid ""
7971
"  bzr help init      more help on e.g. init command\n"
7972
"  bzr help commands  list all commands\n"
7973
"  bzr help topics    list all help topics\n"
7974
msgstr ""
7975
7976
#: dummy/help_topics/basic/summary.txt:1
7977
msgid "Basic commands"
7978
msgstr ""
7979
7980
#: dummy/help_topics/branches/detail.txt:1
7981
msgid "Branches"
7982
msgstr ""
7983
7984
#: dummy/help_topics/branches/detail.txt:3
7985
msgid ""
7986
"A branch consists of the state of a project, including all of its\n"
7987
"history. All branches have a repository associated (which is where the\n"
7988
"branch history is stored), but multiple branches may share the same\n"
7989
"repository (a shared repository). Branches can be copied and merged."
7990
msgstr ""
7991
7992
#: dummy/help_topics/branches/detail.txt:8
7993
msgid ""
7994
"In addition, one branch may be bound to another one.  Binding to another\n"
7995
"branch indicates that commits which happen in this branch must also \n"
7996
"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
7997
"commits when the two branches are out of date.  In order for a commit \n"
7998
"to succeed, it may be necessary to update the current branch using \n"
7999
"``bzr update``."
8000
msgstr ""
8001
8002
#: dummy/help_topics/branches/detail.txt:15
8003
#: dummy/help_topics/checkouts/detail.txt:66
8004
#: dummy/help_topics/repositories/detail.txt:36
8005
msgid "Related commands::"
8006
msgstr ""
8007
8008
#: dummy/help_topics/branches/detail.txt:17
8009
msgid ""
8010
"  init    Change a directory into a versioned branch.\n"
8011
"  branch  Create a new branch that is a copy of an existing branch.\n"
8012
"  merge   Perform a three-way merge.\n"
8013
"  bind    Bind a branch to another one.\n"
8014
msgstr ""
8015
8016
#: dummy/help_topics/branches/summary.txt:1
8017
msgid "Information on what a branch is"
8018
msgstr ""
8019
8020
#: dummy/help_topics/bugs/summary.txt:1
8021
msgid "Bug tracker settings"
8022
msgstr ""
8023
8024
#: dummy/help_topics/checkouts/detail.txt:1
8025
msgid "Checkouts"
8026
msgstr ""
8027
8028
#: dummy/help_topics/checkouts/detail.txt:3
8029
msgid ""
8030
"Checkouts are source trees that are connected to a branch, so that when\n"
8031
"you commit in the source tree, the commit goes into that branch.  They\n"
8032
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8033
"Bazaar's decentralized features until you want them. Using checkouts\n"
8034
"with shared repositories is very similar to working with SVN or CVS, but\n"
8035
"doesn't have the same restrictions.  And using checkouts still allows\n"
8036
"others working on the project to use whatever workflow they like."
8037
msgstr ""
8038
8039
#: dummy/help_topics/checkouts/detail.txt:11
8040
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
8041
"A checkout is created with the bzr checkout command (see \"help checkout"
8042
"\").\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8043
"You pass it a reference to another branch, and it will create a local copy\n"
8044
"for you that still contains a reference to the branch you created the\n"
8045
"checkout from (the master branch). Then if you make any commits they will "
8046
"be\n"
8047
"made on the other branch first. This creates an instant mirror of your work, "
8048
"or\n"
8049
"facilitates lockstep development, where each developer is working together,\n"
8050
"continuously integrating the changes of others."
8051
msgstr ""
8052
8053
#: dummy/help_topics/checkouts/detail.txt:19
8054
msgid ""
8055
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8056
"you have the full history locally.  As you have a first class branch you "
8057
"can\n"
8058
"also commit locally if you want, for instance due to the temporary loss af "
8059
"a\n"
8060
"network connection. Use the --local option to commit to do this. All the "
8061
"local\n"
8062
"commits will then be made on the master branch the next time you do a non-"
8063
"local\n"
8064
"commit."
8065
msgstr ""
8066
8067
#: dummy/help_topics/checkouts/detail.txt:26
8068
msgid ""
8069
"If you are using a checkout from a shared branch you will periodically want "
8070
"to\n"
8071
"pull in all the changes made by others. This is done using the \"update\"\n"
8072
"command. The changes need to be applied before any non-local commit, but\n"
8073
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8074
"command when needed."
8075
msgstr ""
8076
8077
#: dummy/help_topics/checkouts/detail.txt:32
8078
msgid ""
8079
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8080
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8081
"SVN checkout in that it is not a first class branch, it mainly consists of "
8082
"the\n"
8083
"working tree. This means that any history operations must query the master\n"
8084
"branch, which could be slow if a network connection is involved. Also, as "
8085
"you\n"
8086
"don't have a local branch, then you cannot commit locally."
8087
msgstr ""
8088
8089
#: dummy/help_topics/checkouts/detail.txt:39
8090
msgid ""
8091
"Lightweight checkouts work best when you have fast reliable access to the\n"
8092
"master branch. This means that if the master branch is on the same disk or "
8093
"LAN\n"
8094
"a lightweight checkout will be faster than a heavyweight one for any "
8095
"commands\n"
8096
"that modify the revision history (as only one copy of the branch needs to\n"
8097
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8098
"that uses the history but does not change it, but if the master branch is "
8099
"on\n"
8100
"the same disk then there won't be a noticeable difference."
8101
msgstr ""
8102
8103
#: dummy/help_topics/checkouts/detail.txt:47
8104
msgid ""
8105
"Another possible use for a checkout is to use it with a treeless repository\n"
8106
"containing your branches, where you maintain only one working tree by\n"
8107
"switching the master branch that the checkout points to when you want to\n"
8108
"work on a different branch."
8109
msgstr ""
8110
8111
#: dummy/help_topics/checkouts/detail.txt:52
8112
msgid ""
8113
"Obviously to commit on a checkout you need to be able to write to the "
8114
"master\n"
8115
"branch. This means that the master branch must be accessible over a "
8116
"writeable\n"
8117
"protocol , such as sftp://, and that you have write permissions at the "
8118
"other\n"
8119
"end. Checkouts also work on the local file system, so that all that matters "
8120
"is\n"
8121
"file permissions."
8122
msgstr ""
8123
8124
#: dummy/help_topics/checkouts/detail.txt:58
8125
msgid ""
8126
"You can change the master of a checkout by using the \"switch\" command "
8127
"(see\n"
8128
"\"help switch\").  This will change the location that the commits are sent "
8129
"to.\n"
8130
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8131
"checkout. If you would like to convert your heavy checkout into a normal\n"
8132
"branch so that every commit is local, you can use the \"unbind\" command. To "
8133
"see\n"
8134
"whether or not a branch is bound or not you can use the \"info\" command. If "
8135
"the\n"
8136
"branch is bound it will tell you the location of the bound branch."
8137
msgstr ""
8138
8139
#: dummy/help_topics/checkouts/detail.txt:68
8140
msgid ""
8141
"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
8142
"              checkout\n"
8143
"  update      Pull any changes in the master branch in to your checkout\n"
8144
"  commit      Make a commit that is sent to the master branch. If you have\n"
8145
"              a heavy checkout then the --local option will commit to the\n"
8146
"              checkout without sending the commit to the master\n"
8147
"  switch      Change the master branch that the commits in the checkout "
8148
"will\n"
8149
"              be sent to\n"
8150
"  bind        Turn a standalone branch into a heavy checkout so that any\n"
8151
"              commits will be sent to the master branch\n"
8152
"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
8153
"              commits are only made locally\n"
8154
"  info        Displays whether a branch is bound or unbound. If the branch "
8155
"is\n"
8156
"              bound, then it will also display the location of the bound "
8157
"branch\n"
8158
msgstr ""
8159
8160
#: dummy/help_topics/checkouts/summary.txt:1
8161
msgid "Information on what a checkout is"
8162
msgstr ""
8163
8164
#: dummy/help_topics/commands/summary.txt:1
8165
msgid "Basic help for all commands"
8166
msgstr ""
8167
8168
#: dummy/help_topics/configuration/summary.txt:1
8169
msgid "Details on the configuration settings available"
8170
msgstr ""
8171
8172
#: dummy/help_topics/conflict-types/summary.txt:1
8173
msgid "Types of conflicts and what to do about them"
8174
msgstr ""
8175
8176
#: dummy/help_topics/content-filters/summary.txt:1
8177
msgid "Conversion of content into/from working trees"
8178
msgstr ""
8179
8180
#: dummy/help_topics/criss-cross/detail.txt:1
8181
msgid "Criss-Cross"
8182
msgstr ""
8183
8184
#: dummy/help_topics/criss-cross/detail.txt:3
8185
msgid ""
8186
"A criss-cross in the branch history can cause the default merge technique\n"
8187
"to emit more conflicts than would normally be expected."
8188
msgstr ""
8189
8190
#: dummy/help_topics/criss-cross/detail.txt:6
8191
msgid ""
8192
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8193
"give\n"
8194
"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
8195
"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
8196
msgstr ""
8197
8198
#: dummy/help_topics/criss-cross/detail.txt:10
8199
msgid ""
8200
"Criss-crosses occur in a branch's history if two branches merge the same "
8201
"thing\n"
8202
"and then merge one another, or if two branches merge one another at the "
8203
"same\n"
8204
"time.  They can be avoided by having each branch only merge from or into a\n"
8205
"designated central branch (a \"star topology\")."
8206
msgstr ""
8207
8208
#: dummy/help_topics/criss-cross/detail.txt:15
8209
msgid ""
8210
"Criss-crosses cause problems because of the way merge works.  Bazaar's "
8211
"default\n"
8212
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8213
"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
8214
"differences between THIS and OTHER are due to one side adding lines, or\n"
8215
"from another side removing lines."
8216
msgstr ""
8217
8218
#: dummy/help_topics/criss-cross/detail.txt:21
8219
msgid ""
8220
"Criss-crosses mean there is no good choice for a base.  Selecting the "
8221
"recent\n"
8222
"merge points could cause one side's changes to be silently discarded.\n"
8223
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8224
"are emitted."
8225
msgstr ""
8226
8227
#: dummy/help_topics/criss-cross/detail.txt:26
8228
msgid ""
8229
"The ``weave`` merge type is not affected by this problem because it uses\n"
8230
"line-origin detection instead of a basis revision to determine the cause of\n"
8231
"differences.\n"
8232
msgstr ""
8233
8234
#: dummy/help_topics/criss-cross/summary.txt:1
8235
msgid "Information on criss-cross merging"
8236
msgstr ""
8237
8238
#: dummy/help_topics/current-formats/summary.txt:1
8239
msgid "Current storage formats"
8240
msgstr ""
8241
8242
#: dummy/help_topics/debug-flags/summary.txt:1
8243
msgid "Options to show or record debug information"
8244
msgstr ""
8245
8246
#: dummy/help_topics/diverged-branches/summary.txt:1
8247
msgid "How to fix diverged branches"
8248
msgstr ""
8249
8250
#: dummy/help_topics/env-variables/summary.txt:1
8251
msgid "Environment variable names and values"
8252
msgstr ""
8253
8254
#: dummy/help_topics/eol/summary.txt:1
8255
msgid "Information on end-of-line handling"
8256
msgstr ""
8257
8258
#: dummy/help_topics/files/detail.txt:1
8259
msgid "Files"
8260
msgstr ""
8261
8262
#: dummy/help_topics/files/detail.txt:3
8263
msgid ""
8264
":On Unix:   ~/.bazaar/bazaar.conf\n"
6622.1.22 by Jelmer Vernooij
Update po files.
8265
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8266
"\\bazaar\\\\2.0\\\\bazaar.conf"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8267
msgstr ""
8268
8269
#: dummy/help_topics/files/detail.txt:6
8270
msgid ""
8271
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8272
"used to define general configuration that will be applied everywhere.\n"
8273
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8274
"commonly used options."
8275
msgstr ""
8276
8277
#: dummy/help_topics/files/detail.txt:11
8278
msgid "A typical config file might look something like::"
8279
msgstr ""
8280
8281
#: dummy/help_topics/files/detail.txt:13
8282
msgid ""
8283
"  [DEFAULT]\n"
8284
"  email=John Doe <jdoe@isp.com>"
8285
msgstr ""
8286
8287
#: dummy/help_topics/files/detail.txt:16
8288
msgid ""
8289
"  [ALIASES]\n"
8290
"  commit = commit --strict\n"
8291
"  log10 = log --short -r -10..-1\n"
8292
msgstr ""
8293
8294
#: dummy/help_topics/files/summary.txt:1
8295
msgid "Information on configuration and log files"
8296
msgstr ""
8297
8298
#: dummy/help_topics/formats/detail.txt:1
8299
msgid "Storage Formats"
8300
msgstr ""
8301
8302
#: dummy/help_topics/formats/detail.txt:3
8303
msgid ""
8304
"To ensure that older clients do not access data incorrectly,\n"
8305
"Bazaar's policy is to introduce a new storage format whenever\n"
8306
"new features requiring new metadata are added. New storage\n"
8307
"formats may also be introduced to improve performance and\n"
8308
"scalability."
8309
msgstr ""
8310
8311
#: dummy/help_topics/formats/detail.txt:9
8312
msgid ""
8313
"The newest format, 2a, is highly recommended. If your\n"
8314
"project is not using 2a, then you should suggest to the\n"
8315
"project owner to upgrade."
8316
msgstr ""
8317
8318
#: dummy/help_topics/formats/detail.txt:13
8319
msgid ""
8320
"\n"
8321
".. note::"
8322
msgstr ""
8323
8324
#: dummy/help_topics/formats/detail.txt:16
8325
msgid ""
8326
"   Some of the older formats have two variants:\n"
8327
"   a plain one and a rich-root one. The latter include an additional\n"
8328
"   field about the root of the tree. There is no performance cost\n"
8329
"   for using a rich-root format but you cannot easily merge changes\n"
8330
"   from a rich-root format into a plain format. As a consequence,\n"
8331
"   moving a project to a rich-root format takes some co-ordination\n"
8332
"   in that all contributors need to upgrade their repositories\n"
8333
"   around the same time. 2a and all future formats will be\n"
8334
"   implicitly rich-root."
8335
msgstr ""
8336
8337
#: dummy/help_topics/formats/detail.txt:26
8338
msgid ""
8339
"See :doc:`current-formats-help` for the complete list of\n"
8340
"currently supported formats. See :doc:`other-formats-help` for\n"
8341
"descriptions of any available experimental and deprecated formats.\n"
8342
msgstr ""
8343
8344
#: dummy/help_topics/formats/summary.txt:1
8345
msgid "Information on choosing a storage format"
8346
msgstr ""
8347
8348
#: dummy/help_topics/global-options/detail.txt:1
8349
msgid "Global Options"
8350
msgstr ""
8351
8352
#: dummy/help_topics/global-options/detail.txt:3
8353
msgid ""
8354
"These options may be used with any command, and may appear in front of any\n"
8355
"command.  (e.g. ``bzr --profile help``)."
8356
msgstr ""
8357
8358
#: dummy/help_topics/global-options/detail.txt:6
8359
msgid ""
8360
"--version      Print the version number. Must be supplied before the "
8361
"command.\n"
8362
"--no-aliases   Do not process command aliases when running this command.\n"
8363
"--builtin      Use the built-in version of a command, not the plugin "
8364
"version.\n"
8365
"               This does not suppress other plugin effects.\n"
8366
"--no-plugins   Do not process any plugins.\n"
8367
"--no-l10n      Do not translate messages.\n"
8368
"--concurrency  Number of processes that can be run concurrently (selftest)."
8369
msgstr ""
8370
8371
#: dummy/help_topics/global-options/detail.txt:14
8372
msgid ""
8373
"--profile      Profile execution using the hotshot profiler.\n"
8374
"--lsprof       Profile execution using the lsprof profiler.\n"
8375
"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
6622.1.22 by Jelmer Vernooij
Update po files.
8376
"               results to a specified file.  If the filename ends with \".txt"
8377
"\",\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8378
"               text format will be used.  If the filename either starts "
8379
"with\n"
8380
"               \"callgrind.out\" or end with \".callgrind\", the output will "
8381
"be\n"
8382
"               formatted for use with KCacheGrind. Otherwise, the output\n"
8383
"               will be a pickle.\n"
8384
"--coverage     Generate line coverage report in the specified directory."
8385
msgstr ""
8386
8387
#: dummy/help_topics/global-options/detail.txt:24
8388
msgid ""
8389
"-Oname=value   Override the ``name`` config option setting it to ``value`` "
8390
"for\n"
8391
"               the duration of the command.  This can be used multiple times "
8392
"if\n"
8393
"               several options need to be overridden."
8394
msgstr ""
8395
8396
#: dummy/help_topics/global-options/detail.txt:28
8397
msgid ""
8398
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8399
"information on profiling."
8400
msgstr ""
8401
8402
#: dummy/help_topics/global-options/detail.txt:31
8403
msgid ""
8404
"A number of debug flags are also available to assist troubleshooting and\n"
8405
"development.  See :doc:`debug-flags-help`.\n"
8406
msgstr ""
8407
8408
#: dummy/help_topics/global-options/summary.txt:1
8409
msgid "Options that control how Bazaar runs"
8410
msgstr ""
8411
8412
#: dummy/help_topics/hidden-commands/summary.txt:1
8413
msgid "All hidden commands"
8414
msgstr ""
8415
8416
#: dummy/help_topics/hooks/summary.txt:1
8417
msgid "Points at which custom processing can be added"
8418
msgstr ""
8419
8420
#: dummy/help_topics/launchpad/detail.txt:1
8421
msgid "Integration with Launchpad.net"
8422
msgstr ""
8423
8424
#: dummy/help_topics/launchpad/detail.txt:3
8425
msgid ""
8426
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8427
"specification tracking."
8428
msgstr ""
8429
8430
#: dummy/help_topics/launchpad/detail.txt:6
8431
msgid ""
8432
"The bzr client (through the plugin called 'launchpad') has special\n"
8433
"features to communicate with Launchpad:"
8434
msgstr ""
8435
8436
#: dummy/help_topics/launchpad/detail.txt:9
8437
msgid ""
8438
"    * The launchpad-login command tells Bazaar your Launchpad user name. "
8439
"This\n"
8440
"      is then used by the 'lp:' transport to download your branches using\n"
8441
"      bzr+ssh://."
8442
msgstr ""
8443
8444
#: dummy/help_topics/launchpad/detail.txt:13
8445
msgid ""
8446
"    * The 'lp:' transport uses Launchpad as a directory service: for "
8447
"example\n"
8448
"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8449
"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8450
"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8451
msgstr ""
8452
8453
#: dummy/help_topics/launchpad/detail.txt:18
8454
msgid ""
8455
"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8456
"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8457
"lp:12345'\n"
8458
"      will record a revision property that marks that revision as fixing\n"
8459
"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8460
"      automatically be linked to the bug report."
8461
msgstr ""
8462
8463
#: dummy/help_topics/launchpad/detail.txt:24
8464
msgid ""
8465
"    * The register-branch command tells Launchpad about the url of a\n"
8466
"      public branch.  Launchpad will then mirror the branch, display\n"
8467
"      its contents and allow it to be attached to bugs and other\n"
8468
"      objects."
8469
msgstr ""
8470
8471
#: dummy/help_topics/launchpad/detail.txt:29
8472
msgid "For more information see http://help.launchpad.net/\n"
8473
msgstr ""
8474
8475
#: dummy/help_topics/launchpad/summary.txt:1
8476
msgid "Using Bazaar with Launchpad.net"
8477
msgstr ""
8478
8479
#: dummy/help_topics/location-alias/summary.txt:1
8480
msgid "Aliases for remembered locations"
8481
msgstr ""
8482
8483
#: dummy/help_topics/log-formats/summary.txt:1
8484
msgid "Details on the logging formats available"
8485
msgstr ""
8486
8487
#: dummy/help_topics/other-formats/summary.txt:1
8488
msgid "Experimental and deprecated storage formats"
8489
msgstr ""
8490
8491
#: dummy/help_topics/patterns/summary.txt:1
8492
msgid "Information on the pattern syntax"
8493
msgstr ""
8494
8495
#: dummy/help_topics/repositories/detail.txt:1
8496
msgid "Repositories"
8497
msgstr ""
8498
8499
#: dummy/help_topics/repositories/detail.txt:3
8500
msgid ""
8501
"Repositories in Bazaar are where committed information is stored. There is\n"
8502
"a repository associated with every branch."
8503
msgstr ""
8504
8505
#: dummy/help_topics/repositories/detail.txt:6
8506
msgid ""
8507
"Repositories are a form of database. Bzr will usually maintain this for\n"
8508
"good performance automatically, but in some situations (e.g. when doing\n"
8509
"very many commits in a short time period) you may want to ask bzr to\n"
8510
"optimise the database indices. This can be done by the 'bzr pack' command."
8511
msgstr ""
8512
8513
#: dummy/help_topics/repositories/detail.txt:11
8514
msgid ""
8515
"By default just running 'bzr init' will create a repository within the new\n"
8516
"branch but it is possible to create a shared repository which allows "
8517
"multiple\n"
8518
"branches to share their information in the same location. When a new branch "
8519
"is\n"
8520
"created it will first look to see if there is a containing shared repository "
8521
"it\n"
8522
"can use."
8523
msgstr ""
8524
8525
#: dummy/help_topics/repositories/detail.txt:17
8526
msgid ""
8527
"When two branches of the same project share a repository, there is\n"
8528
"generally a large space saving. For some operations (e.g. branching\n"
8529
"within the repository) this translates in to a large time saving."
8530
msgstr ""
8531
8532
#: dummy/help_topics/repositories/detail.txt:21
8533
msgid ""
8534
"To create a shared repository use the init-repository command (or the alias\n"
8535
"init-repo). This command takes the location of the repository to create. "
8536
"This\n"
8537
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8538
"which contains a shared repository. Any new branches that are created in "
8539
"this\n"
8540
"directory will then use it for storage."
8541
msgstr ""
8542
8543
#: dummy/help_topics/repositories/detail.txt:27
8544
msgid ""
8545
"It is a good idea to create a repository whenever you might create more\n"
8546
"than one branch of a project. This is true for both working areas where you\n"
8547
"are doing the development, and any server areas that you use for hosting\n"
8548
"projects. In the latter case, it is common to want branches without working\n"
8549
"trees. Since the files in the branch will not be edited directly there is "
8550
"no\n"
8551
"need to use up disk space for a working tree. To create a repository in "
8552
"which\n"
8553
"the branches will not have working trees pass the '--no-trees' option to\n"
8554
"'init-repository'."
8555
msgstr ""
8556
8557
#: dummy/help_topics/repositories/detail.txt:38
8558
msgid ""
8559
"  init-repository   Create a shared repository. Use --no-trees to create "
8560
"one\n"
8561
"                    in which new branches won't get a working tree.\n"
8562
msgstr ""
8563
8564
#: dummy/help_topics/repositories/summary.txt:1
8565
msgid "Basic information on shared repositories."
8566
msgstr ""
8567
8568
#: dummy/help_topics/revisionspec/summary.txt:1
8569
msgid "Explain how to use --revision"
8570
msgstr ""
8571
8572
#: dummy/help_topics/rules/summary.txt:1
8573
msgid "Information on defining rule-based preferences"
8574
msgstr ""
8575
8576
#: dummy/help_topics/standalone-trees/detail.txt:1
8577
msgid "Standalone Trees"
8578
msgstr ""
8579
8580
#: dummy/help_topics/standalone-trees/detail.txt:3
8581
msgid ""
8582
"A standalone tree is a working tree with an associated repository. It\n"
8583
"is an independently usable branch, with no dependencies on any other.\n"
8584
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8585
"an existing project under version control."
8586
msgstr ""
8587
8588
#: dummy/help_topics/standalone-trees/detail.txt:8
8589
msgid "Related Commands::"
8590
msgstr ""
8591
8592
#: dummy/help_topics/standalone-trees/detail.txt:10
8593
msgid "  init    Make a directory into a versioned branch.\n"
8594
msgstr ""
8595
8596
#: dummy/help_topics/standalone-trees/summary.txt:1
8597
msgid "Information on what a standalone tree is"
8598
msgstr ""
8599
8600
#: dummy/help_topics/standard-options/detail.txt:1
8601
msgid "Standard Options"
8602
msgstr ""
8603
8604
#: dummy/help_topics/standard-options/detail.txt:3
8605
msgid "Standard options are legal for all commands."
8606
msgstr ""
8607
8608
#: dummy/help_topics/standard-options/detail.txt:5
8609
msgid ""
8610
"--help, -h     Show help message.\n"
8611
"--verbose, -v  Display more information.\n"
8612
"--quiet, -q    Only display errors and warnings."
8613
msgstr ""
8614
8615
#: dummy/help_topics/standard-options/detail.txt:9
8616
msgid "Unlike global options, standard options can be used in aliases.\n"
8617
msgstr ""
8618
8619
#: dummy/help_topics/standard-options/summary.txt:1
8620
msgid "Options that can be used with any command"
8621
msgstr ""
8622
8623
#: dummy/help_topics/status-flags/detail.txt:1
8624
msgid "Status Flags"
8625
msgstr ""
8626
8627
#: dummy/help_topics/status-flags/detail.txt:3
8628
msgid ""
8629
"Status flags are used to summarise changes to the working tree in a concise\n"
8630
"manner.  They are in the form::"
8631
msgstr ""
8632
8633
#: dummy/help_topics/status-flags/detail.txt:6
8634
msgid "   xxx   <filename>"
8635
msgstr ""
8636
8637
#: dummy/help_topics/status-flags/detail.txt:8
8638
msgid "where the columns' meanings are as follows."
8639
msgstr ""
8640
8641
#: dummy/help_topics/status-flags/detail.txt:10
8642
msgid "Column 1 - versioning/renames::"
8643
msgstr ""
8644
8645
#: dummy/help_topics/status-flags/detail.txt:12
8646
msgid ""
8647
"  + File versioned\n"
8648
"  - File unversioned\n"
8649
"  R File renamed\n"
8650
"  ? File unknown\n"
8651
"  X File nonexistent (and unknown to bzr)\n"
8652
"  C File has conflicts\n"
8653
"  P Entry for a pending merge (not a file)"
8654
msgstr ""
8655
8656
#: dummy/help_topics/status-flags/detail.txt:20
8657
msgid "Column 2 - contents::"
8658
msgstr ""
8659
8660
#: dummy/help_topics/status-flags/detail.txt:22
8661
msgid ""
8662
"  N File created\n"
8663
"  D File deleted\n"
8664
"  K File kind changed\n"
8665
"  M File modified"
8666
msgstr ""
8667
8668
#: dummy/help_topics/status-flags/detail.txt:27
8669
msgid "Column 3 - execute::"
8670
msgstr ""
8671
8672
#: dummy/help_topics/status-flags/detail.txt:29
8673
msgid "  * The execute bit was changed\n"
8674
msgstr ""
8675
8676
#: dummy/help_topics/status-flags/summary.txt:1
8677
msgid "Help on status flags"
8678
msgstr ""
8679
8680
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8681
msgid "Branches Out of Sync"
8682
msgstr ""
8683
8684
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8685
msgid ""
8686
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8687
"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
8688
"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
8689
"have the same last revision as the new reference branch for the lightweight\n"
8690
"checkout, data could be lost, so Bazaar refuses."
8691
msgstr ""
8692
8693
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8694
msgid "How you deal with this depends on *why* the branches are out of sync."
8695
msgstr ""
8696
8697
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8698
msgid ""
8699
"If you have a checkout and have done local commits, you can get back in "
8700
"sync\n"
8701
"by running \"bzr update\" (and possibly \"bzr commit\")."
8702
msgstr ""
8703
8704
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8705
msgid ""
8706
"If you have a branch and the remote branch is out-of-date, you can push\n"
8707
"the local changes using \"bzr push\".  If the local branch is out of date, "
8708
"you\n"
8709
"can do \"bzr pull\".  If both branches have had changes, you can merge, "
8710
"commit\n"
8711
"and then push your changes.  If you decide that some of the changes aren't\n"
8712
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8713
msgstr ""
8714
8715
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8716
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8717
msgstr ""
8718
8719
#: dummy/help_topics/topics/summary.txt:1
8720
msgid "Topics list"
8721
msgstr ""
8722
8723
#: dummy/help_topics/url-special-chars/summary.txt:1
8724
msgid "Special character handling in URLs"
8725
msgstr ""
8726
8727
#: dummy/help_topics/urlspec/summary.txt:1
8728
msgid "Supported transport protocols"
8729
msgstr ""
8730
8731
#: dummy/help_topics/working-trees/detail.txt:1
8732
msgid "Working Trees"
8733
msgstr ""
8734
8735
#: dummy/help_topics/working-trees/detail.txt:3
8736
msgid ""
8737
"A working tree is the contents of a branch placed on disk so that you can\n"
8738
"see the files and edit them. The working tree is where you make changes to "
8739
"a\n"
8740
"branch, and when you commit the current state of the working tree is the\n"
8741
"snapshot that is recorded in the commit."
8742
msgstr ""
8743
8744
#: dummy/help_topics/working-trees/detail.txt:8
8745
msgid ""
8746
"When you push a branch to a remote system, a working tree will not be\n"
8747
"created. If one is already present the files will not be updated. The\n"
8748
"branch information will be updated and the working tree will be marked\n"
8749
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8750
"may be uncommitted changes or the update may cause content conflicts that "
8751
"are\n"
8752
"difficult to deal with remotely."
8753
msgstr ""
8754
8755
#: dummy/help_topics/working-trees/detail.txt:15
8756
msgid ""
8757
"If you have a branch with no working tree you can use the 'checkout' "
8758
"command\n"
8759
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8760
"will\n"
8761
"create the working tree. If the branch is updated remotely, you can update "
8762
"the\n"
8763
"working tree by running 'bzr update' in that directory."
8764
msgstr ""
8765
8766
#: dummy/help_topics/working-trees/detail.txt:20
8767
msgid ""
8768
"If you have a branch with a working tree that you do not want the 'remove-"
8769
"tree'\n"
8770
"command will remove the tree if it is safe. This can be done to avoid the\n"
8771
"warning about the remote working tree not being updated when pushing to the\n"
8772
"branch. It can also be useful when working with a '--no-trees' repository\n"
8773
"(see 'bzr help repositories')."
8774
msgstr ""
8775
8776
#: dummy/help_topics/working-trees/detail.txt:26
8777
msgid ""
8778
"If you want to have a working tree on a remote machine that you push to you\n"
8779
"can either run 'bzr update' in the remote branch after each push, or use "
8780
"some\n"
8781
"other method to update the tree during the push. There is an 'rspush' "
8782
"plugin\n"
8783
"that will update the working tree using rsync as well as doing a push. "
8784
"There\n"
8785
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8786
"SSH\n"
8787
"after each push."
8788
msgstr ""
8789
8790
#: dummy/help_topics/working-trees/detail.txt:33
8791
msgid "Useful commands::"
8792
msgstr ""
8793
8794
#: dummy/help_topics/working-trees/detail.txt:35
8795
msgid ""
8796
"  checkout     Create a working tree when a branch does not have one.\n"
8797
"  remove-tree  Removes the working tree from a branch when it is safe to do "
8798
"so.\n"
8799
"  update       When a working tree is out of sync with its associated "
8800
"branch\n"
8801
"               this will update the tree to match the branch.\n"
8802
msgstr ""
8803
8804
#: dummy/help_topics/working-trees/summary.txt:1
8805
msgid "Information on working trees"
8806
msgstr ""
8807
8808
#: en/help_topics/authentication.txt:1
8809
msgid ""
8810
"Authentication Settings\n"
8811
"======================="
8812
msgstr ""
8813
8814
#: en/help_topics/authentication.txt:4
8815
msgid ""
8816
"\n"
8817
"Intent\n"
8818
"------"
8819
msgstr ""
8820
8821
#: en/help_topics/authentication.txt:8
8822
msgid ""
8823
"Many different authentication policies can be described in the\n"
8824
"``authentication.conf`` file but a particular user should need only a few\n"
8825
"definitions to cover his needs without having to specify a user and a "
8826
"password\n"
8827
"for every branch he uses."
8828
msgstr ""
8829
8830
#: en/help_topics/authentication.txt:13
8831
msgid ""
8832
"The definitions found in this file are used to find the credentials to use "
8833
"for\n"
8834
"a given url. The same credentials can generally be used for as many branches "
8835
"as\n"
8836
"possible by grouping their declaration around the remote servers that need\n"
8837
"them. It's even possible to declare credentials that will be used by "
8838
"different\n"
8839
"servers."
8840
msgstr ""
8841
8842
#: en/help_topics/authentication.txt:19
8843
msgid ""
8844
"The intent is to make this file as small as possible to minimize maintenance."
8845
msgstr ""
8846
8847
#: en/help_topics/authentication.txt:21
8848
msgid ""
8849
"Once the relevant credentials are declared in this file you may use branch "
8850
"urls\n"
8851
"without embedding passwords (security hazard) or even users (enabling "
8852
"sharing\n"
8853
"of your urls with others)."
8854
msgstr ""
8855
8856
#: en/help_topics/authentication.txt:25
8857
msgid "Instead of using::"
8858
msgstr ""
8859
8860
#: en/help_topics/authentication.txt:27
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8861
msgid "  brz branch ftp://joe:secret@host.com/path/to/my/branch"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8862
msgstr ""
8863
8864
#: en/help_topics/authentication.txt:29
8865
msgid "you simply use::"
8866
msgstr ""
8867
8868
#: en/help_topics/authentication.txt:31
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8869
msgid "  brz branch ftp://host.com/path/to/my/branch"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8870
msgstr ""
8871
8872
#: en/help_topics/authentication.txt:33
6622.1.22 by Jelmer Vernooij
Update po files.
8873
msgid "provided you have created the following ``authentication.conf`` file::"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8874
msgstr ""
8875
8876
#: en/help_topics/authentication.txt:35
8877
msgid ""
8878
"  [myprojects]\n"
8879
"  scheme=ftp\n"
8880
"  host=host.com\n"
8881
"  user=joe\n"
8882
"  password=secret\n"
8883
"  "
8884
msgstr ""
8885
8886
#: en/help_topics/authentication.txt:42
8887
msgid ""
8888
"Authentication definitions\n"
8889
"--------------------------"
8890
msgstr ""
8891
8892
#: en/help_topics/authentication.txt:45
8893
msgid ""
8894
"There are two kinds of authentication used by the various schemes supported "
8895
"by\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8896
"brz:"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8897
msgstr ""
8898
8899
#: en/help_topics/authentication.txt:48
8900
msgid "1. user and password"
8901
msgstr ""
8902
8903
#: en/help_topics/authentication.txt:50
8904
msgid ""
8905
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8906
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8907
"ssh agents are a better, more secure solution. So we have chosen to not "
8908
"provide\n"
8909
"our own less secure method."
8910
msgstr ""
8911
8912
#: en/help_topics/authentication.txt:55
8913
msgid "2. user, realm and password"
8914
msgstr ""
8915
8916
#: en/help_topics/authentication.txt:57
8917
msgid ""
8918
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8919
"against a host. But, by using ``.htaccess`` files, for example, it is "
8920
"possible\n"
8921
"to define several (``user, realm, password``) for a given ``host``. So what "
8922
"is\n"
8923
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8924
"is\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8925
"not taken into account in the definitions, but will displayed if brz "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8926
"prompts\n"
8927
"you for a password."
8928
msgstr ""
8929
8930
#: en/help_topics/authentication.txt:64
8931
msgid ""
8932
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8933
"specifying the appropriate port."
8934
msgstr ""
8935
8936
#: en/help_topics/authentication.txt:67
8937
msgid ""
8938
"To take all schemes into account, the password will be deduced from a set "
8939
"of\n"
8940
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8941
"``user``,\n"
8942
"``password``)."
8943
msgstr ""
8944
8945
#: en/help_topics/authentication.txt:71
8946
msgid ""
8947
"  * ``scheme``: can be empty (meaning the rest of the definition can be "
8948
"used\n"
8949
"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8950
"``ssh``\n"
8951
"    should be used instead since this is the real scheme regarding\n"
8952
"    authentication,"
8953
msgstr ""
8954
8955
#: en/help_topics/authentication.txt:76
8956
msgid "  * ``host``: can be empty (to act as a default for any host),"
8957
msgstr ""
8958
8959
#: en/help_topics/authentication.txt:78
8960
msgid ""
8961
"  * ``port`` can be empty (useful when an host provides several servers for "
8962
"the\n"
8963
"    same scheme), only numerical values are allowed, this should be used "
8964
"only\n"
8965
"    when the server uses a port different than the scheme standard port,"
8966
msgstr ""
8967
8968
#: en/help_topics/authentication.txt:82
8969
msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
8970
msgstr ""
8971
8972
#: en/help_topics/authentication.txt:84
8973
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8974
"  * ``user``: can be empty (``bzr`` will default to python's\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8975
"    ``getpass.get_user()``),"
8976
msgstr ""
8977
8978
#: en/help_topics/authentication.txt:87
8979
msgid ""
8980
"  * ``password``: can be empty if you prefer to always be prompted for your\n"
8981
"    password."
8982
msgstr ""
8983
8984
#: en/help_topics/authentication.txt:90
8985
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
8986
"Multiple definitions can be provided and, for a given URL, brz will select "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
8987
"a\n"
8988
"(``user`` [, ``password``]) based on the following rules :"
8989
msgstr ""
8990
8991
#: en/help_topics/authentication.txt:93
8992
msgid " 1. the first match wins,"
8993
msgstr ""
8994
8995
#: en/help_topics/authentication.txt:95
8996
msgid " 2. empty fields match everything,"
8997
msgstr ""
8998
8999
#: en/help_topics/authentication.txt:97
9000
msgid ""
9001
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9002
msgstr ""
9003
9004
#: en/help_topics/authentication.txt:99
9005
msgid ""
9006
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
6622.1.22 by Jelmer Vernooij
Update po files.
9007
"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
9008
"net``\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9009
"    will not match ``bzr.sf.net``)."
9010
msgstr ""
9011
9012
#: en/help_topics/authentication.txt:103
9013
msgid ""
9014
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9015
msgstr ""
9016
9017
#: en/help_topics/authentication.txt:105
9018
msgid ""
9019
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9020
"above,\n"
9021
"    empty paths will match any provided path)."
9022
msgstr ""
9023
9024
#: en/help_topics/authentication.txt:110
9025
msgid ""
9026
"File format\n"
9027
"-----------"
9028
msgstr ""
9029
9030
#: en/help_topics/authentication.txt:113
9031
msgid ""
9032
"The general rules for :doc:`configuration files <configuration-help>`\n"
9033
"apply except for the variable policies."
9034
msgstr ""
9035
9036
#: en/help_topics/authentication.txt:116
9037
msgid "Each section describes an authentication definition."
9038
msgstr ""
9039
9040
#: en/help_topics/authentication.txt:118
9041
msgid ""
9042
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9043
"reserved\n"
9044
"and should appear as the *last* section."
9045
msgstr ""
9046
9047
#: en/help_topics/authentication.txt:121
9048
msgid "Each section should define:"
9049
msgstr ""
9050
9051
#: en/help_topics/authentication.txt:123
9052
msgid "* ``user``: the login to be used,"
9053
msgstr ""
9054
9055
#: en/help_topics/authentication.txt:125
9056
msgid "Each section could define:"
9057
msgstr ""
9058
9059
#: en/help_topics/authentication.txt:127
9060
msgid "* ``host``: the remote server,"
9061
msgstr ""
9062
9063
#: en/help_topics/authentication.txt:129
9064
msgid "* ``port``: the port the server is listening,"
9065
msgstr ""
9066
9067
#: en/help_topics/authentication.txt:131
9068
msgid "* ``path``: the branch location,"
9069
msgstr ""
9070
9071
#: en/help_topics/authentication.txt:133
9072
msgid "* ``password``: the password."
9073
msgstr ""
9074
9075
#: en/help_topics/authentication.txt:135
9076
msgid ""
9077
"\n"
9078
"Examples\n"
9079
"--------"
9080
msgstr ""
9081
9082
#: en/help_topics/authentication.txt:139
9083
msgid ""
9084
"\n"
9085
"Personal projects hosted outside\n"
9086
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9087
msgstr ""
9088
9089
#: en/help_topics/authentication.txt:143
9090
msgid ""
9091
"All connections are done with the same ``user`` (the remote one for which "
9092
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9093
"default brz one is not appropriate) and the password is always prompted "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9094
"with\n"
9095
"some exceptions::"
9096
msgstr ""
9097
9098
#: en/help_topics/authentication.txt:147
9099
msgid ""
9100
"        # Pet projects on hobby.net\n"
9101
"        [hobby]\n"
9102
"        host=r.hobby.net\n"
9103
"        user=jim\n"
9104
"        password=obvious1234\n"
9105
"        \n"
9106
"        # Home server\n"
9107
"        [home]\n"
9108
"        scheme=https\n"
9109
"        host=home.net\n"
9110
"        user=joe\n"
9111
"        password=1essobV10us\n"
9112
"        \n"
9113
"        [DEFAULT]\n"
9114
"        # Our local user is barbaz, on all remote sites we're known as "
9115
"foobar\n"
9116
"        user=foobar"
9117
msgstr ""
9118
9119
#: en/help_topics/authentication.txt:164
9120
msgid ""
9121
"\n"
9122
"Source hosting provider\n"
9123
"~~~~~~~~~~~~~~~~~~~~~~~"
9124
msgstr ""
9125
9126
#: en/help_topics/authentication.txt:168
9127
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9128
msgstr ""
9129
9130
#: en/help_topics/authentication.txt:170
9131
msgid ""
9132
"        [shpnet domain]\n"
9133
"        # we use sftp, but ssh is the scheme used for authentication\n"
9134
"        scheme=ssh\n"
9135
"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9136
"        host=.shp.net\n"
9137
"        user=joe\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9138
"        # brz doesn't support supplying a password for sftp,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9139
"        # consider using an ssh agent if you don't want to supply\n"
9140
"        # a password interactively. (pageant, ssh-agent, etc)"
9141
msgstr ""
9142
9143
#: en/help_topics/authentication.txt:180
9144
msgid ""
9145
"HTTPS, SFTP servers and their proxy\n"
9146
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9147
msgstr ""
9148
9149
#: en/help_topics/authentication.txt:183
9150
msgid ""
9151
"At company.com, the server hosting release and integration branches is "
9152
"behind a\n"
9153
"proxy, and the two branches use different authentication policies::"
9154
msgstr ""
9155
9156
#: en/help_topics/authentication.txt:186
9157
msgid ""
9158
"        [reference code]\n"
9159
"        scheme=https\n"
9160
"        host=dev.company.com\n"
9161
"        path=/dev\n"
9162
"        user=user1\n"
9163
"        password=pass1"
9164
msgstr ""
9165
9166
#: en/help_topics/authentication.txt:193
9167
msgid ""
9168
"        # development branches on dev server\n"
9169
"        [dev]\n"
9170
"        scheme=ssh # bzr+ssh and sftp are available here\n"
9171
"        host=dev.company.com\n"
9172
"        path=/dev/integration\n"
9173
"        user=user2\n"
9174
"        \n"
9175
"        # proxy\n"
9176
"        [proxy]\n"
9177
"        scheme=http\n"
9178
"        host=proxy.company.com\n"
9179
"        port=3128\n"
9180
"        user=proxyuser1\n"
9181
"        password=proxypass1"
9182
msgstr ""
9183
9184
#: en/help_topics/authentication.txt:208
9185
msgid ""
9186
"\n"
9187
"Planned enhancements\n"
9188
"--------------------"
9189
msgstr ""
9190
9191
#: en/help_topics/authentication.txt:212
9192
msgid ""
9193
"The following are not yet implemented but planned as parts of a work in\n"
9194
"progress:"
9195
msgstr ""
9196
9197
#: en/help_topics/authentication.txt:215
9198
msgid "* add a  ``password_encoding`` field allowing:"
9199
msgstr ""
9200
9201
#: en/help_topics/authentication.txt:217
9202
msgid ""
9203
"  - storing the passwords in various obfuscating encodings (base64 for one),"
9204
msgstr ""
9205
9206
#: en/help_topics/authentication.txt:219
9207
msgid "  - delegate password storage to plugins (.netrc for example)."
9208
msgstr ""
9209
9210
#: en/help_topics/authentication.txt:221
9211
msgid ""
9212
"* update the credentials when the user is prompted for user or password,"
9213
msgstr ""
9214
9215
#: en/help_topics/authentication.txt:223
9216
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9217
msgstr ""
9218
9219
#: en/help_topics/authentication.txt:225
9220
msgid ""
9221
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9222
"but\n"
9223
"ignored in the actual implementation.\n"
9224
msgstr ""
9225
9226
#: en/help_topics/bugs.txt:1
9227
msgid "Bug Tracker Settings"
9228
msgstr ""
9229
9230
#: en/help_topics/bugs.txt:3
9231
msgid ""
9232
"When making a commit, metadata about bugs fixed by that change can be\n"
9233
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9234
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9235
"(The only ``status`` value currently supported is ``fixed.``)"
9236
msgstr ""
9237
9238
#: en/help_topics/bugs.txt:8
9239
msgid ""
9240
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9241
"identifier\n"
9242
"rather than a full URL. This looks like::"
9243
msgstr ""
9244
9245
#: en/help_topics/bugs.txt:11
9246
msgid "    bzr commit --fixes <tracker>:<id>"
9247
msgstr ""
9248
6622.1.22 by Jelmer Vernooij
Update po files.
9249
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9250
msgid "or::"
9251
msgstr ""
9252
9253
#: en/help_topics/bugs.txt:15
9254
msgid "    bzr commit --fixes <id>"
9255
msgstr ""
9256
9257
#: en/help_topics/bugs.txt:17
9258
msgid ""
9259
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9260
"the\n"
9261
"identifier for that bug within the bugtracker, usually the bug number.\n"
9262
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9263
"or global configuration is used."
9264
msgstr ""
9265
9266
#: en/help_topics/bugs.txt:22
9267
msgid ""
9268
"Bazaar knows about a few bug trackers that have many users. If\n"
9269
"you use one of these bug trackers then there is no setup required to\n"
9270
"use this feature, you just need to know the tracker identifier to use.\n"
9271
"These are the bugtrackers that are built in:"
9272
msgstr ""
9273
9274
#: en/help_topics/bugs.txt:27
9275
msgid ""
9276
"  ============================ ============ ============\n"
9277
"  URL                          Abbreviation Example\n"
9278
"  ============================ ============ ============\n"
9279
"  https://bugs.launchpad.net/  lp           lp:12345\n"
9280
"  http://bugs.debian.org/      deb          deb:12345\n"
9281
"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
9282
"  ============================ ============ ============"
9283
msgstr ""
9284
9285
#: en/help_topics/bugs.txt:35
9286
msgid ""
9287
"For the bug trackers not listed above configuration is required.\n"
9288
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9289
"is built in, along with a template mechanism for other bugtrackers with\n"
9290
"simple URL schemes. If your bug tracker can't be described by one\n"
9291
"of the schemes described below then you can write a plugin to support\n"
9292
"it."
9293
msgstr ""
9294
9295
#: en/help_topics/bugs.txt:42
9296
msgid ""
9297
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9298
"variable which contains the base URL of the bug tracker. These options\n"
9299
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9300
"configuration section in ``locations.conf``.  You can set up these values\n"
9301
"for each of the projects you work on."
9302
msgstr ""
9303
9304
#: en/help_topics/bugs.txt:48
9305
msgid ""
9306
"Note: As you provide a short name for each tracker, you can specify one or\n"
9307
"more bugs in one or more trackers at commit time if you wish."
9308
msgstr ""
9309
9310
#: en/help_topics/bugs.txt:51
9311
msgid ""
9312
"Launchpad\n"
9313
"---------"
9314
msgstr ""
9315
9316
#: en/help_topics/bugs.txt:54
6622.1.22 by Jelmer Vernooij
Update po files.
9317
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9318
msgstr ""
9319
9320
#: en/help_topics/bugs.txt:56
9321
msgid ""
9322
"bugzilla_<tracker>_url\n"
9323
"----------------------"
9324
msgstr ""
9325
9326
#: en/help_topics/bugs.txt:59
9327
msgid ""
9328
"If present, the location of the Bugzilla bug tracker referred to by\n"
9329
"<tracker>. This option can then be used together with ``bzr commit\n"
9330
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9331
"example::"
9332
msgstr ""
9333
9334
#: en/help_topics/bugs.txt:64
9335
msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
9336
msgstr ""
9337
9338
#: en/help_topics/bugs.txt:66
9339
msgid ""
9340
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9341
"fixed."
9342
msgstr ""
9343
9344
#: en/help_topics/bugs.txt:69
9345
msgid ""
9346
"trac_<tracker>_url\n"
9347
"------------------"
9348
msgstr ""
9349
9350
#: en/help_topics/bugs.txt:72
9351
msgid ""
9352
"If present, the location of the Trac instance referred to by\n"
9353
"<tracker>. This option can then be used together with ``bzr commit\n"
9354
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9355
"example::"
9356
msgstr ""
9357
9358
#: en/help_topics/bugs.txt:77
9359
msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
9360
msgstr ""
9361
9362
#: en/help_topics/bugs.txt:79
9363
msgid ""
9364
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9365
"as\n"
9366
"fixed."
9367
msgstr ""
9368
9369
#: en/help_topics/bugs.txt:82
9370
msgid ""
9371
"bugtracker_<tracker>_url\n"
9372
"------------------------"
9373
msgstr ""
9374
9375
#: en/help_topics/bugs.txt:85
9376
msgid ""
9377
"If present, the location of a generic bug tracker instance referred to by\n"
9378
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9379
"which will be replaced by a specific bug ID. This option can then be used\n"
9380
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9381
"fixed by that commit. For example::"
9382
msgstr ""
9383
9384
#: en/help_topics/bugs.txt:91
9385
msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
9386
msgstr ""
9387
9388
#: en/help_topics/bugs.txt:93
9389
msgid ""
9390
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9391
"Roundup bug tracker as fixed, or::"
9392
msgstr ""
9393
9394
#: en/help_topics/bugs.txt:96
9395
msgid ""
9396
"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9397
msgstr ""
9398
9399
#: en/help_topics/bugs.txt:98
9400
msgid ""
9401
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9402
"RT bug tracker as fixed, or::"
9403
msgstr ""
9404
9405
#: en/help_topics/bugs.txt:101
9406
msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9407
msgstr ""
9408
9409
#: en/help_topics/bugs.txt:103
9410
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
9411
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9412
"HUDSON-1234\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9413
"in Hudson's JIRA bug tracker as fixed.\n"
9414
msgstr ""
9415
9416
#: en/help_topics/commands.txt:1
9417
msgid ""
9418
"add               Add specified files or directories.\n"
9419
"alias             Set/unset and display aliases.\n"
9420
"annotate          Show the origin of each line in a file.\n"
9421
"bash-completion   Generate a shell function for bash command line "
9422
"completion.\n"
9423
"                  [bash_completion]\n"
9424
"bind              Convert the current branch into a checkout of the "
9425
"supplied\n"
9426
"                  branch.\n"
9427
"branch            Create a new branch that is a copy of an existing branch.\n"
9428
"branches          List the branches available at the current location.\n"
9429
"break-lock        Break a dead lock.\n"
9430
"cat               Write the contents of a file as of a given revision to\n"
9431
"                  standard output.\n"
9432
"check             Validate working tree structure, branch consistency and\n"
9433
"                  repository history.\n"
9434
"checkout          Create a new checkout of an existing branch.\n"
9435
"clean-tree        Remove unwanted files from working tree.\n"
9436
"commit            Commit changes into a new revision.\n"
9437
"config            Display, set or remove a configuration option.\n"
9438
"conflicts         List files with conflicts.\n"
9439
"deleted           List files deleted in the working tree.\n"
9440
"diff              Show differences in the working tree, between revisions "
9441
"or\n"
9442
"                  branches.\n"
9443
"dpush             Push into a different VCS without any custom bzr "
9444
"metadata.\n"
9445
"export            Export current or past revision to a destination directory "
9446
"or\n"
9447
"                  archive.\n"
6622.1.22 by Jelmer Vernooij
Update po files.
9448
"grep              Print lines matching PATTERN for specified files and\n"
9449
"                  revisions. [grep]\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9450
"help              Show help on a command or other topic.\n"
9451
"ignore            Ignore specified files or patterns.\n"
9452
"ignored           List ignored files and the patterns that matched them.\n"
9453
"info              Show information about a working tree, branch or "
9454
"repository.\n"
9455
"init              Make a directory into a versioned branch.\n"
9456
"init-repository   Create a shared repository for branches to share storage\n"
9457
"                  space.\n"
9458
"join              Combine a tree into its containing tree.\n"
9459
"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
9460
"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
9461
"launchpad-open    Open a Launchpad branch page in your web browser. "
9462
"[launchpad]\n"
9463
"log               Show historical log for a branch or subset of a branch.\n"
9464
"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
9465
"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
9466
"ls                List files in a tree.\n"
9467
"merge             Perform a three-way merge.\n"
9468
"missing           Show unmerged/unpulled revisions between two branches.\n"
9469
"mkdir             Create a new versioned directory.\n"
9470
"mv                Move or rename a file.\n"
9471
"nick              Print or set the branch nickname.\n"
9472
"pack              Compress the data within a repository.\n"
6622.1.22 by Jelmer Vernooij
Update po files.
9473
"ping              Pings a Bazaar smart server.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9474
"plugins           List the installed plugins.\n"
9475
"pull              Turn this branch into a mirror of another branch.\n"
9476
"push              Update a mirror of this branch.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9477
"reconcile         Reconcile brz metadata in a branch.\n"
9478
"reconfigure       Reconfigure the type of a brz directory.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9479
"register-branch   Register a branch with launchpad.net. [launchpad]\n"
9480
"remerge           Redo a merge.\n"
9481
"remove            Remove files or directories.\n"
9482
"remove-branch     Remove a branch.\n"
9483
"remove-tree       Remove the working tree from a given branch/checkout.\n"
9484
"renames           Show list of renamed files.\n"
9485
"resolve           Mark a conflict as resolved.\n"
6622.1.22 by Jelmer Vernooij
Update po files.
9486
"revert            Set files in the working tree back to the contents of a\n"
9487
"                  previous revision.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9488
"revno             Show current revision number.\n"
9489
"root              Show the tree root directory.\n"
9490
"send              Mail or create a merge-directive for submitting changes.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9491
"serve             Run the brz server.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9492
"shelve            Temporarily set aside some changes from the current tree.\n"
9493
"sign-my-commits   Sign all commits by a given committer.\n"
9494
"split             Split a subdirectory of a tree into a separate tree.\n"
9495
"status            Display status summary.\n"
9496
"switch            Set the branch of a checkout and update.\n"
9497
"tag               Create, remove or modify a tag naming a revision.\n"
9498
"tags              List tags.\n"
9499
"testament         Show testament (signing-form) of a revision.\n"
9500
"unbind            Convert the current checkout into a regular branch.\n"
9501
"uncommit          Remove the last committed revision.\n"
9502
"unshelve          Restore shelved changes.\n"
9503
"update            Update a working tree to a new revision.\n"
9504
"upgrade           Upgrade a repository, branch or working tree to a newer\n"
9505
"                  format.\n"
9506
"verify-signatures Verify all commit signatures.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9507
"version           Show version of brz.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9508
"version-info      Show version information about this tree.\n"
9509
"view              Manage filtered views.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9510
"whoami            Show or set brz user id.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:1
9514
msgid ""
9515
"Configuration Settings\n"
9516
"======================="
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:4
9520
msgid ""
9521
"Environment settings\n"
9522
"---------------------"
9523
msgstr ""
9524
9525
#: en/help_topics/configuration.txt:7
9526
msgid ""
9527
"While most configuration is handled by configuration files, some options\n"
9528
"which may be semi-permanent can also be controlled through the environment."
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:10
9532
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9533
"BRZ_EMAIL\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9534
"~~~~~~~~~"
9535
msgstr ""
9536
9537
#: en/help_topics/configuration.txt:13
9538
msgid "Override the email id used by Bazaar.  Typical format::"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:15
9542
msgid "  \"John Doe <jdoe@example.com>\""
9543
msgstr ""
9544
9545
#: en/help_topics/configuration.txt:17
9546
msgid "See also the ``email`` configuration option."
9547
msgstr ""
9548
9549
#: en/help_topics/configuration.txt:19
9550
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9551
"BRZ_PROGRESS_BAR\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9552
"~~~~~~~~~~~~~~~~"
9553
msgstr ""
9554
9555
#: en/help_topics/configuration.txt:22
9556
msgid ""
9557
"Override the progress display.  Possible values are \"none\" or \"text\".  "
9558
"If\n"
9559
"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
9560
"draws\n"
9561
"the ordinary command line progress bar."
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:26
9565
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9566
"BRZ_SIGQUIT_PDB\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9567
"~~~~~~~~~~~~~~~"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:29
6622.1.22 by Jelmer Vernooij
Update po files.
9571
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9572
msgstr ""
9573
9574
#: en/help_topics/configuration.txt:31
9575
msgid ""
9576
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9577
"* 1 = Invoke breakin debugger (default)"
9578
msgstr ""
9579
9580
#: en/help_topics/configuration.txt:34
9581
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9582
"BRZ_HOME\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9583
"~~~~~~~~"
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:37
9587
msgid "Override the home directory used by Bazaar."
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:39
9591
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9592
"BRZ_SSH\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9593
"~~~~~~~"
9594
msgstr ""
9595
9596
#: en/help_topics/configuration.txt:42
9597
msgid "Select a different SSH implementation."
9598
msgstr ""
9599
9600
#: en/help_topics/configuration.txt:44
9601
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9602
"BRZ_PDB\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9603
"~~~~~~~"
9604
msgstr ""
9605
9606
#: en/help_topics/configuration.txt:47
9607
msgid "Control whether to launch a debugger on error."
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:49
9611
msgid ""
9612
"* 0 = Standard behavior\n"
9613
"* 1 = Launch debugger"
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:52
9617
msgid ""
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
9618
"BZR_REMOTE_PATH\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9619
"~~~~~~~~~~~~~~~"
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:55
9623
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9624
msgstr ""
9625
9626
#: en/help_topics/configuration.txt:57
9627
msgid "See also the ``bzr_remote_path`` configuration option."
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:59
9631
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9632
"BRZ_EDITOR\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9633
"~~~~~~~~~~"
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:62
9637
msgid "Path to the editor Bazaar should use for commit messages, etc."
9638
msgstr ""
9639
9640
#: en/help_topics/configuration.txt:64
9641
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9642
"BRZ_LOG\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9643
"~~~~~~~"
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:67
9647
msgid ""
9648
"Location of the Bazaar log file. You can check the current location by\n"
9649
"running ``bzr version``."
9650
msgstr ""
9651
9652
#: en/help_topics/configuration.txt:70
9653
msgid ""
9654
"The log file contains debug information that is useful for diagnosing or\n"
9655
"reporting problems with Bazaar."
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:73
9659
msgid ""
9660
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9661
"will disable logging."
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:76
9665
msgid ""
9666
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9667
"BRZ_PLUGIN_PATH\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9668
"~~~~~~~~~~~~~~~"
9669
msgstr ""
9670
9671
#: en/help_topics/configuration.txt:80
9672
msgid ""
9673
"The path to the plugins directory that Bazaar should use.\n"
9674
"If not set, Bazaar will search for plugins in:"
9675
msgstr ""
9676
9677
#: en/help_topics/configuration.txt:83
6622.1.22 by Jelmer Vernooij
Update po files.
9678
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9679
msgstr ""
9680
9681
#: en/help_topics/configuration.txt:85
9682
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:87
9686
msgid ""
9687
"* the site specific plugin directory if applicable (containing\n"
9688
"  the ``site`` plugins)."
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:90
9692
msgid ""
9693
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9694
"the way the plugin are searched. "
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:93
9698
msgid ""
9699
"As for the ``PATH`` variables, if multiple directories are\n"
9700
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9701
"platform specific appropriate character (':' on Unix,\n"
9702
"';' on windows)"
9703
msgstr ""
9704
9705
#: en/help_topics/configuration.txt:98
9706
msgid ""
9707
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9708
"in ``user``.  However it will continue to search in ``core`` and\n"
9709
"``site`` unless they are explicitly removed."
9710
msgstr ""
9711
9712
#: en/help_topics/configuration.txt:102
9713
msgid ""
9714
"If you need to change the order or remove one of these\n"
9715
"directories, you should use special values:"
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:105
9719
msgid ""
9720
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9721
"  path from the default values,"
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:108
9725
msgid ""
9726
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9727
"  before the remaining default values (and also remove it from\n"
9728
"  the default values)."
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:112
9732
msgid ""
9733
"Note that the special values 'user', 'core' and 'site' should be\n"
9734
"used literally, they will be substituted by the corresponding,\n"
9735
"platform specific, values."
9736
msgstr ""
9737
9738
#: en/help_topics/configuration.txt:116
9739
msgid ""
9740
"The examples below use ':' as the separator, windows users\n"
9741
"should use ';'."
9742
msgstr ""
9743
9744
#: en/help_topics/configuration.txt:119
9745
msgid "Overriding the default user plugin directory::"
9746
msgstr ""
9747
9748
#: en/help_topics/configuration.txt:121
9749
msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9750
msgstr ""
9751
9752
#: en/help_topics/configuration.txt:123
9753
msgid "Disabling the site directory while retaining the user directory::"
9754
msgstr ""
9755
9756
#: en/help_topics/configuration.txt:125
9757
msgid "  BZR_PLUGIN_PATH='-site:+user'"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:127
9761
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:129
9765
msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:131
9769
msgid "Overriding the default site plugin directory::"
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:133
9773
msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:135
9777
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9778
"BRZ_DISABLE_PLUGINS\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9779
"~~~~~~~~~~~~~~~~~~~"
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:138
9783
msgid ""
9784
"Under special circumstances (mostly when trying to diagnose a\n"
9785
"bug), it's better to disable a plugin (or several) rather than\n"
9786
"uninstalling them completely. Such plugins can be specified in\n"
9787
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:143
9791
msgid ""
9792
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9793
"will raise an import error if they are explicitly imported (by\n"
9794
"another plugin that depends on them for example)."
9795
msgstr ""
9796
9797
#: en/help_topics/configuration.txt:147
9798
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9799
msgstr ""
9800
9801
#: en/help_topics/configuration.txt:149
9802
msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:151
9806
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9807
"BRZ_PLUGINS_AT\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9808
"~~~~~~~~~~~~~~"
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:154
9812
msgid ""
9813
"When adding a new feature or working on a bug in a plugin,\n"
9814
"developers often need to use a specific version of a given\n"
9815
"plugin. Since python requires that the directory containing the\n"
9816
"code is named like the plugin itself this make it impossible to\n"
9817
"use arbitrary directory names (using a two-level directory scheme\n"
9818
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9819
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:162
9823
msgid ""
9824
"Plugins specified in this environment variable takes precedence\n"
9825
"over the ones in ``BZR_PLUGIN_PATH``."
9826
msgstr ""
9827
9828
#: en/help_topics/configuration.txt:165
9829
msgid ""
9830
"The variable specified a list of ``plugin_name@plugin path``,\n"
9831
"``plugin_name`` being the name of the plugin as it appears in\n"
9832
"python module paths, ``plugin_path`` being the path to the\n"
9833
"directory containing the plugin code itself\n"
9834
"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
9835
"separator, use ';' on windows."
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:172
9839
msgid ""
9840
"Example:\n"
9841
"~~~~~~~~"
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:175
9845
msgid ""
9846
"Using a specific version of ``myplugin``:\n"
9847
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:178
9851
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
9852
"BRZPATH\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
9853
"~~~~~~~"
9854
msgstr ""
9855
9856
#: en/help_topics/configuration.txt:181
9857
msgid "The path where Bazaar should look for shell plugin external commands."
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:183
9861
msgid ""
9862
"\n"
9863
"http_proxy, https_proxy\n"
9864
"~~~~~~~~~~~~~~~~~~~~~~~"
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:187
9868
msgid "Specifies the network proxy for outgoing connections, for example::"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:189
9872
msgid ""
9873
"  http_proxy=http://proxy.example.com:3128/ \n"
9874
"  https_proxy=http://proxy.example.com:3128/"
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:192
9878
msgid ""
9879
"\n"
9880
"Configuration files\n"
9881
"-------------------"
9882
msgstr ""
9883
9884
#: en/help_topics/configuration.txt:196
9885
msgid ""
9886
"Location\n"
9887
"~~~~~~~~"
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:199
9891
msgid ""
9892
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9893
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9894
"on\n"
9895
"Windows. (You can check the location for your system by using\n"
9896
"``bzr version``.)"
9897
msgstr ""
9898
9899
#: en/help_topics/configuration.txt:204
9900
msgid "There are three primary configuration files in this location:"
9901
msgstr ""
9902
9903
#: en/help_topics/configuration.txt:206
9904
msgid "* ``bazaar.conf`` describes default configuration options,"
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:208
9908
msgid ""
9909
"* ``locations.conf`` describes configuration information for\n"
9910
"  specific branch locations,"
9911
msgstr ""
9912
9913
#: en/help_topics/configuration.txt:211
9914
msgid ""
9915
"* ``authentication.conf`` describes credential information for\n"
9916
"  remote servers."
9917
msgstr ""
9918
9919
#: en/help_topics/configuration.txt:214
9920
msgid ""
9921
"Each branch can also contain a configuration file that sets values specific\n"
9922
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9923
"the\n"
9924
"branch. This file is visible to all users of a branch, if you wish to "
9925
"override\n"
9926
"one of the values for a branch with a setting that is specific to you then "
9927
"you\n"
9928
"can do so in ``locations.conf``."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:220
9932
msgid ""
9933
"General format\n"
9934
"~~~~~~~~~~~~~~"
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:223
9938
msgid ""
9939
"An ini file has three types of contructs: section headers, section\n"
9940
"options and comments."
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:226
9944
msgid ""
9945
"Comments\n"
9946
"^^^^^^^^"
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:229
9950
msgid ""
9951
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9952
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9953
"Bazaar when parsing ini files."
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:233
9957
msgid ""
9958
"Section headers\n"
9959
"^^^^^^^^^^^^^^^"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:236
9963
msgid ""
9964
"A section header is a word enclosed in brackets that starts at the begining\n"
9965
"of a line.  A typical section header looks like this::"
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:239
9969
msgid "    [DEFAULT]"
9970
msgstr ""
9971
9972
#: en/help_topics/configuration.txt:241
9973
msgid ""
9974
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9975
"[ALIASES].  Section headers are case sensitive. The default section provides "
9976
"for\n"
9977
"setting options which can be overridden with the branch config file."
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:245
9981
msgid ""
9982
"For ``locations.conf``, the options from the section with the\n"
9983
"longest matching section header are used to the exclusion of other\n"
9984
"potentially valid section headers. A section header uses the path for\n"
9985
"the branch as the section header. Some examples include::"
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:250
9989
msgid ""
9990
"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
9991
"    [/home/jdoe/branches/]"
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:253
9995
msgid ""
9996
"\n"
9997
"Section options\n"
9998
"^^^^^^^^^^^^^^^"
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:257
10002
msgid ""
10003
"A section option resides within a section. A section option contains an\n"
10004
"option name, an equals sign and a value.  For example::"
10005
msgstr ""
10006
10007
#: en/help_topics/configuration.txt:260
10008
msgid ""
10009
"    email            = John Doe <jdoe@isp.com>\n"
10010
"    gpg_signing_key  = Amy Pond <amy@example.com>"
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:263
10014
msgid ""
10015
"A option can reference other options by enclosing them in curly brackets::"
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:265
10019
msgid ""
10020
"    my_branch_name = feature_x\n"
10021
"    my_server      = bzr+ssh://example.com\n"
10022
"    push_location   = {my_server}/project/{my_branch_name}"
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:269
10026
msgid ""
10027
"Option policies\n"
10028
"^^^^^^^^^^^^^^^"
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:272
10032
msgid ""
10033
"Options defined in a section affect the named directory or URL plus\n"
10034
"any locations they contain.  Policies can be used to change how an\n"
10035
"option value is interpreted for contained locations.  Currently\n"
10036
"there are three policies available:"
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:277
10040
msgid ""
10041
" none:\n"
10042
"   the value is interpreted the same for contained locations.  This is\n"
10043
"   the default behaviour.\n"
10044
" norecurse:\n"
10045
"   the value is only used for the exact location specified by the\n"
10046
"   section name.\n"
10047
" appendpath:\n"
10048
"   for contained locations, any additional path components are\n"
10049
"   appended to the value."
10050
msgstr ""
10051
10052
#: en/help_topics/configuration.txt:287
10053
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
10054
"Policies are specified by keys with names of the form \"<option_name>:policy"
10055
"\".\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10056
"For example, to define the push location for a tree of branches, the\n"
10057
"following could be used::"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:291
10061
msgid ""
10062
"  [/top/location]\n"
10063
"  push_location = sftp://example.com/location\n"
10064
"  push_location:policy = appendpath"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:295
10068
msgid ""
10069
"With this configuration, the push location for ``/top/location/branch1``\n"
10070
"would be ``sftp://example.com/location/branch1``."
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:298
10074
msgid ""
10075
"Section local options\n"
10076
"^^^^^^^^^^^^^^^^^^^^^"
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:301
10080
msgid ""
10081
"Some options are defined automatically inside a given section and can be\n"
10082
"refered to in this section only. "
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:304
10086
msgid "For example, the ``appendpath`` policy can be used like this::"
10087
msgstr ""
10088
10089
#: en/help_topics/configuration.txt:306
10090
msgid ""
10091
"  [/home/vila/src/bzr/bugs]\n"
10092
"  mypush = lp:~vila/bzr\n"
10093
"  mypush:policy=appendpath"
10094
msgstr ""
10095
10096
#: en/help_topics/configuration.txt:310
10097
msgid "Using ``relpath`` to achieve the same result is done like this::"
10098
msgstr ""
10099
10100
#: en/help_topics/configuration.txt:312
10101
msgid ""
10102
"  [/home/vila/src/bzr/bugs]\n"
10103
"  mypush = lp:~vila/bzr/{relpath}"
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:315
10107
msgid ""
10108
"In both cases, when used in a directory like\n"
10109
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10113
msgid ""
10114
"   $ bzr config mypush\n"
10115
"   lp:~vila/bzr/832013-expand-in-stack"
10116
msgstr ""
10117
10118
#: en/help_topics/configuration.txt:321
10119
msgid "Another such option is ``basename`` which can be used like this::"
10120
msgstr ""
10121
10122
#: en/help_topics/configuration.txt:323
10123
msgid ""
10124
"  [/home/vila/src/bzr]\n"
10125
"  mypush = lp:~vila/bzr/{basename}"
10126
msgstr ""
10127
10128
#: en/help_topics/configuration.txt:326
10129
msgid ""
10130
"When used in a directory like\n"
10131
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:332
10135
msgid ""
10136
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10137
"itself is defined as the relative path between the section name and the\n"
10138
"location it matches."
10139
msgstr ""
10140
10141
#: en/help_topics/configuration.txt:336
10142
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
10143
"Another such option is ``branchname``, which refers to the name of a "
10144
"colocated\n"
10145
"branch.  For non-colocated branches, it behaves like basename.  It can be "
10146
"used\n"
10147
"like this::"
10148
msgstr ""
10149
10150
#: en/help_topics/configuration.txt:340
10151
msgid ""
10152
"  [/home/vila/src/bzr/bugs]\n"
10153
"  mypush = lp:~vila/bzr/{branchname}"
10154
msgstr ""
10155
10156
#: en/help_topics/configuration.txt:343
10157
msgid ""
10158
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10159
"get::"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:345
10163
msgid ""
10164
"  bzr config mypush\n"
10165
"  lp:~vila/bzr/832013-expand-in-stack"
10166
msgstr ""
10167
10168
#: en/help_topics/configuration.txt:348
10169
msgid ""
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10170
"When an option is local to a Section, it cannot be referred to from option\n"
10171
"values in any other section from the same ``Store`` nor from any other\n"
10172
"``Store``."
10173
msgstr ""
10174
6622.1.22 by Jelmer Vernooij
Update po files.
10175
#: en/help_topics/configuration.txt:352
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10176
msgid ""
10177
"\n"
10178
"The main configuration file, bazaar.conf\n"
10179
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10180
msgstr ""
10181
6622.1.22 by Jelmer Vernooij
Update po files.
10182
#: en/help_topics/configuration.txt:356
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10183
msgid ""
10184
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10185
"The default section contains the default\n"
10186
"configuration options for all branches. The default section can be\n"
10187
"overriden by providing a branch-specific section in ``locations.conf``."
10188
msgstr ""
10189
6622.1.22 by Jelmer Vernooij
Update po files.
10190
#: en/help_topics/configuration.txt:361
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10191
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10192
msgstr ""
10193
6622.1.22 by Jelmer Vernooij
Update po files.
10194
#: en/help_topics/configuration.txt:363
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10195
msgid ""
10196
"    [DEFAULT]\n"
10197
"    email             = John Doe <jdoe@isp.com>\n"
10198
"    editor            = /usr/bin/vim\n"
10199
"    create_signatures = when-required"
10200
msgstr ""
10201
6622.1.22 by Jelmer Vernooij
Update po files.
10202
#: en/help_topics/configuration.txt:368
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10203
msgid ""
10204
"\n"
10205
"The branch location configuration file, locations.conf\n"
10206
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10207
msgstr ""
10208
6622.1.22 by Jelmer Vernooij
Update po files.
10209
#: en/help_topics/configuration.txt:372
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10210
msgid ""
10211
"``locations.conf`` allows one to specify overriding settings for\n"
10212
"a specific branch. The format is almost identical to the default section in\n"
10213
"bazaar.conf with one significant change: The section header, instead of "
10214
"saying\n"
10215
"default, will be the path to a branch that you wish to override a value\n"
10216
"for. The '?' and '*' wildcards are supported::"
10217
msgstr ""
10218
6622.1.22 by Jelmer Vernooij
Update po files.
10219
#: en/help_topics/configuration.txt:378
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10220
msgid ""
10221
"    [/home/jdoe/branches/nethack]\n"
10222
"    email = Nethack Admin <nethack@nethack.com>"
10223
msgstr ""
10224
6622.1.22 by Jelmer Vernooij
Update po files.
10225
#: en/help_topics/configuration.txt:381
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10226
msgid ""
10227
"    [http://hypothetical.site.com/branches/devel-branch]\n"
10228
"    create_signatures = always"
10229
msgstr ""
10230
6622.1.22 by Jelmer Vernooij
Update po files.
10231
#: en/help_topics/configuration.txt:384
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10232
msgid ""
10233
"The authentication configuration file, authentication.conf\n"
10234
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10235
msgstr ""
10236
6622.1.22 by Jelmer Vernooij
Update po files.
10237
#: en/help_topics/configuration.txt:387
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10238
msgid ""
10239
"``authentication.conf`` allows one to specify credentials for\n"
10240
"remote servers. This can be used for all the supported transports and any "
10241
"part\n"
10242
"of bzr that requires authentication (smtp for example)."
10243
msgstr ""
10244
6622.1.22 by Jelmer Vernooij
Update po files.
10245
#: en/help_topics/configuration.txt:391
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10246
msgid ""
10247
"The syntax of the file obeys the same rules as the others except for the\n"
10248
"option policies which don't apply."
10249
msgstr ""
10250
6622.1.22 by Jelmer Vernooij
Update po files.
10251
#: en/help_topics/configuration.txt:394
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10252
msgid ""
10253
"For more information on the possible uses of the authentication "
10254
"configuration\n"
10255
"file see :doc:`authentication-help`."
10256
msgstr ""
10257
6622.1.22 by Jelmer Vernooij
Update po files.
10258
#: en/help_topics/configuration.txt:397
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10259
msgid ""
10260
"\n"
10261
"Common options\n"
10262
"--------------"
10263
msgstr ""
10264
6622.1.22 by Jelmer Vernooij
Update po files.
10265
#: en/help_topics/configuration.txt:401
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10266
msgid ""
10267
"debug_flags\n"
10268
"~~~~~~~~~~~"
10269
msgstr ""
10270
6622.1.22 by Jelmer Vernooij
Update po files.
10271
#: en/help_topics/configuration.txt:404
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10272
msgid ""
10273
"A comma-separated list of debugging options to turn on.  The same values\n"
10274
"can be used as with the -D command-line option (see `help global-options`).\n"
10275
"For example::"
10276
msgstr ""
10277
6622.1.22 by Jelmer Vernooij
Update po files.
10278
#: en/help_topics/configuration.txt:408
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10279
msgid "    debug_flags = hpss"
10280
msgstr ""
10281
6622.1.22 by Jelmer Vernooij
Update po files.
10282
#: en/help_topics/configuration.txt:412
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10283
msgid "    debug_flags = hpss,evil"
10284
msgstr ""
10285
6622.1.22 by Jelmer Vernooij
Update po files.
10286
#: en/help_topics/configuration.txt:414
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10287
msgid ""
10288
"email\n"
10289
"~~~~~"
10290
msgstr ""
10291
6622.1.22 by Jelmer Vernooij
Update po files.
10292
#: en/help_topics/configuration.txt:417
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10293
msgid ""
10294
"The email address to use when committing a branch. Typically takes the form\n"
10295
"of::"
10296
msgstr ""
10297
6622.1.22 by Jelmer Vernooij
Update po files.
10298
#: en/help_topics/configuration.txt:420
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10299
msgid "    email = Full Name <account@hostname.tld>"
10300
msgstr ""
10301
6622.1.22 by Jelmer Vernooij
Update po files.
10302
#: en/help_topics/configuration.txt:422
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10303
msgid ""
10304
"editor\n"
10305
"~~~~~~"
10306
msgstr ""
10307
6622.1.22 by Jelmer Vernooij
Update po files.
10308
#: en/help_topics/configuration.txt:425
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10309
msgid ""
10310
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10311
"a commit message. This setting is trumped by the environment variable\n"
10312
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10313
"variables."
10314
msgstr ""
10315
6622.1.22 by Jelmer Vernooij
Update po files.
10316
#: en/help_topics/configuration.txt:430
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10317
msgid ""
10318
"log_format\n"
10319
"~~~~~~~~~~"
10320
msgstr ""
10321
6622.1.22 by Jelmer Vernooij
Update po files.
10322
#: en/help_topics/configuration.txt:433
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10323
msgid ""
10324
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10325
"and ``line``. Additional formats may be provided by plugins. The default\n"
10326
"value is ``long``."
10327
msgstr ""
10328
6622.1.22 by Jelmer Vernooij
Update po files.
10329
#: en/help_topics/configuration.txt:437
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10330
msgid ""
10331
"check_signatures\n"
10332
"~~~~~~~~~~~~~~~~"
10333
msgstr ""
10334
6622.1.22 by Jelmer Vernooij
Update po files.
10335
#: en/help_topics/configuration.txt:440
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10336
msgid ""
10337
"Reserved for future use.  These options will allow a policy for branches to\n"
10338
"require signatures."
10339
msgstr ""
10340
6622.1.22 by Jelmer Vernooij
Update po files.
10341
#: en/help_topics/configuration.txt:443
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10342
msgid ""
10343
"require\n"
10344
"    The gnupg signature for revisions must be present and must be valid."
10345
msgstr ""
10346
6622.1.22 by Jelmer Vernooij
Update po files.
10347
#: en/help_topics/configuration.txt:446
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10348
msgid ""
10349
"ignore\n"
10350
"    Do not check gnupg signatures of revisions."
10351
msgstr ""
10352
6622.1.22 by Jelmer Vernooij
Update po files.
10353
#: en/help_topics/configuration.txt:449
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10354
msgid ""
10355
"check-available\n"
10356
"    (default) If gnupg signatures for revisions are present, check them.\n"
10357
"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
10358
"    no signature is present."
10359
msgstr ""
10360
6622.1.22 by Jelmer Vernooij
Update po files.
10361
#: en/help_topics/configuration.txt:454
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10362
msgid ""
10363
"create_signatures\n"
10364
"~~~~~~~~~~~~~~~~~"
10365
msgstr ""
10366
6622.1.22 by Jelmer Vernooij
Update po files.
10367
#: en/help_topics/configuration.txt:457
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10368
msgid ""
10369
"Defines the behaviour of signing revisions on commits.  By default bzr will "
10370
"not\n"
10371
"sign new commits."
10372
msgstr ""
10373
6622.1.22 by Jelmer Vernooij
Update po files.
10374
#: en/help_topics/configuration.txt:460
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10375
msgid ""
10376
"always\n"
10377
"    Sign every new revision that is committed.  If the signing fails then "
10378
"the\n"
10379
"    commit will not be made."
10380
msgstr ""
10381
6622.1.22 by Jelmer Vernooij
Update po files.
10382
#: en/help_topics/configuration.txt:464
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10383
msgid ""
10384
"when-required\n"
10385
"    Reserved for future use."
10386
msgstr ""
10387
6622.1.22 by Jelmer Vernooij
Update po files.
10388
#: en/help_topics/configuration.txt:467
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10389
msgid ""
10390
"never\n"
10391
"    Reserved for future use."
10392
msgstr ""
10393
6622.1.22 by Jelmer Vernooij
Update po files.
10394
#: en/help_topics/configuration.txt:470
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10395
msgid ""
10396
"In future it is planned that ``when-required`` will sign newly\n"
10397
"committed revisions only when the branch requires them.  ``never`` will "
10398
"refuse\n"
10399
"to sign newly committed revisions, even if the branch requires signatures."
10400
msgstr ""
10401
6622.1.22 by Jelmer Vernooij
Update po files.
10402
#: en/help_topics/configuration.txt:474
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10403
msgid ""
10404
"dirstate.fdatasync\n"
10405
"~~~~~~~~~~~~~~~~~~"
10406
msgstr ""
10407
6622.1.22 by Jelmer Vernooij
Update po files.
10408
#: en/help_topics/configuration.txt:477
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10409
msgid ""
10410
"If true (default), working tree metadata changes are flushed through the\n"
10411
"OS buffers to physical disk.  This is somewhat slower, but means data\n"
10412
"should not be lost if the machine crashes.  See also repository.fdatasync."
10413
msgstr ""
10414
6622.1.22 by Jelmer Vernooij
Update po files.
10415
#: en/help_topics/configuration.txt:481
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10416
msgid ""
10417
"gpg_signing_key\n"
10418
"~~~~~~~~~~~~~~~"
10419
msgstr ""
10420
6622.1.22 by Jelmer Vernooij
Update po files.
10421
#: en/help_topics/configuration.txt:484
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10422
msgid ""
10423
"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
10424
"address, key fingerprint or full key ID.  When unset or when set to\n"
10425
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10426
msgstr ""
10427
6622.1.22 by Jelmer Vernooij
Update po files.
10428
#: en/help_topics/configuration.txt:488
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10429
msgid ""
10430
"recurse\n"
10431
"~~~~~~~"
10432
msgstr ""
10433
6622.1.22 by Jelmer Vernooij
Update po files.
10434
#: en/help_topics/configuration.txt:491
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10435
msgid ""
10436
"Only useful in ``locations.conf``. Defines whether or not the\n"
10437
"configuration for this section applies to subdirectories:"
10438
msgstr ""
10439
6622.1.22 by Jelmer Vernooij
Update po files.
10440
#: en/help_topics/configuration.txt:494
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10441
msgid ""
10442
"true\n"
10443
"    (default) This section applies to subdirectories as well."
10444
msgstr ""
10445
6622.1.22 by Jelmer Vernooij
Update po files.
10446
#: en/help_topics/configuration.txt:497
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10447
msgid ""
10448
"false\n"
10449
"    This section only applies to the branch at this directory and not\n"
10450
"    branches below it."
10451
msgstr ""
10452
6622.1.22 by Jelmer Vernooij
Update po files.
10453
#: en/help_topics/configuration.txt:501
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10454
msgid ""
10455
"gpg_signing_command\n"
10456
"~~~~~~~~~~~~~~~~~~~"
10457
msgstr ""
10458
6622.1.22 by Jelmer Vernooij
Update po files.
10459
#: en/help_topics/configuration.txt:504
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10460
msgid ""
10461
"(Default: \"gpg\"). Which program should be used to sign and check "
10462
"revisions.\n"
10463
"For example::"
10464
msgstr ""
10465
6622.1.22 by Jelmer Vernooij
Update po files.
10466
#: en/help_topics/configuration.txt:507
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10467
msgid "    gpg_signing_command = /usr/bin/gnpg"
10468
msgstr ""
10469
6622.1.22 by Jelmer Vernooij
Update po files.
10470
#: en/help_topics/configuration.txt:509
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10471
msgid ""
10472
"The specified command must accept the options \"--clearsign\" and \"-u "
10473
"<email>\"."
10474
msgstr ""
10475
6622.1.22 by Jelmer Vernooij
Update po files.
10476
#: en/help_topics/configuration.txt:511
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10477
msgid ""
10478
"bzr_remote_path\n"
10479
"~~~~~~~~~~~~~~~"
10480
msgstr ""
10481
6622.1.22 by Jelmer Vernooij
Update po files.
10482
#: en/help_topics/configuration.txt:514
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10483
msgid ""
10484
"(Default: \"bzr\").  The path to the command that should be used to run the "
10485
"smart\n"
10486
"server for bzr.  This value may only be specified in locations.conf, because:"
10487
msgstr ""
10488
6622.1.22 by Jelmer Vernooij
Update po files.
10489
#: en/help_topics/configuration.txt:517
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10490
msgid ""
10491
"- it's needed before branch.conf is accessible\n"
10492
"- allowing remote branch.conf files to specify commands would be a security\n"
10493
"  risk"
10494
msgstr ""
10495
6622.1.22 by Jelmer Vernooij
Update po files.
10496
#: en/help_topics/configuration.txt:521
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10497
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10498
msgstr ""
10499
6622.1.22 by Jelmer Vernooij
Update po files.
10500
#: en/help_topics/configuration.txt:523
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10501
msgid ""
10502
"smtp_server\n"
10503
"~~~~~~~~~~~"
10504
msgstr ""
10505
6622.1.22 by Jelmer Vernooij
Update po files.
10506
#: en/help_topics/configuration.txt:526
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10507
msgid ""
10508
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10509
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10510
msgstr ""
10511
6622.1.22 by Jelmer Vernooij
Update po files.
10512
#: en/help_topics/configuration.txt:529
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10513
msgid ""
10514
"smtp_username, smtp_password\n"
10515
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10516
msgstr ""
10517
6622.1.22 by Jelmer Vernooij
Update po files.
10518
#: en/help_topics/configuration.txt:532
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10519
msgid ""
10520
"User and password to authenticate to the SMTP server. If smtp_username\n"
10521
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10522
"These settings are only needed if the SMTP server requires authentication\n"
10523
"to send mail."
10524
msgstr ""
10525
6622.1.22 by Jelmer Vernooij
Update po files.
10526
#: en/help_topics/configuration.txt:537
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10527
msgid ""
10528
"locks.steal_dead\n"
10529
"~~~~~~~~~~~~~~~~"
10530
msgstr ""
10531
6622.1.22 by Jelmer Vernooij
Update po files.
10532
#: en/help_topics/configuration.txt:540
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10533
msgid ""
10534
"If set to true, bzr will automatically break locks held by processes from\n"
10535
"the same machine and user that are no longer alive.  Otherwise, it will\n"
10536
"print a message and you can break the lock manually, if you are satisfied\n"
10537
"the object is no longer in use."
10538
msgstr ""
10539
6622.1.22 by Jelmer Vernooij
Update po files.
10540
#: en/help_topics/configuration.txt:545
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10541
msgid ""
10542
"mail_client\n"
10543
"~~~~~~~~~~~"
10544
msgstr ""
10545
6622.1.22 by Jelmer Vernooij
Update po files.
10546
#: en/help_topics/configuration.txt:548
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10547
msgid ""
10548
"A mail client to use for sending merge requests.\n"
10549
"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
10550
"it\n"
10551
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10552
"``editor``."
10553
msgstr ""
10554
6622.1.22 by Jelmer Vernooij
Update po files.
10555
#: en/help_topics/configuration.txt:553
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10556
msgid "Supported values for specific clients:"
10557
msgstr ""
10558
6622.1.22 by Jelmer Vernooij
Update po files.
10559
#: en/help_topics/configuration.txt:555
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10560
msgid ""
10561
":claws: Use Claws.  This skips a dialog for attaching files.\n"
10562
":evolution: Use Evolution.\n"
10563
":kmail: Use KMail.\n"
10564
":mutt: Use Mutt.\n"
10565
":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
10566
"1.5,\n"
10567
"    this works around some bugs that xdg-email doesn't handle."
10568
msgstr ""
10569
6622.1.22 by Jelmer Vernooij
Update po files.
10570
#: en/help_topics/configuration.txt:562
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10571
msgid "Supported generic values are:"
10572
msgstr ""
10573
6622.1.22 by Jelmer Vernooij
Update po files.
10574
#: en/help_topics/configuration.txt:564
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10575
msgid ""
10576
":default: See above.\n"
10577
":editor: Use your editor to compose the merge request.  This also uses\n"
10578
"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10579
"    smtp_username and smtp_password.\n"
10580
":mapi: Use your preferred e-mail client on Windows.\n"
10581
":xdg-email: Use xdg-email to run your preferred mail program"
10582
msgstr ""
10583
6622.1.22 by Jelmer Vernooij
Update po files.
10584
#: en/help_topics/configuration.txt:571
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10585
msgid ""
10586
"repository.fdatasync\n"
10587
"~~~~~~~~~~~~~~~~~~~~"
10588
msgstr ""
10589
6622.1.22 by Jelmer Vernooij
Update po files.
10590
#: en/help_topics/configuration.txt:574
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10591
msgid ""
10592
"If true (default), repository changes are flushed through the OS buffers\n"
10593
"to physical disk.  This is somewhat slower, but means data should not be\n"
10594
"lost if the machine crashes.  See also dirstate.fdatasync."
10595
msgstr ""
10596
6622.1.22 by Jelmer Vernooij
Update po files.
10597
#: en/help_topics/configuration.txt:578
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10598
msgid ""
10599
"submit_branch\n"
10600
"~~~~~~~~~~~~~"
10601
msgstr ""
10602
6622.1.22 by Jelmer Vernooij
Update po files.
10603
#: en/help_topics/configuration.txt:581
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10604
msgid ""
10605
"The branch you intend to submit your current work to.  This is "
10606
"automatically\n"
10607
"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
10608
"This\n"
10609
"should usually be set on a per-branch or per-location basis."
10610
msgstr ""
10611
6622.1.22 by Jelmer Vernooij
Update po files.
10612
#: en/help_topics/configuration.txt:585
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10613
msgid ""
10614
"public_branch\n"
10615
"~~~~~~~~~~~~~"
10616
msgstr ""
10617
6622.1.22 by Jelmer Vernooij
Update po files.
10618
#: en/help_topics/configuration.txt:588
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10619
msgid ""
10620
"A publically-accessible version of this branch (implying that this version "
10621
"is\n"
10622
"not publically-accessible).  Used (and set) by ``bzr send``."
10623
msgstr ""
10624
6622.1.22 by Jelmer Vernooij
Update po files.
10625
#: en/help_topics/configuration.txt:591
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10626
msgid ""
10627
"suppress_warnings\n"
10628
"~~~~~~~~~~~~~~~~~"
10629
msgstr ""
10630
6622.1.22 by Jelmer Vernooij
Update po files.
10631
#: en/help_topics/configuration.txt:594
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10632
msgid ""
10633
"A list of strings, each string represent a warning that can be emitted by\n"
10634
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10635
msgstr ""
10636
6622.1.22 by Jelmer Vernooij
Update po files.
10637
#: en/help_topics/configuration.txt:597
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10638
msgid "Valid values:"
10639
msgstr ""
10640
6622.1.22 by Jelmer Vernooij
Update po files.
10641
#: en/help_topics/configuration.txt:599
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10642
msgid ""
10643
"* ``format_deprecation``:\n"
10644
"    whether the format deprecation warning is shown on repositories that "
10645
"are\n"
10646
"    using deprecated formats."
10647
msgstr ""
10648
6622.1.22 by Jelmer Vernooij
Update po files.
10649
#: en/help_topics/configuration.txt:603
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10650
msgid ""
10651
"default_format\n"
10652
"~~~~~~~~~~~~~~"
10653
msgstr ""
10654
6622.1.22 by Jelmer Vernooij
Update po files.
10655
#: en/help_topics/configuration.txt:606
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10656
msgid ""
10657
"A format name for the default format used when creating branches.  See "
10658
"``bzr\n"
10659
"help formats`` for possible values."
10660
msgstr ""
10661
6622.1.22 by Jelmer Vernooij
Update po files.
10662
#: en/help_topics/configuration.txt:609
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10663
msgid ""
10664
"\n"
10665
"Unicode options\n"
10666
"---------------"
10667
msgstr ""
10668
6622.1.22 by Jelmer Vernooij
Update po files.
10669
#: en/help_topics/configuration.txt:613
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10670
msgid ""
10671
"output_encoding\n"
10672
"~~~~~~~~~~~~~~~"
10673
msgstr ""
10674
6622.1.22 by Jelmer Vernooij
Update po files.
10675
#: en/help_topics/configuration.txt:616
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10676
msgid ""
10677
"A Python unicode encoding name for text output from bzr, such as log\n"
10678
"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
10679
"is the terminal encoding prefered by the operating system."
10680
msgstr ""
10681
6622.1.22 by Jelmer Vernooij
Update po files.
10682
#: en/help_topics/configuration.txt:620
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10683
msgid ""
10684
"\n"
10685
"Branch type specific options\n"
10686
"----------------------------"
10687
msgstr ""
10688
6622.1.22 by Jelmer Vernooij
Update po files.
10689
#: en/help_topics/configuration.txt:624
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10690
msgid ""
10691
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10692
"later format.  They\n"
10693
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10694
"manually set in ``locations.conf`` or ``bazaar.conf``."
10695
msgstr ""
10696
6622.1.22 by Jelmer Vernooij
Update po files.
10697
#: en/help_topics/configuration.txt:629
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10698
msgid ""
10699
"append_revisions_only\n"
10700
"~~~~~~~~~~~~~~~~~~~~~"
10701
msgstr ""
10702
6622.1.22 by Jelmer Vernooij
Update po files.
10703
#: en/help_topics/configuration.txt:632
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10704
msgid ""
10705
"If set to \"True\" then revisions can only be appended to the log, not\n"
10706
"removed.  A branch with this setting enabled can only pull from another\n"
10707
"branch if the other branch's log is a longer version of its own.  This is\n"
10708
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10709
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10710
"compatibility with previous bzr versions (older than 2.2)."
10711
msgstr ""
10712
6622.1.22 by Jelmer Vernooij
Update po files.
10713
#: en/help_topics/configuration.txt:639
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10714
msgid ""
10715
"parent_location\n"
10716
"~~~~~~~~~~~~~~~"
10717
msgstr ""
10718
6622.1.22 by Jelmer Vernooij
Update po files.
10719
#: en/help_topics/configuration.txt:642
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10720
msgid ""
10721
"If present, the location of the default branch for pull or merge.  This "
10722
"option\n"
10723
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10724
"--remember``."
10725
msgstr ""
10726
6622.1.22 by Jelmer Vernooij
Update po files.
10727
#: en/help_topics/configuration.txt:646
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10728
msgid ""
10729
"push_location\n"
10730
"~~~~~~~~~~~~~"
10731
msgstr ""
10732
6622.1.22 by Jelmer Vernooij
Update po files.
10733
#: en/help_topics/configuration.txt:649
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10734
msgid ""
10735
"If present, the location of the default branch for push.  This option\n"
10736
"is normally set by the first ``push`` or ``push --remember``."
10737
msgstr ""
10738
6622.1.22 by Jelmer Vernooij
Update po files.
10739
#: en/help_topics/configuration.txt:652
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10740
msgid ""
10741
"push_strict\n"
10742
"~~~~~~~~~~~"
10743
msgstr ""
10744
6622.1.22 by Jelmer Vernooij
Update po files.
10745
#: en/help_topics/configuration.txt:655
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10746
msgid ""
10747
"If present, defines the ``--strict`` option default value for checking\n"
10748
"uncommitted changes before pushing."
10749
msgstr ""
10750
6622.1.22 by Jelmer Vernooij
Update po files.
10751
#: en/help_topics/configuration.txt:658
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10752
msgid ""
10753
"dpush_strict\n"
10754
"~~~~~~~~~~~~"
10755
msgstr ""
10756
6622.1.22 by Jelmer Vernooij
Update po files.
10757
#: en/help_topics/configuration.txt:661
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10758
msgid ""
10759
"If present, defines the ``--strict`` option default value for checking\n"
10760
"uncommitted changes before pushing into a different VCS without any\n"
10761
"custom bzr metadata."
10762
msgstr ""
10763
6622.1.22 by Jelmer Vernooij
Update po files.
10764
#: en/help_topics/configuration.txt:665
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10765
msgid ""
10766
"bound_location\n"
10767
"~~~~~~~~~~~~~~"
10768
msgstr ""
10769
6622.1.22 by Jelmer Vernooij
Update po files.
10770
#: en/help_topics/configuration.txt:668
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10771
msgid ""
10772
"The location that commits should go to when acting as a checkout.\n"
10773
"This option is normally set by ``bind``."
10774
msgstr ""
10775
6622.1.22 by Jelmer Vernooij
Update po files.
10776
#: en/help_topics/configuration.txt:671
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10777
msgid ""
10778
"bound\n"
10779
"~~~~~"
10780
msgstr ""
10781
6622.1.22 by Jelmer Vernooij
Update po files.
10782
#: en/help_topics/configuration.txt:674
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10783
msgid ""
10784
"If set to \"True\", the branch should act as a checkout, and push each "
10785
"commit to\n"
10786
"the bound_location.  This option is normally set by ``bind``/``unbind``."
10787
msgstr ""
10788
6622.1.22 by Jelmer Vernooij
Update po files.
10789
#: en/help_topics/configuration.txt:677
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10790
msgid ""
10791
"send_strict\n"
10792
"~~~~~~~~~~~"
10793
msgstr ""
10794
6622.1.22 by Jelmer Vernooij
Update po files.
10795
#: en/help_topics/configuration.txt:680
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10796
msgid ""
10797
"If present, defines the ``--strict`` option default value for checking\n"
10798
"uncommitted changes before sending a merge directive."
10799
msgstr ""
10800
6622.1.22 by Jelmer Vernooij
Update po files.
10801
#: en/help_topics/configuration.txt:683
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10802
msgid ""
10803
"add.maximum_file_size\n"
10804
"~~~~~~~~~~~~~~~~~~~~~"
10805
msgstr ""
10806
6622.1.22 by Jelmer Vernooij
Update po files.
10807
#: en/help_topics/configuration.txt:686
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10808
msgid ""
10809
"Defines the maximum file size the command line \"add\" operation will allow\n"
6622.1.22 by Jelmer Vernooij
Update po files.
10810
"in recursive mode, with files larger than this value being skipped. You "
10811
"may \n"
10812
"specify this value as an integer (in which case it is interpreted as "
10813
"bytes), \n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10814
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10815
"0 \n"
10816
"will disable skipping."
10817
msgstr ""
10818
6622.1.22 by Jelmer Vernooij
Update po files.
10819
#: en/help_topics/configuration.txt:692
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10820
msgid ""
10821
"External Merge Tools\n"
10822
"--------------------"
10823
msgstr ""
10824
6622.1.22 by Jelmer Vernooij
Update po files.
10825
#: en/help_topics/configuration.txt:695
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10826
msgid ""
10827
"bzr.mergetool.<name>\n"
10828
"~~~~~~~~~~~~~~~~~~~~"
10829
msgstr ""
10830
6622.1.22 by Jelmer Vernooij
Update po files.
10831
#: en/help_topics/configuration.txt:698
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10832
msgid ""
10833
"Defines an external merge tool called <name> with the given command-line.\n"
10834
"Arguments containing spaces should be quoted using single or double quotes. "
10835
"The\n"
10836
"executable may omit its path if it can be found on the PATH."
10837
msgstr ""
10838
6622.1.22 by Jelmer Vernooij
Update po files.
10839
#: en/help_topics/configuration.txt:702
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10840
msgid ""
10841
"The following markers can be used in the command-line to substitute "
10842
"filenames\n"
10843
"involved in the merge conflict::"
10844
msgstr ""
10845
6622.1.22 by Jelmer Vernooij
Update po files.
10846
#: en/help_topics/configuration.txt:705
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10847
msgid ""
10848
"  {base}      file.BASE\n"
10849
"  {this}      file.THIS\n"
10850
"  {other}     file.OTHER\n"
10851
"  {result}    output file\n"
10852
"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
10853
"merge\n"
10854
"              succeeds."
10855
msgstr ""
10856
6622.1.22 by Jelmer Vernooij
Update po files.
10857
#: en/help_topics/configuration.txt:714
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10858
msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10859
msgstr ""
10860
6622.1.22 by Jelmer Vernooij
Update po files.
10861
#: en/help_topics/configuration.txt:716
10862
msgid ""
10863
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10864
"interpolation markers, trying to display the mergetool line results in the\n"
10865
"following problem::"
10866
msgstr ""
10867
10868
#: en/help_topics/configuration.txt:720
10869
msgid ""
10870
"\n"
10871
"  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10872
"{result}'\n"
10873
"  $ bzr config bzr.mergetool.kdiff3\n"
10874
"  bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10875
"{this} {other} -o {result}\"."
10876
msgstr ""
10877
10878
#: en/help_topics/configuration.txt:725
10879
msgid ""
10880
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10881
msgstr ""
10882
10883
#: en/help_topics/configuration.txt:727
10884
msgid ""
10885
"  $ bzr config --all bzr.mergetool.kdiff3\n"
10886
"  branch:\n"
10887
"    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10888
msgstr ""
10889
10890
#: en/help_topics/configuration.txt:731
10891
msgid ""
10892
"\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10893
"bzr.default_mergetool\n"
10894
"~~~~~~~~~~~~~~~~~~~~~"
10895
msgstr ""
10896
6622.1.22 by Jelmer Vernooij
Update po files.
10897
#: en/help_topics/configuration.txt:735
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10898
msgid ""
10899
"Specifies which external merge tool (as defined above) should be selected "
10900
"by\n"
10901
"default in tools such as ``bzr qconflicts``."
10902
msgstr ""
10903
6622.1.22 by Jelmer Vernooij
Update po files.
10904
#: en/help_topics/configuration.txt:740
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10905
msgid "  bzr.default_mergetool = kdiff3\n"
10906
msgstr ""
10907
10908
#: en/help_topics/conflict-types.txt:1
10909
msgid ""
10910
"Conflict Types\n"
10911
"=============="
10912
msgstr ""
10913
10914
#: en/help_topics/conflict-types.txt:4
10915
msgid ""
10916
"Some operations, like merge, revert and pull, modify the contents of your\n"
10917
"working tree.  These modifications are programmatically generated, and so "
10918
"they\n"
10919
"may conflict with the current state of your working tree. "
10920
msgstr ""
10921
10922
#: en/help_topics/conflict-types.txt:8
10923
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
10924
"When conflicts are present in your working tree (as shown by ``brz\n"
10925
"conflicts``), you should resolve them and then inform brz that the "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10926
"conflicts\n"
10927
"have been resolved."
10928
msgstr ""
10929
10930
#: en/help_topics/conflict-types.txt:12
10931
msgid ""
10932
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10933
"should resolve them is not the one responsible for their occurrence, as is "
10934
"the\n"
10935
"case when merging other people's work or because some conflicts are "
10936
"presented\n"
10937
"in a way that is not easy to understand."
10938
msgstr ""
10939
10940
#: en/help_topics/conflict-types.txt:17
10941
msgid ""
10942
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10943
"conflict if and only if there's an actual conceptual conflict in the source\n"
10944
"tree.  Because Bazaar doesn't understand the real meaning of the files "
10945
"being\n"
10946
"versioned, it can, when faced with ambiguities, fall short in either "
10947
"direction\n"
10948
"trying to resolve the conflict itself. Many kinds of changes can be "
10949
"combined\n"
10950
"programmatically, but sometimes only a human can determine the right thing "
10951
"to\n"
10952
"do."
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:25
10956
msgid ""
10957
"When Bazaar generates a conflict, it adds information into the working tree "
10958
"to\n"
10959
"present the conflicting versions, and it's up to you to find the correct\n"
10960
"resolution."
10961
msgstr ""
10962
10963
#: en/help_topics/conflict-types.txt:29
10964
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:31
10968
msgid ""
10969
"1. Modify the working tree content so that the conflicted item is now in "
10970
"the\n"
10971
"   state you want to keep, then"
10972
msgstr ""
10973
10974
#: en/help_topics/conflict-types.txt:34
10975
msgid ""
10976
"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.
10977
"   remaining generated information (``brz resolve <item>``)."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
10978
msgstr ""
10979
10980
#: en/help_topics/conflict-types.txt:37
10981
msgid ""
10982
"For most conflict types, there are some obvious ways to modify the working\n"
10983
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10984
"itself already made a choice, when possible."
10985
msgstr ""
10986
10987
#: en/help_topics/conflict-types.txt:41
10988
msgid ""
10989
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10990
"different ways to resolve the conflict."
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:44
10994
msgid ""
10995
"Each type of conflict is explained below, and the action which must be done "
10996
"to\n"
10997
"resolve the conflict is outlined."
10998
msgstr ""
10999
11000
#: en/help_topics/conflict-types.txt:47
11001
msgid ""
11002
"Various actions are available depending on the kind of conflict, for some "
11003
"of\n"
11004
"these actions, Bazaar can provide some help. In the end you should at least\n"
11005
"inform Bazaar that you're done with the conflict with::"
11006
msgstr ""
11007
11008
#: en/help_topics/conflict-types.txt:51
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11009
msgid "  ``brz resolve FILE --action=done'"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11010
msgstr ""
11011
11012
#: en/help_topics/conflict-types.txt:53
11013
msgid ""
11014
"Note that this is the default action when a single file is involved so you "
11015
"can\n"
11016
"simply use::"
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:56
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11020
msgid "   ``brz resolve FILE``"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11021
msgstr ""
11022
11023
#: en/help_topics/conflict-types.txt:58
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11024
msgid "See ``brz help resolve`` for more details."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11025
msgstr ""
11026
11027
#: en/help_topics/conflict-types.txt:60
11028
msgid ""
11029
"Text conflicts\n"
11030
"--------------"
11031
msgstr ""
11032
11033
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11034
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11035
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11036
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11037
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11038
msgid "Typical message::"
11039
msgstr ""
11040
11041
#: en/help_topics/conflict-types.txt:65
11042
msgid "  Text conflict in FILE"
11043
msgstr ""
11044
11045
#: en/help_topics/conflict-types.txt:67
11046
msgid ""
11047
"These are produced when a text merge cannot completely reconcile two sets "
11048
"of\n"
11049
"text changes.  Bazaar will emit files for each version with the extensions\n"
11050
"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
11051
"tree,\n"
11052
"i.e. the tree that you are merging changes into.  OTHER is the version that "
11053
"you\n"
11054
"are merging into the target.  BASE is an older version that is used as a "
11055
"basis\n"
11056
"for comparison."
11057
msgstr ""
11058
11059
#: en/help_topics/conflict-types.txt:74
11060
msgid ""
11061
"In the main copy of the file, Bazaar will include all the changes that it\n"
11062
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11063
"\"herringbone\" markers like ``<<<<<<<``."
11064
msgstr ""
11065
11066
#: en/help_topics/conflict-types.txt:78
11067
msgid ""
11068
"Say the initial text is \"The project leader released it.\", and THIS "
11069
"modifies it\n"
11070
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11071
"leader\n"
11072
"released Bazaar.\"  A conflict would look like this::"
11073
msgstr ""
11074
11075
#: en/help_topics/conflict-types.txt:82
11076
msgid ""
11077
"  <<<<<<< TREE\n"
11078
"  Martin Pool released it.\n"
11079
"  =======\n"
11080
"  The project leader released Bazaar.\n"
11081
"  >>>>>>> MERGE-SOURCE"
11082
msgstr ""
11083
11084
#: en/help_topics/conflict-types.txt:88
11085
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11086
msgstr ""
11087
11088
#: en/help_topics/conflict-types.txt:90
11089
msgid ""
11090
"You can handle text conflicts either by editing the main copy of the file,\n"
11091
"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
11092
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11093
"set of changes over the other (but see below when you encounter these\n"
11094
"cases).  More often, the two sets of changes must be intelligently combined."
11095
msgstr ""
11096
11097
#: en/help_topics/conflict-types.txt:96
11098
msgid ""
11099
"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
11100
"you are done editing, the file should look like it never had a conflict, and "
11101
"be\n"
11102
"ready to commit."
11103
msgstr ""
11104
11105
#: en/help_topics/conflict-types.txt:100
11106
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11107
"When you have resolved text conflicts, just run ``brz resolve --auto``, and\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11108
"Bazaar will auto-detect which conflicts you have resolved."
11109
msgstr ""
11110
11111
#: en/help_topics/conflict-types.txt:103
11112
msgid ""
11113
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11114
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11115
"working tree."
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:107
11119
msgid ""
11120
"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11121
"When you want to pick one set of changes over the other, you can use ``brz\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11122
"resolve`` with one of the following actions:"
11123
msgstr ""
11124
11125
#: en/help_topics/conflict-types.txt:111
11126
msgid ""
11127
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11128
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11129
msgstr ""
11130
11131
#: en/help_topics/conflict-types.txt:114
11132
msgid ""
11133
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11134
"modifications will be taken into account."
11135
msgstr ""
11136
11137
#: en/help_topics/conflict-types.txt:117
11138
msgid ""
11139
"Content conflicts\n"
11140
"-----------------"
11141
msgstr ""
11142
11143
#: en/help_topics/conflict-types.txt:122
11144
msgid "  Contents conflict in FILE"
11145
msgstr ""
11146
11147
#: en/help_topics/conflict-types.txt:124
11148
msgid ""
11149
"This conflict happens when there are conflicting changes in the working "
11150
"tree\n"
11151
"and the merge source, but the conflicted items are not text files.  They "
11152
"may\n"
11153
"be binary files, or symlinks, or directories.  It can even happen with "
11154
"files\n"
11155
"that are deleted on one side, and modified on the other."
11156
msgstr ""
11157
11158
#: en/help_topics/conflict-types.txt:129
11159
msgid ""
11160
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
11161
"be\n"
11162
"regular files, symlinks or directories).  But it will not include a \"main "
11163
"copy\"\n"
11164
"of the file with herringbone conflict markers.  It will appear that the "
11165
"\"main\n"
11166
"copy\" has been renamed to THIS or OTHER."
11167
msgstr ""
11168
11169
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11170
msgid ""
11171
"To resolve that kind of conflict, you should rebuild FILE from either "
11172
"version\n"
11173
"or a combination of both."
11174
msgstr ""
11175
11176
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11177
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11178
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11179
#: en/help_topics/conflict-types.txt:361
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11180
msgid "``brz resolve`` recognizes the following actions:"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11181
msgstr ""
11182
11183
#: en/help_topics/conflict-types.txt:139
11184
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11185
"* ``--action=take-this`` will issue ``brz mv FILE.THIS FILE``,\n"
11186
"* ``--action=take-other`` will issue ``brz mv FILE.OTHER FILE``,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11187
"* ``--action=done`` will just mark the conflict as resolved."
11188
msgstr ""
11189
11190
#: en/help_topics/conflict-types.txt:143
11191
msgid ""
11192
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11193
"and\n"
11194
"``.OTHER`` files if they are still present in the working tree."
11195
msgstr ""
11196
11197
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11198
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11199
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11200
#: en/help_topics/conflict-types.txt:369
11201
msgid ""
11202
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11203
msgstr ""
11204
11205
#: en/help_topics/conflict-types.txt:148
11206
msgid ""
11207
"Tag conflicts\n"
11208
"-------------"
11209
msgstr ""
11210
11211
#: en/help_topics/conflict-types.txt:153
11212
msgid ""
11213
"  Conflicting tags:\n"
11214
"      version-0.1"
11215
msgstr ""
11216
11217
#: en/help_topics/conflict-types.txt:156
11218
msgid ""
11219
"When pulling from or pushing to another branch, Bazaar informs you about "
11220
"tags\n"
11221
"that conflict between the two branches; that is the same tag points to two\n"
11222
"different revisions.  You need not resolve these conflicts, but subsequent\n"
11223
"uses of pull or push will result in the same message."
11224
msgstr ""
11225
11226
#: en/help_topics/conflict-types.txt:161
11227
msgid ""
11228
"To resolve the conflict, you must apply the correct tags to either the "
11229
"target\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11230
"branch or the source branch as appropriate.  Use \"brz tags --show-ids -d\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11231
"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
11232
"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.
11233
"``brz tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11234
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11235
"source\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11236
"branch.  You need not call \"brz resolve\" after doing this.  To resolve in\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11237
"favor of the target branch, you need to similarly use ``tag --force`` in "
11238
"the\n"
11239
"source branch.  (Note that pulling or pushing using --overwrite will "
11240
"overwrite\n"
11241
"all tags as well.)"
11242
msgstr ""
11243
11244
#: en/help_topics/conflict-types.txt:172
11245
msgid ""
11246
"Duplicate paths\n"
11247
"---------------"
11248
msgstr ""
11249
11250
#: en/help_topics/conflict-types.txt:177
11251
msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
11252
msgstr ""
11253
11254
#: en/help_topics/conflict-types.txt:179
11255
msgid ""
11256
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11257
"already been used.  The existing file will be renamed to \"FILE.moved\".  "
11258
msgstr ""
11259
11260
#: en/help_topics/conflict-types.txt:187
11261
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11262
"* ``--action=take-this`` will issue ``brz rm FILE ; brz mv FILE.moved "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11263
"FILE``,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11264
"* ``--action=take-other`` will issue ``brz rm FILE.moved``,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11265
"* ``--action=done`` will just mark the conflict as resolved."
11266
msgstr ""
11267
11268
#: en/help_topics/conflict-types.txt:191
11269
msgid ""
11270
"Note that you must get rid of FILE.moved before using ``--action=done``."
11271
msgstr ""
11272
11273
#: en/help_topics/conflict-types.txt:195
11274
msgid ""
11275
"Unversioned parent\n"
11276
"------------------"
11277
msgstr ""
11278
11279
#: en/help_topics/conflict-types.txt:200
6622.1.22 by Jelmer Vernooij
Update po files.
11280
msgid "    Conflict because FILE is not versioned, but has versioned children."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11281
msgstr ""
11282
11283
#: en/help_topics/conflict-types.txt:202
11284
msgid ""
11285
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11286
"not\n"
11287
"versioned.  This happens when the directory has been deleted in the target,\n"
11288
"but has a new child in the source, or vice versa.  In this situation, "
11289
"Bazaar\n"
11290
"will version the parent directory as well.  Resolving this issue depends\n"
11291
"very much on the particular scenario.  You may wish to rename or delete "
11292
"either\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11293
"the file or the directory.  When you are satisfied, you can run \"brz "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11294
"resolve\n"
11295
"FILE\" to mark the conflict as resolved."
11296
msgstr ""
11297
11298
#: en/help_topics/conflict-types.txt:210
11299
msgid ""
11300
"Missing parent\n"
11301
"--------------"
11302
msgstr ""
11303
11304
#: en/help_topics/conflict-types.txt:215
11305
msgid "  Conflict adding files to FILE.  Created directory."
11306
msgstr ""
11307
11308
#: en/help_topics/conflict-types.txt:217
11309
msgid ""
11310
"This happens when a directory has been deleted in the target, but has new\n"
11311
"children in the source.  This is similar to the \"unversioned parent\" "
11312
"conflict,\n"
11313
"except that the parent directory does not *exist*, instead of just being\n"
11314
"unversioned.  In this situation, Bazaar will create the missing parent.\n"
11315
"Resolving this issue depends very much on the particular scenario."
11316
msgstr ""
11317
11318
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11319
msgid ""
11320
"To resolve that kind of conflict, you should either remove or rename the\n"
11321
"children or the directory or a combination of both."
11322
msgstr ""
11323
11324
#: en/help_topics/conflict-types.txt:228
11325
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11326
"* ``--action=take-this`` will issue ``brz rm directory`` including the\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11327
"  children,\n"
11328
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11329
"children\n"
11330
"  and restoring the directory,\n"
11331
"* ``--action=done`` will just mark the conflict as resolved."
11332
msgstr ""
11333
11334
#: en/help_topics/conflict-types.txt:236
11335
msgid ""
11336
"Deleting parent\n"
11337
"---------------"
11338
msgstr ""
11339
11340
#: en/help_topics/conflict-types.txt:241
11341
msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
11342
msgstr ""
11343
11344
#: en/help_topics/conflict-types.txt:243
11345
msgid ""
11346
"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
11347
"source, but has new children in the target (either because a directory\n"
11348
"deletion is merged or because the merge introduce new children).  Bazaar\n"
11349
"will retain the directory.  Resolving this issue depends very much on the\n"
11350
"particular scenario."
11351
msgstr ""
11352
11353
#: en/help_topics/conflict-types.txt:254
11354
msgid ""
11355
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11356
"directory,"
11357
msgstr ""
11358
11359
#: en/help_topics/conflict-types.txt:256
11360
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11361
"* ``--action=take-other`` will issue ``brz rm directory`` including the \n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11362
"  children,"
11363
msgstr ""
11364
11365
#: en/help_topics/conflict-types.txt:259
11366
msgid "* ``--action=done`` will just mark the conflict as resolved."
11367
msgstr ""
11368
11369
#: en/help_topics/conflict-types.txt:261
11370
msgid ""
11371
"Note that when merging a directory deletion, if unversioned files are\n"
11372
"present, they become potential orphans has they don't have a directory\n"
11373
"parent anymore."
11374
msgstr ""
11375
11376
#: en/help_topics/conflict-types.txt:265
11377
msgid ""
11378
"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.
11379
"setting the ``brz.transform.orphan_policy`` configuration option."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11380
msgstr ""
11381
11382
#: en/help_topics/conflict-types.txt:268
11383
msgid "There are two possible values for this option:"
11384
msgstr ""
11385
11386
#: en/help_topics/conflict-types.txt:270
11387
msgid ""
11388
"* ``conflict`` (the default): will leave the orphans in place and\n"
11389
"  generate a conflicts,"
11390
msgstr ""
11391
11392
#: en/help_topics/conflict-types.txt:273
11393
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11394
"* ``move``: will move the orphans to a ``brz-orphans`` directory at the "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11395
"root\n"
11396
"  of the working tree with names like ``<file>.~#~``."
11397
msgstr ""
11398
11399
#: en/help_topics/conflict-types.txt:278
11400
msgid ""
11401
"Path conflict\n"
11402
"-------------"
11403
msgstr ""
11404
11405
#: en/help_topics/conflict-types.txt:283
11406
msgid "  Path conflict: PATH1 / PATH2"
11407
msgstr ""
11408
11409
#: en/help_topics/conflict-types.txt:285
11410
msgid ""
11411
"This happens when the source and target have each modified the name or "
11412
"parent\n"
11413
"directory of a file.  Bazaar will use the path elements from the source."
11414
msgstr ""
11415
11416
#: en/help_topics/conflict-types.txt:288
11417
msgid ""
11418
"To resolve that kind of conflict, you just have to decide what name should "
11419
"be\n"
11420
"retained for the file involved."
11421
msgstr ""
11422
11423
#: en/help_topics/conflict-types.txt:293
11424
msgid ""
11425
"* ``--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.
11426
"  issuing ``brz mv PATH2 PATH1``,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11427
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11428
"``PATH2``,\n"
11429
"* ``--action=done`` will just mark the conflict as resolved."
11430
msgstr ""
11431
11432
#: en/help_topics/conflict-types.txt:300
11433
msgid ""
11434
"Parent loop\n"
11435
"-----------"
11436
msgstr ""
11437
11438
#: en/help_topics/conflict-types.txt:305
11439
msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
11440
msgstr ""
11441
11442
#: en/help_topics/conflict-types.txt:307
11443
msgid ""
11444
"This happens when the source and the target have each moved directories, so\n"
11445
"that, if the change could be applied, a directory would be contained by "
11446
"itself.\n"
11447
"For example::"
11448
msgstr ""
11449
11450
#: en/help_topics/conflict-types.txt:311
11451
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11452
"  $ brz init\n"
11453
"  $ brz mkdir white\n"
11454
"  $ brz mkdir black\n"
11455
"  $ brz commit -m \"BASE\"\n"
11456
"  $ brz branch . ../other\n"
11457
"  $ brz mv white black\n"
11458
"  $ brz commit -m \"THIS\"\n"
11459
"  $ brz mv ../other/black ../other/white\n"
11460
"  $ brz commit ../other -m \"OTHER\"\n"
11461
"  $ brz merge ../other"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11462
msgstr ""
11463
11464
#: en/help_topics/conflict-types.txt:322
11465
msgid ""
11466
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11467
"``black``.  To resolve that kind of conflict, you just have to decide what\n"
11468
"name should be retained for the directories involved."
11469
msgstr ""
11470
11471
#: en/help_topics/conflict-types.txt:328
11472
msgid ""
6622.1.22 by Jelmer Vernooij
Update po files.
11473
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11474
"``white`` \n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11475
"  in ``black``,\n"
11476
"* ``--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.
11477
"   ``white`` by issuing ``brz mv black/white white ; brz mv black white``,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11478
"* ``--action=done`` will just mark the conflict as resolved."
11479
msgstr ""
11480
11481
#: en/help_topics/conflict-types.txt:336
11482
msgid ""
11483
"Non-directory parent\n"
11484
"--------------------"
11485
msgstr ""
11486
11487
#: en/help_topics/conflict-types.txt:341
11488
msgid ""
11489
"  Conflict: foo.new is not a directory, but has files in it.\n"
11490
"  Created directory."
11491
msgstr ""
11492
11493
#: en/help_topics/conflict-types.txt:344
11494
msgid ""
11495
"This happens when one side has added files to a directory, and the other "
11496
"side\n"
11497
"has changed the directory into a file or symlink.  For example::"
11498
msgstr ""
11499
11500
#: en/help_topics/conflict-types.txt:347
11501
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11502
"  $ brz init\n"
11503
"  $ brz mkdir foo\n"
11504
"  $ brz commit -m \"BASE\"\n"
11505
"  $ brz branch . ../other\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11506
"  $ rmdir foo\n"
11507
"  $ touch foo\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11508
"  $ brz commit -m \"THIS\"\n"
11509
"  $ brz mkdir ../other/foo/bar\n"
11510
"  $ brz commit ../other -m \"OTHER\"\n"
11511
"  $ brz merge ../other"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11512
msgstr ""
11513
11514
#: en/help_topics/conflict-types.txt:358
11515
msgid ""
11516
"To resolve that kind of conflict, you have to decide what name should be\n"
11517
"retained for the file, directory or symlink involved."
11518
msgstr ""
11519
11520
#: en/help_topics/conflict-types.txt:363
11521
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11522
"* ``--action=take-this`` will issue ``brz rm --force foo.new`` and \n"
11523
"  ``brz add foo``,\n"
11524
"* ``--action=take-other`` will issue ``brz rm --force foo`` and \n"
11525
"  ``brz mv foo.new foo``,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11526
"* ``--action=done`` will just mark the conflict as resolved."
11527
msgstr ""
11528
11529
#: en/help_topics/conflict-types.txt:371
11530
msgid ""
11531
"MalformedTransform\n"
11532
"------------------"
11533
msgstr ""
11534
11535
#: en/help_topics/conflict-types.txt:374
11536
msgid ""
11537
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11538
"exception.  This means that Bazaar encountered a filesystem conflict that it "
11539
"was\n"
11540
"unable to resolve.  This usually indicates a bug.  Please let us know if "
11541
"you\n"
11542
"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11543
msgstr ""
11544
11545
#: en/help_topics/content-filters.txt:1
11546
msgid ""
11547
"Content Filters\n"
11548
"==============="
11549
msgstr ""
11550
11551
#: en/help_topics/content-filters.txt:4
11552
msgid ""
11553
"Content formats\n"
11554
"---------------"
11555
msgstr ""
11556
11557
#: en/help_topics/content-filters.txt:7
11558
msgid ""
11559
"Bazaar's content filtering allows you to store files in a different\n"
11560
"format from the copy in your working tree.  This lets you, or your\n"
11561
"co-developers, use Windows development tools that expect CRLF files\n"
11562
"on projects that use other line-ending conventions. Among other things,\n"
11563
"content filters also let Unix developers more easily work on projects\n"
11564
"using Windows line-ending conventions, keyword expansion/compression,\n"
11565
"and trailing spaces on lines in text files to be implicitly stripped\n"
11566
"when committed."
11567
msgstr ""
11568
11569
#: en/help_topics/content-filters.txt:16
11570
msgid "To generalize, there are two content formats supported by Bazaar:"
11571
msgstr ""
11572
11573
#: en/help_topics/content-filters.txt:18
11574
msgid ""
11575
"* a canonical format - how files are stored internally\n"
11576
"* a convenience format - how files are created in a working tree."
11577
msgstr ""
11578
11579
#: en/help_topics/content-filters.txt:21
11580
msgid ""
11581
"\n"
11582
"Format conversion\n"
11583
"-----------------"
11584
msgstr ""
11585
11586
#: en/help_topics/content-filters.txt:25
11587
msgid ""
11588
"The conversion between these formats is done by content filters.\n"
11589
"A content filter has two parts:"
11590
msgstr ""
11591
11592
#: en/help_topics/content-filters.txt:28
11593
msgid ""
11594
"* a read converter - converts from convenience to canonical format\n"
11595
"* a write converter - converts from canonical to convenience format."
11596
msgstr ""
11597
11598
#: en/help_topics/content-filters.txt:31
11599
msgid ""
11600
"Many of these converters will provide *round-trip* conversion,\n"
11601
"i.e. applying the read converter followed by the write converter\n"
11602
"gives back the original content. However, others may provide an\n"
11603
"asymmetric conversion. For example, a read converter might strip\n"
11604
"trailing whitespace off lines in source code while the matching\n"
11605
"write converter might pass content through unchanged."
11606
msgstr ""
11607
11608
#: en/help_topics/content-filters.txt:38
11609
msgid ""
11610
"\n"
11611
"Enabling content filters\n"
11612
"------------------------"
11613
msgstr ""
11614
11615
#: en/help_topics/content-filters.txt:42
11616
msgid ""
11617
"Content filters are typically provided by plugins, so the first step\n"
11618
"in using them is to install the relevant plugins and read their\n"
11619
"documentation. Some plugins may be very specific about which files\n"
11620
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11621
"In other cases, the plugin may leave it in the user's hands to\n"
11622
"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.
11623
"using rule-based preferences. See ``brz help rules`` for general\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11624
"information about defining these."
11625
msgstr ""
11626
11627
#: en/help_topics/content-filters.txt:51
11628
msgid ""
11629
"\n"
11630
"Impact on commands\n"
11631
"------------------"
11632
msgstr ""
11633
11634
#: en/help_topics/content-filters.txt:55
11635
msgid ""
11636
"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.
11637
"a working tree, e.g. status, diff and commit. For example, ``brz diff``\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11638
"will apply read converters to files in the working tree, then compare\n"
11639
"the results to the content last committed."
11640
msgstr ""
11641
11642
#: en/help_topics/content-filters.txt:60
11643
msgid ""
11644
"Write converters are only applied by commands that **create files in a\n"
11645
"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.
11646
"canonical format of a file or tree, use ``brz cat`` or ``brz export``\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11647
"respectively."
11648
msgstr ""
11649
11650
#: en/help_topics/content-filters.txt:65
11651
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11652
"Note: ``brz commit`` does not implicitly apply write converters after\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11653
"comitting files. If this makes sense for a given plugin providing\n"
11654
"a content filter, the plugin can usually achieve this effect by using a\n"
11655
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11656
"for more information on hooks."
11657
msgstr ""
11658
11659
#: en/help_topics/content-filters.txt:71
11660
msgid ""
11661
"\n"
11662
"Refreshing your working tree\n"
11663
"----------------------------"
11664
msgstr ""
11665
11666
#: en/help_topics/content-filters.txt:75
11667
msgid ""
11668
"For performance reasons, Bazaar caches the timestamps of files in\n"
11669
"a working tree, and assumes files are unchanged if their timestamps\n"
11670
"match the cached values. As a consequence, there are times when\n"
11671
"you may need to explicitly ask for content filtering to be reapplied\n"
11672
"in one or both directions, e.g. after installing or reconfiguring\n"
11673
"plugins providing it."
11674
msgstr ""
11675
11676
#: en/help_topics/content-filters.txt:82
11677
msgid "Here are some general guidelines for doing this:"
11678
msgstr ""
11679
11680
#: en/help_topics/content-filters.txt:84
11681
msgid ""
11682
" * To reapply read converters, ``touch`` files, i.e. update their\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11683
"   timestamp. Operations like ``brz status`` should then reapply the\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11684
"   relevant read converters and compare the end result with the\n"
11685
"   canonical format."
11686
msgstr ""
11687
11688
#: en/help_topics/content-filters.txt:89
11689
msgid ""
11690
" * To reapply write converters, ensure there are no local changes,\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11691
"   delete the relevant files and run ``brz revert`` on those files."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11692
msgstr ""
11693
11694
#: en/help_topics/content-filters.txt:92
11695
msgid ""
11696
"Note: In the future, it is likely that additional options will be added\n"
11697
"to commands to make this refreshing process faster and safer.\n"
11698
msgstr ""
11699
11700
#: en/help_topics/current-formats.txt:1
11701
msgid "Current Storage Formats"
11702
msgstr ""
11703
11704
#: en/help_topics/current-formats.txt:3
11705
msgid ""
11706
":2a:\n"
11707
"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11708
"    compress storage. Provides rich roots which are a one-way\n"
11709
"    transition."
11710
msgstr ""
11711
11712
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11713
msgid ""
11714
"\n"
11715
"See :doc:`formats-help` for more about storage formats."
11716
msgstr ""
11717
11718
#: en/help_topics/debug-flags.txt:1
11719
msgid ""
11720
"Debug Flags\n"
11721
"==========="
11722
msgstr ""
11723
11724
#: en/help_topics/debug-flags.txt:4
11725
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11726
"These flags can be passed on the brz command line or (without the ``-D``\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11727
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11728
msgstr ""
11729
11730
#: en/help_topics/debug-flags.txt:7
11731
msgid ""
11732
"-Dauth            Trace authentication sections used.\n"
11733
"-Dbytes           Print out how many bytes were transferred\n"
11734
"-Ddirstate        Trace dirstate activity (verbose!)\n"
11735
"-Derror           Instead of normal error handling, always print a "
11736
"traceback\n"
11737
"                  on error.\n"
11738
"-Devil            Capture call sites that do expensive or badly-scaling\n"
11739
"                  operations.\n"
11740
"-Dfetch           Trace history copying between repositories.\n"
11741
"-Dfilters         Emit information for debugging content filtering.\n"
11742
"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
11743
"fetch.\n"
11744
"-Dgraph           Trace graph traversal.\n"
11745
"-Dhashcache       Log every time a working file is read to determine its "
11746
"hash.\n"
11747
"-Dhooks           Trace hook execution.\n"
11748
"-Dhpss            Trace smart protocol requests and responses.\n"
11749
"-Dhpssdetail      More hpss details.\n"
11750
"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
11751
"-Dhttp            Trace http connections, requests and responses.\n"
11752
"-Dindex           Trace major index operations.\n"
11753
"-Dknit            Trace knit operations.\n"
11754
"-Dlock            Trace when lockdir locks are taken or released.\n"
11755
"-Dnoretry         If a connection is reset, fail immediately rather than\n"
11756
"                  retrying the request.\n"
11757
"-Dprogress        Trace progress bar operations.\n"
11758
"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
11759
"-Dmerge           Emit information for debugging merges.\n"
11760
"-Dno_apport       Don't use apport to report crashes.\n"
11761
"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
11762
"-Dpack            Emit information about pack operations.\n"
11763
"-Drelock          Emit a message every time a branch or repository object "
11764
"is\n"
11765
"                  unlocked then relocked the same way.\n"
11766
"-Dsftp            Trace SFTP internals.\n"
11767
"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
11768
"expected\n"
11769
"-Dstream          Trace fetch streams.\n"
11770
"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
11771
"portable\n"
11772
"                  manner.\n"
11773
"-Dunlock          Some errors during unlock are treated as warnings.\n"
11774
"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
11775
"-DIDS_always      Always use InterDifferingSerializer to fetch if "
11776
"appropriate\n"
11777
"                  for the format, even for non-local fetches.\n"
11778
msgstr ""
11779
11780
#: en/help_topics/diverged-branches.txt:1
11781
msgid ""
11782
"Diverged Branches\n"
11783
"================="
11784
msgstr ""
11785
11786
#: en/help_topics/diverged-branches.txt:4
11787
msgid ""
11788
"When Bazaar tries to push one branch onto another, it requires that the\n"
11789
"destination branch must be ready to receive the source branch.  If this "
11790
"isn't\n"
11791
"the case, then we say that the branches have ``diverged``.  Branches are\n"
11792
"considered diverged if the destination branch's most recent commit is one "
11793
"that\n"
11794
"has not been merged (directly or indirectly) by the source branch.  To "
11795
"recover\n"
11796
"from diverged branches, one must merge the missing revisions into the "
11797
"source\n"
11798
"branch."
11799
msgstr ""
11800
11801
#: en/help_topics/diverged-branches.txt:12
11802
msgid ""
11803
"This situation commonly arises when using a centralized workflow with local\n"
11804
"commits.  If someone else has committed new work to the mainline since your\n"
11805
"last pull and you have local commits that have not yet been pushed to the\n"
11806
"mainline, then your local branch and the mainline have diverged."
11807
msgstr ""
11808
11809
#: en/help_topics/diverged-branches.txt:17
11810
msgid ""
11811
"Discovering What Has Diverged\n"
11812
"-----------------------------"
11813
msgstr ""
11814
11815
#: en/help_topics/diverged-branches.txt:20
11816
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11817
"The ``brz missing`` command is used to find out what revisions are in "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11818
"another\n"
11819
"branch that are not present in the current branch, and vice-versa.  It shows "
11820
"a\n"
11821
"summary of  which extra revisions exist in each branch.  If you want to see "
11822
"the\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11823
"precise effects of those revisions, you can use ``brz diff --"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11824
"old=other_branch``\n"
11825
"to show the differences between other_branch and your current branch."
11826
msgstr ""
11827
11828
#: en/help_topics/diverged-branches.txt:26
11829
msgid ""
11830
"A Solution\n"
11831
"----------"
11832
msgstr ""
11833
11834
#: en/help_topics/diverged-branches.txt:29
11835
msgid ""
11836
"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.
11837
"branch.  To do so, use ``brz merge`` to get the new revisions from the\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11838
"mainline.  This merge may result in conflicts if the other developer's "
11839
"changes\n"
11840
"overlap with your changes.  These conflicts should be resolved before\n"
11841
"continuing. After any conflicts have been resolved, or even if there were "
11842
"no\n"
11843
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11844
"to your local branch.  This requirement gives you an opportunity to test "
11845
"the\n"
11846
"resulting working tree for correctness, since the merged revisions could "
11847
"have\n"
11848
"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.
11849
"``brz commit``.  This clears up the diverged branches situation.  Your "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11850
"local\n"
11851
"branch can now be pushed to the mainline.\n"
11852
msgstr ""
11853
6622.1.22 by Jelmer Vernooij
Update po files.
11854
#: en/help_topics/env-variables.txt:1
11855
msgid "Environment Variables"
11856
msgstr ""
11857
11858
#: en/help_topics/env-variables.txt:3
11859
msgid "See bzr help configuration for more details."
11860
msgstr ""
11861
11862
#: en/help_topics/env-variables.txt:5
11863
msgid ""
11864
"=================== "
11865
"===========================================================\n"
11866
"BZRPATH             Path where bzr is to look for shell plugin external\n"
11867
"                    commands.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11868
"BRZ_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
6622.1.22 by Jelmer Vernooij
Update po files.
11869
"EMAIL               E-Mail address of the user.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11870
"BRZ_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
6622.1.22 by Jelmer Vernooij
Update po files.
11871
"EDITOR              Editor for editing commit messages.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11872
"BRZ_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
11873
"BRZ_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11874
"BRZ_PLUGINS_AT      Plugins to load from a directory not in "
11875
"BRZ_PLUGIN_PATH.\n"
11876
"BRZ_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
11877
"BRZ_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
6622.1.22 by Jelmer Vernooij
Update po files.
11878
"and\n"
11879
"                    HOME.\n"
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
11880
"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
6622.1.22 by Jelmer Vernooij
Update po files.
11881
"URLs).\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11882
"BRZ_SSH             Path to SSH client, or one of paramiko, openssh, "
6622.1.22 by Jelmer Vernooij
Update po files.
11883
"sshcorp,\n"
11884
"                    plink or lsh.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11885
"BRZ_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
11886
"BRZ_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
11887
"BRZ_COLUMNS         Override implicit terminal width.\n"
11888
"BRZ_CONCURRENCY     Number of processes that can be run concurrently "
6622.1.22 by Jelmer Vernooij
Update po files.
11889
"(selftest)\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11890
"BRZ_PROGRESS_BAR    Override the progress display. Values are 'none' or "
6622.1.22 by Jelmer Vernooij
Update po files.
11891
"'text'.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11892
"BRZ_PDB             Control whether to launch a debugger on error.\n"
11893
"BRZ_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
6622.1.22 by Jelmer Vernooij
Update po files.
11894
"                    breakin debugger.\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11895
"BRZ_TEXTUI_INPUT    Force console input mode for prompts to line-based "
6622.1.22 by Jelmer Vernooij
Update po files.
11896
"(instead\n"
11897
"                    of char-based).\n"
11898
"=================== "
11899
"===========================================================\n"
11900
msgstr ""
11901
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11902
#: en/help_topics/eol.txt:1
11903
msgid ""
11904
"End of Line Conversion\n"
11905
"======================"
11906
msgstr ""
11907
11908
#: en/help_topics/eol.txt:4
11909
msgid ""
11910
"EOL conversion is provided as a content filter where Bazaar internally\n"
11911
"stores a canonical format but outputs a convenience format. See\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
11912
"``brz help content-filters`` for general information about using these."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11913
msgstr ""
11914
11915
#: en/help_topics/eol.txt:8
11916
msgid ""
11917
"Note: Content filtering is only supported in recently added formats,\n"
11918
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11919
"in a recent format. (Just setting the format on the repository\n"
11920
"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.
11921
"'brz info -v' to confirm that the branch is using \"Working tree format 5\"\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11922
"or later."
11923
msgstr ""
11924
11925
#: en/help_topics/eol.txt:15
11926
msgid ""
11927
"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.
11928
"rules. See ``brz help rules`` for general information on defining rules.\n"
11929
"Currently, rules are only supported in $brz_HOME/.bazaar/rules (or\n"
11930
"%brz_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
11931
"supported in a future verison of Bazaar."
11932
msgstr ""
11933
11934
#: en/help_topics/eol.txt:21
11935
msgid ""
11936
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11937
"(If a value is not set, ``exact`` is the default.)"
11938
msgstr ""
11939
11940
#: en/help_topics/eol.txt:24
11941
msgid ""
11942
" ========== ===================================== ======================\n"
11943
" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
11944
" ========== ===================================== ======================\n"
11945
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11946
" ---------- ------------------------------------- ----------------------\n"
11947
" ``lf``     ``lf``                                ``lf``\n"
11948
" ---------- ------------------------------------- ----------------------\n"
11949
" ``crlf``   ``crlf``                              ``lf``\n"
11950
" ---------- ------------------------------------- ----------------------\n"
11951
" ``exact``  No conversion                         Exactly as in file\n"
11952
" ========== ===================================== ======================"
11953
msgstr ""
11954
11955
#: en/help_topics/eol.txt:36
11956
msgid ""
11957
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11958
"byte is detected in the file."
11959
msgstr ""
11960
11961
#: en/help_topics/eol.txt:39
11962
msgid ""
11963
"For users working on a cross-platform project, here is a suggested rule\n"
11964
"to use as a starting point::"
11965
msgstr ""
11966
11967
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11968
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11969
msgid ""
11970
"  [name *]\n"
11971
"  eol = native"
11972
msgstr ""
11973
11974
#: en/help_topics/eol.txt:45
11975
msgid ""
11976
"If you have binary files that do not contain a null byte though, be\n"
11977
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11978
"by giving more explicit patterns earlier in the rules file. For example::"
11979
msgstr ""
11980
11981
#: en/help_topics/eol.txt:49
11982
msgid ""
11983
"  [name *.png]\n"
11984
"  eol = exact"
11985
msgstr ""
11986
11987
#: en/help_topics/eol.txt:55
11988
msgid ""
11989
"If your working tree is on a network drive shared by users on different\n"
11990
"operating systems, you typically want to force certain conventions for\n"
11991
"certain files. In that way, if a file is created with the wrong line\n"
11992
"endings or line endings get mixed during editing, it gets committed\n"
11993
"correctly and gets checked out correctly. For example::"
11994
msgstr ""
11995
11996
#: en/help_topics/eol.txt:61
11997
msgid ""
11998
"  [name *.bat]\n"
11999
"  eol = crlf"
12000
msgstr ""
12001
12002
#: en/help_topics/eol.txt:64
12003
msgid ""
12004
"  [name *.sh]\n"
12005
"  eol = lf"
12006
msgstr ""
12007
12008
#: en/help_topics/eol.txt:70
12009
msgid ""
12010
"If you take the care to create files with their required endings, you can\n"
12011
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12012
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12013
"introducing mixed line endings will be corrected during commit for files\n"
12014
"with those settings."
12015
msgstr ""
12016
12017
#: en/help_topics/eol.txt:76
12018
msgid ""
12019
"If you have sample test data that deliberately has text files with mixed\n"
12020
"newline conventions, you can ask for those to be left alone like this::"
12021
msgstr ""
12022
12023
#: en/help_topics/eol.txt:79
12024
msgid ""
12025
"  [name test_data/]\n"
12026
"  eol = exact"
12027
msgstr ""
12028
12029
#: en/help_topics/eol.txt:85
12030
msgid ""
12031
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12032
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12033
"of content analysis to detect binary files for commands like ``diff``.\n"
12034
"In the future, a ``binary = true`` rule may be added but it is not\n"
12035
"supported yet.)"
12036
msgstr ""
12037
12038
#: en/help_topics/eol.txt:91
12039
msgid ""
12040
"If you have an existing repository with text files already stored using\n"
12041
"Windows newline conventions (``crlf``), then you may want to keep using "
12042
"that\n"
12043
"convention in the repository. Forcing certain files to this convention\n"
12044
"may also help users who do not have rules configured. To do this, set\n"
12045
"``eol`` to one of the values below."
12046
msgstr ""
12047
12048
#: en/help_topics/eol.txt:97
12049
msgid ""
12050
" ============================ ======================== "
12051
"======================\n"
12052
" Value                        Checkout end-of-lines as Commit end-of-lines "
12053
"as\n"
12054
" ============================ ======================== "
12055
"======================\n"
12056
" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
12057
"                              ``lf`` otherwise\n"
6622.1.22 by Jelmer Vernooij
Update po files.
12058
" ---------------------------- ------------------------ "
12059
"----------------------\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12060
" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
6622.1.22 by Jelmer Vernooij
Update po files.
12061
" ---------------------------- ------------------------ "
12062
"----------------------\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12063
" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
12064
" ============================ ======================== ======================"
12065
msgstr ""
12066
12067
#: en/help_topics/eol.txt:108
12068
msgid ""
12069
"For users working on an existing project that uses Windows newline\n"
12070
"conventions in their Bazaar repository, this rule is suggested as a\n"
12071
"starting point::"
12072
msgstr ""
12073
12074
#: en/help_topics/eol.txt:112
12075
msgid ""
12076
"  [name *]\n"
12077
"  eol = native-with-crlf-in-repo"
12078
msgstr ""
12079
12080
#: en/help_topics/eol.txt:115
12081
msgid ""
12082
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12083
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12084
"``crlf`` and ``exact``."
12085
msgstr ""
12086
12087
#: en/help_topics/eol.txt:119
12088
msgid ""
12089
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12090
"never reject files because a given line ending or mixed line endings\n"
12091
"are found. A precommit hook should be used if you wish to validate\n"
12092
"(and not just convert) content before committing.\n"
12093
msgstr ""
12094
12095
#: en/help_topics/hidden-commands.txt:1
12096
msgid ""
12097
"added                List files added in working tree.\n"
12098
"ancestry             List all revisions merged into this branch.\n"
12099
"assert-fail          Test reporting of assertion failures\n"
12100
"bundle-info          Output interesting stats about a bundle\n"
12101
"bundle-revisions     Create a merge-directive for submitting changes.\n"
12102
"cat-revision         Write out metadata for a revision.\n"
12103
"dump-btree           Dump the contents of a btree index file to stdout.\n"
12104
"export-pot           Export command helps and error messages in po format.\n"
12105
"file-id              Print file_id of a particular file or directory.\n"
12106
"file-path            Print path of file_ids to a file or directory.\n"
12107
"find-merge-base      Find and print a base revision for merging two "
12108
"branches.\n"
12109
"hooks                Show hooks.\n"
12110
"inventory            Show inventory of the current working copy or a "
12111
"revision.\n"
12112
"local-time-offset    Show the offset in seconds from GMT to local time.\n"
12113
"lookup-revision      Lookup the revision-id from a revision-number\n"
12114
"merge-directive      Generate a merge directive for auto-merge tools.\n"
12115
"modified             List files modified in working tree.\n"
12116
"re-sign              Create a digital signature for an existing revision.\n"
12117
"reference            list, view and set branch locations for nested trees.\n"
12118
"relpath              Show path of a file relative to root\n"
12119
"repair-workingtree   Reset the working tree state file.\n"
12120
"revision-history     Display the list of revision ids on a branch.\n"
12121
"revision-info        Show revision number and revision id for a given "
12122
"revision\n"
12123
"                     identifier.\n"
12124
"rocks                Statement of optimism.\n"
12125
"selftest             Run internal test suite.\n"
12126
"shell-complete       Show appropriate completions for context.\n"
12127
"test-script          Run a shell-like test from a file.\n"
12128
"touching-revisions   Return revision-ids which affected a particular file.\n"
12129
"unknowns             List unknown files.\n"
12130
"wait-until-signalled Test helper for\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
12131
"                     test_start_and_stop_brz_subprocess_send_signal.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:1
12135
msgid ""
12136
"\n"
12137
"Hooks\n"
12138
"====="
12139
msgstr ""
12140
12141
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12142
msgid ""
12143
"Introduction\n"
12144
"------------"
12145
msgstr ""
12146
12147
#: en/help_topics/hooks.txt:8
12148
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12149
msgstr ""
12150
12151
#: en/help_topics/hooks.txt:10
12152
msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
12153
msgstr ""
12154
12155
#: en/help_topics/hooks.txt:12
12156
msgid ""
12157
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:14
12161
msgid ""
12162
"The class that contains each hook is given before the hooks it supplies. "
12163
"For\n"
12164
"instance, BranchHooks as the class is the hooks class for\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12165
"`breezy.branch.Branch.hooks`."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12166
msgstr ""
12167
12168
#: en/help_topics/hooks.txt:18
12169
msgid ""
12170
"Each description also indicates whether the hook runs on the client (the\n"
12171
"machine where bzr was invoked) or the server (the machine addressed by\n"
12172
"the branch URL).  These may be, but are not necessarily, the same machine."
12173
msgstr ""
12174
12175
#: en/help_topics/hooks.txt:22
12176
msgid ""
12177
"Plugins (including hooks) are run on the server if all of these is true:"
12178
msgstr ""
12179
12180
#: en/help_topics/hooks.txt:24
12181
msgid ""
12182
"  * The connection is via a smart server (accessed with a URL starting with\n"
12183
"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12184
"\"http://\"\n"
12185
"    URL when a smart server is available via HTTP)."
12186
msgstr ""
12187
12188
#: en/help_topics/hooks.txt:28
12189
msgid ""
12190
"  * The hook is either server specific or part of general infrastructure "
12191
"rather\n"
12192
"    than client specific code (such as commit)."
12193
msgstr ""
12194
12195
#: en/help_topics/hooks.txt:31
12196
msgid ""
12197
"\n"
12198
"BranchHooks\n"
12199
"-----------"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:35
12203
msgid ""
12204
"automatic_tag_name\n"
12205
"~~~~~~~~~~~~~~~~~~"
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
6622.1.22 by Jelmer Vernooij
Update po files.
12209
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12210
msgid "Introduced in: 2.2"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:40
12214
msgid ""
12215
"Called to determine an automatic tag name for a revision.\n"
12216
"automatic_tag_name is called with (branch, revision_id) and should\n"
12217
"return a tag name or None if no tag name could be determined. The\n"
12218
"first non-None tag name returned will be used."
12219
msgstr ""
12220
12221
#: en/help_topics/hooks.txt:45
12222
msgid ""
12223
"open\n"
12224
"~~~~"
12225
msgstr ""
12226
6622.1.22 by Jelmer Vernooij
Update po files.
12227
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12228
#: en/help_topics/hooks.txt:307
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12229
msgid "Introduced in: 1.8"
12230
msgstr ""
12231
12232
#: en/help_topics/hooks.txt:50
12233
msgid ""
12234
"Called with the Branch object that has been opened after a branch is\n"
12235
"opened."
12236
msgstr ""
12237
12238
#: en/help_topics/hooks.txt:53
12239
msgid ""
12240
"post_branch_init\n"
12241
"~~~~~~~~~~~~~~~~"
12242
msgstr ""
12243
12244
#: en/help_topics/hooks.txt:58
12245
msgid ""
12246
"Called after new branch initialization completes. post_branch_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12247
"called with a breezy.branch.BranchInitHookParams. Note that init,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12248
"branch and checkout (both heavyweight and lightweight) will all\n"
12249
"trigger this hook."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:63
12253
msgid ""
12254
"post_change_branch_tip\n"
12255
"~~~~~~~~~~~~~~~~~~~~~~"
12256
msgstr ""
12257
6622.1.22 by Jelmer Vernooij
Update po files.
12258
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12259
msgid "Introduced in: 1.4"
12260
msgstr ""
12261
12262
#: en/help_topics/hooks.txt:68
12263
msgid ""
12264
"Called in bzr client and server after a change to the tip of a branch\n"
12265
"is made. post_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12266
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12267
"uncommit will all trigger this hook."
12268
msgstr ""
12269
6622.1.22 by Jelmer Vernooij
Update po files.
12270
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12271
msgid ""
12272
"post_commit\n"
12273
"~~~~~~~~~~~"
12274
msgstr ""
12275
12276
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12277
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12278
msgid "Introduced in: 0.15"
12279
msgstr ""
12280
12281
#: en/help_topics/hooks.txt:78
12282
msgid ""
12283
"Called in the bzr client after a commit has completed. post_commit is\n"
12284
"called with (local, master, old_revno, old_revid, new_revno,\n"
12285
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12286
"branch."
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:83
12290
msgid ""
12291
"post_pull\n"
12292
"~~~~~~~~~"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:88
12296
msgid ""
12297
"Called after a pull operation completes. post_pull is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12298
"breezy.branch.PullResult object and only runs in the bzr client."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:91
12302
msgid ""
12303
"post_push\n"
12304
"~~~~~~~~~"
12305
msgstr ""
12306
12307
#: en/help_topics/hooks.txt:96
12308
msgid ""
12309
"Called after a push operation completes. post_push is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12310
"breezy.branch.BranchPushResult object and only runs in the bzr client."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12311
msgstr ""
12312
12313
#: en/help_topics/hooks.txt:99
12314
msgid ""
12315
"post_switch\n"
12316
"~~~~~~~~~~~"
12317
msgstr ""
12318
12319
#: en/help_topics/hooks.txt:104
12320
msgid ""
12321
"Called after a checkout switches branch. post_switch is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12322
"breezy.branch.SwitchHookParams."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12323
msgstr ""
12324
12325
#: en/help_topics/hooks.txt:107
12326
msgid ""
12327
"post_uncommit\n"
12328
"~~~~~~~~~~~~~"
12329
msgstr ""
12330
12331
#: en/help_topics/hooks.txt:112
12332
msgid ""
12333
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12334
"called with (local, master, old_revno, old_revid, new_revno,\n"
12335
"new_revid) where local is the local branch or None, master is the\n"
12336
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12337
"of None."
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:118
12341
msgid ""
12342
"pre_change_branch_tip\n"
12343
"~~~~~~~~~~~~~~~~~~~~~"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:121
12347
msgid "Introduced in: 1.6"
12348
msgstr ""
12349
12350
#: en/help_topics/hooks.txt:123
12351
msgid ""
12352
"Called in bzr client and server before a change to the tip of a branch\n"
12353
"is made. pre_change_branch_tip is called with a\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12354
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12355
"uncommit will all trigger this hook."
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:128
12359
msgid ""
12360
"pre_commit\n"
12361
"~~~~~~~~~~"
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:131
12365
msgid "Introduced in: 0.91"
12366
msgstr ""
12367
12368
#: en/help_topics/hooks.txt:133
12369
msgid ""
12370
"Called after a commit is calculated but before it is completed.\n"
12371
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12372
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12373
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12374
"TreeDelta object describing changes from the basis revision. hooks\n"
12375
"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
12376
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12377
"tree."
12378
msgstr ""
12379
12380
#: en/help_topics/hooks.txt:142
12381
msgid ""
12382
"transform_fallback_location\n"
12383
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12384
msgstr ""
12385
6622.1.22 by Jelmer Vernooij
Update po files.
12386
#: en/help_topics/hooks.txt:145
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12387
msgid "Introduced in: 1.9"
12388
msgstr ""
12389
6622.1.22 by Jelmer Vernooij
Update po files.
12390
#: en/help_topics/hooks.txt:147
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12391
msgid ""
12392
"Called when a stacked branch is activating its fallback locations.\n"
12393
"transform_fallback_location is called with (branch, url), and should\n"
12394
"return a new url. Returning the same url allows it to be used as-is,\n"
12395
"returning a different one can be used to cause the branch to stack on\n"
12396
"a closer copy of that fallback_location. Note that the branch cannot\n"
12397
"have history accessing methods called on it during this hook because\n"
12398
"the fallback locations have not been activated. When there are\n"
12399
"multiple hooks installed for transform_fallback_location, all are\n"
12400
"called with the url returned from the previous hook.The order is\n"
12401
"however undefined."
12402
msgstr ""
12403
6622.1.22 by Jelmer Vernooij
Update po files.
12404
#: en/help_topics/hooks.txt:158
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12405
msgid ""
12406
"CommandHooks\n"
12407
"------------"
12408
msgstr ""
12409
6622.1.22 by Jelmer Vernooij
Update po files.
12410
#: en/help_topics/hooks.txt:161
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12411
msgid ""
12412
"extend_command\n"
12413
"~~~~~~~~~~~~~~"
12414
msgstr ""
12415
6622.1.22 by Jelmer Vernooij
Update po files.
12416
#: en/help_topics/hooks.txt:164
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12417
msgid "Introduced in: 1.13"
12418
msgstr ""
12419
6622.1.22 by Jelmer Vernooij
Update po files.
12420
#: en/help_topics/hooks.txt:166
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12421
msgid ""
12422
"Called after creating a command object to allow modifications such as\n"
12423
"adding or removing options, docs etc. Called with the new\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12424
"breezy.commands.Command object."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12425
msgstr ""
12426
6622.1.22 by Jelmer Vernooij
Update po files.
12427
#: en/help_topics/hooks.txt:170
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12428
msgid ""
12429
"get_command\n"
12430
"~~~~~~~~~~~"
12431
msgstr ""
12432
6622.1.22 by Jelmer Vernooij
Update po files.
12433
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12434
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12435
msgid "Introduced in: 1.17"
12436
msgstr ""
12437
6622.1.22 by Jelmer Vernooij
Update po files.
12438
#: en/help_topics/hooks.txt:175
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12439
msgid ""
12440
"Called when creating a single command. Called with (cmd_or_None,\n"
12441
"command_name). get_command should either return the cmd_or_None\n"
12442
"parameter, or a replacement Command object that should be used for the\n"
12443
"command. Note that the Command.hooks hooks are core infrastructure.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12444
"Many users will prefer to use breezy.commands.register_command or\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12445
"plugin_cmds.register_lazy."
12446
msgstr ""
12447
6622.1.22 by Jelmer Vernooij
Update po files.
12448
#: en/help_topics/hooks.txt:182
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12449
msgid ""
12450
"get_missing_command\n"
12451
"~~~~~~~~~~~~~~~~~~~"
12452
msgstr ""
12453
6622.1.22 by Jelmer Vernooij
Update po files.
12454
#: en/help_topics/hooks.txt:187
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12455
msgid ""
12456
"Called when creating a single command if no command could be found.\n"
12457
"Called with (command_name). get_missing_command should either return\n"
12458
"None, or a Command object to be used for the command."
12459
msgstr ""
12460
6622.1.22 by Jelmer Vernooij
Update po files.
12461
#: en/help_topics/hooks.txt:191
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12462
msgid ""
12463
"list_commands\n"
12464
"~~~~~~~~~~~~~"
12465
msgstr ""
12466
6622.1.22 by Jelmer Vernooij
Update po files.
12467
#: en/help_topics/hooks.txt:196
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12468
msgid ""
12469
"Called when enumerating commands. Called with a set of cmd_name\n"
12470
"strings for all the commands found so far. This set  is safe to mutate\n"
12471
"- e.g. to remove a command. list_commands should return the updated\n"
12472
"set of command names."
12473
msgstr ""
12474
6622.1.22 by Jelmer Vernooij
Update po files.
12475
#: en/help_topics/hooks.txt:201
12476
msgid ""
12477
"post_command\n"
12478
"~~~~~~~~~~~~"
12479
msgstr ""
12480
12481
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12482
msgid "Introduced in: 2.6"
12483
msgstr ""
12484
12485
#: en/help_topics/hooks.txt:206
12486
msgid "Called after executing a command. Called with the command object."
12487
msgstr ""
12488
12489
#: en/help_topics/hooks.txt:208
12490
msgid ""
12491
"pre_command\n"
12492
"~~~~~~~~~~~"
12493
msgstr ""
12494
12495
#: en/help_topics/hooks.txt:213
12496
msgid "Called prior to executing a command. Called with the command object."
12497
msgstr ""
12498
12499
#: en/help_topics/hooks.txt:215
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12500
msgid ""
12501
"_ConfigHooks\n"
12502
"------------"
12503
msgstr ""
12504
6622.1.22 by Jelmer Vernooij
Update po files.
12505
#: en/help_topics/hooks.txt:218
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12506
msgid ""
12507
"get\n"
12508
"~~~"
12509
msgstr ""
12510
6622.1.22 by Jelmer Vernooij
Update po files.
12511
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12512
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12513
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12514
#: en/help_topics/hooks.txt:446
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12515
msgid "Introduced in: 2.4"
12516
msgstr ""
12517
6622.1.22 by Jelmer Vernooij
Update po files.
12518
#: en/help_topics/hooks.txt:223
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12519
msgid ""
12520
"Invoked when a config option is read. The signature is (stack, name,\n"
12521
"value)."
12522
msgstr ""
12523
6622.1.22 by Jelmer Vernooij
Update po files.
12524
#: en/help_topics/hooks.txt:226
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12525
msgid ""
12526
"load\n"
12527
"~~~~"
12528
msgstr ""
12529
6622.1.22 by Jelmer Vernooij
Update po files.
12530
#: en/help_topics/hooks.txt:231
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12531
msgid "Invoked when a config store is loaded. The signature is (store)."
12532
msgstr ""
12533
6622.1.22 by Jelmer Vernooij
Update po files.
12534
#: en/help_topics/hooks.txt:233
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12535
msgid ""
12536
"remove\n"
12537
"~~~~~~"
12538
msgstr ""
12539
6622.1.22 by Jelmer Vernooij
Update po files.
12540
#: en/help_topics/hooks.txt:238
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12541
msgid ""
12542
"Invoked when a config option is removed. The signature is (stack,\n"
12543
"name)."
12544
msgstr ""
12545
6622.1.22 by Jelmer Vernooij
Update po files.
12546
#: en/help_topics/hooks.txt:241
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12547
msgid ""
12548
"save\n"
12549
"~~~~"
12550
msgstr ""
12551
6622.1.22 by Jelmer Vernooij
Update po files.
12552
#: en/help_topics/hooks.txt:246
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12553
msgid "Invoked when a config store is saved. The signature is (store)."
12554
msgstr ""
12555
6622.1.22 by Jelmer Vernooij
Update po files.
12556
#: en/help_topics/hooks.txt:248
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12557
msgid ""
12558
"set\n"
12559
"~~~"
12560
msgstr ""
12561
6622.1.22 by Jelmer Vernooij
Update po files.
12562
#: en/help_topics/hooks.txt:253
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12563
msgid ""
12564
"Invoked when a config option is set. The signature is (stack, name,\n"
12565
"value)."
12566
msgstr ""
12567
6622.1.22 by Jelmer Vernooij
Update po files.
12568
#: en/help_topics/hooks.txt:256
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12569
msgid ""
12570
"ControlDirHooks\n"
12571
"---------------"
12572
msgstr ""
12573
6622.1.22 by Jelmer Vernooij
Update po files.
12574
#: en/help_topics/hooks.txt:259
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12575
msgid ""
12576
"post_repo_init\n"
12577
"~~~~~~~~~~~~~~"
12578
msgstr ""
12579
6622.1.22 by Jelmer Vernooij
Update po files.
12580
#: en/help_topics/hooks.txt:264
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12581
msgid ""
12582
"Invoked after a repository has been initialized. post_repo_init is\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12583
"called with a breezy.controldir.RepoInitHookParams."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12584
msgstr ""
12585
6622.1.22 by Jelmer Vernooij
Update po files.
12586
#: en/help_topics/hooks.txt:267
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12587
msgid ""
12588
"pre_open\n"
12589
"~~~~~~~~"
12590
msgstr ""
12591
6622.1.22 by Jelmer Vernooij
Update po files.
12592
#: en/help_topics/hooks.txt:270
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12593
msgid "Introduced in: 1.14"
12594
msgstr ""
12595
6622.1.22 by Jelmer Vernooij
Update po files.
12596
#: en/help_topics/hooks.txt:272
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12597
msgid ""
12598
"Invoked before attempting to open a ControlDir with the transport that\n"
12599
"the open will use."
12600
msgstr ""
12601
6622.1.22 by Jelmer Vernooij
Update po files.
12602
#: en/help_topics/hooks.txt:275
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12603
msgid ""
12604
"InfoHooks\n"
12605
"---------"
12606
msgstr ""
12607
6622.1.22 by Jelmer Vernooij
Update po files.
12608
#: en/help_topics/hooks.txt:278
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12609
msgid ""
12610
"repository\n"
12611
"~~~~~~~~~~"
12612
msgstr ""
12613
6622.1.22 by Jelmer Vernooij
Update po files.
12614
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12615
#: en/help_topics/hooks.txt:524
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12616
msgid "Introduced in: 1.15"
12617
msgstr ""
12618
6622.1.22 by Jelmer Vernooij
Update po files.
12619
#: en/help_topics/hooks.txt:283
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12620
msgid ""
12621
"Invoked when displaying the statistics for a repository. repository is\n"
12622
"called with a statistics dictionary as returned by the repository and\n"
12623
"a file-like object to write to."
12624
msgstr ""
12625
6622.1.22 by Jelmer Vernooij
Update po files.
12626
#: en/help_topics/hooks.txt:287
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12627
msgid ""
12628
"LockHooks\n"
12629
"---------"
12630
msgstr ""
12631
6622.1.22 by Jelmer Vernooij
Update po files.
12632
#: en/help_topics/hooks.txt:290
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12633
msgid ""
12634
"lock_acquired\n"
12635
"~~~~~~~~~~~~~"
12636
msgstr ""
12637
6622.1.22 by Jelmer Vernooij
Update po files.
12638
#: en/help_topics/hooks.txt:295
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12639
msgid "Called with a breezy.lock.LockResult when a physical lock is acquired."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12640
msgstr ""
12641
6622.1.22 by Jelmer Vernooij
Update po files.
12642
#: en/help_topics/hooks.txt:297
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12643
msgid ""
12644
"lock_broken\n"
12645
"~~~~~~~~~~~"
12646
msgstr ""
12647
6622.1.22 by Jelmer Vernooij
Update po files.
12648
#: en/help_topics/hooks.txt:302
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12649
msgid "Called with a breezy.lock.LockResult when a physical lock is broken."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12650
msgstr ""
12651
6622.1.22 by Jelmer Vernooij
Update po files.
12652
#: en/help_topics/hooks.txt:304
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12653
msgid ""
12654
"lock_released\n"
12655
"~~~~~~~~~~~~~"
12656
msgstr ""
12657
6622.1.22 by Jelmer Vernooij
Update po files.
12658
#: en/help_topics/hooks.txt:309
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12659
msgid "Called with a breezy.lock.LockResult when a physical lock is released."
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12660
msgstr ""
12661
6622.1.22 by Jelmer Vernooij
Update po files.
12662
#: en/help_topics/hooks.txt:311
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12663
msgid ""
12664
"MergeHooks\n"
12665
"----------"
12666
msgstr ""
12667
6622.1.22 by Jelmer Vernooij
Update po files.
12668
#: en/help_topics/hooks.txt:314
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12669
msgid ""
12670
"merge_file_content\n"
12671
"~~~~~~~~~~~~~~~~~~"
12672
msgstr ""
12673
6622.1.22 by Jelmer Vernooij
Update po files.
12674
#: en/help_topics/hooks.txt:317
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12675
msgid "Introduced in: 2.1"
12676
msgstr ""
12677
6622.1.22 by Jelmer Vernooij
Update po files.
12678
#: en/help_topics/hooks.txt:319
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12679
msgid ""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12680
"Called with a breezy.merge.Merger object to create a per file merge\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12681
"object when starting a merge. Should return either None or a subclass\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12682
"of ``breezy.merge.AbstractPerFileMerger``. Such objects will then be\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12683
"called per file that needs to be merged (including when one side has\n"
12684
"deleted the file and the other has changed it). See the\n"
12685
"AbstractPerFileMerger API docs for details on how it is used by merge."
12686
msgstr ""
12687
6622.1.22 by Jelmer Vernooij
Update po files.
12688
#: en/help_topics/hooks.txt:326
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12689
msgid ""
12690
"post_merge\n"
12691
"~~~~~~~~~~"
12692
msgstr ""
12693
6622.1.22 by Jelmer Vernooij
Update po files.
12694
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12695
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12696
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12697
msgid "Introduced in: 2.5"
12698
msgstr ""
12699
6622.1.22 by Jelmer Vernooij
Update po files.
12700
#: en/help_topics/hooks.txt:331
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12701
msgid ""
12702
"Called after a merge. Receives a Merger object as the single argument.\n"
12703
"The return value is ignored."
12704
msgstr ""
12705
6622.1.22 by Jelmer Vernooij
Update po files.
12706
#: en/help_topics/hooks.txt:334
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12707
msgid ""
12708
"pre_merge\n"
12709
"~~~~~~~~~"
12710
msgstr ""
12711
6622.1.22 by Jelmer Vernooij
Update po files.
12712
#: en/help_topics/hooks.txt:339
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12713
msgid ""
12714
"Called before a merge. Receives a Merger object as the single\n"
12715
"argument."
12716
msgstr ""
12717
6622.1.22 by Jelmer Vernooij
Update po files.
12718
#: en/help_topics/hooks.txt:342
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12719
msgid ""
12720
"MergeDirectiveHooks\n"
12721
"-------------------"
12722
msgstr ""
12723
6622.1.22 by Jelmer Vernooij
Update po files.
12724
#: en/help_topics/hooks.txt:345
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12725
msgid ""
12726
"merge_request_body\n"
12727
"~~~~~~~~~~~~~~~~~~"
12728
msgstr ""
12729
6622.1.22 by Jelmer Vernooij
Update po files.
12730
#: en/help_topics/hooks.txt:348
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12731
msgid "Introduced in: 1.15.0"
12732
msgstr ""
12733
6622.1.22 by Jelmer Vernooij
Update po files.
12734
#: en/help_topics/hooks.txt:350
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12735
msgid ""
12736
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12737
"request.  Callbacks must return a body.  If more than one callback is\n"
12738
"registered, the output of one callback is provided to the next."
12739
msgstr ""
12740
6622.1.22 by Jelmer Vernooij
Update po files.
12741
#: en/help_topics/hooks.txt:354
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12742
msgid ""
12743
"MessageEditorHooks\n"
12744
"------------------"
12745
msgstr ""
12746
6622.1.22 by Jelmer Vernooij
Update po files.
12747
#: en/help_topics/hooks.txt:357
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12748
msgid ""
12749
"commit_message_template\n"
12750
"~~~~~~~~~~~~~~~~~~~~~~~"
12751
msgstr ""
12752
6622.1.22 by Jelmer Vernooij
Update po files.
12753
#: en/help_topics/hooks.txt:360
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12754
msgid "Introduced in: 1.10"
12755
msgstr ""
12756
6622.1.22 by Jelmer Vernooij
Update po files.
12757
#: en/help_topics/hooks.txt:362
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12758
msgid ""
12759
"Called when a commit message is being generated.\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12760
"commit_message_template is called with the breezy.commit.Commit object\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12761
"and the message that is known so far. commit_message_template must\n"
12762
"return a new message to use (which could be the same as it was given).\n"
12763
"When there are multiple hooks registered for commit_message_template,\n"
12764
"they are chained with the result from the first passed into the\n"
12765
"second, and so on."
12766
msgstr ""
12767
6622.1.22 by Jelmer Vernooij
Update po files.
12768
#: en/help_topics/hooks.txt:370
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12769
msgid ""
12770
"set_commit_message\n"
12771
"~~~~~~~~~~~~~~~~~~"
12772
msgstr ""
12773
6622.1.22 by Jelmer Vernooij
Update po files.
12774
#: en/help_topics/hooks.txt:375
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12775
msgid ""
12776
"Set a fixed commit message. set_commit_message is called with the\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12777
"breezy.commit.Commit object (so you can also change e.g. revision\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12778
"properties by editing commit.builder._revprops) and the message so\n"
12779
"far. set_commit_message must return the message to use or None if it\n"
12780
"should use the message editor as normal."
12781
msgstr ""
12782
6622.1.22 by Jelmer Vernooij
Update po files.
12783
#: en/help_topics/hooks.txt:381
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12784
msgid ""
12785
"MutableTreeHooks\n"
12786
"----------------"
12787
msgstr ""
12788
6622.1.22 by Jelmer Vernooij
Update po files.
12789
#: en/help_topics/hooks.txt:384
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12790
msgid ""
12791
"post_build_tree\n"
12792
"~~~~~~~~~~~~~~~"
12793
msgstr ""
12794
6622.1.22 by Jelmer Vernooij
Update po files.
12795
#: en/help_topics/hooks.txt:389
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12796
msgid ""
12797
"Called after a completely new tree is built. The hook is called with\n"
12798
"the tree as its only argument."
12799
msgstr ""
12800
6622.1.22 by Jelmer Vernooij
Update po files.
12801
#: en/help_topics/hooks.txt:395
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12802
msgid "Introduced in: 2.0"
12803
msgstr ""
12804
6622.1.22 by Jelmer Vernooij
Update po files.
12805
#: en/help_topics/hooks.txt:397
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12806
msgid ""
12807
"Called after a commit is performed on a tree. The hook is called with\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12808
"a breezy.mutabletree.PostCommitHookParams object. The mutable tree the\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12809
"commit was performed on is available via the mutable_tree attribute of\n"
12810
"that object."
12811
msgstr ""
12812
6622.1.22 by Jelmer Vernooij
Update po files.
12813
#: en/help_topics/hooks.txt:402
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12814
msgid ""
12815
"post_transform\n"
12816
"~~~~~~~~~~~~~~"
12817
msgstr ""
12818
6622.1.22 by Jelmer Vernooij
Update po files.
12819
#: en/help_topics/hooks.txt:407
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12820
msgid ""
12821
"Called after a tree transform has been performed on a tree. The hook\n"
12822
"is called with the tree that is being transformed and the transform."
12823
msgstr ""
12824
6622.1.22 by Jelmer Vernooij
Update po files.
12825
#: en/help_topics/hooks.txt:410
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12826
msgid ""
12827
"pre_transform\n"
12828
"~~~~~~~~~~~~~"
12829
msgstr ""
12830
6622.1.22 by Jelmer Vernooij
Update po files.
12831
#: en/help_topics/hooks.txt:415
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12832
msgid ""
12833
"Called before a tree transform on this tree. The hook is called with\n"
12834
"the tree that is being transformed and the transform."
12835
msgstr ""
12836
6622.1.22 by Jelmer Vernooij
Update po files.
12837
#: en/help_topics/hooks.txt:418
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12838
msgid ""
12839
"start_commit\n"
12840
"~~~~~~~~~~~~"
12841
msgstr ""
12842
6622.1.22 by Jelmer Vernooij
Update po files.
12843
#: en/help_topics/hooks.txt:423
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12844
msgid ""
12845
"Called before a commit is performed on a tree. The start commit hook\n"
12846
"is able to change the tree before the commit takes place. start_commit\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12847
"is called with the breezy.mutabletree.MutableTree that the commit is\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12848
"being performed on."
12849
msgstr ""
12850
6622.1.22 by Jelmer Vernooij
Update po files.
12851
#: en/help_topics/hooks.txt:428
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12852
msgid ""
12853
"SmartClientHooks\n"
12854
"----------------"
12855
msgstr ""
12856
6622.1.22 by Jelmer Vernooij
Update po files.
12857
#: en/help_topics/hooks.txt:431
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12858
msgid ""
12859
"call\n"
12860
"~~~~"
12861
msgstr ""
12862
6622.1.22 by Jelmer Vernooij
Update po files.
12863
#: en/help_topics/hooks.txt:434
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12864
msgid "Introduced in: unknown"
12865
msgstr ""
12866
6622.1.22 by Jelmer Vernooij
Update po files.
12867
#: en/help_topics/hooks.txt:436
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12868
msgid ""
12869
"Called when the smart client is submitting a request to the smart\n"
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
12870
"server. Called with a breezy.smart.client.CallHookParams object.\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12871
"Streaming request bodies, and responses, are not accessible."
12872
msgstr ""
12873
6622.1.22 by Jelmer Vernooij
Update po files.
12874
#: en/help_topics/hooks.txt:440
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12875
msgid ""
12876
"SmartServerHooks\n"
12877
"----------------"
12878
msgstr ""
12879
6622.1.22 by Jelmer Vernooij
Update po files.
12880
#: en/help_topics/hooks.txt:443
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12881
msgid ""
12882
"server_exception\n"
12883
"~~~~~~~~~~~~~~~~"
12884
msgstr ""
12885
6622.1.22 by Jelmer Vernooij
Update po files.
12886
#: en/help_topics/hooks.txt:448
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12887
msgid ""
12888
"Called by the bzr server when an exception occurs. server_exception is\n"
12889
"called with the sys.exc_info() tuple return true for the hook if the\n"
12890
"exception has been handled, in which case the server will exit\n"
12891
"normally."
12892
msgstr ""
12893
6622.1.22 by Jelmer Vernooij
Update po files.
12894
#: en/help_topics/hooks.txt:453
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12895
msgid ""
12896
"server_started\n"
12897
"~~~~~~~~~~~~~~"
12898
msgstr ""
12899
6622.1.22 by Jelmer Vernooij
Update po files.
12900
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12901
msgid "Introduced in: 0.16"
12902
msgstr ""
12903
6622.1.22 by Jelmer Vernooij
Update po files.
12904
#: en/help_topics/hooks.txt:458
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12905
msgid ""
12906
"Called by the bzr server when it starts serving a directory.\n"
12907
"server_started is called with (backing urls, public url), where\n"
12908
"backing_url is a list of URLs giving the server-specific directory\n"
12909
"locations, and public_url is the public URL for the directory being\n"
12910
"served."
12911
msgstr ""
12912
6622.1.22 by Jelmer Vernooij
Update po files.
12913
#: en/help_topics/hooks.txt:464
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12914
msgid ""
12915
"server_started_ex\n"
12916
"~~~~~~~~~~~~~~~~~"
12917
msgstr ""
12918
6622.1.22 by Jelmer Vernooij
Update po files.
12919
#: en/help_topics/hooks.txt:469
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12920
msgid ""
12921
"Called by the bzr server when it starts serving a directory.\n"
12922
"server_started is called with (backing_urls, server_obj)."
12923
msgstr ""
12924
6622.1.22 by Jelmer Vernooij
Update po files.
12925
#: en/help_topics/hooks.txt:472
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12926
msgid ""
12927
"server_stopped\n"
12928
"~~~~~~~~~~~~~~"
12929
msgstr ""
12930
6622.1.22 by Jelmer Vernooij
Update po files.
12931
#: en/help_topics/hooks.txt:477
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12932
msgid ""
12933
"Called by the bzr server when it stops serving a directory.\n"
12934
"server_stopped is called with the same parameters as the\n"
12935
"server_started hook: (backing_urls, public_url)."
12936
msgstr ""
12937
6622.1.22 by Jelmer Vernooij
Update po files.
12938
#: en/help_topics/hooks.txt:481
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12939
msgid ""
12940
"StatusHooks\n"
12941
"-----------"
12942
msgstr ""
12943
6622.1.22 by Jelmer Vernooij
Update po files.
12944
#: en/help_topics/hooks.txt:484
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12945
msgid ""
12946
"post_status\n"
12947
"~~~~~~~~~~~"
12948
msgstr ""
12949
6622.1.22 by Jelmer Vernooij
Update po files.
12950
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12951
msgid "Introduced in: 2.3"
12952
msgstr ""
12953
6622.1.22 by Jelmer Vernooij
Update po files.
12954
#: en/help_topics/hooks.txt:489
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12955
msgid ""
12956
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12957
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12958
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12959
"correspond to the command line options specified by the user for the\n"
12960
"status command. to_file is the output stream for writing."
12961
msgstr ""
12962
6622.1.22 by Jelmer Vernooij
Update po files.
12963
#: en/help_topics/hooks.txt:495
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12964
msgid ""
12965
"pre_status\n"
12966
"~~~~~~~~~~"
12967
msgstr ""
12968
6622.1.22 by Jelmer Vernooij
Update po files.
12969
#: en/help_topics/hooks.txt:500
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12970
msgid ""
12971
"Called with argument StatusHookParams before Bazaar displays the\n"
12972
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12973
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12974
"correspond to the command line options specified by the user for the\n"
12975
"status command. to_file is the output stream for writing."
12976
msgstr ""
12977
6622.1.22 by Jelmer Vernooij
Update po files.
12978
#: en/help_topics/hooks.txt:506
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12979
msgid ""
12980
"TransportHooks\n"
12981
"--------------"
12982
msgstr ""
12983
6622.1.22 by Jelmer Vernooij
Update po files.
12984
#: en/help_topics/hooks.txt:509
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12985
msgid ""
12986
"post_connect\n"
12987
"~~~~~~~~~~~~"
12988
msgstr ""
12989
6622.1.22 by Jelmer Vernooij
Update po files.
12990
#: en/help_topics/hooks.txt:514
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12991
msgid ""
12992
"Called after a new connection is established or a reconnect occurs.\n"
12993
"The sole argument passed is either the connected transport or smart\n"
12994
"medium instance."
12995
msgstr ""
12996
6622.1.22 by Jelmer Vernooij
Update po files.
12997
#: en/help_topics/hooks.txt:518
6524.1.1 by Jelmer Vernooij
Merge 2.5.
12998
msgid ""
12999
"RioVersionInfoBuilderHooks\n"
13000
"--------------------------"
13001
msgstr ""
13002
6622.1.22 by Jelmer Vernooij
Update po files.
13003
#: en/help_topics/hooks.txt:521
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13004
msgid ""
13005
"revision\n"
13006
"~~~~~~~~"
13007
msgstr ""
13008
6622.1.22 by Jelmer Vernooij
Update po files.
13009
#: en/help_topics/hooks.txt:526
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13010
msgid ""
13011
"Invoked when adding information about a revision to the RIO stanza\n"
13012
"that is printed. revision is called with a revision object and a RIO\n"
13013
"stanza.\n"
13014
msgstr ""
13015
13016
#: en/help_topics/location-alias.txt:1
13017
msgid ""
13018
"Location aliases\n"
13019
"================"
13020
msgstr ""
13021
13022
#: en/help_topics/location-alias.txt:4
13023
msgid ""
13024
"Bazaar defines several aliases for locations associated with a branch.  "
13025
"These\n"
13026
"can be used with most commands that expect a location, such as `bzr push`."
13027
msgstr ""
13028
13029
#: en/help_topics/location-alias.txt:7
13030
msgid "The aliases are::"
13031
msgstr ""
13032
13033
#: en/help_topics/location-alias.txt:9
13034
msgid ""
13035
"  :bound     The branch this branch is bound to, for bound branches.\n"
13036
"  :parent    The parent of this branch.\n"
13037
"  :public    The public location of this branch.\n"
13038
"  :push      The saved location used for `bzr push` with no arguments.\n"
13039
"  :submit    The submit branch for this branch.\n"
13040
"  :this      This branch."
13041
msgstr ""
13042
13043
#: en/help_topics/location-alias.txt:16
13044
msgid "For example, to push to the parent location::"
13045
msgstr ""
13046
13047
#: en/help_topics/location-alias.txt:18
13048
msgid "    bzr push :parent\n"
13049
msgstr ""
13050
13051
#: en/help_topics/log-formats.txt:1
13052
msgid ""
13053
"Log Formats\n"
13054
"==========="
13055
msgstr ""
13056
13057
#: en/help_topics/log-formats.txt:4
13058
msgid ""
13059
"A log format controls how information about each revision is displayed.\n"
13060
"The standard log formats are compared below::"
13061
msgstr ""
13062
13063
#: en/help_topics/log-formats.txt:7
13064
msgid ""
13065
"  Feature                 long           short         line\n"
13066
"  ----------------------  -------------  ------------  -------------------\n"
13067
"  design goal             detailed view  concise view  1 revision per line\n"
13068
"  committer               name+email     name only     name only\n"
13069
"  author                  name+email     -             -\n"
13070
"  date-time format        full           date only     date only\n"
13071
"  commit message          full           full          top line\n"
13072
"  tags                    yes            yes           yes\n"
13073
"  merges indicator        -              yes           -\n"
13074
"  status/delta            optional       optional      -\n"
13075
"  diff/patch              optional       optional      -\n"
13076
"  revision-id             optional       optional      -\n"
13077
"  branch nick             yes            -             -\n"
13078
"  foreign vcs properties  yes            yes           -\n"
13079
"  preferred levels        all            1             1\n"
13080
"  digital signature       optional       -             -"
13081
msgstr ""
13082
13083
#: en/help_topics/log-formats.txt:24
13084
msgid ""
13085
"The default format is ``long``. To change this, define the ``log_format``\n"
13086
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13087
msgstr ""
13088
13089
#: en/help_topics/log-formats.txt:27
13090
msgid ""
13091
"  [DEFAULT]\n"
13092
"  log_format = short"
13093
msgstr ""
13094
13095
#: en/help_topics/log-formats.txt:30
13096
msgid ""
13097
"Alternatively, to change the log format used for a given query, use the\n"
13098
"--long, --short or --line options."
13099
msgstr ""
13100
13101
#: en/help_topics/log-formats.txt:33
13102
msgid ""
13103
"If one of the standard log formats does not meet your needs, additional\n"
13104
"formats can be provided by plugins.\n"
13105
msgstr ""
13106
13107
#: en/help_topics/other-formats.txt:1
13108
msgid "Other Storage Formats"
13109
msgstr ""
13110
13111
#: en/help_topics/other-formats.txt:3
13112
msgid "Experimental formats are shown below."
13113
msgstr ""
13114
13115
#: en/help_topics/other-formats.txt:5
13116
msgid ""
13117
":development-colo:\n"
13118
"    (native) The 2a format with experimental support for colocated\n"
13119
"    branches."
13120
msgstr ""
13121
13122
#: en/help_topics/other-formats.txt:9
13123
msgid ""
13124
"\n"
13125
"Deprecated formats are shown below."
13126
msgstr ""
13127
13128
#: en/help_topics/other-formats.txt:12
13129
msgid ""
13130
":pack-0.92:\n"
13131
"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13132
"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
13133
"    by bzr < 0.92."
13134
msgstr ""
13135
13136
#: en/help_topics/patterns.txt:1
13137
msgid ""
13138
"Patterns\n"
13139
"========"
13140
msgstr ""
13141
13142
#: en/help_topics/patterns.txt:4
13143
msgid ""
13144
"Bazaar uses patterns to match files at various times. For example,\n"
13145
"the ``add`` command skips over files that match ignore patterns\n"
13146
"and preferences can be associated with files using rule patterns.\n"
13147
"The pattern syntax is described below."
13148
msgstr ""
13149
13150
#: en/help_topics/patterns.txt:9
13151
msgid ""
13152
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13153
"slash or is a regular expression, it is compared to the whole path\n"
13154
"from the branch root. Otherwise, it is compared to only the last\n"
13155
"component of the path. To match a file only in the root directory,\n"
13156
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13157
msgstr ""
13158
13159
#: en/help_topics/patterns.txt:15
13160
msgid "Patterns may include globbing wildcards such as::"
13161
msgstr ""
13162
13163
#: en/help_topics/patterns.txt:17
13164
msgid ""
13165
"  ? - Matches any single character except '/'\n"
13166
"  * - Matches 0 or more characters except '/'\n"
13167
"  /**/ - Matches 0 or more directories in a path\n"
13168
"  [a-z] - Matches a single character from within a group of characters"
13169
msgstr ""
13170
13171
#: en/help_topics/patterns.txt:22
13172
msgid ""
13173
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13174
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13175
"expression.  Regular expression patterns may not include named or\n"
13176
"numbered groups."
13177
msgstr ""
13178
13179
#: en/help_topics/patterns.txt:27
13180
msgid ""
13181
"Case insensitive ignore patterns can be specified with regular expressions\n"
13182
"by using the ``i`` (for ignore case) flag in the pattern."
13183
msgstr ""
13184
13185
#: en/help_topics/patterns.txt:30
6622.1.22 by Jelmer Vernooij
Update po files.
13186
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13187
msgstr ""
13188
13189
#: en/help_topics/patterns.txt:32
13190
msgid "  RE:(?i)foo"
13191
msgstr ""
13192
13193
#: en/help_topics/patterns.txt:34
13194
msgid ""
13195
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13196
"matched by that pattern will not be ignored."
13197
msgstr ""
13198
13199
#: en/help_topics/patterns.txt:37
6622.1.22 by Jelmer Vernooij
Update po files.
13200
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13201
msgstr ""
13202
13203
#: en/help_topics/revisionspec.txt:1
13204
msgid "Revision Identifiers"
13205
msgstr ""
13206
13207
#: en/help_topics/revisionspec.txt:3
13208
msgid ""
13209
"A revision identifier refers to a specific state of a branch's history.  It\n"
13210
"can be expressed in several ways.  It can begin with a keyword to\n"
13211
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13212
"'before:yesterday' and 'submit:'."
13213
msgstr ""
13214
13215
#: en/help_topics/revisionspec.txt:8
13216
msgid ""
13217
"Alternately, it can be given without a keyword, in which case it will be\n"
13218
"checked as a revision number, a tag, a revision id, a date specification, or "
13219
"a\n"
13220
"branch specification, in that order.  For example, 'date:today' could be\n"
13221
"written as simply 'today', though if you have a tag called 'today' that "
13222
"will\n"
13223
"be found first."
13224
msgstr ""
13225
13226
#: en/help_topics/revisionspec.txt:14
13227
msgid ""
13228
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13229
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13230
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13231
"or\n"
13232
"spaces around the '..')."
13233
msgstr ""
13234
13235
#: en/help_topics/revisionspec.txt:19
13236
msgid ""
13237
"Ranges are interpreted differently by different commands. To the \"log\" "
13238
"command,\n"
13239
"a range is a sequence of log messages, but to the \"diff\" command, the "
13240
"range\n"
13241
"denotes a change between revisions (and not a sequence of changes).  In\n"
13242
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13243
"consider it\n"
13244
"to be open-ended, that is, they include one end but not the other.  For "
13245
"example:\n"
13246
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13247
"3649,\n"
13248
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13249
"and\n"
13250
"3649, but not 3647."
13251
msgstr ""
13252
13253
#: en/help_topics/revisionspec.txt:28
13254
msgid "The keywords used as revision selection methods are the following:"
13255
msgstr ""
13256
13257
#: en/help_topics/revisionspec.txt:30
13258
msgid ""
13259
":revid:\n"
13260
"\tSelects a revision using the revision id.\n"
13261
":submit:\n"
13262
"\tSelects a common ancestor with the submit branch.\n"
13263
":ancestor:\n"
13264
"\tSelects a common ancestor with a second branch.\n"
13265
":date:\n"
13266
"\tSelects a revision on the basis of a datestamp.\n"
13267
":branch:\n"
13268
"\tSelects the last revision of a specified branch.\n"
13269
":tag:\n"
13270
"\tSelects a revision identified by a tag name.\n"
13271
":revno:\n"
13272
"\tSelects a revision using a number.\n"
13273
":before:\n"
13274
"\tSelects the parent of the revision specified.\n"
13275
":annotate:\n"
13276
"\tSelect the revision that last modified the specified line.\n"
13277
":mainline:\n"
13278
"\tSelect mainline revision that merged the specified revision.\n"
13279
":last:\n"
13280
"\tSelects the nth revision from the end."
13281
msgstr ""
13282
13283
#: en/help_topics/revisionspec.txt:53
13284
msgid "In addition, plugins can provide other keywords."
13285
msgstr ""
13286
13287
#: en/help_topics/revisionspec.txt:55
13288
msgid "A detailed description of each keyword is given below."
13289
msgstr ""
13290
13291
#: en/help_topics/revisionspec.txt:57
13292
msgid ":revid:"
13293
msgstr ""
13294
13295
#: en/help_topics/revisionspec.txt:59
13296
msgid ""
13297
"    Supply a specific revision id, that can be used to specify any\n"
13298
"    revision id in the ancestry of the branch.\n"
13299
"    Including merges, and pending merges.\n"
13300
"    Examples::"
13301
msgstr ""
13302
13303
#: en/help_topics/revisionspec.txt:64
13304
msgid ""
13305
"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13306
msgstr ""
13307
13308
#: en/help_topics/revisionspec.txt:66
13309
msgid ":submit:"
13310
msgstr ""
13311
13312
#: en/help_topics/revisionspec.txt:68
13313
msgid ""
13314
"    Diffing against this shows all the changes that were made in this "
13315
"branch,\n"
13316
"    and is a good predictor of what merge will do.  The submit branch is\n"
13317
"    used by the bundle and merge directive commands.  If no submit branch\n"
13318
"    is specified, the parent branch is used instead."
13319
msgstr ""
13320
13321
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13322
msgid ""
13323
"    The common ancestor is the last revision that existed in both\n"
13324
"    branches. Usually this is the branch point, but it could also be\n"
13325
"    a revision that was merged."
13326
msgstr ""
13327
13328
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13329
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13330
#: en/help_topics/revisionspec.txt:153
13331
msgid "    Examples::"
13332
msgstr ""
13333
13334
#: en/help_topics/revisionspec.txt:79
13335
msgid "      $ bzr diff -r submit:"
13336
msgstr ""
13337
13338
#: en/help_topics/revisionspec.txt:81
13339
msgid ":ancestor:"
13340
msgstr ""
13341
13342
#: en/help_topics/revisionspec.txt:83
13343
msgid "    Supply the path to a branch to select the common ancestor."
13344
msgstr ""
13345
13346
#: en/help_topics/revisionspec.txt:89
13347
msgid ""
13348
"    This is frequently used with 'diff' to return all of the changes\n"
13349
"    that your branch introduces, while excluding the changes that you\n"
13350
"    have not merged from the remote branch."
13351
msgstr ""
13352
13353
#: en/help_topics/revisionspec.txt:95
13354
msgid ""
13355
"      ancestor:/path/to/branch\n"
13356
"      $ bzr diff -r ancestor:../../mainline/branch"
13357
msgstr ""
13358
13359
#: en/help_topics/revisionspec.txt:98
13360
msgid ":date:"
13361
msgstr ""
13362
13363
#: en/help_topics/revisionspec.txt:100
13364
msgid ""
13365
"    Supply a datestamp to select the first revision that matches the date.\n"
13366
"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13367
"    Matches the first entry after a given date (either at midnight or\n"
13368
"    at a specified time)."
13369
msgstr ""
13370
13371
#: en/help_topics/revisionspec.txt:105
13372
msgid "    One way to display all the changes since yesterday would be::"
13373
msgstr ""
13374
13375
#: en/help_topics/revisionspec.txt:107
13376
msgid "        bzr log -r date:yesterday.."
13377
msgstr ""
13378
13379
#: en/help_topics/revisionspec.txt:111
13380
msgid ""
13381
"      date:yesterday            -> select the first revision since "
13382
"yesterday\n"
13383
"      date:2006-08-14,17:10:14  -> select the first revision after\n"
13384
"                                   August 14th, 2006 at 5:10pm."
13385
msgstr ""
13386
13387
#: en/help_topics/revisionspec.txt:115
13388
msgid ":branch:"
13389
msgstr ""
13390
13391
#: en/help_topics/revisionspec.txt:117
13392
msgid "    Supply the path to a branch to select its last revision."
13393
msgstr ""
13394
13395
#: en/help_topics/revisionspec.txt:121
13396
msgid "      branch:/path/to/branch"
13397
msgstr ""
13398
13399
#: en/help_topics/revisionspec.txt:123
13400
msgid ":tag:"
13401
msgstr ""
13402
13403
#: en/help_topics/revisionspec.txt:125
13404
msgid "    Tags are stored in the branch and created by the 'tag' command."
13405
msgstr ""
13406
13407
#: en/help_topics/revisionspec.txt:127
13408
msgid ":revno:"
13409
msgstr ""
13410
13411
#: en/help_topics/revisionspec.txt:129
13412
msgid ""
13413
"    Use an integer to specify a revision in the history of the branch.\n"
13414
"    Optionally a branch can be specified.  A negative number will count\n"
13415
"    from the end of the branch (-1 is the last revision, -2 the previous\n"
13416
"    one). If the negative number is larger than the branch's history, the\n"
13417
"    first revision is returned.\n"
13418
"    Examples::"
13419
msgstr ""
13420
13421
#: en/help_topics/revisionspec.txt:136
13422
msgid ""
13423
"      revno:1                   -> return the first revision of this branch\n"
13424
"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
13425
"                                   the branch '/path/to/branch'\n"
13426
"      revno:-1                  -> The last revision in a branch.\n"
13427
"      -2:http://other/branch    -> The second to last revision in the\n"
13428
"                                   remote branch.\n"
13429
"      -1000000                  -> Most likely the first revision, unless\n"
13430
"                                   your history is very long."
13431
msgstr ""
13432
13433
#: en/help_topics/revisionspec.txt:145
13434
msgid ":before:"
13435
msgstr ""
13436
13437
#: en/help_topics/revisionspec.txt:147
13438
msgid ""
13439
"    Supply any revision spec to return the parent of that revision.  This "
13440
"is\n"
13441
"    mostly useful when inspecting revisions that are not in the revision "
13442
"history\n"
13443
"    of a branch."
13444
msgstr ""
13445
13446
#: en/help_topics/revisionspec.txt:151
13447
msgid ""
13448
"    It is an error to request the parent of the null revision (before:0)."
13449
msgstr ""
13450
13451
#: en/help_topics/revisionspec.txt:155
13452
msgid ""
13453
"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
13454
"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
13455
"                                            aaaa@bbbb-1234567890\n"
13456
"      bzr diff -r before:1913..1913\n"
13457
"            -> Find the changes between revision 1913 and its parent "
13458
"(1912).\n"
13459
"               (What changes did revision 1913 introduce).\n"
13460
"               This is equivalent to:  bzr diff -c 1913"
13461
msgstr ""
13462
13463
#: en/help_topics/revisionspec.txt:163
13464
msgid ":annotate:"
13465
msgstr ""
13466
13467
#: en/help_topics/revisionspec.txt:165
13468
msgid ""
13469
"    Select the revision that last modified the specified line.  Line is\n"
13470
"    specified as path:number.  Path is a relative path to the file.  "
13471
"Numbers\n"
13472
"    start at 1, and are relative to the current version, not the last-\n"
13473
"    committed version of the file."
13474
msgstr ""
13475
13476
#: en/help_topics/revisionspec.txt:170
13477
msgid ":mainline:"
13478
msgstr ""
13479
13480
#: en/help_topics/revisionspec.txt:172
13481
msgid ""
13482
"    Select the revision that merged the specified revision into mainline."
13483
msgstr ""
13484
13485
#: en/help_topics/revisionspec.txt:174
13486
msgid ":last:"
13487
msgstr ""
13488
13489
#: en/help_topics/revisionspec.txt:176
13490
msgid ""
13491
"    Supply a positive number to get the nth revision from the end.\n"
13492
"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
13493
"    Examples::"
13494
msgstr ""
13495
13496
#: en/help_topics/revisionspec.txt:180
13497
msgid ""
13498
"      last:1        -> return the last revision\n"
13499
"      last:3        -> return the revision 2 before the end.\n"
13500
msgstr ""
13501
13502
#: en/help_topics/rules.txt:1
13503
msgid ""
13504
"Rules\n"
13505
"====="
13506
msgstr ""
13507
13508
#: en/help_topics/rules.txt:7
13509
msgid ""
13510
"Rules are defined in ini file format where the sections are file glob\n"
13511
"patterns and the contents of each section are the preferences for files\n"
13512
"matching that pattern(s). For example::"
13513
msgstr ""
13514
13515
#: en/help_topics/rules.txt:11
13516
msgid ""
13517
"    [name *.bat]\n"
13518
"    eol = native"
13519
msgstr ""
13520
13521
#: en/help_topics/rules.txt:14
13522
msgid ""
13523
"    [name *.html *.xml]\n"
13524
"    keywords = xml_escape"
13525
msgstr ""
13526
13527
#: en/help_topics/rules.txt:17
13528
msgid ""
13529
"Preferences like these are useful for commands and plugins wishing to\n"
13530
"provide custom behaviour for selected files.  For more information on \n"
13531
"end of line conversion see :doc:`eol-help`.\n"
13532
"Keyword support is provided by the `keywords plugin\n"
13533
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13534
msgstr ""
13535
13536
#: en/help_topics/rules.txt:23
13537
msgid ""
13538
"Files\n"
13539
"-----"
13540
msgstr ""
13541
13542
#: en/help_topics/rules.txt:26
13543
msgid ""
13544
"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.
13545
"``BRZ_HOME/rules``. "
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13546
msgstr ""
13547
13548
#: en/help_topics/rules.txt:29
13549
msgid ""
13550
"Rule Patterns\n"
13551
"-------------"
13552
msgstr ""
13553
13554
#: en/help_topics/rules.txt:32
13555
msgid ""
13556
"Patterns are ordered and searching stops as soon as one matches.\n"
13557
"As a consequence, more explicit patterns should be placed towards\n"
13558
"the top of the file. Rule patterns use exactly the same conventions\n"
13559
"as ignore patterns. See :doc:`patterns-help` for details."
13560
msgstr ""
13561
13562
#: en/help_topics/rules.txt:37
13563
msgid ".. note::"
13564
msgstr ""
13565
13566
#: en/help_topics/rules.txt:39
13567
msgid ""
13568
"   Patterns containing square brackets or spaces should be\n"
13569
"   surrounded in quotes to ensure they are correctly parsed.\n"
13570
msgstr ""
13571
13572
#: en/help_topics/topics.txt:1
13573
msgid ""
13574
"authentication       Information on configuring authentication\n"
13575
"basic                Basic commands\n"
13576
"branches             Information on what a branch is\n"
13577
"bugs                 Bug tracker settings\n"
13578
"checkouts            Information on what a checkout is\n"
13579
"commands             Basic help for all commands\n"
13580
"configuration        Details on the configuration settings available\n"
13581
"conflict-types       Types of conflicts and what to do about them\n"
13582
"content-filters      Conversion of content into/from working trees\n"
13583
"criss-cross          Information on criss-cross merging\n"
13584
"current-formats      Current storage formats\n"
13585
"debug-flags          Options to show or record debug information\n"
13586
"diverged-branches    How to fix diverged branches\n"
13587
"env-variables        Environment variable names and values\n"
13588
"eol                  Information on end-of-line handling\n"
13589
"files                Information on configuration and log files\n"
13590
"formats              Information on choosing a storage format\n"
13591
"global-options       Options that control how Bazaar runs\n"
13592
"hidden-commands      All hidden commands\n"
13593
"hooks                Points at which custom processing can be added\n"
13594
"launchpad            Using Bazaar with Launchpad.net\n"
13595
"location-alias       Aliases for remembered locations\n"
13596
"log-formats          Details on the logging formats available\n"
13597
"other-formats        Experimental and deprecated storage formats\n"
13598
"patterns             Information on the pattern syntax\n"
13599
"repositories         Basic information on shared repositories.\n"
13600
"revisionspec         Explain how to use --revision\n"
13601
"rules                Information on defining rule-based preferences\n"
13602
"standalone-trees     Information on what a standalone tree is\n"
13603
"standard-options     Options that can be used with any command\n"
13604
"status-flags         Help on status flags\n"
13605
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13606
"topics               Topics list\n"
13607
"url-special-chars    Special character handling in URLs\n"
13608
"urlspec              Supported transport protocols\n"
13609
"working-trees        Information on working trees\n"
13610
msgstr ""
13611
13612
#: en/help_topics/url-special-chars.txt:1
13613
msgid ""
13614
"Special character handling in URLs\n"
13615
"=================================="
13616
msgstr ""
13617
13618
#: en/help_topics/url-special-chars.txt:4
13619
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13620
msgstr ""
13621
13622
#: en/help_topics/url-special-chars.txt:6
13623
msgid " * Fully qualified URLs"
13624
msgstr ""
13625
13626
#: en/help_topics/url-special-chars.txt:8
13627
msgid " * File system paths, relative or absolute"
13628
msgstr ""
13629
13630
#: en/help_topics/url-special-chars.txt:10
13631
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13632
"Internally brz treats all locations as URLs. For any file system paths\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13633
"that are specified it will automatically determine the appropriate URL\n"
13634
"representation, and escape special characters where necessary."
13635
msgstr ""
13636
13637
#: en/help_topics/url-special-chars.txt:14
13638
msgid ""
13639
"There are a few characters which have special meaning in URLs and need "
13640
"careful\n"
13641
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13642
"value in URLs. Any non-ASCII characters in a file path will automatically "
13643
"be\n"
13644
"urlencoded when the path is converted to a URL."
13645
msgstr ""
13646
13647
#: en/help_topics/url-special-chars.txt:19
13648
msgid ""
13649
"URLs represent non-ASCII characters in an encoding defined by the server, "
13650
"but\n"
13651
"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
13652
"be\n"
13653
"generous in what it accepts as a URL and to print them in a way that\n"
13654
"will be readable."
13655
msgstr ""
13656
13657
#: en/help_topics/url-special-chars.txt:24
13658
msgid ""
13659
"For example, if you have a directory named '/tmp/%2False' these are all "
13660
"valid\n"
13661
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13662
"slash)::"
13663
msgstr ""
13664
13665
#: en/help_topics/url-special-chars.txt:27
13666
msgid ""
13667
"  cd /tmp\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13668
"  brz log /tmp/%2False\n"
13669
"  brz log %2False\n"
13670
"  brz log file:///tmp/%252False\n"
13671
"  brz log file://localhost/tmp/%252False\n"
13672
"  brz log file:%252False"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13673
msgstr ""
13674
13675
#: en/help_topics/url-special-chars.txt:34
13676
msgid "These are valid but do not refer to the same file::"
13677
msgstr ""
13678
13679
#: en/help_topics/url-special-chars.txt:36
13680
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13681
"  brz log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13682
"  brz log %252False (refers to a file called /tmp/%252False)"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13683
msgstr ""
13684
13685
#: en/help_topics/url-special-chars.txt:39
13686
msgid ""
13687
"Comma also has special meaning in URLs, because it denotes `segment "
13688
"parameters`_"
13689
msgstr ""
13690
13691
#: en/help_topics/url-special-chars.txt:41
13692
msgid ""
13693
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13694
msgstr ""
13695
13696
#: en/help_topics/url-special-chars.txt:43
13697
msgid ""
13698
"Comma is also special in any file system paths that are specified. To use a "
13699
"literal\n"
13700
"comma in a file system path, specify a URL and URL encode the comma::"
13701
msgstr ""
13702
13703
#: en/help_topics/url-special-chars.txt:46
13704
msgid ""
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13705
"  brz log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
6622.1.22 by Jelmer Vernooij
Update po files.
13706
"\" set to \"bla\"\n"
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
13707
"  brz log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13708
"  brz log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
6622.1.22 by Jelmer Vernooij
Update po files.
13709
"\" set to \"bla\"\n"
6524.1.1 by Jelmer Vernooij
Merge 2.5.
13710
msgstr ""
13711
13712
#: en/help_topics/urlspec.txt:1
13713
msgid "URL Identifiers"
13714
msgstr ""
13715
13716
#: en/help_topics/urlspec.txt:3
13717
msgid "Supported URL prefixes::"
13718
msgstr ""
13719
13720
#: en/help_topics/urlspec.txt:5
13721
msgid ""
13722
"  aftp://             Access using active FTP.\n"
13723
"  bzr://              Fast access using the Bazaar smart server.\n"
13724
"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
13725
"  file://             Access using the standard filesystem (default)\n"
13726
"  ftp://              Access using passive FTP.\n"
13727
"  http://             Read-only access of branches exported on the web.\n"
13728
"  https://            Read-only access of branches exported on the web using "
13729
"SSL.\n"
13730
"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
13731
msgstr ""
13732
13733
#: en/help_topics/urlspec.txt:14
13734
msgid "Supported modifiers::"
13735
msgstr ""
13736
13737
#: en/help_topics/urlspec.txt:16
13738
msgid "  gio+                Access using any GIO supported protocols."
13739
msgstr ""
13740
13741
#: en/help_topics/urlspec.txt:18
13742
msgid "Bazaar supports all of the standard parts within the URL::"
13743
msgstr ""
13744
13745
#: en/help_topics/urlspec.txt:20
13746
msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
13747
msgstr ""
13748
13749
#: en/help_topics/urlspec.txt:22
13750
msgid "allowing URLs such as::"
13751
msgstr ""
13752
13753
#: en/help_topics/urlspec.txt:24
13754
msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13755
msgstr ""
13756
13757
#: en/help_topics/urlspec.txt:26
13758
msgid ""
13759
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13760
"with '~' as meaning that the rest of the path should be interpreted\n"
13761
"relative to the remote user's home directory.  For example if the user\n"
13762
"``remote`` has a  home directory of ``/home/remote`` on the server\n"
13763
"shell.example.com, then::"
13764
msgstr ""
13765
13766
#: en/help_topics/urlspec.txt:32
13767
msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13768
msgstr ""
13769
13770
#: en/help_topics/urlspec.txt:34
13771
msgid "would refer to ``/home/remote/myproject/trunk``."
13772
msgstr ""
13773
13774
#: en/help_topics/urlspec.txt:36
13775
msgid ""
13776
"Many commands that accept URLs also accept location aliases too.\n"
13777
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13778
msgstr ""