|
6524.1.1
by Jelmer Vernooij
Merge 2.5. |
1 |
# Norwegian Bokmal translation for bzr
|
2 |
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
|
|
3 |
# This file is distributed under the same license as the bzr package.
|
|
4 |
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
|
|
5 |
#
|
|
6 |
msgid "" |
|
7 |
msgstr "" |
|
8 |
"Project-Id-Version: bzr\n" |
|
9 |
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
|
10 |
"POT-Creation-Date: 2012-02-02 17:39+0100\n" |
|
11 |
"PO-Revision-Date: 2012-04-03 17:49+0000\n" |
|
12 |
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
|
13 |
"Language-Team: Norwegian Bokmal <nb@li.org>\n" |
|
14 |
"MIME-Version: 1.0\n" |
|
15 |
"Content-Type: text/plain; charset=UTF-8\n" |
|
16 |
"Content-Transfer-Encoding: 8bit\n" |
|
17 |
"Plural-Forms: nplurals=2; plural=n != 1;\n" |
|
18 |
"X-Launchpad-Export-Date: 2012-04-04 05:07+0000\n" |
|
19 |
"X-Generator: Launchpad (build 15055)\n" |
|
20 |
||
21 |
#: bzrlib/add.py:95
|
|
22 |
msgid "skipping {0} (larger than {1} of {2} bytes)" |
|
23 |
msgstr "" |
|
24 |
||
25 |
#: bzrlib/branch.py:872
|
|
26 |
msgid "Unstacking" |
|
27 |
msgstr "" |
|
28 |
||
29 |
#: bzrlib/branch.py:3205
|
|
30 |
#, python-format
|
|
31 |
msgid "Pushed up to revision %d." |
|
32 |
msgstr "" |
|
33 |
||
34 |
#: bzrlib/branch.py:3207
|
|
35 |
#, python-format
|
|
36 |
msgid "%d tag updated." |
|
37 |
msgid_plural "%d tags updated." |
|
38 |
msgstr[0] "" |
|
39 |
msgstr[1] "" |
|
40 |
||
41 |
#: bzrlib/branch.py:3210
|
|
42 |
msgid "No new revisions or tags to push." |
|
43 |
msgstr "" |
|
44 |
||
45 |
#: bzrlib/branch.py:3212
|
|
46 |
msgid "No new revisions to push." |
|
47 |
msgstr "" |
|
48 |
||
49 |
#: bzrlib/branch.py:3232
|
|
50 |
msgid "checked branch {0} format {1}" |
|
51 |
msgstr "" |
|
52 |
||
53 |
#: bzrlib/branch.py:3235
|
|
54 |
#, python-format
|
|
55 |
msgid "found error:%s" |
|
56 |
msgstr "" |
|
57 |
||
58 |
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
|
|
59 |
#, python-format
|
|
60 |
msgid "Ignoring files outside view. View is %s" |
|
61 |
msgstr "" |
|
62 |
||
63 |
#: bzrlib/builtins.py:218
|
|
64 |
#, python-format
|
|
65 |
msgid "bzr %s --revision takes exactly one revision identifier" |
|
66 |
msgstr "" |
|
67 |
||
68 |
#: bzrlib/builtins.py:303
|
|
69 |
msgid "Display status summary." |
|
70 |
msgstr "" |
|
71 |
||
72 |
#: bzrlib/builtins.py:305
|
|
73 |
msgid "" |
|
74 |
"This reports on versioned and unknown files, reporting them\n"
|
|
75 |
"grouped by state. Possible states are:"
|
|
76 |
msgstr "" |
|
77 |
||
78 |
#: bzrlib/builtins.py:308
|
|
79 |
msgid "" |
|
80 |
"added\n"
|
|
81 |
" Versioned in the working copy but not in the previous revision."
|
|
82 |
msgstr "" |
|
83 |
||
84 |
#: bzrlib/builtins.py:311
|
|
85 |
msgid "" |
|
86 |
"removed\n"
|
|
87 |
" Versioned in the previous revision but removed or deleted\n"
|
|
88 |
" in the working copy."
|
|
89 |
msgstr "" |
|
90 |
||
91 |
#: bzrlib/builtins.py:315
|
|
92 |
msgid "" |
|
93 |
"renamed\n"
|
|
94 |
" Path of this file changed from the previous revision;\n"
|
|
95 |
" the text may also have changed. This includes files whose\n"
|
|
96 |
" parent directory was renamed."
|
|
97 |
msgstr "" |
|
98 |
||
99 |
#: bzrlib/builtins.py:320
|
|
100 |
msgid "" |
|
101 |
"modified\n"
|
|
102 |
" Text has changed since the previous revision."
|
|
103 |
msgstr "" |
|
104 |
||
105 |
#: bzrlib/builtins.py:323
|
|
106 |
msgid "" |
|
107 |
"kind changed\n"
|
|
108 |
" File kind has been changed (e.g. from file to directory)."
|
|
109 |
msgstr "" |
|
110 |
||
111 |
#: bzrlib/builtins.py:326
|
|
112 |
msgid "" |
|
113 |
"unknown\n"
|
|
114 |
" Not versioned and not matching an ignore pattern."
|
|
115 |
msgstr "" |
|
116 |
||
117 |
#: bzrlib/builtins.py:329
|
|
118 |
msgid "" |
|
119 |
"Additionally for directories, symlinks and files with a changed\n"
|
|
120 |
"executable bit, Bazaar indicates their type using a trailing\n"
|
|
121 |
"character: '/', '@' or '*' respectively. These decorations can be\n" |
|
122 |
"disabled using the '--no-classify' option."
|
|
123 |
msgstr "" |
|
124 |
||
125 |
#: bzrlib/builtins.py:334
|
|
126 |
msgid "" |
|
127 |
"To see ignored files use 'bzr ignored'. For details on the\n"
|
|
128 |
"changes to file texts, use 'bzr diff'."
|
|
129 |
msgstr "" |
|
130 |
||
131 |
#: bzrlib/builtins.py:337
|
|
132 |
msgid "" |
|
133 |
"Note that --short or -S gives status flags for each item, similar\n"
|
|
134 |
"to Subversion's status command. To get output similar to svn -q,\n"
|
|
135 |
"use bzr status -SV."
|
|
136 |
msgstr "" |
|
137 |
||
138 |
#: bzrlib/builtins.py:341
|
|
139 |
msgid "" |
|
140 |
"If no arguments are specified, the status of the entire working\n"
|
|
141 |
"directory is shown. Otherwise, only the status of the specified\n"
|
|
142 |
"files or directories is reported. If a directory is given, status\n"
|
|
143 |
"is reported for everything inside that directory."
|
|
144 |
msgstr "" |
|
145 |
||
146 |
#: bzrlib/builtins.py:346
|
|
147 |
msgid "" |
|
148 |
"Before merges are committed, the pending merge tip revisions are\n"
|
|
149 |
"shown. To see all pending merge revisions, use the -v option.\n"
|
|
150 |
"To skip the display of pending merge information altogether, use\n"
|
|
151 |
"the no-pending option or specify a file/directory."
|
|
152 |
msgstr "" |
|
153 |
||
154 |
#: bzrlib/builtins.py:351
|
|
155 |
msgid "" |
|
156 |
"To compare the working directory to a specific revision, pass a\n"
|
|
157 |
"single revision to the revision argument."
|
|
158 |
msgstr "" |
|
159 |
||
160 |
#: bzrlib/builtins.py:354
|
|
161 |
msgid "" |
|
162 |
"To see which files have changed in a specific revision, or between\n"
|
|
163 |
"two revisions, pass a revision range to the revision argument.\n"
|
|
164 |
"This will produce the same results as calling 'bzr diff --summarize'."
|
|
165 |
msgstr "" |
|
166 |
||
167 |
#: bzrlib/builtins.py:363
|
|
168 |
msgid "Use short status indicators." |
|
169 |
msgstr "" |
|
170 |
||
171 |
#: bzrlib/builtins.py:365
|
|
172 |
msgid "Only show versioned files." |
|
173 |
msgstr "" |
|
174 |
||
175 |
#: bzrlib/builtins.py:367
|
|
176 |
msgid "Don't show pending merges." |
|
177 |
msgstr "" |
|
178 |
||
179 |
#: bzrlib/builtins.py:370
|
|
180 |
msgid "Do not mark object type using indicator." |
|
181 |
msgstr "" |
|
182 |
||
183 |
#: bzrlib/builtins.py:385
|
|
184 |
msgid "bzr status --revision takes exactly one or two revision specifiers" |
|
185 |
msgstr "" |
|
186 |
||
187 |
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
|
|
188 |
msgid "You can only supply one of revision_id or --revision" |
|
189 |
msgstr "" |
|
190 |
||
191 |
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
|
|
192 |
msgid "You must supply either --revision or a revision_id" |
|
193 |
msgstr "" |
|
194 |
||
195 |
#: bzrlib/builtins.py:439
|
|
196 |
#, python-format
|
|
197 |
msgid "Repository %r does not support access to raw revision texts" |
|
198 |
msgstr "" |
|
199 |
||
200 |
#: bzrlib/builtins.py:450
|
|
201 |
msgid "The repository {0} contains no revision {1}." |
|
202 |
msgstr "" |
|
203 |
||
204 |
#: bzrlib/builtins.py:457
|
|
205 |
msgid "You cannot specify a NULL revision." |
|
206 |
msgstr "" |
|
207 |
||
208 |
#: bzrlib/builtins.py:549
|
|
209 |
msgid "Remove the working tree from a given branch/checkout." |
|
210 |
msgstr "" |
|
211 |
||
212 |
#: bzrlib/builtins.py:551
|
|
213 |
msgid "" |
|
214 |
"Since a lightweight checkout is little more than a working tree\n"
|
|
215 |
"this will refuse to run against one."
|
|
216 |
msgstr "" |
|
217 |
||
218 |
#: bzrlib/builtins.py:554
|
|
219 |
msgid "To re-create the working tree, use \"bzr checkout\"." |
|
220 |
msgstr "" |
|
221 |
||
222 |
#: bzrlib/builtins.py:560
|
|
223 |
msgid "" |
|
224 |
"Remove the working tree even if it has uncommitted or shelved changes."
|
|
225 |
msgstr "" |
|
226 |
||
227 |
#: bzrlib/builtins.py:574
|
|
228 |
msgid "No working tree to remove" |
|
229 |
msgstr "" |
|
230 |
||
231 |
#: bzrlib/builtins.py:576
|
|
232 |
msgid "You cannot remove the working tree of a remote path" |
|
233 |
msgstr "" |
|
234 |
||
235 |
#: bzrlib/builtins.py:585
|
|
236 |
msgid "You cannot remove the working tree from a lightweight checkout" |
|
237 |
msgstr "" |
|
238 |
||
239 |
#: bzrlib/builtins.py:625
|
|
240 |
msgid "" |
|
241 |
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
|
|
242 |
"instead. Use \"--force\" if you are sure you want to reset the working tree."
|
|
243 |
msgstr "" |
|
244 |
||
245 |
#: bzrlib/builtins.py:636
|
|
246 |
msgid "" |
|
247 |
", the header appears corrupt, try passing -r -1 to set the state to the last "
|
|
248 |
"commit"
|
|
249 |
msgstr "" |
|
250 |
||
251 |
#: bzrlib/builtins.py:640
|
|
252 |
msgid "failed to reset the tree state{0}" |
|
253 |
msgstr "" |
|
254 |
||
255 |
#: bzrlib/builtins.py:644
|
|
256 |
msgid "Show current revision number." |
|
257 |
msgstr "" |
|
258 |
||
259 |
#: bzrlib/builtins.py:646
|
|
260 |
msgid "This is equal to the number of revisions on this branch." |
|
261 |
msgstr "" |
|
262 |
||
263 |
#: bzrlib/builtins.py:659
|
|
264 |
msgid "--tree and --revision can not be used together" |
|
265 |
msgstr "" |
|
266 |
||
267 |
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
|
|
268 |
msgid "Tags can only be placed on a single revision, not on a range" |
|
269 |
msgstr "" |
|
270 |
||
271 |
#: bzrlib/builtins.py:700
|
|
272 |
msgid "Show revno of working tree." |
|
273 |
msgstr "" |
|
274 |
||
275 |
#: bzrlib/builtins.py:748
|
|
276 |
msgid "Add specified files or directories." |
|
277 |
msgstr "" |
|
278 |
||
279 |
#: bzrlib/builtins.py:750
|
|
280 |
msgid "" |
|
281 |
"In non-recursive mode, all the named items are added, regardless\n"
|
|
282 |
"of whether they were previously ignored. A warning is given if\n"
|
|
283 |
"any of the named files are already versioned."
|
|
284 |
msgstr "" |
|
285 |
||
286 |
#: bzrlib/builtins.py:754
|
|
287 |
msgid "" |
|
288 |
"In recursive mode (the default), files are treated the same way\n"
|
|
289 |
"but the behaviour for directories is different. Directories that\n"
|
|
290 |
"are already versioned do not give a warning. All directories,\n"
|
|
291 |
"whether already versioned or not, are searched for files or\n"
|
|
292 |
"subdirectories that are neither versioned or ignored, and these\n"
|
|
293 |
"are added. This search proceeds recursively into versioned\n"
|
|
294 |
"directories. If no names are given '.' is assumed."
|
|
295 |
msgstr "" |
|
296 |
||
297 |
#: bzrlib/builtins.py:762
|
|
298 |
msgid "" |
|
299 |
"A warning will be printed when nested trees are encountered,\n"
|
|
300 |
"unless they are explicitly ignored."
|
|
301 |
msgstr "" |
|
302 |
||
303 |
#: bzrlib/builtins.py:765
|
|
304 |
msgid "" |
|
305 |
"Therefore simply saying 'bzr add' will version all files that\n"
|
|
306 |
"are currently unknown."
|
|
307 |
msgstr "" |
|
308 |
||
309 |
#: bzrlib/builtins.py:768
|
|
310 |
msgid "" |
|
311 |
"Adding a file whose parent directory is not versioned will\n"
|
|
312 |
"implicitly add the parent, and so on up to the root. This means\n"
|
|
313 |
"you should never need to explicitly add a directory, they'll just\n"
|
|
314 |
"get added when you add a file in the directory."
|
|
315 |
msgstr "" |
|
316 |
||
317 |
#: bzrlib/builtins.py:773
|
|
318 |
msgid "" |
|
319 |
"--dry-run will show which files would be added, but not actually\n"
|
|
320 |
"add them."
|
|
321 |
msgstr "" |
|
322 |
||
323 |
#: bzrlib/builtins.py:776
|
|
324 |
msgid "" |
|
325 |
"--file-ids-from will try to use the file ids from the supplied path.\n"
|
|
326 |
"It looks up ids trying to find a matching parent directory with the\n"
|
|
327 |
"same filename, and then by pure path. This option is rarely needed\n"
|
|
328 |
"but can be useful when adding the same logical file into two\n"
|
|
329 |
"branches that will be merged later (without showing the two different\n"
|
|
330 |
"adds as a conflict). It is also useful when merging another project\n"
|
|
331 |
"into a subdirectory of this one."
|
|
332 |
msgstr "" |
|
333 |
||
334 |
#: bzrlib/builtins.py:784
|
|
335 |
msgid "" |
|
336 |
"Any files matching patterns in the ignore list will not be added\n"
|
|
337 |
"unless they are explicitly mentioned."
|
|
338 |
msgstr "" |
|
339 |
||
340 |
#: bzrlib/builtins.py:787
|
|
341 |
msgid "" |
|
342 |
"In recursive mode, files larger than the configuration option \n"
|
|
343 |
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
|
|
344 |
"to file size."
|
|
345 |
msgstr "" |
|
346 |
||
347 |
#: bzrlib/builtins.py:794
|
|
348 |
msgid "Don't recursively add the contents of directories." |
|
349 |
msgstr "" |
|
350 |
||
351 |
#: bzrlib/builtins.py:800
|
|
352 |
msgid "Lookup file ids from this tree." |
|
353 |
msgstr "" |
|
354 |
||
355 |
#: bzrlib/builtins.py:836
|
|
356 |
msgid "ignored {0} matching \"{1}\"\n" |
|
357 |
msgstr "" |
|
358 |
||
359 |
#: bzrlib/builtins.py:841
|
|
360 |
msgid "Create a new versioned directory." |
|
361 |
msgstr "" |
|
362 |
||
363 |
#: bzrlib/builtins.py:843
|
|
364 |
msgid "This is equivalent to creating the directory and then adding it." |
|
365 |
msgstr "" |
|
366 |
||
367 |
#: bzrlib/builtins.py:850
|
|
368 |
msgid "No error if existing, make parent directories as needed." |
|
369 |
msgstr "" |
|
370 |
||
371 |
#: bzrlib/builtins.py:884
|
|
372 |
#, python-format
|
|
373 |
msgid "added %s\n" |
|
374 |
msgstr "" |
|
375 |
||
376 |
#: bzrlib/builtins.py:926
|
|
377 |
#, python-format
|
|
378 |
msgid "invalid kind %r specified" |
|
379 |
msgstr "" |
|
380 |
||
381 |
#: bzrlib/builtins.py:963
|
|
382 |
msgid "Move or rename a file." |
|
383 |
msgstr "" |
|
384 |
||
385 |
#: bzrlib/builtins.py:965
|
|
386 |
msgid " bzr mv SOURCE... DESTINATION" |
|
387 |
msgstr "" |
|
388 |
||
389 |
#: bzrlib/builtins.py:967
|
|
390 |
msgid "" |
|
391 |
"If the last argument is a versioned directory, all the other names\n"
|
|
392 |
"are moved into it. Otherwise, there must be exactly two arguments\n"
|
|
393 |
"and the file is changed to a new name."
|
|
394 |
msgstr "" |
|
395 |
||
396 |
#: bzrlib/builtins.py:971
|
|
397 |
msgid "" |
|
398 |
"If OLDNAME does not exist on the filesystem but is versioned and\n"
|
|
399 |
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
|
|
400 |
"assumes that the file has been manually moved and only updates\n"
|
|
401 |
"its internal inventory to reflect that change.\n"
|
|
402 |
"The same is valid when moving many SOURCE files to a DESTINATION."
|
|
403 |
msgstr "" |
|
404 |
||
405 |
#: bzrlib/builtins.py:977
|
|
406 |
msgid "Files cannot be moved between branches." |
|
407 |
msgstr "" |
|
408 |
||
409 |
#: bzrlib/builtins.py:984
|
|
410 |
msgid "" |
|
411 |
"Move only the bzr identifier of the file, because the file has already been "
|
|
412 |
"moved."
|
|
413 |
msgstr "" |
|
414 |
||
415 |
#: bzrlib/builtins.py:986
|
|
416 |
msgid "Automatically guess renames." |
|
417 |
msgstr "" |
|
418 |
||
419 |
#: bzrlib/builtins.py:987
|
|
420 |
msgid "Avoid making changes when guessing renames." |
|
421 |
msgstr "" |
|
422 |
||
423 |
#: bzrlib/builtins.py:996
|
|
424 |
msgid "--dry-run requires --auto." |
|
425 |
msgstr "" |
|
426 |
||
427 |
#: bzrlib/builtins.py:1000
|
|
428 |
msgid "missing file argument" |
|
429 |
msgstr "" |
|
430 |
||
431 |
#: bzrlib/builtins.py:1004
|
|
432 |
msgid "can not move root of branch" |
|
433 |
msgstr "" |
|
434 |
||
435 |
#: bzrlib/builtins.py:1010
|
|
436 |
msgid "Only one path may be specified to --auto." |
|
437 |
msgstr "" |
|
438 |
||
439 |
#: bzrlib/builtins.py:1013
|
|
440 |
msgid "--after cannot be specified with --auto." |
|
441 |
msgstr "" |
|
442 |
||
443 |
#: bzrlib/builtins.py:1050
|
|
444 |
msgid "to mv multiple files the destination must be a versioned directory" |
|
445 |
msgstr "" |
|
446 |
||
447 |
#: bzrlib/builtins.py:1102
|
|
448 |
msgid "Turn this branch into a mirror of another branch." |
|
449 |
msgstr "" |
|
450 |
||
451 |
#: bzrlib/builtins.py:1104
|
|
452 |
msgid "" |
|
453 |
"By default, this command only works on branches that have not diverged.\n"
|
|
454 |
"Branches are considered diverged if the destination branch's most recent \n"
|
|
455 |
"commit is one that has not been merged (directly or indirectly) into the \n"
|
|
456 |
"parent."
|
|
457 |
msgstr "" |
|
458 |
||
459 |
#: bzrlib/builtins.py:1109
|
|
460 |
msgid "" |
|
461 |
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
|
|
462 |
"from one into the other. Once one branch has merged, the other should\n"
|
|
463 |
"be able to pull it again."
|
|
464 |
msgstr "" |
|
465 |
||
466 |
#: bzrlib/builtins.py:1113
|
|
467 |
msgid "" |
|
468 |
"If you want to replace your local changes and just want your branch to\n"
|
|
469 |
"match the remote one, use pull --overwrite. This will work even if the two\n"
|
|
470 |
"branches have diverged."
|
|
471 |
msgstr "" |
|
472 |
||
473 |
#: bzrlib/builtins.py:1117
|
|
474 |
msgid "" |
|
475 |
"If there is no default location set, the first pull will set it (use\n"
|
|
476 |
"--no-remember to avoid setting it). After that, you can omit the\n"
|
|
477 |
"location to use the default. To change the default, use --remember. The\n"
|
|
478 |
"value will only be saved if the remote location can be accessed."
|
|
479 |
msgstr "" |
|
480 |
||
481 |
#: bzrlib/builtins.py:1122
|
|
482 |
msgid "" |
|
483 |
"The --verbose option will display the revisions pulled using the log_format\n"
|
|
484 |
"configuration option. You can use a different format by overriding it with\n"
|
|
485 |
"-Olog_format=<other_format>."
|
|
486 |
msgstr "" |
|
487 |
||
488 |
#: bzrlib/builtins.py:1126
|
|
489 |
msgid "" |
|
490 |
"Note: The location can be specified either in the form of a branch,\n" |
|
491 |
"or in the form of a path to a file containing a merge directive generated\n"
|
|
492 |
"with bzr send."
|
|
493 |
msgstr "" |
|
494 |
||
495 |
#: bzrlib/builtins.py:1134
|
|
496 |
msgid "Show logs of pulled revisions." |
|
497 |
msgstr "" |
|
498 |
||
499 |
#: bzrlib/builtins.py:1136
|
|
500 |
msgid "" |
|
501 |
"Branch to pull into, rather than the one containing the working directory."
|
|
502 |
msgstr "" |
|
503 |
||
504 |
#: bzrlib/builtins.py:1139
|
|
505 |
msgid "" |
|
506 |
"Perform a local pull in a bound branch. Local pulls are not applied to the "
|
|
507 |
"master branch."
|
|
508 |
msgstr "" |
|
509 |
||
510 |
#: bzrlib/builtins.py:1168
|
|
511 |
msgid "Need working tree for --show-base." |
|
512 |
msgstr "" |
|
513 |
||
514 |
#: bzrlib/builtins.py:1184
|
|
515 |
msgid "No pull location known or specified." |
|
516 |
msgstr "" |
|
517 |
||
518 |
#: bzrlib/builtins.py:1190
|
|
519 |
#, python-format
|
|
520 |
msgid "Using saved parent location: %s\n" |
|
521 |
msgstr "" |
|
522 |
||
523 |
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
|
|
524 |
msgid "Cannot use -r with merge directives or bundles" |
|
525 |
msgstr "" |
|
526 |
||
527 |
#: bzrlib/builtins.py:1238
|
|
528 |
msgid "Update a mirror of this branch." |
|
529 |
msgstr "" |
|
530 |
||
531 |
#: bzrlib/builtins.py:1240
|
|
532 |
msgid "" |
|
533 |
"The target branch will not have its working tree populated because this\n"
|
|
534 |
"is both expensive, and is not supported on remote file systems."
|
|
535 |
msgstr "" |
|
536 |
||
537 |
#: bzrlib/builtins.py:1243
|
|
538 |
msgid "" |
|
539 |
"Some smart servers or protocols *may* put the working tree in place in\n"
|
|
540 |
"the future."
|
|
541 |
msgstr "" |
|
542 |
||
543 |
#: bzrlib/builtins.py:1246
|
|
544 |
msgid "" |
|
545 |
"This command only works on branches that have not diverged. Branches are\n"
|
|
546 |
"considered diverged if the destination branch's most recent commit is one\n"
|
|
547 |
"that has not been merged (directly or indirectly) by the source branch."
|
|
548 |
msgstr "" |
|
549 |
||
550 |
#: bzrlib/builtins.py:1250
|
|
551 |
msgid "" |
|
552 |
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
|
|
553 |
"the other branch completely, discarding its unmerged changes."
|
|
554 |
msgstr "" |
|
555 |
||
556 |
#: bzrlib/builtins.py:1253
|
|
557 |
msgid "" |
|
558 |
"If you want to ensure you have the different changes in the other branch,\n"
|
|
559 |
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
|
|
560 |
"After that you will be able to do a push without '--overwrite'."
|
|
561 |
msgstr "" |
|
562 |
||
563 |
#: bzrlib/builtins.py:1257
|
|
564 |
msgid "" |
|
565 |
"If there is no default push location set, the first push will set it (use\n"
|
|
566 |
"--no-remember to avoid setting it). After that, you can omit the\n"
|
|
567 |
"location to use the default. To change the default, use --remember. The\n"
|
|
568 |
"value will only be saved if the remote location can be accessed."
|
|
569 |
msgstr "" |
|
570 |
||
571 |
#: bzrlib/builtins.py:1262
|
|
572 |
msgid "" |
|
573 |
"The --verbose option will display the revisions pushed using the log_format\n"
|
|
574 |
"configuration option. You can use a different format by overriding it with\n"
|
|
575 |
"-Olog_format=<other_format>."
|
|
576 |
msgstr "" |
|
577 |
||
578 |
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
|
|
579 |
msgid "" |
|
580 |
"Branch to push from, rather than the one containing the working directory."
|
|
581 |
msgstr "" |
|
582 |
||
583 |
#: bzrlib/builtins.py:1276
|
|
584 |
msgid "" |
|
585 |
"By default push will fail if the target directory exists, but does not "
|
|
586 |
"already have a control directory. This flag will allow push to proceed."
|
|
587 |
msgstr "" |
|
588 |
||
589 |
#: bzrlib/builtins.py:1281
|
|
590 |
msgid "" |
|
591 |
"Create a stacked branch that references the public location of the parent "
|
|
592 |
"branch."
|
|
593 |
msgstr "" |
|
594 |
||
595 |
#: bzrlib/builtins.py:1284
|
|
596 |
msgid "" |
|
597 |
"Create a stacked branch that refers to another branch for the commit "
|
|
598 |
"history. Only the work not present in the referenced branch is included in "
|
|
599 |
"the branch created."
|
|
600 |
msgstr "" |
|
601 |
||
602 |
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
|
|
603 |
msgid "" |
|
604 |
"Refuse to push if there are uncommitted changes in the working tree, --no-"
|
|
605 |
"strict disables the check."
|
|
606 |
msgstr "" |
|
607 |
||
608 |
#: bzrlib/builtins.py:1292
|
|
609 |
msgid "Don't populate the working tree, even for protocols that support it." |
|
610 |
msgstr "" |
|
611 |
||
612 |
#: bzrlib/builtins.py:1336
|
|
613 |
msgid "Could not determine branch to refer to." |
|
614 |
msgstr "" |
|
615 |
||
616 |
#: bzrlib/builtins.py:1345
|
|
617 |
#, python-format
|
|
618 |
msgid "" |
|
619 |
"No push location known or specified. To push to the parent branch (at %s), "
|
|
620 |
"use 'bzr push :parent'."
|
|
621 |
msgstr "" |
|
622 |
||
623 |
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
|
|
624 |
msgid "No push location known or specified." |
|
625 |
msgstr "" |
|
626 |
||
627 |
#: bzrlib/builtins.py:1355
|
|
628 |
#, python-format
|
|
629 |
msgid "Using saved push location: %s" |
|
630 |
msgstr "" |
|
631 |
||
632 |
#: bzrlib/builtins.py:1365
|
|
633 |
msgid "Create a new branch that is a copy of an existing branch." |
|
634 |
msgstr "" |
|
635 |
||
636 |
#: bzrlib/builtins.py:1367
|
|
637 |
msgid "" |
|
638 |
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
|
|
639 |
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
|
|
640 |
"./bar.\n"
|
|
641 |
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
|
|
642 |
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
|
|
643 |
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
|
|
644 |
"create ./foo-bar."
|
|
645 |
msgstr "" |
|
646 |
||
647 |
#: bzrlib/builtins.py:1374
|
|
648 |
msgid "" |
|
649 |
"To retrieve the branch as of a particular revision, supply the --revision\n"
|
|
650 |
"parameter, as in \"branch foo/bar -r 5\"."
|
|
651 |
msgstr "" |
|
652 |
||
653 |
#: bzrlib/builtins.py:1377
|
|
654 |
msgid "The synonyms 'clone' and 'get' for this command are deprecated." |
|
655 |
msgstr "" |
|
656 |
||
657 |
#: bzrlib/builtins.py:1387
|
|
658 |
msgid "Create a branch without a working-tree." |
|
659 |
msgstr "" |
|
660 |
||
661 |
#: bzrlib/builtins.py:1389
|
|
662 |
msgid "Switch the checkout in the current directory to the new branch." |
|
663 |
msgstr "" |
|
664 |
||
665 |
#: bzrlib/builtins.py:1392
|
|
666 |
msgid "" |
|
667 |
"Create a stacked branch referring to the source branch. The new branch will "
|
|
668 |
"depend on the availability of the source branch for all operations."
|
|
669 |
msgstr "" |
|
670 |
||
671 |
#: bzrlib/builtins.py:1396
|
|
672 |
msgid "Do not use a shared repository, even if available." |
|
673 |
msgstr "" |
|
674 |
||
675 |
#: bzrlib/builtins.py:1398
|
|
676 |
msgid "" |
|
677 |
"By default branch will fail if the target directory exists, but does not "
|
|
678 |
"already have a control directory. This flag will allow branch to proceed."
|
|
679 |
msgstr "" |
|
680 |
||
681 |
#: bzrlib/builtins.py:1403
|
|
682 |
msgid "Bind new branch to from location." |
|
683 |
msgstr "" |
|
684 |
||
685 |
#: bzrlib/builtins.py:1450
|
|
686 |
#, python-format
|
|
687 |
msgid "Target directory \"%s\" already exists." |
|
688 |
msgstr "" |
|
689 |
||
690 |
#: bzrlib/builtins.py:1462
|
|
691 |
#, python-format
|
|
692 |
msgid "Parent of \"%s\" does not exist." |
|
693 |
msgstr "" |
|
694 |
||
695 |
#: bzrlib/builtins.py:1481
|
|
696 |
msgid "The branch {0} has no revision {1}." |
|
697 |
msgstr "" |
|
698 |
||
699 |
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
|
|
700 |
#, python-format
|
|
701 |
msgid "Created new stacked branch referring to %s." |
|
702 |
msgstr "" |
|
703 |
||
704 |
#: bzrlib/builtins.py:1500
|
|
705 |
#, python-format
|
|
706 |
msgid "Branched %d revision." |
|
707 |
msgid_plural "Branched %d revisions." |
|
708 |
msgstr[0] "" |
|
709 |
msgstr[1] "" |
|
710 |
||
711 |
#: bzrlib/builtins.py:1505
|
|
712 |
#, python-format
|
|
713 |
msgid "New branch bound to %s" |
|
714 |
msgstr "" |
|
715 |
||
716 |
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
|
|
717 |
#, python-format
|
|
718 |
msgid "Switched to branch: %s" |
|
719 |
msgstr "" |
|
720 |
||
721 |
#: bzrlib/builtins.py:1515
|
|
722 |
msgid "List the branches available at the current location." |
|
723 |
msgstr "" |
|
724 |
||
725 |
#: bzrlib/builtins.py:1517
|
|
726 |
msgid "" |
|
727 |
"This command will print the names of all the branches at the current\n"
|
|
728 |
"location."
|
|
729 |
msgstr "" |
|
730 |
||
731 |
#: bzrlib/builtins.py:1524
|
|
732 |
msgid "" |
|
733 |
"Recursively scan for branches rather than just looking in the specified "
|
|
734 |
"location."
|
|
735 |
msgstr "" |
|
736 |
||
737 |
#: bzrlib/builtins.py:1554
|
|
738 |
msgid "(default)" |
|
739 |
msgstr "" |
|
740 |
||
741 |
#: bzrlib/builtins.py:1566
|
|
742 |
msgid "Create a new checkout of an existing branch." |
|
743 |
msgstr "" |
|
744 |
||
745 |
#: bzrlib/builtins.py:1568
|
|
746 |
msgid "" |
|
747 |
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
|
|
748 |
"for\n"
|
|
749 |
"the branch found in '.'. This is useful if you have removed the working "
|
|
750 |
"tree\n"
|
|
751 |
"or if it was never created - i.e. if you pushed the branch to its current\n"
|
|
752 |
"location using SFTP."
|
|
753 |
msgstr "" |
|
754 |
||
755 |
#: bzrlib/builtins.py:1573
|
|
756 |
msgid "" |
|
757 |
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
|
|
758 |
"will\n"
|
|
759 |
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
|
|
760 |
"./bar.\n"
|
|
761 |
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
|
|
762 |
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
|
|
763 |
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
|
|
764 |
"create ./foo-bar."
|
|
765 |
msgstr "" |
|
766 |
||
767 |
#: bzrlib/builtins.py:1580
|
|
768 |
msgid "" |
|
769 |
"To retrieve the branch as of a particular revision, supply the --revision\n"
|
|
770 |
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
|
|
771 |
"immediately\n"
|
|
772 |
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
|
|
773 |
"old\n"
|
|
774 |
"code.)"
|
|
775 |
msgstr "" |
|
776 |
||
777 |
#: bzrlib/builtins.py:1590
|
|
778 |
msgid "" |
|
779 |
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
|
|
780 |
"the branch for every operation. Normal checkouts can perform common "
|
|
781 |
"operations like diff and status without such access, and also support local "
|
|
782 |
"commits."
|
|
783 |
msgstr "" |
|
784 |
||
785 |
#: bzrlib/builtins.py:1597
|
|
786 |
msgid "Get file contents from this tree." |
|
787 |
msgstr "" |
|
788 |
||
789 |
#: bzrlib/builtins.py:1599
|
|
790 |
msgid "Hard-link working tree files where possible." |
|
791 |
msgstr "" |
|
792 |
||
793 |
#: bzrlib/builtins.py:1640
|
|
794 |
msgid "" |
|
795 |
"Show list of renamed files.\n"
|
|
796 |
" "
|
|
797 |
msgstr "" |
|
798 |
||
799 |
#: bzrlib/builtins.py:1670
|
|
800 |
msgid "Update a working tree to a new revision." |
|
801 |
msgstr "" |
|
802 |
||
803 |
#: bzrlib/builtins.py:1672
|
|
804 |
msgid "" |
|
805 |
"This will perform a merge of the destination revision (the tip of the\n"
|
|
806 |
"branch, or the specified revision) into the working tree, and then make\n"
|
|
807 |
"that revision the basis revision for the working tree. "
|
|
808 |
msgstr "" |
|
809 |
||
810 |
#: bzrlib/builtins.py:1676
|
|
811 |
msgid "" |
|
812 |
"You can use this to visit an older revision, or to update a working tree\n"
|
|
813 |
"that is out of date from its branch."
|
|
814 |
msgstr "" |
|
815 |
||
816 |
#: bzrlib/builtins.py:1679
|
|
817 |
msgid "" |
|
818 |
"If there are any uncommitted changes in the tree, they will be carried\n"
|
|
819 |
"across and remain as uncommitted changes after the update. To discard\n"
|
|
820 |
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
|
|
821 |
"with the changes brought in by the change in basis revision."
|
|
822 |
msgstr "" |
|
823 |
||
824 |
#: bzrlib/builtins.py:1684
|
|
825 |
msgid "" |
|
826 |
"If the tree's branch is bound to a master branch, bzr will also update\n"
|
|
827 |
"the branch from the master."
|
|
828 |
msgstr "" |
|
829 |
||
830 |
#: bzrlib/builtins.py:1687
|
|
831 |
msgid "" |
|
832 |
"You cannot update just a single file or directory, because each Bazaar\n"
|
|
833 |
"working tree has just a single basis revision. If you want to restore a\n"
|
|
834 |
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
|
|
835 |
"update'. If you want to restore a file to its state in a previous\n"
|
|
836 |
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
|
|
837 |
"out the old content of that file to a new location."
|
|
838 |
msgstr "" |
|
839 |
||
840 |
#: bzrlib/builtins.py:1694
|
|
841 |
msgid "" |
|
842 |
"The 'dir' argument, if given, must be the location of the root of a\n"
|
|
843 |
"working tree to update. By default, the working tree that contains the \n"
|
|
844 |
"current working directory is used."
|
|
845 |
msgstr "" |
|
846 |
||
847 |
#: bzrlib/builtins.py:1710
|
|
848 |
msgid "bzr update --revision takes exactly one revision" |
|
849 |
msgstr "" |
|
850 |
||
851 |
#: bzrlib/builtins.py:1718
|
|
852 |
msgid "bzr update can only update a whole tree, not a file or subdirectory" |
|
853 |
msgstr "" |
|
854 |
||
855 |
#: bzrlib/builtins.py:1749
|
|
856 |
msgid "Tree is up to date at revision {0} of branch {1}" |
|
857 |
msgstr "" |
|
858 |
||
859 |
#: bzrlib/builtins.py:1765
|
|
860 |
#, python-format
|
|
861 |
msgid "" |
|
862 |
"branch has no revision %s\n"
|
|
863 |
"bzr update --revision only works for a revision in the branch history"
|
|
864 |
msgstr "" |
|
865 |
||
866 |
#: bzrlib/builtins.py:1771
|
|
867 |
msgid "Updated to revision {0} of branch {1}" |
|
868 |
msgstr "" |
|
869 |
||
870 |
#: bzrlib/builtins.py:1775
|
|
871 |
msgid "" |
|
872 |
"Your local commits will now show as pending merges with 'bzr status', and "
|
|
873 |
"can be committed with 'bzr commit'."
|
|
874 |
msgstr "" |
|
875 |
||
876 |
#: bzrlib/builtins.py:1784
|
|
877 |
msgid "Show information about a working tree, branch or repository." |
|
878 |
msgstr "" |
|
879 |
||
880 |
#: bzrlib/builtins.py:1786
|
|
881 |
msgid "" |
|
882 |
"This command will show all known locations and formats associated to the\n"
|
|
883 |
"tree, branch or repository."
|
|
884 |
msgstr "" |
|
885 |
||
886 |
#: bzrlib/builtins.py:1789
|
|
887 |
msgid "" |
|
888 |
"In verbose mode, statistical information is included with each report.\n"
|
|
889 |
"To see extended statistic information, use a verbosity level of 2 or\n"
|
|
890 |
"higher by specifying the verbose option multiple times, e.g. -vv."
|
|
891 |
msgstr "" |
|
892 |
||
893 |
#: bzrlib/builtins.py:1793
|
|
894 |
msgid "Branches and working trees will also report any missing revisions." |
|
895 |
msgstr "" |
|
896 |
||
897 |
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
|
|
898 |
#: bzrlib/builtins.py:6442
|
|
899 |
msgid ":Examples:" |
|
900 |
msgstr "" |
|
901 |
||
902 |
#: bzrlib/builtins.py:1797
|
|
903 |
msgid " Display information on the format and related locations:" |
|
904 |
msgstr "" |
|
905 |
||
906 |
#: bzrlib/builtins.py:1799
|
|
907 |
msgid " bzr info" |
|
908 |
msgstr "" |
|
909 |
||
910 |
#: bzrlib/builtins.py:1801
|
|
911 |
msgid "" |
|
912 |
" Display the above together with extended format information and\n"
|
|
913 |
" basic statistics (like the number of files in the working tree and\n"
|
|
914 |
" number of revisions in the branch and repository):"
|
|
915 |
msgstr "" |
|
916 |
||
917 |
#: bzrlib/builtins.py:1805
|
|
918 |
msgid " bzr info -v" |
|
919 |
msgstr "" |
|
920 |
||
921 |
#: bzrlib/builtins.py:1807
|
|
922 |
msgid " Display the above together with number of committers to the branch:" |
|
923 |
msgstr "" |
|
924 |
||
925 |
#: bzrlib/builtins.py:1809
|
|
926 |
msgid " bzr info -vv" |
|
927 |
msgstr "" |
|
928 |
||
929 |
#: bzrlib/builtins.py:1828
|
|
930 |
msgid "Remove files or directories." |
|
931 |
msgstr "" |
|
932 |
||
933 |
#: bzrlib/builtins.py:1830
|
|
934 |
msgid "" |
|
935 |
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
|
|
936 |
"delete them if they can easily be recovered using revert otherwise they\n"
|
|
937 |
"will be backed up (adding an extention of the form .~#~). If no options or\n"
|
|
938 |
"parameters are given Bazaar will scan for files that are being tracked by\n"
|
|
939 |
"Bazaar but missing in your tree and stop tracking them for you."
|
|
940 |
msgstr "" |
|
941 |
||
942 |
#: bzrlib/builtins.py:1838
|
|
943 |
msgid "Only remove files that have never been committed." |
|
944 |
msgstr "" |
|
945 |
||
946 |
#: bzrlib/builtins.py:1840
|
|
947 |
msgid "The file deletion mode to be used." |
|
948 |
msgstr "" |
|
949 |
||
950 |
#: bzrlib/builtins.py:1841
|
|
951 |
msgid "Deletion Strategy" |
|
952 |
msgstr "" |
|
953 |
||
954 |
#: bzrlib/builtins.py:1842
|
|
955 |
msgid "Backup changed files (default)." |
|
956 |
msgstr "" |
|
957 |
||
958 |
#: bzrlib/builtins.py:1843
|
|
959 |
msgid "Delete from bzr but leave the working copy." |
|
960 |
msgstr "" |
|
961 |
||
962 |
#: bzrlib/builtins.py:1844
|
|
963 |
msgid "Don't backup changed files." |
|
964 |
msgstr "" |
|
965 |
||
966 |
#: bzrlib/builtins.py:1845
|
|
967 |
msgid "" |
|
968 |
"Delete all the specified files, even if they can not be recovered and even "
|
|
969 |
"if they are non-empty directories. (deprecated, use no-backup)"
|
|
970 |
msgstr "" |
|
971 |
||
972 |
#: bzrlib/builtins.py:1854
|
|
973 |
msgid "(The --force option is deprecated, rather use --no-backup in future.)" |
|
974 |
msgstr "" |
|
975 |
||
976 |
#: bzrlib/builtins.py:1871
|
|
977 |
msgid "No matching files." |
|
978 |
msgstr "" |
|
979 |
||
980 |
#: bzrlib/builtins.py:1932
|
|
981 |
msgid "Reconcile bzr metadata in a branch." |
|
982 |
msgstr "" |
|
983 |
||
984 |
#: bzrlib/builtins.py:1934
|
|
985 |
msgid "" |
|
986 |
"This can correct data mismatches that may have been caused by\n"
|
|
987 |
"previous ghost operations or bzr upgrades. You should only\n"
|
|
988 |
"need to run this command if 'bzr check' or a bzr developer\n"
|
|
989 |
"advises you to run it."
|
|
990 |
msgstr "" |
|
991 |
||
992 |
#: bzrlib/builtins.py:1939
|
|
993 |
msgid "" |
|
994 |
"If a second branch is provided, cross-branch reconciliation is\n"
|
|
995 |
"also attempted, which will check that data like the tree root\n"
|
|
996 |
"id which was not present in very early bzr versions is represented\n"
|
|
997 |
"correctly in both branches."
|
|
998 |
msgstr "" |
|
999 |
||
1000 |
#: bzrlib/builtins.py:1944
|
|
1001 |
msgid "" |
|
1002 |
"At the same time it is run it may recompress data resulting in\n"
|
|
1003 |
"a potential saving in disk space or performance gain."
|
|
1004 |
msgstr "" |
|
1005 |
||
1006 |
#: bzrlib/builtins.py:1947
|
|
1007 |
msgid "The branch *MUST* be on a listable system such as local disk or sftp." |
|
1008 |
msgstr "" |
|
1009 |
||
1010 |
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
|
|
1011 |
msgid "" |
|
1012 |
"Format for the bzr 2.0 series.\n"
|
|
1013 |
"Uses group-compress storage.\n"
|
|
1014 |
"Provides rich roots which are a one-way transition.\n"
|
|
1015 |
msgstr "" |
|
1016 |
||
1017 |
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
|
|
1018 |
msgid "" |
|
1019 |
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
|
|
1020 |
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
|
|
1021 |
msgstr "" |
|
1022 |
||
1023 |
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
|
|
1024 |
msgid "The 2a format with experimental support for colocated branches.\n" |
|
1025 |
msgstr "" |
|
1026 |
||
1027 |
#: bzrlib/builtins.py:2015
|
|
1028 |
msgid "Make a directory into a versioned branch." |
|
1029 |
msgstr "" |
|
1030 |
||
1031 |
#: bzrlib/builtins.py:2017
|
|
1032 |
msgid "" |
|
1033 |
"Use this to create an empty branch, or before importing an\n"
|
|
1034 |
"existing project."
|
|
1035 |
msgstr "" |
|
1036 |
||
1037 |
#: bzrlib/builtins.py:2020
|
|
1038 |
msgid "" |
|
1039 |
"If there is a repository in a parent directory of the location, then\n"
|
|
1040 |
"the history of the branch will be stored in the repository. Otherwise\n"
|
|
1041 |
"init creates a standalone branch which carries its own history\n"
|
|
1042 |
"in the .bzr directory."
|
|
1043 |
msgstr "" |
|
1044 |
||
1045 |
#: bzrlib/builtins.py:2025
|
|
1046 |
msgid "" |
|
1047 |
"If there is already a branch at the location but it has no working tree,\n"
|
|
1048 |
"the tree can be populated with 'bzr checkout'."
|
|
1049 |
msgstr "" |
|
1050 |
||
1051 |
#: bzrlib/builtins.py:2028
|
|
1052 |
msgid "Recipe for importing a tree of files::" |
|
1053 |
msgstr "" |
|
1054 |
||
1055 |
#: bzrlib/builtins.py:2030
|
|
1056 |
msgid "" |
|
1057 |
" cd ~/project\n"
|
|
1058 |
" bzr init\n"
|
|
1059 |
" bzr add .\n"
|
|
1060 |
" bzr status\n"
|
|
1061 |
" bzr commit -m \"imported project\""
|
|
1062 |
msgstr "" |
|
1063 |
||
1064 |
#: bzrlib/builtins.py:2041
|
|
1065 |
msgid "" |
|
1066 |
"Create the path leading up to the branch if it does not already exist."
|
|
1067 |
msgstr "" |
|
1068 |
||
1069 |
#: bzrlib/builtins.py:2044
|
|
1070 |
msgid "Specify a format for this branch. See \"help formats\"." |
|
1071 |
msgstr "" |
|
1072 |
||
1073 |
#: bzrlib/builtins.py:2052
|
|
1074 |
msgid "" |
|
1075 |
"Never change revnos or the existing log. Append revisions to it only."
|
|
1076 |
msgstr "" |
|
1077 |
||
1078 |
#: bzrlib/builtins.py:2055
|
|
1079 |
msgid "Create a branch without a working tree." |
|
1080 |
msgstr "" |
|
1081 |
||
1082 |
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
|
|
1083 |
#, python-format
|
|
1084 |
msgid "" |
|
1085 |
"Parent directory of %s does not exist.\n"
|
|
1086 |
"You may supply --create-prefix to create all leading parent directories."
|
|
1087 |
msgstr "" |
|
1088 |
||
1089 |
#: bzrlib/builtins.py:2109
|
|
1090 |
msgid "" |
|
1091 |
"This branch format cannot be set to append-revisions-only. Try --default."
|
|
1092 |
msgstr "" |
|
1093 |
||
1094 |
#: bzrlib/builtins.py:2120
|
|
1095 |
msgid "Created a {0} (format: {1})\n" |
|
1096 |
msgstr "" |
|
1097 |
||
1098 |
#: bzrlib/builtins.py:2129
|
|
1099 |
#, python-format
|
|
1100 |
msgid "Using shared repository: %s\n" |
|
1101 |
msgstr "" |
|
1102 |
||
1103 |
#: bzrlib/builtins.py:2133
|
|
1104 |
msgid "Create a shared repository for branches to share storage space." |
|
1105 |
msgstr "" |
|
1106 |
||
1107 |
#: bzrlib/builtins.py:2135
|
|
1108 |
msgid "" |
|
1109 |
"New branches created under the repository directory will store their\n"
|
|
1110 |
"revisions in the repository, not in the branch directory. For branches\n"
|
|
1111 |
"with shared history, this reduces the amount of storage needed and \n"
|
|
1112 |
"speeds up the creation of new branches."
|
|
1113 |
msgstr "" |
|
1114 |
||
1115 |
#: bzrlib/builtins.py:2140
|
|
1116 |
msgid "" |
|
1117 |
"If the --no-trees option is given then the branches in the repository\n"
|
|
1118 |
"will not have working trees by default. They will still exist as \n"
|
|
1119 |
"directories on disk, but they will not have separate copies of the \n"
|
|
1120 |
"files at a certain revision. This can be useful for repositories that\n"
|
|
1121 |
"store branches which are interacted with through checkouts or remote\n"
|
|
1122 |
"branches, such as on a server."
|
|
1123 |
msgstr "" |
|
1124 |
||
1125 |
#: bzrlib/builtins.py:2147
|
|
1126 |
msgid "" |
|
1127 |
":Examples:\n"
|
|
1128 |
" Create a shared repository holding just branches::"
|
|
1129 |
msgstr "" |
|
1130 |
||
1131 |
#: bzrlib/builtins.py:2150
|
|
1132 |
msgid "" |
|
1133 |
" bzr init-repo --no-trees repo\n"
|
|
1134 |
" bzr init repo/trunk"
|
|
1135 |
msgstr "" |
|
1136 |
||
1137 |
#: bzrlib/builtins.py:2153
|
|
1138 |
msgid " Make a lightweight checkout elsewhere::" |
|
1139 |
msgstr "" |
|
1140 |
||
1141 |
#: bzrlib/builtins.py:2155
|
|
1142 |
msgid "" |
|
1143 |
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
|
|
1144 |
" cd trunk-checkout\n"
|
|
1145 |
" (add files here)"
|
|
1146 |
msgstr "" |
|
1147 |
||
1148 |
#: bzrlib/builtins.py:2163
|
|
1149 |
msgid "" |
|
1150 |
"Specify a format for this repository. See \"bzr help formats\" for details."
|
|
1151 |
msgstr "" |
|
1152 |
||
1153 |
#: bzrlib/builtins.py:2167
|
|
1154 |
msgid "Repository format" |
|
1155 |
msgstr "" |
|
1156 |
||
1157 |
#: bzrlib/builtins.py:2169
|
|
1158 |
msgid "Branches in the repository will default to not having a working tree." |
|
1159 |
msgstr "" |
|
1160 |
||
1161 |
#: bzrlib/builtins.py:2195
|
|
1162 |
msgid "Show differences in the working tree, between revisions or branches." |
|
1163 |
msgstr "" |
|
1164 |
||
1165 |
#: bzrlib/builtins.py:2197
|
|
1166 |
msgid "" |
|
1167 |
"If no arguments are given, all changes for the current tree are listed.\n"
|
|
1168 |
"If files are given, only the changes in those files are listed.\n"
|
|
1169 |
"Remote and multiple branches can be compared by using the --old and\n"
|
|
1170 |
"--new options. If not provided, the default for both is derived from\n"
|
|
1171 |
"the first argument, if any, or the current tree if no arguments are\n"
|
|
1172 |
"given."
|
|
1173 |
msgstr "" |
|
1174 |
||
1175 |
#: bzrlib/builtins.py:2204
|
|
1176 |
msgid "" |
|
1177 |
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
|
|
1178 |
"produces patches suitable for \"patch -p1\"."
|
|
1179 |
msgstr "" |
|
1180 |
||
1181 |
#: bzrlib/builtins.py:2207
|
|
1182 |
msgid "" |
|
1183 |
"Note that when using the -r argument with a range of revisions, the\n"
|
|
1184 |
"differences are computed between the two specified revisions. That\n"
|
|
1185 |
"is, the command does not show the changes introduced by the first \n"
|
|
1186 |
"revision in the range. This differs from the interpretation of \n"
|
|
1187 |
"revision ranges used by \"bzr log\" which includes the first revision\n"
|
|
1188 |
"in the range."
|
|
1189 |
msgstr "" |
|
1190 |
||
1191 |
#: bzrlib/builtins.py:2214
|
|
1192 |
msgid "" |
|
1193 |
":Exit values:\n"
|
|
1194 |
" 1 - changed\n"
|
|
1195 |
" 2 - unrepresentable changes\n"
|
|
1196 |
" 3 - error\n"
|
|
1197 |
" 0 - no change"
|
|
1198 |
msgstr "" |
|
1199 |
||
1200 |
#: bzrlib/builtins.py:2220
|
|
1201 |
msgid "" |
|
1202 |
":Examples:\n"
|
|
1203 |
" Shows the difference in the working tree versus the last commit::"
|
|
1204 |
msgstr "" |
|
1205 |
||
1206 |
#: bzrlib/builtins.py:2223
|
|
1207 |
msgid " bzr diff" |
|
1208 |
msgstr "" |
|
1209 |
||
1210 |
#: bzrlib/builtins.py:2225
|
|
1211 |
msgid " Difference between the working tree and revision 1::" |
|
1212 |
msgstr "" |
|
1213 |
||
1214 |
#: bzrlib/builtins.py:2227
|
|
1215 |
msgid " bzr diff -r1" |
|
1216 |
msgstr "" |
|
1217 |
||
1218 |
#: bzrlib/builtins.py:2229
|
|
1219 |
msgid " Difference between revision 3 and revision 1::" |
|
1220 |
msgstr "" |
|
1221 |
||
1222 |
#: bzrlib/builtins.py:2231
|
|
1223 |
msgid " bzr diff -r1..3" |
|
1224 |
msgstr "" |
|
1225 |
||
1226 |
#: bzrlib/builtins.py:2233
|
|
1227 |
msgid " Difference between revision 3 and revision 1 for branch xxx::" |
|
1228 |
msgstr "" |
|
1229 |
||
1230 |
#: bzrlib/builtins.py:2235
|
|
1231 |
msgid " bzr diff -r1..3 xxx" |
|
1232 |
msgstr "" |
|
1233 |
||
1234 |
#: bzrlib/builtins.py:2237
|
|
1235 |
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::" |
|
1236 |
msgstr "" |
|
1237 |
||
1238 |
#: bzrlib/builtins.py:2239
|
|
1239 |
msgid " bzr diff -c2" |
|
1240 |
msgstr "" |
|
1241 |
||
1242 |
#: bzrlib/builtins.py:2241
|
|
1243 |
msgid "" |
|
1244 |
" To see the changes introduced by revision X::\n"
|
|
1245 |
" \n"
|
|
1246 |
" bzr diff -cX"
|
|
1247 |
msgstr "" |
|
1248 |
||
1249 |
#: bzrlib/builtins.py:2245
|
|
1250 |
msgid "" |
|
1251 |
" Note that in the case of a merge, the -c option shows the changes\n"
|
|
1252 |
" compared to the left hand parent. To see the changes against\n"
|
|
1253 |
" another parent, use::"
|
|
1254 |
msgstr "" |
|
1255 |
||
1256 |
#: bzrlib/builtins.py:2249
|
|
1257 |
msgid " bzr diff -r<chosen_parent>..X" |
|
1258 |
msgstr "" |
|
1259 |
||
1260 |
#: bzrlib/builtins.py:2251
|
|
1261 |
msgid "" |
|
1262 |
" The changes between the current revision and the previous revision\n"
|
|
1263 |
" (equivalent to -c-1 and -r-2..-1)"
|
|
1264 |
msgstr "" |
|
1265 |
||
1266 |
#: bzrlib/builtins.py:2254
|
|
1267 |
msgid " bzr diff -r-2.." |
|
1268 |
msgstr "" |
|
1269 |
||
1270 |
#: bzrlib/builtins.py:2256
|
|
1271 |
msgid " Show just the differences for file NEWS::" |
|
1272 |
msgstr "" |
|
1273 |
||
1274 |
#: bzrlib/builtins.py:2258
|
|
1275 |
msgid " bzr diff NEWS" |
|
1276 |
msgstr "" |
|
1277 |
||
1278 |
#: bzrlib/builtins.py:2260
|
|
1279 |
msgid " Show the differences in working tree xxx for file NEWS::" |
|
1280 |
msgstr "" |
|
1281 |
||
1282 |
#: bzrlib/builtins.py:2262
|
|
1283 |
msgid " bzr diff xxx/NEWS" |
|
1284 |
msgstr "" |
|
1285 |
||
1286 |
#: bzrlib/builtins.py:2264
|
|
1287 |
msgid " Show the differences from branch xxx to this working tree:" |
|
1288 |
msgstr "" |
|
1289 |
||
1290 |
#: bzrlib/builtins.py:2266
|
|
1291 |
msgid " bzr diff --old xxx" |
|
1292 |
msgstr "" |
|
1293 |
||
1294 |
#: bzrlib/builtins.py:2268
|
|
1295 |
msgid " Show the differences between two branches for file NEWS::" |
|
1296 |
msgstr "" |
|
1297 |
||
1298 |
#: bzrlib/builtins.py:2270
|
|
1299 |
msgid " bzr diff --old xxx --new yyy NEWS" |
|
1300 |
msgstr "" |
|
1301 |
||
1302 |
#: bzrlib/builtins.py:2272
|
|
1303 |
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::" |
|
1304 |
msgstr "" |
|
1305 |
||
1306 |
#: bzrlib/builtins.py:2274
|
|
1307 |
msgid "" |
|
1308 |
" bzr diff --prefix old/:new/\n"
|
|
1309 |
" \n"
|
|
1310 |
" Show the differences using a custom diff program with options::\n"
|
|
1311 |
" \n"
|
|
1312 |
" bzr diff --using /usr/bin/diff --diff-options -wu"
|
|
1313 |
msgstr "" |
|
1314 |
||
1315 |
#: bzrlib/builtins.py:2284
|
|
1316 |
msgid "Pass these options to the external diff program." |
|
1317 |
msgstr "" |
|
1318 |
||
1319 |
#: bzrlib/builtins.py:2287
|
|
1320 |
msgid "" |
|
1321 |
"Set prefixes added to old and new filenames, as two values separated by a "
|
|
1322 |
"colon. (eg \"old/:new/\")."
|
|
1323 |
msgstr "" |
|
1324 |
||
1325 |
#: bzrlib/builtins.py:2290
|
|
1326 |
msgid "Branch/tree to compare from." |
|
1327 |
msgstr "" |
|
1328 |
||
1329 |
#: bzrlib/builtins.py:2294
|
|
1330 |
msgid "Branch/tree to compare to." |
|
1331 |
msgstr "" |
|
1332 |
||
1333 |
#: bzrlib/builtins.py:2300
|
|
1334 |
msgid "Use this command to compare files." |
|
1335 |
msgstr "" |
|
1336 |
||
1337 |
#: bzrlib/builtins.py:2305
|
|
1338 |
msgid "Diff format to use." |
|
1339 |
msgstr "" |
|
1340 |
||
1341 |
#: bzrlib/builtins.py:2307
|
|
1342 |
msgid "Diff format" |
|
1343 |
msgstr "" |
|
1344 |
||
1345 |
#: bzrlib/builtins.py:2329
|
|
1346 |
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")" |
|
1347 |
msgstr "" |
|
1348 |
||
1349 |
#: bzrlib/builtins.py:2333
|
|
1350 |
msgid "bzr diff --revision takes exactly one or two revision specifiers" |
|
1351 |
msgstr "" |
|
1352 |
||
1353 |
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
|
|
1354 |
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
|
|
1355 |
msgid "{0} and {1} are mutually exclusive" |
|
1356 |
msgstr "" |
|
1357 |
||
1358 |
#: bzrlib/builtins.py:2358
|
|
1359 |
msgid "" |
|
1360 |
"List files deleted in the working tree.\n"
|
|
1361 |
" "
|
|
1362 |
msgstr "" |
|
1363 |
||
1364 |
#: bzrlib/builtins.py:2436
|
|
1365 |
msgid "Show the tree root directory." |
|
1366 |
msgstr "" |
|
1367 |
||
1368 |
#: bzrlib/builtins.py:2438
|
|
1369 |
msgid "" |
|
1370 |
"The root is the nearest enclosing directory with a .bzr control\n"
|
|
1371 |
"directory."
|
|
1372 |
msgstr "" |
|
1373 |
||
1374 |
#: bzrlib/builtins.py:2453
|
|
1375 |
msgid "The limit argument must be an integer." |
|
1376 |
msgstr "" |
|
1377 |
||
1378 |
#: bzrlib/builtins.py:2461
|
|
1379 |
msgid "The levels argument must be an integer." |
|
1380 |
msgstr "" |
|
1381 |
||
1382 |
#: bzrlib/builtins.py:2466
|
|
1383 |
msgid "Show historical log for a branch or subset of a branch." |
|
1384 |
msgstr "" |
|
1385 |
||
1386 |
#: bzrlib/builtins.py:2468
|
|
1387 |
msgid "" |
|
1388 |
"log is bzr's default tool for exploring the history of a branch.\n"
|
|
1389 |
"The branch to use is taken from the first parameter. If no parameters\n"
|
|
1390 |
"are given, the branch containing the working directory is logged.\n"
|
|
1391 |
"Here are some simple examples::"
|
|
1392 |
msgstr "" |
|
1393 |
||
1394 |
#: bzrlib/builtins.py:2473
|
|
1395 |
msgid "" |
|
1396 |
" bzr log log the current branch\n"
|
|
1397 |
" bzr log foo.py log a file in its branch\n"
|
|
1398 |
" bzr log http://server/branch log a branch on a server"
|
|
1399 |
msgstr "" |
|
1400 |
||
1401 |
#: bzrlib/builtins.py:2477
|
|
1402 |
msgid "" |
|
1403 |
"The filtering, ordering and information shown for each revision can\n"
|
|
1404 |
"be controlled as explained below. By default, all revisions are\n"
|
|
1405 |
"shown sorted (topologically) so that newer revisions appear before\n"
|
|
1406 |
"older ones and descendants always appear before ancestors. If displayed,\n"
|
|
1407 |
"merged revisions are shown indented under the revision in which they\n"
|
|
1408 |
"were merged."
|
|
1409 |
msgstr "" |
|
1410 |
||
1411 |
#: bzrlib/builtins.py:2484
|
|
1412 |
msgid ":Output control:" |
|
1413 |
msgstr "" |
|
1414 |
||
1415 |
#: bzrlib/builtins.py:2486
|
|
1416 |
msgid "" |
|
1417 |
" The log format controls how information about each revision is\n"
|
|
1418 |
" displayed. The standard log formats are called ``long``, ``short``\n"
|
|
1419 |
" and ``line``. The default is long. See ``bzr help log-formats``\n"
|
|
1420 |
" for more details on log formats."
|
|
1421 |
msgstr "" |
|
1422 |
||
1423 |
#: bzrlib/builtins.py:2491
|
|
1424 |
msgid "" |
|
1425 |
" The following options can be used to control what information is\n"
|
|
1426 |
" displayed::"
|
|
1427 |
msgstr "" |
|
1428 |
||
1429 |
#: bzrlib/builtins.py:2494
|
|
1430 |
msgid "" |
|
1431 |
" -l N display a maximum of N revisions\n"
|
|
1432 |
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
|
|
1433 |
" -v display a status summary (delta) for each revision\n"
|
|
1434 |
" -p display a diff (patch) for each revision\n"
|
|
1435 |
" --show-ids display revision-ids (and file-ids), not just revnos"
|
|
1436 |
msgstr "" |
|
1437 |
||
1438 |
#: bzrlib/builtins.py:2500
|
|
1439 |
msgid "" |
|
1440 |
" Note that the default number of levels to display is a function of the\n"
|
|
1441 |
" log format. If the -n option is not used, the standard log formats show\n"
|
|
1442 |
" just the top level (mainline)."
|
|
1443 |
msgstr "" |
|
1444 |
||
1445 |
#: bzrlib/builtins.py:2504
|
|
1446 |
msgid "" |
|
1447 |
" Status summaries are shown using status flags like A, M, etc. To see\n"
|
|
1448 |
" the changes explained using words like ``added`` and ``modified``\n"
|
|
1449 |
" instead, use the -vv option."
|
|
1450 |
msgstr "" |
|
1451 |
||
1452 |
#: bzrlib/builtins.py:2508
|
|
1453 |
msgid ":Ordering control:" |
|
1454 |
msgstr "" |
|
1455 |
||
1456 |
#: bzrlib/builtins.py:2510
|
|
1457 |
msgid "" |
|
1458 |
" To display revisions from oldest to newest, use the --forward option.\n"
|
|
1459 |
" In most cases, using this option will have little impact on the total\n"
|
|
1460 |
" time taken to produce a log, though --forward does not incrementally\n"
|
|
1461 |
" display revisions like --reverse does when it can."
|
|
1462 |
msgstr "" |
|
1463 |
||
1464 |
#: bzrlib/builtins.py:2515
|
|
1465 |
msgid ":Revision filtering:" |
|
1466 |
msgstr "" |
|
1467 |
||
1468 |
#: bzrlib/builtins.py:2517
|
|
1469 |
msgid "" |
|
1470 |
" The -r option can be used to specify what revision or range of revisions\n"
|
|
1471 |
" to filter against. The various forms are shown below::"
|
|
1472 |
msgstr "" |
|
1473 |
||
1474 |
#: bzrlib/builtins.py:2520
|
|
1475 |
msgid "" |
|
1476 |
" -rX display revision X\n"
|
|
1477 |
" -rX.. display revision X and later\n"
|
|
1478 |
" -r..Y display up to and including revision Y\n"
|
|
1479 |
" -rX..Y display from X to Y inclusive"
|
|
1480 |
msgstr "" |
|
1481 |
||
1482 |
#: bzrlib/builtins.py:2525
|
|
1483 |
msgid "" |
|
1484 |
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
|
|
1485 |
" Some common examples are given below::"
|
|
1486 |
msgstr "" |
|
1487 |
||
1488 |
#: bzrlib/builtins.py:2528
|
|
1489 |
msgid "" |
|
1490 |
" -r-1 show just the tip\n"
|
|
1491 |
" -r-10.. show the last 10 mainline revisions\n"
|
|
1492 |
" -rsubmit:.. show what's new on this branch\n"
|
|
1493 |
" -rancestor:path.. show changes since the common ancestor of this\n"
|
|
1494 |
" branch and the one at location path\n"
|
|
1495 |
" -rdate:yesterday.. show changes since yesterday"
|
|
1496 |
msgstr "" |
|
1497 |
||
1498 |
#: bzrlib/builtins.py:2535
|
|
1499 |
msgid "" |
|
1500 |
" When logging a range of revisions using -rX..Y, log starts at\n"
|
|
1501 |
" revision Y and searches back in history through the primary\n"
|
|
1502 |
" (\"left-hand\") parents until it finds X. When logging just the\n"
|
|
1503 |
" top level (using -n1), an error is reported if X is not found\n"
|
|
1504 |
" along the way. If multi-level logging is used (-n0), X may be\n"
|
|
1505 |
" a nested merge revision and the log will be truncated accordingly."
|
|
1506 |
msgstr "" |
|
1507 |
||
1508 |
#: bzrlib/builtins.py:2542
|
|
1509 |
msgid ":Path filtering:" |
|
1510 |
msgstr "" |
|
1511 |
||
1512 |
#: bzrlib/builtins.py:2544
|
|
1513 |
msgid "" |
|
1514 |
" If parameters are given and the first one is not a branch, the log\n"
|
|
1515 |
" will be filtered to show only those revisions that changed the\n"
|
|
1516 |
" nominated files or directories."
|
|
1517 |
msgstr "" |
|
1518 |
||
1519 |
#: bzrlib/builtins.py:2548
|
|
1520 |
msgid "" |
|
1521 |
" Filenames are interpreted within their historical context. To log a\n"
|
|
1522 |
" deleted file, specify a revision range so that the file existed at\n"
|
|
1523 |
" the end or start of the range."
|
|
1524 |
msgstr "" |
|
1525 |
||
1526 |
#: bzrlib/builtins.py:2552
|
|
1527 |
msgid "" |
|
1528 |
" Historical context is also important when interpreting pathnames of\n"
|
|
1529 |
" renamed files/directories. Consider the following example:"
|
|
1530 |
msgstr "" |
|
1531 |
||
1532 |
#: bzrlib/builtins.py:2555
|
|
1533 |
msgid "" |
|
1534 |
" * revision 1: add tutorial.txt\n"
|
|
1535 |
" * revision 2: modify tutorial.txt\n"
|
|
1536 |
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
|
|
1537 |
msgstr "" |
|
1538 |
||
1539 |
#: bzrlib/builtins.py:2559
|
|
1540 |
msgid " In this case:" |
|
1541 |
msgstr "" |
|
1542 |
||
1543 |
#: bzrlib/builtins.py:2561
|
|
1544 |
msgid " * ``bzr log guide.txt`` will log the file added in revision 1" |
|
1545 |
msgstr "" |
|
1546 |
||
1547 |
#: bzrlib/builtins.py:2563
|
|
1548 |
msgid "" |
|
1549 |
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
|
|
1550 |
msgstr "" |
|
1551 |
||
1552 |
#: bzrlib/builtins.py:2565
|
|
1553 |
msgid "" |
|
1554 |
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
|
|
1555 |
" the original file in revision 2."
|
|
1556 |
msgstr "" |
|
1557 |
||
1558 |
#: bzrlib/builtins.py:2568
|
|
1559 |
msgid "" |
|
1560 |
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
|
|
1561 |
" was no file called guide.txt in revision 2."
|
|
1562 |
msgstr "" |
|
1563 |
||
1564 |
#: bzrlib/builtins.py:2571
|
|
1565 |
msgid "" |
|
1566 |
" Renames are always followed by log. By design, there is no need to\n"
|
|
1567 |
" explicitly ask for this (and no way to stop logging a file back\n"
|
|
1568 |
" until it was last renamed)."
|
|
1569 |
msgstr "" |
|
1570 |
||
1571 |
#: bzrlib/builtins.py:2575
|
|
1572 |
msgid ":Other filtering:" |
|
1573 |
msgstr "" |
|
1574 |
||
1575 |
#: bzrlib/builtins.py:2577
|
|
1576 |
msgid "" |
|
1577 |
" The --match option can be used for finding revisions that match a\n"
|
|
1578 |
" regular expression in a commit message, committer, author or bug.\n"
|
|
1579 |
" Specifying the option several times will match any of the supplied\n"
|
|
1580 |
" expressions. --match-author, --match-bugs, --match-committer and\n"
|
|
1581 |
" --match-message can be used to only match a specific field."
|
|
1582 |
msgstr "" |
|
1583 |
||
1584 |
#: bzrlib/builtins.py:2583
|
|
1585 |
msgid ":Tips & tricks:" |
|
1586 |
msgstr "" |
|
1587 |
||
1588 |
#: bzrlib/builtins.py:2585
|
|
1589 |
msgid "" |
|
1590 |
" GUI tools and IDEs are often better at exploring history than command\n"
|
|
1591 |
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
|
|
1592 |
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
|
|
1593 |
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
|
|
1594 |
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
|
|
1595 |
msgstr "" |
|
1596 |
||
1597 |
#: bzrlib/builtins.py:2591
|
|
1598 |
msgid "" |
|
1599 |
" You may find it useful to add the aliases below to ``bazaar.conf``::"
|
|
1600 |
msgstr "" |
|
1601 |
||
1602 |
#: bzrlib/builtins.py:2593
|
|
1603 |
msgid "" |
|
1604 |
" [ALIASES]\n"
|
|
1605 |
" tip = log -r-1\n"
|
|
1606 |
" top = log -l10 --line\n"
|
|
1607 |
" show = log -v -p"
|
|
1608 |
msgstr "" |
|
1609 |
||
1610 |
#: bzrlib/builtins.py:2598
|
|
1611 |
msgid "" |
|
1612 |
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
|
|
1613 |
" will show the last 10 mainline revisions. To see the details of a\n"
|
|
1614 |
" particular revision X, ``bzr show -rX``."
|
|
1615 |
msgstr "" |
|
1616 |
||
1617 |
#: bzrlib/builtins.py:2602
|
|
1618 |
msgid "" |
|
1619 |
" If you are interested in looking deeper into a particular merge X,\n"
|
|
1620 |
" use ``bzr log -n0 -rX``."
|
|
1621 |
msgstr "" |
|
1622 |
||
1623 |
#: bzrlib/builtins.py:2605
|
|
1624 |
msgid "" |
|
1625 |
" ``bzr log -v`` on a branch with lots of history is currently\n"
|
|
1626 |
" very slow. A fix for this issue is currently under development.\n"
|
|
1627 |
" With or without that fix, it is recommended that a revision range\n"
|
|
1628 |
" be given when using the -v option."
|
|
1629 |
msgstr "" |
|
1630 |
||
1631 |
#: bzrlib/builtins.py:2610
|
|
1632 |
msgid "" |
|
1633 |
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
|
|
1634 |
" used to find revisions matching user names, commit messages, etc.\n"
|
|
1635 |
" Among other features, this plugin can find all revisions containing\n"
|
|
1636 |
" a list of words but not others."
|
|
1637 |
msgstr "" |
|
1638 |
||
1639 |
#: bzrlib/builtins.py:2615
|
|
1640 |
msgid "" |
|
1641 |
" When exploring non-mainline history on large projects with deep\n"
|
|
1642 |
" history, the performance of log can be greatly improved by installing\n"
|
|
1643 |
" the historycache plugin. This plugin buffers historical information\n"
|
|
1644 |
" trading disk space for faster speed."
|
|
1645 |
msgstr "" |
|
1646 |
||
1647 |
#: bzrlib/builtins.py:2624
|
|
1648 |
msgid "Show from oldest to newest." |
|
1649 |
msgstr "" |
|
1650 |
||
1651 |
#: bzrlib/builtins.py:2627
|
|
1652 |
msgid "Show files changed in each revision." |
|
1653 |
msgstr "" |
|
1654 |
||
1655 |
#: bzrlib/builtins.py:2633
|
|
1656 |
msgid "Show just the specified revision. See also \"help revisionspec\"." |
|
1657 |
msgstr "" |
|
1658 |
||
1659 |
#: bzrlib/builtins.py:2637
|
|
1660 |
msgid "What names to list as authors - first, all or committer." |
|
1661 |
msgstr "" |
|
1662 |
||
1663 |
#: bzrlib/builtins.py:2638
|
|
1664 |
msgid "Authors" |
|
1665 |
msgstr "" |
|
1666 |
||
1667 |
#: bzrlib/builtins.py:2643
|
|
1668 |
msgid "Number of levels to display - 0 for all, 1 for flat." |
|
1669 |
msgstr "" |
|
1670 |
||
1671 |
#: bzrlib/builtins.py:2653
|
|
1672 |
msgid "Limit the output to the first N revisions." |
|
1673 |
msgstr "" |
|
1674 |
||
1675 |
#: bzrlib/builtins.py:2658
|
|
1676 |
msgid "Show changes made in each revision as a patch." |
|
1677 |
msgstr "" |
|
1678 |
||
1679 |
#: bzrlib/builtins.py:2660
|
|
1680 |
msgid "Show merged revisions like --levels 0 does." |
|
1681 |
msgstr "" |
|
1682 |
||
1683 |
#: bzrlib/builtins.py:2664
|
|
1684 |
msgid "Do not report commits with more than one parent." |
|
1685 |
msgstr "" |
|
1686 |
||
1687 |
#: bzrlib/builtins.py:2666
|
|
1688 |
msgid "" |
|
1689 |
"Display only the revisions that are not part of both ancestries (require -"
|
|
1690 |
"rX..Y)."
|
|
1691 |
msgstr "" |
|
1692 |
||
1693 |
#: bzrlib/builtins.py:2670
|
|
1694 |
msgid "Show digital signature validity." |
|
1695 |
msgstr "" |
|
1696 |
||
1697 |
#: bzrlib/builtins.py:2673
|
|
1698 |
msgid "Show revisions whose properties match this expression." |
|
1699 |
msgstr "" |
|
1700 |
||
1701 |
#: bzrlib/builtins.py:2677
|
|
1702 |
msgid "Show revisions whose message matches this expression." |
|
1703 |
msgstr "" |
|
1704 |
||
1705 |
#: bzrlib/builtins.py:2681
|
|
1706 |
msgid "Show revisions whose committer matches this expression." |
|
1707 |
msgstr "" |
|
1708 |
||
1709 |
#: bzrlib/builtins.py:2685
|
|
1710 |
msgid "Show revisions whose authors match this expression." |
|
1711 |
msgstr "" |
|
1712 |
||
1713 |
#: bzrlib/builtins.py:2689
|
|
1714 |
msgid "Show revisions whose bugs match this expression." |
|
1715 |
msgstr "" |
|
1716 |
||
1717 |
#: bzrlib/builtins.py:2743
|
|
1718 |
msgid "--exclude-common-ancestry requires -r with two revisions" |
|
1719 |
msgstr "" |
|
1720 |
||
1721 |
#: bzrlib/builtins.py:2771
|
|
1722 |
#, python-format
|
|
1723 |
msgid "Path unknown at end or start of revision range: %s" |
|
1724 |
msgstr "" |
|
1725 |
||
1726 |
#: bzrlib/builtins.py:2888
|
|
1727 |
#, python-format
|
|
1728 |
msgid "bzr %s doesn't accept two revisions in different branches." |
|
1729 |
msgstr "" |
|
1730 |
||
1731 |
#: bzrlib/builtins.py:2904
|
|
1732 |
#, python-format
|
|
1733 |
msgid "bzr %s --revision takes one or two values." |
|
1734 |
msgstr "" |
|
1735 |
||
1736 |
#: bzrlib/builtins.py:2949
|
|
1737 |
msgid "" |
|
1738 |
"List files in a tree.\n"
|
|
1739 |
" "
|
|
1740 |
msgstr "" |
|
1741 |
||
1742 |
#: bzrlib/builtins.py:2958
|
|
1743 |
msgid "Recurse into subdirectories." |
|
1744 |
msgstr "" |
|
1745 |
||
1746 |
#: bzrlib/builtins.py:2960
|
|
1747 |
msgid "Print paths relative to the root of the branch." |
|
1748 |
msgstr "" |
|
1749 |
||
1750 |
#: bzrlib/builtins.py:2962
|
|
1751 |
msgid "Print unknown files." |
|
1752 |
msgstr "" |
|
1753 |
||
1754 |
#: bzrlib/builtins.py:2963
|
|
1755 |
msgid "Print versioned files." |
|
1756 |
msgstr "" |
|
1757 |
||
1758 |
#: bzrlib/builtins.py:2966
|
|
1759 |
msgid "Print ignored files." |
|
1760 |
msgstr "" |
|
1761 |
||
1762 |
#: bzrlib/builtins.py:2968
|
|
1763 |
msgid "List entries of a particular kind: file, directory, symlink." |
|
1764 |
msgstr "" |
|
1765 |
||
1766 |
#: bzrlib/builtins.py:2981
|
|
1767 |
msgid "invalid kind specified" |
|
1768 |
msgstr "" |
|
1769 |
||
1770 |
#: bzrlib/builtins.py:2984
|
|
1771 |
msgid "Cannot set both --verbose and --null" |
|
1772 |
msgstr "" |
|
1773 |
||
1774 |
#: bzrlib/builtins.py:2993
|
|
1775 |
msgid "cannot specify both --from-root and PATH" |
|
1776 |
msgstr "" |
|
1777 |
||
1778 |
#: bzrlib/builtins.py:3080
|
|
1779 |
msgid "Ignore specified files or patterns." |
|
1780 |
msgstr "" |
|
1781 |
||
1782 |
#: bzrlib/builtins.py:3082
|
|
1783 |
msgid "See ``bzr help patterns`` for details on the syntax of patterns." |
|
1784 |
msgstr "" |
|
1785 |
||
1786 |
#: bzrlib/builtins.py:3084
|
|
1787 |
msgid "" |
|
1788 |
"If a .bzrignore file does not exist, the ignore command\n"
|
|
1789 |
"will create one and add the specified files or patterns to the newly\n"
|
|
1790 |
"created file. The ignore command will also automatically add the \n"
|
|
1791 |
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
|
|
1792 |
"the use of the ignore command will require an explicit add command."
|
|
1793 |
msgstr "" |
|
1794 |
||
1795 |
#: bzrlib/builtins.py:3090
|
|
1796 |
msgid "" |
|
1797 |
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
|
|
1798 |
"After adding, editing or deleting that file either indirectly by\n"
|
|
1799 |
"using this command or directly by using an editor, be sure to commit\n"
|
|
1800 |
"it."
|
|
1801 |
msgstr "" |
|
1802 |
||
1803 |
#: bzrlib/builtins.py:3095
|
|
1804 |
msgid "" |
|
1805 |
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
|
|
1806 |
"the global ignore file can be found in the application data directory as\n"
|
|
1807 |
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n" |
|
1808 |
"Global ignores are not touched by this command. The global ignore file\n"
|
|
1809 |
"can be edited directly using an editor."
|
|
1810 |
msgstr "" |
|
1811 |
||
1812 |
#: bzrlib/builtins.py:3101
|
|
1813 |
msgid "" |
|
1814 |
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
|
|
1815 |
"precedence over regular ignores. Such exceptions are used to specify\n"
|
|
1816 |
"files that should be versioned which would otherwise be ignored."
|
|
1817 |
msgstr "" |
|
1818 |
||
1819 |
#: bzrlib/builtins.py:3105
|
|
1820 |
msgid "" |
|
1821 |
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
|
|
1822 |
"precedence over the '!' exception patterns."
|
|
1823 |
msgstr "" |
|
1824 |
||
1825 |
#: bzrlib/builtins.py:3108
|
|
1826 |
msgid "" |
|
1827 |
":Notes: \n"
|
|
1828 |
" \n"
|
|
1829 |
"* Ignore patterns containing shell wildcards must be quoted from\n"
|
|
1830 |
" the shell on Unix."
|
|
1831 |
msgstr "" |
|
1832 |
||
1833 |
#: bzrlib/builtins.py:3113
|
|
1834 |
msgid "" |
|
1835 |
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
|
|
1836 |
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
|
|
1837 |
msgstr "" |
|
1838 |
||
1839 |
#: bzrlib/builtins.py:3116
|
|
1840 |
msgid "" |
|
1841 |
":Examples:\n"
|
|
1842 |
" Ignore the top level Makefile::"
|
|
1843 |
msgstr "" |
|
1844 |
||
1845 |
#: bzrlib/builtins.py:3119
|
|
1846 |
msgid " bzr ignore ./Makefile" |
|
1847 |
msgstr "" |
|
1848 |
||
1849 |
#: bzrlib/builtins.py:3121
|
|
1850 |
msgid " Ignore .class files in all directories...::" |
|
1851 |
msgstr "" |
|
1852 |
||
1853 |
#: bzrlib/builtins.py:3123
|
|
1854 |
msgid " bzr ignore \"*.class\"" |
|
1855 |
msgstr "" |
|
1856 |
||
1857 |
#: bzrlib/builtins.py:3125
|
|
1858 |
msgid " ...but do not ignore \"special.class\"::" |
|
1859 |
msgstr "" |
|
1860 |
||
1861 |
#: bzrlib/builtins.py:3127
|
|
1862 |
msgid " bzr ignore \"!special.class\"" |
|
1863 |
msgstr "" |
|
1864 |
||
1865 |
#: bzrlib/builtins.py:3129
|
|
1866 |
msgid " Ignore files whose name begins with the \"#\" character::" |
|
1867 |
msgstr "" |
|
1868 |
||
1869 |
#: bzrlib/builtins.py:3131
|
|
1870 |
msgid " bzr ignore \"RE:^#\"" |
|
1871 |
msgstr "" |
|
1872 |
||
1873 |
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
|
|
1874 |
msgid " Ignore .o files under the lib directory::" |
|
1875 |
msgstr "" |
|
1876 |
||
1877 |
#: bzrlib/builtins.py:3135
|
|
1878 |
msgid " bzr ignore \"lib/**/*.o\"" |
|
1879 |
msgstr "" |
|
1880 |
||
1881 |
#: bzrlib/builtins.py:3139
|
|
1882 |
msgid " bzr ignore \"RE:lib/.*\\.o\"" |
|
1883 |
msgstr "" |
|
1884 |
||
1885 |
#: bzrlib/builtins.py:3141
|
|
1886 |
msgid " Ignore everything but the \"debian\" toplevel directory::" |
|
1887 |
msgstr "" |
|
1888 |
||
1889 |
#: bzrlib/builtins.py:3143
|
|
1890 |
msgid "" |
|
1891 |
" bzr ignore \"RE:(?!debian/).*\"\n"
|
|
1892 |
" \n"
|
|
1893 |
" Ignore everything except the \"local\" toplevel directory,\n"
|
|
1894 |
" but always ignore autosave files ending in ~, even under local/::\n"
|
|
1895 |
" \n"
|
|
1896 |
" bzr ignore \"*\"\n"
|
|
1897 |
" bzr ignore \"!./local\"\n"
|
|
1898 |
" bzr ignore \"!!*~\""
|
|
1899 |
msgstr "" |
|
1900 |
||
1901 |
#: bzrlib/builtins.py:3157
|
|
1902 |
msgid "Display the default ignore rules that bzr uses." |
|
1903 |
msgstr "" |
|
1904 |
||
1905 |
#: bzrlib/builtins.py:3169
|
|
1906 |
msgid "ignore requires at least one NAME_PATTERN or --default-rules." |
|
1907 |
msgstr "" |
|
1908 |
||
1909 |
#: bzrlib/builtins.py:3180
|
|
1910 |
#, python-format
|
|
1911 |
msgid "Invalid ignore pattern found. %s" |
|
1912 |
msgid_plural "Invalid ignore patterns found. %s" |
|
1913 |
msgstr[0] "" |
|
1914 |
msgstr[1] "" |
|
1915 |
||
1916 |
#: bzrlib/builtins.py:3189
|
|
1917 |
msgid "NAME_PATTERN should not be an absolute path" |
|
1918 |
msgstr "" |
|
1919 |
||
1920 |
#: bzrlib/builtins.py:3202
|
|
1921 |
#, python-format
|
|
1922 |
msgid "" |
|
1923 |
"Warning: the following files are version controlled and match your ignore " |
|
1924 |
"pattern:\n" |
|
1925 |
"%s\n"
|
|
1926 |
"These files will continue to be version controlled unless you 'bzr remove' "
|
|
1927 |
"them.\n"
|
|
1928 |
msgstr "" |
|
1929 |
||
1930 |
#: bzrlib/builtins.py:3209
|
|
1931 |
msgid "List ignored files and the patterns that matched them." |
|
1932 |
msgstr "" |
|
1933 |
||
1934 |
#: bzrlib/builtins.py:3211
|
|
1935 |
msgid "" |
|
1936 |
"List all the ignored files and the ignore pattern that caused the file to\n"
|
|
1937 |
"be ignored."
|
|
1938 |
msgstr "" |
|
1939 |
||
1940 |
#: bzrlib/builtins.py:3214
|
|
1941 |
msgid "Alternatively, to list just the files::" |
|
1942 |
msgstr "" |
|
1943 |
||
1944 |
#: bzrlib/builtins.py:3216
|
|
1945 |
msgid " bzr ls --ignored" |
|
1946 |
msgstr "" |
|
1947 |
||
1948 |
#: bzrlib/builtins.py:3250
|
|
1949 |
#, python-format
|
|
1950 |
msgid "not a valid revision-number: %r" |
|
1951 |
msgstr "" |
|
1952 |
||
1953 |
#: bzrlib/builtins.py:3257
|
|
1954 |
msgid "" |
|
1955 |
"Export current or past revision to a destination directory or archive."
|
|
1956 |
msgstr "" |
|
1957 |
||
1958 |
#: bzrlib/builtins.py:3259
|
|
1959 |
msgid "If no revision is specified this exports the last committed revision." |
|
1960 |
msgstr "" |
|
1961 |
||
1962 |
#: bzrlib/builtins.py:3261
|
|
1963 |
msgid "" |
|
1964 |
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
|
|
1965 |
"given, try to find the format with the extension. If no extension\n"
|
|
1966 |
"is found exports to a directory (equivalent to --format=dir)."
|
|
1967 |
msgstr "" |
|
1968 |
||
1969 |
#: bzrlib/builtins.py:3265
|
|
1970 |
msgid "" |
|
1971 |
"If root is supplied, it will be used as the root directory inside\n"
|
|
1972 |
"container formats (tar, zip, etc). If it is not supplied it will default\n"
|
|
1973 |
"to the exported filename. The root option has no effect for 'dir' format."
|
|
1974 |
msgstr "" |
|
1975 |
||
1976 |
#: bzrlib/builtins.py:3269
|
|
1977 |
msgid "" |
|
1978 |
"If branch is omitted then the branch containing the current working\n"
|
|
1979 |
"directory will be used."
|
|
1980 |
msgstr "" |
|
1981 |
||
1982 |
#: bzrlib/builtins.py:3272
|
|
1983 |
msgid "" |
|
1984 |
"Note: Export of tree with non-ASCII filenames to zip is not supported." |
|
1985 |
msgstr "" |
|
1986 |
||
1987 |
#: bzrlib/builtins.py:3274
|
|
1988 |
msgid "" |
|
1989 |
" ================= =========================\n"
|
|
1990 |
" Supported formats Autodetected by extension\n"
|
|
1991 |
" ================= =========================\n"
|
|
1992 |
" dir (none)\n"
|
|
1993 |
" tar .tar\n"
|
|
1994 |
" tbz2 .tar.bz2, .tbz2\n"
|
|
1995 |
" tgz .tar.gz, .tgz\n"
|
|
1996 |
" zip .zip\n"
|
|
1997 |
" ================= ========================="
|
|
1998 |
msgstr "" |
|
1999 |
||
2000 |
#: bzrlib/builtins.py:3288
|
|
2001 |
msgid "Type of file to export to." |
|
2002 |
msgstr "" |
|
2003 |
||
2004 |
#: bzrlib/builtins.py:3291
|
|
2005 |
msgid "Apply content filters to export the convenient form." |
|
2006 |
msgstr "" |
|
2007 |
||
2008 |
#: bzrlib/builtins.py:3295
|
|
2009 |
msgid "Name of the root directory inside the exported file." |
|
2010 |
msgstr "" |
|
2011 |
||
2012 |
#: bzrlib/builtins.py:3297
|
|
2013 |
msgid "" |
|
2014 |
"Set modification time of files to that of the last revision in which it was "
|
|
2015 |
"changed."
|
|
2016 |
msgstr "" |
|
2017 |
||
2018 |
#: bzrlib/builtins.py:3300
|
|
2019 |
msgid "" |
|
2020 |
"Export the working tree contents rather than that of the last revision."
|
|
2021 |
msgstr "" |
|
2022 |
||
2023 |
#: bzrlib/builtins.py:3319
|
|
2024 |
msgid "--uncommitted requires a working tree" |
|
2025 |
msgstr "" |
|
2026 |
||
2027 |
#: bzrlib/builtins.py:3328
|
|
2028 |
#, python-format
|
|
2029 |
msgid "Unsupported export format: %s" |
|
2030 |
msgstr "" |
|
2031 |
||
2032 |
#: bzrlib/builtins.py:3332
|
|
2033 |
msgid "" |
|
2034 |
"Write the contents of a file as of a given revision to standard output."
|
|
2035 |
msgstr "" |
|
2036 |
||
2037 |
#: bzrlib/builtins.py:3334
|
|
2038 |
msgid "If no revision is nominated, the last revision is used." |
|
2039 |
msgstr "" |
|
2040 |
||
2041 |
#: bzrlib/builtins.py:3336
|
|
2042 |
msgid "" |
|
2043 |
"Note: Take care to redirect standard output when using this command on a\n" |
|
2044 |
"binary file."
|
|
2045 |
msgstr "" |
|
2046 |
||
2047 |
#: bzrlib/builtins.py:3342
|
|
2048 |
msgid "The path name in the old tree." |
|
2049 |
msgstr "" |
|
2050 |
||
2051 |
#: bzrlib/builtins.py:3343
|
|
2052 |
msgid "Apply content filters to display the convenience form." |
|
2053 |
msgstr "" |
|
2054 |
||
2055 |
#: bzrlib/builtins.py:3354
|
|
2056 |
msgid "bzr cat --revision takes exactly one revision specifier" |
|
2057 |
msgstr "" |
|
2058 |
||
2059 |
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
|
|
2060 |
msgid "{0!r} is not present in revision {1}" |
|
2061 |
msgstr "" |
|
2062 |
||
2063 |
#: bzrlib/builtins.py:3414
|
|
2064 |
msgid "Commit changes into a new revision." |
|
2065 |
msgstr "" |
|
2066 |
||
2067 |
#: bzrlib/builtins.py:3416
|
|
2068 |
msgid "" |
|
2069 |
"An explanatory message needs to be given for each commit. This is\n"
|
|
2070 |
"often done by using the --message option (getting the message from the\n"
|
|
2071 |
"command line) or by using the --file option (getting the message from\n"
|
|
2072 |
"a file). If neither of these options is given, an editor is opened for\n"
|
|
2073 |
"the user to enter the message. To see the changed files in the\n"
|
|
2074 |
"boilerplate text loaded into the editor, use the --show-diff option."
|
|
2075 |
msgstr "" |
|
2076 |
||
2077 |
#: bzrlib/builtins.py:3423
|
|
2078 |
msgid "" |
|
2079 |
"By default, the entire tree is committed and the person doing the\n"
|
|
2080 |
"commit is assumed to be the author. These defaults can be overridden\n"
|
|
2081 |
"as explained below."
|
|
2082 |
msgstr "" |
|
2083 |
||
2084 |
#: bzrlib/builtins.py:3427
|
|
2085 |
msgid ":Selective commits:" |
|
2086 |
msgstr "" |
|
2087 |
||
2088 |
#: bzrlib/builtins.py:3429
|
|
2089 |
msgid "" |
|
2090 |
" If selected files are specified, only changes to those files are\n"
|
|
2091 |
" committed. If a directory is specified then the directory and\n"
|
|
2092 |
" everything within it is committed."
|
|
2093 |
msgstr "" |
|
2094 |
||
2095 |
#: bzrlib/builtins.py:3433
|
|
2096 |
msgid "" |
|
2097 |
" When excludes are given, they take precedence over selected files.\n"
|
|
2098 |
" For example, to commit only changes within foo, but not changes\n"
|
|
2099 |
" within foo/bar::"
|
|
2100 |
msgstr "" |
|
2101 |
||
2102 |
#: bzrlib/builtins.py:3437
|
|
2103 |
msgid " bzr commit foo -x foo/bar" |
|
2104 |
msgstr "" |
|
2105 |
||
2106 |
#: bzrlib/builtins.py:3439
|
|
2107 |
msgid " A selective commit after a merge is not yet supported." |
|
2108 |
msgstr "" |
|
2109 |
||
2110 |
#: bzrlib/builtins.py:3441
|
|
2111 |
msgid ":Custom authors:" |
|
2112 |
msgstr "" |
|
2113 |
||
2114 |
#: bzrlib/builtins.py:3443
|
|
2115 |
msgid "" |
|
2116 |
" If the author of the change is not the same person as the committer,\n"
|
|
2117 |
" you can specify the author's name using the --author option. The\n"
|
|
2118 |
" name should be in the same format as a committer-id, e.g.\n"
|
|
2119 |
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
|
|
2120 |
" the change you can specify the option multiple times, once for each\n"
|
|
2121 |
" author."
|
|
2122 |
msgstr "" |
|
2123 |
||
2124 |
#: bzrlib/builtins.py:3450
|
|
2125 |
msgid ":Checks:" |
|
2126 |
msgstr "" |
|
2127 |
||
2128 |
#: bzrlib/builtins.py:3452
|
|
2129 |
msgid "" |
|
2130 |
" A common mistake is to forget to add a new file or directory before\n"
|
|
2131 |
" running the commit command. The --strict option checks for unknown\n"
|
|
2132 |
" files and aborts the commit if any are found. More advanced pre-commit\n"
|
|
2133 |
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
|
|
2134 |
" for details."
|
|
2135 |
msgstr "" |
|
2136 |
||
2137 |
#: bzrlib/builtins.py:3458
|
|
2138 |
msgid ":Things to note:" |
|
2139 |
msgstr "" |
|
2140 |
||
2141 |
#: bzrlib/builtins.py:3460
|
|
2142 |
msgid "" |
|
2143 |
" If you accidentially commit the wrong changes or make a spelling\n"
|
|
2144 |
" mistake in the commit message say, you can use the uncommit command\n"
|
|
2145 |
" to undo it. See ``bzr help uncommit`` for details."
|
|
2146 |
msgstr "" |
|
2147 |
||
2148 |
#: bzrlib/builtins.py:3464
|
|
2149 |
msgid "" |
|
2150 |
" Hooks can also be configured to run after a commit. This allows you\n"
|
|
2151 |
" to trigger updates to external systems like bug trackers. The --fixes\n"
|
|
2152 |
" option can be used to record the association between a revision and\n"
|
|
2153 |
" one or more bugs. See ``bzr help bugs`` for details."
|
|
2154 |
msgstr "" |
|
2155 |
||
2156 |
#: bzrlib/builtins.py:3474
|
|
2157 |
msgid "Do not consider changes made to a given path." |
|
2158 |
msgstr "" |
|
2159 |
||
2160 |
#: bzrlib/builtins.py:3477
|
|
2161 |
msgid "Description of the new revision." |
|
2162 |
msgstr "" |
|
2163 |
||
2164 |
#: bzrlib/builtins.py:3480
|
|
2165 |
msgid "Commit even if nothing has changed." |
|
2166 |
msgstr "" |
|
2167 |
||
2168 |
#: bzrlib/builtins.py:3484
|
|
2169 |
msgid "Take commit message from this file." |
|
2170 |
msgstr "" |
|
2171 |
||
2172 |
#: bzrlib/builtins.py:3486
|
|
2173 |
msgid "Refuse to commit if there are unknown files in the working tree." |
|
2174 |
msgstr "" |
|
2175 |
||
2176 |
#: bzrlib/builtins.py:3489
|
|
2177 |
msgid "" |
|
2178 |
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
|
|
2179 |
"08:00:00 +0100'."
|
|
2180 |
msgstr "" |
|
2181 |
||
2182 |
#: bzrlib/builtins.py:3492
|
|
2183 |
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")." |
|
2184 |
msgstr "" |
|
2185 |
||
2186 |
#: bzrlib/builtins.py:3495
|
|
2187 |
msgid "Set the author's name, if it's different from the committer." |
|
2188 |
msgstr "" |
|
2189 |
||
2190 |
#: bzrlib/builtins.py:3498
|
|
2191 |
msgid "" |
|
2192 |
"Perform a local commit in a bound branch. Local commits are not pushed to "
|
|
2193 |
"the master branch until a normal commit is performed."
|
|
2194 |
msgstr "" |
|
2195 |
||
2196 |
#: bzrlib/builtins.py:3504
|
|
2197 |
msgid "" |
|
2198 |
"When no message is supplied, show the diff along with the status summary in "
|
|
2199 |
"the message editor."
|
|
2200 |
msgstr "" |
|
2201 |
||
2202 |
#: bzrlib/builtins.py:3507
|
|
2203 |
msgid "" |
|
2204 |
"When committing to a foreign version control system do not push data that "
|
|
2205 |
"can not be natively represented."
|
|
2206 |
msgstr "" |
|
2207 |
||
2208 |
#: bzrlib/builtins.py:3525
|
|
2209 |
#, python-format
|
|
2210 |
msgid "" |
|
2211 |
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
|
|
2212 |
"default bug tracker using the `bugtracker` option.\n"
|
|
2213 |
"See \"bzr help bugs\" for more information on this feature. Commit refused."
|
|
2214 |
msgstr "" |
|
2215 |
||
2216 |
#: bzrlib/builtins.py:3534
|
|
2217 |
#, python-format
|
|
2218 |
msgid "" |
|
2219 |
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
|
|
2220 |
"for more information on this feature.\n"
|
|
2221 |
"Commit refused."
|
|
2222 |
msgstr "" |
|
2223 |
||
2224 |
#: bzrlib/builtins.py:3543
|
|
2225 |
#, python-format
|
|
2226 |
msgid "Unrecognized bug %s. Commit refused." |
|
2227 |
msgstr "" |
|
2228 |
||
2229 |
#: bzrlib/builtins.py:3546
|
|
2230 |
#, python-format
|
|
2231 |
msgid "" |
|
2232 |
"%s\n"
|
|
2233 |
"Commit refused."
|
|
2234 |
msgstr "" |
|
2235 |
||
2236 |
#: bzrlib/builtins.py:3570
|
|
2237 |
msgid "Could not parse --commit-time: " |
|
2238 |
msgstr "" |
|
2239 |
||
2240 |
#: bzrlib/builtins.py:3610
|
|
2241 |
msgid "please specify either --message or --file" |
|
2242 |
msgstr "" |
|
2243 |
||
2244 |
#: bzrlib/builtins.py:3639
|
|
2245 |
msgid "please specify a commit message with either --message or --file" |
|
2246 |
msgstr "" |
|
2247 |
||
2248 |
#: bzrlib/builtins.py:3642
|
|
2249 |
msgid "" |
|
2250 |
"Empty commit message specified. Please specify a commit message with either -"
|
|
2251 |
"-message or --file or leave a blank message with --message \"\"."
|
|
2252 |
msgstr "" |
|
2253 |
||
2254 |
#: bzrlib/builtins.py:3662
|
|
2255 |
msgid "" |
|
2256 |
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
|
|
2257 |
"-unchanged to force an empty commit."
|
|
2258 |
msgstr "" |
|
2259 |
||
2260 |
#: bzrlib/builtins.py:3666
|
|
2261 |
msgid "" |
|
2262 |
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
|
|
2263 |
"resolve FILE\" to resolve."
|
|
2264 |
msgstr "" |
|
2265 |
||
2266 |
#: bzrlib/builtins.py:3670
|
|
2267 |
msgid "Commit refused because there are unknown files in the working tree." |
|
2268 |
msgstr "" |
|
2269 |
||
2270 |
#: bzrlib/builtins.py:3673
|
|
2271 |
msgid "" |
|
2272 |
"\n"
|
|
2273 |
"To commit to master branch, run update and then commit.\n"
|
|
2274 |
"You can also pass --local to commit to continue working disconnected."
|
|
2275 |
msgstr "" |
|
2276 |
||
2277 |
#: bzrlib/builtins.py:3681
|
|
2278 |
msgid "" |
|
2279 |
"Validate working tree structure, branch consistency and repository history."
|
|
2280 |
msgstr "" |
|
2281 |
||
2282 |
#: bzrlib/builtins.py:3683
|
|
2283 |
msgid "" |
|
2284 |
"This command checks various invariants about branch and repository storage\n"
|
|
2285 |
"to detect data corruption or bzr bugs."
|
|
2286 |
msgstr "" |
|
2287 |
||
2288 |
#: bzrlib/builtins.py:3686
|
|
2289 |
msgid "" |
|
2290 |
"The working tree and branch checks will only give output if a problem is\n"
|
|
2291 |
"detected. The output fields of the repository check are:"
|
|
2292 |
msgstr "" |
|
2293 |
||
2294 |
#: bzrlib/builtins.py:3689
|
|
2295 |
msgid "" |
|
2296 |
"revisions\n"
|
|
2297 |
" This is just the number of revisions checked. It doesn't\n"
|
|
2298 |
" indicate a problem."
|
|
2299 |
msgstr "" |
|
2300 |
||
2301 |
#: bzrlib/builtins.py:3693
|
|
2302 |
msgid "" |
|
2303 |
"versionedfiles\n"
|
|
2304 |
" This is just the number of versionedfiles checked. It\n"
|
|
2305 |
" doesn't indicate a problem."
|
|
2306 |
msgstr "" |
|
2307 |
||
2308 |
#: bzrlib/builtins.py:3697
|
|
2309 |
msgid "" |
|
2310 |
"unreferenced ancestors\n"
|
|
2311 |
" Texts that are ancestors of other texts, but\n"
|
|
2312 |
" are not properly referenced by the revision ancestry. This is a\n"
|
|
2313 |
" subtle problem that Bazaar can work around."
|
|
2314 |
msgstr "" |
|
2315 |
||
2316 |
#: bzrlib/builtins.py:3702
|
|
2317 |
msgid "" |
|
2318 |
"unique file texts\n"
|
|
2319 |
" This is the total number of unique file contents\n"
|
|
2320 |
" seen in the checked revisions. It does not indicate a problem."
|
|
2321 |
msgstr "" |
|
2322 |
||
2323 |
#: bzrlib/builtins.py:3706
|
|
2324 |
msgid "" |
|
2325 |
"repeated file texts\n"
|
|
2326 |
" This is the total number of repeated texts seen\n"
|
|
2327 |
" in the checked revisions. Texts can be repeated when their file\n"
|
|
2328 |
" entries are modified, but the file contents are not. It does not\n"
|
|
2329 |
" indicate a problem."
|
|
2330 |
msgstr "" |
|
2331 |
||
2332 |
#: bzrlib/builtins.py:3712
|
|
2333 |
msgid "" |
|
2334 |
"If no restrictions are specified, all Bazaar data that is found at the "
|
|
2335 |
"given\n"
|
|
2336 |
"location will be checked."
|
|
2337 |
msgstr "" |
|
2338 |
||
2339 |
#: bzrlib/builtins.py:3717
|
|
2340 |
msgid " Check the tree and branch at 'foo'::" |
|
2341 |
msgstr "" |
|
2342 |
||
2343 |
#: bzrlib/builtins.py:3719
|
|
2344 |
msgid " bzr check --tree --branch foo" |
|
2345 |
msgstr "" |
|
2346 |
||
2347 |
#: bzrlib/builtins.py:3721
|
|
2348 |
msgid " Check only the repository at 'bar'::" |
|
2349 |
msgstr "" |
|
2350 |
||
2351 |
#: bzrlib/builtins.py:3723
|
|
2352 |
msgid " bzr check --repo bar" |
|
2353 |
msgstr "" |
|
2354 |
||
2355 |
#: bzrlib/builtins.py:3725
|
|
2356 |
msgid " Check everything at 'baz'::" |
|
2357 |
msgstr "" |
|
2358 |
||
2359 |
#: bzrlib/builtins.py:3727
|
|
2360 |
msgid " bzr check baz" |
|
2361 |
msgstr "" |
|
2362 |
||
2363 |
#: bzrlib/builtins.py:3733
|
|
2364 |
msgid "Check the branch related to the current directory." |
|
2365 |
msgstr "" |
|
2366 |
||
2367 |
#: bzrlib/builtins.py:3735
|
|
2368 |
msgid "Check the repository related to the current directory." |
|
2369 |
msgstr "" |
|
2370 |
||
2371 |
#: bzrlib/builtins.py:3737
|
|
2372 |
msgid "Check the working tree related to the current directory." |
|
2373 |
msgstr "" |
|
2374 |
||
2375 |
#: bzrlib/builtins.py:3751
|
|
2376 |
msgid "Upgrade a repository, branch or working tree to a newer format." |
|
2377 |
msgstr "" |
|
2378 |
||
2379 |
#: bzrlib/builtins.py:3753
|
|
2380 |
msgid "" |
|
2381 |
"When the default format has changed after a major new release of\n"
|
|
2382 |
"Bazaar, you may be informed during certain operations that you\n"
|
|
2383 |
"should upgrade. Upgrading to a newer format may improve performance\n"
|
|
2384 |
"or make new features available. It may however limit interoperability\n"
|
|
2385 |
"with older repositories or with older versions of Bazaar."
|
|
2386 |
msgstr "" |
|
2387 |
||
2388 |
#: bzrlib/builtins.py:3759
|
|
2389 |
msgid "" |
|
2390 |
"If you wish to upgrade to a particular format rather than the\n"
|
|
2391 |
"current default, that can be specified using the --format option.\n"
|
|
2392 |
"As a consequence, you can use the upgrade command this way to\n"
|
|
2393 |
"\"downgrade\" to an earlier format, though some conversions are\n"
|
|
2394 |
"a one way process (e.g. changing from the 1.x default to the\n"
|
|
2395 |
"2.x default) so downgrading is not always possible."
|
|
2396 |
msgstr "" |
|
2397 |
||
2398 |
#: bzrlib/builtins.py:3766
|
|
2399 |
msgid "" |
|
2400 |
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
|
|
2401 |
"process (where # is a number). By default, this is left there on\n"
|
|
2402 |
"completion. If the conversion fails, delete the new .bzr directory\n"
|
|
2403 |
"and rename this one back in its place. Use the --clean option to ask\n"
|
|
2404 |
"for the backup.bzr directory to be removed on successful conversion.\n"
|
|
2405 |
"Alternatively, you can delete it by hand if everything looks good\n"
|
|
2406 |
"afterwards."
|
|
2407 |
msgstr "" |
|
2408 |
||
2409 |
#: bzrlib/builtins.py:3774
|
|
2410 |
msgid "" |
|
2411 |
"If the location given is a shared repository, dependent branches\n"
|
|
2412 |
"are also converted provided the repository converts successfully.\n"
|
|
2413 |
"If the conversion of a branch fails, remaining branches are still\n"
|
|
2414 |
"tried."
|
|
2415 |
msgstr "" |
|
2416 |
||
2417 |
#: bzrlib/builtins.py:3779
|
|
2418 |
msgid "" |
|
2419 |
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
|
|
2420 |
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." |
|
2421 |
msgstr "" |
|
2422 |
||
2423 |
#: bzrlib/builtins.py:3787
|
|
2424 |
msgid "Upgrade to a specific format. See \"bzr help formats\" for details." |
|
2425 |
msgstr "" |
|
2426 |
||
2427 |
#: bzrlib/builtins.py:3791
|
|
2428 |
msgid "Branch format" |
|
2429 |
msgstr "" |
|
2430 |
||
2431 |
#: bzrlib/builtins.py:3793
|
|
2432 |
msgid "Remove the backup.bzr directory if successful." |
|
2433 |
msgstr "" |
|
2434 |
||
2435 |
#: bzrlib/builtins.py:3795
|
|
2436 |
msgid "Show what would be done, but don't actually do anything." |
|
2437 |
msgstr "" |
|
2438 |
||
2439 |
#: bzrlib/builtins.py:3810
|
|
2440 |
msgid "Show or set bzr user id." |
|
2441 |
msgstr "" |
|
2442 |
||
2443 |
#: bzrlib/builtins.py:3812
|
|
2444 |
msgid "" |
|
2445 |
":Examples:\n"
|
|
2446 |
" Show the email of the current user::"
|
|
2447 |
msgstr "" |
|
2448 |
||
2449 |
#: bzrlib/builtins.py:3815
|
|
2450 |
msgid " bzr whoami --email" |
|
2451 |
msgstr "" |
|
2452 |
||
2453 |
#: bzrlib/builtins.py:3817
|
|
2454 |
msgid " Set the current user::" |
|
2455 |
msgstr "" |
|
2456 |
||
2457 |
#: bzrlib/builtins.py:3819
|
|
2458 |
msgid " bzr whoami \"Frank Chu <fchu@example.com>\"" |
|
2459 |
msgstr "" |
|
2460 |
||
2461 |
#: bzrlib/builtins.py:3823
|
|
2462 |
msgid "Display email address only." |
|
2463 |
msgstr "" |
|
2464 |
||
2465 |
#: bzrlib/builtins.py:3825
|
|
2466 |
msgid "Set identity for the current branch instead of globally." |
|
2467 |
msgstr "" |
|
2468 |
||
2469 |
#: bzrlib/builtins.py:3851
|
|
2470 |
msgid "--email can only be used to display existing identity" |
|
2471 |
msgstr "" |
|
2472 |
||
2473 |
#: bzrlib/builtins.py:3873
|
|
2474 |
msgid "Print or set the branch nickname." |
|
2475 |
msgstr "" |
|
2476 |
||
2477 |
#: bzrlib/builtins.py:3875
|
|
2478 |
msgid "" |
|
2479 |
"If unset, the tree root directory name is used as the nickname.\n"
|
|
2480 |
"To print the current nickname, execute with no argument."
|
|
2481 |
msgstr "" |
|
2482 |
||
2483 |
#: bzrlib/builtins.py:3878
|
|
2484 |
msgid "" |
|
2485 |
"Bound branches use the nickname of its master branch unless it is set\n"
|
|
2486 |
"locally."
|
|
2487 |
msgstr "" |
|
2488 |
||
2489 |
#: bzrlib/builtins.py:3898
|
|
2490 |
msgid "Set/unset and display aliases." |
|
2491 |
msgstr "" |
|
2492 |
||
2493 |
#: bzrlib/builtins.py:3900
|
|
2494 |
msgid "" |
|
2495 |
":Examples:\n"
|
|
2496 |
" Show the current aliases::"
|
|
2497 |
msgstr "" |
|
2498 |
||
2499 |
#: bzrlib/builtins.py:3903
|
|
2500 |
msgid " bzr alias" |
|
2501 |
msgstr "" |
|
2502 |
||
2503 |
#: bzrlib/builtins.py:3905
|
|
2504 |
msgid " Show the alias specified for 'll'::" |
|
2505 |
msgstr "" |
|
2506 |
||
2507 |
#: bzrlib/builtins.py:3907
|
|
2508 |
msgid " bzr alias ll" |
|
2509 |
msgstr "" |
|
2510 |
||
2511 |
#: bzrlib/builtins.py:3909
|
|
2512 |
msgid " Set an alias for 'll'::" |
|
2513 |
msgstr "" |
|
2514 |
||
2515 |
#: bzrlib/builtins.py:3911
|
|
2516 |
msgid " bzr alias ll=\"log --line -r-10..-1\"" |
|
2517 |
msgstr "" |
|
2518 |
||
2519 |
#: bzrlib/builtins.py:3913
|
|
2520 |
msgid " To remove an alias for 'll'::" |
|
2521 |
msgstr "" |
|
2522 |
||
2523 |
#: bzrlib/builtins.py:3915
|
|
2524 |
msgid " bzr alias --remove ll" |
|
2525 |
msgstr "" |
|
2526 |
||
2527 |
#: bzrlib/builtins.py:3920
|
|
2528 |
msgid "Remove the alias." |
|
2529 |
msgstr "" |
|
2530 |
||
2531 |
#: bzrlib/builtins.py:3938
|
|
2532 |
msgid "bzr alias --remove expects an alias to remove." |
|
2533 |
msgstr "" |
|
2534 |
||
2535 |
#: bzrlib/builtins.py:4119
|
|
2536 |
msgid "" |
|
2537 |
"subunit not available. subunit needs to be installed to use --subunit."
|
|
2538 |
msgstr "" |
|
2539 |
||
2540 |
#: bzrlib/builtins.py:4136
|
|
2541 |
msgid "" |
|
2542 |
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
|
|
2543 |
msgstr "" |
|
2544 |
||
2545 |
#: bzrlib/builtins.py:4183
|
|
2546 |
msgid "Show version of bzr." |
|
2547 |
msgstr "" |
|
2548 |
||
2549 |
#: bzrlib/builtins.py:4187
|
|
2550 |
msgid "Print just the version number." |
|
2551 |
msgstr "" |
|
2552 |
||
2553 |
#: bzrlib/builtins.py:4206
|
|
2554 |
msgid "It sure does!\n" |
|
2555 |
msgstr "" |
|
2556 |
||
2557 |
#: bzrlib/builtins.py:4230
|
|
2558 |
#, python-format
|
|
2559 |
msgid "merge base is revision %s\n" |
|
2560 |
msgstr "" |
|
2561 |
||
2562 |
#: bzrlib/builtins.py:4234
|
|
2563 |
msgid "Perform a three-way merge." |
|
2564 |
msgstr "" |
|
2565 |
||
2566 |
#: bzrlib/builtins.py:4236
|
|
2567 |
msgid "" |
|
2568 |
"The source of the merge can be specified either in the form of a branch,\n"
|
|
2569 |
"or in the form of a path to a file containing a merge directive generated\n"
|
|
2570 |
"with bzr send. If neither is specified, the default is the upstream branch\n"
|
|
2571 |
"or the branch most recently merged using --remember. The source of the\n"
|
|
2572 |
"merge may also be specified in the form of a path to a file in another\n"
|
|
2573 |
"branch: in this case, only the modifications to that file are merged into\n" |
|
2574 |
"the current working tree."
|
|
2575 |
msgstr "" |
|
2576 |
||
2577 |
#: bzrlib/builtins.py:4244
|
|
2578 |
msgid "" |
|
2579 |
"When merging from a branch, by default bzr will try to merge in all new\n"
|
|
2580 |
"work from the other branch, automatically determining an appropriate base\n"
|
|
2581 |
"revision. If this fails, you may need to give an explicit base."
|
|
2582 |
msgstr "" |
|
2583 |
||
2584 |
#: bzrlib/builtins.py:4248
|
|
2585 |
msgid "" |
|
2586 |
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
|
|
2587 |
"try to merge in all new work up to and including revision OTHER."
|
|
2588 |
msgstr "" |
|
2589 |
||
2590 |
#: bzrlib/builtins.py:4251
|
|
2591 |
msgid "" |
|
2592 |
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
|
|
2593 |
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
|
|
2594 |
"causes some revisions to be skipped, i.e. if the destination branch does\n"
|
|
2595 |
"not already contain revision BASE, such a merge is commonly referred to as\n"
|
|
2596 |
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
|
|
2597 |
"cherrypicks. The changes look like a normal commit, and the history of the\n"
|
|
2598 |
"changes from the other branch is not stored in the commit."
|
|
2599 |
msgstr "" |
|
2600 |
||
2601 |
#: bzrlib/builtins.py:4259
|
|
2602 |
msgid "Revision numbers are always relative to the source branch." |
|
2603 |
msgstr "" |
|
2604 |
||
2605 |
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
|
|
2606 |
msgid "" |
|
2607 |
"Merge will do its best to combine the changes in two branches, but there\n"
|
|
2608 |
"are some kinds of problems only a human can fix. When it encounters those,\n"
|
|
2609 |
"it will mark a conflict. A conflict means that you need to fix something,\n"
|
|
2610 |
"before you can commit."
|
|
2611 |
msgstr "" |
|
2612 |
||
2613 |
#: bzrlib/builtins.py:4266
|
|
2614 |
msgid "" |
|
2615 |
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
|
|
2616 |
msgstr "" |
|
2617 |
||
2618 |
#: bzrlib/builtins.py:4268
|
|
2619 |
msgid "" |
|
2620 |
"If there is no default branch set, the first merge will set it (use\n"
|
|
2621 |
"--no-remember to avoid setting it). After that, you can omit the branch\n"
|
|
2622 |
"to use the default. To change the default, use --remember. The value will\n"
|
|
2623 |
"only be saved if the remote location can be accessed."
|
|
2624 |
msgstr "" |
|
2625 |
||
2626 |
#: bzrlib/builtins.py:4273
|
|
2627 |
msgid "" |
|
2628 |
"The results of the merge are placed into the destination working\n"
|
|
2629 |
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
|
|
2630 |
"committed to record the result of the merge."
|
|
2631 |
msgstr "" |
|
2632 |
||
2633 |
#: bzrlib/builtins.py:4277
|
|
2634 |
msgid "" |
|
2635 |
"merge refuses to run if there are any uncommitted changes, unless\n"
|
|
2636 |
"--force is given. If --force is given, then the changes from the source \n"
|
|
2637 |
"will be merged with the current working tree, including any uncommitted\n"
|
|
2638 |
"changes in the tree. The --force option can also be used to create a\n"
|
|
2639 |
"merge revision which has more than two parents."
|
|
2640 |
msgstr "" |
|
2641 |
||
2642 |
#: bzrlib/builtins.py:4283
|
|
2643 |
msgid "" |
|
2644 |
"If one would like to merge changes from the working tree of the other\n"
|
|
2645 |
"branch without merging any committed revisions, the --uncommitted option\n"
|
|
2646 |
"can be given."
|
|
2647 |
msgstr "" |
|
2648 |
||
2649 |
#: bzrlib/builtins.py:4287
|
|
2650 |
msgid "" |
|
2651 |
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
|
|
2652 |
"you to apply each diff hunk and file change, similar to \"shelve\"."
|
|
2653 |
msgstr "" |
|
2654 |
||
2655 |
#: bzrlib/builtins.py:4290
|
|
2656 |
msgid "" |
|
2657 |
":Examples:\n"
|
|
2658 |
" To merge all new revisions from bzr.dev::"
|
|
2659 |
msgstr "" |
|
2660 |
||
2661 |
#: bzrlib/builtins.py:4293
|
|
2662 |
msgid " bzr merge ../bzr.dev" |
|
2663 |
msgstr "" |
|
2664 |
||
2665 |
#: bzrlib/builtins.py:4295
|
|
2666 |
msgid " To merge changes up to and including revision 82 from bzr.dev::" |
|
2667 |
msgstr "" |
|
2668 |
||
2669 |
#: bzrlib/builtins.py:4297
|
|
2670 |
msgid " bzr merge -r 82 ../bzr.dev" |
|
2671 |
msgstr "" |
|
2672 |
||
2673 |
#: bzrlib/builtins.py:4299
|
|
2674 |
msgid " To merge the changes introduced by 82, without previous changes::" |
|
2675 |
msgstr "" |
|
2676 |
||
2677 |
#: bzrlib/builtins.py:4301
|
|
2678 |
msgid " bzr merge -r 81..82 ../bzr.dev" |
|
2679 |
msgstr "" |
|
2680 |
||
2681 |
#: bzrlib/builtins.py:4303
|
|
2682 |
msgid " To apply a merge directive contained in /tmp/merge::" |
|
2683 |
msgstr "" |
|
2684 |
||
2685 |
#: bzrlib/builtins.py:4305
|
|
2686 |
msgid " bzr merge /tmp/merge" |
|
2687 |
msgstr "" |
|
2688 |
||
2689 |
#: bzrlib/builtins.py:4307
|
|
2690 |
msgid "" |
|
2691 |
" To create a merge revision with three parents from two branches\n"
|
|
2692 |
" feature1a and feature1b:"
|
|
2693 |
msgstr "" |
|
2694 |
||
2695 |
#: bzrlib/builtins.py:4310
|
|
2696 |
msgid "" |
|
2697 |
" bzr merge ../feature1a\n"
|
|
2698 |
" bzr merge ../feature1b --force\n"
|
|
2699 |
" bzr commit -m 'revision with three parents'"
|
|
2700 |
msgstr "" |
|
2701 |
||
2702 |
#: bzrlib/builtins.py:4322
|
|
2703 |
msgid "Merge even if the destination tree has uncommitted changes." |
|
2704 |
msgstr "" |
|
2705 |
||
2706 |
#: bzrlib/builtins.py:4328
|
|
2707 |
msgid "" |
|
2708 |
"Apply uncommitted changes from a working copy, instead of branch changes."
|
|
2709 |
msgstr "" |
|
2710 |
||
2711 |
#: bzrlib/builtins.py:4330
|
|
2712 |
msgid "" |
|
2713 |
"If the destination is already completely merged into the source, pull from "
|
|
2714 |
"the source rather than merging. When this happens, you do not need to "
|
|
2715 |
"commit the result."
|
|
2716 |
msgstr "" |
|
2717 |
||
2718 |
#: bzrlib/builtins.py:4335
|
|
2719 |
msgid "" |
|
2720 |
"Branch to merge into, rather than the one containing the working directory."
|
|
2721 |
msgstr "" |
|
2722 |
||
2723 |
#: bzrlib/builtins.py:4337
|
|
2724 |
msgid "Instead of merging, show a diff of the merge." |
|
2725 |
msgstr "" |
|
2726 |
||
2727 |
#: bzrlib/builtins.py:4339
|
|
2728 |
msgid "Select changes interactively." |
|
2729 |
msgstr "" |
|
2730 |
||
2731 |
#: bzrlib/builtins.py:4361
|
|
2732 |
msgid "" |
|
2733 |
"Merging into empty branches not currently supported, "
|
|
2734 |
"https://bugs.launchpad.net/bzr/+bug/308562" |
|
2735 |
msgstr "" |
|
2736 |
||
2737 |
#: bzrlib/builtins.py:4388
|
|
2738 |
msgid "Cannot use --uncommitted with bundles or merge directives." |
|
2739 |
msgstr "" |
|
2740 |
||
2741 |
#: bzrlib/builtins.py:4399
|
|
2742 |
msgid "Cannot use --uncommitted and --revision at the same time." |
|
2743 |
msgstr "" |
|
2744 |
||
2745 |
#: bzrlib/builtins.py:4419
|
|
2746 |
msgid "merger: " |
|
2747 |
msgstr "" |
|
2748 |
||
2749 |
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
|
|
2750 |
msgid "Nothing to do." |
|
2751 |
msgstr "" |
|
2752 |
||
2753 |
#: bzrlib/builtins.py:4425
|
|
2754 |
msgid "Cannot pull individual files" |
|
2755 |
msgstr "" |
|
2756 |
||
2757 |
#: bzrlib/builtins.py:4433
|
|
2758 |
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')" |
|
2759 |
msgstr "" |
|
2760 |
||
2761 |
#: bzrlib/builtins.py:4491
|
|
2762 |
#, python-format
|
|
2763 |
msgid "Show-base is not supported for this merge type. %s" |
|
2764 |
msgstr "" |
|
2765 |
||
2766 |
#: bzrlib/builtins.py:4500
|
|
2767 |
#, python-format
|
|
2768 |
msgid "Conflict reduction is not supported for merge type %s." |
|
2769 |
msgstr "" |
|
2770 |
||
2771 |
#: bzrlib/builtins.py:4504
|
|
2772 |
msgid "Cannot do conflict reduction and show base." |
|
2773 |
msgstr "" |
|
2774 |
||
2775 |
#: bzrlib/builtins.py:4615
|
|
2776 |
msgid "No location specified or remembered" |
|
2777 |
msgstr "" |
|
2778 |
||
2779 |
#: bzrlib/builtins.py:4617
|
|
2780 |
msgid "{0} remembered {1} location {2}" |
|
2781 |
msgstr "" |
|
2782 |
||
2783 |
#: bzrlib/builtins.py:4623
|
|
2784 |
msgid "Redo a merge." |
|
2785 |
msgstr "" |
|
2786 |
||
2787 |
#: bzrlib/builtins.py:4625
|
|
2788 |
msgid "" |
|
2789 |
"Use this if you want to try a different merge technique while resolving\n"
|
|
2790 |
"conflicts. Some merge techniques are better than others, and remerge\n"
|
|
2791 |
"lets you try different ones on different files."
|
|
2792 |
msgstr "" |
|
2793 |
||
2794 |
#: bzrlib/builtins.py:4629
|
|
2795 |
msgid "" |
|
2796 |
"The options for remerge have the same meaning and defaults as the ones for\n"
|
|
2797 |
"merge. The difference is that remerge can (only) be run when there is a\n"
|
|
2798 |
"pending merge, and it lets you specify particular files."
|
|
2799 |
msgstr "" |
|
2800 |
||
2801 |
#: bzrlib/builtins.py:4633
|
|
2802 |
msgid "" |
|
2803 |
":Examples:\n"
|
|
2804 |
" Re-do the merge of all conflicted files, and show the base text in\n"
|
|
2805 |
" conflict regions, in addition to the usual THIS and OTHER texts::"
|
|
2806 |
msgstr "" |
|
2807 |
||
2808 |
#: bzrlib/builtins.py:4637
|
|
2809 |
msgid " bzr remerge --show-base" |
|
2810 |
msgstr "" |
|
2811 |
||
2812 |
#: bzrlib/builtins.py:4639
|
|
2813 |
msgid "" |
|
2814 |
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
|
|
2815 |
" additional processing to reduce the size of conflict regions::"
|
|
2816 |
msgstr "" |
|
2817 |
||
2818 |
#: bzrlib/builtins.py:4642
|
|
2819 |
msgid " bzr remerge --merge-type weave --reprocess foobar" |
|
2820 |
msgstr "" |
|
2821 |
||
2822 |
#: bzrlib/builtins.py:4649
|
|
2823 |
msgid "Show base revision text in conflicts." |
|
2824 |
msgstr "" |
|
2825 |
||
2826 |
#: bzrlib/builtins.py:4661
|
|
2827 |
msgid "" |
|
2828 |
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
|
|
2829 |
"merges."
|
|
2830 |
msgstr "" |
|
2831 |
||
2832 |
#: bzrlib/builtins.py:4717
|
|
2833 |
msgid "Revert files to a previous revision." |
|
2834 |
msgstr "" |
|
2835 |
||
2836 |
#: bzrlib/builtins.py:4719
|
|
2837 |
msgid "" |
|
2838 |
"Giving a list of files will revert only those files. Otherwise, all files\n"
|
|
2839 |
"will be reverted. If the revision is not specified with '--revision', the\n"
|
|
2840 |
"last committed revision is used."
|
|
2841 |
msgstr "" |
|
2842 |
||
2843 |
#: bzrlib/builtins.py:4723
|
|
2844 |
msgid "" |
|
2845 |
"To remove only some changes, without reverting to a prior version, use\n"
|
|
2846 |
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
|
|
2847 |
"will remove the changes introduced by the second last commit (-2), without\n"
|
|
2848 |
"affecting the changes introduced by the last commit (-1). To remove\n"
|
|
2849 |
"certain changes on a hunk-by-hunk basis, see the shelve command."
|
|
2850 |
msgstr "" |
|
2851 |
||
2852 |
#: bzrlib/builtins.py:4729
|
|
2853 |
msgid "" |
|
2854 |
"By default, any files that have been manually changed will be backed up\n"
|
|
2855 |
"first. (Files changed only by merge are not backed up.) Backup files have\n"
|
|
2856 |
"'.~#~' appended to their name, where # is a number."
|
|
2857 |
msgstr "" |
|
2858 |
||
2859 |
#: bzrlib/builtins.py:4733
|
|
2860 |
msgid "" |
|
2861 |
"When you provide files, you can use their current pathname or the pathname\n"
|
|
2862 |
"from the target revision. So you can use revert to \"undelete\" a file by\n"
|
|
2863 |
"name. If you name a directory, all the contents of that directory will be\n"
|
|
2864 |
"reverted."
|
|
2865 |
msgstr "" |
|
2866 |
||
2867 |
#: bzrlib/builtins.py:4738
|
|
2868 |
msgid "" |
|
2869 |
"If you have newly added files since the target revision, they will be\n"
|
|
2870 |
"removed. If the files to be removed have been changed, backups will be\n"
|
|
2871 |
"created as above. Directories containing unknown files will not be\n"
|
|
2872 |
"deleted."
|
|
2873 |
msgstr "" |
|
2874 |
||
2875 |
#: bzrlib/builtins.py:4743
|
|
2876 |
msgid "" |
|
2877 |
"The working tree contains a list of revisions that have been merged but\n"
|
|
2878 |
"not yet committed. These revisions will be included as additional parents\n"
|
|
2879 |
"of the next commit. Normally, using revert clears that list as well as\n"
|
|
2880 |
"reverting the files. If any files are specified, revert leaves the list\n"
|
|
2881 |
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
|
|
2882 |
".`` in the tree root to revert all files but keep the recorded merges,\n"
|
|
2883 |
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
|
|
2884 |
"reverting any files."
|
|
2885 |
msgstr "" |
|
2886 |
||
2887 |
#: bzrlib/builtins.py:4752
|
|
2888 |
msgid "" |
|
2889 |
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
|
|
2890 |
"changes from a branch in a single revision. To do this, perform the merge\n"
|
|
2891 |
"as desired. Then doing revert with the \"--forget-merges\" option will "
|
|
2892 |
"keep\n"
|
|
2893 |
"the content of the tree as it was, but it will clear the list of pending\n"
|
|
2894 |
"merges. The next commit will then contain all of the changes that are\n"
|
|
2895 |
"present in the other branch, but without any other parent revisions.\n"
|
|
2896 |
"Because this technique forgets where these changes originated, it may\n"
|
|
2897 |
"cause additional conflicts on later merges involving the same source and\n"
|
|
2898 |
"target branches."
|
|
2899 |
msgstr "" |
|
2900 |
||
2901 |
#: bzrlib/builtins.py:4766
|
|
2902 |
msgid "Do not save backups of reverted files." |
|
2903 |
msgstr "" |
|
2904 |
||
2905 |
#: bzrlib/builtins.py:4768
|
|
2906 |
msgid "Remove pending merge marker, without changing any files." |
|
2907 |
msgstr "" |
|
2908 |
||
2909 |
#: bzrlib/builtins.py:4799
|
|
2910 |
msgid "" |
|
2911 |
"Show help on a command or other topic.\n"
|
|
2912 |
" "
|
|
2913 |
msgstr "" |
|
2914 |
||
2915 |
#: bzrlib/builtins.py:4804
|
|
2916 |
msgid "Show help on all commands." |
|
2917 |
msgstr "" |
|
2918 |
||
2919 |
#: bzrlib/builtins.py:4833
|
|
2920 |
msgid "Show unmerged/unpulled revisions between two branches." |
|
2921 |
msgstr "" |
|
2922 |
||
2923 |
#: bzrlib/builtins.py:4835
|
|
2924 |
msgid "OTHER_BRANCH may be local or remote." |
|
2925 |
msgstr "" |
|
2926 |
||
2927 |
#: bzrlib/builtins.py:4837
|
|
2928 |
msgid "" |
|
2929 |
"To filter on a range of revisions, you can use the command -r begin..end\n"
|
|
2930 |
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
|
|
2931 |
"also valid.\n"
|
|
2932 |
" \n"
|
|
2933 |
":Exit values:\n"
|
|
2934 |
" 1 - some missing revisions\n"
|
|
2935 |
" 0 - no missing revisions"
|
|
2936 |
msgstr "" |
|
2937 |
||
2938 |
#: bzrlib/builtins.py:4847
|
|
2939 |
msgid "" |
|
2940 |
" Determine the missing revisions between this and the branch at the\n"
|
|
2941 |
" remembered pull location::"
|
|
2942 |
msgstr "" |
|
2943 |
||
2944 |
#: bzrlib/builtins.py:4850
|
|
2945 |
msgid " bzr missing" |
|
2946 |
msgstr "" |
|
2947 |
||
2948 |
#: bzrlib/builtins.py:4852
|
|
2949 |
msgid " Determine the missing revisions between this and another branch::" |
|
2950 |
msgstr "" |
|
2951 |
||
2952 |
#: bzrlib/builtins.py:4854
|
|
2953 |
msgid " bzr missing http://server/branch" |
|
2954 |
msgstr "" |
|
2955 |
||
2956 |
#: bzrlib/builtins.py:4856
|
|
2957 |
msgid "" |
|
2958 |
" Determine the missing revisions up to a specific revision on the other\n"
|
|
2959 |
" branch::"
|
|
2960 |
msgstr "" |
|
2961 |
||
2962 |
#: bzrlib/builtins.py:4859
|
|
2963 |
msgid " bzr missing -r ..-10" |
|
2964 |
msgstr "" |
|
2965 |
||
2966 |
#: bzrlib/builtins.py:4861
|
|
2967 |
msgid "" |
|
2968 |
" Determine the missing revisions up to a specific revision on this\n"
|
|
2969 |
" branch::"
|
|
2970 |
msgstr "" |
|
2971 |
||
2972 |
#: bzrlib/builtins.py:4864
|
|
2973 |
msgid " bzr missing --my-revision ..-10" |
|
2974 |
msgstr "" |
|
2975 |
||
2976 |
#: bzrlib/builtins.py:4871
|
|
2977 |
msgid "Reverse the order of revisions." |
|
2978 |
msgstr "" |
|
2979 |
||
2980 |
#: bzrlib/builtins.py:4873
|
|
2981 |
msgid "Display changes in the local branch only." |
|
2982 |
msgstr "" |
|
2983 |
||
2984 |
#: bzrlib/builtins.py:4874
|
|
2985 |
msgid "Same as --mine-only." |
|
2986 |
msgstr "" |
|
2987 |
||
2988 |
#: bzrlib/builtins.py:4876
|
|
2989 |
msgid "Display changes in the remote branch only." |
|
2990 |
msgstr "" |
|
2991 |
||
2992 |
#: bzrlib/builtins.py:4877
|
|
2993 |
msgid "Same as --theirs-only." |
|
2994 |
msgstr "" |
|
2995 |
||
2996 |
#: bzrlib/builtins.py:4882
|
|
2997 |
msgid "" |
|
2998 |
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
|
|
2999 |
"details."
|
|
3000 |
msgstr "" |
|
3001 |
||
3002 |
#: bzrlib/builtins.py:4886
|
|
3003 |
msgid "" |
|
3004 |
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
|
|
3005 |
"details."
|
|
3006 |
msgstr "" |
|
3007 |
||
3008 |
#: bzrlib/builtins.py:4889
|
|
3009 |
msgid "Show all revisions in addition to the mainline ones." |
|
3010 |
msgstr "" |
|
3011 |
||
3012 |
#: bzrlib/builtins.py:4943
|
|
3013 |
msgid "No peer location known or specified." |
|
3014 |
msgstr "" |
|
3015 |
||
3016 |
#: bzrlib/builtins.py:4947
|
|
3017 |
msgid "Using saved parent location: {0}\n" |
|
3018 |
msgstr "" |
|
3019 |
||
3020 |
#: bzrlib/builtins.py:4980
|
|
3021 |
#, python-format
|
|
3022 |
msgid "You have %d extra revision:\n" |
|
3023 |
msgid_plural "You have %d extra revisions:\n" |
|
3024 |
msgstr[0] "" |
|
3025 |
msgstr[1] "" |
|
3026 |
||
3027 |
#: bzrlib/builtins.py:4996
|
|
3028 |
#, python-format
|
|
3029 |
msgid "You are missing %d revision:\n" |
|
3030 |
msgid_plural "You are missing %d revisions:\n" |
|
3031 |
msgstr[0] "" |
|
3032 |
msgstr[1] "" |
|
3033 |
||
3034 |
#: bzrlib/builtins.py:5008
|
|
3035 |
msgid "This branch has no new revisions.\n" |
|
3036 |
msgstr "" |
|
3037 |
||
3038 |
#: bzrlib/builtins.py:5011
|
|
3039 |
msgid "Other branch has no new revisions.\n" |
|
3040 |
msgstr "" |
|
3041 |
||
3042 |
#: bzrlib/builtins.py:5016
|
|
3043 |
msgid "Branches are up to date.\n" |
|
3044 |
msgstr "" |
|
3045 |
||
3046 |
#: bzrlib/builtins.py:5027
|
|
3047 |
msgid "Compress the data within a repository." |
|
3048 |
msgstr "" |
|
3049 |
||
3050 |
#: bzrlib/builtins.py:5029
|
|
3051 |
msgid "" |
|
3052 |
"This operation compresses the data within a bazaar repository. As\n"
|
|
3053 |
"bazaar supports automatic packing of repository, this operation is\n"
|
|
3054 |
"normally not required to be done manually."
|
|
3055 |
msgstr "" |
|
3056 |
||
3057 |
#: bzrlib/builtins.py:5033
|
|
3058 |
msgid "" |
|
3059 |
"During the pack operation, bazaar takes a backup of existing repository\n"
|
|
3060 |
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
|
|
3061 |
"automatically when it is safe to do so. To save disk space by removing\n"
|
|
3062 |
"the backed up pack files, the --clean-obsolete-packs option may be\n"
|
|
3063 |
"used."
|
|
3064 |
msgstr "" |
|
3065 |
||
3066 |
#: bzrlib/builtins.py:5039
|
|
3067 |
msgid "" |
|
3068 |
"Warning: If you use --clean-obsolete-packs and your machine crashes\n" |
|
3069 |
"during or immediately after repacking, you may be left with a state\n"
|
|
3070 |
"where the deletion has been written to disk but the new packs have not\n"
|
|
3071 |
"been. In this case the repository may be unusable."
|
|
3072 |
msgstr "" |
|
3073 |
||
3074 |
#: bzrlib/builtins.py:5048
|
|
3075 |
msgid "Delete obsolete packs to save disk space." |
|
3076 |
msgstr "" |
|
3077 |
||
3078 |
#: bzrlib/builtins.py:5062
|
|
3079 |
msgid "List the installed plugins." |
|
3080 |
msgstr "" |
|
3081 |
||
3082 |
#: bzrlib/builtins.py:5064
|
|
3083 |
msgid "" |
|
3084 |
"This command displays the list of installed plugins including\n"
|
|
3085 |
"version of plugin and a short description of each."
|
|
3086 |
msgstr "" |
|
3087 |
||
3088 |
#: bzrlib/builtins.py:5067
|
|
3089 |
msgid "--verbose shows the path where each plugin is located." |
|
3090 |
msgstr "" |
|
3091 |
||
3092 |
#: bzrlib/builtins.py:5069
|
|
3093 |
msgid "" |
|
3094 |
"A plugin is an external component for Bazaar that extends the\n"
|
|
3095 |
"revision control system, by adding or replacing code in Bazaar.\n"
|
|
3096 |
"Plugins can do a variety of things, including overriding commands,\n"
|
|
3097 |
"adding new commands, providing additional network transports and\n"
|
|
3098 |
"customizing log output."
|
|
3099 |
msgstr "" |
|
3100 |
||
3101 |
#: bzrlib/builtins.py:5075
|
|
3102 |
msgid "" |
|
3103 |
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
|
|
3104 |
"for further information on plugins including where to find them and how to\n"
|
|
3105 |
"install them. Instructions are also provided there on how to write new\n"
|
|
3106 |
"plugins using the Python programming language."
|
|
3107 |
msgstr "" |
|
3108 |
||
3109 |
#: bzrlib/builtins.py:5091
|
|
3110 |
msgid "Show testament (signing-form) of a revision." |
|
3111 |
msgstr "" |
|
3112 |
||
3113 |
#: bzrlib/builtins.py:5094
|
|
3114 |
msgid "Produce long-format testament." |
|
3115 |
msgstr "" |
|
3116 |
||
3117 |
#: bzrlib/builtins.py:5096
|
|
3118 |
msgid "Produce a strict-format testament." |
|
3119 |
msgstr "" |
|
3120 |
||
3121 |
#: bzrlib/builtins.py:5122
|
|
3122 |
msgid "Show the origin of each line in a file." |
|
3123 |
msgstr "" |
|
3124 |
||
3125 |
#: bzrlib/builtins.py:5124
|
|
3126 |
msgid "" |
|
3127 |
"This prints out the given file with an annotation on the left side\n"
|
|
3128 |
"indicating which revision, author and date introduced the change."
|
|
3129 |
msgstr "" |
|
3130 |
||
3131 |
#: bzrlib/builtins.py:5127
|
|
3132 |
msgid "" |
|
3133 |
"If the origin is the same for a run of consecutive lines, it is\n"
|
|
3134 |
"shown only at the top, unless the --all option is given."
|
|
3135 |
msgstr "" |
|
3136 |
||
3137 |
#: bzrlib/builtins.py:5135
|
|
3138 |
msgid "Show annotations on all lines." |
|
3139 |
msgstr "" |
|
3140 |
||
3141 |
#: bzrlib/builtins.py:5136
|
|
3142 |
msgid "Show commit date in annotations." |
|
3143 |
msgstr "" |
|
3144 |
||
3145 |
#: bzrlib/builtins.py:5223
|
|
3146 |
msgid "Cannot sign a range of non-revision-history revisions" |
|
3147 |
msgstr "" |
|
3148 |
||
3149 |
#: bzrlib/builtins.py:5235
|
|
3150 |
msgid "Please supply either one revision, or a range." |
|
3151 |
msgstr "" |
|
3152 |
||
3153 |
#: bzrlib/builtins.py:5239
|
|
3154 |
msgid "" |
|
3155 |
"Convert the current branch into a checkout of the supplied branch.\n"
|
|
3156 |
"If no branch is supplied, rebind to the last bound location."
|
|
3157 |
msgstr "" |
|
3158 |
||
3159 |
#: bzrlib/builtins.py:5242
|
|
3160 |
msgid "" |
|
3161 |
"Once converted into a checkout, commits must succeed on the master branch\n"
|
|
3162 |
"before they will be applied to the local branch."
|
|
3163 |
msgstr "" |
|
3164 |
||
3165 |
#: bzrlib/builtins.py:5245
|
|
3166 |
msgid "" |
|
3167 |
"Bound branches use the nickname of its master branch unless it is set\n"
|
|
3168 |
"locally, in which case binding will update the local nickname to be\n"
|
|
3169 |
"that of the master."
|
|
3170 |
msgstr "" |
|
3171 |
||
3172 |
#: bzrlib/builtins.py:5260
|
|
3173 |
msgid "No location supplied. This format does not remember old locations." |
|
3174 |
msgstr "" |
|
3175 |
||
3176 |
#: bzrlib/builtins.py:5265
|
|
3177 |
msgid "Branch is already bound" |
|
3178 |
msgstr "" |
|
3179 |
||
3180 |
#: bzrlib/builtins.py:5267
|
|
3181 |
msgid "No location supplied and no previous location known" |
|
3182 |
msgstr "" |
|
3183 |
||
3184 |
#: bzrlib/builtins.py:5273
|
|
3185 |
msgid "These branches have diverged. Try merging, and then bind again." |
|
3186 |
msgstr "" |
|
3187 |
||
3188 |
#: bzrlib/builtins.py:5280
|
|
3189 |
msgid "Convert the current checkout into a regular branch." |
|
3190 |
msgstr "" |
|
3191 |
||
3192 |
#: bzrlib/builtins.py:5282
|
|
3193 |
msgid "" |
|
3194 |
"After unbinding, the local branch is considered independent and subsequent\n"
|
|
3195 |
"commits will be local only."
|
|
3196 |
msgstr "" |
|
3197 |
||
3198 |
#: bzrlib/builtins.py:5293
|
|
3199 |
msgid "Local branch is not bound" |
|
3200 |
msgstr "" |
|
3201 |
||
3202 |
#: bzrlib/builtins.py:5297
|
|
3203 |
msgid "Remove the last committed revision." |
|
3204 |
msgstr "" |
|
3205 |
||
3206 |
#: bzrlib/builtins.py:5299
|
|
3207 |
msgid "" |
|
3208 |
"--verbose will print out what is being removed.\n"
|
|
3209 |
"--dry-run will go through all the motions, but not actually\n"
|
|
3210 |
"remove anything."
|
|
3211 |
msgstr "" |
|
3212 |
||
3213 |
#: bzrlib/builtins.py:5303
|
|
3214 |
msgid "" |
|
3215 |
"If --revision is specified, uncommit revisions to leave the branch at the\n"
|
|
3216 |
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
|
|
3217 |
"branch at revision 15."
|
|
3218 |
msgstr "" |
|
3219 |
||
3220 |
#: bzrlib/builtins.py:5307
|
|
3221 |
msgid "" |
|
3222 |
"Uncommit leaves the working tree ready for a new commit. The only change\n"
|
|
3223 |
"it may make is to restore any pending merges that were present before\n"
|
|
3224 |
"the commit."
|
|
3225 |
msgstr "" |
|
3226 |
||
3227 |
#: bzrlib/builtins.py:5318
|
|
3228 |
msgid "Don't actually make changes." |
|
3229 |
msgstr "" |
|
3230 |
||
3231 |
#: bzrlib/builtins.py:5319
|
|
3232 |
msgid "Say yes to all questions." |
|
3233 |
msgstr "" |
|
3234 |
||
3235 |
#: bzrlib/builtins.py:5321
|
|
3236 |
msgid "Keep tags that point to removed revisions." |
|
3237 |
msgstr "" |
|
3238 |
||
3239 |
#: bzrlib/builtins.py:5323
|
|
3240 |
msgid "Only remove the commits from the local branch when in a checkout." |
|
3241 |
msgstr "" |
|
3242 |
||
3243 |
#: bzrlib/builtins.py:5372
|
|
3244 |
msgid "No revisions to uncommit.\n" |
|
3245 |
msgstr "" |
|
3246 |
||
3247 |
#: bzrlib/builtins.py:5387
|
|
3248 |
msgid "Dry-run, pretending to remove the above revisions.\n" |
|
3249 |
msgstr "" |
|
3250 |
||
3251 |
#: bzrlib/builtins.py:5390
|
|
3252 |
msgid "The above revision(s) will be removed.\n" |
|
3253 |
msgstr "" |
|
3254 |
||
3255 |
#: bzrlib/builtins.py:5394
|
|
3256 |
msgid "Uncommit these revisions" |
|
3257 |
msgstr "" |
|
3258 |
||
3259 |
#: bzrlib/builtins.py:5397
|
|
3260 |
msgid "Canceled\n" |
|
3261 |
msgstr "" |
|
3262 |
||
3263 |
#: bzrlib/builtins.py:5404
|
|
3264 |
#, python-format
|
|
3265 |
msgid "" |
|
3266 |
"You can restore the old tip by running:\n"
|
|
3267 |
" bzr pull . -r revid:%s\n"
|
|
3268 |
msgstr "" |
|
3269 |
||
3270 |
#: bzrlib/builtins.py:5409
|
|
3271 |
msgid "Break a dead lock." |
|
3272 |
msgstr "" |
|
3273 |
||
3274 |
#: bzrlib/builtins.py:5411
|
|
3275 |
msgid "" |
|
3276 |
"This command breaks a lock on a repository, branch, working directory or\n"
|
|
3277 |
"config file."
|
|
3278 |
msgstr "" |
|
3279 |
||
3280 |
#: bzrlib/builtins.py:5414
|
|
3281 |
msgid "" |
|
3282 |
"CAUTION: Locks should only be broken when you are sure that the process\n" |
|
3283 |
"holding the lock has been stopped."
|
|
3284 |
msgstr "" |
|
3285 |
||
3286 |
#: bzrlib/builtins.py:5417
|
|
3287 |
msgid "" |
|
3288 |
"You can get information on what locks are open via the 'bzr info\n"
|
|
3289 |
"[location]' command."
|
|
3290 |
msgstr "" |
|
3291 |
||
3292 |
#: bzrlib/builtins.py:5420
|
|
3293 |
msgid "" |
|
3294 |
":Examples:\n"
|
|
3295 |
" bzr break-lock\n"
|
|
3296 |
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
|
|
3297 |
" bzr break-lock --conf ~/.bazaar"
|
|
3298 |
msgstr "" |
|
3299 |
||
3300 |
#: bzrlib/builtins.py:5429
|
|
3301 |
msgid "LOCATION is the directory where the config lock is." |
|
3302 |
msgstr "" |
|
3303 |
||
3304 |
#: bzrlib/builtins.py:5431
|
|
3305 |
msgid "Do not ask for confirmation before breaking the lock." |
|
3306 |
msgstr "" |
|
3307 |
||
3308 |
#: bzrlib/builtins.py:5466
|
|
3309 |
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)" |
|
3310 |
msgstr "" |
|
3311 |
||
3312 |
#: bzrlib/builtins.py:5467
|
|
3313 |
msgid "Run the bzr server." |
|
3314 |
msgstr "" |
|
3315 |
||
3316 |
#: bzrlib/builtins.py:5473
|
|
3317 |
msgid "Serve on stdin/out for use from inetd or sshd." |
|
3318 |
msgstr "" |
|
3319 |
||
3320 |
#: bzrlib/builtins.py:5474
|
|
3321 |
msgid "protocol" |
|
3322 |
msgstr "" |
|
3323 |
||
3324 |
#: bzrlib/builtins.py:5475
|
|
3325 |
msgid "Protocol to serve." |
|
3326 |
msgstr "" |
|
3327 |
||
3328 |
#: bzrlib/builtins.py:5479
|
|
3329 |
msgid "" |
|
3330 |
"Listen for connections on nominated port of the form [hostname:]portnumber. "
|
|
3331 |
"Passing 0 as the port number will result in a dynamically allocated port. "
|
|
3332 |
"The default port depends on the protocol."
|
|
3333 |
msgstr "" |
|
3334 |
||
3335 |
#: bzrlib/builtins.py:5485
|
|
3336 |
msgid "Serve contents of this directory." |
|
3337 |
msgstr "" |
|
3338 |
||
3339 |
#: bzrlib/builtins.py:5487
|
|
3340 |
msgid "" |
|
3341 |
"By default the server is a readonly server. Supplying --allow-writes "
|
|
3342 |
"enables write access to the contents of the served directory and below. "
|
|
3343 |
"Note that ``bzr serve`` does not perform authentication, so unless some form "
|
|
3344 |
"of external authentication is arranged supplying this option leads to global "
|
|
3345 |
"uncontrolled write access to your file system."
|
|
3346 |
msgstr "" |
|
3347 |
||
3348 |
#: bzrlib/builtins.py:5496
|
|
3349 |
msgid "Override the default idle client timeout (5min)." |
|
3350 |
msgstr "" |
|
3351 |
||
3352 |
#: bzrlib/builtins.py:5546
|
|
3353 |
msgid "Combine a tree into its containing tree." |
|
3354 |
msgstr "" |
|
3355 |
||
3356 |
#: bzrlib/builtins.py:5548
|
|
3357 |
msgid "This command requires the target tree to be in a rich-root format." |
|
3358 |
msgstr "" |
|
3359 |
||
3360 |
#: bzrlib/builtins.py:5550
|
|
3361 |
msgid "" |
|
3362 |
"The TREE argument should be an independent tree, inside another tree, but\n"
|
|
3363 |
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
|
|
3364 |
"running \"bzr branch\" with the target inside a tree.)"
|
|
3365 |
msgstr "" |
|
3366 |
||
3367 |
#: bzrlib/builtins.py:5554
|
|
3368 |
msgid "" |
|
3369 |
"The result is a combined tree, with the subtree no longer an independent\n"
|
|
3370 |
"part. This is marked as a merge of the subtree into the containing tree,\n"
|
|
3371 |
"and all history is preserved."
|
|
3372 |
msgstr "" |
|
3373 |
||
3374 |
#: bzrlib/builtins.py:5572
|
|
3375 |
#, python-format
|
|
3376 |
msgid "" |
|
3377 |
"Can't join trees because %s doesn't support rich root data.\n"
|
|
3378 |
"You can use bzr upgrade on the repository."
|
|
3379 |
msgstr "" |
|
3380 |
||
3381 |
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
|
|
3382 |
msgid "Cannot join {0}. {1}" |
|
3383 |
msgstr "" |
|
3384 |
||
3385 |
#: bzrlib/builtins.py:5592
|
|
3386 |
msgid "Split a subdirectory of a tree into a separate tree." |
|
3387 |
msgstr "" |
|
3388 |
||
3389 |
#: bzrlib/builtins.py:5594
|
|
3390 |
msgid "" |
|
3391 |
"This command will produce a target tree in a format that supports\n"
|
|
3392 |
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
|
|
3393 |
"converted into earlier formats like 'dirstate-tags'."
|
|
3394 |
msgstr "" |
|
3395 |
||
3396 |
#: bzrlib/builtins.py:5598
|
|
3397 |
msgid "" |
|
3398 |
"The TREE argument should be a subdirectory of a working tree. That\n"
|
|
3399 |
"subdirectory will be converted into an independent tree, with its own\n"
|
|
3400 |
"branch. Commits in the top-level tree will not apply to the new subtree."
|
|
3401 |
msgstr "" |
|
3402 |
||
3403 |
#: bzrlib/builtins.py:5678
|
|
3404 |
msgid "No submit branch specified or known" |
|
3405 |
msgstr "" |
|
3406 |
||
3407 |
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
|
|
3408 |
msgid "No public branch specified or known" |
|
3409 |
msgstr "" |
|
3410 |
||
3411 |
#: bzrlib/builtins.py:5691
|
|
3412 |
msgid "bzr merge-directive takes at most two one revision identifiers" |
|
3413 |
msgstr "" |
|
3414 |
||
3415 |
#: bzrlib/builtins.py:5700
|
|
3416 |
msgid "No revisions to bundle." |
|
3417 |
msgstr "" |
|
3418 |
||
3419 |
#: bzrlib/builtins.py:5719
|
|
3420 |
msgid "Mail or create a merge-directive for submitting changes." |
|
3421 |
msgstr "" |
|
3422 |
||
3423 |
#: bzrlib/builtins.py:5721
|
|
3424 |
msgid "A merge directive provides many things needed for requesting merges:" |
|
3425 |
msgstr "" |
|
3426 |
||
3427 |
#: bzrlib/builtins.py:5723
|
|
3428 |
msgid "* A machine-readable description of the merge to perform" |
|
3429 |
msgstr "" |
|
3430 |
||
3431 |
#: bzrlib/builtins.py:5725
|
|
3432 |
msgid "* An optional patch that is a preview of the changes requested" |
|
3433 |
msgstr "" |
|
3434 |
||
3435 |
#: bzrlib/builtins.py:5727
|
|
3436 |
msgid "" |
|
3437 |
"* An optional bundle of revision data, so that the changes can be applied\n"
|
|
3438 |
" directly from the merge directive, without retrieving data from a\n"
|
|
3439 |
" branch."
|
|
3440 |
msgstr "" |
|
3441 |
||
3442 |
#: bzrlib/builtins.py:5731
|
|
3443 |
msgid "" |
|
3444 |
"`bzr send` creates a compact data set that, when applied using bzr\n"
|
|
3445 |
"merge, has the same effect as merging from the source branch. "
|
|
3446 |
msgstr "" |
|
3447 |
||
3448 |
#: bzrlib/builtins.py:5734
|
|
3449 |
msgid "" |
|
3450 |
"By default the merge directive is self-contained and can be applied to any\n"
|
|
3451 |
"branch containing submit_branch in its ancestory without needing access to\n"
|
|
3452 |
"the source branch."
|
|
3453 |
msgstr "" |
|
3454 |
||
3455 |
#: bzrlib/builtins.py:5738
|
|
3456 |
msgid "" |
|
3457 |
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
|
|
3458 |
"revisions, but only a structured request to merge from the\n"
|
|
3459 |
"public_location. In that case the public_branch is needed and it must be\n"
|
|
3460 |
"up-to-date and accessible to the recipient. The public_branch is always\n"
|
|
3461 |
"included if known, so that people can check it later."
|
|
3462 |
msgstr "" |
|
3463 |
||
3464 |
#: bzrlib/builtins.py:5744
|
|
3465 |
msgid "" |
|
3466 |
"The submit branch defaults to the parent of the source branch, but can be\n"
|
|
3467 |
"overridden. Both submit branch and public branch will be remembered in\n"
|
|
3468 |
"branch.conf the first time they are used for a particular branch. The\n"
|
|
3469 |
"source branch defaults to that containing the working directory, but can\n"
|
|
3470 |
"be changed using --from."
|
|
3471 |
msgstr "" |
|
3472 |
||
3473 |
#: bzrlib/builtins.py:5750
|
|
3474 |
msgid "" |
|
3475 |
"Both the submit branch and the public branch follow the usual behavior with\n"
|
|
3476 |
"respect to --remember: If there is no default location set, the first send\n"
|
|
3477 |
"will set it (use --no-remember to avoid setting it). After that, you can\n"
|
|
3478 |
"omit the location to use the default. To change the default, use\n"
|
|
3479 |
"--remember. The value will only be saved if the location can be accessed."
|
|
3480 |
msgstr "" |
|
3481 |
||
3482 |
#: bzrlib/builtins.py:5756
|
|
3483 |
msgid "" |
|
3484 |
"In order to calculate those changes, bzr must analyse the submit branch.\n"
|
|
3485 |
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
|
|
3486 |
"If a public location is known for the submit_branch, that location is used\n"
|
|
3487 |
"in the merge directive."
|
|
3488 |
msgstr "" |
|
3489 |
||
3490 |
#: bzrlib/builtins.py:5761
|
|
3491 |
msgid "" |
|
3492 |
"The default behaviour is to send the merge directive by mail, unless -o is\n"
|
|
3493 |
"given, in which case it is sent to a file."
|
|
3494 |
msgstr "" |
|
3495 |
||
3496 |
#: bzrlib/builtins.py:5764
|
|
3497 |
msgid "" |
|
3498 |
"Mail is sent using your preferred mail program. This should be transparent\n"
|
|
3499 |
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
|
|
3500 |
"If the preferred client can't be found (or used), your editor will be used."
|
|
3501 |
msgstr "" |
|
3502 |
||
3503 |
#: bzrlib/builtins.py:5768
|
|
3504 |
msgid "" |
|
3505 |
"To use a specific mail program, set the mail_client configuration option.\n"
|
|
3506 |
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
|
|
3507 |
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
|
|
3508 |
"(MacOS X's\n"
|
|
3509 |
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
|
|
3510 |
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
|
|
3511 |
"add\n"
|
|
3512 |
"supported clients."
|
|
3513 |
msgstr "" |
|
3514 |
||
3515 |
#: bzrlib/builtins.py:5775
|
|
3516 |
msgid "" |
|
3517 |
"If mail is being sent, a to address is required. This can be supplied\n"
|
|
3518 |
"either on the commandline, by setting the submit_to configuration\n"
|
|
3519 |
"option in the branch itself or the child_submit_to configuration option\n"
|
|
3520 |
"in the submit branch."
|
|
3521 |
msgstr "" |
|
3522 |
||
3523 |
#: bzrlib/builtins.py:5780
|
|
3524 |
msgid "" |
|
3525 |
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
|
|
3526 |
"and\n"
|
|
3527 |
"merge directive format 2. It is significantly faster and smaller than\n"
|
|
3528 |
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
|
|
3529 |
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
|
|
3530 |
"format 1. It is compatible with Bazaar 0.12 - 0.18."
|
|
3531 |
msgstr "" |
|
3532 |
||
3533 |
#: bzrlib/builtins.py:5786
|
|
3534 |
msgid "" |
|
3535 |
"The merge directives created by bzr send may be applied using bzr merge or\n"
|
|
3536 |
"bzr pull by specifying a file containing a merge directive as the location."
|
|
3537 |
msgstr "" |
|
3538 |
||
3539 |
#: bzrlib/builtins.py:5789
|
|
3540 |
msgid "" |
|
3541 |
"bzr send makes extensive use of public locations to map local locations "
|
|
3542 |
"into\n"
|
|
3543 |
"URLs that can be used by other people. See `bzr help configuration` to\n"
|
|
3544 |
"set them, and use `bzr info` to display them."
|
|
3545 |
msgstr "" |
|
3546 |
||
3547 |
#: bzrlib/builtins.py:5813
|
|
3548 |
msgid "Write merge directive to this file or directory; use - for stdout." |
|
3549 |
msgstr "" |
|
3550 |
||
3551 |
#: bzrlib/builtins.py:5817
|
|
3552 |
msgid "" |
|
3553 |
"Refuse to send if there are uncommitted changes in the working tree, --no-"
|
|
3554 |
"strict disables the check."
|
|
3555 |
msgstr "" |
|
3556 |
||
3557 |
#: bzrlib/builtins.py:5819
|
|
3558 |
msgid "Mail the request to this address." |
|
3559 |
msgstr "" |
|
3560 |
||
3561 |
#: bzrlib/builtins.py:5823
|
|
3562 |
msgid "Body for the email." |
|
3563 |
msgstr "" |
|
3564 |
||
3565 |
#: bzrlib/builtins.py:5876
|
|
3566 |
msgid "Do not include a bundle in the merge directive." |
|
3567 |
msgstr "" |
|
3568 |
||
3569 |
#: bzrlib/builtins.py:5877
|
|
3570 |
msgid "Do not include a preview patch in the merge directive." |
|
3571 |
msgstr "" |
|
3572 |
||
3573 |
#: bzrlib/builtins.py:5880
|
|
3574 |
msgid "Remember submit and public branch." |
|
3575 |
msgstr "" |
|
3576 |
||
3577 |
#: bzrlib/builtins.py:5882
|
|
3578 |
msgid "" |
|
3579 |
"Branch to generate the submission from, rather than the one containing the "
|
|
3580 |
"working directory."
|
|
3581 |
msgstr "" |
|
3582 |
||
3583 |
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
|
|
3584 |
msgid "format" |
|
3585 |
msgstr "" |
|
3586 |
||
3587 |
#: bzrlib/builtins.py:5893
|
|
3588 |
msgid "Use the specified output format." |
|
3589 |
msgstr "" |
|
3590 |
||
3591 |
#: bzrlib/builtins.py:5915
|
|
3592 |
msgid "Create, remove or modify a tag naming a revision." |
|
3593 |
msgstr "" |
|
3594 |
||
3595 |
#: bzrlib/builtins.py:5917
|
|
3596 |
msgid "" |
|
3597 |
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
|
|
3598 |
"(--revision) option can be given -rtag:X, where X is any previously\n"
|
|
3599 |
"created tag."
|
|
3600 |
msgstr "" |
|
3601 |
||
3602 |
#: bzrlib/builtins.py:5921
|
|
3603 |
msgid "" |
|
3604 |
"Tags are stored in the branch. Tags are copied from one branch to another\n"
|
|
3605 |
"along when you branch, push, pull or merge."
|
|
3606 |
msgstr "" |
|
3607 |
||
3608 |
#: bzrlib/builtins.py:5924
|
|
3609 |
msgid "" |
|
3610 |
"It is an error to give a tag name that already exists unless you pass\n"
|
|
3611 |
"--force, in which case the tag is moved to point to the new revision."
|
|
3612 |
msgstr "" |
|
3613 |
||
3614 |
#: bzrlib/builtins.py:5927
|
|
3615 |
msgid "" |
|
3616 |
"To rename a tag (change the name but keep it on the same revsion), run "
|
|
3617 |
"``bzr\n"
|
|
3618 |
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
|
|
3619 |
msgstr "" |
|
3620 |
||
3621 |
#: bzrlib/builtins.py:5930
|
|
3622 |
msgid "" |
|
3623 |
"If no tag name is specified it will be determined through the \n"
|
|
3624 |
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
|
|
3625 |
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
|
|
3626 |
"details."
|
|
3627 |
msgstr "" |
|
3628 |
||
3629 |
#: bzrlib/builtins.py:5940
|
|
3630 |
msgid "Delete this tag rather than placing it." |
|
3631 |
msgstr "" |
|
3632 |
||
3633 |
#: bzrlib/builtins.py:5943
|
|
3634 |
msgid "Branch in which to place the tag." |
|
3635 |
msgstr "" |
|
3636 |
||
3637 |
#: bzrlib/builtins.py:5945
|
|
3638 |
msgid "Replace existing tags." |
|
3639 |
msgstr "" |
|
3640 |
||
3641 |
#: bzrlib/builtins.py:5960
|
|
3642 |
msgid "No tag specified to delete." |
|
3643 |
msgstr "" |
|
3644 |
||
3645 |
#: bzrlib/builtins.py:5962
|
|
3646 |
#, python-format
|
|
3647 |
msgid "Deleted tag %s." |
|
3648 |
msgstr "" |
|
3649 |
||
3650 |
#: bzrlib/builtins.py:5976
|
|
3651 |
msgid "Please specify a tag name." |
|
3652 |
msgstr "" |
|
3653 |
||
3654 |
#: bzrlib/builtins.py:5984
|
|
3655 |
#, python-format
|
|
3656 |
msgid "Tag %s already exists for that revision." |
|
3657 |
msgstr "" |
|
3658 |
||
3659 |
#: bzrlib/builtins.py:5988
|
|
3660 |
#, python-format
|
|
3661 |
msgid "Created tag %s." |
|
3662 |
msgstr "" |
|
3663 |
||
3664 |
#: bzrlib/builtins.py:5990
|
|
3665 |
#, python-format
|
|
3666 |
msgid "Updated tag %s." |
|
3667 |
msgstr "" |
|
3668 |
||
3669 |
#: bzrlib/builtins.py:5994
|
|
3670 |
msgid "List tags." |
|
3671 |
msgstr "" |
|
3672 |
||
3673 |
#: bzrlib/builtins.py:5996
|
|
3674 |
msgid "" |
|
3675 |
"This command shows a table of tag names and the revisions they reference."
|
|
3676 |
msgstr "" |
|
3677 |
||
3678 |
#: bzrlib/builtins.py:6002
|
|
3679 |
msgid "Branch whose tags should be displayed." |
|
3680 |
msgstr "" |
|
3681 |
||
3682 |
#: bzrlib/builtins.py:6004
|
|
3683 |
msgid "Sort tags by different criteria." |
|
3684 |
msgstr "" |
|
3685 |
||
3686 |
#: bzrlib/builtins.py:6004
|
|
3687 |
msgid "Sorting" |
|
3688 |
msgstr "" |
|
3689 |
||
3690 |
#: bzrlib/builtins.py:6073
|
|
3691 |
msgid "Reconfigure the type of a bzr directory." |
|
3692 |
msgstr "" |
|
3693 |
||
3694 |
#: bzrlib/builtins.py:6075
|
|
3695 |
msgid "A target configuration must be specified." |
|
3696 |
msgstr "" |
|
3697 |
||
3698 |
#: bzrlib/builtins.py:6077
|
|
3699 |
msgid "" |
|
3700 |
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
|
|
3701 |
"The order of preference is\n"
|
|
3702 |
"1. For a lightweight checkout, the current bound location.\n"
|
|
3703 |
"2. For branches that used to be checkouts, the previously-bound location.\n"
|
|
3704 |
"3. The push location.\n"
|
|
3705 |
"4. The parent location.\n"
|
|
3706 |
"If none of these is available, --bind-to must be specified."
|
|
3707 |
msgstr "" |
|
3708 |
||
3709 |
#: bzrlib/builtins.py:6091
|
|
3710 |
msgid "Tree type" |
|
3711 |
msgstr "" |
|
3712 |
||
3713 |
#: bzrlib/builtins.py:6092
|
|
3714 |
msgid "The relation between branch and tree." |
|
3715 |
msgstr "" |
|
3716 |
||
3717 |
#: bzrlib/builtins.py:6094
|
|
3718 |
msgid "Reconfigure to be an unbound branch with no working tree." |
|
3719 |
msgstr "" |
|
3720 |
||
3721 |
#: bzrlib/builtins.py:6095
|
|
3722 |
msgid "Reconfigure to be an unbound branch with a working tree." |
|
3723 |
msgstr "" |
|
3724 |
||
3725 |
#: bzrlib/builtins.py:6096
|
|
3726 |
msgid "Reconfigure to be a bound branch with a working tree." |
|
3727 |
msgstr "" |
|
3728 |
||
3729 |
#: bzrlib/builtins.py:6097
|
|
3730 |
msgid "Reconfigure to be a lightweight checkout (with no local history)." |
|
3731 |
msgstr "" |
|
3732 |
||
3733 |
#: bzrlib/builtins.py:6102
|
|
3734 |
msgid "Repository type" |
|
3735 |
msgstr "" |
|
3736 |
||
3737 |
#: bzrlib/builtins.py:6103
|
|
3738 |
msgid "Location fo the repository." |
|
3739 |
msgstr "" |
|
3740 |
||
3741 |
#: bzrlib/builtins.py:6105
|
|
3742 |
msgid "" |
|
3743 |
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
|
|
3744 |
msgstr "" |
|
3745 |
||
3746 |
#: bzrlib/builtins.py:6107
|
|
3747 |
msgid "Reconfigure to use a shared repository." |
|
3748 |
msgstr "" |
|
3749 |
||
3750 |
#: bzrlib/builtins.py:6111
|
|
3751 |
msgid "Trees in Repository" |
|
3752 |
msgstr "" |
|
3753 |
||
3754 |
#: bzrlib/builtins.py:6112
|
|
3755 |
msgid "Whether new branches in the repository have trees." |
|
3756 |
msgstr "" |
|
3757 |
||
3758 |
#: bzrlib/builtins.py:6114
|
|
3759 |
msgid "" |
|
3760 |
"Reconfigure repository to create working trees on branches by default."
|
|
3761 |
msgstr "" |
|
3762 |
||
3763 |
#: bzrlib/builtins.py:6116
|
|
3764 |
msgid "" |
|
3765 |
"Reconfigure repository to not create working trees on branches by default."
|
|
3766 |
msgstr "" |
|
3767 |
||
3768 |
#: bzrlib/builtins.py:6119
|
|
3769 |
msgid "Branch to bind checkout to." |
|
3770 |
msgstr "" |
|
3771 |
||
3772 |
#: bzrlib/builtins.py:6121
|
|
3773 |
msgid "Perform reconfiguration even if local changes will be lost." |
|
3774 |
msgstr "" |
|
3775 |
||
3776 |
#: bzrlib/builtins.py:6124
|
|
3777 |
msgid "Reconfigure a branch to be stacked on another branch." |
|
3778 |
msgstr "" |
|
3779 |
||
3780 |
#: bzrlib/builtins.py:6128
|
|
3781 |
msgid "" |
|
3782 |
"Reconfigure a branch to be unstacked. This may require copying substantial "
|
|
3783 |
"data into it."
|
|
3784 |
msgstr "" |
|
3785 |
||
3786 |
#: bzrlib/builtins.py:6138
|
|
3787 |
msgid "Can't use both --stacked-on and --unstacked" |
|
3788 |
msgstr "" |
|
3789 |
||
3790 |
#: bzrlib/builtins.py:6152
|
|
3791 |
msgid "No target configuration specified" |
|
3792 |
msgstr "" |
|
3793 |
||
3794 |
#: bzrlib/builtins.py:6187
|
|
3795 |
msgid "Set the branch of a checkout and update." |
|
3796 |
msgstr "" |
|
3797 |
||
3798 |
#: bzrlib/builtins.py:6189
|
|
3799 |
msgid "" |
|
3800 |
"For lightweight checkouts, this changes the branch being referenced.\n"
|
|
3801 |
"For heavyweight checkouts, this checks that there are no local commits\n"
|
|
3802 |
"versus the current bound branch, then it makes the local branch a mirror\n"
|
|
3803 |
"of the new location and binds to it."
|
|
3804 |
msgstr "" |
|
3805 |
||
3806 |
#: bzrlib/builtins.py:6194
|
|
3807 |
msgid "" |
|
3808 |
"In both cases, the working tree is updated and uncommitted changes\n"
|
|
3809 |
"are merged. The user can commit or revert these as they desire."
|
|
3810 |
msgstr "" |
|
3811 |
||
3812 |
#: bzrlib/builtins.py:6197
|
|
3813 |
msgid "Pending merges need to be committed or reverted before using switch." |
|
3814 |
msgstr "" |
|
3815 |
||
3816 |
#: bzrlib/builtins.py:6199
|
|
3817 |
msgid "" |
|
3818 |
"The path to the branch to switch to can be specified relative to the parent\n"
|
|
3819 |
"directory of the current branch. For example, if you are currently in a\n"
|
|
3820 |
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
|
|
3821 |
"/path/to/newbranch."
|
|
3822 |
msgstr "" |
|
3823 |
||
3824 |
#: bzrlib/builtins.py:6204
|
|
3825 |
msgid "" |
|
3826 |
"Bound branches use the nickname of its master branch unless it is set\n"
|
|
3827 |
"locally, in which case switching will update the local nickname to be\n"
|
|
3828 |
"that of the master."
|
|
3829 |
msgstr "" |
|
3830 |
||
3831 |
#: bzrlib/builtins.py:6212
|
|
3832 |
msgid "Switch even if local commits will be lost." |
|
3833 |
msgstr "" |
|
3834 |
||
3835 |
#: bzrlib/builtins.py:6215
|
|
3836 |
msgid "Create the target branch from this one before switching to it." |
|
3837 |
msgstr "" |
|
3838 |
||
3839 |
#: bzrlib/builtins.py:6229
|
|
3840 |
msgid "You must supply either a revision or a location" |
|
3841 |
msgstr "" |
|
3842 |
||
3843 |
#: bzrlib/builtins.py:6242
|
|
3844 |
msgid "cannot create branch without source branch" |
|
3845 |
msgstr "" |
|
3846 |
||
3847 |
#: bzrlib/builtins.py:6262
|
|
3848 |
msgid "Manage filtered views." |
|
3849 |
msgstr "" |
|
3850 |
||
3851 |
#: bzrlib/builtins.py:6264
|
|
3852 |
msgid "" |
|
3853 |
"Views provide a mask over the tree so that users can focus on\n"
|
|
3854 |
"a subset of a tree when doing their work. After creating a view,\n"
|
|
3855 |
"commands that support a list of files - status, diff, commit, etc -\n"
|
|
3856 |
"effectively have that list of files implicitly given each time.\n"
|
|
3857 |
"An explicit list of files can still be given but those files\n"
|
|
3858 |
"must be within the current view."
|
|
3859 |
msgstr "" |
|
3860 |
||
3861 |
#: bzrlib/builtins.py:6271
|
|
3862 |
msgid "" |
|
3863 |
"In most cases, a view has a short life-span: it is created to make\n"
|
|
3864 |
"a selected change and is deleted once that change is committed.\n"
|
|
3865 |
"At other times, you may wish to create one or more named views\n"
|
|
3866 |
"and switch between them."
|
|
3867 |
msgstr "" |
|
3868 |
||
3869 |
#: bzrlib/builtins.py:6276
|
|
3870 |
msgid "" |
|
3871 |
"To disable the current view without deleting it, you can switch to\n"
|
|
3872 |
"the pseudo view called ``off``. This can be useful when you need\n"
|
|
3873 |
"to see the whole tree for an operation or two (e.g. merge) but\n"
|
|
3874 |
"want to switch back to your view after that."
|
|
3875 |
msgstr "" |
|
3876 |
||
3877 |
#: bzrlib/builtins.py:6281
|
|
3878 |
msgid "" |
|
3879 |
":Examples:\n"
|
|
3880 |
" To define the current view::"
|
|
3881 |
msgstr "" |
|
3882 |
||
3883 |
#: bzrlib/builtins.py:6284
|
|
3884 |
msgid " bzr view file1 dir1 ..." |
|
3885 |
msgstr "" |
|
3886 |
||
3887 |
#: bzrlib/builtins.py:6286
|
|
3888 |
msgid " To list the current view::" |
|
3889 |
msgstr "" |
|
3890 |
||
3891 |
#: bzrlib/builtins.py:6288
|
|
3892 |
msgid " bzr view" |
|
3893 |
msgstr "" |
|
3894 |
||
3895 |
#: bzrlib/builtins.py:6290
|
|
3896 |
msgid " To delete the current view::" |
|
3897 |
msgstr "" |
|
3898 |
||
3899 |
#: bzrlib/builtins.py:6292
|
|
3900 |
msgid " bzr view --delete" |
|
3901 |
msgstr "" |
|
3902 |
||
3903 |
#: bzrlib/builtins.py:6294
|
|
3904 |
msgid " To disable the current view without deleting it::" |
|
3905 |
msgstr "" |
|
3906 |
||
3907 |
#: bzrlib/builtins.py:6296
|
|
3908 |
msgid " bzr view --switch off" |
|
3909 |
msgstr "" |
|
3910 |
||
3911 |
#: bzrlib/builtins.py:6298
|
|
3912 |
msgid " To define a named view and switch to it::" |
|
3913 |
msgstr "" |
|
3914 |
||
3915 |
#: bzrlib/builtins.py:6300
|
|
3916 |
msgid " bzr view --name view-name file1 dir1 ..." |
|
3917 |
msgstr "" |
|
3918 |
||
3919 |
#: bzrlib/builtins.py:6302
|
|
3920 |
msgid " To list a named view::" |
|
3921 |
msgstr "" |
|
3922 |
||
3923 |
#: bzrlib/builtins.py:6304
|
|
3924 |
msgid " bzr view --name view-name" |
|
3925 |
msgstr "" |
|
3926 |
||
3927 |
#: bzrlib/builtins.py:6306
|
|
3928 |
msgid " To delete a named view::" |
|
3929 |
msgstr "" |
|
3930 |
||
3931 |
#: bzrlib/builtins.py:6308
|
|
3932 |
msgid " bzr view --name view-name --delete" |
|
3933 |
msgstr "" |
|
3934 |
||
3935 |
#: bzrlib/builtins.py:6310
|
|
3936 |
msgid " To switch to a named view::" |
|
3937 |
msgstr "" |
|
3938 |
||
3939 |
#: bzrlib/builtins.py:6312
|
|
3940 |
msgid " bzr view --switch view-name" |
|
3941 |
msgstr "" |
|
3942 |
||
3943 |
#: bzrlib/builtins.py:6314
|
|
3944 |
msgid " To list all views defined::" |
|
3945 |
msgstr "" |
|
3946 |
||
3947 |
#: bzrlib/builtins.py:6316
|
|
3948 |
msgid " bzr view --all" |
|
3949 |
msgstr "" |
|
3950 |
||
3951 |
#: bzrlib/builtins.py:6318
|
|
3952 |
msgid " To delete all views::" |
|
3953 |
msgstr "" |
|
3954 |
||
3955 |
#: bzrlib/builtins.py:6320
|
|
3956 |
msgid " bzr view --delete --all" |
|
3957 |
msgstr "" |
|
3958 |
||
3959 |
#: bzrlib/builtins.py:6327
|
|
3960 |
msgid "Apply list or delete action to all views." |
|
3961 |
msgstr "" |
|
3962 |
||
3963 |
#: bzrlib/builtins.py:6330
|
|
3964 |
msgid "Delete the view." |
|
3965 |
msgstr "" |
|
3966 |
||
3967 |
#: bzrlib/builtins.py:6333
|
|
3968 |
msgid "Name of the view to define, list or delete." |
|
3969 |
msgstr "" |
|
3970 |
||
3971 |
#: bzrlib/builtins.py:6337
|
|
3972 |
msgid "Name of the view to switch to." |
|
3973 |
msgstr "" |
|
3974 |
||
3975 |
#: bzrlib/builtins.py:6356
|
|
3976 |
msgid "Both --delete and a file list specified" |
|
3977 |
msgstr "" |
|
3978 |
||
3979 |
#: bzrlib/builtins.py:6359
|
|
3980 |
msgid "Both --delete and --switch specified" |
|
3981 |
msgstr "" |
|
3982 |
||
3983 |
#: bzrlib/builtins.py:6362
|
|
3984 |
msgid "Deleted all views.\n" |
|
3985 |
msgstr "" |
|
3986 |
||
3987 |
#: bzrlib/builtins.py:6364
|
|
3988 |
msgid "No current view to delete" |
|
3989 |
msgstr "" |
|
3990 |
||
3991 |
#: bzrlib/builtins.py:6367
|
|
3992 |
#, python-format
|
|
3993 |
msgid "Deleted '%s' view.\n" |
|
3994 |
msgstr "" |
|
3995 |
||
3996 |
#: bzrlib/builtins.py:6371
|
|
3997 |
msgid "Both --switch and a file list specified" |
|
3998 |
msgstr "" |
|
3999 |
||
4000 |
#: bzrlib/builtins.py:6374
|
|
4001 |
msgid "Both --switch and --all specified" |
|
4002 |
msgstr "" |
|
4003 |
||
4004 |
#: bzrlib/builtins.py:6377
|
|
4005 |
msgid "No current view to disable" |
|
4006 |
msgstr "" |
|
4007 |
||
4008 |
#: bzrlib/builtins.py:6379
|
|
4009 |
#, python-format
|
|
4010 |
msgid "Disabled '%s' view.\n" |
|
4011 |
msgstr "" |
|
4012 |
||
4013 |
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
|
|
4014 |
msgid "Using '{0}' view: {1}\n" |
|
4015 |
msgstr "" |
|
4016 |
||
4017 |
#: bzrlib/builtins.py:6386
|
|
4018 |
msgid "Views defined:\n" |
|
4019 |
msgstr "" |
|
4020 |
||
4021 |
#: bzrlib/builtins.py:6395
|
|
4022 |
msgid "No views defined.\n" |
|
4023 |
msgstr "" |
|
4024 |
||
4025 |
#: bzrlib/builtins.py:6402
|
|
4026 |
msgid "Cannot change the 'off' pseudo view" |
|
4027 |
msgstr "" |
|
4028 |
||
4029 |
#: bzrlib/builtins.py:6410
|
|
4030 |
msgid "No current view.\n" |
|
4031 |
msgstr "" |
|
4032 |
||
4033 |
#: bzrlib/builtins.py:6413
|
|
4034 |
msgid "'{0}' view is: {1}\n" |
|
4035 |
msgstr "" |
|
4036 |
||
4037 |
#: bzrlib/builtins.py:6433
|
|
4038 |
msgid " <no hooks installed>\n" |
|
4039 |
msgstr "" |
|
4040 |
||
4041 |
#: bzrlib/builtins.py:6437
|
|
4042 |
msgid "Remove a branch." |
|
4043 |
msgstr "" |
|
4044 |
||
4045 |
#: bzrlib/builtins.py:6439
|
|
4046 |
msgid "" |
|
4047 |
"This will remove the branch from the specified location but \n"
|
|
4048 |
"will keep any working tree or repository in place."
|
|
4049 |
msgstr "" |
|
4050 |
||
4051 |
#: bzrlib/builtins.py:6444
|
|
4052 |
msgid " Remove the branch at repo/trunk::" |
|
4053 |
msgstr "" |
|
4054 |
||
4055 |
#: bzrlib/builtins.py:6446
|
|
4056 |
msgid " bzr remove-branch repo/trunk" |
|
4057 |
msgstr "" |
|
4058 |
||
4059 |
#: bzrlib/builtins.py:6461
|
|
4060 |
msgid "Plaintext diff output." |
|
4061 |
msgstr "" |
|
4062 |
||
4063 |
#: bzrlib/builtins.py:6462
|
|
4064 |
msgid "Temporarily set aside some changes from the current tree." |
|
4065 |
msgstr "" |
|
4066 |
||
4067 |
#: bzrlib/builtins.py:6464
|
|
4068 |
msgid "" |
|
4069 |
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
|
|
4070 |
"ie. out of the way, until a later time when you can bring them back from\n"
|
|
4071 |
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
|
|
4072 |
"your working tree, and so they aren't propagated along with your branch nor\n"
|
|
4073 |
"will they survive its deletion."
|
|
4074 |
msgstr "" |
|
4075 |
||
4076 |
#: bzrlib/builtins.py:6470
|
|
4077 |
msgid "If shelve --list is specified, previously-shelved changes are listed." |
|
4078 |
msgstr "" |
|
4079 |
||
4080 |
#: bzrlib/builtins.py:6472
|
|
4081 |
msgid "" |
|
4082 |
"Shelve is intended to help separate several sets of changes that have\n"
|
|
4083 |
"been inappropriately mingled. If you just want to get rid of all changes\n"
|
|
4084 |
"and you don't need to restore them later, use revert. If you want to\n"
|
|
4085 |
"shelve all text changes at once, use shelve --all."
|
|
4086 |
msgstr "" |
|
4087 |
||
4088 |
#: bzrlib/builtins.py:6477
|
|
4089 |
msgid "" |
|
4090 |
"If filenames are specified, only the changes to those files will be\n"
|
|
4091 |
"shelved. Other files will be left untouched."
|
|
4092 |
msgstr "" |
|
4093 |
||
4094 |
#: bzrlib/builtins.py:6480
|
|
4095 |
msgid "" |
|
4096 |
"If a revision is specified, changes since that revision will be shelved."
|
|
4097 |
msgstr "" |
|
4098 |
||
4099 |
#: bzrlib/builtins.py:6482
|
|
4100 |
msgid "" |
|
4101 |
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
|
|
4102 |
"restore the most recently shelved changes."
|
|
4103 |
msgstr "" |
|
4104 |
||
4105 |
#: bzrlib/builtins.py:6485
|
|
4106 |
msgid "" |
|
4107 |
"For complicated changes, it is possible to edit the changes in a separate\n"
|
|
4108 |
"editor program to decide what the file remaining in the working copy\n"
|
|
4109 |
"should look like. To do this, add the configuration option"
|
|
4110 |
msgstr "" |
|
4111 |
||
4112 |
#: bzrlib/builtins.py:6489
|
|
4113 |
msgid " change_editor = PROGRAM @new_path @old_path" |
|
4114 |
msgstr "" |
|
4115 |
||
4116 |
#: bzrlib/builtins.py:6491
|
|
4117 |
msgid "" |
|
4118 |
"where @new_path is replaced with the path of the new version of the \n"
|
|
4119 |
"file and @old_path is replaced with the path of the old version of \n"
|
|
4120 |
"the file. The PROGRAM should save the new file with the desired \n"
|
|
4121 |
"contents of the file in the working tree.\n"
|
|
4122 |
" "
|
|
4123 |
msgstr "" |
|
4124 |
||
4125 |
#: bzrlib/builtins.py:6503
|
|
4126 |
msgid "Shelve all changes." |
|
4127 |
msgstr "" |
|
4128 |
||
4129 |
#: bzrlib/builtins.py:6505
|
|
4130 |
msgid "Method to use for writing diffs." |
|
4131 |
msgstr "" |
|
4132 |
||
4133 |
#: bzrlib/builtins.py:6505
|
|
4134 |
msgid "writer" |
|
4135 |
msgstr "" |
|
4136 |
||
4137 |
#: bzrlib/builtins.py:6509
|
|
4138 |
msgid "List shelved changes." |
|
4139 |
msgstr "" |
|
4140 |
||
4141 |
#: bzrlib/builtins.py:6511
|
|
4142 |
msgid "Destroy removed changes instead of shelving them." |
|
4143 |
msgstr "" |
|
4144 |
||
4145 |
#: bzrlib/builtins.py:6540
|
|
4146 |
msgid "No shelved changes." |
|
4147 |
msgstr "" |
|
4148 |
||
4149 |
#: bzrlib/builtins.py:6551
|
|
4150 |
msgid "Restore shelved changes." |
|
4151 |
msgstr "" |
|
4152 |
||
4153 |
#: bzrlib/builtins.py:6553
|
|
4154 |
msgid "" |
|
4155 |
"By default, the most recently shelved changes are restored. However if you\n"
|
|
4156 |
"specify a shelf by id those changes will be restored instead. This works\n"
|
|
4157 |
"best when the changes don't depend on each other."
|
|
4158 |
msgstr "" |
|
4159 |
||
4160 |
#: bzrlib/builtins.py:6562
|
|
4161 |
msgid "The action to perform." |
|
4162 |
msgstr "" |
|
4163 |
||
4164 |
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
|
|
4165 |
msgid "action" |
|
4166 |
msgstr "" |
|
4167 |
||
4168 |
#: bzrlib/builtins.py:6564
|
|
4169 |
msgid "Apply changes and remove from the shelf." |
|
4170 |
msgstr "" |
|
4171 |
||
4172 |
#: bzrlib/builtins.py:6565
|
|
4173 |
msgid "Show changes, but do not apply or remove them." |
|
4174 |
msgstr "" |
|
4175 |
||
4176 |
#: bzrlib/builtins.py:6566
|
|
4177 |
msgid "" |
|
4178 |
"Instead of unshelving the changes, show the diff that would result from "
|
|
4179 |
"unshelving."
|
|
4180 |
msgstr "" |
|
4181 |
||
4182 |
#: bzrlib/builtins.py:6568
|
|
4183 |
msgid "Delete changes without applying them." |
|
4184 |
msgstr "" |
|
4185 |
||
4186 |
#: bzrlib/builtins.py:6569
|
|
4187 |
msgid "Apply changes but don't delete them." |
|
4188 |
msgstr "" |
|
4189 |
||
4190 |
#: bzrlib/builtins.py:6584
|
|
4191 |
msgid "Remove unwanted files from working tree." |
|
4192 |
msgstr "" |
|
4193 |
||
4194 |
#: bzrlib/builtins.py:6586
|
|
4195 |
msgid "" |
|
4196 |
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
|
|
4197 |
"files are never deleted."
|
|
4198 |
msgstr "" |
|
4199 |
||
4200 |
#: bzrlib/builtins.py:6589
|
|
4201 |
msgid "" |
|
4202 |
"Another class is 'detritus', which includes files emitted by bzr during\n"
|
|
4203 |
"normal operations and selftests. (The value of these files decreases with\n"
|
|
4204 |
"time.)"
|
|
4205 |
msgstr "" |
|
4206 |
||
4207 |
#: bzrlib/builtins.py:6593
|
|
4208 |
msgid "" |
|
4209 |
"If no options are specified, unknown files are deleted. Otherwise, option\n"
|
|
4210 |
"flags are respected, and may be combined."
|
|
4211 |
msgstr "" |
|
4212 |
||
4213 |
#: bzrlib/builtins.py:6596
|
|
4214 |
msgid "To check what clean-tree will do, use --dry-run." |
|
4215 |
msgstr "" |
|
4216 |
||
4217 |
#: bzrlib/builtins.py:6599
|
|
4218 |
msgid "Delete all ignored files." |
|
4219 |
msgstr "" |
|
4220 |
||
4221 |
#: bzrlib/builtins.py:6600
|
|
4222 |
msgid "" |
|
4223 |
"Delete conflict files, merge and revert backups, and failed selftest dirs."
|
|
4224 |
msgstr "" |
|
4225 |
||
4226 |
#: bzrlib/builtins.py:6603
|
|
4227 |
msgid "Delete files unknown to bzr (default)." |
|
4228 |
msgstr "" |
|
4229 |
||
4230 |
#: bzrlib/builtins.py:6604
|
|
4231 |
msgid "Show files to delete instead of deleting them." |
|
4232 |
msgstr "" |
|
4233 |
||
4234 |
#: bzrlib/builtins.py:6606
|
|
4235 |
msgid "Do not prompt before deleting." |
|
4236 |
msgstr "" |
|
4237 |
||
4238 |
#: bzrlib/bundle/__init__.py:59
|
|
4239 |
msgid "A directory cannot be a bundle" |
|
4240 |
msgstr "" |
|
4241 |
||
4242 |
#: bzrlib/bundle/apply_bundle.py:40
|
|
4243 |
msgid "Install revisions" |
|
4244 |
msgstr "" |
|
4245 |
||
4246 |
#: bzrlib/bundle/commands.py:64
|
|
4247 |
msgid "--verbose requires a merge directive" |
|
4248 |
msgstr "" |
|
4249 |
||
4250 |
#: bzrlib/bundle/commands.py:67
|
|
4251 |
msgid "Bundle format not supported" |
|
4252 |
msgstr "" |
|
4253 |
||
4254 |
#: bzrlib/bundle/commands.py:77
|
|
4255 |
msgid "Records\n" |
|
4256 |
msgstr "" |
|
4257 |
||
4258 |
#: bzrlib/bundle/commands.py:81
|
|
4259 |
msgid "{0}: {1} ({2} multiparent)\n" |
|
4260 |
msgstr "" |
|
4261 |
||
4262 |
#: bzrlib/bundle/commands.py:83
|
|
4263 |
#, python-format
|
|
4264 |
msgid "unique files: %d\n" |
|
4265 |
msgstr "" |
|
4266 |
||
4267 |
#: bzrlib/bundle/commands.py:92
|
|
4268 |
msgid "Revisions\n" |
|
4269 |
msgstr "" |
|
4270 |
||
4271 |
#: bzrlib/bundle/commands.py:93
|
|
4272 |
#, python-format
|
|
4273 |
msgid "nicks: %s\n" |
|
4274 |
msgstr "" |
|
4275 |
||
4276 |
#: bzrlib/bundle/commands.py:95
|
|
4277 |
#, python-format
|
|
4278 |
msgid "" |
|
4279 |
"committers: \n" |
|
4280 |
"%s\n"
|
|
4281 |
msgstr "" |
|
4282 |
||
4283 |
#: bzrlib/bundle/commands.py:103
|
|
4284 |
msgid "Decoded contents\n" |
|
4285 |
msgstr "" |
|
4286 |
||
4287 |
#: bzrlib/bundle/serializer/v4.py:327
|
|
4288 |
#, python-format
|
|
4289 |
msgid "Bundling %d revision." |
|
4290 |
msgid_plural "Bundling %d revisions." |
|
4291 |
msgstr[0] "" |
|
4292 |
msgstr[1] "" |
|
4293 |
||
4294 |
#: bzrlib/bzrdir.py:490
|
|
4295 |
msgid "" |
|
4296 |
"making backup of {0}\n"
|
|
4297 |
" to {1}"
|
|
4298 |
msgstr "" |
|
4299 |
||
4300 |
#: bzrlib/bzrdir.py:513
|
|
4301 |
msgid "renamed {0} to {1}" |
|
4302 |
msgstr "" |
|
4303 |
||
4304 |
#: bzrlib/bzrdir.py:1652
|
|
4305 |
#, python-format
|
|
4306 |
msgid "" |
|
4307 |
"Source repository format does not support stacking, using format:\n"
|
|
4308 |
" %s"
|
|
4309 |
msgstr "" |
|
4310 |
||
4311 |
#: bzrlib/bzrdir.py:1672
|
|
4312 |
#, python-format
|
|
4313 |
msgid "" |
|
4314 |
"Source branch format does not support stacking, using format:\n"
|
|
4315 |
" %s"
|
|
4316 |
msgstr "" |
|
4317 |
||
4318 |
#: bzrlib/bzrdir.py:1818
|
|
4319 |
msgid "starting repository conversion" |
|
4320 |
msgstr "" |
|
4321 |
||
4322 |
#: bzrlib/bzrdir.py:2039
|
|
4323 |
msgid "Using default stacking branch {0} at {1}" |
|
4324 |
msgstr "" |
|
4325 |
||
4326 |
#: bzrlib/check.py:108
|
|
4327 |
msgid "check" |
|
4328 |
msgstr "" |
|
4329 |
||
4330 |
#: bzrlib/check.py:110
|
|
4331 |
msgid "checking revisions" |
|
4332 |
msgstr "" |
|
4333 |
||
4334 |
#: bzrlib/check.py:112
|
|
4335 |
msgid "checking commit contents" |
|
4336 |
msgstr "" |
|
4337 |
||
4338 |
#: bzrlib/check.py:114
|
|
4339 |
msgid "checking file graphs" |
|
4340 |
msgstr "" |
|
4341 |
||
4342 |
#: bzrlib/check.py:118
|
|
4343 |
msgid "checking branches and trees" |
|
4344 |
msgstr "" |
|
4345 |
||
4346 |
#: bzrlib/check.py:205
|
|
4347 |
msgid "checked repository {0} format {1}" |
|
4348 |
msgstr "" |
|
4349 |
||
4350 |
#: bzrlib/check.py:208
|
|
4351 |
#, python-format
|
|
4352 |
msgid "%6d revisions" |
|
4353 |
msgstr "" |
|
4354 |
||
4355 |
#: bzrlib/check.py:209
|
|
4356 |
#, python-format
|
|
4357 |
msgid "%6d file-ids" |
|
4358 |
msgstr "" |
|
4359 |
||
4360 |
#: bzrlib/check.py:211
|
|
4361 |
#, python-format
|
|
4362 |
msgid "%6d unreferenced text versions" |
|
4363 |
msgstr "" |
|
4364 |
||
4365 |
#: bzrlib/check.py:215
|
|
4366 |
msgid "unreferenced version: {{{0}}} in {1}" |
|
4367 |
msgstr "" |
|
4368 |
||
4369 |
#: bzrlib/check.py:218
|
|
4370 |
#, python-format
|
|
4371 |
msgid "%6d revisions are missing inventory_sha1" |
|
4372 |
msgstr "" |
|
4373 |
||
4374 |
#: bzrlib/check.py:221
|
|
4375 |
#, python-format
|
|
4376 |
msgid "%6d revisions are mentioned but not present" |
|
4377 |
msgstr "" |
|
4378 |
||
4379 |
#: bzrlib/check.py:224
|
|
4380 |
#, python-format
|
|
4381 |
msgid "%6d ghost revisions" |
|
4382 |
msgstr "" |
|
4383 |
||
4384 |
#: bzrlib/check.py:229
|
|
4385 |
#, python-format
|
|
4386 |
msgid "%6d revisions missing parents in ancestry" |
|
4387 |
msgstr "" |
|
4388 |
||
4389 |
#: bzrlib/check.py:233
|
|
4390 |
#, python-format
|
|
4391 |
msgid " %s should be in the ancestry for:" |
|
4392 |
msgstr "" |
|
4393 |
||
4394 |
#: bzrlib/check.py:237
|
|
4395 |
#, python-format
|
|
4396 |
msgid "%6d inconsistent parents" |
|
4397 |
msgstr "" |
|
4398 |
||
4399 |
#: bzrlib/check.py:241
|
|
4400 |
msgid " * {0} version {1} has parents {2!r} but should have {3!r}" |
|
4401 |
msgstr "" |
|
4402 |
||
4403 |
#: bzrlib/check.py:247
|
|
4404 |
#, python-format
|
|
4405 |
msgid "%6d revisions have incorrect parents in the revision index" |
|
4406 |
msgstr "" |
|
4407 |
||
4408 |
#: bzrlib/check.py:253
|
|
4409 |
msgid " {0} has wrong parents in index: {1!r} should be {2!r}" |
|
4410 |
msgstr "" |
|
4411 |
||
4412 |
#: bzrlib/check.py:267
|
|
4413 |
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}" |
|
4414 |
msgstr "" |
|
4415 |
||
4416 |
#: bzrlib/check.py:296
|
|
4417 |
msgid "" |
|
4418 |
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
|
|
4419 |
"{{{4}}}"
|
|
4420 |
msgstr "" |
|
4421 |
||
4422 |
#: bzrlib/check.py:354
|
|
4423 |
#, python-format
|
|
4424 |
msgid "Checking branch at '%s'." |
|
4425 |
msgstr "" |
|
4426 |
||
4427 |
#: bzrlib/check.py:374
|
|
4428 |
#, python-format
|
|
4429 |
msgid "Checking working tree at '%s'." |
|
4430 |
msgstr "" |
|
4431 |
||
4432 |
#: bzrlib/check.py:427 bzrlib/check.py:441
|
|
4433 |
msgid "No branch found at specified location." |
|
4434 |
msgstr "" |
|
4435 |
||
4436 |
#: bzrlib/check.py:429 bzrlib/check.py:439
|
|
4437 |
msgid "No working tree found at specified location." |
|
4438 |
msgstr "" |
|
4439 |
||
4440 |
#: bzrlib/check.py:432
|
|
4441 |
#, python-format
|
|
4442 |
msgid "Checking repository at '%s'." |
|
4443 |
msgstr "" |
|
4444 |
||
4445 |
#: bzrlib/check.py:443
|
|
4446 |
msgid "No repository found at specified location." |
|
4447 |
msgstr "" |
|
4448 |
||
4449 |
#: bzrlib/clean_tree.py:63
|
|
4450 |
msgid "Nothing to delete." |
|
4451 |
msgstr "" |
|
4452 |
||
4453 |
#: bzrlib/clean_tree.py:68
|
|
4454 |
msgid "Are you sure you wish to delete these" |
|
4455 |
msgstr "" |
|
4456 |
||
4457 |
#: bzrlib/clean_tree.py:70
|
|
4458 |
msgid "Canceled" |
|
4459 |
msgstr "" |
|
4460 |
||
4461 |
#: bzrlib/clean_tree.py:107
|
|
4462 |
#, python-format
|
|
4463 |
msgid "unable to remove %s" |
|
4464 |
msgstr "" |
|
4465 |
||
4466 |
#: bzrlib/clean_tree.py:111
|
|
4467 |
msgid "deleting paths:" |
|
4468 |
msgstr "" |
|
4469 |
||
4470 |
#: bzrlib/clean_tree.py:125
|
|
4471 |
msgid "unable to remove \"{0}\": {1}." |
|
4472 |
msgstr "" |
|
4473 |
||
4474 |
#: bzrlib/clean_tree.py:130
|
|
4475 |
msgid "No files deleted." |
|
4476 |
msgstr "" |
|
4477 |
||
4478 |
#: bzrlib/cmd_version_info.py:47
|
|
4479 |
msgid "No known version info format {0}. Supported types are: {1}" |
|
4480 |
msgstr "" |
|
4481 |
||
4482 |
#: bzrlib/cmd_version_info.py:52
|
|
4483 |
msgid "Version info in Custom template-based format." |
|
4484 |
msgstr "" |
|
4485 |
||
4486 |
#: bzrlib/cmd_version_info.py:52
|
|
4487 |
msgid "Version info in Python format." |
|
4488 |
msgstr "" |
|
4489 |
||
4490 |
#: bzrlib/cmd_version_info.py:52
|
|
4491 |
msgid "Version info in RIO (simple text) format (default)." |
|
4492 |
msgstr "" |
|
4493 |
||
4494 |
#: bzrlib/cmd_version_info.py:53
|
|
4495 |
msgid "Show version information about this tree." |
|
4496 |
msgstr "" |
|
4497 |
||
4498 |
#: bzrlib/cmd_version_info.py:55
|
|
4499 |
msgid "" |
|
4500 |
"You can use this command to add information about version into\n"
|
|
4501 |
"source code of an application. The output can be in one of the\n"
|
|
4502 |
"supported formats or in a custom format based on a template."
|
|
4503 |
msgstr "" |
|
4504 |
||
4505 |
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
|
|
4506 |
#: en/help_topics/configuration.txt:710
|
|
4507 |
msgid "For example::" |
|
4508 |
msgstr "" |
|
4509 |
||
4510 |
#: bzrlib/cmd_version_info.py:61
|
|
4511 |
msgid "" |
|
4512 |
" bzr version-info --custom \\\n"
|
|
4513 |
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
|
|
4514 |
msgstr "" |
|
4515 |
||
4516 |
#: bzrlib/cmd_version_info.py:64
|
|
4517 |
msgid "" |
|
4518 |
"will produce a C header file with formatted string containing the\n"
|
|
4519 |
"current revision number. Other supported variables in templates are:"
|
|
4520 |
msgstr "" |
|
4521 |
||
4522 |
#: bzrlib/cmd_version_info.py:67
|
|
4523 |
msgid "" |
|
4524 |
" * {date} - date of the last revision\n"
|
|
4525 |
" * {build_date} - current date\n"
|
|
4526 |
" * {revno} - revision number\n"
|
|
4527 |
" * {revision_id} - revision id\n"
|
|
4528 |
" * {branch_nick} - branch nickname\n"
|
|
4529 |
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
|
|
4530 |
" otherwise 1"
|
|
4531 |
msgstr "" |
|
4532 |
||
4533 |
#: bzrlib/cmd_version_info.py:77
|
|
4534 |
msgid "Select the output format." |
|
4535 |
msgstr "" |
|
4536 |
||
4537 |
#: bzrlib/cmd_version_info.py:81
|
|
4538 |
msgid "Include all possible information." |
|
4539 |
msgstr "" |
|
4540 |
||
4541 |
#: bzrlib/cmd_version_info.py:82
|
|
4542 |
msgid "Check if tree is clean." |
|
4543 |
msgstr "" |
|
4544 |
||
4545 |
#: bzrlib/cmd_version_info.py:84
|
|
4546 |
msgid "Include the revision-history." |
|
4547 |
msgstr "" |
|
4548 |
||
4549 |
#: bzrlib/cmd_version_info.py:86
|
|
4550 |
msgid "Include the last revision for each file." |
|
4551 |
msgstr "" |
|
4552 |
||
4553 |
#: bzrlib/cmd_version_info.py:87
|
|
4554 |
msgid "Template for the output." |
|
4555 |
msgstr "" |
|
4556 |
||
4557 |
#: bzrlib/cmd_version_info.py:101
|
|
4558 |
msgid "bzr version-info --revision takes exactly one revision specifier" |
|
4559 |
msgstr "" |
|
4560 |
||
4561 |
#: bzrlib/commands.py:229
|
|
4562 |
#, python-format
|
|
4563 |
msgid "unknown command \"%s\"" |
|
4564 |
msgstr "" |
|
4565 |
||
4566 |
#: bzrlib/commands.py:476
|
|
4567 |
msgid "No help for this command." |
|
4568 |
msgstr "" |
|
4569 |
||
4570 |
#: bzrlib/commands.py:489
|
|
4571 |
#, python-format
|
|
4572 |
msgid ":Purpose: %s\n" |
|
4573 |
msgstr "" |
|
4574 |
||
4575 |
#: bzrlib/commands.py:491
|
|
4576 |
#, python-format
|
|
4577 |
msgid "" |
|
4578 |
":Usage:\n"
|
|
4579 |
"%s\n"
|
|
4580 |
msgstr "" |
|
4581 |
||
4582 |
#: bzrlib/commands.py:493
|
|
4583 |
#, python-format
|
|
4584 |
msgid ":Usage: %s\n" |
|
4585 |
msgstr "" |
|
4586 |
||
4587 |
#: bzrlib/commands.py:512
|
|
4588 |
#, python-format
|
|
4589 |
msgid ":Options:%s" |
|
4590 |
msgstr "" |
|
4591 |
||
4592 |
#: bzrlib/commands.py:523
|
|
4593 |
#, python-format
|
|
4594 |
msgid "" |
|
4595 |
":Description:\n"
|
|
4596 |
" %s\n"
|
|
4597 |
"\n"
|
|
4598 |
msgstr "" |
|
4599 |
||
4600 |
#: bzrlib/commands.py:533
|
|
4601 |
#, python-format
|
|
4602 |
msgid "" |
|
4603 |
"See bzr help %s for more details and examples.\n"
|
|
4604 |
"\n"
|
|
4605 |
msgstr "" |
|
4606 |
||
4607 |
#: bzrlib/commands.py:538
|
|
4608 |
msgid ":Aliases: " |
|
4609 |
msgstr "" |
|
4610 |
||
4611 |
#: bzrlib/commands.py:542
|
|
4612 |
#, python-format
|
|
4613 |
msgid ":From: plugin \"%s\"\n" |
|
4614 |
msgstr "" |
|
4615 |
||
4616 |
#: bzrlib/commands.py:554
|
|
4617 |
msgid ":doc:`{0} <{1}-help>`" |
|
4618 |
msgstr "" |
|
4619 |
||
4620 |
#: bzrlib/commands.py:558
|
|
4621 |
#, python-format
|
|
4622 |
msgid ":See also: %s" |
|
4623 |
msgstr "" |
|
4624 |
||
4625 |
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
|
|
4626 |
msgid "Only ASCII permitted in option names" |
|
4627 |
msgstr "" |
|
4628 |
||
4629 |
#: bzrlib/commands.py:841 bzrlib/commands.py:849
|
|
4630 |
msgid "command {0!r} needs one or more {1}" |
|
4631 |
msgstr "" |
|
4632 |
||
4633 |
#: bzrlib/commands.py:858
|
|
4634 |
msgid "command {0!r} requires argument {1}" |
|
4635 |
msgstr "" |
|
4636 |
||
4637 |
#: bzrlib/commands.py:865
|
|
4638 |
msgid "extra argument to command {0}: {1}" |
|
4639 |
msgstr "" |
|
4640 |
||
4641 |
#: bzrlib/commands.py:962
|
|
4642 |
#, python-format
|
|
4643 |
msgid "Profile data written to \"%s\"." |
|
4644 |
msgstr "" |
|
4645 |
||
4646 |
#: bzrlib/commit.py:117 bzrlib/commit.py:740
|
|
4647 |
msgid "added" |
|
4648 |
msgstr "" |
|
4649 |
||
4650 |
#: bzrlib/commit.py:117 bzrlib/commit.py:748
|
|
4651 |
msgid "modified" |
|
4652 |
msgstr "" |
|
4653 |
||
4654 |
#: bzrlib/commit.py:131
|
|
4655 |
#, python-format
|
|
4656 |
msgid "Committing%s" |
|
4657 |
msgstr "" |
|
4658 |
||
4659 |
#: bzrlib/commit.py:134
|
|
4660 |
#, python-format
|
|
4661 |
msgid "Committed revision %d." |
|
4662 |
msgstr "" |
|
4663 |
||
4664 |
#: bzrlib/commit.py:143
|
|
4665 |
#, python-format
|
|
4666 |
msgid "deleted %s" |
|
4667 |
msgstr "" |
|
4668 |
||
4669 |
#: bzrlib/commit.py:146
|
|
4670 |
#, python-format
|
|
4671 |
msgid "missing %s" |
|
4672 |
msgstr "" |
|
4673 |
||
4674 |
#: bzrlib/commit.py:511
|
|
4675 |
msgid "" |
|
4676 |
"Conflicting tags in bound branch:\n"
|
|
4677 |
"{0}"
|
|
4678 |
msgstr "" |
|
4679 |
||
4680 |
#: bzrlib/commit.py:742
|
|
4681 |
msgid "renamed" |
|
4682 |
msgstr "" |
|
4683 |
||
4684 |
#: bzrlib/commit.py:977
|
|
4685 |
msgid "unchanged" |
|
4686 |
msgstr "" |
|
4687 |
||
4688 |
#: bzrlib/commit.py:999
|
|
4689 |
msgid "{0} [{1}] - Stage" |
|
4690 |
msgstr "" |
|
4691 |
||
4692 |
#: bzrlib/commit.py:1002
|
|
4693 |
#, python-format
|
|
4694 |
msgid "%s - Stage" |
|
4695 |
msgstr "" |
|
4696 |
||
4697 |
#: bzrlib/commit_signature_commands.py:36
|
|
4698 |
msgid "Sign all commits by a given committer." |
|
4699 |
msgstr "" |
|
4700 |
||
4701 |
#: bzrlib/commit_signature_commands.py:38
|
|
4702 |
msgid "" |
|
4703 |
"If location is not specified the local tree is used.\n"
|
|
4704 |
"If committer is not specified the default committer is used."
|
|
4705 |
msgstr "" |
|
4706 |
||
4707 |
#: bzrlib/commit_signature_commands.py:41
|
|
4708 |
msgid "This does not sign commits that already have signatures." |
|
4709 |
msgstr "" |
|
4710 |
||
4711 |
#: bzrlib/commit_signature_commands.py:49
|
|
4712 |
msgid "" |
|
4713 |
"Don't actually sign anything, just print the revisions that would be signed."
|
|
4714 |
msgstr "" |
|
4715 |
||
4716 |
#: bzrlib/commit_signature_commands.py:103
|
|
4717 |
msgid "Verify all commit signatures." |
|
4718 |
msgstr "" |
|
4719 |
||
4720 |
#: bzrlib/commit_signature_commands.py:105
|
|
4721 |
msgid "" |
|
4722 |
"Verifies that all commits in the branch are signed by known GnuPG keys."
|
|
4723 |
msgstr "" |
|
4724 |
||
4725 |
#: bzrlib/commit_signature_commands.py:110
|
|
4726 |
msgid "" |
|
4727 |
"Comma separated list of GPG key patterns which are acceptable for "
|
|
4728 |
"verification."
|
|
4729 |
msgstr "" |
|
4730 |
||
4731 |
#: bzrlib/commit_signature_commands.py:147
|
|
4732 |
msgid "Cannot verify a range of non-revision-history revisions" |
|
4733 |
msgstr "" |
|
4734 |
||
4735 |
#: bzrlib/commit_signature_commands.py:168
|
|
4736 |
msgid "All commits signed with verifiable keys" |
|
4737 |
msgstr "" |
|
4738 |
||
4739 |
#: bzrlib/config.py:475
|
|
4740 |
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit." |
|
4741 |
msgstr "" |
|
4742 |
||
4743 |
#: bzrlib/config.py:2485
|
|
4744 |
msgid "{0} is not an SI unit." |
|
4745 |
msgstr "" |
|
4746 |
||
4747 |
#: bzrlib/config.py:2949
|
|
4748 |
msgid "" |
|
4749 |
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
|
|
4750 |
"will be saved."
|
|
4751 |
msgstr "" |
|
4752 |
||
4753 |
#: bzrlib/config.py:3093
|
|
4754 |
#, python-format
|
|
4755 |
msgid "Invalid '%s', should be of the form 'name=value'" |
|
4756 |
msgstr "" |
|
4757 |
||
4758 |
#: bzrlib/config.py:3962
|
|
4759 |
msgid "Display, set or remove a configuration option." |
|
4760 |
msgstr "" |
|
4761 |
||
4762 |
#: bzrlib/config.py:3964
|
|
4763 |
msgid "Display the active value for a given option." |
|
4764 |
msgstr "" |
|
4765 |
||
4766 |
#: bzrlib/config.py:3966
|
|
4767 |
msgid "" |
|
4768 |
"If --all is specified, NAME is interpreted as a regular expression and all\n"
|
|
4769 |
"matching options are displayed mentioning their scope. The active value\n"
|
|
4770 |
"that bzr will take into account is the first one displayed for each option."
|
|
4771 |
msgstr "" |
|
4772 |
||
4773 |
#: bzrlib/config.py:3970
|
|
4774 |
msgid "If no NAME is given, --all .* is implied." |
|
4775 |
msgstr "" |
|
4776 |
||
4777 |
#: bzrlib/config.py:3972
|
|
4778 |
msgid "" |
|
4779 |
"Setting a value is achieved by using name=value without spaces. The value\n"
|
|
4780 |
"is set in the most relevant scope and can be checked by displaying the\n"
|
|
4781 |
"option again."
|
|
4782 |
msgstr "" |
|
4783 |
||
4784 |
#: bzrlib/config.py:3984
|
|
4785 |
msgid "Reduce the scope to the specified configuration file." |
|
4786 |
msgstr "" |
|
4787 |
||
4788 |
#: bzrlib/config.py:3988
|
|
4789 |
msgid "Display all the defined values for the matching options." |
|
4790 |
msgstr "" |
|
4791 |
||
4792 |
#: bzrlib/config.py:3990
|
|
4793 |
msgid "Remove the option from the configuration file." |
|
4794 |
msgstr "" |
|
4795 |
||
4796 |
#: bzrlib/conflicts.py:50
|
|
4797 |
msgid "List files with conflicts." |
|
4798 |
msgstr "" |
|
4799 |
||
4800 |
#: bzrlib/conflicts.py:57
|
|
4801 |
msgid "" |
|
4802 |
"Conflicts normally are listed as short, human-readable messages. If --text\n"
|
|
4803 |
"is supplied, the pathnames of files with text conflicts are listed,\n"
|
|
4804 |
"instead. (This is useful for editing all files with text conflicts.)"
|
|
4805 |
msgstr "" |
|
4806 |
||
4807 |
#: bzrlib/conflicts.py:61
|
|
4808 |
msgid "Use bzr resolve when you have fixed a problem." |
|
4809 |
msgstr "" |
|
4810 |
||
4811 |
#: bzrlib/conflicts.py:66
|
|
4812 |
msgid "List paths of files with text conflicts." |
|
4813 |
msgstr "" |
|
4814 |
||
4815 |
#: bzrlib/conflicts.py:85
|
|
4816 |
msgid "Marks the conflict as resolved." |
|
4817 |
msgstr "" |
|
4818 |
||
4819 |
#: bzrlib/conflicts.py:88
|
|
4820 |
msgid "Resolve the conflict preserving the version in the working tree." |
|
4821 |
msgstr "" |
|
4822 |
||
4823 |
#: bzrlib/conflicts.py:91
|
|
4824 |
msgid "Resolve the conflict taking the merged version into account." |
|
4825 |
msgstr "" |
|
4826 |
||
4827 |
#: bzrlib/conflicts.py:98
|
|
4828 |
msgid "How to resolve the conflict." |
|
4829 |
msgstr "" |
|
4830 |
||
4831 |
#: bzrlib/conflicts.py:104
|
|
4832 |
msgid "Mark a conflict as resolved." |
|
4833 |
msgstr "" |
|
4834 |
||
4835 |
#: bzrlib/conflicts.py:111
|
|
4836 |
msgid "" |
|
4837 |
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
|
|
4838 |
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
|
|
4839 |
"as\n"
|
|
4840 |
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
|
|
4841 |
msgstr "" |
|
4842 |
||
4843 |
#: bzrlib/conflicts.py:119
|
|
4844 |
msgid "Resolve all conflicts in this tree." |
|
4845 |
msgstr "" |
|
4846 |
||
4847 |
#: bzrlib/conflicts.py:126
|
|
4848 |
msgid "If --all is specified, no FILE may be provided" |
|
4849 |
msgstr "" |
|
4850 |
||
4851 |
#: bzrlib/conflicts.py:151
|
|
4852 |
#, python-format
|
|
4853 |
msgid "%d conflict auto-resolved." |
|
4854 |
msgid_plural "%d conflicts auto-resolved." |
|
4855 |
msgstr[0] "" |
|
4856 |
msgstr[1] "" |
|
4857 |
||
4858 |
#: bzrlib/conflicts.py:154
|
|
4859 |
msgid "Remaining conflicts:" |
|
4860 |
msgstr "" |
|
4861 |
||
4862 |
#: bzrlib/conflicts.py:159
|
|
4863 |
msgid "All conflicts resolved." |
|
4864 |
msgstr "" |
|
4865 |
||
4866 |
#: bzrlib/conflicts.py:168
|
|
4867 |
msgid "{0} conflict resolved, {1} remaining" |
|
4868 |
msgid_plural "{0} conflicts resolved, {1} remaining" |
|
4869 |
msgstr[0] "" |
|
4870 |
msgstr[1] "" |
|
4871 |
||
4872 |
#: bzrlib/controldir.py:710
|
|
4873 |
msgid "{0} is{1} redirected to {2}" |
|
4874 |
msgstr "" |
|
4875 |
||
4876 |
#: bzrlib/diff.py:399
|
|
4877 |
#, python-format
|
|
4878 |
msgid "*** Ignoring files outside view. View is %s" |
|
4879 |
msgstr "" |
|
4880 |
||
4881 |
#: bzrlib/errors.py:157
|
|
4882 |
msgid "The tree builder is already building a tree." |
|
4883 |
msgstr "" |
|
4884 |
||
4885 |
#: bzrlib/errors.py:178
|
|
4886 |
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s" |
|
4887 |
msgstr "" |
|
4888 |
||
4889 |
#: bzrlib/errors.py:197
|
|
4890 |
msgid "" |
|
4891 |
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
|
|
4892 |
"versions \"%(minimum)s\" to \"%(current)s\"."
|
|
4893 |
msgstr "" |
|
4894 |
||
4895 |
#: bzrlib/errors.py:209
|
|
4896 |
msgid "The transport '%(transport)s' is only accessible within this process." |
|
4897 |
msgstr "" |
|
4898 |
||
4899 |
#: bzrlib/errors.py:227
|
|
4900 |
msgid "Invalid revision number %(revno)s" |
|
4901 |
msgstr "" |
|
4902 |
||
4903 |
#: bzrlib/errors.py:236
|
|
4904 |
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s" |
|
4905 |
msgstr "" |
|
4906 |
||
4907 |
#: bzrlib/errors.py:247
|
|
4908 |
msgid "Reserved revision-id {%(revision_id)s}" |
|
4909 |
msgstr "" |
|
4910 |
||
4911 |
#: bzrlib/errors.py:261
|
|
4912 |
msgid "There is no public branch set for \"%(branch_url)s\"." |
|
4913 |
msgstr "" |
|
4914 |
||
4915 |
#: bzrlib/errors.py:271
|
|
4916 |
msgid "" |
|
4917 |
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
|
|
4918 |
"obtain a list of topics."
|
|
4919 |
msgstr "" |
|
4920 |
||
4921 |
#: bzrlib/errors.py:280
|
|
4922 |
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s." |
|
4923 |
msgstr "" |
|
4924 |
||
4925 |
#: bzrlib/errors.py:290
|
|
4926 |
msgid "" |
|
4927 |
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
|
|
4928 |
msgstr "" |
|
4929 |
||
4930 |
#: bzrlib/errors.py:299
|
|
4931 |
msgid "The branch '%(branch)s' is not stacked." |
|
4932 |
msgstr "" |
|
4933 |
||
4934 |
#: bzrlib/errors.py:313
|
|
4935 |
msgid "No WorkingTree exists for \"%(base)s\"." |
|
4936 |
msgstr "" |
|
4937 |
||
4938 |
#: bzrlib/errors.py:322
|
|
4939 |
msgid "Not currently building a tree." |
|
4940 |
msgstr "" |
|
4941 |
||
4942 |
#: bzrlib/errors.py:327
|
|
4943 |
msgid "%(url)s is not a local path." |
|
4944 |
msgstr "" |
|
4945 |
||
4946 |
#: bzrlib/errors.py:355
|
|
4947 |
msgid "%(not_locked)r is not write locked but needs to be." |
|
4948 |
msgstr "" |
|
4949 |
||
4950 |
#: bzrlib/errors.py:363
|
|
4951 |
msgid "Error in command line options" |
|
4952 |
msgstr "" |
|
4953 |
||
4954 |
#: bzrlib/errors.py:368
|
|
4955 |
msgid "%(value)s is not an index of type %(_type)s." |
|
4956 |
msgstr "" |
|
4957 |
||
4958 |
#: bzrlib/errors.py:378
|
|
4959 |
msgid "Error in data for index %(value)s." |
|
4960 |
msgstr "" |
|
4961 |
||
4962 |
#: bzrlib/errors.py:387
|
|
4963 |
msgid "The key '%(key)s' is already in index '%(index)s'." |
|
4964 |
msgstr "" |
|
4965 |
||
4966 |
#: bzrlib/errors.py:397
|
|
4967 |
msgid "The key '%(key)s' is not a valid key." |
|
4968 |
msgstr "" |
|
4969 |
||
4970 |
#: bzrlib/errors.py:406
|
|
4971 |
msgid "Could not parse options for index %(value)s." |
|
4972 |
msgstr "" |
|
4973 |
||
4974 |
#: bzrlib/errors.py:415
|
|
4975 |
msgid "The value '%(value)s' is not a valid value." |
|
4976 |
msgstr "" |
|
4977 |
||
4978 |
#: bzrlib/errors.py:424
|
|
4979 |
msgid "Bad value \"%(value)s\" for option \"%(name)s\"." |
|
4980 |
msgstr "" |
|
4981 |
||
4982 |
#: bzrlib/errors.py:443
|
|
4983 |
msgid "Generic path error: %(path)r%(extra)s)" |
|
4984 |
msgstr "" |
|
4985 |
||
4986 |
#: bzrlib/errors.py:456
|
|
4987 |
msgid "No such file: %(path)r%(extra)s" |
|
4988 |
msgstr "" |
|
4989 |
||
4990 |
#: bzrlib/errors.py:461
|
|
4991 |
msgid "File exists: %(path)r%(extra)s" |
|
4992 |
msgstr "" |
|
4993 |
||
4994 |
#: bzrlib/errors.py:467
|
|
4995 |
msgid "" |
|
4996 |
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
|
|
4997 |
"after to tell bzr about a rename that has already happened)%(extra)s"
|
|
4998 |
msgstr "" |
|
4999 |
||
5000 |
#: bzrlib/errors.py:483
|
|
5001 |
msgid "\"%(path)s\" is not a directory %(extra)s" |
|
5002 |
msgstr "" |
|
5003 |
||
5004 |
#: bzrlib/errors.py:488
|
|
5005 |
msgid "\"%(path)s\" is not in the working directory %(extra)s" |
|
5006 |
msgstr "" |
|
5007 |
||
5008 |
#: bzrlib/errors.py:493
|
|
5009 |
msgid "Directory not empty: \"%(path)s\"%(extra)s" |
|
5010 |
msgstr "" |
|
5011 |
||
5012 |
#: bzrlib/errors.py:498
|
|
5013 |
msgid "Hard-linking \"%(path)s\" is not supported" |
|
5014 |
msgstr "" |
|
5015 |
||
5016 |
#: bzrlib/errors.py:513
|
|
5017 |
msgid "Device or resource busy: \"%(path)s\"%(extra)s" |
|
5018 |
msgstr "" |
|
5019 |
||
5020 |
#: bzrlib/errors.py:518
|
|
5021 |
msgid "Permission denied: \"%(path)s\"%(extra)s" |
|
5022 |
msgstr "" |
|
5023 |
||
5024 |
#: bzrlib/errors.py:523
|
|
5025 |
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s" |
|
5026 |
msgstr "" |
|
5027 |
||
5028 |
#: bzrlib/errors.py:528
|
|
5029 |
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r" |
|
5030 |
msgstr "" |
|
5031 |
||
5032 |
#: bzrlib/errors.py:539
|
|
5033 |
msgid "URLs differ by more than path: %(from_)r and %(to)r" |
|
5034 |
msgstr "" |
|
5035 |
||
5036 |
#: bzrlib/errors.py:561
|
|
5037 |
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib." |
|
5038 |
msgstr "" |
|
5039 |
||
5040 |
#: bzrlib/errors.py:571
|
|
5041 |
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s" |
|
5042 |
msgstr "" |
|
5043 |
||
5044 |
#: bzrlib/errors.py:579
|
|
5045 |
msgid "" |
|
5046 |
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
|
|
5047 |
"upgrade the branch to permit branch stacking."
|
|
5048 |
msgstr "" |
|
5049 |
||
5050 |
#: bzrlib/errors.py:590
|
|
5051 |
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'." |
|
5052 |
msgstr "" |
|
5053 |
||
5054 |
#: bzrlib/errors.py:600
|
|
5055 |
msgid "" |
|
5056 |
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
|
|
5057 |
"need to upgrade the repository to permit branch stacking."
|
|
5058 |
msgstr "" |
|
5059 |
||
5060 |
#: bzrlib/errors.py:611
|
|
5061 |
msgid "Error reading from %(path)r." |
|
5062 |
msgstr "" |
|
5063 |
||
5064 |
#: bzrlib/errors.py:630
|
|
5065 |
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s" |
|
5066 |
msgstr "" |
|
5067 |
||
5068 |
#: bzrlib/errors.py:646
|
|
5069 |
msgid "Path \"%(path)s\" is not unicode normalized" |
|
5070 |
msgstr "" |
|
5071 |
||
5072 |
#: bzrlib/errors.py:654
|
|
5073 |
msgid "Not a branch: \"%(path)s\"%(detail)s." |
|
5074 |
msgstr "" |
|
5075 |
||
5076 |
#: bzrlib/errors.py:696
|
|
5077 |
msgid "No submit branch available for branch \"%(path)s\"" |
|
5078 |
msgstr "" |
|
5079 |
||
5080 |
#: bzrlib/errors.py:705
|
|
5081 |
msgid "A control directory already exists: \"%(path)s\"." |
|
5082 |
msgstr "" |
|
5083 |
||
5084 |
#: bzrlib/errors.py:710
|
|
5085 |
msgid "Already a branch: \"%(path)s\"." |
|
5086 |
msgstr "" |
|
5087 |
||
5088 |
#: bzrlib/errors.py:715
|
|
5089 |
msgid "Parent branch already exists: \"%(path)s\"." |
|
5090 |
msgstr "" |
|
5091 |
||
5092 |
#: bzrlib/errors.py:721
|
|
5093 |
msgid "" |
|
5094 |
"Directory contains a branch, but no working tree (use bzr checkout if you "
|
|
5095 |
"wish to build a working tree): \"%(path)s\""
|
|
5096 |
msgstr "" |
|
5097 |
||
5098 |
#: bzrlib/errors.py:726
|
|
5099 |
msgid "" |
|
5100 |
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
|
|
5101 |
msgstr "" |
|
5102 |
||
5103 |
#: bzrlib/errors.py:736
|
|
5104 |
msgid "" |
|
5105 |
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
|
|
5106 |
msgstr "" |
|
5107 |
||
5108 |
#: bzrlib/errors.py:746
|
|
5109 |
msgid "No repository present: \"%(path)s\"" |
|
5110 |
msgstr "" |
|
5111 |
||
5112 |
#: bzrlib/errors.py:753
|
|
5113 |
msgid "" |
|
5114 |
"Unsupported branch format: %(format)s\n"
|
|
5115 |
"Please run 'bzr upgrade'"
|
|
5116 |
msgstr "" |
|
5117 |
||
5118 |
#: bzrlib/errors.py:759
|
|
5119 |
msgid "Unknown %(kind)s format: %(format)r" |
|
5120 |
msgstr "" |
|
5121 |
||
5122 |
#: bzrlib/errors.py:768
|
|
5123 |
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s." |
|
5124 |
msgstr "" |
|
5125 |
||
5126 |
#: bzrlib/errors.py:778
|
|
5127 |
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s" |
|
5128 |
msgstr "" |
|
5129 |
||
5130 |
#: bzrlib/errors.py:793
|
|
5131 |
msgid "" |
|
5132 |
"%(target)s\n"
|
|
5133 |
"is not compatible with\n"
|
|
5134 |
"%(source)s\n"
|
|
5135 |
"%(details)s"
|
|
5136 |
msgstr "" |
|
5137 |
||
5138 |
#: bzrlib/errors.py:809
|
|
5139 |
msgid "Revision is not compatible with %(repo_format)s" |
|
5140 |
msgstr "" |
|
5141 |
||
5142 |
#: bzrlib/errors.py:819
|
|
5143 |
msgid "%(context_info)s%(path)s is already versioned." |
|
5144 |
msgstr "" |
|
5145 |
||
5146 |
#: bzrlib/errors.py:840
|
|
5147 |
msgid "%(context_info)s%(path)s is not versioned." |
|
5148 |
msgstr "" |
|
5149 |
||
5150 |
#: bzrlib/errors.py:861
|
|
5151 |
msgid "Path(s) are not versioned: %(paths_as_string)s" |
|
5152 |
msgstr "" |
|
5153 |
||
5154 |
#: bzrlib/errors.py:872
|
|
5155 |
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s" |
|
5156 |
msgstr "" |
|
5157 |
||
5158 |
#: bzrlib/errors.py:891
|
|
5159 |
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\"" |
|
5160 |
msgstr "" |
|
5161 |
||
5162 |
#: bzrlib/errors.py:899
|
|
5163 |
msgid "" |
|
5164 |
"Filename %(filename)r is not valid in your current filesystem encoding "
|
|
5165 |
"%(fs_encoding)s"
|
|
5166 |
msgstr "" |
|
5167 |
||
5168 |
#: bzrlib/errors.py:910
|
|
5169 |
msgid "Cannot operate on \"%(filename)s\" because it is a control file" |
|
5170 |
msgstr "" |
|
5171 |
||
5172 |
#: bzrlib/errors.py:928
|
|
5173 |
msgid "The lock for '%(lock_description)s' is in use and cannot be broken." |
|
5174 |
msgstr "" |
|
5175 |
||
5176 |
#: bzrlib/errors.py:967
|
|
5177 |
msgid "Cannot lock %(lock)s: %(why)s" |
|
5178 |
msgstr "" |
|
5179 |
||
5180 |
#: bzrlib/errors.py:977
|
|
5181 |
msgid "" |
|
5182 |
"A transaction related operation was attempted after the transaction finished."
|
|
5183 |
msgstr "" |
|
5184 |
||
5185 |
#: bzrlib/errors.py:1004
|
|
5186 |
msgid "Cannot lock: transport is read only: %(transport)s" |
|
5187 |
msgstr "" |
|
5188 |
||
5189 |
#: bzrlib/errors.py:1012
|
|
5190 |
msgid "Could not acquire lock \"%(lock)s\": %(msg)s" |
|
5191 |
msgstr "" |
|
5192 |
||
5193 |
#: bzrlib/errors.py:1023
|
|
5194 |
msgid "" |
|
5195 |
"Lock was broken while still open: %(lock)s - check storage consistency!"
|
|
5196 |
msgstr "" |
|
5197 |
||
5198 |
#: bzrlib/errors.py:1034
|
|
5199 |
msgid "" |
|
5200 |
"Lock was released and re-acquired before being broken: %(lock)s: held by "
|
|
5201 |
"%(holder)r, wanted to break %(target)r"
|
|
5202 |
msgstr "" |
|
5203 |
||
5204 |
#: bzrlib/errors.py:1046
|
|
5205 |
msgid "" |
|
5206 |
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
|
|
5207 |
"Use 'bzr break-lock' to clear it"
|
|
5208 |
msgstr "" |
|
5209 |
||
5210 |
#: bzrlib/errors.py:1059
|
|
5211 |
msgid "Lock not held: %(lock)s" |
|
5212 |
msgstr "" |
|
5213 |
||
5214 |
#: bzrlib/errors.py:1088
|
|
5215 |
msgid "No changes to commit" |
|
5216 |
msgstr "" |
|
5217 |
||
5218 |
#: bzrlib/errors.py:1093
|
|
5219 |
msgid "" |
|
5220 |
"Selected-file commit of merges is not supported yet: files %(files_str)s"
|
|
5221 |
msgstr "" |
|
5222 |
||
5223 |
#: bzrlib/errors.py:1103
|
|
5224 |
msgid "" |
|
5225 |
"Excluding paths during commit is not supported by repository at "
|
|
5226 |
"%(repository)r."
|
|
5227 |
msgstr "" |
|
5228 |
||
5229 |
#: bzrlib/errors.py:1112
|
|
5230 |
msgid "" |
|
5231 |
"The specified commit message contains characters unsupported by the current "
|
|
5232 |
"encoding."
|
|
5233 |
msgstr "" |
|
5234 |
||
5235 |
#: bzrlib/errors.py:1118
|
|
5236 |
msgid "Upgrade URL cannot work with readonly URLs." |
|
5237 |
msgstr "" |
|
5238 |
||
5239 |
#: bzrlib/errors.py:1123
|
|
5240 |
msgid "The branch format %(format)s is already at the most recent format." |
|
5241 |
msgstr "" |
|
5242 |
||
5243 |
#: bzrlib/errors.py:1146
|
|
5244 |
msgid "Option --change does not accept revision ranges" |
|
5245 |
msgstr "" |
|
5246 |
||
5247 |
#: bzrlib/errors.py:1151
|
|
5248 |
msgid "No namespace registered for string: %(spec)r" |
|
5249 |
msgstr "" |
|
5250 |
||
5251 |
#: bzrlib/errors.py:1170
|
|
5252 |
msgid "" |
|
5253 |
"Requested revision: '%(spec)s' does not exist in branch: "
|
|
5254 |
"%(branch_url)s%(extra)s"
|
|
5255 |
msgstr "" |
|
5256 |
||
5257 |
#: bzrlib/errors.py:1184
|
|
5258 |
msgid "" |
|
5259 |
"Operation denied because it would change the main history, which is not "
|
|
5260 |
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
|
|
5261 |
msgstr "" |
|
5262 |
||
5263 |
#: bzrlib/errors.py:1195
|
|
5264 |
msgid "" |
|
5265 |
"These branches have diverged. Use the missing command to see how.\n"
|
|
5266 |
"Use the merge command to reconcile them."
|
|
5267 |
msgstr "" |
|
5268 |
||
5269 |
#: bzrlib/errors.py:1215
|
|
5270 |
msgid "" |
|
5271 |
"Branches have no common ancestor, and no merge base revision was specified."
|
|
5272 |
msgstr "" |
|
5273 |
||
5274 |
#: bzrlib/errors.py:1221
|
|
5275 |
msgid "" |
|
5276 |
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
|
|
5277 |
msgstr "" |
|
5278 |
||
5279 |
#: bzrlib/errors.py:1227
|
|
5280 |
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" |
|
5281 |
msgstr "" |
|
5282 |
||
5283 |
#: bzrlib/errors.py:1236
|
|
5284 |
msgid "" |
|
5285 |
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
|
|
5286 |
msgstr "" |
|
5287 |
||
5288 |
#: bzrlib/errors.py:1245
|
|
5289 |
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" |
|
5290 |
msgstr "" |
|
5291 |
||
5292 |
#: bzrlib/errors.py:1254
|
|
5293 |
msgid "Branch %(branch)s has no commits." |
|
5294 |
msgstr "" |
|
5295 |
||
5296 |
#: bzrlib/errors.py:1272
|
|
5297 |
msgid "" |
|
5298 |
"Bound branch %(branch)s is out of date with master branch "
|
|
5299 |
"%(master)s.%(extra_help)s"
|
|
5300 |
msgstr "" |
|
5301 |
||
5302 |
#: bzrlib/errors.py:1284
|
|
5303 |
msgid "" |
|
5304 |
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
|
|
5305 |
"bound to %(remote)s."
|
|
5306 |
msgstr "" |
|
5307 |
||
5308 |
#: bzrlib/errors.py:1296
|
|
5309 |
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s" |
|
5310 |
msgstr "" |
|
5311 |
||
5312 |
#: bzrlib/errors.py:1305
|
|
5313 |
msgid "" |
|
5314 |
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
|
|
5315 |
"%(error)s"
|
|
5316 |
msgstr "" |
|
5317 |
||
5318 |
#: bzrlib/errors.py:1317
|
|
5319 |
msgid "Error in processing weave: %(msg)s" |
|
5320 |
msgstr "" |
|
5321 |
||
5322 |
#: bzrlib/errors.py:1326
|
|
5323 |
msgid "Revision {%(revision_id)s} already present in %(weave)s" |
|
5324 |
msgstr "" |
|
5325 |
||
5326 |
#: bzrlib/errors.py:1337
|
|
5327 |
msgid "Revision {%(revision_id)s} not present in %(weave)s" |
|
5328 |
msgstr "" |
|
5329 |
||
5330 |
#: bzrlib/errors.py:1347
|
|
5331 |
msgid "Weave invariant violated: %(what)s" |
|
5332 |
msgstr "" |
|
5333 |
||
5334 |
#: bzrlib/errors.py:1356
|
|
5335 |
msgid "Parents are mismatched between two revisions. %(msg)s" |
|
5336 |
msgstr "" |
|
5337 |
||
5338 |
#: bzrlib/errors.py:1378
|
|
5339 |
msgid "" |
|
5340 |
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
|
|
5341 |
"%(weave_b)s"
|
|
5342 |
msgstr "" |
|
5343 |
||
5344 |
#: bzrlib/errors.py:1390
|
|
5345 |
msgid "Versioned file error" |
|
5346 |
msgstr "" |
|
5347 |
||
5348 |
#: bzrlib/errors.py:1395
|
|
5349 |
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"." |
|
5350 |
msgstr "" |
|
5351 |
||
5352 |
#: bzrlib/errors.py:1405
|
|
5353 |
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"." |
|
5354 |
msgstr "" |
|
5355 |
||
5356 |
#: bzrlib/errors.py:1415
|
|
5357 |
msgid "Text did not match its checksum: %(msg)s" |
|
5358 |
msgstr "" |
|
5359 |
||
5360 |
#: bzrlib/errors.py:1541
|
|
5361 |
msgid "Export format %(format)r not supported" |
|
5362 |
msgstr "" |
|
5363 |
||
5364 |
#: bzrlib/errors.py:1550
|
|
5365 |
msgid "Transport error: %(msg)s %(orig_error)s" |
|
5366 |
msgstr "" |
|
5367 |
||
5368 |
#: bzrlib/errors.py:1576
|
|
5369 |
msgid "Generic bzr smart protocol error: %(details)s" |
|
5370 |
msgstr "" |
|
5371 |
||
5372 |
#: bzrlib/errors.py:1584
|
|
5373 |
msgid "Received bad protocol version marker: %(marker)r" |
|
5374 |
msgstr "" |
|
5375 |
||
5376 |
#: bzrlib/errors.py:1616
|
|
5377 |
msgid "Transport operation not possible: %(msg)s %(orig_error)s" |
|
5378 |
msgstr "" |
|
5379 |
||
5380 |
#: bzrlib/errors.py:1621
|
|
5381 |
msgid "Connection error: %(msg)s %(orig_error)s" |
|
5382 |
msgstr "" |
|
5383 |
||
5384 |
#: bzrlib/errors.py:1626
|
|
5385 |
msgid "%(msg)s %(host)s%(port)s%(orig_error)s" |
|
5386 |
msgstr "" |
|
5387 |
||
5388 |
#: bzrlib/errors.py:1647
|
|
5389 |
msgid "Connection closed: %(msg)s %(orig_error)s" |
|
5390 |
msgstr "" |
|
5391 |
||
5392 |
#: bzrlib/errors.py:1652
|
|
5393 |
msgid "Connection Timeout: %(msg)s%(orig_error)s" |
|
5394 |
msgstr "" |
|
5395 |
||
5396 |
#: bzrlib/errors.py:1657
|
|
5397 |
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s" |
|
5398 |
msgstr "" |
|
5399 |
||
5400 |
#: bzrlib/errors.py:1667
|
|
5401 |
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s" |
|
5402 |
msgstr "" |
|
5403 |
||
5404 |
#: bzrlib/errors.py:1682
|
|
5405 |
msgid "Certificate error: %(error)s" |
|
5406 |
msgstr "" |
|
5407 |
||
5408 |
#: bzrlib/errors.py:1690
|
|
5409 |
msgid "Invalid http range %(range)r for %(path)s: %(msg)s" |
|
5410 |
msgstr "" |
|
5411 |
||
5412 |
#: bzrlib/errors.py:1704
|
|
5413 |
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s" |
|
5414 |
msgstr "" |
|
5415 |
||
5416 |
#: bzrlib/errors.py:1712
|
|
5417 |
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s" |
|
5418 |
msgstr "" |
|
5419 |
||
5420 |
#: bzrlib/errors.py:1721
|
|
5421 |
msgid "%(source)s is%(permanently)s redirected to %(target)s" |
|
5422 |
msgstr "" |
|
5423 |
||
5424 |
#: bzrlib/errors.py:1735
|
|
5425 |
msgid "Too many redirections" |
|
5426 |
msgstr "" |
|
5427 |
||
5428 |
#: bzrlib/errors.py:1740
|
|
5429 |
msgid "Working tree has conflicts." |
|
5430 |
msgstr "" |
|
5431 |
||
5432 |
#: bzrlib/errors.py:1744
|
|
5433 |
msgid "Config file %(filename)s is not UTF-8 encoded\n" |
|
5434 |
msgstr "" |
|
5435 |
||
5436 |
#: bzrlib/errors.py:1753
|
|
5437 |
msgid "" |
|
5438 |
"Error(s) parsing config file %(filename)s:\n"
|
|
5439 |
"%(errors)s"
|
|
5440 |
msgstr "" |
|
5441 |
||
5442 |
#: bzrlib/errors.py:1763
|
|
5443 |
msgid "" |
|
5444 |
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
|
|
5445 |
"See ``bzr help %(name)s``"
|
|
5446 |
msgstr "" |
|
5447 |
||
5448 |
#: bzrlib/errors.py:1773
|
|
5449 |
msgid "%(username)r does not seem to contain a reasonable email address" |
|
5450 |
msgstr "" |
|
5451 |
||
5452 |
#: bzrlib/errors.py:1782
|
|
5453 |
msgid "Failed to GPG sign data with command \"%(command_line)s\"" |
|
5454 |
msgstr "" |
|
5455 |
||
5456 |
#: bzrlib/errors.py:1790
|
|
5457 |
msgid "Failed to verify GPG signature data with error \"%(error)s\"" |
|
5458 |
msgstr "" |
|
5459 |
||
5460 |
#: bzrlib/errors.py:1798
|
|
5461 |
msgid "Unable to import library \"%(library)s\": %(error)s" |
|
5462 |
msgstr "" |
|
5463 |
||
5464 |
#: bzrlib/errors.py:1806
|
|
5465 |
msgid "python-gpgme is not installed, it is needed to verify signatures" |
|
5466 |
msgstr "" |
|
5467 |
||
5468 |
#: bzrlib/errors.py:1814
|
|
5469 |
msgid "" |
|
5470 |
"The working tree for %(basedir)s has changed since the last commit, but "
|
|
5471 |
"weave merge requires that it be unchanged"
|
|
5472 |
msgstr "" |
|
5473 |
||
5474 |
#: bzrlib/errors.py:1824
|
|
5475 |
msgid "" |
|
5476 |
"Can't reprocess and show base, because reprocessing obscures the "
|
|
5477 |
"relationship of conflicting lines to the base"
|
|
5478 |
msgstr "" |
|
5479 |
||
5480 |
#: bzrlib/errors.py:1830
|
|
5481 |
msgid "Cycle in graph %(graph)r" |
|
5482 |
msgstr "" |
|
5483 |
||
5484 |
#: bzrlib/errors.py:1858
|
|
5485 |
msgid "File %(filename)s is not conflicted." |
|
5486 |
msgstr "" |
|
5487 |
||
5488 |
#: bzrlib/errors.py:1880
|
|
5489 |
msgid "No bundle was found in \"%(filename)s\"." |
|
5490 |
msgstr "" |
|
5491 |
||
5492 |
#: bzrlib/errors.py:1889
|
|
5493 |
msgid "Unable to handle bundle version %(version)s: %(msg)s" |
|
5494 |
msgstr "" |
|
5495 |
||
5496 |
#: bzrlib/errors.py:1899
|
|
5497 |
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s" |
|
5498 |
msgstr "" |
|
5499 |
||
5500 |
#: bzrlib/errors.py:1912
|
|
5501 |
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s" |
|
5502 |
msgstr "" |
|
5503 |
||
5504 |
#: bzrlib/errors.py:1922
|
|
5505 |
msgid "Key %(key)s is already present in map" |
|
5506 |
msgstr "" |
|
5507 |
||
5508 |
#: bzrlib/errors.py:1927
|
|
5509 |
msgid "The prefix %(prefix)s is in the help search path twice." |
|
5510 |
msgstr "" |
|
5511 |
||
5512 |
#: bzrlib/errors.py:1937
|
|
5513 |
msgid "" |
|
5514 |
"No final name for trans_id %(trans_id)r\n"
|
|
5515 |
"file-id: %(file_id)r\n" |
|
5516 |
"root trans-id: %(root_trans_id)r\n"
|
|
5517 |
msgstr "" |
|
5518 |
||
5519 |
#: bzrlib/errors.py:1969
|
|
5520 |
msgid "Attempt to reuse a transform that has already been applied." |
|
5521 |
msgstr "" |
|
5522 |
||
5523 |
#: bzrlib/errors.py:1974
|
|
5524 |
msgid "Moving the root directory is not supported at this time" |
|
5525 |
msgstr "" |
|
5526 |
||
5527 |
#: bzrlib/errors.py:1979
|
|
5528 |
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s" |
|
5529 |
msgstr "" |
|
5530 |
||
5531 |
#: bzrlib/errors.py:1990
|
|
5532 |
msgid "" |
|
5533 |
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
|
|
5534 |
msgstr "" |
|
5535 |
||
5536 |
#: bzrlib/errors.py:2026
|
|
5537 |
msgid "" |
|
5538 |
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
|
|
5539 |
msgstr "" |
|
5540 |
||
5541 |
#: bzrlib/errors.py:2056
|
|
5542 |
msgid "Unable to import paramiko (required for sftp support): %(error)s" |
|
5543 |
msgstr "" |
|
5544 |
||
5545 |
#: bzrlib/errors.py:2064
|
|
5546 |
msgid "Nothing to merge." |
|
5547 |
msgstr "" |
|
5548 |
||
5549 |
#: bzrlib/errors.py:2069
|
|
5550 |
msgid "Format %(format)s cannot be initialised by this version of bzr." |
|
5551 |
msgstr "" |
|
5552 |
||
5553 |
#: bzrlib/errors.py:2078
|
|
5554 |
msgid "" |
|
5555 |
"Cannot convert from format %(from_format)s to format %(format)s. "
|
|
5556 |
"%(problem)s"
|
|
5557 |
msgstr "" |
|
5558 |
||
5559 |
#: bzrlib/errors.py:2090
|
|
5560 |
msgid "Could not find an appropriate Differ for file \"%(path)s\"" |
|
5561 |
msgstr "" |
|
5562 |
||
5563 |
#: bzrlib/errors.py:2098
|
|
5564 |
msgid "%(exe_name)s could not be found on this machine" |
|
5565 |
msgstr "" |
|
5566 |
||
5567 |
#: bzrlib/errors.py:2106
|
|
5568 |
msgid "Diff is not installed on this machine: %(msg)s" |
|
5569 |
msgstr "" |
|
5570 |
||
5571 |
#: bzrlib/errors.py:2114
|
|
5572 |
msgid "Diff3 is not installed on this machine." |
|
5573 |
msgstr "" |
|
5574 |
||
5575 |
#: bzrlib/errors.py:2120
|
|
5576 |
msgid "The content being inserted is already present." |
|
5577 |
msgstr "" |
|
5578 |
||
5579 |
#: bzrlib/errors.py:2125
|
|
5580 |
msgid "" |
|
5581 |
"This tree contains left-over files from a failed operation.\n"
|
|
5582 |
" Please examine %(limbo_dir)s to see if it contains any files you wish "
|
|
5583 |
"to\n"
|
|
5584 |
" keep, and delete it when you are done."
|
|
5585 |
msgstr "" |
|
5586 |
||
5587 |
#: bzrlib/errors.py:2136
|
|
5588 |
msgid "" |
|
5589 |
"This tree contains left-over files from a failed operation.\n"
|
|
5590 |
" Please examine %(pending_deletion)s to see if it contains any files you\n"
|
|
5591 |
" wish to keep, and delete it when you are done."
|
|
5592 |
msgstr "" |
|
5593 |
||
5594 |
#: bzrlib/errors.py:2146
|
|
5595 |
msgid "" |
|
5596 |
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
|
|
5597 |
" Please examine %(limbo_dir)s to see if it contains any files you wish "
|
|
5598 |
"to\n"
|
|
5599 |
" keep, and delete it when you are done."
|
|
5600 |
msgstr "" |
|
5601 |
||
5602 |
#: bzrlib/errors.py:2157
|
|
5603 |
msgid "" |
|
5604 |
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
|
|
5605 |
"examine %(pending_deletion)s to see if it contains any files you wish to "
|
|
5606 |
"keep, and delete it when you are done."
|
|
5607 |
msgstr "" |
|
5608 |
||
5609 |
#: bzrlib/errors.py:2167
|
|
5610 |
msgid "Working tree is out of date, please run 'bzr update'.%(more)s" |
|
5611 |
msgstr "" |
|
5612 |
||
5613 |
#: bzrlib/errors.py:2181
|
|
5614 |
msgid "" |
|
5615 |
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
|
|
5616 |
msgstr "" |
|
5617 |
||
5618 |
#: bzrlib/errors.py:2194
|
|
5619 |
msgid "Error in merge modified format" |
|
5620 |
msgstr "" |
|
5621 |
||
5622 |
#: bzrlib/errors.py:2199
|
|
5623 |
msgid "Format error in conflict listings" |
|
5624 |
msgstr "" |
|
5625 |
||
5626 |
#: bzrlib/errors.py:2203
|
|
5627 |
msgid "" |
|
5628 |
"Inconsistency in dirstate file %(dirstate_path)s.\n"
|
|
5629 |
"Error: %(description)s" |
|
5630 |
msgstr "" |
|
5631 |
||
5632 |
#: bzrlib/errors.py:2214
|
|
5633 |
msgid "" |
|
5634 |
"An error has been detected in the repository %(repo_path)s.\n"
|
|
5635 |
"Please run bzr reconcile on this repository."
|
|
5636 |
msgstr "" |
|
5637 |
||
5638 |
#: bzrlib/errors.py:2225
|
|
5639 |
msgid "" |
|
5640 |
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
|
|
5641 |
"reason: %(reason)s" |
|
5642 |
msgstr "" |
|
5643 |
||
5644 |
#: bzrlib/errors.py:2238
|
|
5645 |
msgid "" |
|
5646 |
"An inconsistent delta was supplied: %(delta)r\n"
|
|
5647 |
"reason: %(reason)s" |
|
5648 |
msgstr "" |
|
5649 |
||
5650 |
#: bzrlib/errors.py:2250
|
|
5651 |
msgid "To use this feature you must upgrade your branch at %(path)s." |
|
5652 |
msgstr "" |
|
5653 |
||
5654 |
#: bzrlib/errors.py:2259
|
|
5655 |
msgid "To use this feature you must upgrade your repository at %(path)s." |
|
5656 |
msgstr "" |
|
5657 |
||
5658 |
#: bzrlib/errors.py:2264
|
|
5659 |
msgid "" |
|
5660 |
"To use this feature you must upgrade your branch at %(path)s to a format "
|
|
5661 |
"which supports rich roots."
|
|
5662 |
msgstr "" |
|
5663 |
||
5664 |
#: bzrlib/errors.py:2270
|
|
5665 |
msgid "Cannot perform local-only commits on unbound branches." |
|
5666 |
msgstr "" |
|
5667 |
||
5668 |
#: bzrlib/errors.py:2275
|
|
5669 |
msgid "The method %(mname)s is not supported on objects of type %(tname)s." |
|
5670 |
msgstr "" |
|
5671 |
||
5672 |
#: bzrlib/errors.py:2296
|
|
5673 |
msgid "Ghost tags not supported by format %(format)r." |
|
5674 |
msgstr "" |
|
5675 |
||
5676 |
#: bzrlib/errors.py:2304
|
|
5677 |
msgid "File is binary but should be text." |
|
5678 |
msgstr "" |
|
5679 |
||
5680 |
#: bzrlib/errors.py:2309
|
|
5681 |
msgid "The path %(path)s is not permitted on this platform" |
|
5682 |
msgstr "" |
|
5683 |
||
5684 |
#: bzrlib/errors.py:2318
|
|
5685 |
msgid "" |
|
5686 |
"Testament did not match expected value.\n"
|
|
5687 |
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
|
|
5688 |
" {%(measured)s}"
|
|
5689 |
msgstr "" |
|
5690 |
||
5691 |
#: bzrlib/errors.py:2330
|
|
5692 |
msgid "Not a bzr revision-bundle: %(text)r" |
|
5693 |
msgstr "" |
|
5694 |
||
5695 |
#: bzrlib/errors.py:2339
|
|
5696 |
msgid "Bad bzr revision-bundle: %(text)r" |
|
5697 |
msgstr "" |
|
5698 |
||
5699 |
#: bzrlib/errors.py:2348
|
|
5700 |
msgid "Malformed bzr revision-bundle header: %(text)r" |
|
5701 |
msgstr "" |
|
5702 |
||
5703 |
#: bzrlib/errors.py:2353
|
|
5704 |
msgid "Malformed patches in bzr revision-bundle: %(text)r" |
|
5705 |
msgstr "" |
|
5706 |
||
5707 |
#: bzrlib/errors.py:2358
|
|
5708 |
msgid "Malformed footer in bzr revision-bundle: %(text)r" |
|
5709 |
msgstr "" |
|
5710 |
||
5711 |
#: bzrlib/errors.py:2363
|
|
5712 |
msgid "End of line marker was not \\n in bzr revision-bundle" |
|
5713 |
msgstr "" |
|
5714 |
||
5715 |
#: bzrlib/errors.py:2373
|
|
5716 |
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s" |
|
5717 |
msgstr "" |
|
5718 |
||
5719 |
#: bzrlib/errors.py:2383
|
|
5720 |
msgid "Root class for inventory serialization errors" |
|
5721 |
msgstr "" |
|
5722 |
||
5723 |
#: bzrlib/errors.py:2387
|
|
5724 |
msgid "" |
|
5725 |
"The inventory was not in the expected format:\n"
|
|
5726 |
" %(msg)s"
|
|
5727 |
msgstr "" |
|
5728 |
||
5729 |
#: bzrlib/errors.py:2396
|
|
5730 |
msgid "This operation requires rich root data storage" |
|
5731 |
msgstr "" |
|
5732 |
||
5733 |
#: bzrlib/errors.py:2409
|
|
5734 |
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s" |
|
5735 |
msgstr "" |
|
5736 |
||
5737 |
#: bzrlib/errors.py:2418
|
|
5738 |
msgid "" |
|
5739 |
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
|
|
5740 |
"variable."
|
|
5741 |
msgstr "" |
|
5742 |
||
5743 |
#: bzrlib/errors.py:2425
|
|
5744 |
msgid "" |
|
5745 |
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
|
|
5746 |
"ghost at {%(ghost_revision_id)s}"
|
|
5747 |
msgstr "" |
|
5748 |
||
5749 |
#: bzrlib/errors.py:2435
|
|
5750 |
msgid "Ghost revision {%(revision_id)s} cannot be used here." |
|
5751 |
msgstr "" |
|
5752 |
||
5753 |
#: bzrlib/errors.py:2486
|
|
5754 |
msgid "" |
|
5755 |
"A merge directive must provide either a bundle or a public branch location."
|
|
5756 |
msgstr "" |
|
5757 |
||
5758 |
#: bzrlib/errors.py:2493
|
|
5759 |
msgid "Bad merge directive payload %(start)r" |
|
5760 |
msgstr "" |
|
5761 |
||
5762 |
#: bzrlib/errors.py:2503
|
|
5763 |
msgid "Preview patch does not match requested changes." |
|
5764 |
msgstr "" |
|
5765 |
||
5766 |
#: bzrlib/errors.py:2509
|
|
5767 |
msgid "Patch_type was %(patch_type)s, but no patch was supplied." |
|
5768 |
msgstr "" |
|
5769 |
||
5770 |
#: bzrlib/errors.py:2519
|
|
5771 |
msgid "" |
|
5772 |
"Your branch does not have all of the revisions required in order to merge "
|
|
5773 |
"this merge directive and the target location specified in the merge "
|
|
5774 |
"directive is not a branch: %(location)s."
|
|
5775 |
msgstr "" |
|
5776 |
||
5777 |
#: bzrlib/errors.py:2531
|
|
5778 |
msgid "Unsupported entry kind %(kind)s" |
|
5779 |
msgstr "" |
|
5780 |
||
5781 |
#: bzrlib/errors.py:2539
|
|
5782 |
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s" |
|
5783 |
msgstr "" |
|
5784 |
||
5785 |
#: bzrlib/errors.py:2549
|
|
5786 |
msgid "Subsume target %(other_tree)s needs to be upgraded." |
|
5787 |
msgstr "" |
|
5788 |
||
5789 |
#: bzrlib/errors.py:2568
|
|
5790 |
msgid "No such tag: %(tag_name)s" |
|
5791 |
msgstr "" |
|
5792 |
||
5793 |
#: bzrlib/errors.py:2576
|
|
5794 |
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade." |
|
5795 |
msgstr "" |
|
5796 |
||
5797 |
#: bzrlib/errors.py:2585
|
|
5798 |
msgid "Tag %(tag_name)s already exists." |
|
5799 |
msgstr "" |
|
5800 |
||
5801 |
#: bzrlib/errors.py:2593
|
|
5802 |
msgid "" |
|
5803 |
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
|
|
5804 |
"bugs\" for more information on this feature."
|
|
5805 |
msgstr "" |
|
5806 |
||
5807 |
#: bzrlib/errors.py:2603
|
|
5808 |
msgid "" |
|
5809 |
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
|
|
5810 |
msgstr "" |
|
5811 |
||
5812 |
#: bzrlib/errors.py:2613
|
|
5813 |
msgid "" |
|
5814 |
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
|
|
5815 |
msgstr "" |
|
5816 |
||
5817 |
#: bzrlib/errors.py:2623
|
|
5818 |
msgid "Invalid line in bugs property: '%(line)s'" |
|
5819 |
msgstr "" |
|
5820 |
||
5821 |
#: bzrlib/errors.py:2631
|
|
5822 |
msgid "Invalid bug status: '%(status)s'" |
|
5823 |
msgstr "" |
|
5824 |
||
5825 |
#: bzrlib/errors.py:2639
|
|
5826 |
msgid "Could not understand response from smart server: %(response_tuple)r" |
|
5827 |
msgstr "" |
|
5828 |
||
5829 |
#: bzrlib/errors.py:2678
|
|
5830 |
msgid "Server sent an unexpected error: %(error_tuple)r" |
|
5831 |
msgstr "" |
|
5832 |
||
5833 |
#: bzrlib/errors.py:2697
|
|
5834 |
msgid "Unrecognised container format: %(container_format)r" |
|
5835 |
msgstr "" |
|
5836 |
||
5837 |
#: bzrlib/errors.py:2705
|
|
5838 |
msgid "Unexpected end of container stream" |
|
5839 |
msgstr "" |
|
5840 |
||
5841 |
#: bzrlib/errors.py:2710
|
|
5842 |
msgid "Unknown record type: %(record_type)r" |
|
5843 |
msgstr "" |
|
5844 |
||
5845 |
#: bzrlib/errors.py:2718
|
|
5846 |
msgid "Invalid record: %(reason)s" |
|
5847 |
msgstr "" |
|
5848 |
||
5849 |
#: bzrlib/errors.py:2726
|
|
5850 |
msgid "Container has data after end marker: %(excess)r" |
|
5851 |
msgstr "" |
|
5852 |
||
5853 |
#: bzrlib/errors.py:2734
|
|
5854 |
msgid "Container has multiple records with the same name: %(name)s" |
|
5855 |
msgstr "" |
|
5856 |
||
5857 |
#: bzrlib/errors.py:2747
|
|
5858 |
msgid "Corrupt or incompatible data stream: %(reason)s" |
|
5859 |
msgstr "" |
|
5860 |
||
5861 |
#: bzrlib/errors.py:2755
|
|
5862 |
msgid "SMTP error: %(error)s" |
|
5863 |
msgstr "" |
|
5864 |
||
5865 |
#: bzrlib/errors.py:2763
|
|
5866 |
msgid "No message supplied." |
|
5867 |
msgstr "" |
|
5868 |
||
5869 |
#: bzrlib/errors.py:2768
|
|
5870 |
msgid "No mail-to address (--mail-to) or output (-o) specified." |
|
5871 |
msgstr "" |
|
5872 |
||
5873 |
#: bzrlib/errors.py:2773
|
|
5874 |
msgid "Unknown mail client: %(mail_client)s" |
|
5875 |
msgstr "" |
|
5876 |
||
5877 |
#: bzrlib/errors.py:2781
|
|
5878 |
msgid "" |
|
5879 |
"Unable to find mail client with the following names: "
|
|
5880 |
"%(mail_command_list_string)s"
|
|
5881 |
msgstr "" |
|
5882 |
||
5883 |
#: bzrlib/errors.py:2791
|
|
5884 |
msgid "SMTP connection to %(host)s refused" |
|
5885 |
msgstr "" |
|
5886 |
||
5887 |
#: bzrlib/errors.py:2800
|
|
5888 |
msgid "Please specify smtp_server. No server at default %(host)s." |
|
5889 |
msgstr "" |
|
5890 |
||
5891 |
#: bzrlib/errors.py:2814
|
|
5892 |
msgid "" |
|
5893 |
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
|
|
5894 |
"reconfigure."
|
|
5895 |
msgstr "" |
|
5896 |
||
5897 |
#: bzrlib/errors.py:2826
|
|
5898 |
msgid "'%(display_url)s' is already a branch." |
|
5899 |
msgstr "" |
|
5900 |
||
5901 |
#: bzrlib/errors.py:2831
|
|
5902 |
msgid "'%(display_url)s' is already a tree." |
|
5903 |
msgstr "" |
|
5904 |
||
5905 |
#: bzrlib/errors.py:2836
|
|
5906 |
msgid "'%(display_url)s' is already a checkout." |
|
5907 |
msgstr "" |
|
5908 |
||
5909 |
#: bzrlib/errors.py:2841
|
|
5910 |
msgid "'%(display_url)s' is already a lightweight checkout." |
|
5911 |
msgstr "" |
|
5912 |
||
5913 |
#: bzrlib/errors.py:2846
|
|
5914 |
msgid "'%(display_url)s' is already using a shared repository." |
|
5915 |
msgstr "" |
|
5916 |
||
5917 |
#: bzrlib/errors.py:2851
|
|
5918 |
msgid "'%(display_url)s' is already standalone." |
|
5919 |
msgstr "" |
|
5920 |
||
5921 |
#: bzrlib/errors.py:2856
|
|
5922 |
msgid "Shared repository '%(display_url)s' already creates working trees." |
|
5923 |
msgstr "" |
|
5924 |
||
5925 |
#: bzrlib/errors.py:2862
|
|
5926 |
msgid "" |
|
5927 |
"Shared repository '%(display_url)s' already doesn't create working trees."
|
|
5928 |
msgstr "" |
|
5929 |
||
5930 |
#: bzrlib/errors.py:2868
|
|
5931 |
msgid "Requested reconfiguration of '%(display_url)s' is not supported." |
|
5932 |
msgstr "" |
|
5933 |
||
5934 |
#: bzrlib/errors.py:2873
|
|
5935 |
msgid "No location could be found to bind to at %(display_url)s." |
|
5936 |
msgstr "" |
|
5937 |
||
5938 |
#: bzrlib/errors.py:2878
|
|
5939 |
msgid "" |
|
5940 |
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
|
|
5941 |
"status).%(more)s"
|
|
5942 |
msgstr "" |
|
5943 |
||
5944 |
#: bzrlib/errors.py:2897
|
|
5945 |
msgid "" |
|
5946 |
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
|
|
5947 |
"list).%(more)s"
|
|
5948 |
msgstr "" |
|
5949 |
||
5950 |
#: bzrlib/errors.py:2903
|
|
5951 |
msgid "Variable {%(name)s} is not available." |
|
5952 |
msgstr "" |
|
5953 |
||
5954 |
#: bzrlib/errors.py:2911
|
|
5955 |
msgid "No template specified." |
|
5956 |
msgstr "" |
|
5957 |
||
5958 |
#: bzrlib/errors.py:2916
|
|
5959 |
msgid "Unable to create symlink %(path_str)son this platform" |
|
5960 |
msgstr "" |
|
5961 |
||
5962 |
#: bzrlib/errors.py:2931
|
|
5963 |
msgid "" |
|
5964 |
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
|
|
5965 |
"\"original\", \"local\"."
|
|
5966 |
msgstr "" |
|
5967 |
||
5968 |
#: bzrlib/errors.py:2965
|
|
5969 |
msgid "" |
|
5970 |
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
|
|
5971 |
msgstr "" |
|
5972 |
||
5973 |
#: bzrlib/errors.py:2977
|
|
5974 |
msgid "The \"%(config_id)s\" configuration does not exist." |
|
5975 |
msgstr "" |
|
5976 |
||
5977 |
#: bzrlib/errors.py:2985
|
|
5978 |
msgid "The \"%(option_name)s\" configuration option does not exist." |
|
5979 |
msgstr "" |
|
5980 |
||
5981 |
#: bzrlib/errors.py:2993
|
|
5982 |
msgid "The alias \"%(alias_name)s\" does not exist." |
|
5983 |
msgstr "" |
|
5984 |
||
5985 |
#: bzrlib/errors.py:3007
|
|
5986 |
msgid "\"%(alias_name)s\" is not a valid location alias." |
|
5987 |
msgstr "" |
|
5988 |
||
5989 |
#: bzrlib/errors.py:3015
|
|
5990 |
msgid "No %(alias_name)s location assigned." |
|
5991 |
msgstr "" |
|
5992 |
||
5993 |
#: bzrlib/errors.py:3023
|
|
5994 |
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s." |
|
5995 |
msgstr "" |
|
5996 |
||
5997 |
#: bzrlib/errors.py:3033
|
|
5998 |
msgid "Unknown rules detected: %(unknowns_str)s." |
|
5999 |
msgstr "" |
|
6000 |
||
6001 |
#: bzrlib/errors.py:3044
|
|
6002 |
msgid "Tip change rejected: %(msg)s" |
|
6003 |
msgstr "" |
|
6004 |
||
6005 |
#: bzrlib/errors.py:3052
|
|
6006 |
msgid "Shelf corrupt." |
|
6007 |
msgstr "" |
|
6008 |
||
6009 |
#: bzrlib/errors.py:3057
|
|
6010 |
msgid "Corruption while decompressing repository file%(orig_error)s" |
|
6011 |
msgstr "" |
|
6012 |
||
6013 |
#: bzrlib/errors.py:3069
|
|
6014 |
msgid "No changes are shelved with id \"%(shelf_id)d\"." |
|
6015 |
msgstr "" |
|
6016 |
||
6017 |
#: bzrlib/errors.py:3077
|
|
6018 |
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead." |
|
6019 |
msgstr "" |
|
6020 |
||
6021 |
#: bzrlib/errors.py:3085
|
|
6022 |
msgid "" |
|
6023 |
"An attempt to access a url outside the server jail was made: '%(url)s'."
|
|
6024 |
msgstr "" |
|
6025 |
||
6026 |
#: bzrlib/errors.py:3093
|
|
6027 |
msgid "The user aborted the operation." |
|
6028 |
msgstr "" |
|
6029 |
||
6030 |
#: bzrlib/errors.py:3098
|
|
6031 |
msgid "Branching '%(url)s'(%(format)s) must create a working tree." |
|
6032 |
msgstr "" |
|
6033 |
||
6034 |
#: bzrlib/errors.py:3108
|
|
6035 |
msgid "No such view: %(view_name)s." |
|
6036 |
msgstr "" |
|
6037 |
||
6038 |
#: bzrlib/errors.py:3118
|
|
6039 |
msgid "" |
|
6040 |
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
|
|
6041 |
"to a later format."
|
|
6042 |
msgstr "" |
|
6043 |
||
6044 |
#: bzrlib/errors.py:3127
|
|
6045 |
msgid "" |
|
6046 |
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
|
|
6047 |
msgstr "" |
|
6048 |
||
6049 |
#: bzrlib/errors.py:3194
|
|
6050 |
msgid "%(bzrdir)r does not support co-located branches." |
|
6051 |
msgstr "" |
|
6052 |
||
6053 |
#: bzrlib/errors.py:3200
|
|
6054 |
msgid "" |
|
6055 |
"Unable to determine your name.\n"
|
|
6056 |
"Please, set your name with the 'whoami' command.\n"
|
|
6057 |
"E.g. bzr whoami \"Your Name <name@example.com>\""
|
|
6058 |
msgstr "" |
|
6059 |
||
6060 |
#: bzrlib/errors.py:3209
|
|
6061 |
msgid "Invalid pattern(s) found. %(msg)s" |
|
6062 |
msgstr "" |
|
6063 |
||
6064 |
#: bzrlib/errors.py:3217
|
|
6065 |
msgid "" |
|
6066 |
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
|
|
6067 |
"unbind` to fix."
|
|
6068 |
msgstr "" |
|
6069 |
||
6070 |
#: bzrlib/errors.py:3228
|
|
6071 |
msgid "Loop involving %(refs)r while expanding \"%(string)s\"." |
|
6072 |
msgstr "" |
|
6073 |
||
6074 |
#: bzrlib/errors.py:3237
|
|
6075 |
msgid "Option %(name)s is not defined while expanding \"%(string)s\"." |
|
6076 |
msgstr "" |
|
6077 |
||
6078 |
#: bzrlib/errors.py:3246
|
|
6079 |
msgid "" |
|
6080 |
"No compatible object available for operations from %(source)r to %(target)r."
|
|
6081 |
msgstr "" |
|
6082 |
||
6083 |
#: bzrlib/errors.py:3256
|
|
6084 |
msgid "" |
|
6085 |
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
|
|
6086 |
"%(arguments)s."
|
|
6087 |
msgstr "" |
|
6088 |
||
6089 |
#: bzrlib/errors.py:3266
|
|
6090 |
msgid "" |
|
6091 |
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
|
|
6092 |
"format %(format)r"
|
|
6093 |
msgstr "" |
|
6094 |
||
6095 |
#: bzrlib/errors.py:3278
|
|
6096 |
msgid "" |
|
6097 |
"Missing feature %(feature)s not provided by this version of Bazaar or any "
|
|
6098 |
"plugin."
|
|
6099 |
msgstr "" |
|
6100 |
||
6101 |
#: bzrlib/errors.py:3291
|
|
6102 |
msgid "Binary files section encountered." |
|
6103 |
msgstr "" |
|
6104 |
||
6105 |
#: bzrlib/errors.py:3299
|
|
6106 |
msgid "" |
|
6107 |
"Malformed patch header. %(desc)s\n"
|
|
6108 |
"%(line)r"
|
|
6109 |
msgstr "" |
|
6110 |
||
6111 |
#: bzrlib/errors.py:3308
|
|
6112 |
msgid "" |
|
6113 |
"Malformed hunk header. %(desc)s\n"
|
|
6114 |
"%(line)r"
|
|
6115 |
msgstr "" |
|
6116 |
||
6117 |
#: bzrlib/errors.py:3317
|
|
6118 |
msgid "" |
|
6119 |
"Malformed line. %(desc)s\n"
|
|
6120 |
"%(line)r"
|
|
6121 |
msgstr "" |
|
6122 |
||
6123 |
#: bzrlib/errors.py:3327
|
|
6124 |
msgid "" |
|
6125 |
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
|
|
6126 |
"but patch says it should be \"%(patch_line)s\""
|
|
6127 |
msgstr "" |
|
6128 |
||
6129 |
#: bzrlib/errors.py:3338
|
|
6130 |
msgid "The feature %(feature)s has already been registered." |
|
6131 |
msgstr "" |
|
6132 |
||
6133 |
#: bzrlib/export_pot.py:252
|
|
6134 |
#, python-format
|
|
6135 |
msgid "Exporting messages from builtin command: %s" |
|
6136 |
msgstr "" |
|
6137 |
||
6138 |
#: bzrlib/export_pot.py:271
|
|
6139 |
msgid "Exporting messages from plugin command: {0} in {1}" |
|
6140 |
msgstr "" |
|
6141 |
||
6142 |
#: bzrlib/export_pot.py:292
|
|
6143 |
#, python-format
|
|
6144 |
msgid "Exporting message from error: %s" |
|
6145 |
msgstr "" |
|
6146 |
||
6147 |
#: bzrlib/fetch.py:98
|
|
6148 |
msgid "Finding revisions" |
|
6149 |
msgstr "" |
|
6150 |
||
6151 |
#: bzrlib/fetch.py:103
|
|
6152 |
msgid "Fetching revisions" |
|
6153 |
msgstr "" |
|
6154 |
||
6155 |
#: bzrlib/foreign.py:262
|
|
6156 |
msgid "Push into a different VCS without any custom bzr metadata." |
|
6157 |
msgstr "" |
|
6158 |
||
6159 |
#: bzrlib/foreign.py:264
|
|
6160 |
msgid "" |
|
6161 |
"This will afterwards rebase the local branch on the remote\n"
|
|
6162 |
"branch unless the --no-rebase option is used, in which case \n"
|
|
6163 |
"the two branches will be out of sync after the push. "
|
|
6164 |
msgstr "" |
|
6165 |
||
6166 |
#: bzrlib/foreign.py:277
|
|
6167 |
msgid "Do not rebase after push." |
|
6168 |
msgstr "" |
|
6169 |
||
6170 |
#: bzrlib/foreign.py:311
|
|
6171 |
#, python-format
|
|
6172 |
msgid "Using saved location: %s\n" |
|
6173 |
msgstr "" |
|
6174 |
||
6175 |
#: bzrlib/foreign.py:321
|
|
6176 |
msgid "" |
|
6177 |
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
|
|
6178 |
"regular push."
|
|
6179 |
msgstr "" |
|
6180 |
||
6181 |
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
|
|
6182 |
msgid "{0} commits with valid signatures" |
|
6183 |
msgstr "" |
|
6184 |
||
6185 |
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
|
|
6186 |
msgid "{0} commit with unknown key" |
|
6187 |
msgid_plural "{0} commits with unknown keys" |
|
6188 |
msgstr[0] "" |
|
6189 |
msgstr[1] "" |
|
6190 |
||
6191 |
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
|
|
6192 |
msgid "{0} commit not valid" |
|
6193 |
msgid_plural "{0} commits not valid" |
|
6194 |
msgstr[0] "" |
|
6195 |
msgstr[1] "" |
|
6196 |
||
6197 |
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
|
|
6198 |
msgid "{0} commit not signed" |
|
6199 |
msgid_plural "{0} commits not signed" |
|
6200 |
msgstr[0] "" |
|
6201 |
msgstr[1] "" |
|
6202 |
||
6203 |
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
|
|
6204 |
msgid "{0} commit with key now expired" |
|
6205 |
msgid_plural "{0} commits with key now expired" |
|
6206 |
msgstr[0] "" |
|
6207 |
msgstr[1] "" |
|
6208 |
||
6209 |
#: bzrlib/gpg.py:343
|
|
6210 |
msgid "No GnuPG key results for pattern: {0}" |
|
6211 |
msgstr "" |
|
6212 |
||
6213 |
#: bzrlib/gpg.py:386
|
|
6214 |
msgid "{0} signed {1} commit" |
|
6215 |
msgid_plural "{0} signed {1} commits" |
|
6216 |
msgstr[0] "" |
|
6217 |
msgstr[1] "" |
|
6218 |
||
6219 |
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
|
|
6220 |
msgid "{0} commit by author {1}" |
|
6221 |
msgid_plural "{0} commits by author {1}" |
|
6222 |
msgstr[0] "" |
|
6223 |
msgstr[1] "" |
|
6224 |
||
6225 |
#: bzrlib/gpg.py:433
|
|
6226 |
msgid "Unknown key {0} signed {1} commit" |
|
6227 |
msgid_plural "Unknown key {0} signed {1} commits" |
|
6228 |
msgstr[0] "" |
|
6229 |
msgstr[1] "" |
|
6230 |
||
6231 |
#: bzrlib/gpg.py:452
|
|
6232 |
msgid "{0} commit by author {1} with key {2} now expired" |
|
6233 |
msgid_plural "{0} commits by author {1} with key {2} now expired" |
|
6234 |
msgstr[0] "" |
|
6235 |
msgstr[1] "" |
|
6236 |
||
6237 |
#: bzrlib/groupcompress.py:1739
|
|
6238 |
#, python-format
|
|
6239 |
msgid "Insert claimed random_id=True, but then inserted %r two times" |
|
6240 |
msgstr "" |
|
6241 |
||
6242 |
#: bzrlib/hooks.py:331
|
|
6243 |
#, python-format
|
|
6244 |
msgid "Introduced in: %s" |
|
6245 |
msgstr "" |
|
6246 |
||
6247 |
#: bzrlib/hooks.py:334
|
|
6248 |
#, python-format
|
|
6249 |
msgid "Deprecated in: %s" |
|
6250 |
msgstr "" |
|
6251 |
||
6252 |
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
|
|
6253 |
msgid "Walking content" |
|
6254 |
msgstr "" |
|
6255 |
||
6256 |
#: bzrlib/knit.py:3330
|
|
6257 |
msgid "annotating" |
|
6258 |
msgstr "" |
|
6259 |
||
6260 |
#: bzrlib/lock.py:548
|
|
6261 |
msgid "{0!r} was {1} locked again" |
|
6262 |
msgstr "" |
|
6263 |
||
6264 |
#: bzrlib/lockdir.py:321
|
|
6265 |
#, python-format
|
|
6266 |
msgid "error removing pending lock: %s" |
|
6267 |
msgstr "" |
|
6268 |
||
6269 |
#: bzrlib/lockdir.py:616
|
|
6270 |
msgid "Unable to obtain" |
|
6271 |
msgstr "" |
|
6272 |
||
6273 |
#: bzrlib/lockdir.py:618
|
|
6274 |
msgid "Lock owner changed for" |
|
6275 |
msgstr "" |
|
6276 |
||
6277 |
#: bzrlib/lockdir.py:620
|
|
6278 |
msgid "{0} lock {1} {2}." |
|
6279 |
msgstr "" |
|
6280 |
||
6281 |
#: bzrlib/lockdir.py:627
|
|
6282 |
#, python-format
|
|
6283 |
msgid "Will continue to try until %s, unless you press Ctrl-C." |
|
6284 |
msgstr "" |
|
6285 |
||
6286 |
#: bzrlib/lockdir.py:629
|
|
6287 |
msgid "See \"bzr help break-lock\" for more." |
|
6288 |
msgstr "" |
|
6289 |
||
6290 |
#: bzrlib/lockdir.py:739
|
|
6291 |
#, python-format
|
|
6292 |
msgid "" |
|
6293 |
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
|
|
6294 |
msgstr "" |
|
6295 |
||
6296 |
#: bzrlib/log.py:572
|
|
6297 |
msgid "--exclude-common-ancestry requires two different revisions" |
|
6298 |
msgstr "" |
|
6299 |
||
6300 |
#: bzrlib/log.py:574
|
|
6301 |
#, python-format
|
|
6302 |
msgid "invalid direction %r" |
|
6303 |
msgstr "" |
|
6304 |
||
6305 |
#: bzrlib/log.py:662
|
|
6306 |
msgid "Start revision not found in history of end revision." |
|
6307 |
msgstr "" |
|
6308 |
||
6309 |
#: bzrlib/log.py:1080 bzrlib/log.py:1138
|
|
6310 |
msgid "Logging revision 0 is invalid." |
|
6311 |
msgstr "" |
|
6312 |
||
6313 |
#: bzrlib/log.py:1082 bzrlib/log.py:1140
|
|
6314 |
msgid "Start revision must be older than the end revision." |
|
6315 |
msgstr "" |
|
6316 |
||
6317 |
#: bzrlib/log.py:1827
|
|
6318 |
#, python-format
|
|
6319 |
msgid "unknown log formatter: %r" |
|
6320 |
msgstr "" |
|
6321 |
||
6322 |
#: bzrlib/log.py:2123
|
|
6323 |
msgid "fixes bug" |
|
6324 |
msgid_plural "fixes bugs" |
|
6325 |
msgstr[0] "" |
|
6326 |
msgstr[1] "" |
|
6327 |
||
6328 |
#: bzrlib/merge.py:689
|
|
6329 |
msgid "All changes applied successfully." |
|
6330 |
msgstr "" |
|
6331 |
||
6332 |
#: bzrlib/merge.py:691
|
|
6333 |
#, python-format
|
|
6334 |
msgid "%d conflicts encountered." |
|
6335 |
msgstr "" |
|
6336 |
||
6337 |
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
|
|
6338 |
msgid "Preparing file merge" |
|
6339 |
msgstr "" |
|
6340 |
||
6341 |
#: bzrlib/multiparent.py:426
|
|
6342 |
msgid "Importing revisions" |
|
6343 |
msgstr "" |
|
6344 |
||
6345 |
#: bzrlib/option.py:526
|
|
6346 |
msgid "Show help message." |
|
6347 |
msgstr "" |
|
6348 |
||
6349 |
#: bzrlib/option.py:528
|
|
6350 |
msgid "Only display errors and warnings." |
|
6351 |
msgstr "" |
|
6352 |
||
6353 |
#: bzrlib/option.py:531
|
|
6354 |
msgid "Show usage message and options." |
|
6355 |
msgstr "" |
|
6356 |
||
6357 |
#: bzrlib/option.py:533
|
|
6358 |
msgid "Display more information." |
|
6359 |
msgstr "" |
|
6360 |
||
6361 |
#: bzrlib/option.py:541
|
|
6362 |
msgid "" |
|
6363 |
"Select changes introduced by the specified revision. See also \"help "
|
|
6364 |
"revisionspec\"."
|
|
6365 |
msgstr "" |
|
6366 |
||
6367 |
#: bzrlib/option.py:543
|
|
6368 |
msgid "Branch to operate on, instead of working directory." |
|
6369 |
msgstr "" |
|
6370 |
||
6371 |
#: bzrlib/option.py:545
|
|
6372 |
msgid "Detailed log format." |
|
6373 |
msgstr "" |
|
6374 |
||
6375 |
#: bzrlib/option.py:545
|
|
6376 |
msgid "Format used by GNU ChangeLog files." |
|
6377 |
msgstr "" |
|
6378 |
||
6379 |
#: bzrlib/option.py:545
|
|
6380 |
msgid "Log format with one line per revision." |
|
6381 |
msgstr "" |
|
6382 |
||
6383 |
#: bzrlib/option.py:545
|
|
6384 |
msgid "Moderately short log format." |
|
6385 |
msgstr "" |
|
6386 |
||
6387 |
#: bzrlib/option.py:545
|
|
6388 |
msgid "Use specified log format." |
|
6389 |
msgstr "" |
|
6390 |
||
6391 |
#: bzrlib/option.py:547
|
|
6392 |
msgid "Log format" |
|
6393 |
msgstr "" |
|
6394 |
||
6395 |
#: bzrlib/option.py:549
|
|
6396 |
msgid "LCA-newness merge." |
|
6397 |
msgstr "" |
|
6398 |
||
6399 |
#: bzrlib/option.py:549
|
|
6400 |
msgid "Merge using external diff3." |
|
6401 |
msgstr "" |
|
6402 |
||
6403 |
#: bzrlib/option.py:549
|
|
6404 |
msgid "Native diff3-style merge." |
|
6405 |
msgstr "" |
|
6406 |
||
6407 |
#: bzrlib/option.py:549
|
|
6408 |
msgid "Select a particular merge algorithm." |
|
6409 |
msgstr "" |
|
6410 |
||
6411 |
#: bzrlib/option.py:549
|
|
6412 |
msgid "Weave-based merge." |
|
6413 |
msgstr "" |
|
6414 |
||
6415 |
#: bzrlib/option.py:551
|
|
6416 |
msgid "Merge algorithm" |
|
6417 |
msgstr "" |
|
6418 |
||
6419 |
#: bzrlib/option.py:554
|
|
6420 |
msgid "Message string." |
|
6421 |
msgstr "" |
|
6422 |
||
6423 |
#: bzrlib/option.py:556
|
|
6424 |
msgid "Use an ASCII NUL (\\0) separator rather than a newline." |
|
6425 |
msgstr "" |
|
6426 |
||
6427 |
#: bzrlib/option.py:558
|
|
6428 |
msgid "Ignore differences between branches and overwrite unconditionally." |
|
6429 |
msgstr "" |
|
6430 |
||
6431 |
#: bzrlib/option.py:560
|
|
6432 |
msgid "Remember the specified location as a default." |
|
6433 |
msgstr "" |
|
6434 |
||
6435 |
#: bzrlib/option.py:562
|
|
6436 |
msgid "Reprocess to reduce spurious conflicts." |
|
6437 |
msgstr "" |
|
6438 |
||
6439 |
#: bzrlib/option.py:566
|
|
6440 |
msgid "See \"help revisionspec\" for details." |
|
6441 |
msgstr "" |
|
6442 |
||
6443 |
#: bzrlib/option.py:568
|
|
6444 |
msgid "Show internal object ids." |
|
6445 |
msgstr "" |
|
6446 |
||
6447 |
#: bzrlib/option.py:571
|
|
6448 |
msgid "Display timezone as local, original, or utc." |
|
6449 |
msgstr "" |
|
6450 |
||
6451 |
#: bzrlib/osutils.py:100
|
|
6452 |
msgid "Parameter {0!r} encoding is unsupported by {1} application locale." |
|
6453 |
msgstr "" |
|
6454 |
||
6455 |
#: bzrlib/osutils.py:220
|
|
6456 |
msgid "lstat/stat of ({0!r}): {1!r}" |
|
6457 |
msgstr "" |
|
6458 |
||
6459 |
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
|
|
6460 |
#, python-format
|
|
6461 |
msgid "sorry, %r not allowed in path" |
|
6462 |
msgstr "" |
|
6463 |
||
6464 |
#: bzrlib/osutils.py:1237
|
|
6465 |
#, python-format
|
|
6466 |
msgid "%r is too short to calculate a relative path" |
|
6467 |
msgstr "" |
|
6468 |
||
6469 |
#: bzrlib/plugin.py:143
|
|
6470 |
#, python-format
|
|
6471 |
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description " |
|
6472 |
msgstr "" |
|
6473 |
||
6474 |
#: bzrlib/plugins/bash_completion/bashcomp.py:411
|
|
6475 |
msgid "Enable completions for the selected plugin (default: all plugins)" |
|
6476 |
msgstr "" |
|
6477 |
||
6478 |
#: bzrlib/plugins/bash_completion/bashcomp.py:412
|
|
6479 |
msgid "Generate a shell function for bash command line completion." |
|
6480 |
msgstr "" |
|
6481 |
||
6482 |
#: bzrlib/plugins/bash_completion/bashcomp.py:414
|
|
6483 |
msgid "" |
|
6484 |
"This command generates a shell function which can be used by bash to\n"
|
|
6485 |
"automatically complete the currently typed command when the user presses\n"
|
|
6486 |
"the completion key (usually tab)."
|
|
6487 |
msgstr "" |
|
6488 |
||
6489 |
#: bzrlib/plugins/bash_completion/bashcomp.py:418
|
|
6490 |
msgid "" |
|
6491 |
"Commonly used like this:\n"
|
|
6492 |
" eval \"`bzr bash-completion`\""
|
|
6493 |
msgstr "" |
|
6494 |
||
6495 |
#: bzrlib/plugins/bash_completion/bashcomp.py:424
|
|
6496 |
msgid "Name of the generated function (default: _bzr)" |
|
6497 |
msgstr "" |
|
6498 |
||
6499 |
#: bzrlib/plugins/bash_completion/bashcomp.py:426
|
|
6500 |
msgid "Generate only the shell function, don't enable it" |
|
6501 |
msgstr "" |
|
6502 |
||
6503 |
#: bzrlib/plugins/launchpad/__init__.py:81
|
|
6504 |
msgid "Register a branch with launchpad.net." |
|
6505 |
msgstr "" |
|
6506 |
||
6507 |
#: bzrlib/plugins/launchpad/__init__.py:83
|
|
6508 |
msgid "" |
|
6509 |
"This command lists a bzr branch in the directory of branches on\n"
|
|
6510 |
"launchpad.net. Registration allows the branch to be associated with\n"
|
|
6511 |
"bugs or specifications."
|
|
6512 |
msgstr "" |
|
6513 |
||
6514 |
#: bzrlib/plugins/launchpad/__init__.py:87
|
|
6515 |
msgid "" |
|
6516 |
"Before using this command you must register the project to which the\n"
|
|
6517 |
"branch belongs, and create an account for yourself on launchpad.net."
|
|
6518 |
msgstr "" |
|
6519 |
||
6520 |
#: bzrlib/plugins/launchpad/__init__.py:90
|
|
6521 |
msgid "" |
|
6522 |
"arguments:\n" |
|
6523 |
" public_url: The publicly visible url for the branch to register.\n"
|
|
6524 |
" This must be an http or https url (which Launchpad can read\n"
|
|
6525 |
" from to access the branch). Local file urls, SFTP urls, and\n"
|
|
6526 |
" bzr+ssh urls will not work.\n"
|
|
6527 |
" If no public_url is provided, bzr will use the configured\n"
|
|
6528 |
" public_url if there is one for the current branch, and\n"
|
|
6529 |
" otherwise error."
|
|
6530 |
msgstr "" |
|
6531 |
||
6532 |
#: bzrlib/plugins/launchpad/__init__.py:99
|
|
6533 |
msgid "" |
|
6534 |
"example:\n" |
|
6535 |
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
|
|
6536 |
" --project fooproject"
|
|
6537 |
msgstr "" |
|
6538 |
||
6539 |
#: bzrlib/plugins/launchpad/__init__.py:106
|
|
6540 |
msgid "Launchpad project short name to associate with the branch." |
|
6541 |
msgstr "" |
|
6542 |
||
6543 |
#: bzrlib/plugins/launchpad/__init__.py:113
|
|
6544 |
msgid "" |
|
6545 |
"Short name for the branch; by default taken from the last component of the "
|
|
6546 |
"url."
|
|
6547 |
msgstr "" |
|
6548 |
||
6549 |
#: bzrlib/plugins/launchpad/__init__.py:117
|
|
6550 |
msgid "One-sentence description of the branch." |
|
6551 |
msgstr "" |
|
6552 |
||
6553 |
#: bzrlib/plugins/launchpad/__init__.py:120
|
|
6554 |
msgid "Longer description of the purpose or contents of the branch." |
|
6555 |
msgstr "" |
|
6556 |
||
6557 |
#: bzrlib/plugins/launchpad/__init__.py:123
|
|
6558 |
msgid "Branch author's email address, if not yourself." |
|
6559 |
msgstr "" |
|
6560 |
||
6561 |
#: bzrlib/plugins/launchpad/__init__.py:126
|
|
6562 |
msgid "The bug this branch fixes." |
|
6563 |
msgstr "" |
|
6564 |
||
6565 |
#: bzrlib/plugins/launchpad/__init__.py:129
|
|
6566 |
msgid "Prepare the request but don't actually send it." |
|
6567 |
msgstr "" |
|
6568 |
||
6569 |
#: bzrlib/plugins/launchpad/__init__.py:151
|
|
6570 |
msgid "" |
|
6571 |
"register-branch requires a public branch url - see bzr help register-branch."
|
|
6572 |
msgstr "" |
|
6573 |
||
6574 |
#: bzrlib/plugins/launchpad/__init__.py:159
|
|
6575 |
msgid "--product is deprecated; please use --project." |
|
6576 |
msgstr "" |
|
6577 |
||
6578 |
#: bzrlib/plugins/launchpad/__init__.py:191
|
|
6579 |
msgid "Open a Launchpad branch page in your web browser." |
|
6580 |
msgstr "" |
|
6581 |
||
6582 |
#: bzrlib/plugins/launchpad/__init__.py:196
|
|
6583 |
msgid "Do not actually open the browser. Just say the URL we would use." |
|
6584 |
msgstr "" |
|
6585 |
||
6586 |
#: bzrlib/plugins/launchpad/__init__.py:231
|
|
6587 |
#, python-format
|
|
6588 |
msgid "Opening %s in web browser" |
|
6589 |
msgstr "" |
|
6590 |
||
6591 |
#: bzrlib/plugins/launchpad/__init__.py:241
|
|
6592 |
msgid "Show or set the Launchpad user ID." |
|
6593 |
msgstr "" |
|
6594 |
||
6595 |
#: bzrlib/plugins/launchpad/__init__.py:243
|
|
6596 |
msgid "" |
|
6597 |
"When communicating with Launchpad, some commands need to know your\n"
|
|
6598 |
"Launchpad user ID. This command can be used to set or show the\n"
|
|
6599 |
"user ID that Bazaar will use for such communication."
|
|
6600 |
msgstr "" |
|
6601 |
||
6602 |
#: bzrlib/plugins/launchpad/__init__.py:247
|
|
6603 |
msgid "" |
|
6604 |
":Examples:\n"
|
|
6605 |
" Show the Launchpad ID of the current user::"
|
|
6606 |
msgstr "" |
|
6607 |
||
6608 |
#: bzrlib/plugins/launchpad/__init__.py:250
|
|
6609 |
msgid " bzr launchpad-login" |
|
6610 |
msgstr "" |
|
6611 |
||
6612 |
#: bzrlib/plugins/launchpad/__init__.py:252
|
|
6613 |
msgid " Set the Launchpad ID of the current user to 'bob'::" |
|
6614 |
msgstr "" |
|
6615 |
||
6616 |
#: bzrlib/plugins/launchpad/__init__.py:254
|
|
6617 |
msgid " bzr launchpad-login bob" |
|
6618 |
msgstr "" |
|
6619 |
||
6620 |
#: bzrlib/plugins/launchpad/__init__.py:261
|
|
6621 |
msgid "Don't check that the user name is valid." |
|
6622 |
msgstr "" |
|
6623 |
||
6624 |
#: bzrlib/plugins/launchpad/__init__.py:276
|
|
6625 |
#: bzrlib/plugins/launchpad/__init__.py:287
|
|
6626 |
msgid "Launchpad user ID exists and has SSH keys.\n" |
|
6627 |
msgstr "" |
|
6628 |
||
6629 |
#: bzrlib/plugins/launchpad/__init__.py:279
|
|
6630 |
msgid "No Launchpad user ID configured.\n" |
|
6631 |
msgstr "" |
|
6632 |
||
6633 |
#: bzrlib/plugins/launchpad/__init__.py:290
|
|
6634 |
#, python-format
|
|
6635 |
msgid "Launchpad user ID set to '%s'.\n" |
|
6636 |
msgstr "" |
|
6637 |
||
6638 |
#: bzrlib/plugins/launchpad/__init__.py:298
|
|
6639 |
msgid "Ask Launchpad to mirror a branch now." |
|
6640 |
msgstr "" |
|
6641 |
||
6642 |
#: bzrlib/plugins/launchpad/__init__.py:318
|
|
6643 |
msgid "Propose merging a branch on Launchpad." |
|
6644 |
msgstr "" |
|
6645 |
||
6646 |
#: bzrlib/plugins/launchpad/__init__.py:320
|
|
6647 |
msgid "" |
|
6648 |
"This will open your usual editor to provide the initial comment. When it\n"
|
|
6649 |
"has created the proposal, it will open it in your default web browser."
|
|
6650 |
msgstr "" |
|
6651 |
||
6652 |
#: bzrlib/plugins/launchpad/__init__.py:323
|
|
6653 |
msgid "" |
|
6654 |
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
|
|
6655 |
"is not supplied, the remembered submit branch will be used. If no submit\n"
|
|
6656 |
"branch is remembered, the development focus will be used."
|
|
6657 |
msgstr "" |
|
6658 |
||
6659 |
#: bzrlib/plugins/launchpad/__init__.py:327
|
|
6660 |
msgid "" |
|
6661 |
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
|
|
6662 |
"the merge proposal. This can be overriden by specifying --review (-R).\n"
|
|
6663 |
"The parameter the launchpad account name of the desired reviewer. This\n"
|
|
6664 |
"may optionally be followed by '=' and the review type. For example:"
|
|
6665 |
msgstr "" |
|
6666 |
||
6667 |
#: bzrlib/plugins/launchpad/__init__.py:332
|
|
6668 |
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa" |
|
6669 |
msgstr "" |
|
6670 |
||
6671 |
#: bzrlib/plugins/launchpad/__init__.py:334
|
|
6672 |
msgid "" |
|
6673 |
"This will propose a merge, request \"jrandom\" to perform a review of\n"
|
|
6674 |
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
|
|
6675 |
msgstr "" |
|
6676 |
||
6677 |
#: bzrlib/plugins/launchpad/__init__.py:339
|
|
6678 |
msgid "Propose the merge on staging." |
|
6679 |
msgstr "" |
|
6680 |
||
6681 |
#: bzrlib/plugins/launchpad/__init__.py:341
|
|
6682 |
msgid "Commit message." |
|
6683 |
msgstr "" |
|
6684 |
||
6685 |
#: bzrlib/plugins/launchpad/__init__.py:343
|
|
6686 |
msgid "Mark the proposal as approved immediately." |
|
6687 |
msgstr "" |
|
6688 |
||
6689 |
#: bzrlib/plugins/launchpad/__init__.py:345
|
|
6690 |
msgid "Requested reviewer and optional type." |
|
6691 |
msgstr "" |
|
6692 |
||
6693 |
#: bzrlib/plugins/launchpad/__init__.py:382
|
|
6694 |
msgid "Find the proposal to merge this revision." |
|
6695 |
msgstr "" |
|
6696 |
||
6697 |
#: bzrlib/plugins/launchpad/__init__.py:384
|
|
6698 |
msgid "" |
|
6699 |
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
|
|
6700 |
"This works only if the selected branch was the merge proposal target, and\n"
|
|
6701 |
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
|
|
6702 |
"are opened in a web browser."
|
|
6703 |
msgstr "" |
|
6704 |
||
6705 |
#: bzrlib/plugins/launchpad/__init__.py:389
|
|
6706 |
msgid "" |
|
6707 |
"Any revision involved in the merge may be specified-- the revision in\n"
|
|
6708 |
"which the merge was performed, or one of the revisions that was merged."
|
|
6709 |
msgstr "" |
|
6710 |
||
6711 |
#: bzrlib/plugins/launchpad/__init__.py:392
|
|
6712 |
msgid "So, to find the merge proposal that reviewed line 1 of README::" |
|
6713 |
msgstr "" |
|
6714 |
||
6715 |
#: bzrlib/plugins/launchpad/__init__.py:394
|
|
6716 |
msgid " bzr lp-find-proposal -r annotate:README:1" |
|
6717 |
msgstr "" |
|
6718 |
||
6719 |
#: bzrlib/plugins/launchpad/__init__.py:409
|
|
6720 |
msgid "No review found." |
|
6721 |
msgstr "" |
|
6722 |
||
6723 |
#: bzrlib/plugins/launchpad/__init__.py:410
|
|
6724 |
#, python-format
|
|
6725 |
msgid "%d proposals(s) found." |
|
6726 |
msgstr "" |
|
6727 |
||
6728 |
#: bzrlib/plugins/launchpad/__init__.py:420
|
|
6729 |
msgid "Finding revision-id" |
|
6730 |
msgstr "" |
|
6731 |
||
6732 |
#: bzrlib/plugins/launchpad/__init__.py:427
|
|
6733 |
msgid "Finding merge" |
|
6734 |
msgstr "" |
|
6735 |
||
6736 |
#: bzrlib/plugins/launchpad/__init__.py:432
|
|
6737 |
msgid "Finding revno" |
|
6738 |
msgstr "" |
|
6739 |
||
6740 |
#: bzrlib/plugins/launchpad/__init__.py:437
|
|
6741 |
msgid "Finding Launchpad branch" |
|
6742 |
msgstr "" |
|
6743 |
||
6744 |
#: bzrlib/plugins/launchpad/__init__.py:440
|
|
6745 |
msgid "Finding proposals" |
|
6746 |
msgstr "" |
|
6747 |
||
6748 |
#: bzrlib/plugins/launchpad/account.py:66
|
|
6749 |
msgid "Setting ssh/sftp usernames for launchpad.net." |
|
6750 |
msgstr "" |
|
6751 |
||
6752 |
#: bzrlib/plugins/launchpad/lp_api.py:241
|
|
6753 |
#: bzrlib/plugins/launchpad/lp_api.py:246
|
|
6754 |
#, python-format
|
|
6755 |
msgid "%s is not registered on Launchpad" |
|
6756 |
msgstr "" |
|
6757 |
||
6758 |
#: bzrlib/plugins/launchpad/lp_api.py:256
|
|
6759 |
#, python-format
|
|
6760 |
msgid "%s has no development focus." |
|
6761 |
msgstr "" |
|
6762 |
||
6763 |
#: bzrlib/plugins/launchpad/lp_api.py:261
|
|
6764 |
#, python-format
|
|
6765 |
msgid "development focus %s has no branch." |
|
6766 |
msgstr "" |
|
6767 |
||
6768 |
#: bzrlib/plugins/launchpad/lp_api.py:266
|
|
6769 |
#, python-format
|
|
6770 |
msgid "source package %s has no branch." |
|
6771 |
msgstr "" |
|
6772 |
||
6773 |
#: bzrlib/plugins/launchpad/lp_api.py:270
|
|
6774 |
#, python-format
|
|
6775 |
msgid "%s has no associated product or source package." |
|
6776 |
msgstr "" |
|
6777 |
||
6778 |
#: bzrlib/plugins/launchpad/lp_api.py:282
|
|
6779 |
#, python-format
|
|
6780 |
msgid "%s is already up-to-date." |
|
6781 |
msgstr "" |
|
6782 |
||
6783 |
#: bzrlib/plugins/launchpad/lp_api.py:289
|
|
6784 |
#, python-format
|
|
6785 |
msgid "Pushing to %s" |
|
6786 |
msgstr "" |
|
6787 |
||
6788 |
#: bzrlib/plugins/launchpad/lp_directory.py:170
|
|
6789 |
msgid "" |
|
6790 |
"resolution for {0}\n"
|
|
6791 |
" local: {1}\n"
|
|
6792 |
" remote: {2}"
|
|
6793 |
msgstr "" |
|
6794 |
||
6795 |
#: bzrlib/plugins/launchpad/lp_propose.py:149
|
|
6796 |
#, python-format
|
|
6797 |
msgid "There is already a branch merge proposal: %s" |
|
6798 |
msgstr "" |
|
6799 |
||
6800 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
|
|
6801 |
msgid "pb parameter to convert() is deprecated" |
|
6802 |
msgstr "" |
|
6803 |
||
6804 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
|
|
6805 |
msgid "starting upgrade from format 4 to 5" |
|
6806 |
msgstr "" |
|
6807 |
||
6808 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
|
|
6809 |
msgid "note: upgrade may be faster if all store files are ungzipped first" |
|
6810 |
msgstr "" |
|
6811 |
||
6812 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
|
|
6813 |
msgid "converting revision" |
|
6814 |
msgstr "" |
|
6815 |
||
6816 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
|
|
6817 |
msgid "upgraded to weaves:" |
|
6818 |
msgstr "" |
|
6819 |
||
6820 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
|
|
6821 |
#, python-format
|
|
6822 |
msgid "%6d revisions and inventories" |
|
6823 |
msgstr "" |
|
6824 |
||
6825 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
|
|
6826 |
#, python-format
|
|
6827 |
msgid "%6d revisions not present" |
|
6828 |
msgstr "" |
|
6829 |
||
6830 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
|
|
6831 |
#, python-format
|
|
6832 |
msgid "%6d texts" |
|
6833 |
msgstr "" |
|
6834 |
||
6835 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
|
|
6836 |
msgid "writing weave" |
|
6837 |
msgstr "" |
|
6838 |
||
6839 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
|
|
6840 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
|
|
6841 |
msgid "inventory" |
|
6842 |
msgstr "" |
|
6843 |
||
6844 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
|
|
6845 |
msgid "write revision" |
|
6846 |
msgstr "" |
|
6847 |
||
6848 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
|
|
6849 |
msgid "loading revision" |
|
6850 |
msgstr "" |
|
6851 |
||
6852 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
|
|
6853 |
#, python-format
|
|
6854 |
msgid "revision {%s} not present in branch; will be converted as a ghost" |
|
6855 |
msgstr "" |
|
6856 |
||
6857 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
|
|
6858 |
msgid "starting upgrade from format 5 to 6" |
|
6859 |
msgstr "" |
|
6860 |
||
6861 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
|
|
6862 |
#, python-format
|
|
6863 |
msgid "adding prefixes to %s" |
|
6864 |
msgstr "" |
|
6865 |
||
6866 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
|
|
6867 |
msgid "starting upgrade from format 6 to metadir" |
|
6868 |
msgstr "" |
|
6869 |
||
6870 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
|
|
6871 |
msgid "Removing ancestry.weave" |
|
6872 |
msgstr "" |
|
6873 |
||
6874 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
|
|
6875 |
msgid "Finding branch files" |
|
6876 |
msgstr "" |
|
6877 |
||
6878 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
|
|
6879 |
msgid "Upgrading repository" |
|
6880 |
msgstr "" |
|
6881 |
||
6882 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
|
|
6883 |
msgid "Upgrading branch" |
|
6884 |
msgstr "" |
|
6885 |
||
6886 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
|
|
6887 |
msgid "No working tree." |
|
6888 |
msgstr "" |
|
6889 |
||
6890 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
|
|
6891 |
msgid "Upgrading working tree" |
|
6892 |
msgstr "" |
|
6893 |
||
6894 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
|
|
6895 |
#, python-format
|
|
6896 |
msgid "Make %s lock" |
|
6897 |
msgstr "" |
|
6898 |
||
6899 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
|
|
6900 |
#, python-format
|
|
6901 |
msgid "Moving %s" |
|
6902 |
msgstr "" |
|
6903 |
||
6904 |
#: bzrlib/push.py:56
|
|
6905 |
msgid "Created new branch." |
|
6906 |
msgstr "" |
|
6907 |
||
6908 |
#: bzrlib/push.py:97
|
|
6909 |
#, python-format
|
|
6910 |
msgid "" |
|
6911 |
"Target directory %s already contains a .bzr directory, but it is not valid."
|
|
6912 |
msgstr "" |
|
6913 |
||
6914 |
#: bzrlib/push.py:101
|
|
6915 |
#, python-format
|
|
6916 |
msgid "" |
|
6917 |
"Target directory %s already exists, but does not have a .bzr directory. "
|
|
6918 |
"Supply --use-existing-dir to push there anyway."
|
|
6919 |
msgstr "" |
|
6920 |
||
6921 |
#: bzrlib/push.py:122
|
|
6922 |
#, python-format
|
|
6923 |
msgid "Too many redirections trying to make %s." |
|
6924 |
msgstr "" |
|
6925 |
||
6926 |
#: bzrlib/push.py:147
|
|
6927 |
msgid "" |
|
6928 |
"These branches have diverged. See \"bzr help diverged-branches\" for more "
|
|
6929 |
"information."
|
|
6930 |
msgstr "" |
|
6931 |
||
6932 |
#: bzrlib/push.py:151
|
|
6933 |
#, python-format
|
|
6934 |
msgid "" |
|
6935 |
"It is not possible to losslessly push to %s. You may want to use dpush "
|
|
6936 |
"instead."
|
|
6937 |
msgstr "" |
|
6938 |
||
6939 |
#: bzrlib/push.py:157
|
|
6940 |
#, python-format
|
|
6941 |
msgid "" |
|
6942 |
"At %s you have a valid .bzr control directory, but not a branch or "
|
|
6943 |
"repository. This is an unsupported configuration. Please move the target "
|
|
6944 |
"directory out of the way and try again."
|
|
6945 |
msgstr "" |
|
6946 |
||
6947 |
#: bzrlib/reconcile.py:97
|
|
6948 |
#, python-format
|
|
6949 |
msgid "Reconciling branch %s" |
|
6950 |
msgstr "" |
|
6951 |
||
6952 |
#: bzrlib/reconcile.py:103
|
|
6953 |
#, python-format
|
|
6954 |
msgid "Reconciling repository %s" |
|
6955 |
msgstr "" |
|
6956 |
||
6957 |
#: bzrlib/reconcile.py:105
|
|
6958 |
msgid "Reconciling repository" |
|
6959 |
msgstr "" |
|
6960 |
||
6961 |
#: bzrlib/reconcile.py:111
|
|
6962 |
#, python-format
|
|
6963 |
msgid "%s cannot canonicalize CHKs." |
|
6964 |
msgstr "" |
|
6965 |
||
6966 |
#: bzrlib/reconcile.py:119
|
|
6967 |
msgid "Reconcile aborted: revision index has inconsistent parents." |
|
6968 |
msgstr "" |
|
6969 |
||
6970 |
#: bzrlib/reconcile.py:121
|
|
6971 |
msgid "Run \"bzr check\" for more details." |
|
6972 |
msgstr "" |
|
6973 |
||
6974 |
#: bzrlib/reconcile.py:123
|
|
6975 |
msgid "Reconciliation complete." |
|
6976 |
msgstr "" |
|
6977 |
||
6978 |
#: bzrlib/reconcile.py:166
|
|
6979 |
msgid "Fixing last revision info {0} => {1}" |
|
6980 |
msgstr "" |
|
6981 |
||
6982 |
#: bzrlib/reconcile.py:173
|
|
6983 |
msgid "revision_history ok." |
|
6984 |
msgstr "" |
|
6985 |
||
6986 |
#: bzrlib/reconcile.py:234
|
|
6987 |
msgid "Reading inventory data" |
|
6988 |
msgstr "" |
|
6989 |
||
6990 |
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
|
|
6991 |
msgid "Inventory ok." |
|
6992 |
msgstr "" |
|
6993 |
||
6994 |
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
|
|
6995 |
msgid "Backing up inventory" |
|
6996 |
msgstr "" |
|
6997 |
||
6998 |
#: bzrlib/reconcile.py:258
|
|
6999 |
msgid "Backup inventory created." |
|
7000 |
msgstr "" |
|
7001 |
||
7002 |
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
|
|
7003 |
msgid "Writing weave" |
|
7004 |
msgstr "" |
|
7005 |
||
7006 |
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
|
|
7007 |
msgid "Inventory regenerated." |
|
7008 |
msgstr "" |
|
7009 |
||
7010 |
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
|
|
7011 |
msgid "Reading indexes" |
|
7012 |
msgstr "" |
|
7013 |
||
7014 |
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
|
|
7015 |
msgid "Checking unused inventories" |
|
7016 |
msgstr "" |
|
7017 |
||
7018 |
#: bzrlib/reconcile.py:388
|
|
7019 |
msgid "Backup Inventory created" |
|
7020 |
msgstr "" |
|
7021 |
||
7022 |
#: bzrlib/reconcile.py:446
|
|
7023 |
msgid "Fixing text parents" |
|
7024 |
msgstr "" |
|
7025 |
||
7026 |
#: bzrlib/reconfigure.py:54
|
|
7027 |
msgid "{0} is now stacked on {1}\n" |
|
7028 |
msgstr "" |
|
7029 |
||
7030 |
#: bzrlib/reconfigure.py:69
|
|
7031 |
#, python-format
|
|
7032 |
msgid "%s is now not stacked\n" |
|
7033 |
msgstr "" |
|
7034 |
||
7035 |
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
|
|
7036 |
#, python-format
|
|
7037 |
msgid "bzr: ERROR (ignored): %s" |
|
7038 |
msgstr "" |
|
7039 |
||
7040 |
#: bzrlib/remote.py:2541
|
|
7041 |
msgid "Copying repository content as tarball..." |
|
7042 |
msgstr "" |
|
7043 |
||
7044 |
#: bzrlib/rename_map.py:69
|
|
7045 |
msgid "Calculating hashes" |
|
7046 |
msgstr "" |
|
7047 |
||
7048 |
#: bzrlib/rename_map.py:107
|
|
7049 |
msgid "Determining hash hits" |
|
7050 |
msgstr "" |
|
7051 |
||
7052 |
#: bzrlib/rename_map.py:242
|
|
7053 |
msgid "{0} => {1}" |
|
7054 |
msgstr "" |
|
7055 |
||
7056 |
#: bzrlib/repository.py:1787
|
|
7057 |
msgid "Moving repository to repository.backup" |
|
7058 |
msgstr "" |
|
7059 |
||
7060 |
#: bzrlib/repository.py:1794
|
|
7061 |
msgid "Creating new repository" |
|
7062 |
msgstr "" |
|
7063 |
||
7064 |
#: bzrlib/repository.py:1799
|
|
7065 |
msgid "Copying content" |
|
7066 |
msgstr "" |
|
7067 |
||
7068 |
#: bzrlib/repository.py:1803
|
|
7069 |
msgid "Deleting old repository content" |
|
7070 |
msgstr "" |
|
7071 |
||
7072 |
#: bzrlib/repository.py:1805
|
|
7073 |
msgid "repository converted" |
|
7074 |
msgstr "" |
|
7075 |
||
7076 |
#: bzrlib/revisionspec.py:903
|
|
7077 |
msgid "Using {0} {1}" |
|
7078 |
msgstr "" |
|
7079 |
||
7080 |
#: bzrlib/send.py:58
|
|
7081 |
#, python-format
|
|
7082 |
msgid "Mail client \"%s\" does not support specifying body" |
|
7083 |
msgstr "" |
|
7084 |
||
7085 |
#: bzrlib/send.py:62
|
|
7086 |
msgid "--remember requires a branch to be specified." |
|
7087 |
msgstr "" |
|
7088 |
||
7089 |
#: bzrlib/send.py:77
|
|
7090 |
msgid "No submit branch known or specified" |
|
7091 |
msgstr "" |
|
7092 |
||
7093 |
#: bzrlib/send.py:80
|
|
7094 |
msgid "Using saved {0} location \"{1}\" to determine what changes to submit." |
|
7095 |
msgstr "" |
|
7096 |
||
7097 |
#: bzrlib/send.py:98
|
|
7098 |
#, python-format
|
|
7099 |
msgid "No such send format '%s'." |
|
7100 |
msgstr "" |
|
7101 |
||
7102 |
#: bzrlib/send.py:114
|
|
7103 |
msgid "bzr send takes at most two one revision identifiers" |
|
7104 |
msgstr "" |
|
7105 |
||
7106 |
#: bzrlib/send.py:127
|
|
7107 |
msgid "No revisions to submit." |
|
7108 |
msgstr "" |
|
7109 |
||
7110 |
#: bzrlib/send.py:139
|
|
7111 |
msgid "" |
|
7112 |
"- not supported for merge directives that use more than one output file."
|
|
7113 |
msgstr "" |
|
7114 |
||
7115 |
#: bzrlib/send.py:185
|
|
7116 |
msgid "Format 0.9 does not permit bundle with no patch" |
|
7117 |
msgstr "" |
|
7118 |
||
7119 |
#: bzrlib/shelf_ui.py:46
|
|
7120 |
#, python-format
|
|
7121 |
msgid "Shelve adding file \"%(path)s\"?" |
|
7122 |
msgstr "" |
|
7123 |
||
7124 |
#: bzrlib/shelf_ui.py:47
|
|
7125 |
msgid "Shelve binary changes?" |
|
7126 |
msgstr "" |
|
7127 |
||
7128 |
#: bzrlib/shelf_ui.py:48
|
|
7129 |
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?" |
|
7130 |
msgstr "" |
|
7131 |
||
7132 |
#: bzrlib/shelf_ui.py:50
|
|
7133 |
#, python-format
|
|
7134 |
msgid "Shelve removing file \"%(path)s\"?" |
|
7135 |
msgstr "" |
|
7136 |
||
7137 |
#: bzrlib/shelf_ui.py:51
|
|
7138 |
#, python-format
|
|
7139 |
msgid "Shelve %d change(s)?" |
|
7140 |
msgstr "" |
|
7141 |
||
7142 |
#: bzrlib/shelf_ui.py:52
|
|
7143 |
msgid "Shelve?" |
|
7144 |
msgstr "" |
|
7145 |
||
7146 |
#: bzrlib/shelf_ui.py:53
|
|
7147 |
#, python-format
|
|
7148 |
msgid "" |
|
7149 |
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
|
|
7150 |
msgstr "" |
|
7151 |
||
7152 |
#: bzrlib/shelf_ui.py:55
|
|
7153 |
#, python-format
|
|
7154 |
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?" |
|
7155 |
msgstr "" |
|
7156 |
||
7157 |
#: bzrlib/shelf_ui.py:70
|
|
7158 |
#, python-format
|
|
7159 |
msgid "Changes shelved with id \"%d\"." |
|
7160 |
msgstr "" |
|
7161 |
||
7162 |
#: bzrlib/shelf_ui.py:74
|
|
7163 |
msgid "Selected changes destroyed." |
|
7164 |
msgstr "" |
|
7165 |
||
7166 |
#: bzrlib/shelf_ui.py:78
|
|
7167 |
msgid "Selected changes:" |
|
7168 |
msgstr "" |
|
7169 |
||
7170 |
#: bzrlib/shelf_ui.py:98
|
|
7171 |
#, python-format
|
|
7172 |
msgid "Delete file \"%(path)s\"?" |
|
7173 |
msgstr "" |
|
7174 |
||
7175 |
#: bzrlib/shelf_ui.py:99
|
|
7176 |
msgid "Apply binary changes?" |
|
7177 |
msgstr "" |
|
7178 |
||
7179 |
#: bzrlib/shelf_ui.py:100
|
|
7180 |
#, python-format
|
|
7181 |
msgid "Change \"%(path)s\" from %(this)s to %(other)s?" |
|
7182 |
msgstr "" |
|
7183 |
||
7184 |
#: bzrlib/shelf_ui.py:102
|
|
7185 |
#, python-format
|
|
7186 |
msgid "Add file \"%(path)s\"?" |
|
7187 |
msgstr "" |
|
7188 |
||
7189 |
#: bzrlib/shelf_ui.py:103
|
|
7190 |
#, python-format
|
|
7191 |
msgid "Apply %d change(s)?" |
|
7192 |
msgstr "" |
|
7193 |
||
7194 |
#: bzrlib/shelf_ui.py:104
|
|
7195 |
msgid "Apply change?" |
|
7196 |
msgstr "" |
|
7197 |
||
7198 |
#: bzrlib/shelf_ui.py:105
|
|
7199 |
#, python-format
|
|
7200 |
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?" |
|
7201 |
msgstr "" |
|
7202 |
||
7203 |
#: bzrlib/shelf_ui.py:107
|
|
7204 |
#, python-format
|
|
7205 |
msgid "Rename \"%(this)s\" => \"%(other)s\"?" |
|
7206 |
msgstr "" |
|
7207 |
||
7208 |
#: bzrlib/shelf_ui.py:402
|
|
7209 |
msgid "No changes are shelved." |
|
7210 |
msgstr "" |
|
7211 |
||
7212 |
#: bzrlib/shelf_ui.py:460
|
|
7213 |
#, python-format
|
|
7214 |
msgid "Using changes with id \"%d\"." |
|
7215 |
msgstr "" |
|
7216 |
||
7217 |
#: bzrlib/shelf_ui.py:464
|
|
7218 |
#, python-format
|
|
7219 |
msgid "Message: %s" |
|
7220 |
msgstr "" |
|
7221 |
||
7222 |
#: bzrlib/shelf_ui.py:476
|
|
7223 |
#, python-format
|
|
7224 |
msgid "Deleted changes with id \"%d\"." |
|
7225 |
msgstr "" |
|
7226 |
||
7227 |
#: bzrlib/smart/medium.py:714
|
|
7228 |
msgid "HPSS calls: {0} ({1} vfs) {2}" |
|
7229 |
msgstr "" |
|
7230 |
||
7231 |
#: bzrlib/smart/server.py:169
|
|
7232 |
msgid "Requested to stop gracefully" |
|
7233 |
msgstr "" |
|
7234 |
||
7235 |
#: bzrlib/smart/server.py:179
|
|
7236 |
#, python-format
|
|
7237 |
msgid "Waiting for %d client(s) to finish" |
|
7238 |
msgstr "" |
|
7239 |
||
7240 |
#: bzrlib/smart/server.py:185
|
|
7241 |
#, python-format
|
|
7242 |
msgid "Still waiting for %d client(s) to finish" |
|
7243 |
msgstr "" |
|
7244 |
||
7245 |
#: bzrlib/smart/server.py:219
|
|
7246 |
#, python-format
|
|
7247 |
msgid "listening socket error: %s" |
|
7248 |
msgstr "" |
|
7249 |
||
7250 |
#: bzrlib/smart/server.py:452
|
|
7251 |
#, python-format
|
|
7252 |
msgid "listening on port: %s" |
|
7253 |
msgstr "" |
|
7254 |
||
7255 |
#: bzrlib/switch.py:73
|
|
7256 |
msgid "Pending merges must be committed or reverted before using switch." |
|
7257 |
msgstr "" |
|
7258 |
||
7259 |
#: bzrlib/switch.py:100
|
|
7260 |
msgid "" |
|
7261 |
"Cannot switch as local commits found in the checkout. Commit these to the "
|
|
7262 |
"bound branch or use --force to throw them away."
|
|
7263 |
msgstr "" |
|
7264 |
||
7265 |
#: bzrlib/switch.py:105
|
|
7266 |
#, python-format
|
|
7267 |
msgid "" |
|
7268 |
"Unable to connect to current master branch %(target)s: %(error)s To switch "
|
|
7269 |
"anyway, use --force."
|
|
7270 |
msgstr "" |
|
7271 |
||
7272 |
#: bzrlib/switch.py:125
|
|
7273 |
msgid "Cannot switch a branch, only a checkout." |
|
7274 |
msgstr "" |
|
7275 |
||
7276 |
#: bzrlib/switch.py:163
|
|
7277 |
#, python-format
|
|
7278 |
msgid "Tree is up to date at revision %d." |
|
7279 |
msgstr "" |
|
7280 |
||
7281 |
#: bzrlib/switch.py:169
|
|
7282 |
#, python-format
|
|
7283 |
msgid "Updated to revision %d." |
|
7284 |
msgstr "" |
|
7285 |
||
7286 |
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
|
|
7287 |
msgid "Apply phase" |
|
7288 |
msgstr "" |
|
7289 |
||
7290 |
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
|
|
7291 |
msgid "removing file" |
|
7292 |
msgstr "" |
|
7293 |
||
7294 |
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
|
|
7295 |
msgid "adding file" |
|
7296 |
msgstr "" |
|
7297 |
||
7298 |
#: bzrlib/transform.py:2591
|
|
7299 |
msgid "Building tree" |
|
7300 |
msgstr "" |
|
7301 |
||
7302 |
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
|
|
7303 |
msgid "Adding file contents" |
|
7304 |
msgstr "" |
|
7305 |
||
7306 |
#: bzrlib/transform.py:3028
|
|
7307 |
msgid "Resolution pass" |
|
7308 |
msgstr "" |
|
7309 |
||
7310 |
#: bzrlib/transport/ftp/_gssapi.py:88
|
|
7311 |
#, python-format
|
|
7312 |
msgid "Authenticated as %s" |
|
7313 |
msgstr "" |
|
7314 |
||
7315 |
#: bzrlib/tree.py:634
|
|
7316 |
msgid "*** {0} content-filter: {1} => {2!r}" |
|
7317 |
msgstr "" |
|
7318 |
||
7319 |
#: bzrlib/upgrade.py:77
|
|
7320 |
#, python-format
|
|
7321 |
msgid "This is a checkout. The branch (%s) needs to be upgraded separately." |
|
7322 |
msgstr "" |
|
7323 |
||
7324 |
#: bzrlib/upgrade.py:100
|
|
7325 |
#, python-format
|
|
7326 |
msgid "cannot upgrade from bzrdir format %s" |
|
7327 |
msgstr "" |
|
7328 |
||
7329 |
#: bzrlib/upgrade.py:103
|
|
7330 |
#, python-format
|
|
7331 |
msgid "starting upgrade of %s" |
|
7332 |
msgstr "" |
|
7333 |
||
7334 |
#: bzrlib/upgrade.py:110
|
|
7335 |
msgid "finished" |
|
7336 |
msgstr "" |
|
7337 |
||
7338 |
#: bzrlib/upgrade.py:120
|
|
7339 |
msgid "Deleting backup.bzr" |
|
7340 |
msgstr "" |
|
7341 |
||
7342 |
#: bzrlib/upgrade.py:151
|
|
7343 |
msgid "" |
|
7344 |
"\n"
|
|
7345 |
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed" |
|
7346 |
msgstr "" |
|
7347 |
||
7348 |
#: bzrlib/upgrade.py:208
|
|
7349 |
#, python-format
|
|
7350 |
msgid "Found %d dependent branches - upgrading ..." |
|
7351 |
msgstr "" |
|
7352 |
||
7353 |
#: bzrlib/upgrade.py:276
|
|
7354 |
msgid "Upgrading bzrdirs" |
|
7355 |
msgstr "" |
|
7356 |
||
7357 |
#: bzrlib/upgrade.py:282
|
|
7358 |
#, python-format
|
|
7359 |
msgid "Upgrading %s" |
|
7360 |
msgstr "" |
|
7361 |
||
7362 |
#: bzrlib/upgrade.py:283
|
|
7363 |
msgid "Upgrading {0} {1} ..." |
|
7364 |
msgstr "" |
|
7365 |
||
7366 |
#: bzrlib/upgrade.py:301
|
|
7367 |
msgid "Removing backup ..." |
|
7368 |
msgstr "" |
|
7369 |
||
7370 |
#: bzrlib/upgrade.py:305
|
|
7371 |
msgid "failed to clean-up {0}: {1}" |
|
7372 |
msgstr "" |
|
7373 |
||
7374 |
#: bzrlib/vf_repository.py:1090
|
|
7375 |
msgid "inventories" |
|
7376 |
msgstr "" |
|
7377 |
||
7378 |
#: bzrlib/vf_repository.py:1116
|
|
7379 |
msgid "texts" |
|
7380 |
msgstr "" |
|
7381 |
||
7382 |
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
|
|
7383 |
msgid "Calculating text parents" |
|
7384 |
msgstr "" |
|
7385 |
||
7386 |
#: bzrlib/vf_repository.py:1706
|
|
7387 |
msgid "Fetch texts" |
|
7388 |
msgstr "" |
|
7389 |
||
7390 |
#: bzrlib/vf_repository.py:2535
|
|
7391 |
msgid "loading text store" |
|
7392 |
msgstr "" |
|
7393 |
||
7394 |
#: bzrlib/vf_repository.py:2541
|
|
7395 |
msgid "checking text graph" |
|
7396 |
msgstr "" |
|
7397 |
||
7398 |
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
|
|
7399 |
#: bzrlib/vf_repository.py:3124
|
|
7400 |
msgid "Transferring revisions" |
|
7401 |
msgstr "" |
|
7402 |
||
7403 |
#: bzrlib/win32utils.py:146
|
|
7404 |
msgid "Failed to GetProcessMemoryInfo()" |
|
7405 |
msgstr "" |
|
7406 |
||
7407 |
#: bzrlib/win32utils.py:167
|
|
7408 |
msgid "Cannot debug memory on win32 without ctypes or win32process" |
|
7409 |
msgstr "" |
|
7410 |
||
7411 |
#: bzrlib/win32utils.py:172
|
|
7412 |
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}" |
|
7413 |
msgstr "" |
|
7414 |
||
7415 |
#: bzrlib/win32utils.py:180
|
|
7416 |
#, python-format
|
|
7417 |
msgid "WorkingSize %8d KiB" |
|
7418 |
msgstr "" |
|
7419 |
||
7420 |
#: bzrlib/win32utils.py:181
|
|
7421 |
#, python-format
|
|
7422 |
msgid "PeakWorking %8d KiB" |
|
7423 |
msgstr "" |
|
7424 |
||
7425 |
#: bzrlib/win32utils.py:182
|
|
7426 |
#, python-format
|
|
7427 |
msgid "PagefileUsage %8d KiB" |
|
7428 |
msgstr "" |
|
7429 |
||
7430 |
#: bzrlib/win32utils.py:183
|
|
7431 |
#, python-format
|
|
7432 |
msgid "PeakPagefileUsage %8d KiB" |
|
7433 |
msgstr "" |
|
7434 |
||
7435 |
#: bzrlib/win32utils.py:185
|
|
7436 |
#, python-format
|
|
7437 |
msgid "PrivateUsage %8d KiB" |
|
7438 |
msgstr "" |
|
7439 |
||
7440 |
#: bzrlib/win32utils.py:186
|
|
7441 |
#, python-format
|
|
7442 |
msgid "PageFaultCount %8d" |
|
7443 |
msgstr "" |
|
7444 |
||
7445 |
#: bzrlib/workingtree.py:1478
|
|
7446 |
msgid "Rerun update after fixing the conflicts." |
|
7447 |
msgstr "" |
|
7448 |
||
7449 |
#: dummy/help_topics/authentication/summary.txt:1
|
|
7450 |
msgid "Information on configuring authentication" |
|
7451 |
msgstr "" |
|
7452 |
||
7453 |
#: dummy/help_topics/basic/detail.txt:1
|
|
7454 |
msgid "" |
|
7455 |
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
|
|
7456 |
"http://bazaar.canonical.com/" |
|
7457 |
msgstr "" |
|
7458 |
||
7459 |
#: dummy/help_topics/basic/detail.txt:4
|
|
7460 |
msgid "" |
|
7461 |
"Basic commands:\n"
|
|
7462 |
" bzr init makes this directory a versioned branch\n"
|
|
7463 |
" bzr branch make a copy of another branch"
|
|
7464 |
msgstr "" |
|
7465 |
||
7466 |
#: dummy/help_topics/basic/detail.txt:8
|
|
7467 |
msgid "" |
|
7468 |
" bzr add make files or directories versioned\n"
|
|
7469 |
" bzr ignore ignore a file or pattern\n"
|
|
7470 |
" bzr mv move or rename a versioned file"
|
|
7471 |
msgstr "" |
|
7472 |
||
7473 |
#: dummy/help_topics/basic/detail.txt:12
|
|
7474 |
msgid "" |
|
7475 |
" bzr status summarize changes in working copy\n"
|
|
7476 |
" bzr diff show detailed diffs"
|
|
7477 |
msgstr "" |
|
7478 |
||
7479 |
#: dummy/help_topics/basic/detail.txt:15
|
|
7480 |
msgid "" |
|
7481 |
" bzr merge pull in changes from another branch\n"
|
|
7482 |
" bzr commit save some or all changes\n"
|
|
7483 |
" bzr send send changes via email"
|
|
7484 |
msgstr "" |
|
7485 |
||
7486 |
#: dummy/help_topics/basic/detail.txt:19
|
|
7487 |
msgid "" |
|
7488 |
" bzr log show history of changes\n"
|
|
7489 |
" bzr check validate storage"
|
|
7490 |
msgstr "" |
|
7491 |
||
7492 |
#: dummy/help_topics/basic/detail.txt:22
|
|
7493 |
msgid "" |
|
7494 |
" bzr help init more help on e.g. init command\n"
|
|
7495 |
" bzr help commands list all commands\n"
|
|
7496 |
" bzr help topics list all help topics\n"
|
|
7497 |
msgstr "" |
|
7498 |
||
7499 |
#: dummy/help_topics/basic/summary.txt:1
|
|
7500 |
msgid "Basic commands" |
|
7501 |
msgstr "" |
|
7502 |
||
7503 |
#: dummy/help_topics/branches/detail.txt:1
|
|
7504 |
msgid "Branches" |
|
7505 |
msgstr "" |
|
7506 |
||
7507 |
#: dummy/help_topics/branches/detail.txt:3
|
|
7508 |
msgid "" |
|
7509 |
"A branch consists of the state of a project, including all of its\n"
|
|
7510 |
"history. All branches have a repository associated (which is where the\n"
|
|
7511 |
"branch history is stored), but multiple branches may share the same\n"
|
|
7512 |
"repository (a shared repository). Branches can be copied and merged."
|
|
7513 |
msgstr "" |
|
7514 |
||
7515 |
#: dummy/help_topics/branches/detail.txt:8
|
|
7516 |
msgid "" |
|
7517 |
"In addition, one branch may be bound to another one. Binding to another\n"
|
|
7518 |
"branch indicates that commits which happen in this branch must also \n"
|
|
7519 |
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
|
|
7520 |
"commits when the two branches are out of date. In order for a commit \n"
|
|
7521 |
"to succeed, it may be necessary to update the current branch using \n"
|
|
7522 |
"``bzr update``."
|
|
7523 |
msgstr "" |
|
7524 |
||
7525 |
#: dummy/help_topics/branches/detail.txt:15
|
|
7526 |
#: dummy/help_topics/checkouts/detail.txt:66
|
|
7527 |
#: dummy/help_topics/repositories/detail.txt:36
|
|
7528 |
msgid "Related commands::" |
|
7529 |
msgstr "" |
|
7530 |
||
7531 |
#: dummy/help_topics/branches/detail.txt:17
|
|
7532 |
msgid "" |
|
7533 |
" init Change a directory into a versioned branch.\n"
|
|
7534 |
" branch Create a new branch that is a copy of an existing branch.\n"
|
|
7535 |
" merge Perform a three-way merge.\n"
|
|
7536 |
" bind Bind a branch to another one.\n"
|
|
7537 |
msgstr "" |
|
7538 |
||
7539 |
#: dummy/help_topics/branches/summary.txt:1
|
|
7540 |
msgid "Information on what a branch is" |
|
7541 |
msgstr "" |
|
7542 |
||
7543 |
#: dummy/help_topics/bugs/summary.txt:1
|
|
7544 |
msgid "Bug tracker settings" |
|
7545 |
msgstr "" |
|
7546 |
||
7547 |
#: dummy/help_topics/checkouts/detail.txt:1
|
|
7548 |
msgid "Checkouts" |
|
7549 |
msgstr "" |
|
7550 |
||
7551 |
#: dummy/help_topics/checkouts/detail.txt:3
|
|
7552 |
msgid "" |
|
7553 |
"Checkouts are source trees that are connected to a branch, so that when\n"
|
|
7554 |
"you commit in the source tree, the commit goes into that branch. They\n"
|
|
7555 |
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
|
|
7556 |
"Bazaar's decentralized features until you want them. Using checkouts\n"
|
|
7557 |
"with shared repositories is very similar to working with SVN or CVS, but\n"
|
|
7558 |
"doesn't have the same restrictions. And using checkouts still allows\n"
|
|
7559 |
"others working on the project to use whatever workflow they like."
|
|
7560 |
msgstr "" |
|
7561 |
||
7562 |
#: dummy/help_topics/checkouts/detail.txt:11
|
|
7563 |
msgid "" |
|
7564 |
"A checkout is created with the bzr checkout command (see \"help "
|
|
7565 |
"checkout\").\n"
|
|
7566 |
"You pass it a reference to another branch, and it will create a local copy\n"
|
|
7567 |
"for you that still contains a reference to the branch you created the\n"
|
|
7568 |
"checkout from (the master branch). Then if you make any commits they will "
|
|
7569 |
"be\n"
|
|
7570 |
"made on the other branch first. This creates an instant mirror of your work, "
|
|
7571 |
"or\n"
|
|
7572 |
"facilitates lockstep development, where each developer is working together,\n"
|
|
7573 |
"continuously integrating the changes of others."
|
|
7574 |
msgstr "" |
|
7575 |
||
7576 |
#: dummy/help_topics/checkouts/detail.txt:19
|
|
7577 |
msgid "" |
|
7578 |
"However the checkout is still a first class branch in Bazaar terms, so that\n"
|
|
7579 |
"you have the full history locally. As you have a first class branch you "
|
|
7580 |
"can\n"
|
|
7581 |
"also commit locally if you want, for instance due to the temporary loss af "
|
|
7582 |
"a\n"
|
|
7583 |
"network connection. Use the --local option to commit to do this. All the "
|
|
7584 |
"local\n"
|
|
7585 |
"commits will then be made on the master branch the next time you do a non-"
|
|
7586 |
"local\n"
|
|
7587 |
"commit."
|
|
7588 |
msgstr "" |
|
7589 |
||
7590 |
#: dummy/help_topics/checkouts/detail.txt:26
|
|
7591 |
msgid "" |
|
7592 |
"If you are using a checkout from a shared branch you will periodically want "
|
|
7593 |
"to\n"
|
|
7594 |
"pull in all the changes made by others. This is done using the \"update\"\n"
|
|
7595 |
"command. The changes need to be applied before any non-local commit, but\n"
|
|
7596 |
"Bazaar will tell you if there are any changes and suggest that you use this\n"
|
|
7597 |
"command when needed."
|
|
7598 |
msgstr "" |
|
7599 |
||
7600 |
#: dummy/help_topics/checkouts/detail.txt:32
|
|
7601 |
msgid "" |
|
7602 |
"It is also possible to create a \"lightweight\" checkout by passing the\n"
|
|
7603 |
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
|
|
7604 |
"SVN checkout in that it is not a first class branch, it mainly consists of "
|
|
7605 |
"the\n"
|
|
7606 |
"working tree. This means that any history operations must query the master\n"
|
|
7607 |
"branch, which could be slow if a network connection is involved. Also, as "
|
|
7608 |
"you\n"
|
|
7609 |
"don't have a local branch, then you cannot commit locally."
|
|
7610 |
msgstr "" |
|
7611 |
||
7612 |
#: dummy/help_topics/checkouts/detail.txt:39
|
|
7613 |
msgid "" |
|
7614 |
"Lightweight checkouts work best when you have fast reliable access to the\n"
|
|
7615 |
"master branch. This means that if the master branch is on the same disk or "
|
|
7616 |
"LAN\n"
|
|
7617 |
"a lightweight checkout will be faster than a heavyweight one for any "
|
|
7618 |
"commands\n"
|
|
7619 |
"that modify the revision history (as only one copy of the branch needs to\n"
|
|
7620 |
"be updated). Heavyweight checkouts will generally be faster for any command\n"
|
|
7621 |
"that uses the history but does not change it, but if the master branch is "
|
|
7622 |
"on\n"
|
|
7623 |
"the same disk then there won't be a noticeable difference."
|
|
7624 |
msgstr "" |
|
7625 |
||
7626 |
#: dummy/help_topics/checkouts/detail.txt:47
|
|
7627 |
msgid "" |
|
7628 |
"Another possible use for a checkout is to use it with a treeless repository\n"
|
|
7629 |
"containing your branches, where you maintain only one working tree by\n"
|
|
7630 |
"switching the master branch that the checkout points to when you want to\n"
|
|
7631 |
"work on a different branch."
|
|
7632 |
msgstr "" |
|
7633 |
||
7634 |
#: dummy/help_topics/checkouts/detail.txt:52
|
|
7635 |
msgid "" |
|
7636 |
"Obviously to commit on a checkout you need to be able to write to the "
|
|
7637 |
"master\n"
|
|
7638 |
"branch. This means that the master branch must be accessible over a "
|
|
7639 |
"writeable\n"
|
|
7640 |
"protocol , such as sftp://, and that you have write permissions at the "
|
|
7641 |
"other\n"
|
|
7642 |
"end. Checkouts also work on the local file system, so that all that matters "
|
|
7643 |
"is\n"
|
|
7644 |
"file permissions."
|
|
7645 |
msgstr "" |
|
7646 |
||
7647 |
#: dummy/help_topics/checkouts/detail.txt:58
|
|
7648 |
msgid "" |
|
7649 |
"You can change the master of a checkout by using the \"switch\" command "
|
|
7650 |
"(see\n"
|
|
7651 |
"\"help switch\"). This will change the location that the commits are sent "
|
|
7652 |
"to.\n"
|
|
7653 |
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
|
|
7654 |
"checkout. If you would like to convert your heavy checkout into a normal\n"
|
|
7655 |
"branch so that every commit is local, you can use the \"unbind\" command. To "
|
|
7656 |
"see\n"
|
|
7657 |
"whether or not a branch is bound or not you can use the \"info\" command. If "
|
|
7658 |
"the\n"
|
|
7659 |
"branch is bound it will tell you the location of the bound branch."
|
|
7660 |
msgstr "" |
|
7661 |
||
7662 |
#: dummy/help_topics/checkouts/detail.txt:68
|
|
7663 |
msgid "" |
|
7664 |
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
|
|
7665 |
" checkout\n"
|
|
7666 |
" update Pull any changes in the master branch in to your checkout\n"
|
|
7667 |
" commit Make a commit that is sent to the master branch. If you have\n"
|
|
7668 |
" a heavy checkout then the --local option will commit to the\n"
|
|
7669 |
" checkout without sending the commit to the master\n"
|
|
7670 |
" switch Change the master branch that the commits in the checkout "
|
|
7671 |
"will\n"
|
|
7672 |
" be sent to\n"
|
|
7673 |
" bind Turn a standalone branch into a heavy checkout so that any\n"
|
|
7674 |
" commits will be sent to the master branch\n"
|
|
7675 |
" unbind Turn a heavy checkout into a standalone branch so that any\n"
|
|
7676 |
" commits are only made locally\n"
|
|
7677 |
" info Displays whether a branch is bound or unbound. If the branch "
|
|
7678 |
"is\n"
|
|
7679 |
" bound, then it will also display the location of the bound "
|
|
7680 |
"branch\n"
|
|
7681 |
msgstr "" |
|
7682 |
||
7683 |
#: dummy/help_topics/checkouts/summary.txt:1
|
|
7684 |
msgid "Information on what a checkout is" |
|
7685 |
msgstr "" |
|
7686 |
||
7687 |
#: dummy/help_topics/commands/summary.txt:1
|
|
7688 |
msgid "Basic help for all commands" |
|
7689 |
msgstr "" |
|
7690 |
||
7691 |
#: dummy/help_topics/configuration/summary.txt:1
|
|
7692 |
msgid "Details on the configuration settings available" |
|
7693 |
msgstr "" |
|
7694 |
||
7695 |
#: dummy/help_topics/conflict-types/summary.txt:1
|
|
7696 |
msgid "Types of conflicts and what to do about them" |
|
7697 |
msgstr "" |
|
7698 |
||
7699 |
#: dummy/help_topics/content-filters/summary.txt:1
|
|
7700 |
msgid "Conversion of content into/from working trees" |
|
7701 |
msgstr "" |
|
7702 |
||
7703 |
#: dummy/help_topics/criss-cross/detail.txt:1
|
|
7704 |
msgid "Criss-Cross" |
|
7705 |
msgstr "" |
|
7706 |
||
7707 |
#: dummy/help_topics/criss-cross/detail.txt:3
|
|
7708 |
msgid "" |
|
7709 |
"A criss-cross in the branch history can cause the default merge technique\n"
|
|
7710 |
"to emit more conflicts than would normally be expected."
|
|
7711 |
msgstr "" |
|
7712 |
||
7713 |
#: dummy/help_topics/criss-cross/detail.txt:6
|
|
7714 |
msgid "" |
|
7715 |
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
|
|
7716 |
"give\n"
|
|
7717 |
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
|
|
7718 |
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
|
|
7719 |
msgstr "" |
|
7720 |
||
7721 |
#: dummy/help_topics/criss-cross/detail.txt:10
|
|
7722 |
msgid "" |
|
7723 |
"Criss-crosses occur in a branch's history if two branches merge the same "
|
|
7724 |
"thing\n"
|
|
7725 |
"and then merge one another, or if two branches merge one another at the "
|
|
7726 |
"same\n"
|
|
7727 |
"time. They can be avoided by having each branch only merge from or into a\n"
|
|
7728 |
"designated central branch (a \"star topology\")."
|
|
7729 |
msgstr "" |
|
7730 |
||
7731 |
#: dummy/help_topics/criss-cross/detail.txt:15
|
|
7732 |
msgid "" |
|
7733 |
"Criss-crosses cause problems because of the way merge works. Bazaar's "
|
|
7734 |
"default\n"
|
|
7735 |
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
|
|
7736 |
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
|
|
7737 |
"differences between THIS and OTHER are due to one side adding lines, or\n"
|
|
7738 |
"from another side removing lines."
|
|
7739 |
msgstr "" |
|
7740 |
||
7741 |
#: dummy/help_topics/criss-cross/detail.txt:21
|
|
7742 |
msgid "" |
|
7743 |
"Criss-crosses mean there is no good choice for a base. Selecting the "
|
|
7744 |
"recent\n"
|
|
7745 |
"merge points could cause one side's changes to be silently discarded.\n"
|
|
7746 |
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
|
|
7747 |
"are emitted."
|
|
7748 |
msgstr "" |
|
7749 |
||
7750 |
#: dummy/help_topics/criss-cross/detail.txt:26
|
|
7751 |
msgid "" |
|
7752 |
"The ``weave`` merge type is not affected by this problem because it uses\n"
|
|
7753 |
"line-origin detection instead of a basis revision to determine the cause of\n"
|
|
7754 |
"differences.\n"
|
|
7755 |
msgstr "" |
|
7756 |
||
7757 |
#: dummy/help_topics/criss-cross/summary.txt:1
|
|
7758 |
msgid "Information on criss-cross merging" |
|
7759 |
msgstr "" |
|
7760 |
||
7761 |
#: dummy/help_topics/current-formats/summary.txt:1
|
|
7762 |
msgid "Current storage formats" |
|
7763 |
msgstr "" |
|
7764 |
||
7765 |
#: dummy/help_topics/debug-flags/summary.txt:1
|
|
7766 |
msgid "Options to show or record debug information" |
|
7767 |
msgstr "" |
|
7768 |
||
7769 |
#: dummy/help_topics/diverged-branches/summary.txt:1
|
|
7770 |
msgid "How to fix diverged branches" |
|
7771 |
msgstr "" |
|
7772 |
||
7773 |
#: dummy/help_topics/env-variables/detail.txt:1
|
|
7774 |
msgid "Environment Variables" |
|
7775 |
msgstr "" |
|
7776 |
||
7777 |
#: dummy/help_topics/env-variables/detail.txt:3
|
|
7778 |
msgid "" |
|
7779 |
"=================== "
|
|
7780 |
"===========================================================\n"
|
|
7781 |
"BZRPATH Path where bzr is to look for shell plugin external\n"
|
|
7782 |
" commands.\n"
|
|
7783 |
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
|
|
7784 |
"EMAIL E-Mail address of the user.\n"
|
|
7785 |
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
|
|
7786 |
"EDITOR Editor for editing commit messages.\n"
|
|
7787 |
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
|
|
7788 |
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
|
|
7789 |
"BZR_PLUGINS_AT Plugins to load from a directory not in "
|
|
7790 |
"BZR_PLUGIN_PATH.\n"
|
|
7791 |
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
|
|
7792 |
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
|
|
7793 |
"and\n"
|
|
7794 |
" HOME.\n"
|
|
7795 |
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
|
|
7796 |
"URLs).\n"
|
|
7797 |
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
|
|
7798 |
"sshcorp,\n"
|
|
7799 |
" plink or lsh.\n"
|
|
7800 |
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
|
|
7801 |
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
|
|
7802 |
"BZR_COLUMNS Override implicit terminal width.\n"
|
|
7803 |
"BZR_CONCURRENCY Number of processes that can be run concurrently "
|
|
7804 |
"(selftest)\n"
|
|
7805 |
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
|
|
7806 |
"'text'.\n"
|
|
7807 |
"BZR_PDB Control whether to launch a debugger on error.\n"
|
|
7808 |
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
|
|
7809 |
" breakin debugger.\n"
|
|
7810 |
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
|
|
7811 |
"(instead\n"
|
|
7812 |
" of char-based).\n"
|
|
7813 |
"=================== "
|
|
7814 |
"===========================================================\n"
|
|
7815 |
msgstr "" |
|
7816 |
||
7817 |
#: dummy/help_topics/env-variables/summary.txt:1
|
|
7818 |
msgid "Environment variable names and values" |
|
7819 |
msgstr "" |
|
7820 |
||
7821 |
#: dummy/help_topics/eol/summary.txt:1
|
|
7822 |
msgid "Information on end-of-line handling" |
|
7823 |
msgstr "" |
|
7824 |
||
7825 |
#: dummy/help_topics/files/detail.txt:1
|
|
7826 |
msgid "Files" |
|
7827 |
msgstr "" |
|
7828 |
||
7829 |
#: dummy/help_topics/files/detail.txt:3
|
|
7830 |
msgid "" |
|
7831 |
":On Unix: ~/.bazaar/bazaar.conf\n"
|
|
7832 |
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
|
|
7833 |
"bazaar\\\\2.0\\\\bazaar.conf"
|
|
7834 |
msgstr "" |
|
7835 |
||
7836 |
#: dummy/help_topics/files/detail.txt:6
|
|
7837 |
msgid "" |
|
7838 |
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
|
|
7839 |
"used to define general configuration that will be applied everywhere.\n"
|
|
7840 |
"The section ``[ALIASES]`` can be used to create command aliases for\n"
|
|
7841 |
"commonly used options."
|
|
7842 |
msgstr "" |
|
7843 |
||
7844 |
#: dummy/help_topics/files/detail.txt:11
|
|
7845 |
msgid "A typical config file might look something like::" |
|
7846 |
msgstr "" |
|
7847 |
||
7848 |
#: dummy/help_topics/files/detail.txt:13
|
|
7849 |
msgid "" |
|
7850 |
" [DEFAULT]\n"
|
|
7851 |
" email=John Doe <jdoe@isp.com>"
|
|
7852 |
msgstr "" |
|
7853 |
||
7854 |
#: dummy/help_topics/files/detail.txt:16
|
|
7855 |
msgid "" |
|
7856 |
" [ALIASES]\n"
|
|
7857 |
" commit = commit --strict\n"
|
|
7858 |
" log10 = log --short -r -10..-1\n"
|
|
7859 |
msgstr "" |
|
7860 |
||
7861 |
#: dummy/help_topics/files/summary.txt:1
|
|
7862 |
msgid "Information on configuration and log files" |
|
7863 |
msgstr "" |
|
7864 |
||
7865 |
#: dummy/help_topics/formats/detail.txt:1
|
|
7866 |
msgid "Storage Formats" |
|
7867 |
msgstr "" |
|
7868 |
||
7869 |
#: dummy/help_topics/formats/detail.txt:3
|
|
7870 |
msgid "" |
|
7871 |
"To ensure that older clients do not access data incorrectly,\n"
|
|
7872 |
"Bazaar's policy is to introduce a new storage format whenever\n"
|
|
7873 |
"new features requiring new metadata are added. New storage\n"
|
|
7874 |
"formats may also be introduced to improve performance and\n"
|
|
7875 |
"scalability."
|
|
7876 |
msgstr "" |
|
7877 |
||
7878 |
#: dummy/help_topics/formats/detail.txt:9
|
|
7879 |
msgid "" |
|
7880 |
"The newest format, 2a, is highly recommended. If your\n"
|
|
7881 |
"project is not using 2a, then you should suggest to the\n"
|
|
7882 |
"project owner to upgrade."
|
|
7883 |
msgstr "" |
|
7884 |
||
7885 |
#: dummy/help_topics/formats/detail.txt:13
|
|
7886 |
msgid "" |
|
7887 |
"\n"
|
|
7888 |
".. note::"
|
|
7889 |
msgstr "" |
|
7890 |
||
7891 |
#: dummy/help_topics/formats/detail.txt:16
|
|
7892 |
msgid "" |
|
7893 |
" Some of the older formats have two variants:\n"
|
|
7894 |
" a plain one and a rich-root one. The latter include an additional\n"
|
|
7895 |
" field about the root of the tree. There is no performance cost\n"
|
|
7896 |
" for using a rich-root format but you cannot easily merge changes\n"
|
|
7897 |
" from a rich-root format into a plain format. As a consequence,\n"
|
|
7898 |
" moving a project to a rich-root format takes some co-ordination\n"
|
|
7899 |
" in that all contributors need to upgrade their repositories\n"
|
|
7900 |
" around the same time. 2a and all future formats will be\n"
|
|
7901 |
" implicitly rich-root."
|
|
7902 |
msgstr "" |
|
7903 |
||
7904 |
#: dummy/help_topics/formats/detail.txt:26
|
|
7905 |
msgid "" |
|
7906 |
"See :doc:`current-formats-help` for the complete list of\n"
|
|
7907 |
"currently supported formats. See :doc:`other-formats-help` for\n"
|
|
7908 |
"descriptions of any available experimental and deprecated formats.\n"
|
|
7909 |
msgstr "" |
|
7910 |
||
7911 |
#: dummy/help_topics/formats/summary.txt:1
|
|
7912 |
msgid "Information on choosing a storage format" |
|
7913 |
msgstr "" |
|
7914 |
||
7915 |
#: dummy/help_topics/global-options/detail.txt:1
|
|
7916 |
msgid "Global Options" |
|
7917 |
msgstr "" |
|
7918 |
||
7919 |
#: dummy/help_topics/global-options/detail.txt:3
|
|
7920 |
msgid "" |
|
7921 |
"These options may be used with any command, and may appear in front of any\n"
|
|
7922 |
"command. (e.g. ``bzr --profile help``)."
|
|
7923 |
msgstr "" |
|
7924 |
||
7925 |
#: dummy/help_topics/global-options/detail.txt:6
|
|
7926 |
msgid "" |
|
7927 |
"--version Print the version number. Must be supplied before the "
|
|
7928 |
"command.\n"
|
|
7929 |
"--no-aliases Do not process command aliases when running this command.\n"
|
|
7930 |
"--builtin Use the built-in version of a command, not the plugin "
|
|
7931 |
"version.\n"
|
|
7932 |
" This does not suppress other plugin effects.\n"
|
|
7933 |
"--no-plugins Do not process any plugins.\n"
|
|
7934 |
"--no-l10n Do not translate messages.\n"
|
|
7935 |
"--concurrency Number of processes that can be run concurrently (selftest)."
|
|
7936 |
msgstr "" |
|
7937 |
||
7938 |
#: dummy/help_topics/global-options/detail.txt:14
|
|
7939 |
msgid "" |
|
7940 |
"--profile Profile execution using the hotshot profiler.\n"
|
|
7941 |
"--lsprof Profile execution using the lsprof profiler.\n"
|
|
7942 |
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
|
|
7943 |
" results to a specified file. If the filename ends with "
|
|
7944 |
"\".txt\",\n"
|
|
7945 |
" text format will be used. If the filename either starts "
|
|
7946 |
"with\n"
|
|
7947 |
" \"callgrind.out\" or end with \".callgrind\", the output will "
|
|
7948 |
"be\n"
|
|
7949 |
" formatted for use with KCacheGrind. Otherwise, the output\n"
|
|
7950 |
" will be a pickle.\n"
|
|
7951 |
"--coverage Generate line coverage report in the specified directory."
|
|
7952 |
msgstr "" |
|
7953 |
||
7954 |
#: dummy/help_topics/global-options/detail.txt:24
|
|
7955 |
msgid "" |
|
7956 |
"-Oname=value Override the ``name`` config option setting it to ``value`` "
|
|
7957 |
"for\n"
|
|
7958 |
" the duration of the command. This can be used multiple times "
|
|
7959 |
"if\n"
|
|
7960 |
" several options need to be overridden."
|
|
7961 |
msgstr "" |
|
7962 |
||
7963 |
#: dummy/help_topics/global-options/detail.txt:28
|
|
7964 |
msgid "" |
|
7965 |
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
|
|
7966 |
"information on profiling."
|
|
7967 |
msgstr "" |
|
7968 |
||
7969 |
#: dummy/help_topics/global-options/detail.txt:31
|
|
7970 |
msgid "" |
|
7971 |
"A number of debug flags are also available to assist troubleshooting and\n"
|
|
7972 |
"development. See :doc:`debug-flags-help`.\n"
|
|
7973 |
msgstr "" |
|
7974 |
||
7975 |
#: dummy/help_topics/global-options/summary.txt:1
|
|
7976 |
msgid "Options that control how Bazaar runs" |
|
7977 |
msgstr "" |
|
7978 |
||
7979 |
#: dummy/help_topics/hidden-commands/summary.txt:1
|
|
7980 |
msgid "All hidden commands" |
|
7981 |
msgstr "" |
|
7982 |
||
7983 |
#: dummy/help_topics/hooks/summary.txt:1
|
|
7984 |
msgid "Points at which custom processing can be added" |
|
7985 |
msgstr "" |
|
7986 |
||
7987 |
#: dummy/help_topics/launchpad/detail.txt:1
|
|
7988 |
msgid "Integration with Launchpad.net" |
|
7989 |
msgstr "" |
|
7990 |
||
7991 |
#: dummy/help_topics/launchpad/detail.txt:3
|
|
7992 |
msgid "" |
|
7993 |
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
|
|
7994 |
"specification tracking."
|
|
7995 |
msgstr "" |
|
7996 |
||
7997 |
#: dummy/help_topics/launchpad/detail.txt:6
|
|
7998 |
msgid "" |
|
7999 |
"The bzr client (through the plugin called 'launchpad') has special\n"
|
|
8000 |
"features to communicate with Launchpad:"
|
|
8001 |
msgstr "" |
|
8002 |
||
8003 |
#: dummy/help_topics/launchpad/detail.txt:9
|
|
8004 |
msgid "" |
|
8005 |
" * The launchpad-login command tells Bazaar your Launchpad user name. "
|
|
8006 |
"This\n"
|
|
8007 |
" is then used by the 'lp:' transport to download your branches using\n"
|
|
8008 |
" bzr+ssh://."
|
|
8009 |
msgstr "" |
|
8010 |
||
8011 |
#: dummy/help_topics/launchpad/detail.txt:13
|
|
8012 |
msgid "" |
|
8013 |
" * The 'lp:' transport uses Launchpad as a directory service: for "
|
|
8014 |
"example\n"
|
|
8015 |
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
|
|
8016 |
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
|
|
8017 |
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
|
|
8018 |
msgstr "" |
|
8019 |
||
8020 |
#: dummy/help_topics/launchpad/detail.txt:18
|
|
8021 |
msgid "" |
|
8022 |
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
|
|
8023 |
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
|
|
8024 |
"lp:12345'\n" |
|
8025 |
" will record a revision property that marks that revision as fixing\n"
|
|
8026 |
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
|
|
8027 |
" automatically be linked to the bug report."
|
|
8028 |
msgstr "" |
|
8029 |
||
8030 |
#: dummy/help_topics/launchpad/detail.txt:24
|
|
8031 |
msgid "" |
|
8032 |
" * The register-branch command tells Launchpad about the url of a\n"
|
|
8033 |
" public branch. Launchpad will then mirror the branch, display\n"
|
|
8034 |
" its contents and allow it to be attached to bugs and other\n"
|
|
8035 |
" objects."
|
|
8036 |
msgstr "" |
|
8037 |
||
8038 |
#: dummy/help_topics/launchpad/detail.txt:29
|
|
8039 |
msgid "For more information see http://help.launchpad.net/\n" |
|
8040 |
msgstr "" |
|
8041 |
||
8042 |
#: dummy/help_topics/launchpad/summary.txt:1
|
|
8043 |
msgid "Using Bazaar with Launchpad.net" |
|
8044 |
msgstr "" |
|
8045 |
||
8046 |
#: dummy/help_topics/location-alias/summary.txt:1
|
|
8047 |
msgid "Aliases for remembered locations" |
|
8048 |
msgstr "" |
|
8049 |
||
8050 |
#: dummy/help_topics/log-formats/summary.txt:1
|
|
8051 |
msgid "Details on the logging formats available" |
|
8052 |
msgstr "" |
|
8053 |
||
8054 |
#: dummy/help_topics/other-formats/summary.txt:1
|
|
8055 |
msgid "Experimental and deprecated storage formats" |
|
8056 |
msgstr "" |
|
8057 |
||
8058 |
#: dummy/help_topics/patterns/summary.txt:1
|
|
8059 |
msgid "Information on the pattern syntax" |
|
8060 |
msgstr "" |
|
8061 |
||
8062 |
#: dummy/help_topics/repositories/detail.txt:1
|
|
8063 |
msgid "Repositories" |
|
8064 |
msgstr "" |
|
8065 |
||
8066 |
#: dummy/help_topics/repositories/detail.txt:3
|
|
8067 |
msgid "" |
|
8068 |
"Repositories in Bazaar are where committed information is stored. There is\n"
|
|
8069 |
"a repository associated with every branch."
|
|
8070 |
msgstr "" |
|
8071 |
||
8072 |
#: dummy/help_topics/repositories/detail.txt:6
|
|
8073 |
msgid "" |
|
8074 |
"Repositories are a form of database. Bzr will usually maintain this for\n"
|
|
8075 |
"good performance automatically, but in some situations (e.g. when doing\n"
|
|
8076 |
"very many commits in a short time period) you may want to ask bzr to\n"
|
|
8077 |
"optimise the database indices. This can be done by the 'bzr pack' command."
|
|
8078 |
msgstr "" |
|
8079 |
||
8080 |
#: dummy/help_topics/repositories/detail.txt:11
|
|
8081 |
msgid "" |
|
8082 |
"By default just running 'bzr init' will create a repository within the new\n"
|
|
8083 |
"branch but it is possible to create a shared repository which allows "
|
|
8084 |
"multiple\n"
|
|
8085 |
"branches to share their information in the same location. When a new branch "
|
|
8086 |
"is\n"
|
|
8087 |
"created it will first look to see if there is a containing shared repository "
|
|
8088 |
"it\n"
|
|
8089 |
"can use."
|
|
8090 |
msgstr "" |
|
8091 |
||
8092 |
#: dummy/help_topics/repositories/detail.txt:17
|
|
8093 |
msgid "" |
|
8094 |
"When two branches of the same project share a repository, there is\n"
|
|
8095 |
"generally a large space saving. For some operations (e.g. branching\n"
|
|
8096 |
"within the repository) this translates in to a large time saving."
|
|
8097 |
msgstr "" |
|
8098 |
||
8099 |
#: dummy/help_topics/repositories/detail.txt:21
|
|
8100 |
msgid "" |
|
8101 |
"To create a shared repository use the init-repository command (or the alias\n"
|
|
8102 |
"init-repo). This command takes the location of the repository to create. "
|
|
8103 |
"This\n"
|
|
8104 |
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
|
|
8105 |
"which contains a shared repository. Any new branches that are created in "
|
|
8106 |
"this\n"
|
|
8107 |
"directory will then use it for storage."
|
|
8108 |
msgstr "" |
|
8109 |
||
8110 |
#: dummy/help_topics/repositories/detail.txt:27
|
|
8111 |
msgid "" |
|
8112 |
"It is a good idea to create a repository whenever you might create more\n"
|
|
8113 |
"than one branch of a project. This is true for both working areas where you\n"
|
|
8114 |
"are doing the development, and any server areas that you use for hosting\n"
|
|
8115 |
"projects. In the latter case, it is common to want branches without working\n"
|
|
8116 |
"trees. Since the files in the branch will not be edited directly there is "
|
|
8117 |
"no\n"
|
|
8118 |
"need to use up disk space for a working tree. To create a repository in "
|
|
8119 |
"which\n"
|
|
8120 |
"the branches will not have working trees pass the '--no-trees' option to\n"
|
|
8121 |
"'init-repository'."
|
|
8122 |
msgstr "" |
|
8123 |
||
8124 |
#: dummy/help_topics/repositories/detail.txt:38
|
|
8125 |
msgid "" |
|
8126 |
" init-repository Create a shared repository. Use --no-trees to create "
|
|
8127 |
"one\n"
|
|
8128 |
" in which new branches won't get a working tree.\n"
|
|
8129 |
msgstr "" |
|
8130 |
||
8131 |
#: dummy/help_topics/repositories/summary.txt:1
|
|
8132 |
msgid "Basic information on shared repositories." |
|
8133 |
msgstr "" |
|
8134 |
||
8135 |
#: dummy/help_topics/revisionspec/summary.txt:1
|
|
8136 |
msgid "Explain how to use --revision" |
|
8137 |
msgstr "" |
|
8138 |
||
8139 |
#: dummy/help_topics/rules/summary.txt:1
|
|
8140 |
msgid "Information on defining rule-based preferences" |
|
8141 |
msgstr "" |
|
8142 |
||
8143 |
#: dummy/help_topics/standalone-trees/detail.txt:1
|
|
8144 |
msgid "Standalone Trees" |
|
8145 |
msgstr "" |
|
8146 |
||
8147 |
#: dummy/help_topics/standalone-trees/detail.txt:3
|
|
8148 |
msgid "" |
|
8149 |
"A standalone tree is a working tree with an associated repository. It\n"
|
|
8150 |
"is an independently usable branch, with no dependencies on any other.\n"
|
|
8151 |
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
|
|
8152 |
"an existing project under version control."
|
|
8153 |
msgstr "" |
|
8154 |
||
8155 |
#: dummy/help_topics/standalone-trees/detail.txt:8
|
|
8156 |
msgid "Related Commands::" |
|
8157 |
msgstr "" |
|
8158 |
||
8159 |
#: dummy/help_topics/standalone-trees/detail.txt:10
|
|
8160 |
msgid " init Make a directory into a versioned branch.\n" |
|
8161 |
msgstr "" |
|
8162 |
||
8163 |
#: dummy/help_topics/standalone-trees/summary.txt:1
|
|
8164 |
msgid "Information on what a standalone tree is" |
|
8165 |
msgstr "" |
|
8166 |
||
8167 |
#: dummy/help_topics/standard-options/detail.txt:1
|
|
8168 |
msgid "Standard Options" |
|
8169 |
msgstr "" |
|
8170 |
||
8171 |
#: dummy/help_topics/standard-options/detail.txt:3
|
|
8172 |
msgid "Standard options are legal for all commands." |
|
8173 |
msgstr "" |
|
8174 |
||
8175 |
#: dummy/help_topics/standard-options/detail.txt:5
|
|
8176 |
msgid "" |
|
8177 |
"--help, -h Show help message.\n"
|
|
8178 |
"--verbose, -v Display more information.\n"
|
|
8179 |
"--quiet, -q Only display errors and warnings."
|
|
8180 |
msgstr "" |
|
8181 |
||
8182 |
#: dummy/help_topics/standard-options/detail.txt:9
|
|
8183 |
msgid "Unlike global options, standard options can be used in aliases.\n" |
|
8184 |
msgstr "" |
|
8185 |
||
8186 |
#: dummy/help_topics/standard-options/summary.txt:1
|
|
8187 |
msgid "Options that can be used with any command" |
|
8188 |
msgstr "" |
|
8189 |
||
8190 |
#: dummy/help_topics/status-flags/detail.txt:1
|
|
8191 |
msgid "Status Flags" |
|
8192 |
msgstr "" |
|
8193 |
||
8194 |
#: dummy/help_topics/status-flags/detail.txt:3
|
|
8195 |
msgid "" |
|
8196 |
"Status flags are used to summarise changes to the working tree in a concise\n"
|
|
8197 |
"manner. They are in the form::"
|
|
8198 |
msgstr "" |
|
8199 |
||
8200 |
#: dummy/help_topics/status-flags/detail.txt:6
|
|
8201 |
msgid " xxx <filename>" |
|
8202 |
msgstr "" |
|
8203 |
||
8204 |
#: dummy/help_topics/status-flags/detail.txt:8
|
|
8205 |
msgid "where the columns' meanings are as follows." |
|
8206 |
msgstr "" |
|
8207 |
||
8208 |
#: dummy/help_topics/status-flags/detail.txt:10
|
|
8209 |
msgid "Column 1 - versioning/renames::" |
|
8210 |
msgstr "" |
|
8211 |
||
8212 |
#: dummy/help_topics/status-flags/detail.txt:12
|
|
8213 |
msgid "" |
|
8214 |
" + File versioned\n"
|
|
8215 |
" - File unversioned\n"
|
|
8216 |
" R File renamed\n"
|
|
8217 |
" ? File unknown\n"
|
|
8218 |
" X File nonexistent (and unknown to bzr)\n"
|
|
8219 |
" C File has conflicts\n"
|
|
8220 |
" P Entry for a pending merge (not a file)"
|
|
8221 |
msgstr "" |
|
8222 |
||
8223 |
#: dummy/help_topics/status-flags/detail.txt:20
|
|
8224 |
msgid "Column 2 - contents::" |
|
8225 |
msgstr "" |
|
8226 |
||
8227 |
#: dummy/help_topics/status-flags/detail.txt:22
|
|
8228 |
msgid "" |
|
8229 |
" N File created\n"
|
|
8230 |
" D File deleted\n"
|
|
8231 |
" K File kind changed\n"
|
|
8232 |
" M File modified"
|
|
8233 |
msgstr "" |
|
8234 |
||
8235 |
#: dummy/help_topics/status-flags/detail.txt:27
|
|
8236 |
msgid "Column 3 - execute::" |
|
8237 |
msgstr "" |
|
8238 |
||
8239 |
#: dummy/help_topics/status-flags/detail.txt:29
|
|
8240 |
msgid " * The execute bit was changed\n" |
|
8241 |
msgstr "" |
|
8242 |
||
8243 |
#: dummy/help_topics/status-flags/summary.txt:1
|
|
8244 |
msgid "Help on status flags" |
|
8245 |
msgstr "" |
|
8246 |
||
8247 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
|
|
8248 |
msgid "Branches Out of Sync" |
|
8249 |
msgstr "" |
|
8250 |
||
8251 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
|
|
8252 |
msgid "" |
|
8253 |
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
|
|
8254 |
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
|
|
8255 |
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
|
|
8256 |
"have the same last revision as the new reference branch for the lightweight\n"
|
|
8257 |
"checkout, data could be lost, so Bazaar refuses."
|
|
8258 |
msgstr "" |
|
8259 |
||
8260 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
|
|
8261 |
msgid "How you deal with this depends on *why* the branches are out of sync." |
|
8262 |
msgstr "" |
|
8263 |
||
8264 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
|
|
8265 |
msgid "" |
|
8266 |
"If you have a checkout and have done local commits, you can get back in "
|
|
8267 |
"sync\n"
|
|
8268 |
"by running \"bzr update\" (and possibly \"bzr commit\")."
|
|
8269 |
msgstr "" |
|
8270 |
||
8271 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
|
|
8272 |
msgid "" |
|
8273 |
"If you have a branch and the remote branch is out-of-date, you can push\n"
|
|
8274 |
"the local changes using \"bzr push\". If the local branch is out of date, "
|
|
8275 |
"you\n"
|
|
8276 |
"can do \"bzr pull\". If both branches have had changes, you can merge, "
|
|
8277 |
"commit\n"
|
|
8278 |
"and then push your changes. If you decide that some of the changes aren't\n"
|
|
8279 |
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
|
|
8280 |
msgstr "" |
|
8281 |
||
8282 |
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
|
|
8283 |
msgid "Steps to resolve \"out-of-sync\" when reconfiguring" |
|
8284 |
msgstr "" |
|
8285 |
||
8286 |
#: dummy/help_topics/topics/summary.txt:1
|
|
8287 |
msgid "Topics list" |
|
8288 |
msgstr "" |
|
8289 |
||
8290 |
#: dummy/help_topics/url-special-chars/summary.txt:1
|
|
8291 |
msgid "Special character handling in URLs" |
|
8292 |
msgstr "" |
|
8293 |
||
8294 |
#: dummy/help_topics/urlspec/summary.txt:1
|
|
8295 |
msgid "Supported transport protocols" |
|
8296 |
msgstr "" |
|
8297 |
||
8298 |
#: dummy/help_topics/working-trees/detail.txt:1
|
|
8299 |
msgid "Working Trees" |
|
8300 |
msgstr "" |
|
8301 |
||
8302 |
#: dummy/help_topics/working-trees/detail.txt:3
|
|
8303 |
msgid "" |
|
8304 |
"A working tree is the contents of a branch placed on disk so that you can\n"
|
|
8305 |
"see the files and edit them. The working tree is where you make changes to "
|
|
8306 |
"a\n"
|
|
8307 |
"branch, and when you commit the current state of the working tree is the\n"
|
|
8308 |
"snapshot that is recorded in the commit."
|
|
8309 |
msgstr "" |
|
8310 |
||
8311 |
#: dummy/help_topics/working-trees/detail.txt:8
|
|
8312 |
msgid "" |
|
8313 |
"When you push a branch to a remote system, a working tree will not be\n"
|
|
8314 |
"created. If one is already present the files will not be updated. The\n"
|
|
8315 |
"branch information will be updated and the working tree will be marked\n"
|
|
8316 |
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
|
|
8317 |
"may be uncommitted changes or the update may cause content conflicts that "
|
|
8318 |
"are\n"
|
|
8319 |
"difficult to deal with remotely."
|
|
8320 |
msgstr "" |
|
8321 |
||
8322 |
#: dummy/help_topics/working-trees/detail.txt:15
|
|
8323 |
msgid "" |
|
8324 |
"If you have a branch with no working tree you can use the 'checkout' "
|
|
8325 |
"command\n"
|
|
8326 |
"to create a working tree. If you run 'bzr checkout .' from the branch it "
|
|
8327 |
"will\n"
|
|
8328 |
"create the working tree. If the branch is updated remotely, you can update "
|
|
8329 |
"the\n"
|
|
8330 |
"working tree by running 'bzr update' in that directory."
|
|
8331 |
msgstr "" |
|
8332 |
||
8333 |
#: dummy/help_topics/working-trees/detail.txt:20
|
|
8334 |
msgid "" |
|
8335 |
"If you have a branch with a working tree that you do not want the 'remove-"
|
|
8336 |
"tree'\n"
|
|
8337 |
"command will remove the tree if it is safe. This can be done to avoid the\n"
|
|
8338 |
"warning about the remote working tree not being updated when pushing to the\n"
|
|
8339 |
"branch. It can also be useful when working with a '--no-trees' repository\n"
|
|
8340 |
"(see 'bzr help repositories')."
|
|
8341 |
msgstr "" |
|
8342 |
||
8343 |
#: dummy/help_topics/working-trees/detail.txt:26
|
|
8344 |
msgid "" |
|
8345 |
"If you want to have a working tree on a remote machine that you push to you\n"
|
|
8346 |
"can either run 'bzr update' in the remote branch after each push, or use "
|
|
8347 |
"some\n"
|
|
8348 |
"other method to update the tree during the push. There is an 'rspush' "
|
|
8349 |
"plugin\n"
|
|
8350 |
"that will update the working tree using rsync as well as doing a push. "
|
|
8351 |
"There\n"
|
|
8352 |
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
|
|
8353 |
"SSH\n"
|
|
8354 |
"after each push."
|
|
8355 |
msgstr "" |
|
8356 |
||
8357 |
#: dummy/help_topics/working-trees/detail.txt:33
|
|
8358 |
msgid "Useful commands::" |
|
8359 |
msgstr "" |
|
8360 |
||
8361 |
#: dummy/help_topics/working-trees/detail.txt:35
|
|
8362 |
msgid "" |
|
8363 |
" checkout Create a working tree when a branch does not have one.\n"
|
|
8364 |
" remove-tree Removes the working tree from a branch when it is safe to do "
|
|
8365 |
"so.\n"
|
|
8366 |
" update When a working tree is out of sync with its associated "
|
|
8367 |
"branch\n"
|
|
8368 |
" this will update the tree to match the branch.\n"
|
|
8369 |
msgstr "" |
|
8370 |
||
8371 |
#: dummy/help_topics/working-trees/summary.txt:1
|
|
8372 |
msgid "Information on working trees" |
|
8373 |
msgstr "" |
|
8374 |
||
8375 |
#: en/help_topics/authentication.txt:1
|
|
8376 |
msgid "" |
|
8377 |
"Authentication Settings\n"
|
|
8378 |
"======================="
|
|
8379 |
msgstr "" |
|
8380 |
||
8381 |
#: en/help_topics/authentication.txt:4
|
|
8382 |
msgid "" |
|
8383 |
"\n"
|
|
8384 |
"Intent\n"
|
|
8385 |
"------"
|
|
8386 |
msgstr "" |
|
8387 |
||
8388 |
#: en/help_topics/authentication.txt:8
|
|
8389 |
msgid "" |
|
8390 |
"Many different authentication policies can be described in the\n"
|
|
8391 |
"``authentication.conf`` file but a particular user should need only a few\n"
|
|
8392 |
"definitions to cover his needs without having to specify a user and a "
|
|
8393 |
"password\n"
|
|
8394 |
"for every branch he uses."
|
|
8395 |
msgstr "" |
|
8396 |
||
8397 |
#: en/help_topics/authentication.txt:13
|
|
8398 |
msgid "" |
|
8399 |
"The definitions found in this file are used to find the credentials to use "
|
|
8400 |
"for\n"
|
|
8401 |
"a given url. The same credentials can generally be used for as many branches "
|
|
8402 |
"as\n"
|
|
8403 |
"possible by grouping their declaration around the remote servers that need\n"
|
|
8404 |
"them. It's even possible to declare credentials that will be used by "
|
|
8405 |
"different\n"
|
|
8406 |
"servers."
|
|
8407 |
msgstr "" |
|
8408 |
||
8409 |
#: en/help_topics/authentication.txt:19
|
|
8410 |
msgid "" |
|
8411 |
"The intent is to make this file as small as possible to minimize maintenance."
|
|
8412 |
msgstr "" |
|
8413 |
||
8414 |
#: en/help_topics/authentication.txt:21
|
|
8415 |
msgid "" |
|
8416 |
"Once the relevant credentials are declared in this file you may use branch "
|
|
8417 |
"urls\n"
|
|
8418 |
"without embedding passwords (security hazard) or even users (enabling "
|
|
8419 |
"sharing\n"
|
|
8420 |
"of your urls with others)."
|
|
8421 |
msgstr "" |
|
8422 |
||
8423 |
#: en/help_topics/authentication.txt:25
|
|
8424 |
msgid "Instead of using::" |
|
8425 |
msgstr "" |
|
8426 |
||
8427 |
#: en/help_topics/authentication.txt:27
|
|
8428 |
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch" |
|
8429 |
msgstr "" |
|
8430 |
||
8431 |
#: en/help_topics/authentication.txt:29
|
|
8432 |
msgid "you simply use::" |
|
8433 |
msgstr "" |
|
8434 |
||
8435 |
#: en/help_topics/authentication.txt:31
|
|
8436 |
msgid " bzr branch ftp://host.com/path/to/my/branch" |
|
8437 |
msgstr "" |
|
8438 |
||
8439 |
#: en/help_topics/authentication.txt:33
|
|
8440 |
msgid "" |
|
8441 |
"provided you have created the following ``authentication.conf`` file::"
|
|
8442 |
msgstr "" |
|
8443 |
||
8444 |
#: en/help_topics/authentication.txt:35
|
|
8445 |
msgid "" |
|
8446 |
" [myprojects]\n"
|
|
8447 |
" scheme=ftp\n"
|
|
8448 |
" host=host.com\n"
|
|
8449 |
" user=joe\n"
|
|
8450 |
" password=secret\n"
|
|
8451 |
" "
|
|
8452 |
msgstr "" |
|
8453 |
||
8454 |
#: en/help_topics/authentication.txt:42
|
|
8455 |
msgid "" |
|
8456 |
"Authentication definitions\n"
|
|
8457 |
"--------------------------"
|
|
8458 |
msgstr "" |
|
8459 |
||
8460 |
#: en/help_topics/authentication.txt:45
|
|
8461 |
msgid "" |
|
8462 |
"There are two kinds of authentication used by the various schemes supported "
|
|
8463 |
"by\n"
|
|
8464 |
"bzr:" |
|
8465 |
msgstr "" |
|
8466 |
||
8467 |
#: en/help_topics/authentication.txt:48
|
|
8468 |
msgid "1. user and password" |
|
8469 |
msgstr "" |
|
8470 |
||
8471 |
#: en/help_topics/authentication.txt:50
|
|
8472 |
msgid "" |
|
8473 |
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
|
|
8474 |
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
|
|
8475 |
"ssh agents are a better, more secure solution. So we have chosen to not "
|
|
8476 |
"provide\n"
|
|
8477 |
"our own less secure method."
|
|
8478 |
msgstr "" |
|
8479 |
||
8480 |
#: en/help_topics/authentication.txt:55
|
|
8481 |
msgid "2. user, realm and password" |
|
8482 |
msgstr "" |
|
8483 |
||
8484 |
#: en/help_topics/authentication.txt:57
|
|
8485 |
msgid "" |
|
8486 |
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
|
|
8487 |
"against a host. But, by using ``.htaccess`` files, for example, it is "
|
|
8488 |
"possible\n"
|
|
8489 |
"to define several (``user, realm, password``) for a given ``host``. So what "
|
|
8490 |
"is\n"
|
|
8491 |
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
|
|
8492 |
"is\n"
|
|
8493 |
"not taken into account in the definitions, but will displayed if bzr "
|
|
8494 |
"prompts\n"
|
|
8495 |
"you for a password."
|
|
8496 |
msgstr "" |
|
8497 |
||
8498 |
#: en/help_topics/authentication.txt:64
|
|
8499 |
msgid "" |
|
8500 |
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
|
|
8501 |
"specifying the appropriate port."
|
|
8502 |
msgstr "" |
|
8503 |
||
8504 |
#: en/help_topics/authentication.txt:67
|
|
8505 |
msgid "" |
|
8506 |
"To take all schemes into account, the password will be deduced from a set "
|
|
8507 |
"of\n"
|
|
8508 |
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
|
|
8509 |
"``user``,\n"
|
|
8510 |
"``password``)."
|
|
8511 |
msgstr "" |
|
8512 |
||
8513 |
#: en/help_topics/authentication.txt:71
|
|
8514 |
msgid "" |
|
8515 |
" * ``scheme``: can be empty (meaning the rest of the definition can be "
|
|
8516 |
"used\n"
|
|
8517 |
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
|
|
8518 |
"``ssh``\n"
|
|
8519 |
" should be used instead since this is the real scheme regarding\n"
|
|
8520 |
" authentication,"
|
|
8521 |
msgstr "" |
|
8522 |
||
8523 |
#: en/help_topics/authentication.txt:76
|
|
8524 |
msgid " * ``host``: can be empty (to act as a default for any host)," |
|
8525 |
msgstr "" |
|
8526 |
||
8527 |
#: en/help_topics/authentication.txt:78
|
|
8528 |
msgid "" |
|
8529 |
" * ``port`` can be empty (useful when an host provides several servers for "
|
|
8530 |
"the\n"
|
|
8531 |
" same scheme), only numerical values are allowed, this should be used "
|
|
8532 |
"only\n"
|
|
8533 |
" when the server uses a port different than the scheme standard port,"
|
|
8534 |
msgstr "" |
|
8535 |
||
8536 |
#: en/help_topics/authentication.txt:82
|
|
8537 |
msgid " * ``path``: can be empty (FTP or SFTP will never user it)," |
|
8538 |
msgstr "" |
|
8539 |
||
8540 |
#: en/help_topics/authentication.txt:84
|
|
8541 |
msgid "" |
|
8542 |
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
|
|
8543 |
" ``getpass.get_user()``),"
|
|
8544 |
msgstr "" |
|
8545 |
||
8546 |
#: en/help_topics/authentication.txt:87
|
|
8547 |
msgid "" |
|
8548 |
" * ``password``: can be empty if you prefer to always be prompted for your\n"
|
|
8549 |
" password."
|
|
8550 |
msgstr "" |
|
8551 |
||
8552 |
#: en/help_topics/authentication.txt:90
|
|
8553 |
msgid "" |
|
8554 |
"Multiple definitions can be provided and, for a given URL, bzr will select "
|
|
8555 |
"a\n"
|
|
8556 |
"(``user`` [, ``password``]) based on the following rules :"
|
|
8557 |
msgstr "" |
|
8558 |
||
8559 |
#: en/help_topics/authentication.txt:93
|
|
8560 |
msgid " 1. the first match wins," |
|
8561 |
msgstr "" |
|
8562 |
||
8563 |
#: en/help_topics/authentication.txt:95
|
|
8564 |
msgid " 2. empty fields match everything," |
|
8565 |
msgstr "" |
|
8566 |
||
8567 |
#: en/help_topics/authentication.txt:97
|
|
8568 |
msgid "" |
|
8569 |
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
|
|
8570 |
msgstr "" |
|
8571 |
||
8572 |
#: en/help_topics/authentication.txt:99
|
|
8573 |
msgid "" |
|
8574 |
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
|
|
8575 |
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
|
|
8576 |
"``projectbzr.sf.net``\n"
|
|
8577 |
" will not match ``bzr.sf.net``)."
|
|
8578 |
msgstr "" |
|
8579 |
||
8580 |
#: en/help_topics/authentication.txt:103
|
|
8581 |
msgid "" |
|
8582 |
" 5. ``port`` matches if included in the requested URL (exact matches only)"
|
|
8583 |
msgstr "" |
|
8584 |
||
8585 |
#: en/help_topics/authentication.txt:105
|
|
8586 |
msgid "" |
|
8587 |
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
|
|
8588 |
"above,\n"
|
|
8589 |
" empty paths will match any provided path)."
|
|
8590 |
msgstr "" |
|
8591 |
||
8592 |
#: en/help_topics/authentication.txt:110
|
|
8593 |
msgid "" |
|
8594 |
"File format\n"
|
|
8595 |
"-----------"
|
|
8596 |
msgstr "" |
|
8597 |
||
8598 |
#: en/help_topics/authentication.txt:113
|
|
8599 |
msgid "" |
|
8600 |
"The general rules for :doc:`configuration files <configuration-help>`\n"
|
|
8601 |
"apply except for the variable policies."
|
|
8602 |
msgstr "" |
|
8603 |
||
8604 |
#: en/help_topics/authentication.txt:116
|
|
8605 |
msgid "Each section describes an authentication definition." |
|
8606 |
msgstr "" |
|
8607 |
||
8608 |
#: en/help_topics/authentication.txt:118
|
|
8609 |
msgid "" |
|
8610 |
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
|
|
8611 |
"reserved\n"
|
|
8612 |
"and should appear as the *last* section."
|
|
8613 |
msgstr "" |
|
8614 |
||
8615 |
#: en/help_topics/authentication.txt:121
|
|
8616 |
msgid "Each section should define:" |
|
8617 |
msgstr "" |
|
8618 |
||
8619 |
#: en/help_topics/authentication.txt:123
|
|
8620 |
msgid "* ``user``: the login to be used," |
|
8621 |
msgstr "" |
|
8622 |
||
8623 |
#: en/help_topics/authentication.txt:125
|
|
8624 |
msgid "Each section could define:" |
|
8625 |
msgstr "" |
|
8626 |
||
8627 |
#: en/help_topics/authentication.txt:127
|
|
8628 |
msgid "* ``host``: the remote server," |
|
8629 |
msgstr "" |
|
8630 |
||
8631 |
#: en/help_topics/authentication.txt:129
|
|
8632 |
msgid "* ``port``: the port the server is listening," |
|
8633 |
msgstr "" |
|
8634 |
||
8635 |
#: en/help_topics/authentication.txt:131
|
|
8636 |
msgid "* ``path``: the branch location," |
|
8637 |
msgstr "" |
|
8638 |
||
8639 |
#: en/help_topics/authentication.txt:133
|
|
8640 |
msgid "* ``password``: the password." |
|
8641 |
msgstr "" |
|
8642 |
||
8643 |
#: en/help_topics/authentication.txt:135
|
|
8644 |
msgid "" |
|
8645 |
"\n"
|
|
8646 |
"Examples\n"
|
|
8647 |
"--------"
|
|
8648 |
msgstr "" |
|
8649 |
||
8650 |
#: en/help_topics/authentication.txt:139
|
|
8651 |
msgid "" |
|
8652 |
"\n"
|
|
8653 |
"Personal projects hosted outside\n"
|
|
8654 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
8655 |
msgstr "" |
|
8656 |
||
8657 |
#: en/help_topics/authentication.txt:143
|
|
8658 |
msgid "" |
|
8659 |
"All connections are done with the same ``user`` (the remote one for which "
|
|
8660 |
"the\n"
|
|
8661 |
"default bzr one is not appropriate) and the password is always prompted "
|
|
8662 |
"with\n"
|
|
8663 |
"some exceptions::"
|
|
8664 |
msgstr "" |
|
8665 |
||
8666 |
#: en/help_topics/authentication.txt:147
|
|
8667 |
msgid "" |
|
8668 |
" # Pet projects on hobby.net\n"
|
|
8669 |
" [hobby]\n"
|
|
8670 |
" host=r.hobby.net\n"
|
|
8671 |
" user=jim\n"
|
|
8672 |
" password=obvious1234\n"
|
|
8673 |
" \n"
|
|
8674 |
" # Home server\n"
|
|
8675 |
" [home]\n"
|
|
8676 |
" scheme=https\n"
|
|
8677 |
" host=home.net\n"
|
|
8678 |
" user=joe\n"
|
|
8679 |
" password=1essobV10us\n"
|
|
8680 |
" \n"
|
|
8681 |
" [DEFAULT]\n"
|
|
8682 |
" # Our local user is barbaz, on all remote sites we're known as "
|
|
8683 |
"foobar\n"
|
|
8684 |
" user=foobar"
|
|
8685 |
msgstr "" |
|
8686 |
||
8687 |
#: en/help_topics/authentication.txt:164
|
|
8688 |
msgid "" |
|
8689 |
"\n"
|
|
8690 |
"Source hosting provider\n"
|
|
8691 |
"~~~~~~~~~~~~~~~~~~~~~~~"
|
|
8692 |
msgstr "" |
|
8693 |
||
8694 |
#: en/help_topics/authentication.txt:168
|
|
8695 |
msgid "In the shp.net (fictitious) domain, each project has its own site::" |
|
8696 |
msgstr "" |
|
8697 |
||
8698 |
#: en/help_topics/authentication.txt:170
|
|
8699 |
msgid "" |
|
8700 |
" [shpnet domain]\n"
|
|
8701 |
" # we use sftp, but ssh is the scheme used for authentication\n"
|
|
8702 |
" scheme=ssh\n"
|
|
8703 |
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
|
|
8704 |
" host=.shp.net\n"
|
|
8705 |
" user=joe\n"
|
|
8706 |
" # bzr don't support supplying a password for sftp,\n"
|
|
8707 |
" # consider using an ssh agent if you don't want to supply\n"
|
|
8708 |
" # a password interactively. (pageant, ssh-agent, etc)"
|
|
8709 |
msgstr "" |
|
8710 |
||
8711 |
#: en/help_topics/authentication.txt:180
|
|
8712 |
msgid "" |
|
8713 |
"HTTPS, SFTP servers and their proxy\n"
|
|
8714 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
8715 |
msgstr "" |
|
8716 |
||
8717 |
#: en/help_topics/authentication.txt:183
|
|
8718 |
msgid "" |
|
8719 |
"At company.com, the server hosting release and integration branches is "
|
|
8720 |
"behind a\n"
|
|
8721 |
"proxy, and the two branches use different authentication policies::"
|
|
8722 |
msgstr "" |
|
8723 |
||
8724 |
#: en/help_topics/authentication.txt:186
|
|
8725 |
msgid "" |
|
8726 |
" [reference code]\n"
|
|
8727 |
" scheme=https\n"
|
|
8728 |
" host=dev.company.com\n"
|
|
8729 |
" path=/dev\n"
|
|
8730 |
" user=user1\n"
|
|
8731 |
" password=pass1"
|
|
8732 |
msgstr "" |
|
8733 |
||
8734 |
#: en/help_topics/authentication.txt:193
|
|
8735 |
msgid "" |
|
8736 |
" # development branches on dev server\n"
|
|
8737 |
" [dev]\n"
|
|
8738 |
" scheme=ssh # bzr+ssh and sftp are available here\n"
|
|
8739 |
" host=dev.company.com\n"
|
|
8740 |
" path=/dev/integration\n"
|
|
8741 |
" user=user2\n"
|
|
8742 |
" \n"
|
|
8743 |
" # proxy\n"
|
|
8744 |
" [proxy]\n"
|
|
8745 |
" scheme=http\n"
|
|
8746 |
" host=proxy.company.com\n"
|
|
8747 |
" port=3128\n"
|
|
8748 |
" user=proxyuser1\n"
|
|
8749 |
" password=proxypass1"
|
|
8750 |
msgstr "" |
|
8751 |
||
8752 |
#: en/help_topics/authentication.txt:208
|
|
8753 |
msgid "" |
|
8754 |
"\n"
|
|
8755 |
"Planned enhancements\n"
|
|
8756 |
"--------------------"
|
|
8757 |
msgstr "" |
|
8758 |
||
8759 |
#: en/help_topics/authentication.txt:212
|
|
8760 |
msgid "" |
|
8761 |
"The following are not yet implemented but planned as parts of a work in\n"
|
|
8762 |
"progress:" |
|
8763 |
msgstr "" |
|
8764 |
||
8765 |
#: en/help_topics/authentication.txt:215
|
|
8766 |
msgid "* add a ``password_encoding`` field allowing:" |
|
8767 |
msgstr "" |
|
8768 |
||
8769 |
#: en/help_topics/authentication.txt:217
|
|
8770 |
msgid "" |
|
8771 |
" - storing the passwords in various obfuscating encodings (base64 for one),"
|
|
8772 |
msgstr "" |
|
8773 |
||
8774 |
#: en/help_topics/authentication.txt:219
|
|
8775 |
msgid " - delegate password storage to plugins (.netrc for example)." |
|
8776 |
msgstr "" |
|
8777 |
||
8778 |
#: en/help_topics/authentication.txt:221
|
|
8779 |
msgid "" |
|
8780 |
"* update the credentials when the user is prompted for user or password,"
|
|
8781 |
msgstr "" |
|
8782 |
||
8783 |
#: en/help_topics/authentication.txt:223
|
|
8784 |
msgid "* add a ``verify_certificates`` field for ``HTTPS``." |
|
8785 |
msgstr "" |
|
8786 |
||
8787 |
#: en/help_topics/authentication.txt:225
|
|
8788 |
msgid "" |
|
8789 |
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
|
|
8790 |
"but\n"
|
|
8791 |
"ignored in the actual implementation.\n"
|
|
8792 |
msgstr "" |
|
8793 |
||
8794 |
#: en/help_topics/bugs.txt:1
|
|
8795 |
msgid "Bug Tracker Settings" |
|
8796 |
msgstr "" |
|
8797 |
||
8798 |
#: en/help_topics/bugs.txt:3
|
|
8799 |
msgid "" |
|
8800 |
"When making a commit, metadata about bugs fixed by that change can be\n"
|
|
8801 |
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
|
|
8802 |
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
|
|
8803 |
"(The only ``status`` value currently supported is ``fixed.``)"
|
|
8804 |
msgstr "" |
|
8805 |
||
8806 |
#: en/help_topics/bugs.txt:8
|
|
8807 |
msgid "" |
|
8808 |
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
|
|
8809 |
"identifier\n"
|
|
8810 |
"rather than a full URL. This looks like::"
|
|
8811 |
msgstr "" |
|
8812 |
||
8813 |
#: en/help_topics/bugs.txt:11
|
|
8814 |
msgid " bzr commit --fixes <tracker>:<id>" |
|
8815 |
msgstr "" |
|
8816 |
||
8817 |
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
|
|
8818 |
msgid "or::" |
|
8819 |
msgstr "" |
|
8820 |
||
8821 |
#: en/help_topics/bugs.txt:15
|
|
8822 |
msgid " bzr commit --fixes <id>" |
|
8823 |
msgstr "" |
|
8824 |
||
8825 |
#: en/help_topics/bugs.txt:17
|
|
8826 |
msgid "" |
|
8827 |
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
|
|
8828 |
"the\n"
|
|
8829 |
"identifier for that bug within the bugtracker, usually the bug number.\n"
|
|
8830 |
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
|
|
8831 |
"or global configuration is used."
|
|
8832 |
msgstr "" |
|
8833 |
||
8834 |
#: en/help_topics/bugs.txt:22
|
|
8835 |
msgid "" |
|
8836 |
"Bazaar knows about a few bug trackers that have many users. If\n"
|
|
8837 |
"you use one of these bug trackers then there is no setup required to\n"
|
|
8838 |
"use this feature, you just need to know the tracker identifier to use.\n"
|
|
8839 |
"These are the bugtrackers that are built in:"
|
|
8840 |
msgstr "" |
|
8841 |
||
8842 |
#: en/help_topics/bugs.txt:27
|
|
8843 |
msgid "" |
|
8844 |
" ============================ ============ ============\n"
|
|
8845 |
" URL Abbreviation Example\n"
|
|
8846 |
" ============================ ============ ============\n"
|
|
8847 |
" https://bugs.launchpad.net/ lp lp:12345\n"
|
|
8848 |
" http://bugs.debian.org/ deb deb:12345\n"
|
|
8849 |
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
|
|
8850 |
" ============================ ============ ============"
|
|
8851 |
msgstr "" |
|
8852 |
||
8853 |
#: en/help_topics/bugs.txt:35
|
|
8854 |
msgid "" |
|
8855 |
"For the bug trackers not listed above configuration is required.\n"
|
|
8856 |
"Support for generating the URLs for any project using Bugzilla or Trac\n"
|
|
8857 |
"is built in, along with a template mechanism for other bugtrackers with\n"
|
|
8858 |
"simple URL schemes. If your bug tracker can't be described by one\n"
|
|
8859 |
"of the schemes described below then you can write a plugin to support\n"
|
|
8860 |
"it."
|
|
8861 |
msgstr "" |
|
8862 |
||
8863 |
#: en/help_topics/bugs.txt:42
|
|
8864 |
msgid "" |
|
8865 |
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
|
|
8866 |
"variable which contains the base URL of the bug tracker. These options\n"
|
|
8867 |
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
|
|
8868 |
"configuration section in ``locations.conf``. You can set up these values\n"
|
|
8869 |
"for each of the projects you work on."
|
|
8870 |
msgstr "" |
|
8871 |
||
8872 |
#: en/help_topics/bugs.txt:48
|
|
8873 |
msgid "" |
|
8874 |
"Note: As you provide a short name for each tracker, you can specify one or\n" |
|
8875 |
"more bugs in one or more trackers at commit time if you wish."
|
|
8876 |
msgstr "" |
|
8877 |
||
8878 |
#: en/help_topics/bugs.txt:51
|
|
8879 |
msgid "" |
|
8880 |
"Launchpad\n"
|
|
8881 |
"---------"
|
|
8882 |
msgstr "" |
|
8883 |
||
8884 |
#: en/help_topics/bugs.txt:54
|
|
8885 |
msgid "" |
|
8886 |
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
|
|
8887 |
msgstr "" |
|
8888 |
||
8889 |
#: en/help_topics/bugs.txt:56
|
|
8890 |
msgid "" |
|
8891 |
"bugzilla_<tracker>_url\n"
|
|
8892 |
"----------------------"
|
|
8893 |
msgstr "" |
|
8894 |
||
8895 |
#: en/help_topics/bugs.txt:59
|
|
8896 |
msgid "" |
|
8897 |
"If present, the location of the Bugzilla bug tracker referred to by\n"
|
|
8898 |
"<tracker>. This option can then be used together with ``bzr commit\n"
|
|
8899 |
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
|
|
8900 |
"example::" |
|
8901 |
msgstr "" |
|
8902 |
||
8903 |
#: en/help_topics/bugs.txt:64
|
|
8904 |
msgid " bugzilla_squid_url = http://bugs.squid-cache.org" |
|
8905 |
msgstr "" |
|
8906 |
||
8907 |
#: en/help_topics/bugs.txt:66
|
|
8908 |
msgid "" |
|
8909 |
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
|
|
8910 |
"fixed."
|
|
8911 |
msgstr "" |
|
8912 |
||
8913 |
#: en/help_topics/bugs.txt:69
|
|
8914 |
msgid "" |
|
8915 |
"trac_<tracker>_url\n"
|
|
8916 |
"------------------"
|
|
8917 |
msgstr "" |
|
8918 |
||
8919 |
#: en/help_topics/bugs.txt:72
|
|
8920 |
msgid "" |
|
8921 |
"If present, the location of the Trac instance referred to by\n"
|
|
8922 |
"<tracker>. This option can then be used together with ``bzr commit\n"
|
|
8923 |
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
|
|
8924 |
"example::" |
|
8925 |
msgstr "" |
|
8926 |
||
8927 |
#: en/help_topics/bugs.txt:77
|
|
8928 |
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac" |
|
8929 |
msgstr "" |
|
8930 |
||
8931 |
#: en/help_topics/bugs.txt:79
|
|
8932 |
msgid "" |
|
8933 |
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
|
|
8934 |
"as\n"
|
|
8935 |
"fixed."
|
|
8936 |
msgstr "" |
|
8937 |
||
8938 |
#: en/help_topics/bugs.txt:82
|
|
8939 |
msgid "" |
|
8940 |
"bugtracker_<tracker>_url\n"
|
|
8941 |
"------------------------"
|
|
8942 |
msgstr "" |
|
8943 |
||
8944 |
#: en/help_topics/bugs.txt:85
|
|
8945 |
msgid "" |
|
8946 |
"If present, the location of a generic bug tracker instance referred to by\n"
|
|
8947 |
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
|
|
8948 |
"which will be replaced by a specific bug ID. This option can then be used\n"
|
|
8949 |
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
|
|
8950 |
"fixed by that commit. For example::"
|
|
8951 |
msgstr "" |
|
8952 |
||
8953 |
#: en/help_topics/bugs.txt:91
|
|
8954 |
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}" |
|
8955 |
msgstr "" |
|
8956 |
||
8957 |
#: en/help_topics/bugs.txt:93
|
|
8958 |
msgid "" |
|
8959 |
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
|
|
8960 |
"Roundup bug tracker as fixed, or::"
|
|
8961 |
msgstr "" |
|
8962 |
||
8963 |
#: en/help_topics/bugs.txt:96
|
|
8964 |
msgid "" |
|
8965 |
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
|
|
8966 |
msgstr "" |
|
8967 |
||
8968 |
#: en/help_topics/bugs.txt:98
|
|
8969 |
msgid "" |
|
8970 |
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
|
|
8971 |
"RT bug tracker as fixed, or::"
|
|
8972 |
msgstr "" |
|
8973 |
||
8974 |
#: en/help_topics/bugs.txt:101
|
|
8975 |
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}" |
|
8976 |
msgstr "" |
|
8977 |
||
8978 |
#: en/help_topics/bugs.txt:103
|
|
8979 |
msgid "" |
|
8980 |
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
|
|
8981 |
"1234\n"
|
|
8982 |
"in Hudson's JIRA bug tracker as fixed.\n"
|
|
8983 |
msgstr "" |
|
8984 |
||
8985 |
#: en/help_topics/commands.txt:1
|
|
8986 |
msgid "" |
|
8987 |
"add Add specified files or directories.\n"
|
|
8988 |
"alias Set/unset and display aliases.\n"
|
|
8989 |
"annotate Show the origin of each line in a file.\n"
|
|
8990 |
"bash-completion Generate a shell function for bash command line "
|
|
8991 |
"completion.\n"
|
|
8992 |
" [bash_completion]\n"
|
|
8993 |
"bind Convert the current branch into a checkout of the "
|
|
8994 |
"supplied\n"
|
|
8995 |
" branch.\n"
|
|
8996 |
"branch Create a new branch that is a copy of an existing branch.\n"
|
|
8997 |
"branches List the branches available at the current location.\n"
|
|
8998 |
"break-lock Break a dead lock.\n"
|
|
8999 |
"cat Write the contents of a file as of a given revision to\n"
|
|
9000 |
" standard output.\n"
|
|
9001 |
"check Validate working tree structure, branch consistency and\n"
|
|
9002 |
" repository history.\n"
|
|
9003 |
"checkout Create a new checkout of an existing branch.\n"
|
|
9004 |
"clean-tree Remove unwanted files from working tree.\n"
|
|
9005 |
"commit Commit changes into a new revision.\n"
|
|
9006 |
"config Display, set or remove a configuration option.\n"
|
|
9007 |
"conflicts List files with conflicts.\n"
|
|
9008 |
"deleted List files deleted in the working tree.\n"
|
|
9009 |
"diff Show differences in the working tree, between revisions "
|
|
9010 |
"or\n"
|
|
9011 |
" branches.\n"
|
|
9012 |
"dpush Push into a different VCS without any custom bzr "
|
|
9013 |
"metadata.\n"
|
|
9014 |
"export Export current or past revision to a destination directory "
|
|
9015 |
"or\n"
|
|
9016 |
" archive.\n"
|
|
9017 |
"help Show help on a command or other topic.\n"
|
|
9018 |
"ignore Ignore specified files or patterns.\n"
|
|
9019 |
"ignored List ignored files and the patterns that matched them.\n"
|
|
9020 |
"info Show information about a working tree, branch or "
|
|
9021 |
"repository.\n"
|
|
9022 |
"init Make a directory into a versioned branch.\n"
|
|
9023 |
"init-repository Create a shared repository for branches to share storage\n"
|
|
9024 |
" space.\n"
|
|
9025 |
"join Combine a tree into its containing tree.\n"
|
|
9026 |
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
|
|
9027 |
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
|
|
9028 |
"launchpad-open Open a Launchpad branch page in your web browser. "
|
|
9029 |
"[launchpad]\n"
|
|
9030 |
"log Show historical log for a branch or subset of a branch.\n"
|
|
9031 |
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
|
|
9032 |
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
|
|
9033 |
"ls List files in a tree.\n"
|
|
9034 |
"merge Perform a three-way merge.\n"
|
|
9035 |
"missing Show unmerged/unpulled revisions between two branches.\n"
|
|
9036 |
"mkdir Create a new versioned directory.\n"
|
|
9037 |
"mv Move or rename a file.\n"
|
|
9038 |
"nick Print or set the branch nickname.\n"
|
|
9039 |
"pack Compress the data within a repository.\n"
|
|
9040 |
"plugins List the installed plugins.\n"
|
|
9041 |
"pull Turn this branch into a mirror of another branch.\n"
|
|
9042 |
"push Update a mirror of this branch.\n"
|
|
9043 |
"reconcile Reconcile bzr metadata in a branch.\n"
|
|
9044 |
"reconfigure Reconfigure the type of a bzr directory.\n"
|
|
9045 |
"register-branch Register a branch with launchpad.net. [launchpad]\n"
|
|
9046 |
"remerge Redo a merge.\n"
|
|
9047 |
"remove Remove files or directories.\n"
|
|
9048 |
"remove-branch Remove a branch.\n"
|
|
9049 |
"remove-tree Remove the working tree from a given branch/checkout.\n"
|
|
9050 |
"renames Show list of renamed files.\n"
|
|
9051 |
"resolve Mark a conflict as resolved.\n"
|
|
9052 |
"revert Revert files to a previous revision.\n"
|
|
9053 |
"revno Show current revision number.\n"
|
|
9054 |
"root Show the tree root directory.\n"
|
|
9055 |
"send Mail or create a merge-directive for submitting changes.\n"
|
|
9056 |
"serve Run the bzr server.\n"
|
|
9057 |
"shelve Temporarily set aside some changes from the current tree.\n"
|
|
9058 |
"sign-my-commits Sign all commits by a given committer.\n"
|
|
9059 |
"split Split a subdirectory of a tree into a separate tree.\n"
|
|
9060 |
"status Display status summary.\n"
|
|
9061 |
"switch Set the branch of a checkout and update.\n"
|
|
9062 |
"tag Create, remove or modify a tag naming a revision.\n"
|
|
9063 |
"tags List tags.\n"
|
|
9064 |
"testament Show testament (signing-form) of a revision.\n"
|
|
9065 |
"unbind Convert the current checkout into a regular branch.\n"
|
|
9066 |
"uncommit Remove the last committed revision.\n"
|
|
9067 |
"unshelve Restore shelved changes.\n"
|
|
9068 |
"update Update a working tree to a new revision.\n"
|
|
9069 |
"upgrade Upgrade a repository, branch or working tree to a newer\n"
|
|
9070 |
" format.\n"
|
|
9071 |
"verify-signatures Verify all commit signatures.\n"
|
|
9072 |
"version Show version of bzr.\n"
|
|
9073 |
"version-info Show version information about this tree.\n"
|
|
9074 |
"view Manage filtered views.\n"
|
|
9075 |
"whoami Show or set bzr user id.\n"
|
|
9076 |
msgstr "" |
|
9077 |
||
9078 |
#: en/help_topics/configuration.txt:1
|
|
9079 |
msgid "" |
|
9080 |
"Configuration Settings\n"
|
|
9081 |
"======================="
|
|
9082 |
msgstr "" |
|
9083 |
||
9084 |
#: en/help_topics/configuration.txt:4
|
|
9085 |
msgid "" |
|
9086 |
"Environment settings\n"
|
|
9087 |
"---------------------"
|
|
9088 |
msgstr "" |
|
9089 |
||
9090 |
#: en/help_topics/configuration.txt:7
|
|
9091 |
msgid "" |
|
9092 |
"While most configuration is handled by configuration files, some options\n"
|
|
9093 |
"which may be semi-permanent can also be controlled through the environment."
|
|
9094 |
msgstr "" |
|
9095 |
||
9096 |
#: en/help_topics/configuration.txt:10
|
|
9097 |
msgid "" |
|
9098 |
"BZR_EMAIL\n"
|
|
9099 |
"~~~~~~~~~"
|
|
9100 |
msgstr "" |
|
9101 |
||
9102 |
#: en/help_topics/configuration.txt:13
|
|
9103 |
msgid "Override the email id used by Bazaar. Typical format::" |
|
9104 |
msgstr "" |
|
9105 |
||
9106 |
#: en/help_topics/configuration.txt:15
|
|
9107 |
msgid " \"John Doe <jdoe@example.com>\"" |
|
9108 |
msgstr "" |
|
9109 |
||
9110 |
#: en/help_topics/configuration.txt:17
|
|
9111 |
msgid "See also the ``email`` configuration option." |
|
9112 |
msgstr "" |
|
9113 |
||
9114 |
#: en/help_topics/configuration.txt:19
|
|
9115 |
msgid "" |
|
9116 |
"BZR_PROGRESS_BAR\n"
|
|
9117 |
"~~~~~~~~~~~~~~~~"
|
|
9118 |
msgstr "" |
|
9119 |
||
9120 |
#: en/help_topics/configuration.txt:22
|
|
9121 |
msgid "" |
|
9122 |
"Override the progress display. Possible values are \"none\" or \"text\". "
|
|
9123 |
"If\n"
|
|
9124 |
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
|
|
9125 |
"draws\n"
|
|
9126 |
"the ordinary command line progress bar."
|
|
9127 |
msgstr "" |
|
9128 |
||
9129 |
#: en/help_topics/configuration.txt:26
|
|
9130 |
msgid "" |
|
9131 |
"BZR_SIGQUIT_PDB\n"
|
|
9132 |
"~~~~~~~~~~~~~~~"
|
|
9133 |
msgstr "" |
|
9134 |
||
9135 |
#: en/help_topics/configuration.txt:29
|
|
9136 |
msgid "" |
|
9137 |
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
|
|
9138 |
msgstr "" |
|
9139 |
||
9140 |
#: en/help_topics/configuration.txt:31
|
|
9141 |
msgid "" |
|
9142 |
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
|
|
9143 |
"* 1 = Invoke breakin debugger (default)"
|
|
9144 |
msgstr "" |
|
9145 |
||
9146 |
#: en/help_topics/configuration.txt:34
|
|
9147 |
msgid "" |
|
9148 |
"BZR_HOME\n"
|
|
9149 |
"~~~~~~~~"
|
|
9150 |
msgstr "" |
|
9151 |
||
9152 |
#: en/help_topics/configuration.txt:37
|
|
9153 |
msgid "Override the home directory used by Bazaar." |
|
9154 |
msgstr "" |
|
9155 |
||
9156 |
#: en/help_topics/configuration.txt:39
|
|
9157 |
msgid "" |
|
9158 |
"BZR_SSH\n"
|
|
9159 |
"~~~~~~~"
|
|
9160 |
msgstr "" |
|
9161 |
||
9162 |
#: en/help_topics/configuration.txt:42
|
|
9163 |
msgid "Select a different SSH implementation." |
|
9164 |
msgstr "" |
|
9165 |
||
9166 |
#: en/help_topics/configuration.txt:44
|
|
9167 |
msgid "" |
|
9168 |
"BZR_PDB\n"
|
|
9169 |
"~~~~~~~"
|
|
9170 |
msgstr "" |
|
9171 |
||
9172 |
#: en/help_topics/configuration.txt:47
|
|
9173 |
msgid "Control whether to launch a debugger on error." |
|
9174 |
msgstr "" |
|
9175 |
||
9176 |
#: en/help_topics/configuration.txt:49
|
|
9177 |
msgid "" |
|
9178 |
"* 0 = Standard behavior\n"
|
|
9179 |
"* 1 = Launch debugger"
|
|
9180 |
msgstr "" |
|
9181 |
||
9182 |
#: en/help_topics/configuration.txt:52
|
|
9183 |
msgid "" |
|
9184 |
"BZR_REMOTE_PATH\n"
|
|
9185 |
"~~~~~~~~~~~~~~~"
|
|
9186 |
msgstr "" |
|
9187 |
||
9188 |
#: en/help_topics/configuration.txt:55
|
|
9189 |
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol." |
|
9190 |
msgstr "" |
|
9191 |
||
9192 |
#: en/help_topics/configuration.txt:57
|
|
9193 |
msgid "See also the ``bzr_remote_path`` configuration option." |
|
9194 |
msgstr "" |
|
9195 |
||
9196 |
#: en/help_topics/configuration.txt:59
|
|
9197 |
msgid "" |
|
9198 |
"BZR_EDITOR\n"
|
|
9199 |
"~~~~~~~~~~"
|
|
9200 |
msgstr "" |
|
9201 |
||
9202 |
#: en/help_topics/configuration.txt:62
|
|
9203 |
msgid "Path to the editor Bazaar should use for commit messages, etc." |
|
9204 |
msgstr "" |
|
9205 |
||
9206 |
#: en/help_topics/configuration.txt:64
|
|
9207 |
msgid "" |
|
9208 |
"BZR_LOG\n"
|
|
9209 |
"~~~~~~~"
|
|
9210 |
msgstr "" |
|
9211 |
||
9212 |
#: en/help_topics/configuration.txt:67
|
|
9213 |
msgid "" |
|
9214 |
"Location of the Bazaar log file. You can check the current location by\n"
|
|
9215 |
"running ``bzr version``."
|
|
9216 |
msgstr "" |
|
9217 |
||
9218 |
#: en/help_topics/configuration.txt:70
|
|
9219 |
msgid "" |
|
9220 |
"The log file contains debug information that is useful for diagnosing or\n"
|
|
9221 |
"reporting problems with Bazaar."
|
|
9222 |
msgstr "" |
|
9223 |
||
9224 |
#: en/help_topics/configuration.txt:73
|
|
9225 |
msgid "" |
|
9226 |
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
|
|
9227 |
"will disable logging."
|
|
9228 |
msgstr "" |
|
9229 |
||
9230 |
#: en/help_topics/configuration.txt:76
|
|
9231 |
msgid "" |
|
9232 |
"\n"
|
|
9233 |
"BZR_PLUGIN_PATH\n"
|
|
9234 |
"~~~~~~~~~~~~~~~"
|
|
9235 |
msgstr "" |
|
9236 |
||
9237 |
#: en/help_topics/configuration.txt:80
|
|
9238 |
msgid "" |
|
9239 |
"The path to the plugins directory that Bazaar should use.\n"
|
|
9240 |
"If not set, Bazaar will search for plugins in:"
|
|
9241 |
msgstr "" |
|
9242 |
||
9243 |
#: en/help_topics/configuration.txt:83
|
|
9244 |
msgid "" |
|
9245 |
"* the user specific plugin directory (containing the ``user`` plugins),"
|
|
9246 |
msgstr "" |
|
9247 |
||
9248 |
#: en/help_topics/configuration.txt:85
|
|
9249 |
msgid "* the bzrlib directory (containing the ``core`` plugins)," |
|
9250 |
msgstr "" |
|
9251 |
||
9252 |
#: en/help_topics/configuration.txt:87
|
|
9253 |
msgid "" |
|
9254 |
"* the site specific plugin directory if applicable (containing\n"
|
|
9255 |
" the ``site`` plugins)."
|
|
9256 |
msgstr "" |
|
9257 |
||
9258 |
#: en/help_topics/configuration.txt:90
|
|
9259 |
msgid "" |
|
9260 |
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
|
|
9261 |
"the way the plugin are searched. "
|
|
9262 |
msgstr "" |
|
9263 |
||
9264 |
#: en/help_topics/configuration.txt:93
|
|
9265 |
msgid "" |
|
9266 |
"As for the ``PATH`` variables, if multiple directories are\n"
|
|
9267 |
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
|
|
9268 |
"platform specific appropriate character (':' on Unix,\n"
|
|
9269 |
"';' on windows)"
|
|
9270 |
msgstr "" |
|
9271 |
||
9272 |
#: en/help_topics/configuration.txt:98
|
|
9273 |
msgid "" |
|
9274 |
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
|
|
9275 |
"in ``user``. However it will continue to search in ``core`` and\n"
|
|
9276 |
"``site`` unless they are explicitly removed."
|
|
9277 |
msgstr "" |
|
9278 |
||
9279 |
#: en/help_topics/configuration.txt:102
|
|
9280 |
msgid "" |
|
9281 |
"If you need to change the order or remove one of these\n"
|
|
9282 |
"directories, you should use special values:"
|
|
9283 |
msgstr "" |
|
9284 |
||
9285 |
#: en/help_topics/configuration.txt:105
|
|
9286 |
msgid "" |
|
9287 |
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
|
|
9288 |
" path from the default values,"
|
|
9289 |
msgstr "" |
|
9290 |
||
9291 |
#: en/help_topics/configuration.txt:108
|
|
9292 |
msgid "" |
|
9293 |
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
|
|
9294 |
" before the remaining default values (and also remove it from\n"
|
|
9295 |
" the default values)."
|
|
9296 |
msgstr "" |
|
9297 |
||
9298 |
#: en/help_topics/configuration.txt:112
|
|
9299 |
msgid "" |
|
9300 |
"Note that the special values 'user', 'core' and 'site' should be\n"
|
|
9301 |
"used literally, they will be substituted by the corresponding,\n"
|
|
9302 |
"platform specific, values."
|
|
9303 |
msgstr "" |
|
9304 |
||
9305 |
#: en/help_topics/configuration.txt:116
|
|
9306 |
msgid "" |
|
9307 |
"The examples below use ':' as the separator, windows users\n"
|
|
9308 |
"should use ';'."
|
|
9309 |
msgstr "" |
|
9310 |
||
9311 |
#: en/help_topics/configuration.txt:119
|
|
9312 |
msgid "Overriding the default user plugin directory::" |
|
9313 |
msgstr "" |
|
9314 |
||
9315 |
#: en/help_topics/configuration.txt:121
|
|
9316 |
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'" |
|
9317 |
msgstr "" |
|
9318 |
||
9319 |
#: en/help_topics/configuration.txt:123
|
|
9320 |
msgid "Disabling the site directory while retaining the user directory::" |
|
9321 |
msgstr "" |
|
9322 |
||
9323 |
#: en/help_topics/configuration.txt:125
|
|
9324 |
msgid " BZR_PLUGIN_PATH='-site:+user'" |
|
9325 |
msgstr "" |
|
9326 |
||
9327 |
#: en/help_topics/configuration.txt:127
|
|
9328 |
msgid "Disabling all plugins (better achieved with --no-plugins)::" |
|
9329 |
msgstr "" |
|
9330 |
||
9331 |
#: en/help_topics/configuration.txt:129
|
|
9332 |
msgid " BZR_PLUGIN_PATH='-user:-core:-site'" |
|
9333 |
msgstr "" |
|
9334 |
||
9335 |
#: en/help_topics/configuration.txt:131
|
|
9336 |
msgid "Overriding the default site plugin directory::" |
|
9337 |
msgstr "" |
|
9338 |
||
9339 |
#: en/help_topics/configuration.txt:133
|
|
9340 |
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user" |
|
9341 |
msgstr "" |
|
9342 |
||
9343 |
#: en/help_topics/configuration.txt:135
|
|
9344 |
msgid "" |
|
9345 |
"BZR_DISABLE_PLUGINS\n"
|
|
9346 |
"~~~~~~~~~~~~~~~~~~~"
|
|
9347 |
msgstr "" |
|
9348 |
||
9349 |
#: en/help_topics/configuration.txt:138
|
|
9350 |
msgid "" |
|
9351 |
"Under special circumstances (mostly when trying to diagnose a\n"
|
|
9352 |
"bug), it's better to disable a plugin (or several) rather than\n"
|
|
9353 |
"uninstalling them completely. Such plugins can be specified in\n"
|
|
9354 |
"the ``BZR_DISABLE_PLUGINS`` environment variable."
|
|
9355 |
msgstr "" |
|
9356 |
||
9357 |
#: en/help_topics/configuration.txt:143
|
|
9358 |
msgid "" |
|
9359 |
"In that case, ``bzr`` will stop loading the specified plugins and\n"
|
|
9360 |
"will raise an import error if they are explicitly imported (by\n"
|
|
9361 |
"another plugin that depends on them for example)."
|
|
9362 |
msgstr "" |
|
9363 |
||
9364 |
#: en/help_topics/configuration.txt:147
|
|
9365 |
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::" |
|
9366 |
msgstr "" |
|
9367 |
||
9368 |
#: en/help_topics/configuration.txt:149
|
|
9369 |
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'" |
|
9370 |
msgstr "" |
|
9371 |
||
9372 |
#: en/help_topics/configuration.txt:151
|
|
9373 |
msgid "" |
|
9374 |
"BZR_PLUGINS_AT\n"
|
|
9375 |
"~~~~~~~~~~~~~~"
|
|
9376 |
msgstr "" |
|
9377 |
||
9378 |
#: en/help_topics/configuration.txt:154
|
|
9379 |
msgid "" |
|
9380 |
"When adding a new feature or working on a bug in a plugin,\n"
|
|
9381 |
"developers often need to use a specific version of a given\n"
|
|
9382 |
"plugin. Since python requires that the directory containing the\n"
|
|
9383 |
"code is named like the plugin itself this make it impossible to\n"
|
|
9384 |
"use arbitrary directory names (using a two-level directory scheme\n"
|
|
9385 |
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
|
|
9386 |
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
|
|
9387 |
msgstr "" |
|
9388 |
||
9389 |
#: en/help_topics/configuration.txt:162
|
|
9390 |
msgid "" |
|
9391 |
"Plugins specified in this environment variable takes precedence\n"
|
|
9392 |
"over the ones in ``BZR_PLUGIN_PATH``."
|
|
9393 |
msgstr "" |
|
9394 |
||
9395 |
#: en/help_topics/configuration.txt:165
|
|
9396 |
msgid "" |
|
9397 |
"The variable specified a list of ``plugin_name@plugin path``,\n"
|
|
9398 |
"``plugin_name`` being the name of the plugin as it appears in\n"
|
|
9399 |
"python module paths, ``plugin_path`` being the path to the\n"
|
|
9400 |
"directory containing the plugin code itself\n"
|
|
9401 |
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
|
|
9402 |
"separator, use ';' on windows."
|
|
9403 |
msgstr "" |
|
9404 |
||
9405 |
#: en/help_topics/configuration.txt:172
|
|
9406 |
msgid "" |
|
9407 |
"Example:\n" |
|
9408 |
"~~~~~~~~"
|
|
9409 |
msgstr "" |
|
9410 |
||
9411 |
#: en/help_topics/configuration.txt:175
|
|
9412 |
msgid "" |
|
9413 |
"Using a specific version of ``myplugin``:\n"
|
|
9414 |
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
|
|
9415 |
msgstr "" |
|
9416 |
||
9417 |
#: en/help_topics/configuration.txt:178
|
|
9418 |
msgid "" |
|
9419 |
"BZRPATH\n"
|
|
9420 |
"~~~~~~~"
|
|
9421 |
msgstr "" |
|
9422 |
||
9423 |
#: en/help_topics/configuration.txt:181
|
|
9424 |
msgid "The path where Bazaar should look for shell plugin external commands." |
|
9425 |
msgstr "" |
|
9426 |
||
9427 |
#: en/help_topics/configuration.txt:183
|
|
9428 |
msgid "" |
|
9429 |
"\n"
|
|
9430 |
"http_proxy, https_proxy\n"
|
|
9431 |
"~~~~~~~~~~~~~~~~~~~~~~~"
|
|
9432 |
msgstr "" |
|
9433 |
||
9434 |
#: en/help_topics/configuration.txt:187
|
|
9435 |
msgid "Specifies the network proxy for outgoing connections, for example::" |
|
9436 |
msgstr "" |
|
9437 |
||
9438 |
#: en/help_topics/configuration.txt:189
|
|
9439 |
msgid "" |
|
9440 |
" http_proxy=http://proxy.example.com:3128/ \n"
|
|
9441 |
" https_proxy=http://proxy.example.com:3128/"
|
|
9442 |
msgstr "" |
|
9443 |
||
9444 |
#: en/help_topics/configuration.txt:192
|
|
9445 |
msgid "" |
|
9446 |
"\n"
|
|
9447 |
"Configuration files\n"
|
|
9448 |
"-------------------"
|
|
9449 |
msgstr "" |
|
9450 |
||
9451 |
#: en/help_topics/configuration.txt:196
|
|
9452 |
msgid "" |
|
9453 |
"Location\n"
|
|
9454 |
"~~~~~~~~"
|
|
9455 |
msgstr "" |
|
9456 |
||
9457 |
#: en/help_topics/configuration.txt:199
|
|
9458 |
msgid "" |
|
9459 |
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
|
|
9460 |
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
|
|
9461 |
"on\n"
|
|
9462 |
"Windows. (You can check the location for your system by using\n"
|
|
9463 |
"``bzr version``.)"
|
|
9464 |
msgstr "" |
|
9465 |
||
9466 |
#: en/help_topics/configuration.txt:204
|
|
9467 |
msgid "There are three primary configuration files in this location:" |
|
9468 |
msgstr "" |
|
9469 |
||
9470 |
#: en/help_topics/configuration.txt:206
|
|
9471 |
msgid "* ``bazaar.conf`` describes default configuration options," |
|
9472 |
msgstr "" |
|
9473 |
||
9474 |
#: en/help_topics/configuration.txt:208
|
|
9475 |
msgid "" |
|
9476 |
"* ``locations.conf`` describes configuration information for\n"
|
|
9477 |
" specific branch locations,"
|
|
9478 |
msgstr "" |
|
9479 |
||
9480 |
#: en/help_topics/configuration.txt:211
|
|
9481 |
msgid "" |
|
9482 |
"* ``authentication.conf`` describes credential information for\n"
|
|
9483 |
" remote servers."
|
|
9484 |
msgstr "" |
|
9485 |
||
9486 |
#: en/help_topics/configuration.txt:214
|
|
9487 |
msgid "" |
|
9488 |
"Each branch can also contain a configuration file that sets values specific\n"
|
|
9489 |
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
|
|
9490 |
"the\n"
|
|
9491 |
"branch. This file is visible to all users of a branch, if you wish to "
|
|
9492 |
"override\n"
|
|
9493 |
"one of the values for a branch with a setting that is specific to you then "
|
|
9494 |
"you\n"
|
|
9495 |
"can do so in ``locations.conf``."
|
|
9496 |
msgstr "" |
|
9497 |
||
9498 |
#: en/help_topics/configuration.txt:220
|
|
9499 |
msgid "" |
|
9500 |
"General format\n"
|
|
9501 |
"~~~~~~~~~~~~~~"
|
|
9502 |
msgstr "" |
|
9503 |
||
9504 |
#: en/help_topics/configuration.txt:223
|
|
9505 |
msgid "" |
|
9506 |
"An ini file has three types of contructs: section headers, section\n"
|
|
9507 |
"options and comments."
|
|
9508 |
msgstr "" |
|
9509 |
||
9510 |
#: en/help_topics/configuration.txt:226
|
|
9511 |
msgid "" |
|
9512 |
"Comments\n"
|
|
9513 |
"^^^^^^^^"
|
|
9514 |
msgstr "" |
|
9515 |
||
9516 |
#: en/help_topics/configuration.txt:229
|
|
9517 |
msgid "" |
|
9518 |
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
|
|
9519 |
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
|
|
9520 |
"Bazaar when parsing ini files."
|
|
9521 |
msgstr "" |
|
9522 |
||
9523 |
#: en/help_topics/configuration.txt:233
|
|
9524 |
msgid "" |
|
9525 |
"Section headers\n"
|
|
9526 |
"^^^^^^^^^^^^^^^"
|
|
9527 |
msgstr "" |
|
9528 |
||
9529 |
#: en/help_topics/configuration.txt:236
|
|
9530 |
msgid "" |
|
9531 |
"A section header is a word enclosed in brackets that starts at the begining\n"
|
|
9532 |
"of a line. A typical section header looks like this::"
|
|
9533 |
msgstr "" |
|
9534 |
||
9535 |
#: en/help_topics/configuration.txt:239
|
|
9536 |
msgid " [DEFAULT]" |
|
9537 |
msgstr "" |
|
9538 |
||
9539 |
#: en/help_topics/configuration.txt:241
|
|
9540 |
msgid "" |
|
9541 |
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
|
|
9542 |
"[ALIASES]. Section headers are case sensitive. The default section provides "
|
|
9543 |
"for\n"
|
|
9544 |
"setting options which can be overridden with the branch config file."
|
|
9545 |
msgstr "" |
|
9546 |
||
9547 |
#: en/help_topics/configuration.txt:245
|
|
9548 |
msgid "" |
|
9549 |
"For ``locations.conf``, the options from the section with the\n"
|
|
9550 |
"longest matching section header are used to the exclusion of other\n"
|
|
9551 |
"potentially valid section headers. A section header uses the path for\n"
|
|
9552 |
"the branch as the section header. Some examples include::"
|
|
9553 |
msgstr "" |
|
9554 |
||
9555 |
#: en/help_topics/configuration.txt:250
|
|
9556 |
msgid "" |
|
9557 |
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
|
|
9558 |
" [/home/jdoe/branches/]"
|
|
9559 |
msgstr "" |
|
9560 |
||
9561 |
#: en/help_topics/configuration.txt:253
|
|
9562 |
msgid "" |
|
9563 |
"\n"
|
|
9564 |
"Section options\n"
|
|
9565 |
"^^^^^^^^^^^^^^^"
|
|
9566 |
msgstr "" |
|
9567 |
||
9568 |
#: en/help_topics/configuration.txt:257
|
|
9569 |
msgid "" |
|
9570 |
"A section option resides within a section. A section option contains an\n"
|
|
9571 |
"option name, an equals sign and a value. For example::"
|
|
9572 |
msgstr "" |
|
9573 |
||
9574 |
#: en/help_topics/configuration.txt:260
|
|
9575 |
msgid "" |
|
9576 |
" email = John Doe <jdoe@isp.com>\n"
|
|
9577 |
" gpg_signing_key = Amy Pond <amy@example.com>"
|
|
9578 |
msgstr "" |
|
9579 |
||
9580 |
#: en/help_topics/configuration.txt:263
|
|
9581 |
msgid "" |
|
9582 |
"A option can reference other options by enclosing them in curly brackets::"
|
|
9583 |
msgstr "" |
|
9584 |
||
9585 |
#: en/help_topics/configuration.txt:265
|
|
9586 |
msgid "" |
|
9587 |
" my_branch_name = feature_x\n"
|
|
9588 |
" my_server = bzr+ssh://example.com\n"
|
|
9589 |
" push_location = {my_server}/project/{my_branch_name}"
|
|
9590 |
msgstr "" |
|
9591 |
||
9592 |
#: en/help_topics/configuration.txt:269
|
|
9593 |
msgid "" |
|
9594 |
"Option policies\n"
|
|
9595 |
"^^^^^^^^^^^^^^^"
|
|
9596 |
msgstr "" |
|
9597 |
||
9598 |
#: en/help_topics/configuration.txt:272
|
|
9599 |
msgid "" |
|
9600 |
"Options defined in a section affect the named directory or URL plus\n"
|
|
9601 |
"any locations they contain. Policies can be used to change how an\n"
|
|
9602 |
"option value is interpreted for contained locations. Currently\n"
|
|
9603 |
"there are three policies available:"
|
|
9604 |
msgstr "" |
|
9605 |
||
9606 |
#: en/help_topics/configuration.txt:277
|
|
9607 |
msgid "" |
|
9608 |
" none:\n"
|
|
9609 |
" the value is interpreted the same for contained locations. This is\n"
|
|
9610 |
" the default behaviour.\n"
|
|
9611 |
" norecurse:\n"
|
|
9612 |
" the value is only used for the exact location specified by the\n"
|
|
9613 |
" section name.\n"
|
|
9614 |
" appendpath:\n"
|
|
9615 |
" for contained locations, any additional path components are\n"
|
|
9616 |
" appended to the value."
|
|
9617 |
msgstr "" |
|
9618 |
||
9619 |
#: en/help_topics/configuration.txt:287
|
|
9620 |
msgid "" |
|
9621 |
"Policies are specified by keys with names of the form "
|
|
9622 |
"\"<option_name>:policy\".\n"
|
|
9623 |
"For example, to define the push location for a tree of branches, the\n"
|
|
9624 |
"following could be used::"
|
|
9625 |
msgstr "" |
|
9626 |
||
9627 |
#: en/help_topics/configuration.txt:291
|
|
9628 |
msgid "" |
|
9629 |
" [/top/location]\n"
|
|
9630 |
" push_location = sftp://example.com/location\n"
|
|
9631 |
" push_location:policy = appendpath"
|
|
9632 |
msgstr "" |
|
9633 |
||
9634 |
#: en/help_topics/configuration.txt:295
|
|
9635 |
msgid "" |
|
9636 |
"With this configuration, the push location for ``/top/location/branch1``\n"
|
|
9637 |
"would be ``sftp://example.com/location/branch1``."
|
|
9638 |
msgstr "" |
|
9639 |
||
9640 |
#: en/help_topics/configuration.txt:298
|
|
9641 |
msgid "" |
|
9642 |
"Section local options\n"
|
|
9643 |
"^^^^^^^^^^^^^^^^^^^^^"
|
|
9644 |
msgstr "" |
|
9645 |
||
9646 |
#: en/help_topics/configuration.txt:301
|
|
9647 |
msgid "" |
|
9648 |
"Some options are defined automatically inside a given section and can be\n"
|
|
9649 |
"refered to in this section only. "
|
|
9650 |
msgstr "" |
|
9651 |
||
9652 |
#: en/help_topics/configuration.txt:304
|
|
9653 |
msgid "For example, the ``appendpath`` policy can be used like this::" |
|
9654 |
msgstr "" |
|
9655 |
||
9656 |
#: en/help_topics/configuration.txt:306
|
|
9657 |
msgid "" |
|
9658 |
" [/home/vila/src/bzr/bugs]\n"
|
|
9659 |
" mypush = lp:~vila/bzr\n"
|
|
9660 |
" mypush:policy=appendpath"
|
|
9661 |
msgstr "" |
|
9662 |
||
9663 |
#: en/help_topics/configuration.txt:310
|
|
9664 |
msgid "Using ``relpath`` to achieve the same result is done like this::" |
|
9665 |
msgstr "" |
|
9666 |
||
9667 |
#: en/help_topics/configuration.txt:312
|
|
9668 |
msgid "" |
|
9669 |
" [/home/vila/src/bzr/bugs]\n"
|
|
9670 |
" mypush = lp:~vila/bzr/{relpath}"
|
|
9671 |
msgstr "" |
|
9672 |
||
9673 |
#: en/help_topics/configuration.txt:315
|
|
9674 |
msgid "" |
|
9675 |
"In both cases, when used in a directory like\n"
|
|
9676 |
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
|
|
9677 |
msgstr "" |
|
9678 |
||
9679 |
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
|
|
9680 |
msgid "" |
|
9681 |
" $ bzr config mypush\n"
|
|
9682 |
" lp:~vila/bzr/832013-expand-in-stack"
|
|
9683 |
msgstr "" |
|
9684 |
||
9685 |
#: en/help_topics/configuration.txt:321
|
|
9686 |
msgid "Another such option is ``basename`` which can be used like this::" |
|
9687 |
msgstr "" |
|
9688 |
||
9689 |
#: en/help_topics/configuration.txt:323
|
|
9690 |
msgid "" |
|
9691 |
" [/home/vila/src/bzr]\n"
|
|
9692 |
" mypush = lp:~vila/bzr/{basename}"
|
|
9693 |
msgstr "" |
|
9694 |
||
9695 |
#: en/help_topics/configuration.txt:326
|
|
9696 |
msgid "" |
|
9697 |
"When used in a directory like\n"
|
|
9698 |
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
|
|
9699 |
msgstr "" |
|
9700 |
||
9701 |
#: en/help_topics/configuration.txt:332
|
|
9702 |
msgid "" |
|
9703 |
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
|
|
9704 |
"itself is defined as the relative path between the section name and the\n"
|
|
9705 |
"location it matches."
|
|
9706 |
msgstr "" |
|
9707 |
||
9708 |
#: en/help_topics/configuration.txt:336
|
|
9709 |
msgid "" |
|
9710 |
"When an option is local to a Section, it cannot be referred to from option\n"
|
|
9711 |
"values in any other section from the same ``Store`` nor from any other\n"
|
|
9712 |
"``Store``."
|
|
9713 |
msgstr "" |
|
9714 |
||
9715 |
#: en/help_topics/configuration.txt:340
|
|
9716 |
msgid "" |
|
9717 |
"\n"
|
|
9718 |
"The main configuration file, bazaar.conf\n"
|
|
9719 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
9720 |
msgstr "" |
|
9721 |
||
9722 |
#: en/help_topics/configuration.txt:344
|
|
9723 |
msgid "" |
|
9724 |
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
|
|
9725 |
"The default section contains the default\n"
|
|
9726 |
"configuration options for all branches. The default section can be\n"
|
|
9727 |
"overriden by providing a branch-specific section in ``locations.conf``."
|
|
9728 |
msgstr "" |
|
9729 |
||
9730 |
#: en/help_topics/configuration.txt:349
|
|
9731 |
msgid "A typical ``bazaar.conf`` section often looks like the following::" |
|
9732 |
msgstr "" |
|
9733 |
||
9734 |
#: en/help_topics/configuration.txt:351
|
|
9735 |
msgid "" |
|
9736 |
" [DEFAULT]\n"
|
|
9737 |
" email = John Doe <jdoe@isp.com>\n"
|
|
9738 |
" editor = /usr/bin/vim\n"
|
|
9739 |
" create_signatures = when-required"
|
|
9740 |
msgstr "" |
|
9741 |
||
9742 |
#: en/help_topics/configuration.txt:356
|
|
9743 |
msgid "" |
|
9744 |
"\n"
|
|
9745 |
"The branch location configuration file, locations.conf\n"
|
|
9746 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
9747 |
msgstr "" |
|
9748 |
||
9749 |
#: en/help_topics/configuration.txt:360
|
|
9750 |
msgid "" |
|
9751 |
"``locations.conf`` allows one to specify overriding settings for\n"
|
|
9752 |
"a specific branch. The format is almost identical to the default section in\n"
|
|
9753 |
"bazaar.conf with one significant change: The section header, instead of "
|
|
9754 |
"saying\n"
|
|
9755 |
"default, will be the path to a branch that you wish to override a value\n"
|
|
9756 |
"for. The '?' and '*' wildcards are supported::"
|
|
9757 |
msgstr "" |
|
9758 |
||
9759 |
#: en/help_topics/configuration.txt:366
|
|
9760 |
msgid "" |
|
9761 |
" [/home/jdoe/branches/nethack]\n"
|
|
9762 |
" email = Nethack Admin <nethack@nethack.com>"
|
|
9763 |
msgstr "" |
|
9764 |
||
9765 |
#: en/help_topics/configuration.txt:369
|
|
9766 |
msgid "" |
|
9767 |
" [http://hypothetical.site.com/branches/devel-branch]\n"
|
|
9768 |
" create_signatures = always"
|
|
9769 |
msgstr "" |
|
9770 |
||
9771 |
#: en/help_topics/configuration.txt:372
|
|
9772 |
msgid "" |
|
9773 |
"The authentication configuration file, authentication.conf\n"
|
|
9774 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
9775 |
msgstr "" |
|
9776 |
||
9777 |
#: en/help_topics/configuration.txt:375
|
|
9778 |
msgid "" |
|
9779 |
"``authentication.conf`` allows one to specify credentials for\n"
|
|
9780 |
"remote servers. This can be used for all the supported transports and any "
|
|
9781 |
"part\n"
|
|
9782 |
"of bzr that requires authentication (smtp for example)."
|
|
9783 |
msgstr "" |
|
9784 |
||
9785 |
#: en/help_topics/configuration.txt:379
|
|
9786 |
msgid "" |
|
9787 |
"The syntax of the file obeys the same rules as the others except for the\n"
|
|
9788 |
"option policies which don't apply."
|
|
9789 |
msgstr "" |
|
9790 |
||
9791 |
#: en/help_topics/configuration.txt:382
|
|
9792 |
msgid "" |
|
9793 |
"For more information on the possible uses of the authentication "
|
|
9794 |
"configuration\n"
|
|
9795 |
"file see :doc:`authentication-help`."
|
|
9796 |
msgstr "" |
|
9797 |
||
9798 |
#: en/help_topics/configuration.txt:385
|
|
9799 |
msgid "" |
|
9800 |
"\n"
|
|
9801 |
"Common options\n"
|
|
9802 |
"--------------"
|
|
9803 |
msgstr "" |
|
9804 |
||
9805 |
#: en/help_topics/configuration.txt:389
|
|
9806 |
msgid "" |
|
9807 |
"debug_flags\n"
|
|
9808 |
"~~~~~~~~~~~"
|
|
9809 |
msgstr "" |
|
9810 |
||
9811 |
#: en/help_topics/configuration.txt:392
|
|
9812 |
msgid "" |
|
9813 |
"A comma-separated list of debugging options to turn on. The same values\n"
|
|
9814 |
"can be used as with the -D command-line option (see `help global-options`).\n"
|
|
9815 |
"For example::"
|
|
9816 |
msgstr "" |
|
9817 |
||
9818 |
#: en/help_topics/configuration.txt:396
|
|
9819 |
msgid " debug_flags = hpss" |
|
9820 |
msgstr "" |
|
9821 |
||
9822 |
#: en/help_topics/configuration.txt:400
|
|
9823 |
msgid " debug_flags = hpss,evil" |
|
9824 |
msgstr "" |
|
9825 |
||
9826 |
#: en/help_topics/configuration.txt:402
|
|
9827 |
msgid "" |
|
9828 |
"email\n"
|
|
9829 |
"~~~~~"
|
|
9830 |
msgstr "" |
|
9831 |
||
9832 |
#: en/help_topics/configuration.txt:405
|
|
9833 |
msgid "" |
|
9834 |
"The email address to use when committing a branch. Typically takes the form\n"
|
|
9835 |
"of::" |
|
9836 |
msgstr "" |
|
9837 |
||
9838 |
#: en/help_topics/configuration.txt:408
|
|
9839 |
msgid " email = Full Name <account@hostname.tld>" |
|
9840 |
msgstr "" |
|
9841 |
||
9842 |
#: en/help_topics/configuration.txt:410
|
|
9843 |
msgid "" |
|
9844 |
"editor\n"
|
|
9845 |
"~~~~~~"
|
|
9846 |
msgstr "" |
|
9847 |
||
9848 |
#: en/help_topics/configuration.txt:413
|
|
9849 |
msgid "" |
|
9850 |
"The path of the editor that you wish to use if *bzr commit* is run without\n"
|
|
9851 |
"a commit message. This setting is trumped by the environment variable\n"
|
|
9852 |
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
|
|
9853 |
"variables."
|
|
9854 |
msgstr "" |
|
9855 |
||
9856 |
#: en/help_topics/configuration.txt:418
|
|
9857 |
msgid "" |
|
9858 |
"log_format\n"
|
|
9859 |
"~~~~~~~~~~"
|
|
9860 |
msgstr "" |
|
9861 |
||
9862 |
#: en/help_topics/configuration.txt:421
|
|
9863 |
msgid "" |
|
9864 |
"The default log format to use. Standard log formats are ``long``, ``short``\n"
|
|
9865 |
"and ``line``. Additional formats may be provided by plugins. The default\n"
|
|
9866 |
"value is ``long``."
|
|
9867 |
msgstr "" |
|
9868 |
||
9869 |
#: en/help_topics/configuration.txt:425
|
|
9870 |
msgid "" |
|
9871 |
"check_signatures\n"
|
|
9872 |
"~~~~~~~~~~~~~~~~"
|
|
9873 |
msgstr "" |
|
9874 |
||
9875 |
#: en/help_topics/configuration.txt:428
|
|
9876 |
msgid "" |
|
9877 |
"Reserved for future use. These options will allow a policy for branches to\n"
|
|
9878 |
"require signatures."
|
|
9879 |
msgstr "" |
|
9880 |
||
9881 |
#: en/help_topics/configuration.txt:431
|
|
9882 |
msgid "" |
|
9883 |
"require\n"
|
|
9884 |
" The gnupg signature for revisions must be present and must be valid."
|
|
9885 |
msgstr "" |
|
9886 |
||
9887 |
#: en/help_topics/configuration.txt:434
|
|
9888 |
msgid "" |
|
9889 |
"ignore\n"
|
|
9890 |
" Do not check gnupg signatures of revisions."
|
|
9891 |
msgstr "" |
|
9892 |
||
9893 |
#: en/help_topics/configuration.txt:437
|
|
9894 |
msgid "" |
|
9895 |
"check-available\n"
|
|
9896 |
" (default) If gnupg signatures for revisions are present, check them.\n"
|
|
9897 |
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
|
|
9898 |
" no signature is present."
|
|
9899 |
msgstr "" |
|
9900 |
||
9901 |
#: en/help_topics/configuration.txt:442
|
|
9902 |
msgid "" |
|
9903 |
"create_signatures\n"
|
|
9904 |
"~~~~~~~~~~~~~~~~~"
|
|
9905 |
msgstr "" |
|
9906 |
||
9907 |
#: en/help_topics/configuration.txt:445
|
|
9908 |
msgid "" |
|
9909 |
"Defines the behaviour of signing revisions on commits. By default bzr will "
|
|
9910 |
"not\n"
|
|
9911 |
"sign new commits."
|
|
9912 |
msgstr "" |
|
9913 |
||
9914 |
#: en/help_topics/configuration.txt:448
|
|
9915 |
msgid "" |
|
9916 |
"always\n"
|
|
9917 |
" Sign every new revision that is committed. If the signing fails then "
|
|
9918 |
"the\n"
|
|
9919 |
" commit will not be made."
|
|
9920 |
msgstr "" |
|
9921 |
||
9922 |
#: en/help_topics/configuration.txt:452
|
|
9923 |
msgid "" |
|
9924 |
"when-required\n"
|
|
9925 |
" Reserved for future use."
|
|
9926 |
msgstr "" |
|
9927 |
||
9928 |
#: en/help_topics/configuration.txt:455
|
|
9929 |
msgid "" |
|
9930 |
"never\n"
|
|
9931 |
" Reserved for future use."
|
|
9932 |
msgstr "" |
|
9933 |
||
9934 |
#: en/help_topics/configuration.txt:458
|
|
9935 |
msgid "" |
|
9936 |
"In future it is planned that ``when-required`` will sign newly\n"
|
|
9937 |
"committed revisions only when the branch requires them. ``never`` will "
|
|
9938 |
"refuse\n"
|
|
9939 |
"to sign newly committed revisions, even if the branch requires signatures."
|
|
9940 |
msgstr "" |
|
9941 |
||
9942 |
#: en/help_topics/configuration.txt:462
|
|
9943 |
msgid "" |
|
9944 |
"dirstate.fdatasync\n"
|
|
9945 |
"~~~~~~~~~~~~~~~~~~"
|
|
9946 |
msgstr "" |
|
9947 |
||
9948 |
#: en/help_topics/configuration.txt:465
|
|
9949 |
msgid "" |
|
9950 |
"If true (default), working tree metadata changes are flushed through the\n"
|
|
9951 |
"OS buffers to physical disk. This is somewhat slower, but means data\n"
|
|
9952 |
"should not be lost if the machine crashes. See also repository.fdatasync."
|
|
9953 |
msgstr "" |
|
9954 |
||
9955 |
#: en/help_topics/configuration.txt:469
|
|
9956 |
msgid "" |
|
9957 |
"gpg_signing_key\n"
|
|
9958 |
"~~~~~~~~~~~~~~~"
|
|
9959 |
msgstr "" |
|
9960 |
||
9961 |
#: en/help_topics/configuration.txt:472
|
|
9962 |
msgid "" |
|
9963 |
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
|
|
9964 |
"address, key fingerprint or full key ID. When unset or when set to\n"
|
|
9965 |
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
|
|
9966 |
msgstr "" |
|
9967 |
||
9968 |
#: en/help_topics/configuration.txt:476
|
|
9969 |
msgid "" |
|
9970 |
"recurse\n"
|
|
9971 |
"~~~~~~~"
|
|
9972 |
msgstr "" |
|
9973 |
||
9974 |
#: en/help_topics/configuration.txt:479
|
|
9975 |
msgid "" |
|
9976 |
"Only useful in ``locations.conf``. Defines whether or not the\n"
|
|
9977 |
"configuration for this section applies to subdirectories:"
|
|
9978 |
msgstr "" |
|
9979 |
||
9980 |
#: en/help_topics/configuration.txt:482
|
|
9981 |
msgid "" |
|
9982 |
"true\n"
|
|
9983 |
" (default) This section applies to subdirectories as well."
|
|
9984 |
msgstr "" |
|
9985 |
||
9986 |
#: en/help_topics/configuration.txt:485
|
|
9987 |
msgid "" |
|
9988 |
"false\n"
|
|
9989 |
" This section only applies to the branch at this directory and not\n"
|
|
9990 |
" branches below it."
|
|
9991 |
msgstr "" |
|
9992 |
||
9993 |
#: en/help_topics/configuration.txt:489
|
|
9994 |
msgid "" |
|
9995 |
"gpg_signing_command\n"
|
|
9996 |
"~~~~~~~~~~~~~~~~~~~"
|
|
9997 |
msgstr "" |
|
9998 |
||
9999 |
#: en/help_topics/configuration.txt:492
|
|
10000 |
msgid "" |
|
10001 |
"(Default: \"gpg\"). Which program should be used to sign and check "
|
|
10002 |
"revisions.\n"
|
|
10003 |
"For example::"
|
|
10004 |
msgstr "" |
|
10005 |
||
10006 |
#: en/help_topics/configuration.txt:495
|
|
10007 |
msgid " gpg_signing_command = /usr/bin/gnpg" |
|
10008 |
msgstr "" |
|
10009 |
||
10010 |
#: en/help_topics/configuration.txt:497
|
|
10011 |
msgid "" |
|
10012 |
"The specified command must accept the options \"--clearsign\" and \"-u "
|
|
10013 |
"<email>\"."
|
|
10014 |
msgstr "" |
|
10015 |
||
10016 |
#: en/help_topics/configuration.txt:499
|
|
10017 |
msgid "" |
|
10018 |
"bzr_remote_path\n"
|
|
10019 |
"~~~~~~~~~~~~~~~"
|
|
10020 |
msgstr "" |
|
10021 |
||
10022 |
#: en/help_topics/configuration.txt:502
|
|
10023 |
msgid "" |
|
10024 |
"(Default: \"bzr\"). The path to the command that should be used to run the "
|
|
10025 |
"smart\n"
|
|
10026 |
"server for bzr. This value may only be specified in locations.conf, because:"
|
|
10027 |
msgstr "" |
|
10028 |
||
10029 |
#: en/help_topics/configuration.txt:505
|
|
10030 |
msgid "" |
|
10031 |
"- it's needed before branch.conf is accessible\n"
|
|
10032 |
"- allowing remote branch.conf files to specify commands would be a security\n"
|
|
10033 |
" risk"
|
|
10034 |
msgstr "" |
|
10035 |
||
10036 |
#: en/help_topics/configuration.txt:509
|
|
10037 |
msgid "It is overridden by the BZR_REMOTE_PATH environment variable." |
|
10038 |
msgstr "" |
|
10039 |
||
10040 |
#: en/help_topics/configuration.txt:511
|
|
10041 |
msgid "" |
|
10042 |
"smtp_server\n"
|
|
10043 |
"~~~~~~~~~~~"
|
|
10044 |
msgstr "" |
|
10045 |
||
10046 |
#: en/help_topics/configuration.txt:514
|
|
10047 |
msgid "" |
|
10048 |
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
|
|
10049 |
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
|
|
10050 |
msgstr "" |
|
10051 |
||
10052 |
#: en/help_topics/configuration.txt:517
|
|
10053 |
msgid "" |
|
10054 |
"smtp_username, smtp_password\n"
|
|
10055 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
10056 |
msgstr "" |
|
10057 |
||
10058 |
#: en/help_topics/configuration.txt:520
|
|
10059 |
msgid "" |
|
10060 |
"User and password to authenticate to the SMTP server. If smtp_username\n"
|
|
10061 |
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
|
|
10062 |
"These settings are only needed if the SMTP server requires authentication\n"
|
|
10063 |
"to send mail."
|
|
10064 |
msgstr "" |
|
10065 |
||
10066 |
#: en/help_topics/configuration.txt:525
|
|
10067 |
msgid "" |
|
10068 |
"locks.steal_dead\n"
|
|
10069 |
"~~~~~~~~~~~~~~~~"
|
|
10070 |
msgstr "" |
|
10071 |
||
10072 |
#: en/help_topics/configuration.txt:528
|
|
10073 |
msgid "" |
|
10074 |
"If set to true, bzr will automatically break locks held by processes from\n"
|
|
10075 |
"the same machine and user that are no longer alive. Otherwise, it will\n"
|
|
10076 |
"print a message and you can break the lock manually, if you are satisfied\n"
|
|
10077 |
"the object is no longer in use."
|
|
10078 |
msgstr "" |
|
10079 |
||
10080 |
#: en/help_topics/configuration.txt:533
|
|
10081 |
msgid "" |
|
10082 |
"mail_client\n"
|
|
10083 |
"~~~~~~~~~~~"
|
|
10084 |
msgstr "" |
|
10085 |
||
10086 |
#: en/help_topics/configuration.txt:536
|
|
10087 |
msgid "" |
|
10088 |
"A mail client to use for sending merge requests.\n"
|
|
10089 |
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
|
|
10090 |
"it\n"
|
|
10091 |
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
|
|
10092 |
"``editor``."
|
|
10093 |
msgstr "" |
|
10094 |
||
10095 |
#: en/help_topics/configuration.txt:541
|
|
10096 |
msgid "Supported values for specific clients:" |
|
10097 |
msgstr "" |
|
10098 |
||
10099 |
#: en/help_topics/configuration.txt:543
|
|
10100 |
msgid "" |
|
10101 |
":claws: Use Claws. This skips a dialog for attaching files.\n"
|
|
10102 |
":evolution: Use Evolution.\n"
|
|
10103 |
":kmail: Use KMail.\n"
|
|
10104 |
":mutt: Use Mutt.\n"
|
|
10105 |
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
|
|
10106 |
"1.5,\n"
|
|
10107 |
" this works around some bugs that xdg-email doesn't handle."
|
|
10108 |
msgstr "" |
|
10109 |
||
10110 |
#: en/help_topics/configuration.txt:550
|
|
10111 |
msgid "Supported generic values are:" |
|
10112 |
msgstr "" |
|
10113 |
||
10114 |
#: en/help_topics/configuration.txt:552
|
|
10115 |
msgid "" |
|
10116 |
":default: See above.\n"
|
|
10117 |
":editor: Use your editor to compose the merge request. This also uses\n"
|
|
10118 |
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
|
|
10119 |
" smtp_username and smtp_password.\n"
|
|
10120 |
":mapi: Use your preferred e-mail client on Windows.\n"
|
|
10121 |
":xdg-email: Use xdg-email to run your preferred mail program"
|
|
10122 |
msgstr "" |
|
10123 |
||
10124 |
#: en/help_topics/configuration.txt:559
|
|
10125 |
msgid "" |
|
10126 |
"repository.fdatasync\n"
|
|
10127 |
"~~~~~~~~~~~~~~~~~~~~"
|
|
10128 |
msgstr "" |
|
10129 |
||
10130 |
#: en/help_topics/configuration.txt:562
|
|
10131 |
msgid "" |
|
10132 |
"If true (default), repository changes are flushed through the OS buffers\n"
|
|
10133 |
"to physical disk. This is somewhat slower, but means data should not be\n"
|
|
10134 |
"lost if the machine crashes. See also dirstate.fdatasync."
|
|
10135 |
msgstr "" |
|
10136 |
||
10137 |
#: en/help_topics/configuration.txt:566
|
|
10138 |
msgid "" |
|
10139 |
"submit_branch\n"
|
|
10140 |
"~~~~~~~~~~~~~"
|
|
10141 |
msgstr "" |
|
10142 |
||
10143 |
#: en/help_topics/configuration.txt:569
|
|
10144 |
msgid "" |
|
10145 |
"The branch you intend to submit your current work to. This is "
|
|
10146 |
"automatically\n"
|
|
10147 |
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
|
|
10148 |
"This\n"
|
|
10149 |
"should usually be set on a per-branch or per-location basis."
|
|
10150 |
msgstr "" |
|
10151 |
||
10152 |
#: en/help_topics/configuration.txt:573
|
|
10153 |
msgid "" |
|
10154 |
"public_branch\n"
|
|
10155 |
"~~~~~~~~~~~~~"
|
|
10156 |
msgstr "" |
|
10157 |
||
10158 |
#: en/help_topics/configuration.txt:576
|
|
10159 |
msgid "" |
|
10160 |
"A publically-accessible version of this branch (implying that this version "
|
|
10161 |
"is\n"
|
|
10162 |
"not publically-accessible). Used (and set) by ``bzr send``."
|
|
10163 |
msgstr "" |
|
10164 |
||
10165 |
#: en/help_topics/configuration.txt:579
|
|
10166 |
msgid "" |
|
10167 |
"suppress_warnings\n"
|
|
10168 |
"~~~~~~~~~~~~~~~~~"
|
|
10169 |
msgstr "" |
|
10170 |
||
10171 |
#: en/help_topics/configuration.txt:582
|
|
10172 |
msgid "" |
|
10173 |
"A list of strings, each string represent a warning that can be emitted by\n"
|
|
10174 |
"bzr. Mentioning a warning in this list tells bzr to not emit it."
|
|
10175 |
msgstr "" |
|
10176 |
||
10177 |
#: en/help_topics/configuration.txt:585
|
|
10178 |
msgid "Valid values:" |
|
10179 |
msgstr "" |
|
10180 |
||
10181 |
#: en/help_topics/configuration.txt:587
|
|
10182 |
msgid "" |
|
10183 |
"* ``format_deprecation``:\n"
|
|
10184 |
" whether the format deprecation warning is shown on repositories that "
|
|
10185 |
"are\n"
|
|
10186 |
" using deprecated formats."
|
|
10187 |
msgstr "" |
|
10188 |
||
10189 |
#: en/help_topics/configuration.txt:591
|
|
10190 |
msgid "" |
|
10191 |
"default_format\n"
|
|
10192 |
"~~~~~~~~~~~~~~"
|
|
10193 |
msgstr "" |
|
10194 |
||
10195 |
#: en/help_topics/configuration.txt:594
|
|
10196 |
msgid "" |
|
10197 |
"A format name for the default format used when creating branches. See "
|
|
10198 |
"``bzr\n"
|
|
10199 |
"help formats`` for possible values."
|
|
10200 |
msgstr "" |
|
10201 |
||
10202 |
#: en/help_topics/configuration.txt:597
|
|
10203 |
msgid "" |
|
10204 |
"\n"
|
|
10205 |
"Unicode options\n"
|
|
10206 |
"---------------"
|
|
10207 |
msgstr "" |
|
10208 |
||
10209 |
#: en/help_topics/configuration.txt:601
|
|
10210 |
msgid "" |
|
10211 |
"output_encoding\n"
|
|
10212 |
"~~~~~~~~~~~~~~~"
|
|
10213 |
msgstr "" |
|
10214 |
||
10215 |
#: en/help_topics/configuration.txt:604
|
|
10216 |
msgid "" |
|
10217 |
"A Python unicode encoding name for text output from bzr, such as log\n"
|
|
10218 |
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
|
|
10219 |
"is the terminal encoding prefered by the operating system."
|
|
10220 |
msgstr "" |
|
10221 |
||
10222 |
#: en/help_topics/configuration.txt:608
|
|
10223 |
msgid "" |
|
10224 |
"\n"
|
|
10225 |
"Branch type specific options\n"
|
|
10226 |
"----------------------------"
|
|
10227 |
msgstr "" |
|
10228 |
||
10229 |
#: en/help_topics/configuration.txt:612
|
|
10230 |
msgid "" |
|
10231 |
"These options apply only to branches that use the ``dirstate-tags`` or\n"
|
|
10232 |
"later format. They\n"
|
|
10233 |
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
|
|
10234 |
"manually set in ``locations.conf`` or ``bazaar.conf``."
|
|
10235 |
msgstr "" |
|
10236 |
||
10237 |
#: en/help_topics/configuration.txt:617
|
|
10238 |
msgid "" |
|
10239 |
"append_revisions_only\n"
|
|
10240 |
"~~~~~~~~~~~~~~~~~~~~~"
|
|
10241 |
msgstr "" |
|
10242 |
||
10243 |
#: en/help_topics/configuration.txt:620
|
|
10244 |
msgid "" |
|
10245 |
"If set to \"True\" then revisions can only be appended to the log, not\n"
|
|
10246 |
"removed. A branch with this setting enabled can only pull from another\n"
|
|
10247 |
"branch if the other branch's log is a longer version of its own. This is\n"
|
|
10248 |
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
|
|
10249 |
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
|
|
10250 |
"compatibility with previous bzr versions (older than 2.2)."
|
|
10251 |
msgstr "" |
|
10252 |
||
10253 |
#: en/help_topics/configuration.txt:627
|
|
10254 |
msgid "" |
|
10255 |
"parent_location\n"
|
|
10256 |
"~~~~~~~~~~~~~~~"
|
|
10257 |
msgstr "" |
|
10258 |
||
10259 |
#: en/help_topics/configuration.txt:630
|
|
10260 |
msgid "" |
|
10261 |
"If present, the location of the default branch for pull or merge. This "
|
|
10262 |
"option\n"
|
|
10263 |
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
|
|
10264 |
"--remember``."
|
|
10265 |
msgstr "" |
|
10266 |
||
10267 |
#: en/help_topics/configuration.txt:634
|
|
10268 |
msgid "" |
|
10269 |
"push_location\n"
|
|
10270 |
"~~~~~~~~~~~~~"
|
|
10271 |
msgstr "" |
|
10272 |
||
10273 |
#: en/help_topics/configuration.txt:637
|
|
10274 |
msgid "" |
|
10275 |
"If present, the location of the default branch for push. This option\n"
|
|
10276 |
"is normally set by the first ``push`` or ``push --remember``."
|
|
10277 |
msgstr "" |
|
10278 |
||
10279 |
#: en/help_topics/configuration.txt:640
|
|
10280 |
msgid "" |
|
10281 |
"push_strict\n"
|
|
10282 |
"~~~~~~~~~~~"
|
|
10283 |
msgstr "" |
|
10284 |
||
10285 |
#: en/help_topics/configuration.txt:643
|
|
10286 |
msgid "" |
|
10287 |
"If present, defines the ``--strict`` option default value for checking\n"
|
|
10288 |
"uncommitted changes before pushing."
|
|
10289 |
msgstr "" |
|
10290 |
||
10291 |
#: en/help_topics/configuration.txt:646
|
|
10292 |
msgid "" |
|
10293 |
"dpush_strict\n"
|
|
10294 |
"~~~~~~~~~~~~"
|
|
10295 |
msgstr "" |
|
10296 |
||
10297 |
#: en/help_topics/configuration.txt:649
|
|
10298 |
msgid "" |
|
10299 |
"If present, defines the ``--strict`` option default value for checking\n"
|
|
10300 |
"uncommitted changes before pushing into a different VCS without any\n"
|
|
10301 |
"custom bzr metadata."
|
|
10302 |
msgstr "" |
|
10303 |
||
10304 |
#: en/help_topics/configuration.txt:653
|
|
10305 |
msgid "" |
|
10306 |
"bound_location\n"
|
|
10307 |
"~~~~~~~~~~~~~~"
|
|
10308 |
msgstr "" |
|
10309 |
||
10310 |
#: en/help_topics/configuration.txt:656
|
|
10311 |
msgid "" |
|
10312 |
"The location that commits should go to when acting as a checkout.\n"
|
|
10313 |
"This option is normally set by ``bind``."
|
|
10314 |
msgstr "" |
|
10315 |
||
10316 |
#: en/help_topics/configuration.txt:659
|
|
10317 |
msgid "" |
|
10318 |
"bound\n"
|
|
10319 |
"~~~~~"
|
|
10320 |
msgstr "" |
|
10321 |
||
10322 |
#: en/help_topics/configuration.txt:662
|
|
10323 |
msgid "" |
|
10324 |
"If set to \"True\", the branch should act as a checkout, and push each "
|
|
10325 |
"commit to\n"
|
|
10326 |
"the bound_location. This option is normally set by ``bind``/``unbind``."
|
|
10327 |
msgstr "" |
|
10328 |
||
10329 |
#: en/help_topics/configuration.txt:665
|
|
10330 |
msgid "" |
|
10331 |
"send_strict\n"
|
|
10332 |
"~~~~~~~~~~~"
|
|
10333 |
msgstr "" |
|
10334 |
||
10335 |
#: en/help_topics/configuration.txt:668
|
|
10336 |
msgid "" |
|
10337 |
"If present, defines the ``--strict`` option default value for checking\n"
|
|
10338 |
"uncommitted changes before sending a merge directive."
|
|
10339 |
msgstr "" |
|
10340 |
||
10341 |
#: en/help_topics/configuration.txt:671
|
|
10342 |
msgid "" |
|
10343 |
"add.maximum_file_size\n"
|
|
10344 |
"~~~~~~~~~~~~~~~~~~~~~"
|
|
10345 |
msgstr "" |
|
10346 |
||
10347 |
#: en/help_topics/configuration.txt:674
|
|
10348 |
msgid "" |
|
10349 |
"Defines the maximum file size the command line \"add\" operation will allow\n"
|
|
10350 |
"in recursive mode, with files larger than this value being skipped. You may "
|
|
10351 |
"\n"
|
|
10352 |
"specify this value as an integer (in which case it is interpreted as bytes), "
|
|
10353 |
"\n"
|
|
10354 |
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
|
|
10355 |
"0 \n"
|
|
10356 |
"will disable skipping."
|
|
10357 |
msgstr "" |
|
10358 |
||
10359 |
#: en/help_topics/configuration.txt:680
|
|
10360 |
msgid "" |
|
10361 |
"External Merge Tools\n"
|
|
10362 |
"--------------------"
|
|
10363 |
msgstr "" |
|
10364 |
||
10365 |
#: en/help_topics/configuration.txt:683
|
|
10366 |
msgid "" |
|
10367 |
"bzr.mergetool.<name>\n"
|
|
10368 |
"~~~~~~~~~~~~~~~~~~~~"
|
|
10369 |
msgstr "" |
|
10370 |
||
10371 |
#: en/help_topics/configuration.txt:686
|
|
10372 |
msgid "" |
|
10373 |
"Defines an external merge tool called <name> with the given command-line.\n"
|
|
10374 |
"Arguments containing spaces should be quoted using single or double quotes. "
|
|
10375 |
"The\n"
|
|
10376 |
"executable may omit its path if it can be found on the PATH."
|
|
10377 |
msgstr "" |
|
10378 |
||
10379 |
#: en/help_topics/configuration.txt:690
|
|
10380 |
msgid "" |
|
10381 |
"The following markers can be used in the command-line to substitute "
|
|
10382 |
"filenames\n"
|
|
10383 |
"involved in the merge conflict::"
|
|
10384 |
msgstr "" |
|
10385 |
||
10386 |
#: en/help_topics/configuration.txt:693
|
|
10387 |
msgid "" |
|
10388 |
" {base} file.BASE\n"
|
|
10389 |
" {this} file.THIS\n"
|
|
10390 |
" {other} file.OTHER\n"
|
|
10391 |
" {result} output file\n"
|
|
10392 |
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
|
|
10393 |
"merge\n"
|
|
10394 |
" succeeds."
|
|
10395 |
msgstr "" |
|
10396 |
||
10397 |
#: en/help_topics/configuration.txt:702
|
|
10398 |
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}" |
|
10399 |
msgstr "" |
|
10400 |
||
10401 |
#: en/help_topics/configuration.txt:704
|
|
10402 |
msgid "" |
|
10403 |
"bzr.default_mergetool\n"
|
|
10404 |
"~~~~~~~~~~~~~~~~~~~~~"
|
|
10405 |
msgstr "" |
|
10406 |
||
10407 |
#: en/help_topics/configuration.txt:707
|
|
10408 |
msgid "" |
|
10409 |
"Specifies which external merge tool (as defined above) should be selected "
|
|
10410 |
"by\n"
|
|
10411 |
"default in tools such as ``bzr qconflicts``."
|
|
10412 |
msgstr "" |
|
10413 |
||
10414 |
#: en/help_topics/configuration.txt:712
|
|
10415 |
msgid " bzr.default_mergetool = kdiff3\n" |
|
10416 |
msgstr "" |
|
10417 |
||
10418 |
#: en/help_topics/conflict-types.txt:1
|
|
10419 |
msgid "" |
|
10420 |
"Conflict Types\n"
|
|
10421 |
"=============="
|
|
10422 |
msgstr "" |
|
10423 |
||
10424 |
#: en/help_topics/conflict-types.txt:4
|
|
10425 |
msgid "" |
|
10426 |
"Some operations, like merge, revert and pull, modify the contents of your\n"
|
|
10427 |
"working tree. These modifications are programmatically generated, and so "
|
|
10428 |
"they\n"
|
|
10429 |
"may conflict with the current state of your working tree. "
|
|
10430 |
msgstr "" |
|
10431 |
||
10432 |
#: en/help_topics/conflict-types.txt:8
|
|
10433 |
msgid "" |
|
10434 |
"When conflicts are present in your working tree (as shown by ``bzr\n"
|
|
10435 |
"conflicts``), you should resolve them and then inform bzr that the "
|
|
10436 |
"conflicts\n"
|
|
10437 |
"have been resolved."
|
|
10438 |
msgstr "" |
|
10439 |
||
10440 |
#: en/help_topics/conflict-types.txt:12
|
|
10441 |
msgid "" |
|
10442 |
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
|
|
10443 |
"should resolve them is not the one responsible for their occurrence, as is "
|
|
10444 |
"the\n"
|
|
10445 |
"case when merging other people's work or because some conflicts are "
|
|
10446 |
"presented\n"
|
|
10447 |
"in a way that is not easy to understand."
|
|
10448 |
msgstr "" |
|
10449 |
||
10450 |
#: en/help_topics/conflict-types.txt:17
|
|
10451 |
msgid "" |
|
10452 |
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
|
|
10453 |
"conflict if and only if there's an actual conceptual conflict in the source\n"
|
|
10454 |
"tree. Because Bazaar doesn't understand the real meaning of the files "
|
|
10455 |
"being\n"
|
|
10456 |
"versioned, it can, when faced with ambiguities, fall short in either "
|
|
10457 |
"direction\n"
|
|
10458 |
"trying to resolve the conflict itself. Many kinds of changes can be "
|
|
10459 |
"combined\n"
|
|
10460 |
"programmatically, but sometimes only a human can determine the right thing "
|
|
10461 |
"to\n"
|
|
10462 |
"do."
|
|
10463 |
msgstr "" |
|
10464 |
||
10465 |
#: en/help_topics/conflict-types.txt:25
|
|
10466 |
msgid "" |
|
10467 |
"When Bazaar generates a conflict, it adds information into the working tree "
|
|
10468 |
"to\n"
|
|
10469 |
"present the conflicting versions, and it's up to you to find the correct\n"
|
|
10470 |
"resolution."
|
|
10471 |
msgstr "" |
|
10472 |
||
10473 |
#: en/help_topics/conflict-types.txt:29
|
|
10474 |
msgid "Whatever the conflict is, resolving it is roughly done in two steps:" |
|
10475 |
msgstr "" |
|
10476 |
||
10477 |
#: en/help_topics/conflict-types.txt:31
|
|
10478 |
msgid "" |
|
10479 |
"1. Modify the working tree content so that the conflicted item is now in "
|
|
10480 |
"the\n"
|
|
10481 |
" state you want to keep, then"
|
|
10482 |
msgstr "" |
|
10483 |
||
10484 |
#: en/help_topics/conflict-types.txt:34
|
|
10485 |
msgid "" |
|
10486 |
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
|
|
10487 |
" remaining generated information (``bzr resolve <item>``)."
|
|
10488 |
msgstr "" |
|
10489 |
||
10490 |
#: en/help_topics/conflict-types.txt:37
|
|
10491 |
msgid "" |
|
10492 |
"For most conflict types, there are some obvious ways to modify the working\n"
|
|
10493 |
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
|
|
10494 |
"itself already made a choice, when possible."
|
|
10495 |
msgstr "" |
|
10496 |
||
10497 |
#: en/help_topics/conflict-types.txt:41
|
|
10498 |
msgid "" |
|
10499 |
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
|
|
10500 |
"different ways to resolve the conflict."
|
|
10501 |
msgstr "" |
|
10502 |
||
10503 |
#: en/help_topics/conflict-types.txt:44
|
|
10504 |
msgid "" |
|
10505 |
"Each type of conflict is explained below, and the action which must be done "
|
|
10506 |
"to\n"
|
|
10507 |
"resolve the conflict is outlined."
|
|
10508 |
msgstr "" |
|
10509 |
||
10510 |
#: en/help_topics/conflict-types.txt:47
|
|
10511 |
msgid "" |
|
10512 |
"Various actions are available depending on the kind of conflict, for some "
|
|
10513 |
"of\n"
|
|
10514 |
"these actions, Bazaar can provide some help. In the end you should at least\n"
|
|
10515 |
"inform Bazaar that you're done with the conflict with::"
|
|
10516 |
msgstr "" |
|
10517 |
||
10518 |
#: en/help_topics/conflict-types.txt:51
|
|
10519 |
msgid " ``bzr resolve FILE --action=done'" |
|
10520 |
msgstr "" |
|
10521 |
||
10522 |
#: en/help_topics/conflict-types.txt:53
|
|
10523 |
msgid "" |
|
10524 |
"Note that this is the default action when a single file is involved so you "
|
|
10525 |
"can\n"
|
|
10526 |
"simply use::"
|
|
10527 |
msgstr "" |
|
10528 |
||
10529 |
#: en/help_topics/conflict-types.txt:56
|
|
10530 |
msgid " ``bzr resolve FILE``" |
|
10531 |
msgstr "" |
|
10532 |
||
10533 |
#: en/help_topics/conflict-types.txt:58
|
|
10534 |
msgid "See ``bzr help resolve`` for more details." |
|
10535 |
msgstr "" |
|
10536 |
||
10537 |
#: en/help_topics/conflict-types.txt:60
|
|
10538 |
msgid "" |
|
10539 |
"Text conflicts\n"
|
|
10540 |
"--------------"
|
|
10541 |
msgstr "" |
|
10542 |
||
10543 |
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
|
|
10544 |
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
|
|
10545 |
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
|
|
10546 |
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
|
|
10547 |
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
|
|
10548 |
msgid "Typical message::" |
|
10549 |
msgstr "" |
|
10550 |
||
10551 |
#: en/help_topics/conflict-types.txt:65
|
|
10552 |
msgid " Text conflict in FILE" |
|
10553 |
msgstr "" |
|
10554 |
||
10555 |
#: en/help_topics/conflict-types.txt:67
|
|
10556 |
msgid "" |
|
10557 |
"These are produced when a text merge cannot completely reconcile two sets "
|
|
10558 |
"of\n"
|
|
10559 |
"text changes. Bazaar will emit files for each version with the extensions\n"
|
|
10560 |
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
|
|
10561 |
"tree,\n"
|
|
10562 |
"i.e. the tree that you are merging changes into. OTHER is the version that "
|
|
10563 |
"you\n"
|
|
10564 |
"are merging into the target. BASE is an older version that is used as a "
|
|
10565 |
"basis\n"
|
|
10566 |
"for comparison."
|
|
10567 |
msgstr "" |
|
10568 |
||
10569 |
#: en/help_topics/conflict-types.txt:74
|
|
10570 |
msgid "" |
|
10571 |
"In the main copy of the file, Bazaar will include all the changes that it\n"
|
|
10572 |
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
|
|
10573 |
"\"herringbone\" markers like ``<<<<<<<``."
|
|
10574 |
msgstr "" |
|
10575 |
||
10576 |
#: en/help_topics/conflict-types.txt:78
|
|
10577 |
msgid "" |
|
10578 |
"Say the initial text is \"The project leader released it.\", and THIS "
|
|
10579 |
"modifies it\n"
|
|
10580 |
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
|
|
10581 |
"leader\n"
|
|
10582 |
"released Bazaar.\" A conflict would look like this::"
|
|
10583 |
msgstr "" |
|
10584 |
||
10585 |
#: en/help_topics/conflict-types.txt:82
|
|
10586 |
msgid "" |
|
10587 |
" <<<<<<< TREE\n"
|
|
10588 |
" Martin Pool released it.\n"
|
|
10589 |
" =======\n"
|
|
10590 |
" The project leader released Bazaar.\n"
|
|
10591 |
" >>>>>>> MERGE-SOURCE"
|
|
10592 |
msgstr "" |
|
10593 |
||
10594 |
#: en/help_topics/conflict-types.txt:88
|
|
10595 |
msgid "The correct resolution would be \"Martin Pool released Bazaar.\"" |
|
10596 |
msgstr "" |
|
10597 |
||
10598 |
#: en/help_topics/conflict-types.txt:90
|
|
10599 |
msgid "" |
|
10600 |
"You can handle text conflicts either by editing the main copy of the file,\n"
|
|
10601 |
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
|
|
10602 |
"worth mentioning that resolving text conflicts rarely involves picking one\n"
|
|
10603 |
"set of changes over the other (but see below when you encounter these\n"
|
|
10604 |
"cases). More often, the two sets of changes must be intelligently combined."
|
|
10605 |
msgstr "" |
|
10606 |
||
10607 |
#: en/help_topics/conflict-types.txt:96
|
|
10608 |
msgid "" |
|
10609 |
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
|
|
10610 |
"you are done editing, the file should look like it never had a conflict, and "
|
|
10611 |
"be\n"
|
|
10612 |
"ready to commit."
|
|
10613 |
msgstr "" |
|
10614 |
||
10615 |
#: en/help_topics/conflict-types.txt:100
|
|
10616 |
msgid "" |
|
10617 |
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
|
|
10618 |
"Bazaar will auto-detect which conflicts you have resolved."
|
|
10619 |
msgstr "" |
|
10620 |
||
10621 |
#: en/help_topics/conflict-types.txt:103
|
|
10622 |
msgid "" |
|
10623 |
"When the conflict is resolved, Bazaar deletes the previously generated\n"
|
|
10624 |
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
|
|
10625 |
"working tree."
|
|
10626 |
msgstr "" |
|
10627 |
||
10628 |
#: en/help_topics/conflict-types.txt:107
|
|
10629 |
msgid "" |
|
10630 |
"\n"
|
|
10631 |
"When you want to pick one set of changes over the other, you can use ``bzr\n"
|
|
10632 |
"resolve`` with one of the following actions:"
|
|
10633 |
msgstr "" |
|
10634 |
||
10635 |
#: en/help_topics/conflict-types.txt:111
|
|
10636 |
msgid "" |
|
10637 |
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
|
|
10638 |
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
|
|
10639 |
msgstr "" |
|
10640 |
||
10641 |
#: en/help_topics/conflict-types.txt:114
|
|
10642 |
msgid "" |
|
10643 |
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
|
|
10644 |
"modifications will be taken into account."
|
|
10645 |
msgstr "" |
|
10646 |
||
10647 |
#: en/help_topics/conflict-types.txt:117
|
|
10648 |
msgid "" |
|
10649 |
"Content conflicts\n"
|
|
10650 |
"-----------------"
|
|
10651 |
msgstr "" |
|
10652 |
||
10653 |
#: en/help_topics/conflict-types.txt:122
|
|
10654 |
msgid " Contents conflict in FILE" |
|
10655 |
msgstr "" |
|
10656 |
||
10657 |
#: en/help_topics/conflict-types.txt:124
|
|
10658 |
msgid "" |
|
10659 |
"This conflict happens when there are conflicting changes in the working "
|
|
10660 |
"tree\n"
|
|
10661 |
"and the merge source, but the conflicted items are not text files. They "
|
|
10662 |
"may\n"
|
|
10663 |
"be binary files, or symlinks, or directories. It can even happen with "
|
|
10664 |
"files\n"
|
|
10665 |
"that are deleted on one side, and modified on the other."
|
|
10666 |
msgstr "" |
|
10667 |
||
10668 |
#: en/help_topics/conflict-types.txt:129
|
|
10669 |
msgid "" |
|
10670 |
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
|
|
10671 |
"be\n"
|
|
10672 |
"regular files, symlinks or directories). But it will not include a \"main "
|
|
10673 |
"copy\"\n"
|
|
10674 |
"of the file with herringbone conflict markers. It will appear that the "
|
|
10675 |
"\"main\n"
|
|
10676 |
"copy\" has been renamed to THIS or OTHER."
|
|
10677 |
msgstr "" |
|
10678 |
||
10679 |
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
|
|
10680 |
msgid "" |
|
10681 |
"To resolve that kind of conflict, you should rebuild FILE from either "
|
|
10682 |
"version\n"
|
|
10683 |
"or a combination of both."
|
|
10684 |
msgstr "" |
|
10685 |
||
10686 |
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
|
|
10687 |
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
|
|
10688 |
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
|
|
10689 |
#: en/help_topics/conflict-types.txt:361
|
|
10690 |
msgid "``bzr resolve`` recognizes the following actions:" |
|
10691 |
msgstr "" |
|
10692 |
||
10693 |
#: en/help_topics/conflict-types.txt:139
|
|
10694 |
msgid "" |
|
10695 |
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
|
|
10696 |
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
|
|
10697 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
10698 |
msgstr "" |
|
10699 |
||
10700 |
#: en/help_topics/conflict-types.txt:143
|
|
10701 |
msgid "" |
|
10702 |
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
|
|
10703 |
"and\n"
|
|
10704 |
"``.OTHER`` files if they are still present in the working tree."
|
|
10705 |
msgstr "" |
|
10706 |
||
10707 |
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
|
|
10708 |
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
|
|
10709 |
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
|
|
10710 |
#: en/help_topics/conflict-types.txt:369
|
|
10711 |
msgid "" |
|
10712 |
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
|
|
10713 |
msgstr "" |
|
10714 |
||
10715 |
#: en/help_topics/conflict-types.txt:148
|
|
10716 |
msgid "" |
|
10717 |
"Tag conflicts\n"
|
|
10718 |
"-------------"
|
|
10719 |
msgstr "" |
|
10720 |
||
10721 |
#: en/help_topics/conflict-types.txt:153
|
|
10722 |
msgid "" |
|
10723 |
" Conflicting tags:\n"
|
|
10724 |
" version-0.1"
|
|
10725 |
msgstr "" |
|
10726 |
||
10727 |
#: en/help_topics/conflict-types.txt:156
|
|
10728 |
msgid "" |
|
10729 |
"When pulling from or pushing to another branch, Bazaar informs you about "
|
|
10730 |
"tags\n"
|
|
10731 |
"that conflict between the two branches; that is the same tag points to two\n"
|
|
10732 |
"different revisions. You need not resolve these conflicts, but subsequent\n"
|
|
10733 |
"uses of pull or push will result in the same message."
|
|
10734 |
msgstr "" |
|
10735 |
||
10736 |
#: en/help_topics/conflict-types.txt:161
|
|
10737 |
msgid "" |
|
10738 |
"To resolve the conflict, you must apply the correct tags to either the "
|
|
10739 |
"target\n"
|
|
10740 |
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
|
|
10741 |
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
|
|
10742 |
"target branch's tags match the source branch, then in the target branch do\n"
|
|
10743 |
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
|
|
10744 |
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
|
|
10745 |
"source\n"
|
|
10746 |
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
|
|
10747 |
"favor of the target branch, you need to similarly use ``tag --force`` in "
|
|
10748 |
"the\n"
|
|
10749 |
"source branch. (Note that pulling or pushing using --overwrite will "
|
|
10750 |
"overwrite\n"
|
|
10751 |
"all tags as well.)"
|
|
10752 |
msgstr "" |
|
10753 |
||
10754 |
#: en/help_topics/conflict-types.txt:172
|
|
10755 |
msgid "" |
|
10756 |
"Duplicate paths\n"
|
|
10757 |
"---------------"
|
|
10758 |
msgstr "" |
|
10759 |
||
10760 |
#: en/help_topics/conflict-types.txt:177
|
|
10761 |
msgid " Conflict adding file FILE. Moved existing file to FILE.moved." |
|
10762 |
msgstr "" |
|
10763 |
||
10764 |
#: en/help_topics/conflict-types.txt:179
|
|
10765 |
msgid "" |
|
10766 |
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
|
|
10767 |
"already been used. The existing file will be renamed to \"FILE.moved\". "
|
|
10768 |
msgstr "" |
|
10769 |
||
10770 |
#: en/help_topics/conflict-types.txt:187
|
|
10771 |
msgid "" |
|
10772 |
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
|
|
10773 |
"FILE``,\n"
|
|
10774 |
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
|
|
10775 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
10776 |
msgstr "" |
|
10777 |
||
10778 |
#: en/help_topics/conflict-types.txt:191
|
|
10779 |
msgid "" |
|
10780 |
"Note that you must get rid of FILE.moved before using ``--action=done``."
|
|
10781 |
msgstr "" |
|
10782 |
||
10783 |
#: en/help_topics/conflict-types.txt:195
|
|
10784 |
msgid "" |
|
10785 |
"Unversioned parent\n"
|
|
10786 |
"------------------"
|
|
10787 |
msgstr "" |
|
10788 |
||
10789 |
#: en/help_topics/conflict-types.txt:200
|
|
10790 |
msgid "" |
|
10791 |
" Conflict because FILE is not versioned, but has versioned children."
|
|
10792 |
msgstr "" |
|
10793 |
||
10794 |
#: en/help_topics/conflict-types.txt:202
|
|
10795 |
msgid "" |
|
10796 |
"Sometimes Bazaar will attempt to create a file whose parent directory is "
|
|
10797 |
"not\n"
|
|
10798 |
"versioned. This happens when the directory has been deleted in the target,\n"
|
|
10799 |
"but has a new child in the source, or vice versa. In this situation, "
|
|
10800 |
"Bazaar\n"
|
|
10801 |
"will version the parent directory as well. Resolving this issue depends\n"
|
|
10802 |
"very much on the particular scenario. You may wish to rename or delete "
|
|
10803 |
"either\n"
|
|
10804 |
"the file or the directory. When you are satisfied, you can run \"bzr "
|
|
10805 |
"resolve\n"
|
|
10806 |
"FILE\" to mark the conflict as resolved."
|
|
10807 |
msgstr "" |
|
10808 |
||
10809 |
#: en/help_topics/conflict-types.txt:210
|
|
10810 |
msgid "" |
|
10811 |
"Missing parent\n"
|
|
10812 |
"--------------"
|
|
10813 |
msgstr "" |
|
10814 |
||
10815 |
#: en/help_topics/conflict-types.txt:215
|
|
10816 |
msgid " Conflict adding files to FILE. Created directory." |
|
10817 |
msgstr "" |
|
10818 |
||
10819 |
#: en/help_topics/conflict-types.txt:217
|
|
10820 |
msgid "" |
|
10821 |
"This happens when a directory has been deleted in the target, but has new\n"
|
|
10822 |
"children in the source. This is similar to the \"unversioned parent\" "
|
|
10823 |
"conflict,\n"
|
|
10824 |
"except that the parent directory does not *exist*, instead of just being\n"
|
|
10825 |
"unversioned. In this situation, Bazaar will create the missing parent.\n"
|
|
10826 |
"Resolving this issue depends very much on the particular scenario."
|
|
10827 |
msgstr "" |
|
10828 |
||
10829 |
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
|
|
10830 |
msgid "" |
|
10831 |
"To resolve that kind of conflict, you should either remove or rename the\n"
|
|
10832 |
"children or the directory or a combination of both."
|
|
10833 |
msgstr "" |
|
10834 |
||
10835 |
#: en/help_topics/conflict-types.txt:228
|
|
10836 |
msgid "" |
|
10837 |
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
|
|
10838 |
" children,\n"
|
|
10839 |
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
|
|
10840 |
"children\n"
|
|
10841 |
" and restoring the directory,\n"
|
|
10842 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
10843 |
msgstr "" |
|
10844 |
||
10845 |
#: en/help_topics/conflict-types.txt:236
|
|
10846 |
msgid "" |
|
10847 |
"Deleting parent\n"
|
|
10848 |
"---------------"
|
|
10849 |
msgstr "" |
|
10850 |
||
10851 |
#: en/help_topics/conflict-types.txt:241
|
|
10852 |
msgid " Conflict: can't delete DIR because it is not empty. Not deleting." |
|
10853 |
msgstr "" |
|
10854 |
||
10855 |
#: en/help_topics/conflict-types.txt:243
|
|
10856 |
msgid "" |
|
10857 |
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
|
|
10858 |
"source, but has new children in the target (either because a directory\n"
|
|
10859 |
"deletion is merged or because the merge introduce new children). Bazaar\n"
|
|
10860 |
"will retain the directory. Resolving this issue depends very much on the\n"
|
|
10861 |
"particular scenario."
|
|
10862 |
msgstr "" |
|
10863 |
||
10864 |
#: en/help_topics/conflict-types.txt:254
|
|
10865 |
msgid "" |
|
10866 |
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
|
|
10867 |
"directory,"
|
|
10868 |
msgstr "" |
|
10869 |
||
10870 |
#: en/help_topics/conflict-types.txt:256
|
|
10871 |
msgid "" |
|
10872 |
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
|
|
10873 |
" children,"
|
|
10874 |
msgstr "" |
|
10875 |
||
10876 |
#: en/help_topics/conflict-types.txt:259
|
|
10877 |
msgid "* ``--action=done`` will just mark the conflict as resolved." |
|
10878 |
msgstr "" |
|
10879 |
||
10880 |
#: en/help_topics/conflict-types.txt:261
|
|
10881 |
msgid "" |
|
10882 |
"Note that when merging a directory deletion, if unversioned files are\n"
|
|
10883 |
"present, they become potential orphans has they don't have a directory\n"
|
|
10884 |
"parent anymore."
|
|
10885 |
msgstr "" |
|
10886 |
||
10887 |
#: en/help_topics/conflict-types.txt:265
|
|
10888 |
msgid "" |
|
10889 |
"Handling such orphans, *before* the conflict is created, is controlled by\n"
|
|
10890 |
"setting the ``bzr.transform.orphan_policy`` configuration option."
|
|
10891 |
msgstr "" |
|
10892 |
||
10893 |
#: en/help_topics/conflict-types.txt:268
|
|
10894 |
msgid "There are two possible values for this option:" |
|
10895 |
msgstr "" |
|
10896 |
||
10897 |
#: en/help_topics/conflict-types.txt:270
|
|
10898 |
msgid "" |
|
10899 |
"* ``conflict`` (the default): will leave the orphans in place and\n"
|
|
10900 |
" generate a conflicts,"
|
|
10901 |
msgstr "" |
|
10902 |
||
10903 |
#: en/help_topics/conflict-types.txt:273
|
|
10904 |
msgid "" |
|
10905 |
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
|
|
10906 |
"root\n"
|
|
10907 |
" of the working tree with names like ``<file>.~#~``."
|
|
10908 |
msgstr "" |
|
10909 |
||
10910 |
#: en/help_topics/conflict-types.txt:278
|
|
10911 |
msgid "" |
|
10912 |
"Path conflict\n"
|
|
10913 |
"-------------"
|
|
10914 |
msgstr "" |
|
10915 |
||
10916 |
#: en/help_topics/conflict-types.txt:283
|
|
10917 |
msgid " Path conflict: PATH1 / PATH2" |
|
10918 |
msgstr "" |
|
10919 |
||
10920 |
#: en/help_topics/conflict-types.txt:285
|
|
10921 |
msgid "" |
|
10922 |
"This happens when the source and target have each modified the name or "
|
|
10923 |
"parent\n"
|
|
10924 |
"directory of a file. Bazaar will use the path elements from the source."
|
|
10925 |
msgstr "" |
|
10926 |
||
10927 |
#: en/help_topics/conflict-types.txt:288
|
|
10928 |
msgid "" |
|
10929 |
"To resolve that kind of conflict, you just have to decide what name should "
|
|
10930 |
"be\n"
|
|
10931 |
"retained for the file involved."
|
|
10932 |
msgstr "" |
|
10933 |
||
10934 |
#: en/help_topics/conflict-types.txt:293
|
|
10935 |
msgid "" |
|
10936 |
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
|
|
10937 |
" issuing ``bzr mv PATH2 PATH1``,\n"
|
|
10938 |
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
|
|
10939 |
"``PATH2``,\n"
|
|
10940 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
10941 |
msgstr "" |
|
10942 |
||
10943 |
#: en/help_topics/conflict-types.txt:300
|
|
10944 |
msgid "" |
|
10945 |
"Parent loop\n"
|
|
10946 |
"-----------"
|
|
10947 |
msgstr "" |
|
10948 |
||
10949 |
#: en/help_topics/conflict-types.txt:305
|
|
10950 |
msgid " Conflict moving FILE into DIRECTORY. Cancelled move." |
|
10951 |
msgstr "" |
|
10952 |
||
10953 |
#: en/help_topics/conflict-types.txt:307
|
|
10954 |
msgid "" |
|
10955 |
"This happens when the source and the target have each moved directories, so\n"
|
|
10956 |
"that, if the change could be applied, a directory would be contained by "
|
|
10957 |
"itself.\n"
|
|
10958 |
"For example::"
|
|
10959 |
msgstr "" |
|
10960 |
||
10961 |
#: en/help_topics/conflict-types.txt:311
|
|
10962 |
msgid "" |
|
10963 |
" $ bzr init\n"
|
|
10964 |
" $ bzr mkdir white\n"
|
|
10965 |
" $ bzr mkdir black\n"
|
|
10966 |
" $ bzr commit -m \"BASE\"\n"
|
|
10967 |
" $ bzr branch . ../other\n"
|
|
10968 |
" $ bzr mv white black\n"
|
|
10969 |
" $ bzr commit -m \"THIS\"\n"
|
|
10970 |
" $ bzr mv ../other/black ../other/white\n"
|
|
10971 |
" $ bzr commit ../other -m \"OTHER\"\n"
|
|
10972 |
" $ bzr merge ../other"
|
|
10973 |
msgstr "" |
|
10974 |
||
10975 |
#: en/help_topics/conflict-types.txt:322
|
|
10976 |
msgid "" |
|
10977 |
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
|
|
10978 |
"``black``. To resolve that kind of conflict, you just have to decide what\n"
|
|
10979 |
"name should be retained for the directories involved."
|
|
10980 |
msgstr "" |
|
10981 |
||
10982 |
#: en/help_topics/conflict-types.txt:328
|
|
10983 |
msgid "" |
|
10984 |
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
|
|
10985 |
"\n"
|
|
10986 |
" in ``black``,\n"
|
|
10987 |
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
|
|
10988 |
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
|
|
10989 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
10990 |
msgstr "" |
|
10991 |
||
10992 |
#: en/help_topics/conflict-types.txt:336
|
|
10993 |
msgid "" |
|
10994 |
"Non-directory parent\n"
|
|
10995 |
"--------------------"
|
|
10996 |
msgstr "" |
|
10997 |
||
10998 |
#: en/help_topics/conflict-types.txt:341
|
|
10999 |
msgid "" |
|
11000 |
" Conflict: foo.new is not a directory, but has files in it.\n"
|
|
11001 |
" Created directory."
|
|
11002 |
msgstr "" |
|
11003 |
||
11004 |
#: en/help_topics/conflict-types.txt:344
|
|
11005 |
msgid "" |
|
11006 |
"This happens when one side has added files to a directory, and the other "
|
|
11007 |
"side\n"
|
|
11008 |
"has changed the directory into a file or symlink. For example::"
|
|
11009 |
msgstr "" |
|
11010 |
||
11011 |
#: en/help_topics/conflict-types.txt:347
|
|
11012 |
msgid "" |
|
11013 |
" $ bzr init\n"
|
|
11014 |
" $ bzr mkdir foo\n"
|
|
11015 |
" $ bzr commit -m \"BASE\"\n"
|
|
11016 |
" $ bzr branch . ../other\n"
|
|
11017 |
" $ rmdir foo\n"
|
|
11018 |
" $ touch foo\n"
|
|
11019 |
" $ bzr commit -m \"THIS\"\n"
|
|
11020 |
" $ bzr mkdir ../other/foo/bar\n"
|
|
11021 |
" $ bzr commit ../other -m \"OTHER\"\n"
|
|
11022 |
" $ bzr merge ../other"
|
|
11023 |
msgstr "" |
|
11024 |
||
11025 |
#: en/help_topics/conflict-types.txt:358
|
|
11026 |
msgid "" |
|
11027 |
"To resolve that kind of conflict, you have to decide what name should be\n"
|
|
11028 |
"retained for the file, directory or symlink involved."
|
|
11029 |
msgstr "" |
|
11030 |
||
11031 |
#: en/help_topics/conflict-types.txt:363
|
|
11032 |
msgid "" |
|
11033 |
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
|
|
11034 |
" ``bzr add foo``,\n"
|
|
11035 |
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
|
|
11036 |
" ``bzr mv foo.new foo``,\n"
|
|
11037 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
11038 |
msgstr "" |
|
11039 |
||
11040 |
#: en/help_topics/conflict-types.txt:371
|
|
11041 |
msgid "" |
|
11042 |
"MalformedTransform\n"
|
|
11043 |
"------------------"
|
|
11044 |
msgstr "" |
|
11045 |
||
11046 |
#: en/help_topics/conflict-types.txt:374
|
|
11047 |
msgid "" |
|
11048 |
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
|
|
11049 |
"exception. This means that Bazaar encountered a filesystem conflict that it "
|
|
11050 |
"was\n"
|
|
11051 |
"unable to resolve. This usually indicates a bug. Please let us know if "
|
|
11052 |
"you\n"
|
|
11053 |
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
|
|
11054 |
msgstr "" |
|
11055 |
||
11056 |
#: en/help_topics/content-filters.txt:1
|
|
11057 |
msgid "" |
|
11058 |
"Content Filters\n"
|
|
11059 |
"==============="
|
|
11060 |
msgstr "" |
|
11061 |
||
11062 |
#: en/help_topics/content-filters.txt:4
|
|
11063 |
msgid "" |
|
11064 |
"Content formats\n"
|
|
11065 |
"---------------"
|
|
11066 |
msgstr "" |
|
11067 |
||
11068 |
#: en/help_topics/content-filters.txt:7
|
|
11069 |
msgid "" |
|
11070 |
"Bazaar's content filtering allows you to store files in a different\n"
|
|
11071 |
"format from the copy in your working tree. This lets you, or your\n"
|
|
11072 |
"co-developers, use Windows development tools that expect CRLF files\n"
|
|
11073 |
"on projects that use other line-ending conventions. Among other things,\n"
|
|
11074 |
"content filters also let Unix developers more easily work on projects\n"
|
|
11075 |
"using Windows line-ending conventions, keyword expansion/compression,\n"
|
|
11076 |
"and trailing spaces on lines in text files to be implicitly stripped\n"
|
|
11077 |
"when committed."
|
|
11078 |
msgstr "" |
|
11079 |
||
11080 |
#: en/help_topics/content-filters.txt:16
|
|
11081 |
msgid "To generalize, there are two content formats supported by Bazaar:" |
|
11082 |
msgstr "" |
|
11083 |
||
11084 |
#: en/help_topics/content-filters.txt:18
|
|
11085 |
msgid "" |
|
11086 |
"* a canonical format - how files are stored internally\n"
|
|
11087 |
"* a convenience format - how files are created in a working tree."
|
|
11088 |
msgstr "" |
|
11089 |
||
11090 |
#: en/help_topics/content-filters.txt:21
|
|
11091 |
msgid "" |
|
11092 |
"\n"
|
|
11093 |
"Format conversion\n"
|
|
11094 |
"-----------------"
|
|
11095 |
msgstr "" |
|
11096 |
||
11097 |
#: en/help_topics/content-filters.txt:25
|
|
11098 |
msgid "" |
|
11099 |
"The conversion between these formats is done by content filters.\n"
|
|
11100 |
"A content filter has two parts:"
|
|
11101 |
msgstr "" |
|
11102 |
||
11103 |
#: en/help_topics/content-filters.txt:28
|
|
11104 |
msgid "" |
|
11105 |
"* a read converter - converts from convenience to canonical format\n"
|
|
11106 |
"* a write converter - converts from canonical to convenience format."
|
|
11107 |
msgstr "" |
|
11108 |
||
11109 |
#: en/help_topics/content-filters.txt:31
|
|
11110 |
msgid "" |
|
11111 |
"Many of these converters will provide *round-trip* conversion,\n"
|
|
11112 |
"i.e. applying the read converter followed by the write converter\n"
|
|
11113 |
"gives back the original content. However, others may provide an\n"
|
|
11114 |
"asymmetric conversion. For example, a read converter might strip\n"
|
|
11115 |
"trailing whitespace off lines in source code while the matching\n"
|
|
11116 |
"write converter might pass content through unchanged."
|
|
11117 |
msgstr "" |
|
11118 |
||
11119 |
#: en/help_topics/content-filters.txt:38
|
|
11120 |
msgid "" |
|
11121 |
"\n"
|
|
11122 |
"Enabling content filters\n"
|
|
11123 |
"------------------------"
|
|
11124 |
msgstr "" |
|
11125 |
||
11126 |
#: en/help_topics/content-filters.txt:42
|
|
11127 |
msgid "" |
|
11128 |
"Content filters are typically provided by plugins, so the first step\n"
|
|
11129 |
"in using them is to install the relevant plugins and read their\n"
|
|
11130 |
"documentation. Some plugins may be very specific about which files\n"
|
|
11131 |
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
|
|
11132 |
"In other cases, the plugin may leave it in the user's hands to\n"
|
|
11133 |
"define which files are to be filtered. This is typically done\n"
|
|
11134 |
"using rule-based preferences. See ``bzr help rules`` for general\n"
|
|
11135 |
"information about defining these."
|
|
11136 |
msgstr "" |
|
11137 |
||
11138 |
#: en/help_topics/content-filters.txt:51
|
|
11139 |
msgid "" |
|
11140 |
"\n"
|
|
11141 |
"Impact on commands\n"
|
|
11142 |
"------------------"
|
|
11143 |
msgstr "" |
|
11144 |
||
11145 |
#: en/help_topics/content-filters.txt:55
|
|
11146 |
msgid "" |
|
11147 |
"Read converters are only applied to commands that read content from\n"
|
|
11148 |
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
|
|
11149 |
"will apply read converters to files in the working tree, then compare\n"
|
|
11150 |
"the results to the content last committed."
|
|
11151 |
msgstr "" |
|
11152 |
||
11153 |
#: en/help_topics/content-filters.txt:60
|
|
11154 |
msgid "" |
|
11155 |
"Write converters are only applied by commands that **create files in a\n"
|
|
11156 |
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
|
|
11157 |
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
|
|
11158 |
"respectively."
|
|
11159 |
msgstr "" |
|
11160 |
||
11161 |
#: en/help_topics/content-filters.txt:65
|
|
11162 |
msgid "" |
|
11163 |
"Note: ``bzr commit`` does not implicitly apply write converters after\n" |
|
11164 |
"comitting files. If this makes sense for a given plugin providing\n"
|
|
11165 |
"a content filter, the plugin can usually achieve this effect by using a\n"
|
|
11166 |
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
|
|
11167 |
"for more information on hooks."
|
|
11168 |
msgstr "" |
|
11169 |
||
11170 |
#: en/help_topics/content-filters.txt:71
|
|
11171 |
msgid "" |
|
11172 |
"\n"
|
|
11173 |
"Refreshing your working tree\n"
|
|
11174 |
"----------------------------"
|
|
11175 |
msgstr "" |
|
11176 |
||
11177 |
#: en/help_topics/content-filters.txt:75
|
|
11178 |
msgid "" |
|
11179 |
"For performance reasons, Bazaar caches the timestamps of files in\n"
|
|
11180 |
"a working tree, and assumes files are unchanged if their timestamps\n"
|
|
11181 |
"match the cached values. As a consequence, there are times when\n"
|
|
11182 |
"you may need to explicitly ask for content filtering to be reapplied\n"
|
|
11183 |
"in one or both directions, e.g. after installing or reconfiguring\n"
|
|
11184 |
"plugins providing it."
|
|
11185 |
msgstr "" |
|
11186 |
||
11187 |
#: en/help_topics/content-filters.txt:82
|
|
11188 |
msgid "Here are some general guidelines for doing this:" |
|
11189 |
msgstr "" |
|
11190 |
||
11191 |
#: en/help_topics/content-filters.txt:84
|
|
11192 |
msgid "" |
|
11193 |
" * To reapply read converters, ``touch`` files, i.e. update their\n"
|
|
11194 |
" timestamp. Operations like ``bzr status`` should then reapply the\n"
|
|
11195 |
" relevant read converters and compare the end result with the\n"
|
|
11196 |
" canonical format."
|
|
11197 |
msgstr "" |
|
11198 |
||
11199 |
#: en/help_topics/content-filters.txt:89
|
|
11200 |
msgid "" |
|
11201 |
" * To reapply write converters, ensure there are no local changes,\n"
|
|
11202 |
" delete the relevant files and run ``bzr revert`` on those files."
|
|
11203 |
msgstr "" |
|
11204 |
||
11205 |
#: en/help_topics/content-filters.txt:92
|
|
11206 |
msgid "" |
|
11207 |
"Note: In the future, it is likely that additional options will be added\n" |
|
11208 |
"to commands to make this refreshing process faster and safer.\n"
|
|
11209 |
msgstr "" |
|
11210 |
||
11211 |
#: en/help_topics/current-formats.txt:1
|
|
11212 |
msgid "Current Storage Formats" |
|
11213 |
msgstr "" |
|
11214 |
||
11215 |
#: en/help_topics/current-formats.txt:3
|
|
11216 |
msgid "" |
|
11217 |
":2a:\n"
|
|
11218 |
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
|
|
11219 |
" compress storage. Provides rich roots which are a one-way\n"
|
|
11220 |
" transition."
|
|
11221 |
msgstr "" |
|
11222 |
||
11223 |
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
|
|
11224 |
msgid "" |
|
11225 |
"\n"
|
|
11226 |
"See :doc:`formats-help` for more about storage formats."
|
|
11227 |
msgstr "" |
|
11228 |
||
11229 |
#: en/help_topics/debug-flags.txt:1
|
|
11230 |
msgid "" |
|
11231 |
"Debug Flags\n"
|
|
11232 |
"==========="
|
|
11233 |
msgstr "" |
|
11234 |
||
11235 |
#: en/help_topics/debug-flags.txt:4
|
|
11236 |
msgid "" |
|
11237 |
"These flags can be passed on the bzr command line or (without the ``-D``\n"
|
|
11238 |
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
|
|
11239 |
msgstr "" |
|
11240 |
||
11241 |
#: en/help_topics/debug-flags.txt:7
|
|
11242 |
msgid "" |
|
11243 |
"-Dauth Trace authentication sections used.\n"
|
|
11244 |
"-Dbytes Print out how many bytes were transferred\n"
|
|
11245 |
"-Ddirstate Trace dirstate activity (verbose!)\n"
|
|
11246 |
"-Derror Instead of normal error handling, always print a "
|
|
11247 |
"traceback\n"
|
|
11248 |
" on error.\n"
|
|
11249 |
"-Devil Capture call sites that do expensive or badly-scaling\n"
|
|
11250 |
" operations.\n"
|
|
11251 |
"-Dfetch Trace history copying between repositories.\n"
|
|
11252 |
"-Dfilters Emit information for debugging content filtering.\n"
|
|
11253 |
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
|
|
11254 |
"fetch.\n"
|
|
11255 |
"-Dgraph Trace graph traversal.\n"
|
|
11256 |
"-Dhashcache Log every time a working file is read to determine its "
|
|
11257 |
"hash.\n"
|
|
11258 |
"-Dhooks Trace hook execution.\n"
|
|
11259 |
"-Dhpss Trace smart protocol requests and responses.\n"
|
|
11260 |
"-Dhpssdetail More hpss details.\n"
|
|
11261 |
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
|
|
11262 |
"-Dhttp Trace http connections, requests and responses.\n"
|
|
11263 |
"-Dindex Trace major index operations.\n"
|
|
11264 |
"-Dknit Trace knit operations.\n"
|
|
11265 |
"-Dlock Trace when lockdir locks are taken or released.\n"
|
|
11266 |
"-Dnoretry If a connection is reset, fail immediately rather than\n"
|
|
11267 |
" retrying the request.\n"
|
|
11268 |
"-Dprogress Trace progress bar operations.\n"
|
|
11269 |
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
|
|
11270 |
"-Dmerge Emit information for debugging merges.\n"
|
|
11271 |
"-Dno_apport Don't use apport to report crashes.\n"
|
|
11272 |
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
|
|
11273 |
"-Dpack Emit information about pack operations.\n"
|
|
11274 |
"-Drelock Emit a message every time a branch or repository object "
|
|
11275 |
"is\n"
|
|
11276 |
" unlocked then relocked the same way.\n"
|
|
11277 |
"-Dsftp Trace SFTP internals.\n"
|
|
11278 |
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
|
|
11279 |
"expected\n"
|
|
11280 |
"-Dstream Trace fetch streams.\n"
|
|
11281 |
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
|
|
11282 |
"portable\n"
|
|
11283 |
" manner.\n"
|
|
11284 |
"-Dunlock Some errors during unlock are treated as warnings.\n"
|
|
11285 |
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
|
|
11286 |
"-DIDS_always Always use InterDifferingSerializer to fetch if "
|
|
11287 |
"appropriate\n"
|
|
11288 |
" for the format, even for non-local fetches.\n"
|
|
11289 |
msgstr "" |
|
11290 |
||
11291 |
#: en/help_topics/diverged-branches.txt:1
|
|
11292 |
msgid "" |
|
11293 |
"Diverged Branches\n"
|
|
11294 |
"================="
|
|
11295 |
msgstr "" |
|
11296 |
||
11297 |
#: en/help_topics/diverged-branches.txt:4
|
|
11298 |
msgid "" |
|
11299 |
"When Bazaar tries to push one branch onto another, it requires that the\n"
|
|
11300 |
"destination branch must be ready to receive the source branch. If this "
|
|
11301 |
"isn't\n"
|
|
11302 |
"the case, then we say that the branches have ``diverged``. Branches are\n"
|
|
11303 |
"considered diverged if the destination branch's most recent commit is one "
|
|
11304 |
"that\n"
|
|
11305 |
"has not been merged (directly or indirectly) by the source branch. To "
|
|
11306 |
"recover\n"
|
|
11307 |
"from diverged branches, one must merge the missing revisions into the "
|
|
11308 |
"source\n"
|
|
11309 |
"branch."
|
|
11310 |
msgstr "" |
|
11311 |
||
11312 |
#: en/help_topics/diverged-branches.txt:12
|
|
11313 |
msgid "" |
|
11314 |
"This situation commonly arises when using a centralized workflow with local\n"
|
|
11315 |
"commits. If someone else has committed new work to the mainline since your\n"
|
|
11316 |
"last pull and you have local commits that have not yet been pushed to the\n"
|
|
11317 |
"mainline, then your local branch and the mainline have diverged."
|
|
11318 |
msgstr "" |
|
11319 |
||
11320 |
#: en/help_topics/diverged-branches.txt:17
|
|
11321 |
msgid "" |
|
11322 |
"Discovering What Has Diverged\n"
|
|
11323 |
"-----------------------------"
|
|
11324 |
msgstr "" |
|
11325 |
||
11326 |
#: en/help_topics/diverged-branches.txt:20
|
|
11327 |
msgid "" |
|
11328 |
"The ``bzr missing`` command is used to find out what revisions are in "
|
|
11329 |
"another\n"
|
|
11330 |
"branch that are not present in the current branch, and vice-versa. It shows "
|
|
11331 |
"a\n"
|
|
11332 |
"summary of which extra revisions exist in each branch. If you want to see "
|
|
11333 |
"the\n"
|
|
11334 |
"precise effects of those revisions, you can use ``bzr diff --"
|
|
11335 |
"old=other_branch``\n"
|
|
11336 |
"to show the differences between other_branch and your current branch."
|
|
11337 |
msgstr "" |
|
11338 |
||
11339 |
#: en/help_topics/diverged-branches.txt:26
|
|
11340 |
msgid "" |
|
11341 |
"A Solution\n"
|
|
11342 |
"----------"
|
|
11343 |
msgstr "" |
|
11344 |
||
11345 |
#: en/help_topics/diverged-branches.txt:29
|
|
11346 |
msgid "" |
|
11347 |
"The solution is to merge the revisions from the mainline into your local\n"
|
|
11348 |
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
|
|
11349 |
"mainline. This merge may result in conflicts if the other developer's "
|
|
11350 |
"changes\n"
|
|
11351 |
"overlap with your changes. These conflicts should be resolved before\n"
|
|
11352 |
"continuing. After any conflicts have been resolved, or even if there were "
|
|
11353 |
"no\n"
|
|
11354 |
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
|
|
11355 |
"to your local branch. This requirement gives you an opportunity to test "
|
|
11356 |
"the\n"
|
|
11357 |
"resulting working tree for correctness, since the merged revisions could "
|
|
11358 |
"have\n"
|
|
11359 |
"made arbitrary changes. After testing, you should commit the merge using\n"
|
|
11360 |
"``bzr commit``. This clears up the diverged branches situation. Your "
|
|
11361 |
"local\n"
|
|
11362 |
"branch can now be pushed to the mainline.\n"
|
|
11363 |
msgstr "" |
|
11364 |
||
11365 |
#: en/help_topics/eol.txt:1
|
|
11366 |
msgid "" |
|
11367 |
"End of Line Conversion\n"
|
|
11368 |
"======================"
|
|
11369 |
msgstr "" |
|
11370 |
||
11371 |
#: en/help_topics/eol.txt:4
|
|
11372 |
msgid "" |
|
11373 |
"EOL conversion is provided as a content filter where Bazaar internally\n"
|
|
11374 |
"stores a canonical format but outputs a convenience format. See\n"
|
|
11375 |
"``bzr help content-filters`` for general information about using these."
|
|
11376 |
msgstr "" |
|
11377 |
||
11378 |
#: en/help_topics/eol.txt:8
|
|
11379 |
msgid "" |
|
11380 |
"Note: Content filtering is only supported in recently added formats,\n" |
|
11381 |
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
|
|
11382 |
"in a recent format. (Just setting the format on the repository\n"
|
|
11383 |
"is not enough.) If content filtering does not appear to be working, use\n"
|
|
11384 |
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
|
|
11385 |
"or later."
|
|
11386 |
msgstr "" |
|
11387 |
||
11388 |
#: en/help_topics/eol.txt:15
|
|
11389 |
msgid "" |
|
11390 |
"EOL conversion needs to be enabled for selected file patterns using\n"
|
|
11391 |
"rules. See ``bzr help rules`` for general information on defining rules.\n"
|
|
11392 |
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
|
|
11393 |
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
|
|
11394 |
"supported in a future verison of Bazaar."
|
|
11395 |
msgstr "" |
|
11396 |
||
11397 |
#: en/help_topics/eol.txt:21
|
|
11398 |
msgid "" |
|
11399 |
"To configure which files to filter, set ``eol`` to one of the values below.\n"
|
|
11400 |
"(If a value is not set, ``exact`` is the default.)"
|
|
11401 |
msgstr "" |
|
11402 |
||
11403 |
#: en/help_topics/eol.txt:24
|
|
11404 |
msgid "" |
|
11405 |
" ========== ===================================== ======================\n"
|
|
11406 |
" Value Checkout end-of-lines as Commit end-of-lines as\n"
|
|
11407 |
" ========== ===================================== ======================\n"
|
|
11408 |
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
|
|
11409 |
" ---------- ------------------------------------- ----------------------\n"
|
|
11410 |
" ``lf`` ``lf`` ``lf``\n"
|
|
11411 |
" ---------- ------------------------------------- ----------------------\n"
|
|
11412 |
" ``crlf`` ``crlf`` ``lf``\n"
|
|
11413 |
" ---------- ------------------------------------- ----------------------\n"
|
|
11414 |
" ``exact`` No conversion Exactly as in file\n"
|
|
11415 |
" ========== ===================================== ======================"
|
|
11416 |
msgstr "" |
|
11417 |
||
11418 |
#: en/help_topics/eol.txt:36
|
|
11419 |
msgid "" |
|
11420 |
"Note: For safety reasons, no conversion is applied to any file where a null\n" |
|
11421 |
"byte is detected in the file."
|
|
11422 |
msgstr "" |
|
11423 |
||
11424 |
#: en/help_topics/eol.txt:39
|
|
11425 |
msgid "" |
|
11426 |
"For users working on a cross-platform project, here is a suggested rule\n"
|
|
11427 |
"to use as a starting point::"
|
|
11428 |
msgstr "" |
|
11429 |
||
11430 |
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
|
|
11431 |
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
|
|
11432 |
msgid "" |
|
11433 |
" [name *]\n"
|
|
11434 |
" eol = native"
|
|
11435 |
msgstr "" |
|
11436 |
||
11437 |
#: en/help_topics/eol.txt:45
|
|
11438 |
msgid "" |
|
11439 |
"If you have binary files that do not contain a null byte though, be\n"
|
|
11440 |
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
|
|
11441 |
"by giving more explicit patterns earlier in the rules file. For example::"
|
|
11442 |
msgstr "" |
|
11443 |
||
11444 |
#: en/help_topics/eol.txt:49
|
|
11445 |
msgid "" |
|
11446 |
" [name *.png]\n"
|
|
11447 |
" eol = exact"
|
|
11448 |
msgstr "" |
|
11449 |
||
11450 |
#: en/help_topics/eol.txt:55
|
|
11451 |
msgid "" |
|
11452 |
"If your working tree is on a network drive shared by users on different\n"
|
|
11453 |
"operating systems, you typically want to force certain conventions for\n"
|
|
11454 |
"certain files. In that way, if a file is created with the wrong line\n"
|
|
11455 |
"endings or line endings get mixed during editing, it gets committed\n"
|
|
11456 |
"correctly and gets checked out correctly. For example::"
|
|
11457 |
msgstr "" |
|
11458 |
||
11459 |
#: en/help_topics/eol.txt:61
|
|
11460 |
msgid "" |
|
11461 |
" [name *.bat]\n"
|
|
11462 |
" eol = crlf"
|
|
11463 |
msgstr "" |
|
11464 |
||
11465 |
#: en/help_topics/eol.txt:64
|
|
11466 |
msgid "" |
|
11467 |
" [name *.sh]\n"
|
|
11468 |
" eol = lf"
|
|
11469 |
msgstr "" |
|
11470 |
||
11471 |
#: en/help_topics/eol.txt:70
|
|
11472 |
msgid "" |
|
11473 |
"If you take the care to create files with their required endings, you can\n"
|
|
11474 |
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
|
|
11475 |
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
|
|
11476 |
"introducing mixed line endings will be corrected during commit for files\n"
|
|
11477 |
"with those settings."
|
|
11478 |
msgstr "" |
|
11479 |
||
11480 |
#: en/help_topics/eol.txt:76
|
|
11481 |
msgid "" |
|
11482 |
"If you have sample test data that deliberately has text files with mixed\n"
|
|
11483 |
"newline conventions, you can ask for those to be left alone like this::"
|
|
11484 |
msgstr "" |
|
11485 |
||
11486 |
#: en/help_topics/eol.txt:79
|
|
11487 |
msgid "" |
|
11488 |
" [name test_data/]\n"
|
|
11489 |
" eol = exact"
|
|
11490 |
msgstr "" |
|
11491 |
||
11492 |
#: en/help_topics/eol.txt:85
|
|
11493 |
msgid "" |
|
11494 |
"Note that ``exact`` does not imply the file is binary but it does mean\n"
|
|
11495 |
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
|
|
11496 |
"of content analysis to detect binary files for commands like ``diff``.\n"
|
|
11497 |
"In the future, a ``binary = true`` rule may be added but it is not\n"
|
|
11498 |
"supported yet.)"
|
|
11499 |
msgstr "" |
|
11500 |
||
11501 |
#: en/help_topics/eol.txt:91
|
|
11502 |
msgid "" |
|
11503 |
"If you have an existing repository with text files already stored using\n"
|
|
11504 |
"Windows newline conventions (``crlf``), then you may want to keep using "
|
|
11505 |
"that\n"
|
|
11506 |
"convention in the repository. Forcing certain files to this convention\n"
|
|
11507 |
"may also help users who do not have rules configured. To do this, set\n"
|
|
11508 |
"``eol`` to one of the values below."
|
|
11509 |
msgstr "" |
|
11510 |
||
11511 |
#: en/help_topics/eol.txt:97
|
|
11512 |
msgid "" |
|
11513 |
" ============================ ======================== "
|
|
11514 |
"======================\n"
|
|
11515 |
" Value Checkout end-of-lines as Commit end-of-lines "
|
|
11516 |
"as\n"
|
|
11517 |
" ============================ ======================== "
|
|
11518 |
"======================\n"
|
|
11519 |
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
|
|
11520 |
" ``lf`` otherwise\n"
|
|
11521 |
" ---------------------------- ------------------------ ----------------------"
|
|
11522 |
"\n"
|
|
11523 |
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
|
|
11524 |
" ---------------------------- ------------------------ ----------------------"
|
|
11525 |
"\n"
|
|
11526 |
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
|
|
11527 |
" ============================ ======================== ======================"
|
|
11528 |
msgstr "" |
|
11529 |
||
11530 |
#: en/help_topics/eol.txt:108
|
|
11531 |
msgid "" |
|
11532 |
"For users working on an existing project that uses Windows newline\n"
|
|
11533 |
"conventions in their Bazaar repository, this rule is suggested as a\n"
|
|
11534 |
"starting point::"
|
|
11535 |
msgstr "" |
|
11536 |
||
11537 |
#: en/help_topics/eol.txt:112
|
|
11538 |
msgid "" |
|
11539 |
" [name *]\n"
|
|
11540 |
" eol = native-with-crlf-in-repo"
|
|
11541 |
msgstr "" |
|
11542 |
||
11543 |
#: en/help_topics/eol.txt:115
|
|
11544 |
msgid "" |
|
11545 |
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
|
|
11546 |
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
|
|
11547 |
"``crlf`` and ``exact``."
|
|
11548 |
msgstr "" |
|
11549 |
||
11550 |
#: en/help_topics/eol.txt:119
|
|
11551 |
msgid "" |
|
11552 |
"Note: Bazaar's EOL conversion will convert the content of files but\n" |
|
11553 |
"never reject files because a given line ending or mixed line endings\n"
|
|
11554 |
"are found. A precommit hook should be used if you wish to validate\n"
|
|
11555 |
"(and not just convert) content before committing.\n"
|
|
11556 |
msgstr "" |
|
11557 |
||
11558 |
#: en/help_topics/hidden-commands.txt:1
|
|
11559 |
msgid "" |
|
11560 |
"added List files added in working tree.\n"
|
|
11561 |
"ancestry List all revisions merged into this branch.\n"
|
|
11562 |
"assert-fail Test reporting of assertion failures\n"
|
|
11563 |
"bundle-info Output interesting stats about a bundle\n"
|
|
11564 |
"bundle-revisions Create a merge-directive for submitting changes.\n"
|
|
11565 |
"cat-revision Write out metadata for a revision.\n"
|
|
11566 |
"dump-btree Dump the contents of a btree index file to stdout.\n"
|
|
11567 |
"export-pot Export command helps and error messages in po format.\n"
|
|
11568 |
"file-id Print file_id of a particular file or directory.\n"
|
|
11569 |
"file-path Print path of file_ids to a file or directory.\n"
|
|
11570 |
"find-merge-base Find and print a base revision for merging two "
|
|
11571 |
"branches.\n"
|
|
11572 |
"hooks Show hooks.\n"
|
|
11573 |
"inventory Show inventory of the current working copy or a "
|
|
11574 |
"revision.\n"
|
|
11575 |
"local-time-offset Show the offset in seconds from GMT to local time.\n"
|
|
11576 |
"lookup-revision Lookup the revision-id from a revision-number\n"
|
|
11577 |
"merge-directive Generate a merge directive for auto-merge tools.\n"
|
|
11578 |
"modified List files modified in working tree.\n"
|
|
11579 |
"re-sign Create a digital signature for an existing revision.\n"
|
|
11580 |
"reference list, view and set branch locations for nested trees.\n"
|
|
11581 |
"relpath Show path of a file relative to root\n"
|
|
11582 |
"repair-workingtree Reset the working tree state file.\n"
|
|
11583 |
"revision-history Display the list of revision ids on a branch.\n"
|
|
11584 |
"revision-info Show revision number and revision id for a given "
|
|
11585 |
"revision\n"
|
|
11586 |
" identifier.\n"
|
|
11587 |
"rocks Statement of optimism.\n"
|
|
11588 |
"selftest Run internal test suite.\n"
|
|
11589 |
"shell-complete Show appropriate completions for context.\n"
|
|
11590 |
"test-script Run a shell-like test from a file.\n"
|
|
11591 |
"touching-revisions Return revision-ids which affected a particular file.\n"
|
|
11592 |
"unknowns List unknown files.\n"
|
|
11593 |
"wait-until-signalled Test helper for\n"
|
|
11594 |
" test_start_and_stop_bzr_subprocess_send_signal.\n"
|
|
11595 |
msgstr "" |
|
11596 |
||
11597 |
#: en/help_topics/hooks.txt:1
|
|
11598 |
msgid "" |
|
11599 |
"\n"
|
|
11600 |
"Hooks\n"
|
|
11601 |
"====="
|
|
11602 |
msgstr "" |
|
11603 |
||
11604 |
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
|
|
11605 |
msgid "" |
|
11606 |
"Introduction\n"
|
|
11607 |
"------------"
|
|
11608 |
msgstr "" |
|
11609 |
||
11610 |
#: en/help_topics/hooks.txt:8
|
|
11611 |
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::" |
|
11612 |
msgstr "" |
|
11613 |
||
11614 |
#: en/help_topics/hooks.txt:10
|
|
11615 |
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)" |
|
11616 |
msgstr "" |
|
11617 |
||
11618 |
#: en/help_topics/hooks.txt:12
|
|
11619 |
msgid "" |
|
11620 |
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
|
|
11621 |
msgstr "" |
|
11622 |
||
11623 |
#: en/help_topics/hooks.txt:14
|
|
11624 |
msgid "" |
|
11625 |
"The class that contains each hook is given before the hooks it supplies. "
|
|
11626 |
"For\n"
|
|
11627 |
"instance, BranchHooks as the class is the hooks class for\n"
|
|
11628 |
"`bzrlib.branch.Branch.hooks`."
|
|
11629 |
msgstr "" |
|
11630 |
||
11631 |
#: en/help_topics/hooks.txt:18
|
|
11632 |
msgid "" |
|
11633 |
"Each description also indicates whether the hook runs on the client (the\n"
|
|
11634 |
"machine where bzr was invoked) or the server (the machine addressed by\n"
|
|
11635 |
"the branch URL). These may be, but are not necessarily, the same machine."
|
|
11636 |
msgstr "" |
|
11637 |
||
11638 |
#: en/help_topics/hooks.txt:22
|
|
11639 |
msgid "" |
|
11640 |
"Plugins (including hooks) are run on the server if all of these is true:"
|
|
11641 |
msgstr "" |
|
11642 |
||
11643 |
#: en/help_topics/hooks.txt:24
|
|
11644 |
msgid "" |
|
11645 |
" * The connection is via a smart server (accessed with a URL starting with\n"
|
|
11646 |
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
|
|
11647 |
"\"http://\"\n"
|
|
11648 |
" URL when a smart server is available via HTTP)."
|
|
11649 |
msgstr "" |
|
11650 |
||
11651 |
#: en/help_topics/hooks.txt:28
|
|
11652 |
msgid "" |
|
11653 |
" * The hook is either server specific or part of general infrastructure "
|
|
11654 |
"rather\n"
|
|
11655 |
" than client specific code (such as commit)."
|
|
11656 |
msgstr "" |
|
11657 |
||
11658 |
#: en/help_topics/hooks.txt:31
|
|
11659 |
msgid "" |
|
11660 |
"\n"
|
|
11661 |
"BranchHooks\n"
|
|
11662 |
"-----------"
|
|
11663 |
msgstr "" |
|
11664 |
||
11665 |
#: en/help_topics/hooks.txt:35
|
|
11666 |
msgid "" |
|
11667 |
"automatic_tag_name\n"
|
|
11668 |
"~~~~~~~~~~~~~~~~~~"
|
|
11669 |
msgstr "" |
|
11670 |
||
11671 |
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
|
|
11672 |
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
|
|
11673 |
msgid "Introduced in: 2.2" |
|
11674 |
msgstr "" |
|
11675 |
||
11676 |
#: en/help_topics/hooks.txt:40
|
|
11677 |
msgid "" |
|
11678 |
"Called to determine an automatic tag name for a revision.\n"
|
|
11679 |
"automatic_tag_name is called with (branch, revision_id) and should\n"
|
|
11680 |
"return a tag name or None if no tag name could be determined. The\n"
|
|
11681 |
"first non-None tag name returned will be used."
|
|
11682 |
msgstr "" |
|
11683 |
||
11684 |
#: en/help_topics/hooks.txt:45
|
|
11685 |
msgid "" |
|
11686 |
"open\n"
|
|
11687 |
"~~~~"
|
|
11688 |
msgstr "" |
|
11689 |
||
11690 |
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
|
|
11691 |
#: en/help_topics/hooks.txt:304
|
|
11692 |
msgid "Introduced in: 1.8" |
|
11693 |
msgstr "" |
|
11694 |
||
11695 |
#: en/help_topics/hooks.txt:50
|
|
11696 |
msgid "" |
|
11697 |
"Called with the Branch object that has been opened after a branch is\n"
|
|
11698 |
"opened."
|
|
11699 |
msgstr "" |
|
11700 |
||
11701 |
#: en/help_topics/hooks.txt:53
|
|
11702 |
msgid "" |
|
11703 |
"post_branch_init\n"
|
|
11704 |
"~~~~~~~~~~~~~~~~"
|
|
11705 |
msgstr "" |
|
11706 |
||
11707 |
#: en/help_topics/hooks.txt:58
|
|
11708 |
msgid "" |
|
11709 |
"Called after new branch initialization completes. post_branch_init is\n"
|
|
11710 |
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
|
|
11711 |
"branch and checkout (both heavyweight and lightweight) will all\n"
|
|
11712 |
"trigger this hook."
|
|
11713 |
msgstr "" |
|
11714 |
||
11715 |
#: en/help_topics/hooks.txt:63
|
|
11716 |
msgid "" |
|
11717 |
"post_change_branch_tip\n"
|
|
11718 |
"~~~~~~~~~~~~~~~~~~~~~~"
|
|
11719 |
msgstr "" |
|
11720 |
||
11721 |
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
|
|
11722 |
msgid "Introduced in: 1.4" |
|
11723 |
msgstr "" |
|
11724 |
||
11725 |
#: en/help_topics/hooks.txt:68
|
|
11726 |
msgid "" |
|
11727 |
"Called in bzr client and server after a change to the tip of a branch\n"
|
|
11728 |
"is made. post_change_branch_tip is called with a\n"
|
|
11729 |
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
|
|
11730 |
"uncommit will all trigger this hook."
|
|
11731 |
msgstr "" |
|
11732 |
||
11733 |
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
|
|
11734 |
msgid "" |
|
11735 |
"post_commit\n"
|
|
11736 |
"~~~~~~~~~~~"
|
|
11737 |
msgstr "" |
|
11738 |
||
11739 |
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
|
|
11740 |
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
|
|
11741 |
#: en/help_topics/hooks.txt:145
|
|
11742 |
msgid "Introduced in: 0.15" |
|
11743 |
msgstr "" |
|
11744 |
||
11745 |
#: en/help_topics/hooks.txt:78
|
|
11746 |
msgid "" |
|
11747 |
"Called in the bzr client after a commit has completed. post_commit is\n"
|
|
11748 |
"called with (local, master, old_revno, old_revid, new_revno,\n"
|
|
11749 |
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
|
|
11750 |
"branch."
|
|
11751 |
msgstr "" |
|
11752 |
||
11753 |
#: en/help_topics/hooks.txt:83
|
|
11754 |
msgid "" |
|
11755 |
"post_pull\n"
|
|
11756 |
"~~~~~~~~~"
|
|
11757 |
msgstr "" |
|
11758 |
||
11759 |
#: en/help_topics/hooks.txt:88
|
|
11760 |
msgid "" |
|
11761 |
"Called after a pull operation completes. post_pull is called with a\n"
|
|
11762 |
"bzrlib.branch.PullResult object and only runs in the bzr client."
|
|
11763 |
msgstr "" |
|
11764 |
||
11765 |
#: en/help_topics/hooks.txt:91
|
|
11766 |
msgid "" |
|
11767 |
"post_push\n"
|
|
11768 |
"~~~~~~~~~"
|
|
11769 |
msgstr "" |
|
11770 |
||
11771 |
#: en/help_topics/hooks.txt:96
|
|
11772 |
msgid "" |
|
11773 |
"Called after a push operation completes. post_push is called with a\n"
|
|
11774 |
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
|
|
11775 |
msgstr "" |
|
11776 |
||
11777 |
#: en/help_topics/hooks.txt:99
|
|
11778 |
msgid "" |
|
11779 |
"post_switch\n"
|
|
11780 |
"~~~~~~~~~~~"
|
|
11781 |
msgstr "" |
|
11782 |
||
11783 |
#: en/help_topics/hooks.txt:104
|
|
11784 |
msgid "" |
|
11785 |
"Called after a checkout switches branch. post_switch is called with a\n"
|
|
11786 |
"bzrlib.branch.SwitchHookParams."
|
|
11787 |
msgstr "" |
|
11788 |
||
11789 |
#: en/help_topics/hooks.txt:107
|
|
11790 |
msgid "" |
|
11791 |
"post_uncommit\n"
|
|
11792 |
"~~~~~~~~~~~~~"
|
|
11793 |
msgstr "" |
|
11794 |
||
11795 |
#: en/help_topics/hooks.txt:112
|
|
11796 |
msgid "" |
|
11797 |
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
|
|
11798 |
"called with (local, master, old_revno, old_revid, new_revno,\n"
|
|
11799 |
"new_revid) where local is the local branch or None, master is the\n"
|
|
11800 |
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
|
|
11801 |
"of None."
|
|
11802 |
msgstr "" |
|
11803 |
||
11804 |
#: en/help_topics/hooks.txt:118
|
|
11805 |
msgid "" |
|
11806 |
"pre_change_branch_tip\n"
|
|
11807 |
"~~~~~~~~~~~~~~~~~~~~~"
|
|
11808 |
msgstr "" |
|
11809 |
||
11810 |
#: en/help_topics/hooks.txt:121
|
|
11811 |
msgid "Introduced in: 1.6" |
|
11812 |
msgstr "" |
|
11813 |
||
11814 |
#: en/help_topics/hooks.txt:123
|
|
11815 |
msgid "" |
|
11816 |
"Called in bzr client and server before a change to the tip of a branch\n"
|
|
11817 |
"is made. pre_change_branch_tip is called with a\n"
|
|
11818 |
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
|
|
11819 |
"uncommit will all trigger this hook."
|
|
11820 |
msgstr "" |
|
11821 |
||
11822 |
#: en/help_topics/hooks.txt:128
|
|
11823 |
msgid "" |
|
11824 |
"pre_commit\n"
|
|
11825 |
"~~~~~~~~~~"
|
|
11826 |
msgstr "" |
|
11827 |
||
11828 |
#: en/help_topics/hooks.txt:131
|
|
11829 |
msgid "Introduced in: 0.91" |
|
11830 |
msgstr "" |
|
11831 |
||
11832 |
#: en/help_topics/hooks.txt:133
|
|
11833 |
msgid "" |
|
11834 |
"Called after a commit is calculated but before it is completed.\n"
|
|
11835 |
"pre_commit is called with (local, master, old_revno, old_revid,\n"
|
|
11836 |
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
|
|
11837 |
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
|
|
11838 |
"TreeDelta object describing changes from the basis revision. hooks\n"
|
|
11839 |
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
|
|
11840 |
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
|
|
11841 |
"tree."
|
|
11842 |
msgstr "" |
|
11843 |
||
11844 |
#: en/help_topics/hooks.txt:142
|
|
11845 |
msgid "" |
|
11846 |
"set_rh\n"
|
|
11847 |
"~~~~~~"
|
|
11848 |
msgstr "" |
|
11849 |
||
11850 |
#: en/help_topics/hooks.txt:147
|
|
11851 |
msgid "" |
|
11852 |
"Invoked whenever the revision history has been set via\n"
|
|
11853 |
"set_revision_history. The api signature is (branch, revision_history),\n"
|
|
11854 |
"and the branch will be write-locked. The set_rh hook can be expensive\n"
|
|
11855 |
"for bzr to trigger, a better hook to use is\n"
|
|
11856 |
"Branch.post_change_branch_tip."
|
|
11857 |
msgstr "" |
|
11858 |
||
11859 |
#: en/help_topics/hooks.txt:153
|
|
11860 |
msgid "" |
|
11861 |
"transform_fallback_location\n"
|
|
11862 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
11863 |
msgstr "" |
|
11864 |
||
11865 |
#: en/help_topics/hooks.txt:156
|
|
11866 |
msgid "Introduced in: 1.9" |
|
11867 |
msgstr "" |
|
11868 |
||
11869 |
#: en/help_topics/hooks.txt:158
|
|
11870 |
msgid "" |
|
11871 |
"Called when a stacked branch is activating its fallback locations.\n"
|
|
11872 |
"transform_fallback_location is called with (branch, url), and should\n"
|
|
11873 |
"return a new url. Returning the same url allows it to be used as-is,\n"
|
|
11874 |
"returning a different one can be used to cause the branch to stack on\n"
|
|
11875 |
"a closer copy of that fallback_location. Note that the branch cannot\n"
|
|
11876 |
"have history accessing methods called on it during this hook because\n"
|
|
11877 |
"the fallback locations have not been activated. When there are\n"
|
|
11878 |
"multiple hooks installed for transform_fallback_location, all are\n"
|
|
11879 |
"called with the url returned from the previous hook.The order is\n"
|
|
11880 |
"however undefined."
|
|
11881 |
msgstr "" |
|
11882 |
||
11883 |
#: en/help_topics/hooks.txt:169
|
|
11884 |
msgid "" |
|
11885 |
"CommandHooks\n"
|
|
11886 |
"------------"
|
|
11887 |
msgstr "" |
|
11888 |
||
11889 |
#: en/help_topics/hooks.txt:172
|
|
11890 |
msgid "" |
|
11891 |
"extend_command\n"
|
|
11892 |
"~~~~~~~~~~~~~~"
|
|
11893 |
msgstr "" |
|
11894 |
||
11895 |
#: en/help_topics/hooks.txt:175
|
|
11896 |
msgid "Introduced in: 1.13" |
|
11897 |
msgstr "" |
|
11898 |
||
11899 |
#: en/help_topics/hooks.txt:177
|
|
11900 |
msgid "" |
|
11901 |
"Called after creating a command object to allow modifications such as\n"
|
|
11902 |
"adding or removing options, docs etc. Called with the new\n"
|
|
11903 |
"bzrlib.commands.Command object."
|
|
11904 |
msgstr "" |
|
11905 |
||
11906 |
#: en/help_topics/hooks.txt:181
|
|
11907 |
msgid "" |
|
11908 |
"get_command\n"
|
|
11909 |
"~~~~~~~~~~~"
|
|
11910 |
msgstr "" |
|
11911 |
||
11912 |
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
|
|
11913 |
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
|
|
11914 |
msgid "Introduced in: 1.17" |
|
11915 |
msgstr "" |
|
11916 |
||
11917 |
#: en/help_topics/hooks.txt:186
|
|
11918 |
msgid "" |
|
11919 |
"Called when creating a single command. Called with (cmd_or_None,\n"
|
|
11920 |
"command_name). get_command should either return the cmd_or_None\n"
|
|
11921 |
"parameter, or a replacement Command object that should be used for the\n"
|
|
11922 |
"command. Note that the Command.hooks hooks are core infrastructure.\n"
|
|
11923 |
"Many users will prefer to use bzrlib.commands.register_command or\n"
|
|
11924 |
"plugin_cmds.register_lazy."
|
|
11925 |
msgstr "" |
|
11926 |
||
11927 |
#: en/help_topics/hooks.txt:193
|
|
11928 |
msgid "" |
|
11929 |
"get_missing_command\n"
|
|
11930 |
"~~~~~~~~~~~~~~~~~~~"
|
|
11931 |
msgstr "" |
|
11932 |
||
11933 |
#: en/help_topics/hooks.txt:198
|
|
11934 |
msgid "" |
|
11935 |
"Called when creating a single command if no command could be found.\n"
|
|
11936 |
"Called with (command_name). get_missing_command should either return\n"
|
|
11937 |
"None, or a Command object to be used for the command."
|
|
11938 |
msgstr "" |
|
11939 |
||
11940 |
#: en/help_topics/hooks.txt:202
|
|
11941 |
msgid "" |
|
11942 |
"list_commands\n"
|
|
11943 |
"~~~~~~~~~~~~~"
|
|
11944 |
msgstr "" |
|
11945 |
||
11946 |
#: en/help_topics/hooks.txt:207
|
|
11947 |
msgid "" |
|
11948 |
"Called when enumerating commands. Called with a set of cmd_name\n"
|
|
11949 |
"strings for all the commands found so far. This set is safe to mutate\n"
|
|
11950 |
"- e.g. to remove a command. list_commands should return the updated\n"
|
|
11951 |
"set of command names."
|
|
11952 |
msgstr "" |
|
11953 |
||
11954 |
#: en/help_topics/hooks.txt:212
|
|
11955 |
msgid "" |
|
11956 |
"_ConfigHooks\n"
|
|
11957 |
"------------"
|
|
11958 |
msgstr "" |
|
11959 |
||
11960 |
#: en/help_topics/hooks.txt:215
|
|
11961 |
msgid "" |
|
11962 |
"get\n"
|
|
11963 |
"~~~"
|
|
11964 |
msgstr "" |
|
11965 |
||
11966 |
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
|
|
11967 |
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
|
|
11968 |
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
|
|
11969 |
#: en/help_topics/hooks.txt:443
|
|
11970 |
msgid "Introduced in: 2.4" |
|
11971 |
msgstr "" |
|
11972 |
||
11973 |
#: en/help_topics/hooks.txt:220
|
|
11974 |
msgid "" |
|
11975 |
"Invoked when a config option is read. The signature is (stack, name,\n"
|
|
11976 |
"value)."
|
|
11977 |
msgstr "" |
|
11978 |
||
11979 |
#: en/help_topics/hooks.txt:223
|
|
11980 |
msgid "" |
|
11981 |
"load\n"
|
|
11982 |
"~~~~"
|
|
11983 |
msgstr "" |
|
11984 |
||
11985 |
#: en/help_topics/hooks.txt:228
|
|
11986 |
msgid "Invoked when a config store is loaded. The signature is (store)." |
|
11987 |
msgstr "" |
|
11988 |
||
11989 |
#: en/help_topics/hooks.txt:230
|
|
11990 |
msgid "" |
|
11991 |
"remove\n"
|
|
11992 |
"~~~~~~"
|
|
11993 |
msgstr "" |
|
11994 |
||
11995 |
#: en/help_topics/hooks.txt:235
|
|
11996 |
msgid "" |
|
11997 |
"Invoked when a config option is removed. The signature is (stack,\n"
|
|
11998 |
"name)."
|
|
11999 |
msgstr "" |
|
12000 |
||
12001 |
#: en/help_topics/hooks.txt:238
|
|
12002 |
msgid "" |
|
12003 |
"save\n"
|
|
12004 |
"~~~~"
|
|
12005 |
msgstr "" |
|
12006 |
||
12007 |
#: en/help_topics/hooks.txt:243
|
|
12008 |
msgid "Invoked when a config store is saved. The signature is (store)." |
|
12009 |
msgstr "" |
|
12010 |
||
12011 |
#: en/help_topics/hooks.txt:245
|
|
12012 |
msgid "" |
|
12013 |
"set\n"
|
|
12014 |
"~~~"
|
|
12015 |
msgstr "" |
|
12016 |
||
12017 |
#: en/help_topics/hooks.txt:250
|
|
12018 |
msgid "" |
|
12019 |
"Invoked when a config option is set. The signature is (stack, name,\n"
|
|
12020 |
"value)."
|
|
12021 |
msgstr "" |
|
12022 |
||
12023 |
#: en/help_topics/hooks.txt:253
|
|
12024 |
msgid "" |
|
12025 |
"ControlDirHooks\n"
|
|
12026 |
"---------------"
|
|
12027 |
msgstr "" |
|
12028 |
||
12029 |
#: en/help_topics/hooks.txt:256
|
|
12030 |
msgid "" |
|
12031 |
"post_repo_init\n"
|
|
12032 |
"~~~~~~~~~~~~~~"
|
|
12033 |
msgstr "" |
|
12034 |
||
12035 |
#: en/help_topics/hooks.txt:261
|
|
12036 |
msgid "" |
|
12037 |
"Invoked after a repository has been initialized. post_repo_init is\n"
|
|
12038 |
"called with a bzrlib.controldir.RepoInitHookParams."
|
|
12039 |
msgstr "" |
|
12040 |
||
12041 |
#: en/help_topics/hooks.txt:264
|
|
12042 |
msgid "" |
|
12043 |
"pre_open\n"
|
|
12044 |
"~~~~~~~~"
|
|
12045 |
msgstr "" |
|
12046 |
||
12047 |
#: en/help_topics/hooks.txt:267
|
|
12048 |
msgid "Introduced in: 1.14" |
|
12049 |
msgstr "" |
|
12050 |
||
12051 |
#: en/help_topics/hooks.txt:269
|
|
12052 |
msgid "" |
|
12053 |
"Invoked before attempting to open a ControlDir with the transport that\n"
|
|
12054 |
"the open will use."
|
|
12055 |
msgstr "" |
|
12056 |
||
12057 |
#: en/help_topics/hooks.txt:272
|
|
12058 |
msgid "" |
|
12059 |
"InfoHooks\n"
|
|
12060 |
"---------"
|
|
12061 |
msgstr "" |
|
12062 |
||
12063 |
#: en/help_topics/hooks.txt:275
|
|
12064 |
msgid "" |
|
12065 |
"repository\n"
|
|
12066 |
"~~~~~~~~~~"
|
|
12067 |
msgstr "" |
|
12068 |
||
12069 |
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
|
|
12070 |
#: en/help_topics/hooks.txt:521
|
|
12071 |
msgid "Introduced in: 1.15" |
|
12072 |
msgstr "" |
|
12073 |
||
12074 |
#: en/help_topics/hooks.txt:280
|
|
12075 |
msgid "" |
|
12076 |
"Invoked when displaying the statistics for a repository. repository is\n"
|
|
12077 |
"called with a statistics dictionary as returned by the repository and\n"
|
|
12078 |
"a file-like object to write to."
|
|
12079 |
msgstr "" |
|
12080 |
||
12081 |
#: en/help_topics/hooks.txt:284
|
|
12082 |
msgid "" |
|
12083 |
"LockHooks\n"
|
|
12084 |
"---------"
|
|
12085 |
msgstr "" |
|
12086 |
||
12087 |
#: en/help_topics/hooks.txt:287
|
|
12088 |
msgid "" |
|
12089 |
"lock_acquired\n"
|
|
12090 |
"~~~~~~~~~~~~~"
|
|
12091 |
msgstr "" |
|
12092 |
||
12093 |
#: en/help_topics/hooks.txt:292
|
|
12094 |
msgid "" |
|
12095 |
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
|
|
12096 |
msgstr "" |
|
12097 |
||
12098 |
#: en/help_topics/hooks.txt:294
|
|
12099 |
msgid "" |
|
12100 |
"lock_broken\n"
|
|
12101 |
"~~~~~~~~~~~"
|
|
12102 |
msgstr "" |
|
12103 |
||
12104 |
#: en/help_topics/hooks.txt:299
|
|
12105 |
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken." |
|
12106 |
msgstr "" |
|
12107 |
||
12108 |
#: en/help_topics/hooks.txt:301
|
|
12109 |
msgid "" |
|
12110 |
"lock_released\n"
|
|
12111 |
"~~~~~~~~~~~~~"
|
|
12112 |
msgstr "" |
|
12113 |
||
12114 |
#: en/help_topics/hooks.txt:306
|
|
12115 |
msgid "" |
|
12116 |
"Called with a bzrlib.lock.LockResult when a physical lock is released."
|
|
12117 |
msgstr "" |
|
12118 |
||
12119 |
#: en/help_topics/hooks.txt:308
|
|
12120 |
msgid "" |
|
12121 |
"MergeHooks\n"
|
|
12122 |
"----------"
|
|
12123 |
msgstr "" |
|
12124 |
||
12125 |
#: en/help_topics/hooks.txt:311
|
|
12126 |
msgid "" |
|
12127 |
"merge_file_content\n"
|
|
12128 |
"~~~~~~~~~~~~~~~~~~"
|
|
12129 |
msgstr "" |
|
12130 |
||
12131 |
#: en/help_topics/hooks.txt:314
|
|
12132 |
msgid "Introduced in: 2.1" |
|
12133 |
msgstr "" |
|
12134 |
||
12135 |
#: en/help_topics/hooks.txt:316
|
|
12136 |
msgid "" |
|
12137 |
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
|
|
12138 |
"object when starting a merge. Should return either None or a subclass\n"
|
|
12139 |
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
|
|
12140 |
"called per file that needs to be merged (including when one side has\n"
|
|
12141 |
"deleted the file and the other has changed it). See the\n"
|
|
12142 |
"AbstractPerFileMerger API docs for details on how it is used by merge."
|
|
12143 |
msgstr "" |
|
12144 |
||
12145 |
#: en/help_topics/hooks.txt:323
|
|
12146 |
msgid "" |
|
12147 |
"post_merge\n"
|
|
12148 |
"~~~~~~~~~~"
|
|
12149 |
msgstr "" |
|
12150 |
||
12151 |
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
|
|
12152 |
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
|
|
12153 |
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
|
|
12154 |
msgid "Introduced in: 2.5" |
|
12155 |
msgstr "" |
|
12156 |
||
12157 |
#: en/help_topics/hooks.txt:328
|
|
12158 |
msgid "" |
|
12159 |
"Called after a merge. Receives a Merger object as the single argument.\n"
|
|
12160 |
"The return value is ignored."
|
|
12161 |
msgstr "" |
|
12162 |
||
12163 |
#: en/help_topics/hooks.txt:331
|
|
12164 |
msgid "" |
|
12165 |
"pre_merge\n"
|
|
12166 |
"~~~~~~~~~"
|
|
12167 |
msgstr "" |
|
12168 |
||
12169 |
#: en/help_topics/hooks.txt:336
|
|
12170 |
msgid "" |
|
12171 |
"Called before a merge. Receives a Merger object as the single\n"
|
|
12172 |
"argument."
|
|
12173 |
msgstr "" |
|
12174 |
||
12175 |
#: en/help_topics/hooks.txt:339
|
|
12176 |
msgid "" |
|
12177 |
"MergeDirectiveHooks\n"
|
|
12178 |
"-------------------"
|
|
12179 |
msgstr "" |
|
12180 |
||
12181 |
#: en/help_topics/hooks.txt:342
|
|
12182 |
msgid "" |
|
12183 |
"merge_request_body\n"
|
|
12184 |
"~~~~~~~~~~~~~~~~~~"
|
|
12185 |
msgstr "" |
|
12186 |
||
12187 |
#: en/help_topics/hooks.txt:345
|
|
12188 |
msgid "Introduced in: 1.15.0" |
|
12189 |
msgstr "" |
|
12190 |
||
12191 |
#: en/help_topics/hooks.txt:347
|
|
12192 |
msgid "" |
|
12193 |
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
|
|
12194 |
"request. Callbacks must return a body. If more than one callback is\n"
|
|
12195 |
"registered, the output of one callback is provided to the next."
|
|
12196 |
msgstr "" |
|
12197 |
||
12198 |
#: en/help_topics/hooks.txt:351
|
|
12199 |
msgid "" |
|
12200 |
"MessageEditorHooks\n"
|
|
12201 |
"------------------"
|
|
12202 |
msgstr "" |
|
12203 |
||
12204 |
#: en/help_topics/hooks.txt:354
|
|
12205 |
msgid "" |
|
12206 |
"commit_message_template\n"
|
|
12207 |
"~~~~~~~~~~~~~~~~~~~~~~~"
|
|
12208 |
msgstr "" |
|
12209 |
||
12210 |
#: en/help_topics/hooks.txt:357
|
|
12211 |
msgid "Introduced in: 1.10" |
|
12212 |
msgstr "" |
|
12213 |
||
12214 |
#: en/help_topics/hooks.txt:359
|
|
12215 |
msgid "" |
|
12216 |
"Called when a commit message is being generated.\n"
|
|
12217 |
"commit_message_template is called with the bzrlib.commit.Commit object\n"
|
|
12218 |
"and the message that is known so far. commit_message_template must\n"
|
|
12219 |
"return a new message to use (which could be the same as it was given).\n"
|
|
12220 |
"When there are multiple hooks registered for commit_message_template,\n"
|
|
12221 |
"they are chained with the result from the first passed into the\n"
|
|
12222 |
"second, and so on."
|
|
12223 |
msgstr "" |
|
12224 |
||
12225 |
#: en/help_topics/hooks.txt:367
|
|
12226 |
msgid "" |
|
12227 |
"set_commit_message\n"
|
|
12228 |
"~~~~~~~~~~~~~~~~~~"
|
|
12229 |
msgstr "" |
|
12230 |
||
12231 |
#: en/help_topics/hooks.txt:372
|
|
12232 |
msgid "" |
|
12233 |
"Set a fixed commit message. set_commit_message is called with the\n"
|
|
12234 |
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
|
|
12235 |
"properties by editing commit.builder._revprops) and the message so\n"
|
|
12236 |
"far. set_commit_message must return the message to use or None if it\n"
|
|
12237 |
"should use the message editor as normal."
|
|
12238 |
msgstr "" |
|
12239 |
||
12240 |
#: en/help_topics/hooks.txt:378
|
|
12241 |
msgid "" |
|
12242 |
"MutableTreeHooks\n"
|
|
12243 |
"----------------"
|
|
12244 |
msgstr "" |
|
12245 |
||
12246 |
#: en/help_topics/hooks.txt:381
|
|
12247 |
msgid "" |
|
12248 |
"post_build_tree\n"
|
|
12249 |
"~~~~~~~~~~~~~~~"
|
|
12250 |
msgstr "" |
|
12251 |
||
12252 |
#: en/help_topics/hooks.txt:386
|
|
12253 |
msgid "" |
|
12254 |
"Called after a completely new tree is built. The hook is called with\n"
|
|
12255 |
"the tree as its only argument."
|
|
12256 |
msgstr "" |
|
12257 |
||
12258 |
#: en/help_topics/hooks.txt:392
|
|
12259 |
msgid "Introduced in: 2.0" |
|
12260 |
msgstr "" |
|
12261 |
||
12262 |
#: en/help_topics/hooks.txt:394
|
|
12263 |
msgid "" |
|
12264 |
"Called after a commit is performed on a tree. The hook is called with\n"
|
|
12265 |
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
|
|
12266 |
"commit was performed on is available via the mutable_tree attribute of\n"
|
|
12267 |
"that object."
|
|
12268 |
msgstr "" |
|
12269 |
||
12270 |
#: en/help_topics/hooks.txt:399
|
|
12271 |
msgid "" |
|
12272 |
"post_transform\n"
|
|
12273 |
"~~~~~~~~~~~~~~"
|
|
12274 |
msgstr "" |
|
12275 |
||
12276 |
#: en/help_topics/hooks.txt:404
|
|
12277 |
msgid "" |
|
12278 |
"Called after a tree transform has been performed on a tree. The hook\n"
|
|
12279 |
"is called with the tree that is being transformed and the transform."
|
|
12280 |
msgstr "" |
|
12281 |
||
12282 |
#: en/help_topics/hooks.txt:407
|
|
12283 |
msgid "" |
|
12284 |
"pre_transform\n"
|
|
12285 |
"~~~~~~~~~~~~~"
|
|
12286 |
msgstr "" |
|
12287 |
||
12288 |
#: en/help_topics/hooks.txt:412
|
|
12289 |
msgid "" |
|
12290 |
"Called before a tree transform on this tree. The hook is called with\n"
|
|
12291 |
"the tree that is being transformed and the transform."
|
|
12292 |
msgstr "" |
|
12293 |
||
12294 |
#: en/help_topics/hooks.txt:415
|
|
12295 |
msgid "" |
|
12296 |
"start_commit\n"
|
|
12297 |
"~~~~~~~~~~~~"
|
|
12298 |
msgstr "" |
|
12299 |
||
12300 |
#: en/help_topics/hooks.txt:420
|
|
12301 |
msgid "" |
|
12302 |
"Called before a commit is performed on a tree. The start commit hook\n"
|
|
12303 |
"is able to change the tree before the commit takes place. start_commit\n"
|
|
12304 |
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
|
|
12305 |
"being performed on."
|
|
12306 |
msgstr "" |
|
12307 |
||
12308 |
#: en/help_topics/hooks.txt:425
|
|
12309 |
msgid "" |
|
12310 |
"SmartClientHooks\n"
|
|
12311 |
"----------------"
|
|
12312 |
msgstr "" |
|
12313 |
||
12314 |
#: en/help_topics/hooks.txt:428
|
|
12315 |
msgid "" |
|
12316 |
"call\n"
|
|
12317 |
"~~~~"
|
|
12318 |
msgstr "" |
|
12319 |
||
12320 |
#: en/help_topics/hooks.txt:431
|
|
12321 |
msgid "Introduced in: unknown" |
|
12322 |
msgstr "" |
|
12323 |
||
12324 |
#: en/help_topics/hooks.txt:433
|
|
12325 |
msgid "" |
|
12326 |
"Called when the smart client is submitting a request to the smart\n"
|
|
12327 |
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
|
|
12328 |
"Streaming request bodies, and responses, are not accessible."
|
|
12329 |
msgstr "" |
|
12330 |
||
12331 |
#: en/help_topics/hooks.txt:437
|
|
12332 |
msgid "" |
|
12333 |
"SmartServerHooks\n"
|
|
12334 |
"----------------"
|
|
12335 |
msgstr "" |
|
12336 |
||
12337 |
#: en/help_topics/hooks.txt:440
|
|
12338 |
msgid "" |
|
12339 |
"server_exception\n"
|
|
12340 |
"~~~~~~~~~~~~~~~~"
|
|
12341 |
msgstr "" |
|
12342 |
||
12343 |
#: en/help_topics/hooks.txt:445
|
|
12344 |
msgid "" |
|
12345 |
"Called by the bzr server when an exception occurs. server_exception is\n"
|
|
12346 |
"called with the sys.exc_info() tuple return true for the hook if the\n"
|
|
12347 |
"exception has been handled, in which case the server will exit\n"
|
|
12348 |
"normally."
|
|
12349 |
msgstr "" |
|
12350 |
||
12351 |
#: en/help_topics/hooks.txt:450
|
|
12352 |
msgid "" |
|
12353 |
"server_started\n"
|
|
12354 |
"~~~~~~~~~~~~~~"
|
|
12355 |
msgstr "" |
|
12356 |
||
12357 |
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
|
|
12358 |
msgid "Introduced in: 0.16" |
|
12359 |
msgstr "" |
|
12360 |
||
12361 |
#: en/help_topics/hooks.txt:455
|
|
12362 |
msgid "" |
|
12363 |
"Called by the bzr server when it starts serving a directory.\n"
|
|
12364 |
"server_started is called with (backing urls, public url), where\n"
|
|
12365 |
"backing_url is a list of URLs giving the server-specific directory\n"
|
|
12366 |
"locations, and public_url is the public URL for the directory being\n"
|
|
12367 |
"served."
|
|
12368 |
msgstr "" |
|
12369 |
||
12370 |
#: en/help_topics/hooks.txt:461
|
|
12371 |
msgid "" |
|
12372 |
"server_started_ex\n"
|
|
12373 |
"~~~~~~~~~~~~~~~~~"
|
|
12374 |
msgstr "" |
|
12375 |
||
12376 |
#: en/help_topics/hooks.txt:466
|
|
12377 |
msgid "" |
|
12378 |
"Called by the bzr server when it starts serving a directory.\n"
|
|
12379 |
"server_started is called with (backing_urls, server_obj)."
|
|
12380 |
msgstr "" |
|
12381 |
||
12382 |
#: en/help_topics/hooks.txt:469
|
|
12383 |
msgid "" |
|
12384 |
"server_stopped\n"
|
|
12385 |
"~~~~~~~~~~~~~~"
|
|
12386 |
msgstr "" |
|
12387 |
||
12388 |
#: en/help_topics/hooks.txt:474
|
|
12389 |
msgid "" |
|
12390 |
"Called by the bzr server when it stops serving a directory.\n"
|
|
12391 |
"server_stopped is called with the same parameters as the\n"
|
|
12392 |
"server_started hook: (backing_urls, public_url)."
|
|
12393 |
msgstr "" |
|
12394 |
||
12395 |
#: en/help_topics/hooks.txt:478
|
|
12396 |
msgid "" |
|
12397 |
"StatusHooks\n"
|
|
12398 |
"-----------"
|
|
12399 |
msgstr "" |
|
12400 |
||
12401 |
#: en/help_topics/hooks.txt:481
|
|
12402 |
msgid "" |
|
12403 |
"post_status\n"
|
|
12404 |
"~~~~~~~~~~~"
|
|
12405 |
msgstr "" |
|
12406 |
||
12407 |
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
|
|
12408 |
msgid "Introduced in: 2.3" |
|
12409 |
msgstr "" |
|
12410 |
||
12411 |
#: en/help_topics/hooks.txt:486
|
|
12412 |
msgid "" |
|
12413 |
"Called with argument StatusHookParams after Bazaar has displayed the\n"
|
|
12414 |
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
|
|
12415 |
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
|
|
12416 |
"correspond to the command line options specified by the user for the\n"
|
|
12417 |
"status command. to_file is the output stream for writing."
|
|
12418 |
msgstr "" |
|
12419 |
||
12420 |
#: en/help_topics/hooks.txt:492
|
|
12421 |
msgid "" |
|
12422 |
"pre_status\n"
|
|
12423 |
"~~~~~~~~~~"
|
|
12424 |
msgstr "" |
|
12425 |
||
12426 |
#: en/help_topics/hooks.txt:497
|
|
12427 |
msgid "" |
|
12428 |
"Called with argument StatusHookParams before Bazaar displays the\n"
|
|
12429 |
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
|
|
12430 |
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
|
|
12431 |
"correspond to the command line options specified by the user for the\n"
|
|
12432 |
"status command. to_file is the output stream for writing."
|
|
12433 |
msgstr "" |
|
12434 |
||
12435 |
#: en/help_topics/hooks.txt:503
|
|
12436 |
msgid "" |
|
12437 |
"TransportHooks\n"
|
|
12438 |
"--------------"
|
|
12439 |
msgstr "" |
|
12440 |
||
12441 |
#: en/help_topics/hooks.txt:506
|
|
12442 |
msgid "" |
|
12443 |
"post_connect\n"
|
|
12444 |
"~~~~~~~~~~~~"
|
|
12445 |
msgstr "" |
|
12446 |
||
12447 |
#: en/help_topics/hooks.txt:511
|
|
12448 |
msgid "" |
|
12449 |
"Called after a new connection is established or a reconnect occurs.\n"
|
|
12450 |
"The sole argument passed is either the connected transport or smart\n"
|
|
12451 |
"medium instance."
|
|
12452 |
msgstr "" |
|
12453 |
||
12454 |
#: en/help_topics/hooks.txt:515
|
|
12455 |
msgid "" |
|
12456 |
"RioVersionInfoBuilderHooks\n"
|
|
12457 |
"--------------------------"
|
|
12458 |
msgstr "" |
|
12459 |
||
12460 |
#: en/help_topics/hooks.txt:518
|
|
12461 |
msgid "" |
|
12462 |
"revision\n"
|
|
12463 |
"~~~~~~~~"
|
|
12464 |
msgstr "" |
|
12465 |
||
12466 |
#: en/help_topics/hooks.txt:523
|
|
12467 |
msgid "" |
|
12468 |
"Invoked when adding information about a revision to the RIO stanza\n"
|
|
12469 |
"that is printed. revision is called with a revision object and a RIO\n"
|
|
12470 |
"stanza.\n"
|
|
12471 |
msgstr "" |
|
12472 |
||
12473 |
#: en/help_topics/location-alias.txt:1
|
|
12474 |
msgid "" |
|
12475 |
"Location aliases\n"
|
|
12476 |
"================"
|
|
12477 |
msgstr "" |
|
12478 |
||
12479 |
#: en/help_topics/location-alias.txt:4
|
|
12480 |
msgid "" |
|
12481 |
"Bazaar defines several aliases for locations associated with a branch. "
|
|
12482 |
"These\n"
|
|
12483 |
"can be used with most commands that expect a location, such as `bzr push`."
|
|
12484 |
msgstr "" |
|
12485 |
||
12486 |
#: en/help_topics/location-alias.txt:7
|
|
12487 |
msgid "The aliases are::" |
|
12488 |
msgstr "" |
|
12489 |
||
12490 |
#: en/help_topics/location-alias.txt:9
|
|
12491 |
msgid "" |
|
12492 |
" :bound The branch this branch is bound to, for bound branches.\n"
|
|
12493 |
" :parent The parent of this branch.\n"
|
|
12494 |
" :public The public location of this branch.\n"
|
|
12495 |
" :push The saved location used for `bzr push` with no arguments.\n"
|
|
12496 |
" :submit The submit branch for this branch.\n"
|
|
12497 |
" :this This branch."
|
|
12498 |
msgstr "" |
|
12499 |
||
12500 |
#: en/help_topics/location-alias.txt:16
|
|
12501 |
msgid "For example, to push to the parent location::" |
|
12502 |
msgstr "" |
|
12503 |
||
12504 |
#: en/help_topics/location-alias.txt:18
|
|
12505 |
msgid " bzr push :parent\n" |
|
12506 |
msgstr "" |
|
12507 |
||
12508 |
#: en/help_topics/log-formats.txt:1
|
|
12509 |
msgid "" |
|
12510 |
"Log Formats\n"
|
|
12511 |
"==========="
|
|
12512 |
msgstr "" |
|
12513 |
||
12514 |
#: en/help_topics/log-formats.txt:4
|
|
12515 |
msgid "" |
|
12516 |
"A log format controls how information about each revision is displayed.\n"
|
|
12517 |
"The standard log formats are compared below::"
|
|
12518 |
msgstr "" |
|
12519 |
||
12520 |
#: en/help_topics/log-formats.txt:7
|
|
12521 |
msgid "" |
|
12522 |
" Feature long short line\n"
|
|
12523 |
" ---------------------- ------------- ------------ -------------------\n"
|
|
12524 |
" design goal detailed view concise view 1 revision per line\n"
|
|
12525 |
" committer name+email name only name only\n"
|
|
12526 |
" author name+email - -\n"
|
|
12527 |
" date-time format full date only date only\n"
|
|
12528 |
" commit message full full top line\n"
|
|
12529 |
" tags yes yes yes\n"
|
|
12530 |
" merges indicator - yes -\n"
|
|
12531 |
" status/delta optional optional -\n"
|
|
12532 |
" diff/patch optional optional -\n"
|
|
12533 |
" revision-id optional optional -\n"
|
|
12534 |
" branch nick yes - -\n"
|
|
12535 |
" foreign vcs properties yes yes -\n"
|
|
12536 |
" preferred levels all 1 1\n"
|
|
12537 |
" digital signature optional - -"
|
|
12538 |
msgstr "" |
|
12539 |
||
12540 |
#: en/help_topics/log-formats.txt:24
|
|
12541 |
msgid "" |
|
12542 |
"The default format is ``long``. To change this, define the ``log_format``\n"
|
|
12543 |
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
|
|
12544 |
msgstr "" |
|
12545 |
||
12546 |
#: en/help_topics/log-formats.txt:27
|
|
12547 |
msgid "" |
|
12548 |
" [DEFAULT]\n"
|
|
12549 |
" log_format = short"
|
|
12550 |
msgstr "" |
|
12551 |
||
12552 |
#: en/help_topics/log-formats.txt:30
|
|
12553 |
msgid "" |
|
12554 |
"Alternatively, to change the log format used for a given query, use the\n"
|
|
12555 |
"--long, --short or --line options."
|
|
12556 |
msgstr "" |
|
12557 |
||
12558 |
#: en/help_topics/log-formats.txt:33
|
|
12559 |
msgid "" |
|
12560 |
"If one of the standard log formats does not meet your needs, additional\n"
|
|
12561 |
"formats can be provided by plugins.\n"
|
|
12562 |
msgstr "" |
|
12563 |
||
12564 |
#: en/help_topics/other-formats.txt:1
|
|
12565 |
msgid "Other Storage Formats" |
|
12566 |
msgstr "" |
|
12567 |
||
12568 |
#: en/help_topics/other-formats.txt:3
|
|
12569 |
msgid "Experimental formats are shown below." |
|
12570 |
msgstr "" |
|
12571 |
||
12572 |
#: en/help_topics/other-formats.txt:5
|
|
12573 |
msgid "" |
|
12574 |
":development-colo:\n"
|
|
12575 |
" (native) The 2a format with experimental support for colocated\n"
|
|
12576 |
" branches."
|
|
12577 |
msgstr "" |
|
12578 |
||
12579 |
#: en/help_topics/other-formats.txt:9
|
|
12580 |
msgid "" |
|
12581 |
"\n"
|
|
12582 |
"Deprecated formats are shown below."
|
|
12583 |
msgstr "" |
|
12584 |
||
12585 |
#: en/help_topics/other-formats.txt:12
|
|
12586 |
msgid "" |
|
12587 |
":pack-0.92:\n"
|
|
12588 |
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
|
|
12589 |
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
|
|
12590 |
" by bzr < 0.92."
|
|
12591 |
msgstr "" |
|
12592 |
||
12593 |
#: en/help_topics/patterns.txt:1
|
|
12594 |
msgid "" |
|
12595 |
"Patterns\n"
|
|
12596 |
"========"
|
|
12597 |
msgstr "" |
|
12598 |
||
12599 |
#: en/help_topics/patterns.txt:4
|
|
12600 |
msgid "" |
|
12601 |
"Bazaar uses patterns to match files at various times. For example,\n"
|
|
12602 |
"the ``add`` command skips over files that match ignore patterns\n"
|
|
12603 |
"and preferences can be associated with files using rule patterns.\n"
|
|
12604 |
"The pattern syntax is described below."
|
|
12605 |
msgstr "" |
|
12606 |
||
12607 |
#: en/help_topics/patterns.txt:9
|
|
12608 |
msgid "" |
|
12609 |
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
|
|
12610 |
"slash or is a regular expression, it is compared to the whole path\n"
|
|
12611 |
"from the branch root. Otherwise, it is compared to only the last\n"
|
|
12612 |
"component of the path. To match a file only in the root directory,\n"
|
|
12613 |
"prepend ``./``. Patterns specifying absolute paths are not allowed."
|
|
12614 |
msgstr "" |
|
12615 |
||
12616 |
#: en/help_topics/patterns.txt:15
|
|
12617 |
msgid "Patterns may include globbing wildcards such as::" |
|
12618 |
msgstr "" |
|
12619 |
||
12620 |
#: en/help_topics/patterns.txt:17
|
|
12621 |
msgid "" |
|
12622 |
" ? - Matches any single character except '/'\n"
|
|
12623 |
" * - Matches 0 or more characters except '/'\n"
|
|
12624 |
" /**/ - Matches 0 or more directories in a path\n"
|
|
12625 |
" [a-z] - Matches a single character from within a group of characters"
|
|
12626 |
msgstr "" |
|
12627 |
||
12628 |
#: en/help_topics/patterns.txt:22
|
|
12629 |
msgid "" |
|
12630 |
"Patterns may also be `Python regular expressions`_. Regular expression\n"
|
|
12631 |
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
|
|
12632 |
"expression. Regular expression patterns may not include named or\n"
|
|
12633 |
"numbered groups."
|
|
12634 |
msgstr "" |
|
12635 |
||
12636 |
#: en/help_topics/patterns.txt:27
|
|
12637 |
msgid "" |
|
12638 |
"Case insensitive ignore patterns can be specified with regular expressions\n"
|
|
12639 |
"by using the ``i`` (for ignore case) flag in the pattern."
|
|
12640 |
msgstr "" |
|
12641 |
||
12642 |
#: en/help_topics/patterns.txt:30
|
|
12643 |
msgid "" |
|
12644 |
"For example, a case insensitive match for ``foo`` may be specified as::"
|
|
12645 |
msgstr "" |
|
12646 |
||
12647 |
#: en/help_topics/patterns.txt:32
|
|
12648 |
msgid " RE:(?i)foo" |
|
12649 |
msgstr "" |
|
12650 |
||
12651 |
#: en/help_topics/patterns.txt:34
|
|
12652 |
msgid "" |
|
12653 |
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
|
|
12654 |
"matched by that pattern will not be ignored."
|
|
12655 |
msgstr "" |
|
12656 |
||
12657 |
#: en/help_topics/patterns.txt:37
|
|
12658 |
msgid "" |
|
12659 |
".. _Python regular expressions: http://docs.python.org/library/re.html"
|
|
12660 |
msgstr "" |
|
12661 |
||
12662 |
#: en/help_topics/revisionspec.txt:1
|
|
12663 |
msgid "Revision Identifiers" |
|
12664 |
msgstr "" |
|
12665 |
||
12666 |
#: en/help_topics/revisionspec.txt:3
|
|
12667 |
msgid "" |
|
12668 |
"A revision identifier refers to a specific state of a branch's history. It\n"
|
|
12669 |
"can be expressed in several ways. It can begin with a keyword to\n"
|
|
12670 |
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
|
|
12671 |
"'before:yesterday' and 'submit:'."
|
|
12672 |
msgstr "" |
|
12673 |
||
12674 |
#: en/help_topics/revisionspec.txt:8
|
|
12675 |
msgid "" |
|
12676 |
"Alternately, it can be given without a keyword, in which case it will be\n"
|
|
12677 |
"checked as a revision number, a tag, a revision id, a date specification, or "
|
|
12678 |
"a\n"
|
|
12679 |
"branch specification, in that order. For example, 'date:today' could be\n"
|
|
12680 |
"written as simply 'today', though if you have a tag called 'today' that "
|
|
12681 |
"will\n"
|
|
12682 |
"be found first."
|
|
12683 |
msgstr "" |
|
12684 |
||
12685 |
#: en/help_topics/revisionspec.txt:14
|
|
12686 |
msgid "" |
|
12687 |
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
|
|
12688 |
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
|
|
12689 |
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
|
|
12690 |
"or\n"
|
|
12691 |
"spaces around the '..')."
|
|
12692 |
msgstr "" |
|
12693 |
||
12694 |
#: en/help_topics/revisionspec.txt:19
|
|
12695 |
msgid "" |
|
12696 |
"Ranges are interpreted differently by different commands. To the \"log\" "
|
|
12697 |
"command,\n"
|
|
12698 |
"a range is a sequence of log messages, but to the \"diff\" command, the "
|
|
12699 |
"range\n"
|
|
12700 |
"denotes a change between revisions (and not a sequence of changes). In\n"
|
|
12701 |
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
|
|
12702 |
"consider it\n"
|
|
12703 |
"to be open-ended, that is, they include one end but not the other. For "
|
|
12704 |
"example:\n" |
|
12705 |
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
|
|
12706 |
"3649,\n"
|
|
12707 |
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
|
|
12708 |
"and\n"
|
|
12709 |
"3649, but not 3647."
|
|
12710 |
msgstr "" |
|
12711 |
||
12712 |
#: en/help_topics/revisionspec.txt:28
|
|
12713 |
msgid "The keywords used as revision selection methods are the following:" |
|
12714 |
msgstr "" |
|
12715 |
||
12716 |
#: en/help_topics/revisionspec.txt:30
|
|
12717 |
msgid "" |
|
12718 |
":revid:\n"
|
|
12719 |
"\tSelects a revision using the revision id.\n"
|
|
12720 |
":submit:\n"
|
|
12721 |
"\tSelects a common ancestor with the submit branch.\n"
|
|
12722 |
":ancestor:\n"
|
|
12723 |
"\tSelects a common ancestor with a second branch.\n"
|
|
12724 |
":date:\n"
|
|
12725 |
"\tSelects a revision on the basis of a datestamp.\n"
|
|
12726 |
":branch:\n"
|
|
12727 |
"\tSelects the last revision of a specified branch.\n"
|
|
12728 |
":tag:\n"
|
|
12729 |
"\tSelects a revision identified by a tag name.\n"
|
|
12730 |
":revno:\n"
|
|
12731 |
"\tSelects a revision using a number.\n"
|
|
12732 |
":before:\n"
|
|
12733 |
"\tSelects the parent of the revision specified.\n"
|
|
12734 |
":annotate:\n"
|
|
12735 |
"\tSelect the revision that last modified the specified line.\n"
|
|
12736 |
":mainline:\n"
|
|
12737 |
"\tSelect mainline revision that merged the specified revision.\n"
|
|
12738 |
":last:\n"
|
|
12739 |
"\tSelects the nth revision from the end."
|
|
12740 |
msgstr "" |
|
12741 |
||
12742 |
#: en/help_topics/revisionspec.txt:53
|
|
12743 |
msgid "In addition, plugins can provide other keywords." |
|
12744 |
msgstr "" |
|
12745 |
||
12746 |
#: en/help_topics/revisionspec.txt:55
|
|
12747 |
msgid "A detailed description of each keyword is given below." |
|
12748 |
msgstr "" |
|
12749 |
||
12750 |
#: en/help_topics/revisionspec.txt:57
|
|
12751 |
msgid ":revid:" |
|
12752 |
msgstr "" |
|
12753 |
||
12754 |
#: en/help_topics/revisionspec.txt:59
|
|
12755 |
msgid "" |
|
12756 |
" Supply a specific revision id, that can be used to specify any\n"
|
|
12757 |
" revision id in the ancestry of the branch.\n"
|
|
12758 |
" Including merges, and pending merges.\n"
|
|
12759 |
" Examples::"
|
|
12760 |
msgstr "" |
|
12761 |
||
12762 |
#: en/help_topics/revisionspec.txt:64
|
|
12763 |
msgid "" |
|
12764 |
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
|
|
12765 |
msgstr "" |
|
12766 |
||
12767 |
#: en/help_topics/revisionspec.txt:66
|
|
12768 |
msgid ":submit:" |
|
12769 |
msgstr "" |
|
12770 |
||
12771 |
#: en/help_topics/revisionspec.txt:68
|
|
12772 |
msgid "" |
|
12773 |
" Diffing against this shows all the changes that were made in this "
|
|
12774 |
"branch,\n"
|
|
12775 |
" and is a good predictor of what merge will do. The submit branch is\n"
|
|
12776 |
" used by the bundle and merge directive commands. If no submit branch\n"
|
|
12777 |
" is specified, the parent branch is used instead."
|
|
12778 |
msgstr "" |
|
12779 |
||
12780 |
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
|
|
12781 |
msgid "" |
|
12782 |
" The common ancestor is the last revision that existed in both\n"
|
|
12783 |
" branches. Usually this is the branch point, but it could also be\n"
|
|
12784 |
" a revision that was merged."
|
|
12785 |
msgstr "" |
|
12786 |
||
12787 |
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
|
|
12788 |
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
|
|
12789 |
#: en/help_topics/revisionspec.txt:153
|
|
12790 |
msgid " Examples::" |
|
12791 |
msgstr "" |
|
12792 |
||
12793 |
#: en/help_topics/revisionspec.txt:79
|
|
12794 |
msgid " $ bzr diff -r submit:" |
|
12795 |
msgstr "" |
|
12796 |
||
12797 |
#: en/help_topics/revisionspec.txt:81
|
|
12798 |
msgid ":ancestor:" |
|
12799 |
msgstr "" |
|
12800 |
||
12801 |
#: en/help_topics/revisionspec.txt:83
|
|
12802 |
msgid " Supply the path to a branch to select the common ancestor." |
|
12803 |
msgstr "" |
|
12804 |
||
12805 |
#: en/help_topics/revisionspec.txt:89
|
|
12806 |
msgid "" |
|
12807 |
" This is frequently used with 'diff' to return all of the changes\n"
|
|
12808 |
" that your branch introduces, while excluding the changes that you\n"
|
|
12809 |
" have not merged from the remote branch."
|
|
12810 |
msgstr "" |
|
12811 |
||
12812 |
#: en/help_topics/revisionspec.txt:95
|
|
12813 |
msgid "" |
|
12814 |
" ancestor:/path/to/branch\n"
|
|
12815 |
" $ bzr diff -r ancestor:../../mainline/branch"
|
|
12816 |
msgstr "" |
|
12817 |
||
12818 |
#: en/help_topics/revisionspec.txt:98
|
|
12819 |
msgid ":date:" |
|
12820 |
msgstr "" |
|
12821 |
||
12822 |
#: en/help_topics/revisionspec.txt:100
|
|
12823 |
msgid "" |
|
12824 |
" Supply a datestamp to select the first revision that matches the date.\n"
|
|
12825 |
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
|
|
12826 |
" Matches the first entry after a given date (either at midnight or\n"
|
|
12827 |
" at a specified time)."
|
|
12828 |
msgstr "" |
|
12829 |
||
12830 |
#: en/help_topics/revisionspec.txt:105
|
|
12831 |
msgid " One way to display all the changes since yesterday would be::" |
|
12832 |
msgstr "" |
|
12833 |
||
12834 |
#: en/help_topics/revisionspec.txt:107
|
|
12835 |
msgid " bzr log -r date:yesterday.." |
|
12836 |
msgstr "" |
|
12837 |
||
12838 |
#: en/help_topics/revisionspec.txt:111
|
|
12839 |
msgid "" |
|
12840 |
" date:yesterday -> select the first revision since "
|
|
12841 |
"yesterday\n"
|
|
12842 |
" date:2006-08-14,17:10:14 -> select the first revision after\n"
|
|
12843 |
" August 14th, 2006 at 5:10pm."
|
|
12844 |
msgstr "" |
|
12845 |
||
12846 |
#: en/help_topics/revisionspec.txt:115
|
|
12847 |
msgid ":branch:" |
|
12848 |
msgstr "" |
|
12849 |
||
12850 |
#: en/help_topics/revisionspec.txt:117
|
|
12851 |
msgid " Supply the path to a branch to select its last revision." |
|
12852 |
msgstr "" |
|
12853 |
||
12854 |
#: en/help_topics/revisionspec.txt:121
|
|
12855 |
msgid " branch:/path/to/branch" |
|
12856 |
msgstr "" |
|
12857 |
||
12858 |
#: en/help_topics/revisionspec.txt:123
|
|
12859 |
msgid ":tag:" |
|
12860 |
msgstr "" |
|
12861 |
||
12862 |
#: en/help_topics/revisionspec.txt:125
|
|
12863 |
msgid " Tags are stored in the branch and created by the 'tag' command." |
|
12864 |
msgstr "" |
|
12865 |
||
12866 |
#: en/help_topics/revisionspec.txt:127
|
|
12867 |
msgid ":revno:" |
|
12868 |
msgstr "" |
|
12869 |
||
12870 |
#: en/help_topics/revisionspec.txt:129
|
|
12871 |
msgid "" |
|
12872 |
" Use an integer to specify a revision in the history of the branch.\n"
|
|
12873 |
" Optionally a branch can be specified. A negative number will count\n"
|
|
12874 |
" from the end of the branch (-1 is the last revision, -2 the previous\n"
|
|
12875 |
" one). If the negative number is larger than the branch's history, the\n"
|
|
12876 |
" first revision is returned.\n"
|
|
12877 |
" Examples::"
|
|
12878 |
msgstr "" |
|
12879 |
||
12880 |
#: en/help_topics/revisionspec.txt:136
|
|
12881 |
msgid "" |
|
12882 |
" revno:1 -> return the first revision of this branch\n"
|
|
12883 |
" revno:3:/path/to/branch -> return the 3rd revision of\n"
|
|
12884 |
" the branch '/path/to/branch'\n"
|
|
12885 |
" revno:-1 -> The last revision in a branch.\n"
|
|
12886 |
" -2:http://other/branch -> The second to last revision in the\n"
|
|
12887 |
" remote branch.\n"
|
|
12888 |
" -1000000 -> Most likely the first revision, unless\n"
|
|
12889 |
" your history is very long."
|
|
12890 |
msgstr "" |
|
12891 |
||
12892 |
#: en/help_topics/revisionspec.txt:145
|
|
12893 |
msgid ":before:" |
|
12894 |
msgstr "" |
|
12895 |
||
12896 |
#: en/help_topics/revisionspec.txt:147
|
|
12897 |
msgid "" |
|
12898 |
" Supply any revision spec to return the parent of that revision. This "
|
|
12899 |
"is\n"
|
|
12900 |
" mostly useful when inspecting revisions that are not in the revision "
|
|
12901 |
"history\n"
|
|
12902 |
" of a branch."
|
|
12903 |
msgstr "" |
|
12904 |
||
12905 |
#: en/help_topics/revisionspec.txt:151
|
|
12906 |
msgid "" |
|
12907 |
" It is an error to request the parent of the null revision (before:0)."
|
|
12908 |
msgstr "" |
|
12909 |
||
12910 |
#: en/help_topics/revisionspec.txt:155
|
|
12911 |
msgid "" |
|
12912 |
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
|
|
12913 |
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
|
|
12914 |
" aaaa@bbbb-1234567890\n"
|
|
12915 |
" bzr diff -r before:1913..1913\n"
|
|
12916 |
" -> Find the changes between revision 1913 and its parent "
|
|
12917 |
"(1912).\n"
|
|
12918 |
" (What changes did revision 1913 introduce).\n"
|
|
12919 |
" This is equivalent to: bzr diff -c 1913"
|
|
12920 |
msgstr "" |
|
12921 |
||
12922 |
#: en/help_topics/revisionspec.txt:163
|
|
12923 |
msgid ":annotate:" |
|
12924 |
msgstr "" |
|
12925 |
||
12926 |
#: en/help_topics/revisionspec.txt:165
|
|
12927 |
msgid "" |
|
12928 |
" Select the revision that last modified the specified line. Line is\n"
|
|
12929 |
" specified as path:number. Path is a relative path to the file. "
|
|
12930 |
"Numbers\n"
|
|
12931 |
" start at 1, and are relative to the current version, not the last-\n"
|
|
12932 |
" committed version of the file."
|
|
12933 |
msgstr "" |
|
12934 |
||
12935 |
#: en/help_topics/revisionspec.txt:170
|
|
12936 |
msgid ":mainline:" |
|
12937 |
msgstr "" |
|
12938 |
||
12939 |
#: en/help_topics/revisionspec.txt:172
|
|
12940 |
msgid "" |
|
12941 |
" Select the revision that merged the specified revision into mainline."
|
|
12942 |
msgstr "" |
|
12943 |
||
12944 |
#: en/help_topics/revisionspec.txt:174
|
|
12945 |
msgid ":last:" |
|
12946 |
msgstr "" |
|
12947 |
||
12948 |
#: en/help_topics/revisionspec.txt:176
|
|
12949 |
msgid "" |
|
12950 |
" Supply a positive number to get the nth revision from the end.\n"
|
|
12951 |
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
|
|
12952 |
" Examples::"
|
|
12953 |
msgstr "" |
|
12954 |
||
12955 |
#: en/help_topics/revisionspec.txt:180
|
|
12956 |
msgid "" |
|
12957 |
" last:1 -> return the last revision\n"
|
|
12958 |
" last:3 -> return the revision 2 before the end.\n"
|
|
12959 |
msgstr "" |
|
12960 |
||
12961 |
#: en/help_topics/rules.txt:1
|
|
12962 |
msgid "" |
|
12963 |
"Rules\n"
|
|
12964 |
"====="
|
|
12965 |
msgstr "" |
|
12966 |
||
12967 |
#: en/help_topics/rules.txt:7
|
|
12968 |
msgid "" |
|
12969 |
"Rules are defined in ini file format where the sections are file glob\n"
|
|
12970 |
"patterns and the contents of each section are the preferences for files\n"
|
|
12971 |
"matching that pattern(s). For example::"
|
|
12972 |
msgstr "" |
|
12973 |
||
12974 |
#: en/help_topics/rules.txt:11
|
|
12975 |
msgid "" |
|
12976 |
" [name *.bat]\n"
|
|
12977 |
" eol = native"
|
|
12978 |
msgstr "" |
|
12979 |
||
12980 |
#: en/help_topics/rules.txt:14
|
|
12981 |
msgid "" |
|
12982 |
" [name *.html *.xml]\n"
|
|
12983 |
" keywords = xml_escape"
|
|
12984 |
msgstr "" |
|
12985 |
||
12986 |
#: en/help_topics/rules.txt:17
|
|
12987 |
msgid "" |
|
12988 |
"Preferences like these are useful for commands and plugins wishing to\n"
|
|
12989 |
"provide custom behaviour for selected files. For more information on \n"
|
|
12990 |
"end of line conversion see :doc:`eol-help`.\n"
|
|
12991 |
"Keyword support is provided by the `keywords plugin\n"
|
|
12992 |
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
|
|
12993 |
msgstr "" |
|
12994 |
||
12995 |
#: en/help_topics/rules.txt:23
|
|
12996 |
msgid "" |
|
12997 |
"Files\n"
|
|
12998 |
"-----"
|
|
12999 |
msgstr "" |
|
13000 |
||
13001 |
#: en/help_topics/rules.txt:26
|
|
13002 |
msgid "" |
|
13003 |
"Default rules for all branches are defined in the optional file\n"
|
|
13004 |
"``BZR_HOME/rules``. "
|
|
13005 |
msgstr "" |
|
13006 |
||
13007 |
#: en/help_topics/rules.txt:29
|
|
13008 |
msgid "" |
|
13009 |
"Rule Patterns\n"
|
|
13010 |
"-------------"
|
|
13011 |
msgstr "" |
|
13012 |
||
13013 |
#: en/help_topics/rules.txt:32
|
|
13014 |
msgid "" |
|
13015 |
"Patterns are ordered and searching stops as soon as one matches.\n"
|
|
13016 |
"As a consequence, more explicit patterns should be placed towards\n"
|
|
13017 |
"the top of the file. Rule patterns use exactly the same conventions\n"
|
|
13018 |
"as ignore patterns. See :doc:`patterns-help` for details."
|
|
13019 |
msgstr "" |
|
13020 |
||
13021 |
#: en/help_topics/rules.txt:37
|
|
13022 |
msgid ".. note::" |
|
13023 |
msgstr "" |
|
13024 |
||
13025 |
#: en/help_topics/rules.txt:39
|
|
13026 |
msgid "" |
|
13027 |
" Patterns containing square brackets or spaces should be\n"
|
|
13028 |
" surrounded in quotes to ensure they are correctly parsed.\n"
|
|
13029 |
msgstr "" |
|
13030 |
||
13031 |
#: en/help_topics/topics.txt:1
|
|
13032 |
msgid "" |
|
13033 |
"authentication Information on configuring authentication\n"
|
|
13034 |
"basic Basic commands\n"
|
|
13035 |
"branches Information on what a branch is\n"
|
|
13036 |
"bugs Bug tracker settings\n"
|
|
13037 |
"checkouts Information on what a checkout is\n"
|
|
13038 |
"commands Basic help for all commands\n"
|
|
13039 |
"configuration Details on the configuration settings available\n"
|
|
13040 |
"conflict-types Types of conflicts and what to do about them\n"
|
|
13041 |
"content-filters Conversion of content into/from working trees\n"
|
|
13042 |
"criss-cross Information on criss-cross merging\n"
|
|
13043 |
"current-formats Current storage formats\n"
|
|
13044 |
"debug-flags Options to show or record debug information\n"
|
|
13045 |
"diverged-branches How to fix diverged branches\n"
|
|
13046 |
"env-variables Environment variable names and values\n"
|
|
13047 |
"eol Information on end-of-line handling\n"
|
|
13048 |
"files Information on configuration and log files\n"
|
|
13049 |
"formats Information on choosing a storage format\n"
|
|
13050 |
"global-options Options that control how Bazaar runs\n"
|
|
13051 |
"hidden-commands All hidden commands\n"
|
|
13052 |
"hooks Points at which custom processing can be added\n"
|
|
13053 |
"launchpad Using Bazaar with Launchpad.net\n"
|
|
13054 |
"location-alias Aliases for remembered locations\n"
|
|
13055 |
"log-formats Details on the logging formats available\n"
|
|
13056 |
"other-formats Experimental and deprecated storage formats\n"
|
|
13057 |
"patterns Information on the pattern syntax\n"
|
|
13058 |
"repositories Basic information on shared repositories.\n"
|
|
13059 |
"revisionspec Explain how to use --revision\n"
|
|
13060 |
"rules Information on defining rule-based preferences\n"
|
|
13061 |
"standalone-trees Information on what a standalone tree is\n"
|
|
13062 |
"standard-options Options that can be used with any command\n"
|
|
13063 |
"status-flags Help on status flags\n"
|
|
13064 |
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
|
|
13065 |
"topics Topics list\n"
|
|
13066 |
"url-special-chars Special character handling in URLs\n"
|
|
13067 |
"urlspec Supported transport protocols\n"
|
|
13068 |
"working-trees Information on working trees\n"
|
|
13069 |
msgstr "" |
|
13070 |
||
13071 |
#: en/help_topics/url-special-chars.txt:1
|
|
13072 |
msgid "" |
|
13073 |
"Special character handling in URLs\n"
|
|
13074 |
"=================================="
|
|
13075 |
msgstr "" |
|
13076 |
||
13077 |
#: en/help_topics/url-special-chars.txt:4
|
|
13078 |
msgid "Bazaar allows locations to be specified in multiple ways, either:" |
|
13079 |
msgstr "" |
|
13080 |
||
13081 |
#: en/help_topics/url-special-chars.txt:6
|
|
13082 |
msgid " * Fully qualified URLs" |
|
13083 |
msgstr "" |
|
13084 |
||
13085 |
#: en/help_topics/url-special-chars.txt:8
|
|
13086 |
msgid " * File system paths, relative or absolute" |
|
13087 |
msgstr "" |
|
13088 |
||
13089 |
#: en/help_topics/url-special-chars.txt:10
|
|
13090 |
msgid "" |
|
13091 |
"Internally bzr treats all locations as URLs. For any file system paths\n"
|
|
13092 |
"that are specified it will automatically determine the appropriate URL\n"
|
|
13093 |
"representation, and escape special characters where necessary."
|
|
13094 |
msgstr "" |
|
13095 |
||
13096 |
#: en/help_topics/url-special-chars.txt:14
|
|
13097 |
msgid "" |
|
13098 |
"There are a few characters which have special meaning in URLs and need "
|
|
13099 |
"careful\n"
|
|
13100 |
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
|
|
13101 |
"value in URLs. Any non-ASCII characters in a file path will automatically "
|
|
13102 |
"be\n"
|
|
13103 |
"urlencoded when the path is converted to a URL."
|
|
13104 |
msgstr "" |
|
13105 |
||
13106 |
#: en/help_topics/url-special-chars.txt:19
|
|
13107 |
msgid "" |
|
13108 |
"URLs represent non-ASCII characters in an encoding defined by the server, "
|
|
13109 |
"but\n"
|
|
13110 |
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
|
|
13111 |
"be\n"
|
|
13112 |
"generous in what it accepts as a URL and to print them in a way that\n"
|
|
13113 |
"will be readable."
|
|
13114 |
msgstr "" |
|
13115 |
||
13116 |
#: en/help_topics/url-special-chars.txt:24
|
|
13117 |
msgid "" |
|
13118 |
"For example, if you have a directory named '/tmp/%2False' these are all "
|
|
13119 |
"valid\n"
|
|
13120 |
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
|
|
13121 |
"slash)::"
|
|
13122 |
msgstr "" |
|
13123 |
||
13124 |
#: en/help_topics/url-special-chars.txt:27
|
|
13125 |
msgid "" |
|
13126 |
" cd /tmp\n"
|
|
13127 |
" bzr log /tmp/%2False\n"
|
|
13128 |
" bzr log %2False\n"
|
|
13129 |
" bzr log file:///tmp/%252False\n"
|
|
13130 |
" bzr log file://localhost/tmp/%252False\n"
|
|
13131 |
" bzr log file:%252False"
|
|
13132 |
msgstr "" |
|
13133 |
||
13134 |
#: en/help_topics/url-special-chars.txt:34
|
|
13135 |
msgid "These are valid but do not refer to the same file::" |
|
13136 |
msgstr "" |
|
13137 |
||
13138 |
#: en/help_topics/url-special-chars.txt:36
|
|
13139 |
msgid "" |
|
13140 |
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
|
|
13141 |
" bzr log %252False (refers to a file called /tmp/%252False)"
|
|
13142 |
msgstr "" |
|
13143 |
||
13144 |
#: en/help_topics/url-special-chars.txt:39
|
|
13145 |
msgid "" |
|
13146 |
"Comma also has special meaning in URLs, because it denotes `segment "
|
|
13147 |
"parameters`_"
|
|
13148 |
msgstr "" |
|
13149 |
||
13150 |
#: en/help_topics/url-special-chars.txt:41
|
|
13151 |
msgid "" |
|
13152 |
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
|
|
13153 |
msgstr "" |
|
13154 |
||
13155 |
#: en/help_topics/url-special-chars.txt:43
|
|
13156 |
msgid "" |
|
13157 |
"Comma is also special in any file system paths that are specified. To use a "
|
|
13158 |
"literal\n"
|
|
13159 |
"comma in a file system path, specify a URL and URL encode the comma::"
|
|
13160 |
msgstr "" |
|
13161 |
||
13162 |
#: en/help_topics/url-special-chars.txt:46
|
|
13163 |
msgid "" |
|
13164 |
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
|
|
13165 |
"\"branch\" set to \"bla\"\n"
|
|
13166 |
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
|
|
13167 |
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
|
|
13168 |
"\"branch\" set to \"bla\"\n"
|
|
13169 |
msgstr "" |
|
13170 |
||
13171 |
#: en/help_topics/urlspec.txt:1
|
|
13172 |
msgid "URL Identifiers" |
|
13173 |
msgstr "" |
|
13174 |
||
13175 |
#: en/help_topics/urlspec.txt:3
|
|
13176 |
msgid "Supported URL prefixes::" |
|
13177 |
msgstr "" |
|
13178 |
||
13179 |
#: en/help_topics/urlspec.txt:5
|
|
13180 |
msgid "" |
|
13181 |
" aftp:// Access using active FTP.\n"
|
|
13182 |
" bzr:// Fast access using the Bazaar smart server.\n"
|
|
13183 |
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
|
|
13184 |
" file:// Access using the standard filesystem (default)\n"
|
|
13185 |
" ftp:// Access using passive FTP.\n"
|
|
13186 |
" http:// Read-only access of branches exported on the web.\n"
|
|
13187 |
" https:// Read-only access of branches exported on the web using "
|
|
13188 |
"SSL.\n"
|
|
13189 |
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
|
|
13190 |
msgstr "" |
|
13191 |
||
13192 |
#: en/help_topics/urlspec.txt:14
|
|
13193 |
msgid "Supported modifiers::" |
|
13194 |
msgstr "" |
|
13195 |
||
13196 |
#: en/help_topics/urlspec.txt:16
|
|
13197 |
msgid " gio+ Access using any GIO supported protocols." |
|
13198 |
msgstr "" |
|
13199 |
||
13200 |
#: en/help_topics/urlspec.txt:18
|
|
13201 |
msgid "Bazaar supports all of the standard parts within the URL::" |
|
13202 |
msgstr "" |
|
13203 |
||
13204 |
#: en/help_topics/urlspec.txt:20
|
|
13205 |
msgid " <protocol>://[user[:password]@]host[:port]/[path]" |
|
13206 |
msgstr "" |
|
13207 |
||
13208 |
#: en/help_topics/urlspec.txt:22
|
|
13209 |
msgid "allowing URLs such as::" |
|
13210 |
msgstr "" |
|
13211 |
||
13212 |
#: en/help_topics/urlspec.txt:24
|
|
13213 |
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk" |
|
13214 |
msgstr "" |
|
13215 |
||
13216 |
#: en/help_topics/urlspec.txt:26
|
|
13217 |
msgid "" |
|
13218 |
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
|
|
13219 |
"with '~' as meaning that the rest of the path should be interpreted\n"
|
|
13220 |
"relative to the remote user's home directory. For example if the user\n"
|
|
13221 |
"``remote`` has a home directory of ``/home/remote`` on the server\n"
|
|
13222 |
"shell.example.com, then::"
|
|
13223 |
msgstr "" |
|
13224 |
||
13225 |
#: en/help_topics/urlspec.txt:32
|
|
13226 |
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk" |
|
13227 |
msgstr "" |
|
13228 |
||
13229 |
#: en/help_topics/urlspec.txt:34
|
|
13230 |
msgid "would refer to ``/home/remote/myproject/trunk``." |
|
13231 |
msgstr "" |
|
13232 |
||
13233 |
#: en/help_topics/urlspec.txt:36
|
|
13234 |
msgid "" |
|
13235 |
"Many commands that accept URLs also accept location aliases too.\n"
|
|
13236 |
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
|
|
13237 |
msgstr "" |