« back to all changes in this revision
Viewing changes to po/en_GB.po
- browse files at revision 6581.1.1
- compare with another revision
- compare with revision 6578
- download diff
- download tarball
- view history from revision 6581.1.1
- Committer: Vincent Ladeuil
- Date: 2013-07-27 10:54:05 UTC
- mfrom: (6093.4.218 bzr)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: v.ladeuil+lp@free.fr-20130727105405-387zagx5ek6yprb1
Update translations
added
removed
po/en_GB.po
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
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-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-01-17 10:28+0000\n"
12
"Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
13
13
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:34+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
20
21
#: bzrlib/add.py:95
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
24
25
#: bzrlib/branch.py:872
25
#: bzrlib/branch.py:854
26
26
msgid "Unstacking"
27
27
msgstr "Unstacking"
28
28
29
#: bzrlib/branch.py:3205
29
#: bzrlib/branch.py:2955
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr "Pushed up to revision %d."
33
33
34
#: bzrlib/branch.py:3207
34
#: bzrlib/branch.py:2957
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] "%d tag updated."
39
39
msgstr[1] "%d tags updated."
40
40
41
#: bzrlib/branch.py:3210
41
#: bzrlib/branch.py:2960
42
42
msgid "No new revisions or tags to push."
43
43
msgstr "No new revisions or tags to push."
44
44
45
#: bzrlib/branch.py:3212
45
#: bzrlib/branch.py:2962
46
46
msgid "No new revisions to push."
47
47
msgstr "No new revisions to push."
48
48
49
#: bzrlib/branch.py:3232
49
#: bzrlib/branch.py:2982
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr "checked branch {0} format {1}"
52
52
53
#: bzrlib/branch.py:3235
53
#: bzrlib/branch.py:2985
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr "found error:%s"
57
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr "Ignoring files outside view. View is %s"
62
62
63
#: bzrlib/builtins.py:218
63
#: bzrlib/builtins.py:260
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
67
68
#: bzrlib/builtins.py:303
68
#: bzrlib/builtins.py:315
69
69
msgid "Display status summary."
70
70
msgstr "Display status summary."
71
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
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
87
88
#: bzrlib/builtins.py:311
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:315
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
109
79
110
80
#: bzrlib/builtins.py:320
111
81
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
114
84
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
117
87
118
88
#: bzrlib/builtins.py:323
119
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:327
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
109
110
#: bzrlib/builtins.py:332
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
118
#: bzrlib/builtins.py:335
119
msgid ""
120
120
"kind changed\n"
121
121
" File kind has been changed (e.g. from file to directory)."
122
122
msgstr ""
123
123
"type changed\n"
124
124
" File type has been changed (e.g. from file to directory)."
125
125
126
#: bzrlib/builtins.py:326
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
134
#: bzrlib/builtins.py:329
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
145
146
#: bzrlib/builtins.py:334
126
#: bzrlib/builtins.py:338
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
134
#: bzrlib/builtins.py:341
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
145
146
#: bzrlib/builtins.py:346
147
147
msgid ""
148
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
149
"changes to file texts, use 'bzr diff'."
151
151
"To see ignored files, use 'bzr ignored'. For details on the\n"
152
152
"changes to file texts, use 'bzr diff'."
153
153
154
#: bzrlib/builtins.py:337
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
163
164
#: bzrlib/builtins.py:341
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
175
176
#: bzrlib/builtins.py:346
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
187
188
#: bzrlib/builtins.py:351
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:354
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
154
#: bzrlib/builtins.py:349
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
163
164
#: bzrlib/builtins.py:353
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
175
176
#: bzrlib/builtins.py:358
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
205
187
206
188
#: bzrlib/builtins.py:363
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:366
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
205
206
#: bzrlib/builtins.py:375
207
207
msgid "Use short status indicators."
208
208
msgstr "Use short status indicators."
209
209
210
#: bzrlib/builtins.py:365
210
#: bzrlib/builtins.py:377
211
211
msgid "Only show versioned files."
212
212
msgstr "Only show versioned files."
213
213
214
#: bzrlib/builtins.py:367
214
#: bzrlib/builtins.py:379
215
215
msgid "Don't show pending merges."
216
216
msgstr "Don't show pending merges."
217
217
218
#: bzrlib/builtins.py:370
218
#: bzrlib/builtins.py:382
219
219
msgid "Do not mark object type using indicator."
220
220
msgstr "Do not mark object type using indicator."
221
221
222
#: bzrlib/builtins.py:385
222
#: bzrlib/builtins.py:397
223
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
225
225
226
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
227
227
msgid "You can only supply one of revision_id or --revision"
228
228
msgstr "You can only supply one of revision_id or --revision"
229
229
230
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
231
231
msgid "You must supply either --revision or a revision_id"
232
msgstr ""
232
msgstr "You must supply either --revision or a revision_id"
233
233
234
#: bzrlib/builtins.py:439
234
#: bzrlib/builtins.py:451
235
235
#, python-format
236
236
msgid "Repository %r does not support access to raw revision texts"
237
msgstr ""
237
msgstr "Repository %r does not support access to raw revision texts"
238
238
239
#: bzrlib/builtins.py:450
239
#: bzrlib/builtins.py:462
240
240
msgid "The repository {0} contains no revision {1}."
241
msgstr ""
241
msgstr "The repository {0} contains no revision {1}."
242
242
243
#: bzrlib/builtins.py:457
243
#: bzrlib/builtins.py:469
244
244
msgid "You cannot specify a NULL revision."
245
245
msgstr "You cannot specify a NULL revision."
246
246
247
#: bzrlib/builtins.py:549
247
#: bzrlib/builtins.py:561
248
248
msgid "Remove the working tree from a given branch/checkout."
249
msgstr ""
249
msgstr "Remove the working tree from a given branch/checkout."
250
250
251
#: bzrlib/builtins.py:551
251
#: bzrlib/builtins.py:563
252
252
msgid ""
253
253
"Since a lightweight checkout is little more than a working tree\n"
254
254
"this will refuse to run against one."
255
255
msgstr ""
256
"Since a lightweight checkout is little more than a working tree,\n"
257
"this will refuse to run against one."
256
258
257
#: bzrlib/builtins.py:554
259
#: bzrlib/builtins.py:566
258
260
msgid "To re-create the working tree, use \"bzr checkout\"."
259
msgstr ""
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
260
262
261
#: bzrlib/builtins.py:560
263
#: bzrlib/builtins.py:572
262
264
msgid ""
263
265
"Remove the working tree even if it has uncommitted or shelved changes."
264
266
msgstr ""
265
267
"Remove the working tree even if it has uncommitted or shelved changes."
266
268
267
#: bzrlib/builtins.py:574
269
#: bzrlib/builtins.py:586
268
270
msgid "No working tree to remove"
269
msgstr ""
271
msgstr "No working tree to remove"
270
272
271
#: bzrlib/builtins.py:576
273
#: bzrlib/builtins.py:588
272
274
msgid "You cannot remove the working tree of a remote path"
273
275
msgstr "You cannot remove the working tree of a remote path"
274
276
275
#: bzrlib/builtins.py:585
277
#: bzrlib/builtins.py:597
276
278
msgid "You cannot remove the working tree from a lightweight checkout"
277
279
msgstr "You cannot remove the working tree from a lightweight checkout"
278
280
279
#: bzrlib/builtins.py:625
280
msgid ""
281
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
282
"instead. Use \"--force\" if you are sure you want to reset the working tree."
283
msgstr ""
284
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
285
"instead. Use \"--force\" if you are sure you want to reset the working tree."
286
287
#: bzrlib/builtins.py:636
288
msgid ""
289
", the header appears corrupt, try passing -r -1 to set the state to the last "
290
"commit"
291
msgstr ""
292
293
#: bzrlib/builtins.py:640
281
#: bzrlib/builtins.py:637
282
msgid ""
283
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
284
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
msgstr ""
286
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
287
"instead. Use \"--force\" if you are sure you want to reset the working tree."
288
289
#: bzrlib/builtins.py:648
290
msgid ""
291
", the header appears corrupt, try passing -r -1 to set the state to the last "
292
"commit"
293
msgstr ""
294
", the header appears corrupt, try passing -r -1 to set the state to the last "
295
"commit"
296
297
#: bzrlib/builtins.py:652
294
298
msgid "failed to reset the tree state{0}"
295
299
msgstr "failed to reset the tree state{0}"
296
300
297
#: bzrlib/builtins.py:644
301
#: bzrlib/builtins.py:656
298
302
msgid "Show current revision number."
299
303
msgstr "Show current revision number."
300
304
301
#: bzrlib/builtins.py:646
305
#: bzrlib/builtins.py:658
302
306
msgid "This is equal to the number of revisions on this branch."
303
msgstr ""
307
msgstr "This is equal to the number of revisions on this branch."
304
308
305
#: bzrlib/builtins.py:659
309
#: bzrlib/builtins.py:671
306
310
msgid "--tree and --revision can not be used together"
307
msgstr ""
311
msgstr "--tree and --revision can not be used together"
308
312
309
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
313
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
310
314
msgid "Tags can only be placed on a single revision, not on a range"
311
msgstr ""
315
msgstr "Tags can only be placed on a single revision, not on a range"
312
316
313
#: bzrlib/builtins.py:700
317
#: bzrlib/builtins.py:712
314
318
msgid "Show revno of working tree."
315
319
msgstr "Show revno of working tree."
316
320
317
#: bzrlib/builtins.py:748
321
#: bzrlib/builtins.py:760
318
322
msgid "Add specified files or directories."
319
323
msgstr "Add specified files or directories."
320
324
321
#: bzrlib/builtins.py:750
325
#: bzrlib/builtins.py:762
322
326
msgid ""
323
327
"In non-recursive mode, all the named items are added, regardless\n"
324
328
"of whether they were previously ignored. A warning is given if\n"
325
329
"any of the named files are already versioned."
326
330
msgstr ""
331
"In non-recursive mode, all the named items are added, regardless\n"
332
"of whether they were previously ignored. A warning is given if\n"
333
"any of the named files are already versioned."
327
334
328
#: bzrlib/builtins.py:754
335
#: bzrlib/builtins.py:766
329
336
msgid ""
330
337
"In recursive mode (the default), files are treated the same way\n"
331
338
"but the behaviour for directories is different. Directories that\n"
336
343
"directories. If no names are given '.' is assumed."
337
344
msgstr ""
338
345
339
#: bzrlib/builtins.py:762
340
msgid ""
341
"A warning will be printed when nested trees are encountered,\n"
342
"unless they are explicitly ignored."
343
msgstr ""
344
345
#: bzrlib/builtins.py:765
346
msgid ""
347
"Therefore simply saying 'bzr add' will version all files that\n"
348
"are currently unknown."
349
msgstr ""
350
351
#: bzrlib/builtins.py:768
346
#: bzrlib/builtins.py:774
347
msgid ""
348
"A warning will be printed when nested trees are encountered,\n"
349
"unless they are explicitly ignored."
350
msgstr ""
351
"A warning will be printed when nested trees are encountered,\n"
352
"unless they are explicitly ignored."
353
354
#: bzrlib/builtins.py:777
355
msgid ""
356
"Therefore simply saying 'bzr add' will version all files that\n"
357
"are currently unknown."
358
msgstr ""
359
"Therefore simply saying 'bzr add' will version all files that\n"
360
"are currently unknown."
361
362
#: bzrlib/builtins.py:780
352
363
msgid ""
353
364
"Adding a file whose parent directory is not versioned will\n"
354
365
"implicitly add the parent, and so on up to the root. This means\n"
356
367
"get added when you add a file in the directory."
357
368
msgstr ""
358
369
359
#: bzrlib/builtins.py:773
370
#: bzrlib/builtins.py:785
360
371
msgid ""
361
372
"--dry-run will show which files would be added, but not actually\n"
362
373
"add them."
364
375
"--dry-run will show which files would be added, but not actually\n"
365
376
"add them."
366
377
367
#: bzrlib/builtins.py:776
378
#: bzrlib/builtins.py:788
368
379
msgid ""
369
380
"--file-ids-from will try to use the file ids from the supplied path.\n"
370
381
"It looks up ids trying to find a matching parent directory with the\n"
375
386
"into a subdirectory of this one."
376
387
msgstr ""
377
388
378
#: bzrlib/builtins.py:784
379
msgid ""
380
"Any files matching patterns in the ignore list will not be added\n"
381
"unless they are explicitly mentioned."
382
msgstr ""
383
384
#: bzrlib/builtins.py:787
385
msgid ""
386
"In recursive mode, files larger than the configuration option \n"
387
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
388
"to file size."
389
msgstr ""
390
391
#: bzrlib/builtins.py:794
389
#: bzrlib/builtins.py:796
390
msgid ""
391
"Any files matching patterns in the ignore list will not be added\n"
392
"unless they are explicitly mentioned."
393
msgstr ""
394
"Any files matching patterns in the ignore list will not be added\n"
395
"unless they are explicitly mentioned."
396
397
#: bzrlib/builtins.py:799
398
msgid ""
399
"In recursive mode, files larger than the configuration option \n"
400
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
401
"to file size."
402
msgstr ""
403
"In recursive mode, files larger than the configuration option \n"
404
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
405
"to file size."
406
407
#: bzrlib/builtins.py:806
392
408
msgid "Don't recursively add the contents of directories."
393
msgstr ""
409
msgstr "Do not recursively add the contents of directories."
394
410
395
#: bzrlib/builtins.py:800
411
#: bzrlib/builtins.py:813
396
412
msgid "Lookup file ids from this tree."
397
413
msgstr "Lookup file ids from this tree."
398
414
399
#: bzrlib/builtins.py:836
415
#: bzrlib/builtins.py:849
400
416
msgid "ignored {0} matching \"{1}\"\n"
401
msgstr ""
417
msgstr "ignored {0} matching \"{1}\"\n"
402
418
403
#: bzrlib/builtins.py:841
419
#: bzrlib/builtins.py:854
404
420
msgid "Create a new versioned directory."
405
421
msgstr "Create a new versioned directory."
406
422
407
#: bzrlib/builtins.py:843
423
#: bzrlib/builtins.py:856
408
424
msgid "This is equivalent to creating the directory and then adding it."
409
msgstr ""
425
msgstr "This is equivalent to creating the directory and then adding it."
410
426
411
#: bzrlib/builtins.py:850
427
#: bzrlib/builtins.py:863
412
428
msgid "No error if existing, make parent directories as needed."
413
429
msgstr "No error if existing, make parent directories as needed."
414
430
415
#: bzrlib/builtins.py:884
431
#: bzrlib/builtins.py:897
416
432
#, python-format
417
433
msgid "added %s\n"
418
msgstr ""
434
msgstr "added %s\n"
419
435
420
#: bzrlib/builtins.py:926
436
#: bzrlib/builtins.py:939
421
437
#, python-format
422
438
msgid "invalid kind %r specified"
423
439
msgstr "invalid type %r specified"
424
440
425
#: bzrlib/builtins.py:963
441
#: bzrlib/builtins.py:976
426
442
msgid "Move or rename a file."
427
443
msgstr "Move or rename a file."
428
444
429
#: bzrlib/builtins.py:965
445
#: bzrlib/builtins.py:978
430
446
msgid " bzr mv SOURCE... DESTINATION"
431
447
msgstr " bzr mv SOURCE... DESTINATION"
432
448
433
#: bzrlib/builtins.py:967
434
msgid ""
435
"If the last argument is a versioned directory, all the other names\n"
436
"are moved into it. Otherwise, there must be exactly two arguments\n"
437
"and the file is changed to a new name."
438
msgstr ""
439
440
#: bzrlib/builtins.py:971
441
msgid ""
442
"If OLDNAME does not exist on the filesystem but is versioned and\n"
443
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
444
"assumes that the file has been manually moved and only updates\n"
445
"its internal inventory to reflect that change.\n"
446
"The same is valid when moving many SOURCE files to a DESTINATION."
447
msgstr ""
448
449
#: bzrlib/builtins.py:977
449
#: bzrlib/builtins.py:980
450
msgid ""
451
"If the last argument is a versioned directory, all the other names\n"
452
"are moved into it. Otherwise, there must be exactly two arguments\n"
453
"and the file is changed to a new name."
454
msgstr ""
455
"If the last argument is a versioned directory, all the other names\n"
456
"are moved into it. Otherwise, there must be exactly two arguments\n"
457
"and the file is changed to a new name."
458
459
#: bzrlib/builtins.py:984
460
msgid ""
461
"If OLDNAME does not exist on the filesystem but is versioned and\n"
462
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
463
"assumes that the file has been manually moved and only updates\n"
464
"its internal inventory to reflect that change.\n"
465
"The same is valid when moving many SOURCE files to a DESTINATION."
466
msgstr ""
467
"If OLDNAME does not exist on the filesystem but is versioned and\n"
468
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
469
"assumes that the file has been manually moved and only updates\n"
470
"its internal inventory to reflect that change.\n"
471
"The same is valid when moving many SOURCE files to a DESTINATION."
472
473
#: bzrlib/builtins.py:990
450
474
msgid "Files cannot be moved between branches."
451
475
msgstr "Files cannot be moved between branches."
452
476
453
#: bzrlib/builtins.py:984
477
#: bzrlib/builtins.py:997
454
478
msgid ""
455
479
"Move only the bzr identifier of the file, because the file has already been "
456
480
"moved."
457
481
msgstr ""
482
"Move only the bzr identifier of the file, because the file has already been "
483
"moved."
458
484
459
#: bzrlib/builtins.py:986
485
#: bzrlib/builtins.py:999
460
486
msgid "Automatically guess renames."
461
487
msgstr "Automatically guess renames."
462
488
463
#: bzrlib/builtins.py:987
489
#: bzrlib/builtins.py:1000
464
490
msgid "Avoid making changes when guessing renames."
465
491
msgstr "Avoid making changes when guessing renames."
466
492
467
#: bzrlib/builtins.py:996
493
#: bzrlib/builtins.py:1009
468
494
msgid "--dry-run requires --auto."
469
msgstr ""
495
msgstr "--dry-run requires --auto."
470
496
471
#: bzrlib/builtins.py:1000
497
#: bzrlib/builtins.py:1013
472
498
msgid "missing file argument"
473
499
msgstr "missing file argument"
474
500
475
#: bzrlib/builtins.py:1004
501
#: bzrlib/builtins.py:1017
476
502
msgid "can not move root of branch"
477
503
msgstr "cannot move root of branch"
478
504
479
#: bzrlib/builtins.py:1010
505
#: bzrlib/builtins.py:1023
480
506
msgid "Only one path may be specified to --auto."
481
msgstr ""
507
msgstr "Only one path may be specified to --auto."
482
508
483
#: bzrlib/builtins.py:1013
509
#: bzrlib/builtins.py:1026
484
510
msgid "--after cannot be specified with --auto."
485
msgstr ""
511
msgstr "--after cannot be specified with --auto."
486
512
487
#: bzrlib/builtins.py:1050
513
#: bzrlib/builtins.py:1062
488
514
msgid "to mv multiple files the destination must be a versioned directory"
489
msgstr ""
515
msgstr "to mv multiple files the destination must be a versioned directory"
490
516
491
#: bzrlib/builtins.py:1102
517
#: bzrlib/builtins.py:1114
492
518
msgid "Turn this branch into a mirror of another branch."
493
msgstr ""
519
msgstr "Turn this branch into a mirror of another branch."
494
520
495
#: bzrlib/builtins.py:1104
521
#: bzrlib/builtins.py:1116
496
522
msgid ""
497
523
"By default, this command only works on branches that have not diverged.\n"
498
524
"Branches are considered diverged if the destination branch's most recent \n"
499
525
"commit is one that has not been merged (directly or indirectly) into the \n"
500
526
"parent."
501
527
msgstr ""
528
"By default, this command only works on branches that have not diverged.\n"
529
"Branches are considered diverged if the destination branch's most recent \n"
530
"commit is one that has not been merged (directly or indirectly) into the \n"
531
"parent."
502
532
503
#: bzrlib/builtins.py:1109
533
#: bzrlib/builtins.py:1121
504
534
msgid ""
505
535
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
506
536
"from one into the other. Once one branch has merged, the other should\n"
507
537
"be able to pull it again."
508
538
msgstr ""
509
539
510
#: bzrlib/builtins.py:1113
540
#: bzrlib/builtins.py:1125
511
541
msgid ""
512
542
"If you want to replace your local changes and just want your branch to\n"
513
543
"match the remote one, use pull --overwrite. This will work even if the two\n"
514
544
"branches have diverged."
515
545
msgstr ""
516
546
517
#: bzrlib/builtins.py:1117
547
#: bzrlib/builtins.py:1129
518
548
msgid ""
519
549
"If there is no default location set, the first pull will set it (use\n"
520
550
"--no-remember to avoid setting it). After that, you can omit the\n"
522
552
"value will only be saved if the remote location can be accessed."
523
553
msgstr ""
524
554
525
#: bzrlib/builtins.py:1122
555
#: bzrlib/builtins.py:1134
526
556
msgid ""
527
557
"The --verbose option will display the revisions pulled using the log_format\n"
528
558
"configuration option. You can use a different format by overriding it with\n"
529
559
"-Olog_format=<other_format>."
530
560
msgstr ""
531
561
532
#: bzrlib/builtins.py:1126
562
#: bzrlib/builtins.py:1138
533
563
msgid ""
534
564
"Note: The location can be specified either in the form of a branch,\n"
535
565
"or in the form of a path to a file containing a merge directive generated\n"
536
566
"with bzr send."
537
567
msgstr ""
538
568
539
#: bzrlib/builtins.py:1134
569
#: bzrlib/builtins.py:1146
540
570
msgid "Show logs of pulled revisions."
541
571
msgstr ""
542
572
543
#: bzrlib/builtins.py:1136
573
#: bzrlib/builtins.py:1148
544
574
msgid ""
545
575
"Branch to pull into, rather than the one containing the working directory."
546
576
msgstr ""
547
577
548
#: bzrlib/builtins.py:1139
578
#: bzrlib/builtins.py:1151
549
579
msgid ""
550
580
"Perform a local pull in a bound branch. Local pulls are not applied to the "
551
581
"master branch."
552
582
msgstr ""
553
583
554
#: bzrlib/builtins.py:1168
584
#: bzrlib/builtins.py:1189
555
585
msgid "Need working tree for --show-base."
556
586
msgstr ""
557
587
558
#: bzrlib/builtins.py:1184
588
#: bzrlib/builtins.py:1205
559
589
msgid "No pull location known or specified."
560
590
msgstr ""
561
591
562
#: bzrlib/builtins.py:1190
592
#: bzrlib/builtins.py:1211
563
593
#, python-format
564
594
msgid "Using saved parent location: %s\n"
565
595
msgstr ""
566
596
567
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
597
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
568
598
msgid "Cannot use -r with merge directives or bundles"
569
599
msgstr ""
570
600
571
#: bzrlib/builtins.py:1238
601
#: bzrlib/builtins.py:1261
572
602
msgid "Update a mirror of this branch."
573
603
msgstr ""
574
604
575
#: bzrlib/builtins.py:1240
605
#: bzrlib/builtins.py:1263
576
606
msgid ""
577
607
"The target branch will not have its working tree populated because this\n"
578
608
"is both expensive, and is not supported on remote file systems."
579
609
msgstr ""
580
610
581
#: bzrlib/builtins.py:1243
611
#: bzrlib/builtins.py:1266
582
612
msgid ""
583
613
"Some smart servers or protocols *may* put the working tree in place in\n"
584
614
"the future."
585
615
msgstr ""
586
616
587
#: bzrlib/builtins.py:1246
617
#: bzrlib/builtins.py:1269
588
618
msgid ""
589
619
"This command only works on branches that have not diverged. Branches are\n"
590
620
"considered diverged if the destination branch's most recent commit is one\n"
591
621
"that has not been merged (directly or indirectly) by the source branch."
592
622
msgstr ""
593
623
594
#: bzrlib/builtins.py:1250
624
#: bzrlib/builtins.py:1273
595
625
msgid ""
596
626
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
597
627
"the other branch completely, discarding its unmerged changes."
598
628
msgstr ""
599
629
600
#: bzrlib/builtins.py:1253
630
#: bzrlib/builtins.py:1276
601
631
msgid ""
602
632
"If you want to ensure you have the different changes in the other branch,\n"
603
633
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
604
634
"After that you will be able to do a push without '--overwrite'."
605
635
msgstr ""
606
636
607
#: bzrlib/builtins.py:1257
637
#: bzrlib/builtins.py:1280
608
638
msgid ""
609
639
"If there is no default push location set, the first push will set it (use\n"
610
640
"--no-remember to avoid setting it). After that, you can omit the\n"
612
642
"value will only be saved if the remote location can be accessed."
613
643
msgstr ""
614
644
615
#: bzrlib/builtins.py:1262
645
#: bzrlib/builtins.py:1285
616
646
msgid ""
617
647
"The --verbose option will display the revisions pushed using the log_format\n"
618
648
"configuration option. You can use a different format by overriding it with\n"
619
649
"-Olog_format=<other_format>."
620
650
msgstr ""
621
651
622
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
652
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
623
653
msgid ""
624
654
"Branch to push from, rather than the one containing the working directory."
625
655
msgstr ""
626
656
627
#: bzrlib/builtins.py:1276
657
#: bzrlib/builtins.py:1299
628
658
msgid ""
629
659
"By default push will fail if the target directory exists, but does not "
630
660
"already have a control directory. This flag will allow push to proceed."
631
661
msgstr ""
632
662
633
#: bzrlib/builtins.py:1281
663
#: bzrlib/builtins.py:1304
634
664
msgid ""
635
665
"Create a stacked branch that references the public location of the parent "
636
666
"branch."
637
667
msgstr ""
638
668
639
#: bzrlib/builtins.py:1284
669
#: bzrlib/builtins.py:1307
640
670
msgid ""
641
671
"Create a stacked branch that refers to another branch for the commit "
642
672
"history. Only the work not present in the referenced branch is included in "
643
673
"the branch created."
644
674
msgstr ""
645
675
646
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
676
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
647
677
msgid ""
648
678
"Refuse to push if there are uncommitted changes in the working tree, --no-"
649
679
"strict disables the check."
650
680
msgstr ""
651
681
652
#: bzrlib/builtins.py:1292
682
#: bzrlib/builtins.py:1315
653
683
msgid "Don't populate the working tree, even for protocols that support it."
654
684
msgstr ""
655
685
656
#: bzrlib/builtins.py:1336
686
#: bzrlib/builtins.py:1318
687
msgid "Overwrite tags only."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1369
657
691
msgid "Could not determine branch to refer to."
658
692
msgstr ""
659
693
660
#: bzrlib/builtins.py:1345
694
#: bzrlib/builtins.py:1378
661
695
#, python-format
662
696
msgid ""
663
697
"No push location known or specified. To push to the parent branch (at %s), "
664
698
"use 'bzr push :parent'."
665
699
msgstr ""
666
700
667
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
701
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
668
702
msgid "No push location known or specified."
669
703
msgstr ""
670
704
671
#: bzrlib/builtins.py:1355
705
#: bzrlib/builtins.py:1388
672
706
#, python-format
673
707
msgid "Using saved push location: %s"
674
708
msgstr ""
675
709
676
#: bzrlib/builtins.py:1365
710
#: bzrlib/builtins.py:1398
677
711
msgid "Create a new branch that is a copy of an existing branch."
678
712
msgstr ""
679
713
680
#: bzrlib/builtins.py:1367
714
#: bzrlib/builtins.py:1400
681
715
msgid ""
682
716
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
683
717
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
688
722
"create ./foo-bar."
689
723
msgstr ""
690
724
691
#: bzrlib/builtins.py:1374
725
#: bzrlib/builtins.py:1407
692
726
msgid ""
693
727
"To retrieve the branch as of a particular revision, supply the --revision\n"
694
728
"parameter, as in \"branch foo/bar -r 5\"."
695
729
msgstr ""
696
730
697
#: bzrlib/builtins.py:1377
731
#: bzrlib/builtins.py:1410
698
732
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
699
733
msgstr ""
700
734
701
#: bzrlib/builtins.py:1387
735
#: bzrlib/builtins.py:1420
702
736
msgid "Create a branch without a working-tree."
703
737
msgstr ""
704
738
705
#: bzrlib/builtins.py:1389
739
#: bzrlib/builtins.py:1422
706
740
msgid "Switch the checkout in the current directory to the new branch."
707
741
msgstr ""
708
742
709
#: bzrlib/builtins.py:1392
743
#: bzrlib/builtins.py:1425
710
744
msgid ""
711
745
"Create a stacked branch referring to the source branch. The new branch will "
712
746
"depend on the availability of the source branch for all operations."
713
747
msgstr ""
714
748
715
#: bzrlib/builtins.py:1396
749
#: bzrlib/builtins.py:1429
716
750
msgid "Do not use a shared repository, even if available."
717
751
msgstr ""
718
752
719
#: bzrlib/builtins.py:1398
753
#: bzrlib/builtins.py:1431
720
754
msgid ""
721
755
"By default branch will fail if the target directory exists, but does not "
722
756
"already have a control directory. This flag will allow branch to proceed."
723
757
msgstr ""
724
758
725
#: bzrlib/builtins.py:1403
759
#: bzrlib/builtins.py:1436
726
760
msgid "Bind new branch to from location."
727
761
msgstr ""
728
762
729
#: bzrlib/builtins.py:1450
763
#: bzrlib/builtins.py:1483
730
764
#, python-format
731
765
msgid "Target directory \"%s\" already exists."
732
766
msgstr ""
733
767
734
#: bzrlib/builtins.py:1462
768
#: bzrlib/builtins.py:1495
735
769
#, python-format
736
770
msgid "Parent of \"%s\" does not exist."
737
771
msgstr ""
738
772
739
#: bzrlib/builtins.py:1481
773
#: bzrlib/builtins.py:1514
740
774
msgid "The branch {0} has no revision {1}."
741
775
msgstr ""
742
776
743
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
777
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
744
778
#, python-format
745
779
msgid "Created new stacked branch referring to %s."
746
780
msgstr ""
747
781
748
#: bzrlib/builtins.py:1500
782
#: bzrlib/builtins.py:1533
749
783
#, python-format
750
784
msgid "Branched %d revision."
751
785
msgid_plural "Branched %d revisions."
752
786
msgstr[0] ""
753
787
msgstr[1] ""
754
788
755
#: bzrlib/builtins.py:1505
789
#: bzrlib/builtins.py:1538
756
790
#, python-format
757
791
msgid "New branch bound to %s"
758
792
msgstr ""
759
793
760
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
794
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
761
795
#, python-format
762
796
msgid "Switched to branch: %s"
763
797
msgstr ""
764
798
765
#: bzrlib/builtins.py:1515
799
#: bzrlib/builtins.py:1548
766
800
msgid "List the branches available at the current location."
767
801
msgstr ""
768
802
769
#: bzrlib/builtins.py:1517
803
#: bzrlib/builtins.py:1550
770
804
msgid ""
771
805
"This command will print the names of all the branches at the current\n"
772
806
"location."
773
807
msgstr ""
774
808
775
#: bzrlib/builtins.py:1524
809
#: bzrlib/builtins.py:1557
776
810
msgid ""
777
811
"Recursively scan for branches rather than just looking in the specified "
778
812
"location."
779
813
msgstr ""
780
814
781
#: bzrlib/builtins.py:1554
815
#: bzrlib/builtins.py:1586
782
816
msgid "(default)"
783
817
msgstr ""
784
818
785
#: bzrlib/builtins.py:1566
819
#: bzrlib/builtins.py:1598
786
820
msgid "Create a new checkout of an existing branch."
787
821
msgstr ""
788
822
789
#: bzrlib/builtins.py:1568
823
#: bzrlib/builtins.py:1600
790
824
msgid ""
791
825
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
792
826
"for\n"
796
830
"location using SFTP."
797
831
msgstr ""
798
832
799
#: bzrlib/builtins.py:1573
833
#: bzrlib/builtins.py:1605
800
834
msgid ""
801
835
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
802
836
"will\n"
808
842
"create ./foo-bar."
809
843
msgstr ""
810
844
811
#: bzrlib/builtins.py:1580
845
#: bzrlib/builtins.py:1612
812
846
msgid ""
813
847
"To retrieve the branch as of a particular revision, supply the --revision\n"
814
848
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
818
852
"code.)"
819
853
msgstr ""
820
854
821
#: bzrlib/builtins.py:1590
855
#: bzrlib/builtins.py:1622
822
856
msgid ""
823
857
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
824
858
"the branch for every operation. Normal checkouts can perform common "
826
860
"commits."
827
861
msgstr ""
828
862
829
#: bzrlib/builtins.py:1597
863
#: bzrlib/builtins.py:1629
830
864
msgid "Get file contents from this tree."
831
865
msgstr ""
832
866
833
#: bzrlib/builtins.py:1599
867
#: bzrlib/builtins.py:1631
834
868
msgid "Hard-link working tree files where possible."
835
869
msgstr ""
836
870
837
#: bzrlib/builtins.py:1640
871
#: bzrlib/builtins.py:1672
838
872
msgid ""
839
873
"Show list of renamed files.\n"
840
874
" "
841
875
msgstr ""
842
876
843
#: bzrlib/builtins.py:1670
877
#: bzrlib/builtins.py:1700
844
878
msgid "Update a working tree to a new revision."
845
879
msgstr ""
846
880
847
#: bzrlib/builtins.py:1672
881
#: bzrlib/builtins.py:1702
848
882
msgid ""
849
883
"This will perform a merge of the destination revision (the tip of the\n"
850
884
"branch, or the specified revision) into the working tree, and then make\n"
851
885
"that revision the basis revision for the working tree. "
852
886
msgstr ""
853
887
854
#: bzrlib/builtins.py:1676
888
#: bzrlib/builtins.py:1706
855
889
msgid ""
856
890
"You can use this to visit an older revision, or to update a working tree\n"
857
891
"that is out of date from its branch."
858
892
msgstr ""
859
893
860
#: bzrlib/builtins.py:1679
894
#: bzrlib/builtins.py:1709
861
895
msgid ""
862
896
"If there are any uncommitted changes in the tree, they will be carried\n"
863
897
"across and remain as uncommitted changes after the update. To discard\n"
865
899
"with the changes brought in by the change in basis revision."
866
900
msgstr ""
867
901
868
#: bzrlib/builtins.py:1684
902
#: bzrlib/builtins.py:1714
869
903
msgid ""
870
904
"If the tree's branch is bound to a master branch, bzr will also update\n"
871
905
"the branch from the master."
872
906
msgstr ""
873
907
874
#: bzrlib/builtins.py:1687
908
#: bzrlib/builtins.py:1717
875
909
msgid ""
876
910
"You cannot update just a single file or directory, because each Bazaar\n"
877
911
"working tree has just a single basis revision. If you want to restore a\n"
881
915
"out the old content of that file to a new location."
882
916
msgstr ""
883
917
884
#: bzrlib/builtins.py:1694
918
#: bzrlib/builtins.py:1724
885
919
msgid ""
886
920
"The 'dir' argument, if given, must be the location of the root of a\n"
887
921
"working tree to update. By default, the working tree that contains the \n"
888
922
"current working directory is used."
889
923
msgstr ""
890
924
891
#: bzrlib/builtins.py:1710
925
#: bzrlib/builtins.py:1740
892
926
msgid "bzr update --revision takes exactly one revision"
893
927
msgstr ""
894
928
895
#: bzrlib/builtins.py:1718
929
#: bzrlib/builtins.py:1748
896
930
msgid "bzr update can only update a whole tree, not a file or subdirectory"
897
931
msgstr ""
898
932
899
#: bzrlib/builtins.py:1749
933
#: bzrlib/builtins.py:1779
900
934
msgid "Tree is up to date at revision {0} of branch {1}"
901
935
msgstr ""
902
936
903
#: bzrlib/builtins.py:1765
937
#: bzrlib/builtins.py:1795
904
938
#, python-format
905
939
msgid ""
906
940
"branch has no revision %s\n"
907
941
"bzr update --revision only works for a revision in the branch history"
908
942
msgstr ""
909
943
910
#: bzrlib/builtins.py:1771
944
#: bzrlib/builtins.py:1801
911
945
msgid "Updated to revision {0} of branch {1}"
912
946
msgstr ""
913
947
914
#: bzrlib/builtins.py:1775
948
#: bzrlib/builtins.py:1805
915
949
msgid ""
916
950
"Your local commits will now show as pending merges with 'bzr status', and "
917
951
"can be committed with 'bzr commit'."
918
952
msgstr ""
919
953
920
#: bzrlib/builtins.py:1784
954
#: bzrlib/builtins.py:1814
921
955
msgid "Show information about a working tree, branch or repository."
922
956
msgstr ""
923
957
924
#: bzrlib/builtins.py:1786
958
#: bzrlib/builtins.py:1816
925
959
msgid ""
926
960
"This command will show all known locations and formats associated to the\n"
927
961
"tree, branch or repository."
928
962
msgstr ""
929
963
930
#: bzrlib/builtins.py:1789
964
#: bzrlib/builtins.py:1819
931
965
msgid ""
932
966
"In verbose mode, statistical information is included with each report.\n"
933
967
"To see extended statistic information, use a verbosity level of 2 or\n"
934
968
"higher by specifying the verbose option multiple times, e.g. -vv."
935
969
msgstr ""
936
970
937
#: bzrlib/builtins.py:1793
971
#: bzrlib/builtins.py:1823
938
972
msgid "Branches and working trees will also report any missing revisions."
939
973
msgstr ""
940
974
941
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
942
#: bzrlib/builtins.py:6442
975
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
976
#: bzrlib/builtins.py:6466
943
977
msgid ":Examples:"
944
978
msgstr ""
945
979
946
#: bzrlib/builtins.py:1797
980
#: bzrlib/builtins.py:1827
947
981
msgid " Display information on the format and related locations:"
948
982
msgstr ""
949
983
950
#: bzrlib/builtins.py:1799
984
#: bzrlib/builtins.py:1829
951
985
msgid " bzr info"
952
986
msgstr ""
953
987
954
#: bzrlib/builtins.py:1801
988
#: bzrlib/builtins.py:1831
955
989
msgid ""
956
990
" Display the above together with extended format information and\n"
957
991
" basic statistics (like the number of files in the working tree and\n"
958
992
" number of revisions in the branch and repository):"
959
993
msgstr ""
960
994
961
#: bzrlib/builtins.py:1805
995
#: bzrlib/builtins.py:1835
962
996
msgid " bzr info -v"
963
997
msgstr ""
964
998
965
#: bzrlib/builtins.py:1807
999
#: bzrlib/builtins.py:1837
966
1000
msgid " Display the above together with number of committers to the branch:"
967
1001
msgstr ""
968
1002
969
#: bzrlib/builtins.py:1809
1003
#: bzrlib/builtins.py:1839
970
1004
msgid " bzr info -vv"
971
1005
msgstr ""
972
1006
973
#: bzrlib/builtins.py:1828
1007
#: bzrlib/builtins.py:1858
974
1008
msgid "Remove files or directories."
975
1009
msgstr ""
976
1010
977
#: bzrlib/builtins.py:1830
1011
#: bzrlib/builtins.py:1860
978
1012
msgid ""
979
1013
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
980
1014
"delete them if they can easily be recovered using revert otherwise they\n"
981
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1015
"will be backed up (adding an extension of the form .~#~). If no options or\n"
982
1016
"parameters are given Bazaar will scan for files that are being tracked by\n"
983
1017
"Bazaar but missing in your tree and stop tracking them for you."
984
1018
msgstr ""
985
1019
986
#: bzrlib/builtins.py:1838
1020
#: bzrlib/builtins.py:1868
987
1021
msgid "Only remove files that have never been committed."
988
1022
msgstr ""
989
1023
990
#: bzrlib/builtins.py:1840
1024
#: bzrlib/builtins.py:1870
991
1025
msgid "The file deletion mode to be used."
992
1026
msgstr ""
993
1027
994
#: bzrlib/builtins.py:1841
1028
#: bzrlib/builtins.py:1871
995
1029
msgid "Deletion Strategy"
996
1030
msgstr ""
997
1031
998
#: bzrlib/builtins.py:1842
1032
#: bzrlib/builtins.py:1872
999
1033
msgid "Backup changed files (default)."
1000
1034
msgstr ""
1001
1035
1002
#: bzrlib/builtins.py:1843
1036
#: bzrlib/builtins.py:1873
1003
1037
msgid "Delete from bzr but leave the working copy."
1004
1038
msgstr ""
1005
1039
1006
#: bzrlib/builtins.py:1844
1040
#: bzrlib/builtins.py:1874
1007
1041
msgid "Don't backup changed files."
1008
1042
msgstr ""
1009
1043
1010
#: bzrlib/builtins.py:1845
1044
#: bzrlib/builtins.py:1875
1011
1045
msgid ""
1012
1046
"Delete all the specified files, even if they can not be recovered and even "
1013
1047
"if they are non-empty directories. (deprecated, use no-backup)"
1014
1048
msgstr ""
1015
1049
1016
#: bzrlib/builtins.py:1854
1050
#: bzrlib/builtins.py:1884
1017
1051
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1018
1052
msgstr ""
1019
1053
1020
#: bzrlib/builtins.py:1871
1054
#: bzrlib/builtins.py:1901
1021
1055
msgid "No matching files."
1022
1056
msgstr ""
1023
1057
1024
#: bzrlib/builtins.py:1932
1058
#: bzrlib/builtins.py:1962
1025
1059
msgid "Reconcile bzr metadata in a branch."
1026
1060
msgstr ""
1027
1061
1028
#: bzrlib/builtins.py:1934
1062
#: bzrlib/builtins.py:1964
1029
1063
msgid ""
1030
1064
"This can correct data mismatches that may have been caused by\n"
1031
1065
"previous ghost operations or bzr upgrades. You should only\n"
1033
1067
"advises you to run it."
1034
1068
msgstr ""
1035
1069
1036
#: bzrlib/builtins.py:1939
1070
#: bzrlib/builtins.py:1969
1037
1071
msgid ""
1038
1072
"If a second branch is provided, cross-branch reconciliation is\n"
1039
1073
"also attempted, which will check that data like the tree root\n"
1041
1075
"correctly in both branches."
1042
1076
msgstr ""
1043
1077
1044
#: bzrlib/builtins.py:1944
1078
#: bzrlib/builtins.py:1974
1045
1079
msgid ""
1046
1080
"At the same time it is run it may recompress data resulting in\n"
1047
1081
"a potential saving in disk space or performance gain."
1048
1082
msgstr ""
1049
1083
1050
#: bzrlib/builtins.py:1947
1084
#: bzrlib/builtins.py:1977
1051
1085
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1052
1086
msgstr ""
1053
1087
1054
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1088
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1055
1089
msgid ""
1056
1090
"Format for the bzr 2.0 series.\n"
1057
1091
"Uses group-compress storage.\n"
1058
1092
"Provides rich roots which are a one-way transition.\n"
1059
1093
msgstr ""
1060
1094
1061
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1095
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1062
1096
msgid ""
1063
1097
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1064
1098
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1065
1099
msgstr ""
1066
1100
1067
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1101
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1068
1102
msgid "The 2a format with experimental support for colocated branches.\n"
1069
1103
msgstr ""
1070
1104
1071
#: bzrlib/builtins.py:2015
1105
#: bzrlib/builtins.py:2045
1072
1106
msgid "Make a directory into a versioned branch."
1073
1107
msgstr ""
1074
1108
1075
#: bzrlib/builtins.py:2017
1109
#: bzrlib/builtins.py:2047
1076
1110
msgid ""
1077
1111
"Use this to create an empty branch, or before importing an\n"
1078
1112
"existing project."
1079
1113
msgstr ""
1080
1114
1081
#: bzrlib/builtins.py:2020
1115
#: bzrlib/builtins.py:2050
1082
1116
msgid ""
1083
1117
"If there is a repository in a parent directory of the location, then\n"
1084
1118
"the history of the branch will be stored in the repository. Otherwise\n"
1086
1120
"in the .bzr directory."
1087
1121
msgstr ""
1088
1122
1089
#: bzrlib/builtins.py:2025
1123
#: bzrlib/builtins.py:2055
1090
1124
msgid ""
1091
1125
"If there is already a branch at the location but it has no working tree,\n"
1092
1126
"the tree can be populated with 'bzr checkout'."
1093
1127
msgstr ""
1094
1128
1095
#: bzrlib/builtins.py:2028
1129
#: bzrlib/builtins.py:2058
1096
1130
msgid "Recipe for importing a tree of files::"
1097
1131
msgstr ""
1098
1132
1099
#: bzrlib/builtins.py:2030
1133
#: bzrlib/builtins.py:2060
1100
1134
msgid ""
1101
1135
" cd ~/project\n"
1102
1136
" bzr init\n"
1105
1139
" bzr commit -m \"imported project\""
1106
1140
msgstr ""
1107
1141
1108
#: bzrlib/builtins.py:2041
1142
#: bzrlib/builtins.py:2071
1109
1143
msgid ""
1110
1144
"Create the path leading up to the branch if it does not already exist."
1111
1145
msgstr ""
1112
1146
1113
#: bzrlib/builtins.py:2044
1147
#: bzrlib/builtins.py:2074
1114
1148
msgid "Specify a format for this branch. See \"help formats\"."
1115
1149
msgstr ""
1116
1150
1117
#: bzrlib/builtins.py:2052
1151
#: bzrlib/builtins.py:2082
1118
1152
msgid ""
1119
1153
"Never change revnos or the existing log. Append revisions to it only."
1120
1154
msgstr ""
1121
1155
1122
#: bzrlib/builtins.py:2055
1156
#: bzrlib/builtins.py:2085
1123
1157
msgid "Create a branch without a working tree."
1124
1158
msgstr ""
1125
1159
1126
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1160
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1127
1161
#, python-format
1128
1162
msgid ""
1129
1163
"Parent directory of %s does not exist.\n"
1130
1164
"You may supply --create-prefix to create all leading parent directories."
1131
1165
msgstr ""
1132
1166
1133
#: bzrlib/builtins.py:2109
1167
#: bzrlib/builtins.py:2139
1134
1168
msgid ""
1135
1169
"This branch format cannot be set to append-revisions-only. Try --default."
1136
1170
msgstr ""
1137
1171
1138
#: bzrlib/builtins.py:2120
1172
#: bzrlib/builtins.py:2150
1139
1173
msgid "Created a {0} (format: {1})\n"
1140
1174
msgstr ""
1141
1175
1142
#: bzrlib/builtins.py:2129
1176
#: bzrlib/builtins.py:2159
1143
1177
#, python-format
1144
1178
msgid "Using shared repository: %s\n"
1145
1179
msgstr ""
1146
1180
1147
#: bzrlib/builtins.py:2133
1181
#: bzrlib/builtins.py:2163
1148
1182
msgid "Create a shared repository for branches to share storage space."
1149
1183
msgstr ""
1150
1184
1151
#: bzrlib/builtins.py:2135
1185
#: bzrlib/builtins.py:2165
1152
1186
msgid ""
1153
1187
"New branches created under the repository directory will store their\n"
1154
1188
"revisions in the repository, not in the branch directory. For branches\n"
1156
1190
"speeds up the creation of new branches."
1157
1191
msgstr ""
1158
1192
1159
#: bzrlib/builtins.py:2140
1193
#: bzrlib/builtins.py:2170
1160
1194
msgid ""
1161
1195
"If the --no-trees option is given then the branches in the repository\n"
1162
1196
"will not have working trees by default. They will still exist as \n"
1166
1200
"branches, such as on a server."
1167
1201
msgstr ""
1168
1202
1169
#: bzrlib/builtins.py:2147
1203
#: bzrlib/builtins.py:2177
1170
1204
msgid ""
1171
1205
":Examples:\n"
1172
1206
" Create a shared repository holding just branches::"
1173
1207
msgstr ""
1174
1208
1175
#: bzrlib/builtins.py:2150
1209
#: bzrlib/builtins.py:2180
1176
1210
msgid ""
1177
1211
" bzr init-repo --no-trees repo\n"
1178
1212
" bzr init repo/trunk"
1179
1213
msgstr ""
1180
1214
1181
#: bzrlib/builtins.py:2153
1215
#: bzrlib/builtins.py:2183
1182
1216
msgid " Make a lightweight checkout elsewhere::"
1183
1217
msgstr ""
1184
1218
1185
#: bzrlib/builtins.py:2155
1219
#: bzrlib/builtins.py:2185
1186
1220
msgid ""
1187
1221
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1188
1222
" cd trunk-checkout\n"
1189
1223
" (add files here)"
1190
1224
msgstr ""
1191
1225
1192
#: bzrlib/builtins.py:2163
1226
#: bzrlib/builtins.py:2193
1193
1227
msgid ""
1194
1228
"Specify a format for this repository. See \"bzr help formats\" for details."
1195
1229
msgstr ""
1196
1230
1197
#: bzrlib/builtins.py:2167
1231
#: bzrlib/builtins.py:2197
1198
1232
msgid "Repository format"
1199
1233
msgstr ""
1200
1234
1201
#: bzrlib/builtins.py:2169
1235
#: bzrlib/builtins.py:2199
1202
1236
msgid "Branches in the repository will default to not having a working tree."
1203
1237
msgstr ""
1204
1238
1205
#: bzrlib/builtins.py:2195
1239
#: bzrlib/builtins.py:2225
1206
1240
msgid "Show differences in the working tree, between revisions or branches."
1207
1241
msgstr ""
1208
1242
1209
#: bzrlib/builtins.py:2197
1243
#: bzrlib/builtins.py:2227
1210
1244
msgid ""
1211
1245
"If no arguments are given, all changes for the current tree are listed.\n"
1212
1246
"If files are given, only the changes in those files are listed.\n"
1216
1250
"given."
1217
1251
msgstr ""
1218
1252
1219
#: bzrlib/builtins.py:2204
1253
#: bzrlib/builtins.py:2234
1220
1254
msgid ""
1221
1255
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1222
1256
"produces patches suitable for \"patch -p1\"."
1223
1257
msgstr ""
1224
1258
1225
#: bzrlib/builtins.py:2207
1259
#: bzrlib/builtins.py:2237
1226
1260
msgid ""
1227
1261
"Note that when using the -r argument with a range of revisions, the\n"
1228
1262
"differences are computed between the two specified revisions. That\n"
1232
1266
"in the range."
1233
1267
msgstr ""
1234
1268
1235
#: bzrlib/builtins.py:2214
1269
#: bzrlib/builtins.py:2244
1236
1270
msgid ""
1237
1271
":Exit values:\n"
1238
1272
" 1 - changed\n"
1241
1275
" 0 - no change"
1242
1276
msgstr ""
1243
1277
1244
#: bzrlib/builtins.py:2220
1278
#: bzrlib/builtins.py:2250
1245
1279
msgid ""
1246
1280
":Examples:\n"
1247
1281
" Shows the difference in the working tree versus the last commit::"
1248
1282
msgstr ""
1249
1283
1250
#: bzrlib/builtins.py:2223
1284
#: bzrlib/builtins.py:2253
1251
1285
msgid " bzr diff"
1252
1286
msgstr ""
1253
1287
1254
#: bzrlib/builtins.py:2225
1288
#: bzrlib/builtins.py:2255
1255
1289
msgid " Difference between the working tree and revision 1::"
1256
1290
msgstr ""
1257
1291
1258
#: bzrlib/builtins.py:2227
1292
#: bzrlib/builtins.py:2257
1259
1293
msgid " bzr diff -r1"
1260
1294
msgstr ""
1261
1295
1262
#: bzrlib/builtins.py:2229
1296
#: bzrlib/builtins.py:2259
1263
1297
msgid " Difference between revision 3 and revision 1::"
1264
1298
msgstr ""
1265
1299
1266
#: bzrlib/builtins.py:2231
1300
#: bzrlib/builtins.py:2261
1267
1301
msgid " bzr diff -r1..3"
1268
1302
msgstr ""
1269
1303
1270
#: bzrlib/builtins.py:2233
1304
#: bzrlib/builtins.py:2263
1271
1305
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1272
1306
msgstr ""
1273
1307
1274
#: bzrlib/builtins.py:2235
1308
#: bzrlib/builtins.py:2265
1275
1309
msgid " bzr diff -r1..3 xxx"
1276
1310
msgstr ""
1277
1311
1278
#: bzrlib/builtins.py:2237
1312
#: bzrlib/builtins.py:2267
1279
1313
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1280
1314
msgstr ""
1281
1315
1282
#: bzrlib/builtins.py:2239
1316
#: bzrlib/builtins.py:2269
1283
1317
msgid " bzr diff -c2"
1284
1318
msgstr ""
1285
1319
1286
#: bzrlib/builtins.py:2241
1320
#: bzrlib/builtins.py:2271
1287
1321
msgid ""
1288
1322
" To see the changes introduced by revision X::\n"
1289
1323
" \n"
1290
1324
" bzr diff -cX"
1291
1325
msgstr ""
1292
1326
1293
#: bzrlib/builtins.py:2245
1327
#: bzrlib/builtins.py:2275
1294
1328
msgid ""
1295
1329
" Note that in the case of a merge, the -c option shows the changes\n"
1296
1330
" compared to the left hand parent. To see the changes against\n"
1297
1331
" another parent, use::"
1298
1332
msgstr ""
1299
1333
1300
#: bzrlib/builtins.py:2249
1334
#: bzrlib/builtins.py:2279
1301
1335
msgid " bzr diff -r<chosen_parent>..X"
1302
1336
msgstr ""
1303
1337
1304
#: bzrlib/builtins.py:2251
1338
#: bzrlib/builtins.py:2281
1305
1339
msgid ""
1306
1340
" The changes between the current revision and the previous revision\n"
1307
1341
" (equivalent to -c-1 and -r-2..-1)"
1308
1342
msgstr ""
1309
1343
1310
#: bzrlib/builtins.py:2254
1344
#: bzrlib/builtins.py:2284
1311
1345
msgid " bzr diff -r-2.."
1312
1346
msgstr ""
1313
1347
1314
#: bzrlib/builtins.py:2256
1348
#: bzrlib/builtins.py:2286
1315
1349
msgid " Show just the differences for file NEWS::"
1316
1350
msgstr ""
1317
1351
1318
#: bzrlib/builtins.py:2258
1352
#: bzrlib/builtins.py:2288
1319
1353
msgid " bzr diff NEWS"
1320
1354
msgstr ""
1321
1355
1322
#: bzrlib/builtins.py:2260
1356
#: bzrlib/builtins.py:2290
1323
1357
msgid " Show the differences in working tree xxx for file NEWS::"
1324
1358
msgstr ""
1325
1359
1326
#: bzrlib/builtins.py:2262
1360
#: bzrlib/builtins.py:2292
1327
1361
msgid " bzr diff xxx/NEWS"
1328
1362
msgstr ""
1329
1363
1330
#: bzrlib/builtins.py:2264
1364
#: bzrlib/builtins.py:2294
1331
1365
msgid " Show the differences from branch xxx to this working tree:"
1332
1366
msgstr ""
1333
1367
1334
#: bzrlib/builtins.py:2266
1368
#: bzrlib/builtins.py:2296
1335
1369
msgid " bzr diff --old xxx"
1336
1370
msgstr ""
1337
1371
1338
#: bzrlib/builtins.py:2268
1372
#: bzrlib/builtins.py:2298
1339
1373
msgid " Show the differences between two branches for file NEWS::"
1340
1374
msgstr ""
1341
1375
1342
#: bzrlib/builtins.py:2270
1376
#: bzrlib/builtins.py:2300
1343
1377
msgid " bzr diff --old xxx --new yyy NEWS"
1344
1378
msgstr ""
1345
1379
1346
#: bzrlib/builtins.py:2272
1380
#: bzrlib/builtins.py:2302
1347
1381
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1348
1382
msgstr ""
1349
1383
1350
#: bzrlib/builtins.py:2274
1384
#: bzrlib/builtins.py:2304
1351
1385
msgid ""
1352
1386
" bzr diff --prefix old/:new/\n"
1353
1387
" \n"
1356
1390
" bzr diff --using /usr/bin/diff --diff-options -wu"
1357
1391
msgstr ""
1358
1392
1359
#: bzrlib/builtins.py:2284
1393
#: bzrlib/builtins.py:2314
1360
1394
msgid "Pass these options to the external diff program."
1361
1395
msgstr ""
1362
1396
1363
#: bzrlib/builtins.py:2287
1397
#: bzrlib/builtins.py:2317
1364
1398
msgid ""
1365
1399
"Set prefixes added to old and new filenames, as two values separated by a "
1366
1400
"colon. (eg \"old/:new/\")."
1367
1401
msgstr ""
1368
1402
1369
#: bzrlib/builtins.py:2290
1403
#: bzrlib/builtins.py:2320
1370
1404
msgid "Branch/tree to compare from."
1371
1405
msgstr ""
1372
1406
1373
#: bzrlib/builtins.py:2294
1407
#: bzrlib/builtins.py:2324
1374
1408
msgid "Branch/tree to compare to."
1375
1409
msgstr ""
1376
1410
1377
#: bzrlib/builtins.py:2300
1411
#: bzrlib/builtins.py:2330
1378
1412
msgid "Use this command to compare files."
1379
1413
msgstr ""
1380
1414
1381
#: bzrlib/builtins.py:2305
1415
#: bzrlib/builtins.py:2335
1382
1416
msgid "Diff format to use."
1383
1417
msgstr ""
1384
1418
1385
#: bzrlib/builtins.py:2307
1419
#: bzrlib/builtins.py:2337
1386
1420
msgid "Diff format"
1387
1421
msgstr ""
1388
1422
1389
#: bzrlib/builtins.py:2329
1423
#: bzrlib/builtins.py:2359
1390
1424
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1391
1425
msgstr ""
1392
1426
1393
#: bzrlib/builtins.py:2333
1427
#: bzrlib/builtins.py:2363
1394
1428
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1395
1429
msgstr ""
1396
1430
1397
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1398
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1431
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1432
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1399
1433
msgid "{0} and {1} are mutually exclusive"
1400
1434
msgstr ""
1401
1435
1402
#: bzrlib/builtins.py:2358
1436
#: bzrlib/builtins.py:2388
1403
1437
msgid ""
1404
1438
"List files deleted in the working tree.\n"
1405
1439
" "
1406
1440
msgstr ""
1407
1441
1408
#: bzrlib/builtins.py:2436
1442
#: bzrlib/builtins.py:2465
1409
1443
msgid "Show the tree root directory."
1410
1444
msgstr ""
1411
1445
1412
#: bzrlib/builtins.py:2438
1446
#: bzrlib/builtins.py:2467
1413
1447
msgid ""
1414
1448
"The root is the nearest enclosing directory with a .bzr control\n"
1415
1449
"directory."
1416
1450
msgstr ""
1417
1451
1418
#: bzrlib/builtins.py:2453
1452
#: bzrlib/builtins.py:2482
1419
1453
msgid "The limit argument must be an integer."
1420
1454
msgstr ""
1421
1455
1422
#: bzrlib/builtins.py:2461
1456
#: bzrlib/builtins.py:2490
1423
1457
msgid "The levels argument must be an integer."
1424
1458
msgstr ""
1425
1459
1426
#: bzrlib/builtins.py:2466
1460
#: bzrlib/builtins.py:2495
1427
1461
msgid "Show historical log for a branch or subset of a branch."
1428
1462
msgstr ""
1429
1463
1430
#: bzrlib/builtins.py:2468
1464
#: bzrlib/builtins.py:2497
1431
1465
msgid ""
1432
1466
"log is bzr's default tool for exploring the history of a branch.\n"
1433
1467
"The branch to use is taken from the first parameter. If no parameters\n"
1435
1469
"Here are some simple examples::"
1436
1470
msgstr ""
1437
1471
1438
#: bzrlib/builtins.py:2473
1472
#: bzrlib/builtins.py:2502
1439
1473
msgid ""
1440
1474
" bzr log log the current branch\n"
1441
1475
" bzr log foo.py log a file in its branch\n"
1442
1476
" bzr log http://server/branch log a branch on a server"
1443
1477
msgstr ""
1444
1478
1445
#: bzrlib/builtins.py:2477
1479
#: bzrlib/builtins.py:2506
1446
1480
msgid ""
1447
1481
"The filtering, ordering and information shown for each revision can\n"
1448
1482
"be controlled as explained below. By default, all revisions are\n"
1452
1486
"were merged."
1453
1487
msgstr ""
1454
1488
1455
#: bzrlib/builtins.py:2484
1489
#: bzrlib/builtins.py:2513
1456
1490
msgid ":Output control:"
1457
1491
msgstr ""
1458
1492
1459
#: bzrlib/builtins.py:2486
1493
#: bzrlib/builtins.py:2515
1460
1494
msgid ""
1461
1495
" The log format controls how information about each revision is\n"
1462
1496
" displayed. The standard log formats are called ``long``, ``short``\n"
1464
1498
" for more details on log formats."
1465
1499
msgstr ""
1466
1500
1467
#: bzrlib/builtins.py:2491
1501
#: bzrlib/builtins.py:2520
1468
1502
msgid ""
1469
1503
" The following options can be used to control what information is\n"
1470
1504
" displayed::"
1471
1505
msgstr ""
1472
1506
1473
#: bzrlib/builtins.py:2494
1507
#: bzrlib/builtins.py:2523
1474
1508
msgid ""
1475
1509
" -l N display a maximum of N revisions\n"
1476
1510
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1479
1513
" --show-ids display revision-ids (and file-ids), not just revnos"
1480
1514
msgstr ""
1481
1515
1482
#: bzrlib/builtins.py:2500
1516
#: bzrlib/builtins.py:2529
1483
1517
msgid ""
1484
1518
" Note that the default number of levels to display is a function of the\n"
1485
1519
" log format. If the -n option is not used, the standard log formats show\n"
1486
1520
" just the top level (mainline)."
1487
1521
msgstr ""
1488
1522
1489
#: bzrlib/builtins.py:2504
1523
#: bzrlib/builtins.py:2533
1490
1524
msgid ""
1491
1525
" Status summaries are shown using status flags like A, M, etc. To see\n"
1492
1526
" the changes explained using words like ``added`` and ``modified``\n"
1493
1527
" instead, use the -vv option."
1494
1528
msgstr ""
1495
1529
1496
#: bzrlib/builtins.py:2508
1530
#: bzrlib/builtins.py:2537
1497
1531
msgid ":Ordering control:"
1498
1532
msgstr ""
1499
1533
1500
#: bzrlib/builtins.py:2510
1534
#: bzrlib/builtins.py:2539
1501
1535
msgid ""
1502
1536
" To display revisions from oldest to newest, use the --forward option.\n"
1503
1537
" In most cases, using this option will have little impact on the total\n"
1505
1539
" display revisions like --reverse does when it can."
1506
1540
msgstr ""
1507
1541
1508
#: bzrlib/builtins.py:2515
1542
#: bzrlib/builtins.py:2544
1509
1543
msgid ":Revision filtering:"
1510
1544
msgstr ""
1511
1545
1512
#: bzrlib/builtins.py:2517
1546
#: bzrlib/builtins.py:2546
1513
1547
msgid ""
1514
1548
" The -r option can be used to specify what revision or range of revisions\n"
1515
1549
" to filter against. The various forms are shown below::"
1516
1550
msgstr ""
1517
1551
1518
#: bzrlib/builtins.py:2520
1552
#: bzrlib/builtins.py:2549
1519
1553
msgid ""
1520
1554
" -rX display revision X\n"
1521
1555
" -rX.. display revision X and later\n"
1523
1557
" -rX..Y display from X to Y inclusive"
1524
1558
msgstr ""
1525
1559
1526
#: bzrlib/builtins.py:2525
1560
#: bzrlib/builtins.py:2554
1527
1561
msgid ""
1528
1562
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1529
1563
" Some common examples are given below::"
1530
1564
msgstr ""
1531
1565
1532
#: bzrlib/builtins.py:2528
1566
#: bzrlib/builtins.py:2557
1533
1567
msgid ""
1534
1568
" -r-1 show just the tip\n"
1535
1569
" -r-10.. show the last 10 mainline revisions\n"
1539
1573
" -rdate:yesterday.. show changes since yesterday"
1540
1574
msgstr ""
1541
1575
1542
#: bzrlib/builtins.py:2535
1576
#: bzrlib/builtins.py:2564
1543
1577
msgid ""
1544
1578
" When logging a range of revisions using -rX..Y, log starts at\n"
1545
1579
" revision Y and searches back in history through the primary\n"
1549
1583
" a nested merge revision and the log will be truncated accordingly."
1550
1584
msgstr ""
1551
1585
1552
#: bzrlib/builtins.py:2542
1586
#: bzrlib/builtins.py:2571
1553
1587
msgid ":Path filtering:"
1554
1588
msgstr ""
1555
1589
1556
#: bzrlib/builtins.py:2544
1590
#: bzrlib/builtins.py:2573
1557
1591
msgid ""
1558
1592
" If parameters are given and the first one is not a branch, the log\n"
1559
1593
" will be filtered to show only those revisions that changed the\n"
1560
1594
" nominated files or directories."
1561
1595
msgstr ""
1562
1596
1563
#: bzrlib/builtins.py:2548
1597
#: bzrlib/builtins.py:2577
1564
1598
msgid ""
1565
1599
" Filenames are interpreted within their historical context. To log a\n"
1566
1600
" deleted file, specify a revision range so that the file existed at\n"
1567
1601
" the end or start of the range."
1568
1602
msgstr ""
1569
1603
1570
#: bzrlib/builtins.py:2552
1604
#: bzrlib/builtins.py:2581
1571
1605
msgid ""
1572
1606
" Historical context is also important when interpreting pathnames of\n"
1573
1607
" renamed files/directories. Consider the following example:"
1574
1608
msgstr ""
1575
1609
1576
#: bzrlib/builtins.py:2555
1610
#: bzrlib/builtins.py:2584
1577
1611
msgid ""
1578
1612
" * revision 1: add tutorial.txt\n"
1579
1613
" * revision 2: modify tutorial.txt\n"
1580
1614
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1581
1615
msgstr ""
1582
1616
1583
#: bzrlib/builtins.py:2559
1617
#: bzrlib/builtins.py:2588
1584
1618
msgid " In this case:"
1585
1619
msgstr ""
1586
1620
1587
#: bzrlib/builtins.py:2561
1621
#: bzrlib/builtins.py:2590
1588
1622
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1589
1623
msgstr ""
1590
1624
1591
#: bzrlib/builtins.py:2563
1625
#: bzrlib/builtins.py:2592
1592
1626
msgid ""
1593
1627
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1594
1628
msgstr ""
1595
1629
1596
#: bzrlib/builtins.py:2565
1630
#: bzrlib/builtins.py:2594
1597
1631
msgid ""
1598
1632
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1599
1633
" the original file in revision 2."
1600
1634
msgstr ""
1601
1635
1602
#: bzrlib/builtins.py:2568
1636
#: bzrlib/builtins.py:2597
1603
1637
msgid ""
1604
1638
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1605
1639
" was no file called guide.txt in revision 2."
1606
1640
msgstr ""
1607
1641
1608
#: bzrlib/builtins.py:2571
1642
#: bzrlib/builtins.py:2600
1609
1643
msgid ""
1610
1644
" Renames are always followed by log. By design, there is no need to\n"
1611
1645
" explicitly ask for this (and no way to stop logging a file back\n"
1612
1646
" until it was last renamed)."
1613
1647
msgstr ""
1614
1648
1615
#: bzrlib/builtins.py:2575
1649
#: bzrlib/builtins.py:2604
1616
1650
msgid ":Other filtering:"
1617
1651
msgstr ""
1618
1652
1619
#: bzrlib/builtins.py:2577
1653
#: bzrlib/builtins.py:2606
1620
1654
msgid ""
1621
1655
" The --match option can be used for finding revisions that match a\n"
1622
1656
" regular expression in a commit message, committer, author or bug.\n"
1625
1659
" --match-message can be used to only match a specific field."
1626
1660
msgstr ""
1627
1661
1628
#: bzrlib/builtins.py:2583
1662
#: bzrlib/builtins.py:2612
1629
1663
msgid ":Tips & tricks:"
1630
1664
msgstr ""
1631
1665
1632
#: bzrlib/builtins.py:2585
1666
#: bzrlib/builtins.py:2614
1633
1667
msgid ""
1634
1668
" GUI tools and IDEs are often better at exploring history than command\n"
1635
1669
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1638
1672
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1639
1673
msgstr ""
1640
1674
1641
#: bzrlib/builtins.py:2591
1675
#: bzrlib/builtins.py:2620
1642
1676
msgid ""
1643
1677
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1644
1678
msgstr ""
1645
1679
1646
#: bzrlib/builtins.py:2593
1680
#: bzrlib/builtins.py:2622
1647
1681
msgid ""
1648
1682
" [ALIASES]\n"
1649
1683
" tip = log -r-1\n"
1651
1685
" show = log -v -p"
1652
1686
msgstr ""
1653
1687
1654
#: bzrlib/builtins.py:2598
1688
#: bzrlib/builtins.py:2627
1655
1689
msgid ""
1656
1690
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1657
1691
" will show the last 10 mainline revisions. To see the details of a\n"
1658
1692
" particular revision X, ``bzr show -rX``."
1659
1693
msgstr ""
1660
1694
1661
#: bzrlib/builtins.py:2602
1695
#: bzrlib/builtins.py:2631
1662
1696
msgid ""
1663
1697
" If you are interested in looking deeper into a particular merge X,\n"
1664
1698
" use ``bzr log -n0 -rX``."
1665
1699
msgstr ""
1666
1700
1667
#: bzrlib/builtins.py:2605
1701
#: bzrlib/builtins.py:2634
1668
1702
msgid ""
1669
1703
" ``bzr log -v`` on a branch with lots of history is currently\n"
1670
1704
" very slow. A fix for this issue is currently under development.\n"
1672
1706
" be given when using the -v option."
1673
1707
msgstr ""
1674
1708
1675
#: bzrlib/builtins.py:2610
1709
#: bzrlib/builtins.py:2639
1676
1710
msgid ""
1677
1711
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1678
1712
" used to find revisions matching user names, commit messages, etc.\n"
1680
1714
" a list of words but not others."
1681
1715
msgstr ""
1682
1716
1683
#: bzrlib/builtins.py:2615
1717
#: bzrlib/builtins.py:2644
1684
1718
msgid ""
1685
1719
" When exploring non-mainline history on large projects with deep\n"
1686
1720
" history, the performance of log can be greatly improved by installing\n"
1688
1722
" trading disk space for faster speed."
1689
1723
msgstr ""
1690
1724
1691
#: bzrlib/builtins.py:2624
1725
#: bzrlib/builtins.py:2653
1692
1726
msgid "Show from oldest to newest."
1693
1727
msgstr ""
1694
1728
1695
#: bzrlib/builtins.py:2627
1729
#: bzrlib/builtins.py:2656
1696
1730
msgid "Show files changed in each revision."
1697
1731
msgstr ""
1698
1732
1699
#: bzrlib/builtins.py:2633
1733
#: bzrlib/builtins.py:2662
1700
1734
msgid "Show just the specified revision. See also \"help revisionspec\"."
1701
1735
msgstr ""
1702
1736
1703
#: bzrlib/builtins.py:2637
1737
#: bzrlib/builtins.py:2666
1704
1738
msgid "What names to list as authors - first, all or committer."
1705
1739
msgstr ""
1706
1740
1707
#: bzrlib/builtins.py:2638
1741
#: bzrlib/builtins.py:2667
1708
1742
msgid "Authors"
1709
1743
msgstr ""
1710
1744
1711
#: bzrlib/builtins.py:2643
1745
#: bzrlib/builtins.py:2672
1712
1746
msgid "Number of levels to display - 0 for all, 1 for flat."
1713
1747
msgstr ""
1714
1748
1715
#: bzrlib/builtins.py:2653
1749
#: bzrlib/builtins.py:2682
1716
1750
msgid "Limit the output to the first N revisions."
1717
1751
msgstr ""
1718
1752
1719
#: bzrlib/builtins.py:2658
1753
#: bzrlib/builtins.py:2687
1720
1754
msgid "Show changes made in each revision as a patch."
1721
1755
msgstr ""
1722
1756
1723
#: bzrlib/builtins.py:2660
1757
#: bzrlib/builtins.py:2689
1724
1758
msgid "Show merged revisions like --levels 0 does."
1725
1759
msgstr ""
1726
1760
1727
#: bzrlib/builtins.py:2664
1761
#: bzrlib/builtins.py:2693
1728
1762
msgid "Do not report commits with more than one parent."
1729
1763
msgstr ""
1730
1764
1731
#: bzrlib/builtins.py:2666
1765
#: bzrlib/builtins.py:2695
1732
1766
msgid ""
1733
1767
"Display only the revisions that are not part of both ancestries (require -"
1734
1768
"rX..Y)."
1735
1769
msgstr ""
1736
1770
1737
#: bzrlib/builtins.py:2670
1771
#: bzrlib/builtins.py:2699
1738
1772
msgid "Show digital signature validity."
1739
1773
msgstr ""
1740
1774
1741
#: bzrlib/builtins.py:2673
1775
#: bzrlib/builtins.py:2702
1742
1776
msgid "Show revisions whose properties match this expression."
1743
1777
msgstr ""
1744
1778
1745
#: bzrlib/builtins.py:2677
1779
#: bzrlib/builtins.py:2706
1746
1780
msgid "Show revisions whose message matches this expression."
1747
1781
msgstr ""
1748
1782
1749
#: bzrlib/builtins.py:2681
1783
#: bzrlib/builtins.py:2710
1750
1784
msgid "Show revisions whose committer matches this expression."
1751
1785
msgstr ""
1752
1786
1753
#: bzrlib/builtins.py:2685
1787
#: bzrlib/builtins.py:2714
1754
1788
msgid "Show revisions whose authors match this expression."
1755
1789
msgstr ""
1756
1790
1757
#: bzrlib/builtins.py:2689
1791
#: bzrlib/builtins.py:2718
1758
1792
msgid "Show revisions whose bugs match this expression."
1759
1793
msgstr ""
1760
1794
1761
#: bzrlib/builtins.py:2743
1795
#: bzrlib/builtins.py:2772
1762
1796
msgid "--exclude-common-ancestry requires -r with two revisions"
1763
1797
msgstr ""
1764
1798
1765
#: bzrlib/builtins.py:2771
1799
#: bzrlib/builtins.py:2800
1766
1800
#, python-format
1767
1801
msgid "Path unknown at end or start of revision range: %s"
1768
1802
msgstr ""
1769
1803
1770
#: bzrlib/builtins.py:2888
1804
#: bzrlib/builtins.py:2917
1771
1805
#, python-format
1772
1806
msgid "bzr %s doesn't accept two revisions in different branches."
1773
1807
msgstr ""
1774
1808
1775
#: bzrlib/builtins.py:2904
1809
#: bzrlib/builtins.py:2933
1776
1810
#, python-format
1777
1811
msgid "bzr %s --revision takes one or two values."
1778
1812
msgstr ""
1779
1813
1780
#: bzrlib/builtins.py:2949
1814
#: bzrlib/builtins.py:2978
1781
1815
msgid ""
1782
1816
"List files in a tree.\n"
1783
1817
" "
1784
1818
msgstr ""
1785
1819
1786
#: bzrlib/builtins.py:2958
1820
#: bzrlib/builtins.py:2987
1787
1821
msgid "Recurse into subdirectories."
1788
1822
msgstr ""
1789
1823
1790
#: bzrlib/builtins.py:2960
1824
#: bzrlib/builtins.py:2989
1791
1825
msgid "Print paths relative to the root of the branch."
1792
1826
msgstr ""
1793
1827
1794
#: bzrlib/builtins.py:2962
1828
#: bzrlib/builtins.py:2991
1795
1829
msgid "Print unknown files."
1796
1830
msgstr ""
1797
1831
1798
#: bzrlib/builtins.py:2963
1832
#: bzrlib/builtins.py:2992
1799
1833
msgid "Print versioned files."
1800
1834
msgstr ""
1801
1835
1802
#: bzrlib/builtins.py:2966
1836
#: bzrlib/builtins.py:2995
1803
1837
msgid "Print ignored files."
1804
1838
msgstr ""
1805
1839
1806
#: bzrlib/builtins.py:2968
1840
#: bzrlib/builtins.py:2997
1807
1841
msgid "List entries of a particular kind: file, directory, symlink."
1808
1842
msgstr "List entries of a particular type: file, directory, symlink."
1809
1843
1810
#: bzrlib/builtins.py:2981
1844
#: bzrlib/builtins.py:3010
1811
1845
msgid "invalid kind specified"
1812
1846
msgstr "invalid type specified"
1813
1847
1814
#: bzrlib/builtins.py:2984
1848
#: bzrlib/builtins.py:3013
1815
1849
msgid "Cannot set both --verbose and --null"
1816
1850
msgstr ""
1817
1851
1818
#: bzrlib/builtins.py:2993
1852
#: bzrlib/builtins.py:3022
1819
1853
msgid "cannot specify both --from-root and PATH"
1820
1854
msgstr ""
1821
1855
1822
#: bzrlib/builtins.py:3080
1856
#: bzrlib/builtins.py:3109
1823
1857
msgid "Ignore specified files or patterns."
1824
1858
msgstr ""
1825
1859
1826
#: bzrlib/builtins.py:3082
1860
#: bzrlib/builtins.py:3111
1827
1861
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1828
1862
msgstr ""
1829
1863
1830
#: bzrlib/builtins.py:3084
1864
#: bzrlib/builtins.py:3113
1831
1865
msgid ""
1832
1866
"If a .bzrignore file does not exist, the ignore command\n"
1833
1867
"will create one and add the specified files or patterns to the newly\n"
1836
1870
"the use of the ignore command will require an explicit add command."
1837
1871
msgstr ""
1838
1872
1839
#: bzrlib/builtins.py:3090
1873
#: bzrlib/builtins.py:3119
1840
1874
msgid ""
1841
1875
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1842
1876
"After adding, editing or deleting that file either indirectly by\n"
1844
1878
"it."
1845
1879
msgstr ""
1846
1880
1847
#: bzrlib/builtins.py:3095
1881
#: bzrlib/builtins.py:3124
1848
1882
msgid ""
1849
1883
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1850
1884
"the global ignore file can be found in the application data directory as\n"
1853
1887
"can be edited directly using an editor."
1854
1888
msgstr ""
1855
1889
1856
#: bzrlib/builtins.py:3101
1890
#: bzrlib/builtins.py:3130
1857
1891
msgid ""
1858
1892
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1859
1893
"precedence over regular ignores. Such exceptions are used to specify\n"
1860
1894
"files that should be versioned which would otherwise be ignored."
1861
1895
msgstr ""
1862
1896
1863
#: bzrlib/builtins.py:3105
1897
#: bzrlib/builtins.py:3134
1864
1898
msgid ""
1865
1899
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1866
1900
"precedence over the '!' exception patterns."
1867
1901
msgstr ""
1868
1902
1869
#: bzrlib/builtins.py:3108
1903
#: bzrlib/builtins.py:3137
1870
1904
msgid ""
1871
1905
":Notes: \n"
1872
1906
" \n"
1874
1908
" the shell on Unix."
1875
1909
msgstr ""
1876
1910
1877
#: bzrlib/builtins.py:3113
1911
#: bzrlib/builtins.py:3142
1878
1912
msgid ""
1879
1913
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1880
1914
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1881
1915
msgstr ""
1882
1916
1883
#: bzrlib/builtins.py:3116
1917
#: bzrlib/builtins.py:3145
1884
1918
msgid ""
1885
1919
":Examples:\n"
1886
1920
" Ignore the top level Makefile::"
1887
1921
msgstr ""
1888
1922
1889
#: bzrlib/builtins.py:3119
1923
#: bzrlib/builtins.py:3148
1890
1924
msgid " bzr ignore ./Makefile"
1891
1925
msgstr ""
1892
1926
1893
#: bzrlib/builtins.py:3121
1927
#: bzrlib/builtins.py:3150
1894
1928
msgid " Ignore .class files in all directories...::"
1895
1929
msgstr ""
1896
1930
1897
#: bzrlib/builtins.py:3123
1931
#: bzrlib/builtins.py:3152
1898
1932
msgid " bzr ignore \"*.class\""
1899
1933
msgstr ""
1900
1934
1901
#: bzrlib/builtins.py:3125
1935
#: bzrlib/builtins.py:3154
1902
1936
msgid " ...but do not ignore \"special.class\"::"
1903
1937
msgstr ""
1904
1938
1905
#: bzrlib/builtins.py:3127
1939
#: bzrlib/builtins.py:3156
1906
1940
msgid " bzr ignore \"!special.class\""
1907
1941
msgstr ""
1908
1942
1909
#: bzrlib/builtins.py:3129
1943
#: bzrlib/builtins.py:3158
1910
1944
msgid " Ignore files whose name begins with the \"#\" character::"
1911
1945
msgstr ""
1912
1946
1913
#: bzrlib/builtins.py:3131
1947
#: bzrlib/builtins.py:3160
1914
1948
msgid " bzr ignore \"RE:^#\""
1915
1949
msgstr ""
1916
1950
1917
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1951
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1918
1952
msgid " Ignore .o files under the lib directory::"
1919
1953
msgstr ""
1920
1954
1921
#: bzrlib/builtins.py:3135
1955
#: bzrlib/builtins.py:3164
1922
1956
msgid " bzr ignore \"lib/**/*.o\""
1923
1957
msgstr ""
1924
1958
1925
#: bzrlib/builtins.py:3139
1959
#: bzrlib/builtins.py:3168
1926
1960
msgid " bzr ignore \"RE:lib/.*\\.o\""
1927
1961
msgstr ""
1928
1962
1929
#: bzrlib/builtins.py:3141
1963
#: bzrlib/builtins.py:3170
1930
1964
msgid " Ignore everything but the \"debian\" toplevel directory::"
1931
1965
msgstr ""
1932
1966
1933
#: bzrlib/builtins.py:3143
1967
#: bzrlib/builtins.py:3172
1934
1968
msgid ""
1935
1969
" bzr ignore \"RE:(?!debian/).*\"\n"
1936
1970
" \n"
1942
1976
" bzr ignore \"!!*~\""
1943
1977
msgstr ""
1944
1978
1945
#: bzrlib/builtins.py:3157
1979
#: bzrlib/builtins.py:3186
1946
1980
msgid "Display the default ignore rules that bzr uses."
1947
1981
msgstr ""
1948
1982
1949
#: bzrlib/builtins.py:3169
1983
#: bzrlib/builtins.py:3198
1950
1984
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1951
1985
msgstr ""
1952
1986
1953
#: bzrlib/builtins.py:3180
1987
#: bzrlib/builtins.py:3209
1954
1988
#, python-format
1955
1989
msgid "Invalid ignore pattern found. %s"
1956
1990
msgid_plural "Invalid ignore patterns found. %s"
1957
1991
msgstr[0] ""
1958
1992
msgstr[1] ""
1959
1993
1960
#: bzrlib/builtins.py:3189
1994
#: bzrlib/builtins.py:3218
1961
1995
msgid "NAME_PATTERN should not be an absolute path"
1962
1996
msgstr ""
1963
1997
1964
#: bzrlib/builtins.py:3202
1998
#: bzrlib/builtins.py:3231
1965
1999
#, python-format
1966
2000
msgid ""
1967
2001
"Warning: the following files are version controlled and match your ignore "
1971
2005
"them.\n"
1972
2006
msgstr ""
1973
2007
1974
#: bzrlib/builtins.py:3209
2008
#: bzrlib/builtins.py:3238
1975
2009
msgid "List ignored files and the patterns that matched them."
1976
2010
msgstr ""
1977
2011
1978
#: bzrlib/builtins.py:3211
2012
#: bzrlib/builtins.py:3240
1979
2013
msgid ""
1980
2014
"List all the ignored files and the ignore pattern that caused the file to\n"
1981
2015
"be ignored."
1982
2016
msgstr ""
1983
2017
1984
#: bzrlib/builtins.py:3214
2018
#: bzrlib/builtins.py:3243
1985
2019
msgid "Alternatively, to list just the files::"
1986
2020
msgstr ""
1987
2021
1988
#: bzrlib/builtins.py:3216
2022
#: bzrlib/builtins.py:3245
1989
2023
msgid " bzr ls --ignored"
1990
2024
msgstr ""
1991
2025
1992
#: bzrlib/builtins.py:3250
2026
#: bzrlib/builtins.py:3279
1993
2027
#, python-format
1994
2028
msgid "not a valid revision-number: %r"
1995
2029
msgstr ""
1996
2030
1997
#: bzrlib/builtins.py:3257
2031
#: bzrlib/builtins.py:3286
1998
2032
msgid ""
1999
2033
"Export current or past revision to a destination directory or archive."
2000
2034
msgstr ""
2001
2035
2002
#: bzrlib/builtins.py:3259
2036
#: bzrlib/builtins.py:3288
2003
2037
msgid "If no revision is specified this exports the last committed revision."
2004
2038
msgstr ""
2005
2039
2006
#: bzrlib/builtins.py:3261
2040
#: bzrlib/builtins.py:3290
2007
2041
msgid ""
2008
2042
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2009
2043
"given, try to find the format with the extension. If no extension\n"
2010
2044
"is found exports to a directory (equivalent to --format=dir)."
2011
2045
msgstr ""
2012
2046
2013
#: bzrlib/builtins.py:3265
2047
#: bzrlib/builtins.py:3294
2014
2048
msgid ""
2015
2049
"If root is supplied, it will be used as the root directory inside\n"
2016
2050
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2017
2051
"to the exported filename. The root option has no effect for 'dir' format."
2018
2052
msgstr ""
2019
2053
2020
#: bzrlib/builtins.py:3269
2054
#: bzrlib/builtins.py:3298
2021
2055
msgid ""
2022
2056
"If branch is omitted then the branch containing the current working\n"
2023
2057
"directory will be used."
2024
2058
msgstr ""
2025
2059
2026
#: bzrlib/builtins.py:3272
2060
#: bzrlib/builtins.py:3301
2027
2061
msgid ""
2028
2062
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2029
2063
msgstr ""
2030
2064
2031
#: bzrlib/builtins.py:3274
2065
#: bzrlib/builtins.py:3303
2032
2066
msgid ""
2033
2067
" ================= =========================\n"
2034
2068
" Supported formats Autodetected by extension\n"
2041
2075
" ================= ========================="
2042
2076
msgstr ""
2043
2077
2044
#: bzrlib/builtins.py:3288
2078
#: bzrlib/builtins.py:3317
2045
2079
msgid "Type of file to export to."
2046
2080
msgstr ""
2047
2081
2048
#: bzrlib/builtins.py:3291
2082
#: bzrlib/builtins.py:3320
2049
2083
msgid "Apply content filters to export the convenient form."
2050
2084
msgstr ""
2051
2085
2052
#: bzrlib/builtins.py:3295
2086
#: bzrlib/builtins.py:3324
2053
2087
msgid "Name of the root directory inside the exported file."
2054
2088
msgstr ""
2055
2089
2056
#: bzrlib/builtins.py:3297
2090
#: bzrlib/builtins.py:3326
2057
2091
msgid ""
2058
2092
"Set modification time of files to that of the last revision in which it was "
2059
2093
"changed."
2060
2094
msgstr ""
2061
2095
2062
#: bzrlib/builtins.py:3300
2096
#: bzrlib/builtins.py:3329
2063
2097
msgid ""
2064
2098
"Export the working tree contents rather than that of the last revision."
2065
2099
msgstr ""
2066
2100
2067
#: bzrlib/builtins.py:3319
2101
#: bzrlib/builtins.py:3348
2068
2102
msgid "--uncommitted requires a working tree"
2069
2103
msgstr ""
2070
2104
2071
#: bzrlib/builtins.py:3328
2105
#: bzrlib/builtins.py:3357
2072
2106
#, python-format
2073
2107
msgid "Unsupported export format: %s"
2074
2108
msgstr ""
2075
2109
2076
#: bzrlib/builtins.py:3332
2110
#: bzrlib/builtins.py:3361
2077
2111
msgid ""
2078
2112
"Write the contents of a file as of a given revision to standard output."
2079
2113
msgstr ""
2080
2114
2081
#: bzrlib/builtins.py:3334
2115
#: bzrlib/builtins.py:3363
2082
2116
msgid "If no revision is nominated, the last revision is used."
2083
2117
msgstr ""
2084
2118
2085
#: bzrlib/builtins.py:3336
2119
#: bzrlib/builtins.py:3365
2086
2120
msgid ""
2087
2121
"Note: Take care to redirect standard output when using this command on a\n"
2088
2122
"binary file."
2089
2123
msgstr ""
2090
2124
2091
#: bzrlib/builtins.py:3342
2125
#: bzrlib/builtins.py:3371
2092
2126
msgid "The path name in the old tree."
2093
2127
msgstr ""
2094
2128
2095
#: bzrlib/builtins.py:3343
2129
#: bzrlib/builtins.py:3372
2096
2130
msgid "Apply content filters to display the convenience form."
2097
2131
msgstr ""
2098
2132
2099
#: bzrlib/builtins.py:3354
2133
#: bzrlib/builtins.py:3383
2100
2134
msgid "bzr cat --revision takes exactly one revision specifier"
2101
2135
msgstr ""
2102
2136
2103
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2137
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2104
2138
msgid "{0!r} is not present in revision {1}"
2105
2139
msgstr ""
2106
2140
2107
#: bzrlib/builtins.py:3414
2141
#: bzrlib/builtins.py:3443
2108
2142
msgid "Commit changes into a new revision."
2109
2143
msgstr ""
2110
2144
2111
#: bzrlib/builtins.py:3416
2145
#: bzrlib/builtins.py:3445
2112
2146
msgid ""
2113
2147
"An explanatory message needs to be given for each commit. This is\n"
2114
2148
"often done by using the --message option (getting the message from the\n"
2118
2152
"boilerplate text loaded into the editor, use the --show-diff option."
2119
2153
msgstr ""
2120
2154
2121
#: bzrlib/builtins.py:3423
2155
#: bzrlib/builtins.py:3452
2122
2156
msgid ""
2123
2157
"By default, the entire tree is committed and the person doing the\n"
2124
2158
"commit is assumed to be the author. These defaults can be overridden\n"
2125
2159
"as explained below."
2126
2160
msgstr ""
2127
2161
2128
#: bzrlib/builtins.py:3427
2162
#: bzrlib/builtins.py:3456
2129
2163
msgid ":Selective commits:"
2130
2164
msgstr ""
2131
2165
2132
#: bzrlib/builtins.py:3429
2166
#: bzrlib/builtins.py:3458
2133
2167
msgid ""
2134
2168
" If selected files are specified, only changes to those files are\n"
2135
2169
" committed. If a directory is specified then the directory and\n"
2136
2170
" everything within it is committed."
2137
2171
msgstr ""
2138
2172
2139
#: bzrlib/builtins.py:3433
2173
#: bzrlib/builtins.py:3462
2140
2174
msgid ""
2141
2175
" When excludes are given, they take precedence over selected files.\n"
2142
2176
" For example, to commit only changes within foo, but not changes\n"
2143
2177
" within foo/bar::"
2144
2178
msgstr ""
2145
2179
2146
#: bzrlib/builtins.py:3437
2180
#: bzrlib/builtins.py:3466
2147
2181
msgid " bzr commit foo -x foo/bar"
2148
2182
msgstr ""
2149
2183
2150
#: bzrlib/builtins.py:3439
2184
#: bzrlib/builtins.py:3468
2151
2185
msgid " A selective commit after a merge is not yet supported."
2152
2186
msgstr ""
2153
2187
2154
#: bzrlib/builtins.py:3441
2188
#: bzrlib/builtins.py:3470
2155
2189
msgid ":Custom authors:"
2156
2190
msgstr ""
2157
2191
2158
#: bzrlib/builtins.py:3443
2192
#: bzrlib/builtins.py:3472
2159
2193
msgid ""
2160
2194
" If the author of the change is not the same person as the committer,\n"
2161
2195
" you can specify the author's name using the --author option. The\n"
2165
2199
" author."
2166
2200
msgstr ""
2167
2201
2168
#: bzrlib/builtins.py:3450
2202
#: bzrlib/builtins.py:3479
2169
2203
msgid ":Checks:"
2170
2204
msgstr ""
2171
2205
2172
#: bzrlib/builtins.py:3452
2206
#: bzrlib/builtins.py:3481
2173
2207
msgid ""
2174
2208
" A common mistake is to forget to add a new file or directory before\n"
2175
2209
" running the commit command. The --strict option checks for unknown\n"
2178
2212
" for details."
2179
2213
msgstr ""
2180
2214
2181
#: bzrlib/builtins.py:3458
2215
#: bzrlib/builtins.py:3487
2182
2216
msgid ":Things to note:"
2183
2217
msgstr ""
2184
2218
2185
#: bzrlib/builtins.py:3460
2219
#: bzrlib/builtins.py:3489
2186
2220
msgid ""
2187
2221
" If you accidentially commit the wrong changes or make a spelling\n"
2188
2222
" mistake in the commit message say, you can use the uncommit command\n"
2189
2223
" to undo it. See ``bzr help uncommit`` for details."
2190
2224
msgstr ""
2191
2225
2192
#: bzrlib/builtins.py:3464
2226
#: bzrlib/builtins.py:3493
2193
2227
msgid ""
2194
2228
" Hooks can also be configured to run after a commit. This allows you\n"
2195
2229
" to trigger updates to external systems like bug trackers. The --fixes\n"
2197
2231
" one or more bugs. See ``bzr help bugs`` for details."
2198
2232
msgstr ""
2199
2233
2200
#: bzrlib/builtins.py:3474
2234
#: bzrlib/builtins.py:3503
2201
2235
msgid "Do not consider changes made to a given path."
2202
2236
msgstr ""
2203
2237
2204
#: bzrlib/builtins.py:3477
2238
#: bzrlib/builtins.py:3506
2205
2239
msgid "Description of the new revision."
2206
2240
msgstr ""
2207
2241
2208
#: bzrlib/builtins.py:3480
2242
#: bzrlib/builtins.py:3509
2209
2243
msgid "Commit even if nothing has changed."
2210
2244
msgstr ""
2211
2245
2212
#: bzrlib/builtins.py:3484
2246
#: bzrlib/builtins.py:3513
2213
2247
msgid "Take commit message from this file."
2214
2248
msgstr ""
2215
2249
2216
#: bzrlib/builtins.py:3486
2250
#: bzrlib/builtins.py:3515
2217
2251
msgid "Refuse to commit if there are unknown files in the working tree."
2218
2252
msgstr ""
2219
2253
2220
#: bzrlib/builtins.py:3489
2254
#: bzrlib/builtins.py:3518
2221
2255
msgid ""
2222
2256
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2223
2257
"08:00:00 +0100'."
2224
2258
msgstr ""
2225
2259
2226
#: bzrlib/builtins.py:3492
2260
#: bzrlib/builtins.py:3521
2227
2261
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2228
2262
msgstr ""
2229
2263
2230
#: bzrlib/builtins.py:3495
2264
#: bzrlib/builtins.py:3524
2231
2265
msgid "Set the author's name, if it's different from the committer."
2232
2266
msgstr ""
2233
2267
2234
#: bzrlib/builtins.py:3498
2268
#: bzrlib/builtins.py:3527
2235
2269
msgid ""
2236
2270
"Perform a local commit in a bound branch. Local commits are not pushed to "
2237
2271
"the master branch until a normal commit is performed."
2238
2272
msgstr ""
2239
2273
2240
#: bzrlib/builtins.py:3504
2274
#: bzrlib/builtins.py:3533
2241
2275
msgid ""
2242
2276
"When no message is supplied, show the diff along with the status summary in "
2243
2277
"the message editor."
2244
2278
msgstr ""
2245
2279
2246
#: bzrlib/builtins.py:3507
2280
#: bzrlib/builtins.py:3536
2247
2281
msgid ""
2248
2282
"When committing to a foreign version control system do not push data that "
2249
2283
"can not be natively represented."
2250
2284
msgstr ""
2251
2285
2252
#: bzrlib/builtins.py:3525
2286
#: bzrlib/builtins.py:3554
2253
2287
#, python-format
2254
2288
msgid ""
2255
2289
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2257
2291
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2258
2292
msgstr ""
2259
2293
2260
#: bzrlib/builtins.py:3534
2294
#: bzrlib/builtins.py:3563
2261
2295
#, python-format
2262
2296
msgid ""
2263
2297
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2265
2299
"Commit refused."
2266
2300
msgstr ""
2267
2301
2268
#: bzrlib/builtins.py:3543
2302
#: bzrlib/builtins.py:3572
2269
2303
#, python-format
2270
2304
msgid "Unrecognized bug %s. Commit refused."
2271
msgstr ""
2305
msgstr "Unrecognised bug %s. Commit refused."
2272
2306
2273
#: bzrlib/builtins.py:3546
2307
#: bzrlib/builtins.py:3575
2274
2308
#, python-format
2275
2309
msgid ""
2276
2310
"%s\n"
2277
2311
"Commit refused."
2278
2312
msgstr ""
2279
2313
2280
#: bzrlib/builtins.py:3570
2314
#: bzrlib/builtins.py:3599
2281
2315
msgid "Could not parse --commit-time: "
2282
2316
msgstr ""
2283
2317
2284
#: bzrlib/builtins.py:3610
2318
#: bzrlib/builtins.py:3639
2285
2319
msgid "please specify either --message or --file"
2286
2320
msgstr ""
2287
2321
2288
#: bzrlib/builtins.py:3639
2322
#: bzrlib/builtins.py:3668
2289
2323
msgid "please specify a commit message with either --message or --file"
2290
2324
msgstr ""
2291
2325
2292
#: bzrlib/builtins.py:3642
2326
#: bzrlib/builtins.py:3671
2293
2327
msgid ""
2294
2328
"Empty commit message specified. Please specify a commit message with either -"
2295
2329
"-message or --file or leave a blank message with --message \"\"."
2296
2330
msgstr ""
2297
2331
2298
#: bzrlib/builtins.py:3662
2332
#: bzrlib/builtins.py:3691
2299
2333
msgid ""
2300
2334
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2301
2335
"-unchanged to force an empty commit."
2302
2336
msgstr ""
2303
2337
2304
#: bzrlib/builtins.py:3666
2338
#: bzrlib/builtins.py:3695
2305
2339
msgid ""
2306
2340
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2307
2341
"resolve FILE\" to resolve."
2308
2342
msgstr ""
2309
2343
2310
#: bzrlib/builtins.py:3670
2344
#: bzrlib/builtins.py:3699
2311
2345
msgid "Commit refused because there are unknown files in the working tree."
2312
2346
msgstr ""
2313
2347
2314
#: bzrlib/builtins.py:3673
2348
#: bzrlib/builtins.py:3702
2315
2349
msgid ""
2316
2350
"\n"
2317
2351
"To commit to master branch, run update and then commit.\n"
2318
2352
"You can also pass --local to commit to continue working disconnected."
2319
2353
msgstr ""
2320
2354
2321
#: bzrlib/builtins.py:3681
2355
#: bzrlib/builtins.py:3710
2322
2356
msgid ""
2323
2357
"Validate working tree structure, branch consistency and repository history."
2324
2358
msgstr ""
2325
2359
2326
#: bzrlib/builtins.py:3683
2360
#: bzrlib/builtins.py:3712
2327
2361
msgid ""
2328
2362
"This command checks various invariants about branch and repository storage\n"
2329
2363
"to detect data corruption or bzr bugs."
2330
2364
msgstr ""
2331
2365
2332
#: bzrlib/builtins.py:3686
2366
#: bzrlib/builtins.py:3715
2333
2367
msgid ""
2334
2368
"The working tree and branch checks will only give output if a problem is\n"
2335
2369
"detected. The output fields of the repository check are:"
2336
2370
msgstr ""
2337
2371
2338
#: bzrlib/builtins.py:3689
2372
#: bzrlib/builtins.py:3718
2339
2373
msgid ""
2340
2374
"revisions\n"
2341
2375
" This is just the number of revisions checked. It doesn't\n"
2342
2376
" indicate a problem."
2343
2377
msgstr ""
2344
2378
2345
#: bzrlib/builtins.py:3693
2379
#: bzrlib/builtins.py:3722
2346
2380
msgid ""
2347
2381
"versionedfiles\n"
2348
2382
" This is just the number of versionedfiles checked. It\n"
2349
2383
" doesn't indicate a problem."
2350
2384
msgstr ""
2351
2385
2352
#: bzrlib/builtins.py:3697
2386
#: bzrlib/builtins.py:3726
2353
2387
msgid ""
2354
2388
"unreferenced ancestors\n"
2355
2389
" Texts that are ancestors of other texts, but\n"
2357
2391
" subtle problem that Bazaar can work around."
2358
2392
msgstr ""
2359
2393
2360
#: bzrlib/builtins.py:3702
2394
#: bzrlib/builtins.py:3731
2361
2395
msgid ""
2362
2396
"unique file texts\n"
2363
2397
" This is the total number of unique file contents\n"
2364
2398
" seen in the checked revisions. It does not indicate a problem."
2365
2399
msgstr ""
2366
2400
2367
#: bzrlib/builtins.py:3706
2401
#: bzrlib/builtins.py:3735
2368
2402
msgid ""
2369
2403
"repeated file texts\n"
2370
2404
" This is the total number of repeated texts seen\n"
2373
2407
" indicate a problem."
2374
2408
msgstr ""
2375
2409
2376
#: bzrlib/builtins.py:3712
2410
#: bzrlib/builtins.py:3741
2377
2411
msgid ""
2378
2412
"If no restrictions are specified, all Bazaar data that is found at the "
2379
2413
"given\n"
2380
2414
"location will be checked."
2381
2415
msgstr ""
2382
2416
2383
#: bzrlib/builtins.py:3717
2417
#: bzrlib/builtins.py:3746
2384
2418
msgid " Check the tree and branch at 'foo'::"
2385
2419
msgstr ""
2386
2420
2387
#: bzrlib/builtins.py:3719
2421
#: bzrlib/builtins.py:3748
2388
2422
msgid " bzr check --tree --branch foo"
2389
2423
msgstr ""
2390
2424
2391
#: bzrlib/builtins.py:3721
2425
#: bzrlib/builtins.py:3750
2392
2426
msgid " Check only the repository at 'bar'::"
2393
2427
msgstr ""
2394
2428
2395
#: bzrlib/builtins.py:3723
2429
#: bzrlib/builtins.py:3752
2396
2430
msgid " bzr check --repo bar"
2397
2431
msgstr ""
2398
2432
2399
#: bzrlib/builtins.py:3725
2433
#: bzrlib/builtins.py:3754
2400
2434
msgid " Check everything at 'baz'::"
2401
2435
msgstr ""
2402
2436
2403
#: bzrlib/builtins.py:3727
2437
#: bzrlib/builtins.py:3756
2404
2438
msgid " bzr check baz"
2405
2439
msgstr ""
2406
2440
2407
#: bzrlib/builtins.py:3733
2441
#: bzrlib/builtins.py:3762
2408
2442
msgid "Check the branch related to the current directory."
2409
2443
msgstr ""
2410
2444
2411
#: bzrlib/builtins.py:3735
2445
#: bzrlib/builtins.py:3764
2412
2446
msgid "Check the repository related to the current directory."
2413
2447
msgstr ""
2414
2448
2415
#: bzrlib/builtins.py:3737
2449
#: bzrlib/builtins.py:3766
2416
2450
msgid "Check the working tree related to the current directory."
2417
2451
msgstr ""
2418
2452
2419
#: bzrlib/builtins.py:3751
2453
#: bzrlib/builtins.py:3780
2420
2454
msgid "Upgrade a repository, branch or working tree to a newer format."
2421
2455
msgstr ""
2422
2456
2423
#: bzrlib/builtins.py:3753
2457
#: bzrlib/builtins.py:3782
2424
2458
msgid ""
2425
2459
"When the default format has changed after a major new release of\n"
2426
2460
"Bazaar, you may be informed during certain operations that you\n"
2429
2463
"with older repositories or with older versions of Bazaar."
2430
2464
msgstr ""
2431
2465
2432
#: bzrlib/builtins.py:3759
2466
#: bzrlib/builtins.py:3788
2433
2467
msgid ""
2434
2468
"If you wish to upgrade to a particular format rather than the\n"
2435
2469
"current default, that can be specified using the --format option.\n"
2439
2473
"2.x default) so downgrading is not always possible."
2440
2474
msgstr ""
2441
2475
2442
#: bzrlib/builtins.py:3766
2476
#: bzrlib/builtins.py:3795
2443
2477
msgid ""
2444
2478
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2445
2479
"process (where # is a number). By default, this is left there on\n"
2450
2484
"afterwards."
2451
2485
msgstr ""
2452
2486
2453
#: bzrlib/builtins.py:3774
2487
#: bzrlib/builtins.py:3803
2454
2488
msgid ""
2455
2489
"If the location given is a shared repository, dependent branches\n"
2456
2490
"are also converted provided the repository converts successfully.\n"
2458
2492
"tried."
2459
2493
msgstr ""
2460
2494
2461
#: bzrlib/builtins.py:3779
2495
#: bzrlib/builtins.py:3808
2462
2496
msgid ""
2463
2497
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2464
2498
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2465
2499
msgstr ""
2466
2500
2467
#: bzrlib/builtins.py:3787
2501
#: bzrlib/builtins.py:3816
2468
2502
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2469
2503
msgstr ""
2470
2504
2471
#: bzrlib/builtins.py:3791
2505
#: bzrlib/builtins.py:3820
2472
2506
msgid "Branch format"
2473
2507
msgstr ""
2474
2508
2475
#: bzrlib/builtins.py:3793
2509
#: bzrlib/builtins.py:3822
2476
2510
msgid "Remove the backup.bzr directory if successful."
2477
2511
msgstr ""
2478
2512
2479
#: bzrlib/builtins.py:3795
2513
#: bzrlib/builtins.py:3824
2480
2514
msgid "Show what would be done, but don't actually do anything."
2481
2515
msgstr ""
2482
2516
2483
#: bzrlib/builtins.py:3810
2517
#: bzrlib/builtins.py:3839
2484
2518
msgid "Show or set bzr user id."
2485
2519
msgstr ""
2486
2520
2487
#: bzrlib/builtins.py:3812
2521
#: bzrlib/builtins.py:3841
2488
2522
msgid ""
2489
2523
":Examples:\n"
2490
2524
" Show the email of the current user::"
2491
2525
msgstr ""
2492
2526
2493
#: bzrlib/builtins.py:3815
2527
#: bzrlib/builtins.py:3844
2494
2528
msgid " bzr whoami --email"
2495
2529
msgstr ""
2496
2530
2497
#: bzrlib/builtins.py:3817
2531
#: bzrlib/builtins.py:3846
2498
2532
msgid " Set the current user::"
2499
2533
msgstr ""
2500
2534
2501
#: bzrlib/builtins.py:3819
2535
#: bzrlib/builtins.py:3848
2502
2536
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2503
2537
msgstr ""
2504
2538
2505
#: bzrlib/builtins.py:3823
2539
#: bzrlib/builtins.py:3852
2506
2540
msgid "Display email address only."
2507
2541
msgstr ""
2508
2542
2509
#: bzrlib/builtins.py:3825
2543
#: bzrlib/builtins.py:3854
2510
2544
msgid "Set identity for the current branch instead of globally."
2511
2545
msgstr ""
2512
2546
2513
#: bzrlib/builtins.py:3851
2547
#: bzrlib/builtins.py:3880
2514
2548
msgid "--email can only be used to display existing identity"
2515
2549
msgstr ""
2516
2550
2517
#: bzrlib/builtins.py:3873
2551
#: bzrlib/builtins.py:3904
2518
2552
msgid "Print or set the branch nickname."
2519
2553
msgstr ""
2520
2554
2521
#: bzrlib/builtins.py:3875
2555
#: bzrlib/builtins.py:3906
2522
2556
msgid ""
2523
"If unset, the tree root directory name is used as the nickname.\n"
2524
"To print the current nickname, execute with no argument."
2557
"If unset, the colocated branch name is used for colocated branches, and\n"
2558
"the branch directory name is used for other branches. To print the\n"
2559
"current nickname, execute with no argument."
2525
2560
msgstr ""
2526
2561
2527
#: bzrlib/builtins.py:3878
2562
#: bzrlib/builtins.py:3910
2528
2563
msgid ""
2529
2564
"Bound branches use the nickname of its master branch unless it is set\n"
2530
2565
"locally."
2531
2566
msgstr ""
2532
2567
2533
#: bzrlib/builtins.py:3898
2568
#: bzrlib/builtins.py:3930
2534
2569
msgid "Set/unset and display aliases."
2535
2570
msgstr ""
2536
2571
2537
#: bzrlib/builtins.py:3900
2572
#: bzrlib/builtins.py:3932
2538
2573
msgid ""
2539
2574
":Examples:\n"
2540
2575
" Show the current aliases::"
2541
2576
msgstr ""
2542
2577
2543
#: bzrlib/builtins.py:3903
2578
#: bzrlib/builtins.py:3935
2544
2579
msgid " bzr alias"
2545
2580
msgstr ""
2546
2581
2547
#: bzrlib/builtins.py:3905
2582
#: bzrlib/builtins.py:3937
2548
2583
msgid " Show the alias specified for 'll'::"
2549
2584
msgstr ""
2550
2585
2551
#: bzrlib/builtins.py:3907
2586
#: bzrlib/builtins.py:3939
2552
2587
msgid " bzr alias ll"
2553
2588
msgstr ""
2554
2589
2555
#: bzrlib/builtins.py:3909
2590
#: bzrlib/builtins.py:3941
2556
2591
msgid " Set an alias for 'll'::"
2557
2592
msgstr ""
2558
2593
2559
#: bzrlib/builtins.py:3911
2594
#: bzrlib/builtins.py:3943
2560
2595
msgid " bzr alias ll=\"log --line -r-10..-1\""
2561
2596
msgstr ""
2562
2597
2563
#: bzrlib/builtins.py:3913
2598
#: bzrlib/builtins.py:3945
2564
2599
msgid " To remove an alias for 'll'::"
2565
2600
msgstr ""
2566
2601
2567
#: bzrlib/builtins.py:3915
2602
#: bzrlib/builtins.py:3947
2568
2603
msgid " bzr alias --remove ll"
2569
2604
msgstr ""
2570
2605
2571
#: bzrlib/builtins.py:3920
2606
#: bzrlib/builtins.py:3952
2572
2607
msgid "Remove the alias."
2573
2608
msgstr ""
2574
2609
2575
#: bzrlib/builtins.py:3938
2610
#: bzrlib/builtins.py:3970
2576
2611
msgid "bzr alias --remove expects an alias to remove."
2577
2612
msgstr ""
2578
2613
2579
#: bzrlib/builtins.py:4119
2614
#: bzrlib/builtins.py:4151
2580
2615
msgid ""
2581
2616
"subunit not available. subunit needs to be installed to use --subunit."
2582
2617
msgstr ""
2583
2618
2584
#: bzrlib/builtins.py:4136
2619
#: bzrlib/builtins.py:4168
2585
2620
msgid ""
2586
2621
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2587
2622
msgstr ""
2588
2623
2589
#: bzrlib/builtins.py:4183
2624
#: bzrlib/builtins.py:4215
2590
2625
msgid "Show version of bzr."
2591
2626
msgstr ""
2592
2627
2593
#: bzrlib/builtins.py:4187
2628
#: bzrlib/builtins.py:4219
2594
2629
msgid "Print just the version number."
2595
2630
msgstr ""
2596
2631
2597
#: bzrlib/builtins.py:4206
2632
#: bzrlib/builtins.py:4238
2598
2633
msgid "It sure does!\n"
2599
2634
msgstr ""
2600
2635
2601
#: bzrlib/builtins.py:4230
2636
#: bzrlib/builtins.py:4262
2602
2637
#, python-format
2603
2638
msgid "merge base is revision %s\n"
2604
2639
msgstr ""
2605
2640
2606
#: bzrlib/builtins.py:4234
2641
#: bzrlib/builtins.py:4266
2607
2642
msgid "Perform a three-way merge."
2608
2643
msgstr ""
2609
2644
2610
#: bzrlib/builtins.py:4236
2645
#: bzrlib/builtins.py:4268
2611
2646
msgid ""
2612
2647
"The source of the merge can be specified either in the form of a branch,\n"
2613
2648
"or in the form of a path to a file containing a merge directive generated\n"
2618
2653
"the current working tree."
2619
2654
msgstr ""
2620
2655
2621
#: bzrlib/builtins.py:4244
2656
#: bzrlib/builtins.py:4276
2622
2657
msgid ""
2623
2658
"When merging from a branch, by default bzr will try to merge in all new\n"
2624
2659
"work from the other branch, automatically determining an appropriate base\n"
2625
2660
"revision. If this fails, you may need to give an explicit base."
2626
2661
msgstr ""
2627
2662
2628
#: bzrlib/builtins.py:4248
2663
#: bzrlib/builtins.py:4280
2629
2664
msgid ""
2630
2665
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2631
2666
"try to merge in all new work up to and including revision OTHER."
2632
2667
msgstr ""
2633
2668
2634
#: bzrlib/builtins.py:4251
2669
#: bzrlib/builtins.py:4283
2635
2670
msgid ""
2636
2671
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2637
2672
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2642
2677
"changes from the other branch is not stored in the commit."
2643
2678
msgstr ""
2644
2679
2645
#: bzrlib/builtins.py:4259
2680
#: bzrlib/builtins.py:4291
2646
2681
msgid "Revision numbers are always relative to the source branch."
2647
2682
msgstr ""
2648
2683
2649
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2684
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2650
2685
msgid ""
2651
2686
"Merge will do its best to combine the changes in two branches, but there\n"
2652
2687
"are some kinds of problems only a human can fix. When it encounters those,\n"
2654
2689
"before you can commit."
2655
2690
msgstr ""
2656
2691
2657
#: bzrlib/builtins.py:4266
2692
#: bzrlib/builtins.py:4298
2658
2693
msgid ""
2659
2694
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2660
2695
msgstr ""
2661
2696
2662
#: bzrlib/builtins.py:4268
2697
#: bzrlib/builtins.py:4300
2663
2698
msgid ""
2664
2699
"If there is no default branch set, the first merge will set it (use\n"
2665
2700
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2667
2702
"only be saved if the remote location can be accessed."
2668
2703
msgstr ""
2669
2704
2670
#: bzrlib/builtins.py:4273
2705
#: bzrlib/builtins.py:4305
2671
2706
msgid ""
2672
2707
"The results of the merge are placed into the destination working\n"
2673
2708
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2674
2709
"committed to record the result of the merge."
2675
2710
msgstr ""
2676
2711
2677
#: bzrlib/builtins.py:4277
2712
#: bzrlib/builtins.py:4309
2678
2713
msgid ""
2679
2714
"merge refuses to run if there are any uncommitted changes, unless\n"
2680
2715
"--force is given. If --force is given, then the changes from the source \n"
2683
2718
"merge revision which has more than two parents."
2684
2719
msgstr ""
2685
2720
2686
#: bzrlib/builtins.py:4283
2721
#: bzrlib/builtins.py:4315
2687
2722
msgid ""
2688
2723
"If one would like to merge changes from the working tree of the other\n"
2689
2724
"branch without merging any committed revisions, the --uncommitted option\n"
2690
2725
"can be given."
2691
2726
msgstr ""
2692
2727
2693
#: bzrlib/builtins.py:4287
2728
#: bzrlib/builtins.py:4319
2694
2729
msgid ""
2695
2730
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2696
2731
"you to apply each diff hunk and file change, similar to \"shelve\"."
2697
2732
msgstr ""
2698
2733
2699
#: bzrlib/builtins.py:4290
2734
#: bzrlib/builtins.py:4322
2700
2735
msgid ""
2701
2736
":Examples:\n"
2702
2737
" To merge all new revisions from bzr.dev::"
2703
2738
msgstr ""
2704
2739
2705
#: bzrlib/builtins.py:4293
2740
#: bzrlib/builtins.py:4325
2706
2741
msgid " bzr merge ../bzr.dev"
2707
2742
msgstr ""
2708
2743
2709
#: bzrlib/builtins.py:4295
2744
#: bzrlib/builtins.py:4327
2710
2745
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2711
2746
msgstr ""
2712
2747
2713
#: bzrlib/builtins.py:4297
2748
#: bzrlib/builtins.py:4329
2714
2749
msgid " bzr merge -r 82 ../bzr.dev"
2715
2750
msgstr ""
2716
2751
2717
#: bzrlib/builtins.py:4299
2752
#: bzrlib/builtins.py:4331
2718
2753
msgid " To merge the changes introduced by 82, without previous changes::"
2719
2754
msgstr ""
2720
2755
2721
#: bzrlib/builtins.py:4301
2756
#: bzrlib/builtins.py:4333
2722
2757
msgid " bzr merge -r 81..82 ../bzr.dev"
2723
2758
msgstr ""
2724
2759
2725
#: bzrlib/builtins.py:4303
2760
#: bzrlib/builtins.py:4335
2726
2761
msgid " To apply a merge directive contained in /tmp/merge::"
2727
2762
msgstr ""
2728
2763
2729
#: bzrlib/builtins.py:4305
2764
#: bzrlib/builtins.py:4337
2730
2765
msgid " bzr merge /tmp/merge"
2731
2766
msgstr ""
2732
2767
2733
#: bzrlib/builtins.py:4307
2768
#: bzrlib/builtins.py:4339
2734
2769
msgid ""
2735
2770
" To create a merge revision with three parents from two branches\n"
2736
2771
" feature1a and feature1b:"
2737
2772
msgstr ""
2738
2773
2739
#: bzrlib/builtins.py:4310
2774
#: bzrlib/builtins.py:4342
2740
2775
msgid ""
2741
2776
" bzr merge ../feature1a\n"
2742
2777
" bzr merge ../feature1b --force\n"
2743
2778
" bzr commit -m 'revision with three parents'"
2744
2779
msgstr ""
2745
2780
2746
#: bzrlib/builtins.py:4322
2781
#: bzrlib/builtins.py:4354
2747
2782
msgid "Merge even if the destination tree has uncommitted changes."
2748
2783
msgstr ""
2749
2784
2750
#: bzrlib/builtins.py:4328
2785
#: bzrlib/builtins.py:4360
2751
2786
msgid ""
2752
2787
"Apply uncommitted changes from a working copy, instead of branch changes."
2753
2788
msgstr ""
2754
2789
2755
#: bzrlib/builtins.py:4330
2790
#: bzrlib/builtins.py:4362
2756
2791
msgid ""
2757
2792
"If the destination is already completely merged into the source, pull from "
2758
2793
"the source rather than merging. When this happens, you do not need to "
2759
2794
"commit the result."
2760
2795
msgstr ""
2761
2796
2762
#: bzrlib/builtins.py:4335
2797
#: bzrlib/builtins.py:4367
2763
2798
msgid ""
2764
2799
"Branch to merge into, rather than the one containing the working directory."
2765
2800
msgstr ""
2766
2801
2767
#: bzrlib/builtins.py:4337
2802
#: bzrlib/builtins.py:4369
2768
2803
msgid "Instead of merging, show a diff of the merge."
2769
2804
msgstr ""
2770
2805
2771
#: bzrlib/builtins.py:4339
2806
#: bzrlib/builtins.py:4371
2772
2807
msgid "Select changes interactively."
2773
2808
msgstr ""
2774
2809
2775
#: bzrlib/builtins.py:4361
2810
#: bzrlib/builtins.py:4393
2776
2811
msgid ""
2777
2812
"Merging into empty branches not currently supported, "
2778
2813
"https://bugs.launchpad.net/bzr/+bug/308562"
2779
2814
msgstr ""
2780
2815
2781
#: bzrlib/builtins.py:4388
2816
#: bzrlib/builtins.py:4420
2782
2817
msgid "Cannot use --uncommitted with bundles or merge directives."
2783
2818
msgstr ""
2784
2819
2785
#: bzrlib/builtins.py:4399
2820
#: bzrlib/builtins.py:4431
2786
2821
msgid "Cannot use --uncommitted and --revision at the same time."
2787
2822
msgstr ""
2788
2823
2789
#: bzrlib/builtins.py:4419
2824
#: bzrlib/builtins.py:4451
2790
2825
msgid "merger: "
2791
2826
msgstr ""
2792
2827
2793
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2828
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2794
2829
msgid "Nothing to do."
2795
2830
msgstr ""
2796
2831
2797
#: bzrlib/builtins.py:4425
2832
#: bzrlib/builtins.py:4457
2798
2833
msgid "Cannot pull individual files"
2799
2834
msgstr ""
2800
2835
2801
#: bzrlib/builtins.py:4433
2836
#: bzrlib/builtins.py:4465
2802
2837
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2803
2838
msgstr ""
2804
2839
2805
#: bzrlib/builtins.py:4491
2840
#: bzrlib/builtins.py:4523
2806
2841
#, python-format
2807
2842
msgid "Show-base is not supported for this merge type. %s"
2808
2843
msgstr ""
2809
2844
2810
#: bzrlib/builtins.py:4500
2845
#: bzrlib/builtins.py:4532
2811
2846
#, python-format
2812
2847
msgid "Conflict reduction is not supported for merge type %s."
2813
2848
msgstr ""
2814
2849
2815
#: bzrlib/builtins.py:4504
2850
#: bzrlib/builtins.py:4536
2816
2851
msgid "Cannot do conflict reduction and show base."
2817
2852
msgstr ""
2818
2853
2819
#: bzrlib/builtins.py:4615
2854
#: bzrlib/builtins.py:4647
2820
2855
msgid "No location specified or remembered"
2821
2856
msgstr ""
2822
2857
2823
#: bzrlib/builtins.py:4617
2858
#: bzrlib/builtins.py:4649
2824
2859
msgid "{0} remembered {1} location {2}"
2825
2860
msgstr ""
2826
2861
2827
#: bzrlib/builtins.py:4623
2862
#: bzrlib/builtins.py:4655
2828
2863
msgid "Redo a merge."
2829
2864
msgstr ""
2830
2865
2831
#: bzrlib/builtins.py:4625
2866
#: bzrlib/builtins.py:4657
2832
2867
msgid ""
2833
2868
"Use this if you want to try a different merge technique while resolving\n"
2834
2869
"conflicts. Some merge techniques are better than others, and remerge\n"
2835
2870
"lets you try different ones on different files."
2836
2871
msgstr ""
2837
2872
2838
#: bzrlib/builtins.py:4629
2873
#: bzrlib/builtins.py:4661
2839
2874
msgid ""
2840
2875
"The options for remerge have the same meaning and defaults as the ones for\n"
2841
2876
"merge. The difference is that remerge can (only) be run when there is a\n"
2842
2877
"pending merge, and it lets you specify particular files."
2843
2878
msgstr ""
2844
2879
2845
#: bzrlib/builtins.py:4633
2880
#: bzrlib/builtins.py:4665
2846
2881
msgid ""
2847
2882
":Examples:\n"
2848
2883
" Re-do the merge of all conflicted files, and show the base text in\n"
2849
2884
" conflict regions, in addition to the usual THIS and OTHER texts::"
2850
2885
msgstr ""
2851
2886
2852
#: bzrlib/builtins.py:4637
2887
#: bzrlib/builtins.py:4669
2853
2888
msgid " bzr remerge --show-base"
2854
2889
msgstr ""
2855
2890
2856
#: bzrlib/builtins.py:4639
2891
#: bzrlib/builtins.py:4671
2857
2892
msgid ""
2858
2893
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2859
2894
" additional processing to reduce the size of conflict regions::"
2860
2895
msgstr ""
2896
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2897
" additional processing to reduce the size of conflict regions::"
2861
2898
2862
#: bzrlib/builtins.py:4642
2899
#: bzrlib/builtins.py:4674
2863
2900
msgid " bzr remerge --merge-type weave --reprocess foobar"
2864
2901
msgstr ""
2865
2902
2866
#: bzrlib/builtins.py:4649
2903
#: bzrlib/builtins.py:4681
2867
2904
msgid "Show base revision text in conflicts."
2868
2905
msgstr ""
2869
2906
2870
#: bzrlib/builtins.py:4661
2907
#: bzrlib/builtins.py:4693
2871
2908
msgid ""
2872
2909
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2873
2910
"merges."
2874
2911
msgstr ""
2875
2912
2876
#: bzrlib/builtins.py:4717
2877
msgid "Revert files to a previous revision."
2913
#: bzrlib/builtins.py:4751
2914
msgid ""
2915
"Set files in the working tree back to the contents of a previous revision."
2878
2916
msgstr ""
2879
2917
2880
#: bzrlib/builtins.py:4719
2918
#: bzrlib/builtins.py:4753
2881
2919
msgid ""
2882
2920
"Giving a list of files will revert only those files. Otherwise, all files\n"
2883
2921
"will be reverted. If the revision is not specified with '--revision', the\n"
2884
"last committed revision is used."
2922
"working tree basis revision is used. A revert operation affects only the\n"
2923
"working tree, not any revision history like the branch and repository or\n"
2924
"the working tree basis revision."
2885
2925
msgstr ""
2886
2926
2887
#: bzrlib/builtins.py:4723
2927
#: bzrlib/builtins.py:4759
2888
2928
msgid ""
2889
2929
"To remove only some changes, without reverting to a prior version, use\n"
2890
2930
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2891
2931
"will remove the changes introduced by the second last commit (-2), without\n"
2892
2932
"affecting the changes introduced by the last commit (-1). To remove\n"
2893
"certain changes on a hunk-by-hunk basis, see the shelve command."
2933
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2934
"To update the branch to a specific revision or the latest revision and\n"
2935
"update the working tree accordingly while preserving local changes, see the\n"
2936
"update command."
2894
2937
msgstr ""
2895
2938
2896
#: bzrlib/builtins.py:4729
2939
#: bzrlib/builtins.py:4768
2897
2940
msgid ""
2898
"By default, any files that have been manually changed will be backed up\n"
2899
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2900
"'.~#~' appended to their name, where # is a number."
2941
"Uncommitted changes to files that are reverted will be discarded.\n"
2942
"Howver, by default, any files that have been manually changed will be\n"
2943
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2944
"files have '.~#~' appended to their name, where # is a number."
2901
2945
msgstr ""
2902
2946
2903
#: bzrlib/builtins.py:4733
2947
#: bzrlib/builtins.py:4773
2904
2948
msgid ""
2905
2949
"When you provide files, you can use their current pathname or the pathname\n"
2906
2950
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2908
2952
"reverted."
2909
2953
msgstr ""
2910
2954
2911
#: bzrlib/builtins.py:4738
2955
#: bzrlib/builtins.py:4778
2912
2956
msgid ""
2913
2957
"If you have newly added files since the target revision, they will be\n"
2914
2958
"removed. If the files to be removed have been changed, backups will be\n"
2916
2960
"deleted."
2917
2961
msgstr ""
2918
2962
2919
#: bzrlib/builtins.py:4743
2963
#: bzrlib/builtins.py:4783
2920
2964
msgid ""
2921
2965
"The working tree contains a list of revisions that have been merged but\n"
2922
2966
"not yet committed. These revisions will be included as additional parents\n"
2928
2972
"reverting any files."
2929
2973
msgstr ""
2930
2974
2931
#: bzrlib/builtins.py:4752
2975
#: bzrlib/builtins.py:4792
2932
2976
msgid ""
2933
2977
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2934
2978
"changes from a branch in a single revision. To do this, perform the merge\n"
2942
2986
"target branches."
2943
2987
msgstr ""
2944
2988
2945
#: bzrlib/builtins.py:4766
2989
#: bzrlib/builtins.py:4806
2946
2990
msgid "Do not save backups of reverted files."
2947
2991
msgstr ""
2948
2992
2949
#: bzrlib/builtins.py:4768
2993
#: bzrlib/builtins.py:4808
2950
2994
msgid "Remove pending merge marker, without changing any files."
2951
2995
msgstr ""
2952
2996
2953
#: bzrlib/builtins.py:4799
2997
#: bzrlib/builtins.py:4839
2954
2998
msgid ""
2955
2999
"Show help on a command or other topic.\n"
2956
3000
" "
2957
3001
msgstr ""
2958
3002
2959
#: bzrlib/builtins.py:4804
3003
#: bzrlib/builtins.py:4844
2960
3004
msgid "Show help on all commands."
2961
3005
msgstr ""
2962
3006
2963
#: bzrlib/builtins.py:4833
3007
#: bzrlib/builtins.py:4873
2964
3008
msgid "Show unmerged/unpulled revisions between two branches."
2965
3009
msgstr ""
2966
3010
2967
#: bzrlib/builtins.py:4835
3011
#: bzrlib/builtins.py:4875
2968
3012
msgid "OTHER_BRANCH may be local or remote."
2969
3013
msgstr ""
2970
3014
2971
#: bzrlib/builtins.py:4837
3015
#: bzrlib/builtins.py:4877
2972
3016
msgid ""
2973
3017
"To filter on a range of revisions, you can use the command -r begin..end\n"
2974
3018
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2979
3023
" 0 - no missing revisions"
2980
3024
msgstr ""
2981
3025
2982
#: bzrlib/builtins.py:4847
3026
#: bzrlib/builtins.py:4887
2983
3027
msgid ""
2984
3028
" Determine the missing revisions between this and the branch at the\n"
2985
3029
" remembered pull location::"
2986
3030
msgstr ""
2987
3031
2988
#: bzrlib/builtins.py:4850
3032
#: bzrlib/builtins.py:4890
2989
3033
msgid " bzr missing"
2990
3034
msgstr ""
2991
3035
2992
#: bzrlib/builtins.py:4852
3036
#: bzrlib/builtins.py:4892
2993
3037
msgid " Determine the missing revisions between this and another branch::"
2994
3038
msgstr ""
2995
3039
2996
#: bzrlib/builtins.py:4854
3040
#: bzrlib/builtins.py:4894
2997
3041
msgid " bzr missing http://server/branch"
2998
3042
msgstr ""
2999
3043
3000
#: bzrlib/builtins.py:4856
3044
#: bzrlib/builtins.py:4896
3001
3045
msgid ""
3002
3046
" Determine the missing revisions up to a specific revision on the other\n"
3003
3047
" branch::"
3004
3048
msgstr ""
3005
3049
3006
#: bzrlib/builtins.py:4859
3050
#: bzrlib/builtins.py:4899
3007
3051
msgid " bzr missing -r ..-10"
3008
3052
msgstr ""
3009
3053
3010
#: bzrlib/builtins.py:4861
3054
#: bzrlib/builtins.py:4901
3011
3055
msgid ""
3012
3056
" Determine the missing revisions up to a specific revision on this\n"
3013
3057
" branch::"
3014
3058
msgstr ""
3015
3059
3016
#: bzrlib/builtins.py:4864
3060
#: bzrlib/builtins.py:4904
3017
3061
msgid " bzr missing --my-revision ..-10"
3018
3062
msgstr ""
3019
3063
3020
#: bzrlib/builtins.py:4871
3064
#: bzrlib/builtins.py:4911
3021
3065
msgid "Reverse the order of revisions."
3022
3066
msgstr ""
3023
3067
3024
#: bzrlib/builtins.py:4873
3068
#: bzrlib/builtins.py:4913
3025
3069
msgid "Display changes in the local branch only."
3026
3070
msgstr ""
3027
3071
3028
#: bzrlib/builtins.py:4874
3072
#: bzrlib/builtins.py:4914
3029
3073
msgid "Same as --mine-only."
3030
3074
msgstr ""
3031
3075
3032
#: bzrlib/builtins.py:4876
3076
#: bzrlib/builtins.py:4916
3033
3077
msgid "Display changes in the remote branch only."
3034
3078
msgstr ""
3035
3079
3036
#: bzrlib/builtins.py:4877
3080
#: bzrlib/builtins.py:4917
3037
3081
msgid "Same as --theirs-only."
3038
3082
msgstr ""
3039
3083
3040
#: bzrlib/builtins.py:4882
3084
#: bzrlib/builtins.py:4922
3041
3085
msgid ""
3042
3086
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3043
3087
"details."
3044
3088
msgstr ""
3045
3089
3046
#: bzrlib/builtins.py:4886
3090
#: bzrlib/builtins.py:4926
3047
3091
msgid ""
3048
3092
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3049
3093
"details."
3050
3094
msgstr ""
3051
3095
3052
#: bzrlib/builtins.py:4889
3096
#: bzrlib/builtins.py:4929
3053
3097
msgid "Show all revisions in addition to the mainline ones."
3054
3098
msgstr ""
3055
3099
3056
#: bzrlib/builtins.py:4943
3100
#: bzrlib/builtins.py:4983
3057
3101
msgid "No peer location known or specified."
3058
3102
msgstr ""
3059
3103
3060
#: bzrlib/builtins.py:4947
3104
#: bzrlib/builtins.py:4987
3061
3105
msgid "Using saved parent location: {0}\n"
3062
3106
msgstr ""
3063
3107
3064
#: bzrlib/builtins.py:4980
3108
#: bzrlib/builtins.py:5020
3065
3109
#, python-format
3066
3110
msgid "You have %d extra revision:\n"
3067
3111
msgid_plural "You have %d extra revisions:\n"
3068
3112
msgstr[0] ""
3069
3113
msgstr[1] ""
3070
3114
3071
#: bzrlib/builtins.py:4996
3115
#: bzrlib/builtins.py:5040
3072
3116
#, python-format
3073
3117
msgid "You are missing %d revision:\n"
3074
3118
msgid_plural "You are missing %d revisions:\n"
3075
3119
msgstr[0] ""
3076
3120
msgstr[1] ""
3077
3121
3078
#: bzrlib/builtins.py:5008
3122
#: bzrlib/builtins.py:5055
3079
3123
msgid "This branch has no new revisions.\n"
3080
3124
msgstr ""
3081
3125
3082
#: bzrlib/builtins.py:5011
3126
#: bzrlib/builtins.py:5058
3083
3127
msgid "Other branch has no new revisions.\n"
3084
3128
msgstr ""
3085
3129
3086
#: bzrlib/builtins.py:5016
3130
#: bzrlib/builtins.py:5063
3087
3131
msgid "Branches are up to date.\n"
3088
3132
msgstr ""
3089
3133
3090
#: bzrlib/builtins.py:5027
3134
#: bzrlib/builtins.py:5074
3091
3135
msgid "Compress the data within a repository."
3092
3136
msgstr ""
3093
3137
3094
#: bzrlib/builtins.py:5029
3138
#: bzrlib/builtins.py:5076
3095
3139
msgid ""
3096
3140
"This operation compresses the data within a bazaar repository. As\n"
3097
3141
"bazaar supports automatic packing of repository, this operation is\n"
3098
3142
"normally not required to be done manually."
3099
3143
msgstr ""
3100
3144
3101
#: bzrlib/builtins.py:5033
3145
#: bzrlib/builtins.py:5080
3102
3146
msgid ""
3103
3147
"During the pack operation, bazaar takes a backup of existing repository\n"
3104
3148
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3107
3151
"used."
3108
3152
msgstr ""
3109
3153
3110
#: bzrlib/builtins.py:5039
3154
#: bzrlib/builtins.py:5086
3111
3155
msgid ""
3112
3156
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3113
3157
"during or immediately after repacking, you may be left with a state\n"
3115
3159
"been. In this case the repository may be unusable."
3116
3160
msgstr ""
3117
3161
3118
#: bzrlib/builtins.py:5048
3162
#: bzrlib/builtins.py:5095
3119
3163
msgid "Delete obsolete packs to save disk space."
3120
3164
msgstr ""
3121
3165
3122
#: bzrlib/builtins.py:5062
3166
#: bzrlib/builtins.py:5109
3123
3167
msgid "List the installed plugins."
3124
3168
msgstr ""
3125
3169
3126
#: bzrlib/builtins.py:5064
3170
#: bzrlib/builtins.py:5111
3127
3171
msgid ""
3128
3172
"This command displays the list of installed plugins including\n"
3129
3173
"version of plugin and a short description of each."
3130
3174
msgstr ""
3131
3175
3132
#: bzrlib/builtins.py:5067
3176
#: bzrlib/builtins.py:5114
3133
3177
msgid "--verbose shows the path where each plugin is located."
3134
3178
msgstr ""
3135
3179
3136
#: bzrlib/builtins.py:5069
3180
#: bzrlib/builtins.py:5116
3137
3181
msgid ""
3138
3182
"A plugin is an external component for Bazaar that extends the\n"
3139
3183
"revision control system, by adding or replacing code in Bazaar.\n"
3142
3186
"customizing log output."
3143
3187
msgstr ""
3144
3188
3145
#: bzrlib/builtins.py:5075
3189
#: bzrlib/builtins.py:5122
3146
3190
msgid ""
3147
3191
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3148
3192
"for further information on plugins including where to find them and how to\n"
3150
3194
"plugins using the Python programming language."
3151
3195
msgstr ""
3152
3196
3153
#: bzrlib/builtins.py:5091
3197
#: bzrlib/builtins.py:5138
3154
3198
msgid "Show testament (signing-form) of a revision."
3155
3199
msgstr ""
3156
3200
3157
#: bzrlib/builtins.py:5094
3201
#: bzrlib/builtins.py:5141
3158
3202
msgid "Produce long-format testament."
3159
3203
msgstr ""
3160
3204
3161
#: bzrlib/builtins.py:5096
3205
#: bzrlib/builtins.py:5143
3162
3206
msgid "Produce a strict-format testament."
3163
3207
msgstr ""
3164
3208
3165
#: bzrlib/builtins.py:5122
3209
#: bzrlib/builtins.py:5169
3166
3210
msgid "Show the origin of each line in a file."
3167
3211
msgstr ""
3168
3212
3169
#: bzrlib/builtins.py:5124
3213
#: bzrlib/builtins.py:5171
3170
3214
msgid ""
3171
3215
"This prints out the given file with an annotation on the left side\n"
3172
3216
"indicating which revision, author and date introduced the change."
3173
3217
msgstr ""
3174
3218
3175
#: bzrlib/builtins.py:5127
3219
#: bzrlib/builtins.py:5174
3176
3220
msgid ""
3177
3221
"If the origin is the same for a run of consecutive lines, it is\n"
3178
3222
"shown only at the top, unless the --all option is given."
3179
3223
msgstr ""
3180
3224
3181
#: bzrlib/builtins.py:5135
3225
#: bzrlib/builtins.py:5182
3182
3226
msgid "Show annotations on all lines."
3183
3227
msgstr ""
3184
3228
3185
#: bzrlib/builtins.py:5136
3229
#: bzrlib/builtins.py:5183
3186
3230
msgid "Show commit date in annotations."
3187
3231
msgstr ""
3188
3232
3189
#: bzrlib/builtins.py:5223
3233
#: bzrlib/builtins.py:5270
3190
3234
msgid "Cannot sign a range of non-revision-history revisions"
3191
3235
msgstr ""
3192
3236
3193
#: bzrlib/builtins.py:5235
3237
#: bzrlib/builtins.py:5282
3194
3238
msgid "Please supply either one revision, or a range."
3195
3239
msgstr ""
3196
3240
3197
#: bzrlib/builtins.py:5239
3241
#: bzrlib/builtins.py:5286
3198
3242
msgid ""
3199
3243
"Convert the current branch into a checkout of the supplied branch.\n"
3200
3244
"If no branch is supplied, rebind to the last bound location."
3201
3245
msgstr ""
3202
3246
3203
#: bzrlib/builtins.py:5242
3247
#: bzrlib/builtins.py:5289
3204
3248
msgid ""
3205
3249
"Once converted into a checkout, commits must succeed on the master branch\n"
3206
3250
"before they will be applied to the local branch."
3207
3251
msgstr ""
3208
3252
3209
#: bzrlib/builtins.py:5245
3253
#: bzrlib/builtins.py:5292
3210
3254
msgid ""
3211
3255
"Bound branches use the nickname of its master branch unless it is set\n"
3212
3256
"locally, in which case binding will update the local nickname to be\n"
3213
3257
"that of the master."
3214
3258
msgstr ""
3215
3259
3216
#: bzrlib/builtins.py:5260
3260
#: bzrlib/builtins.py:5307
3217
3261
msgid "No location supplied. This format does not remember old locations."
3218
3262
msgstr ""
3219
3263
3220
#: bzrlib/builtins.py:5265
3264
#: bzrlib/builtins.py:5313
3221
3265
msgid "Branch is already bound"
3222
3266
msgstr ""
3223
3267
3224
#: bzrlib/builtins.py:5267
3268
#: bzrlib/builtins.py:5316
3225
3269
msgid "No location supplied and no previous location known"
3226
3270
msgstr ""
3227
3271
3228
#: bzrlib/builtins.py:5273
3272
#: bzrlib/builtins.py:5322
3229
3273
msgid "These branches have diverged. Try merging, and then bind again."
3230
3274
msgstr ""
3231
3275
3232
#: bzrlib/builtins.py:5280
3276
#: bzrlib/builtins.py:5329
3233
3277
msgid "Convert the current checkout into a regular branch."
3234
3278
msgstr ""
3235
3279
3236
#: bzrlib/builtins.py:5282
3280
#: bzrlib/builtins.py:5331
3237
3281
msgid ""
3238
3282
"After unbinding, the local branch is considered independent and subsequent\n"
3239
3283
"commits will be local only."
3240
3284
msgstr ""
3241
3285
3242
#: bzrlib/builtins.py:5293
3286
#: bzrlib/builtins.py:5342
3243
3287
msgid "Local branch is not bound"
3244
3288
msgstr ""
3245
3289
3246
#: bzrlib/builtins.py:5297
3290
#: bzrlib/builtins.py:5346
3247
3291
msgid "Remove the last committed revision."
3248
3292
msgstr ""
3249
3293
3250
#: bzrlib/builtins.py:5299
3294
#: bzrlib/builtins.py:5348
3251
3295
msgid ""
3252
3296
"--verbose will print out what is being removed.\n"
3253
3297
"--dry-run will go through all the motions, but not actually\n"
3254
3298
"remove anything."
3255
3299
msgstr ""
3256
3300
3257
#: bzrlib/builtins.py:5303
3301
#: bzrlib/builtins.py:5352
3258
3302
msgid ""
3259
3303
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3260
3304
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3261
3305
"branch at revision 15."
3262
3306
msgstr ""
3263
3307
3264
#: bzrlib/builtins.py:5307
3308
#: bzrlib/builtins.py:5356
3265
3309
msgid ""
3266
3310
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3267
3311
"it may make is to restore any pending merges that were present before\n"
3268
3312
"the commit."
3269
3313
msgstr ""
3270
3314
3271
#: bzrlib/builtins.py:5318
3315
#: bzrlib/builtins.py:5367
3272
3316
msgid "Don't actually make changes."
3273
3317
msgstr ""
3274
3318
3275
#: bzrlib/builtins.py:5319
3319
#: bzrlib/builtins.py:5368
3276
3320
msgid "Say yes to all questions."
3277
3321
msgstr ""
3278
3322
3279
#: bzrlib/builtins.py:5321
3323
#: bzrlib/builtins.py:5370
3280
3324
msgid "Keep tags that point to removed revisions."
3281
3325
msgstr ""
3282
3326
3283
#: bzrlib/builtins.py:5323
3327
#: bzrlib/builtins.py:5372
3284
3328
msgid "Only remove the commits from the local branch when in a checkout."
3285
3329
msgstr ""
3286
3330
3287
#: bzrlib/builtins.py:5372
3331
#: bzrlib/builtins.py:5421
3288
3332
msgid "No revisions to uncommit.\n"
3289
3333
msgstr ""
3290
3334
3291
#: bzrlib/builtins.py:5387
3335
#: bzrlib/builtins.py:5436
3292
3336
msgid "Dry-run, pretending to remove the above revisions.\n"
3293
3337
msgstr ""
3294
3338
3295
#: bzrlib/builtins.py:5390
3339
#: bzrlib/builtins.py:5439
3296
3340
msgid "The above revision(s) will be removed.\n"
3297
3341
msgstr ""
3298
3342
3299
#: bzrlib/builtins.py:5394
3343
#: bzrlib/builtins.py:5443
3300
3344
msgid "Uncommit these revisions"
3301
3345
msgstr ""
3302
3346
3303
#: bzrlib/builtins.py:5397
3347
#: bzrlib/builtins.py:5446
3304
3348
msgid "Canceled\n"
3305
3349
msgstr ""
3306
3350
3307
#: bzrlib/builtins.py:5404
3351
#: bzrlib/builtins.py:5453
3308
3352
#, python-format
3309
3353
msgid ""
3310
3354
"You can restore the old tip by running:\n"
3311
3355
" bzr pull . -r revid:%s\n"
3312
3356
msgstr ""
3313
3357
3314
#: bzrlib/builtins.py:5409
3358
#: bzrlib/builtins.py:5458
3315
3359
msgid "Break a dead lock."
3316
3360
msgstr ""
3317
3361
3318
#: bzrlib/builtins.py:5411
3362
#: bzrlib/builtins.py:5460
3319
3363
msgid ""
3320
3364
"This command breaks a lock on a repository, branch, working directory or\n"
3321
3365
"config file."
3322
3366
msgstr ""
3323
3367
3324
#: bzrlib/builtins.py:5414
3368
#: bzrlib/builtins.py:5463
3325
3369
msgid ""
3326
3370
"CAUTION: Locks should only be broken when you are sure that the process\n"
3327
3371
"holding the lock has been stopped."
3328
3372
msgstr ""
3329
3373
3330
#: bzrlib/builtins.py:5417
3374
#: bzrlib/builtins.py:5466
3331
3375
msgid ""
3332
3376
"You can get information on what locks are open via the 'bzr info\n"
3333
3377
"[location]' command."
3334
3378
msgstr ""
3335
3379
3336
#: bzrlib/builtins.py:5420
3380
#: bzrlib/builtins.py:5469
3337
3381
msgid ""
3338
3382
":Examples:\n"
3339
3383
" bzr break-lock\n"
3341
3385
" bzr break-lock --conf ~/.bazaar"
3342
3386
msgstr ""
3343
3387
3344
#: bzrlib/builtins.py:5429
3388
#: bzrlib/builtins.py:5478
3345
3389
msgid "LOCATION is the directory where the config lock is."
3346
3390
msgstr ""
3347
3391
3348
#: bzrlib/builtins.py:5431
3392
#: bzrlib/builtins.py:5480
3349
3393
msgid "Do not ask for confirmation before breaking the lock."
3350
3394
msgstr ""
3351
3395
3352
#: bzrlib/builtins.py:5466
3396
#: bzrlib/builtins.py:5515
3353
3397
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3354
3398
msgstr ""
3355
3399
3356
#: bzrlib/builtins.py:5467
3400
#: bzrlib/builtins.py:5516
3357
3401
msgid "Run the bzr server."
3358
3402
msgstr ""
3359
3403
3360
#: bzrlib/builtins.py:5473
3404
#: bzrlib/builtins.py:5522
3361
3405
msgid "Serve on stdin/out for use from inetd or sshd."
3362
3406
msgstr ""
3363
3407
3364
#: bzrlib/builtins.py:5474
3408
#: bzrlib/builtins.py:5523
3365
3409
msgid "protocol"
3366
3410
msgstr ""
3367
3411
3368
#: bzrlib/builtins.py:5475
3412
#: bzrlib/builtins.py:5524
3369
3413
msgid "Protocol to serve."
3370
3414
msgstr ""
3371
3415
3372
#: bzrlib/builtins.py:5479
3416
#: bzrlib/builtins.py:5528
3417
msgid "Listen for connections on nominated address."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5530
3373
3421
msgid ""
3374
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3375
"Passing 0 as the port number will result in a dynamically allocated port. "
3376
"The default port depends on the protocol."
3422
"Listen for connections on nominated port. Passing 0 as the port number will "
3423
"result in a dynamically allocated port. The default port depends on the "
3424
"protocol."
3377
3425
msgstr ""
3378
3426
3379
#: bzrlib/builtins.py:5485
3427
#: bzrlib/builtins.py:5535
3380
3428
msgid "Serve contents of this directory."
3381
3429
msgstr ""
3382
3430
3383
#: bzrlib/builtins.py:5487
3431
#: bzrlib/builtins.py:5537
3384
3432
msgid ""
3385
3433
"By default the server is a readonly server. Supplying --allow-writes "
3386
3434
"enables write access to the contents of the served directory and below. "
3389
3437
"uncontrolled write access to your file system."
3390
3438
msgstr ""
3391
3439
3392
#: bzrlib/builtins.py:5496
3440
#: bzrlib/builtins.py:5546
3393
3441
msgid "Override the default idle client timeout (5min)."
3394
3442
msgstr ""
3395
3443
3396
#: bzrlib/builtins.py:5546
3444
#: bzrlib/builtins.py:5564
3397
3445
msgid "Combine a tree into its containing tree."
3398
3446
msgstr ""
3399
3447
3400
#: bzrlib/builtins.py:5548
3448
#: bzrlib/builtins.py:5566
3401
3449
msgid "This command requires the target tree to be in a rich-root format."
3402
3450
msgstr ""
3403
3451
3404
#: bzrlib/builtins.py:5550
3452
#: bzrlib/builtins.py:5568
3405
3453
msgid ""
3406
3454
"The TREE argument should be an independent tree, inside another tree, but\n"
3407
3455
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3408
3456
"running \"bzr branch\" with the target inside a tree.)"
3409
3457
msgstr ""
3410
3458
3411
#: bzrlib/builtins.py:5554
3459
#: bzrlib/builtins.py:5572
3412
3460
msgid ""
3413
3461
"The result is a combined tree, with the subtree no longer an independent\n"
3414
3462
"part. This is marked as a merge of the subtree into the containing tree,\n"
3415
3463
"and all history is preserved."
3416
3464
msgstr ""
3417
3465
3418
#: bzrlib/builtins.py:5572
3466
#: bzrlib/builtins.py:5590
3419
3467
#, python-format
3420
3468
msgid ""
3421
3469
"Can't join trees because %s doesn't support rich root data.\n"
3422
3470
"You can use bzr upgrade on the repository."
3423
3471
msgstr ""
3424
3472
3425
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3473
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3426
3474
msgid "Cannot join {0}. {1}"
3427
3475
msgstr ""
3428
3476
3429
#: bzrlib/builtins.py:5592
3477
#: bzrlib/builtins.py:5610
3430
3478
msgid "Split a subdirectory of a tree into a separate tree."
3431
3479
msgstr ""
3432
3480
3433
#: bzrlib/builtins.py:5594
3481
#: bzrlib/builtins.py:5612
3434
3482
msgid ""
3435
3483
"This command will produce a target tree in a format that supports\n"
3436
3484
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3437
3485
"converted into earlier formats like 'dirstate-tags'."
3438
3486
msgstr ""
3439
3487
3440
#: bzrlib/builtins.py:5598
3488
#: bzrlib/builtins.py:5616
3441
3489
msgid ""
3442
3490
"The TREE argument should be a subdirectory of a working tree. That\n"
3443
3491
"subdirectory will be converted into an independent tree, with its own\n"
3444
3492
"branch. Commits in the top-level tree will not apply to the new subtree."
3445
3493
msgstr ""
3446
3494
3447
#: bzrlib/builtins.py:5678
3495
#: bzrlib/builtins.py:5696
3448
3496
msgid "No submit branch specified or known"
3449
3497
msgstr ""
3450
3498
3451
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3499
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3452
3500
msgid "No public branch specified or known"
3453
3501
msgstr ""
3454
3502
3455
#: bzrlib/builtins.py:5691
3503
#: bzrlib/builtins.py:5710
3456
3504
msgid "bzr merge-directive takes at most two one revision identifiers"
3457
3505
msgstr ""
3458
3506
3459
#: bzrlib/builtins.py:5700
3507
#: bzrlib/builtins.py:5719
3460
3508
msgid "No revisions to bundle."
3461
3509
msgstr ""
3462
3510
3463
#: bzrlib/builtins.py:5719
3511
#: bzrlib/builtins.py:5738
3464
3512
msgid "Mail or create a merge-directive for submitting changes."
3465
3513
msgstr ""
3466
3514
3467
#: bzrlib/builtins.py:5721
3515
#: bzrlib/builtins.py:5740
3468
3516
msgid "A merge directive provides many things needed for requesting merges:"
3469
3517
msgstr ""
3470
3518
3471
#: bzrlib/builtins.py:5723
3519
#: bzrlib/builtins.py:5742
3472
3520
msgid "* A machine-readable description of the merge to perform"
3473
3521
msgstr ""
3474
3522
3475
#: bzrlib/builtins.py:5725
3523
#: bzrlib/builtins.py:5744
3476
3524
msgid "* An optional patch that is a preview of the changes requested"
3477
3525
msgstr ""
3478
3526
3479
#: bzrlib/builtins.py:5727
3527
#: bzrlib/builtins.py:5746
3480
3528
msgid ""
3481
3529
"* An optional bundle of revision data, so that the changes can be applied\n"
3482
3530
" directly from the merge directive, without retrieving data from a\n"
3483
3531
" branch."
3484
3532
msgstr ""
3485
3533
3486
#: bzrlib/builtins.py:5731
3534
#: bzrlib/builtins.py:5750
3487
3535
msgid ""
3488
3536
"`bzr send` creates a compact data set that, when applied using bzr\n"
3489
3537
"merge, has the same effect as merging from the source branch. "
3490
3538
msgstr ""
3491
3539
3492
#: bzrlib/builtins.py:5734
3540
#: bzrlib/builtins.py:5753
3493
3541
msgid ""
3494
3542
"By default the merge directive is self-contained and can be applied to any\n"
3495
3543
"branch containing submit_branch in its ancestory without needing access to\n"
3496
3544
"the source branch."
3497
3545
msgstr ""
3498
3546
3499
#: bzrlib/builtins.py:5738
3547
#: bzrlib/builtins.py:5757
3500
3548
msgid ""
3501
3549
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3502
3550
"revisions, but only a structured request to merge from the\n"
3505
3553
"included if known, so that people can check it later."
3506
3554
msgstr ""
3507
3555
3508
#: bzrlib/builtins.py:5744
3556
#: bzrlib/builtins.py:5763
3509
3557
msgid ""
3510
3558
"The submit branch defaults to the parent of the source branch, but can be\n"
3511
3559
"overridden. Both submit branch and public branch will be remembered in\n"
3514
3562
"be changed using --from."
3515
3563
msgstr ""
3516
3564
3517
#: bzrlib/builtins.py:5750
3565
#: bzrlib/builtins.py:5769
3518
3566
msgid ""
3519
3567
"Both the submit branch and the public branch follow the usual behavior with\n"
3520
3568
"respect to --remember: If there is no default location set, the first send\n"
3523
3571
"--remember. The value will only be saved if the location can be accessed."
3524
3572
msgstr ""
3525
3573
3526
#: bzrlib/builtins.py:5756
3574
#: bzrlib/builtins.py:5775
3527
3575
msgid ""
3528
3576
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3529
3577
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3531
3579
"in the merge directive."
3532
3580
msgstr ""
3533
3581
3534
#: bzrlib/builtins.py:5761
3582
#: bzrlib/builtins.py:5780
3535
3583
msgid ""
3536
3584
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3537
3585
"given, in which case it is sent to a file."
3538
3586
msgstr ""
3539
3587
3540
#: bzrlib/builtins.py:5764
3588
#: bzrlib/builtins.py:5783
3541
3589
msgid ""
3542
3590
"Mail is sent using your preferred mail program. This should be transparent\n"
3543
3591
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3544
3592
"If the preferred client can't be found (or used), your editor will be used."
3545
3593
msgstr ""
3546
3594
3547
#: bzrlib/builtins.py:5768
3595
#: bzrlib/builtins.py:5787
3548
3596
msgid ""
3549
3597
"To use a specific mail program, set the mail_client configuration option.\n"
3550
3598
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3556
3604
"supported clients."
3557
3605
msgstr ""
3558
3606
3559
#: bzrlib/builtins.py:5775
3607
#: bzrlib/builtins.py:5794
3560
3608
msgid ""
3561
3609
"If mail is being sent, a to address is required. This can be supplied\n"
3562
3610
"either on the commandline, by setting the submit_to configuration\n"
3564
3612
"in the submit branch."
3565
3613
msgstr ""
3566
3614
3567
#: bzrlib/builtins.py:5780
3615
#: bzrlib/builtins.py:5799
3568
3616
msgid ""
3569
3617
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3570
3618
"and\n"
3574
3622
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3575
3623
msgstr ""
3576
3624
3577
#: bzrlib/builtins.py:5786
3625
#: bzrlib/builtins.py:5805
3578
3626
msgid ""
3579
3627
"The merge directives created by bzr send may be applied using bzr merge or\n"
3580
3628
"bzr pull by specifying a file containing a merge directive as the location."
3581
3629
msgstr ""
3582
3630
3583
#: bzrlib/builtins.py:5789
3631
#: bzrlib/builtins.py:5808
3584
3632
msgid ""
3585
3633
"bzr send makes extensive use of public locations to map local locations "
3586
3634
"into\n"
3588
3636
"set them, and use `bzr info` to display them."
3589
3637
msgstr ""
3590
3638
3591
#: bzrlib/builtins.py:5813
3639
#: bzrlib/builtins.py:5832
3592
3640
msgid "Write merge directive to this file or directory; use - for stdout."
3593
3641
msgstr ""
3594
3642
3595
#: bzrlib/builtins.py:5817
3643
#: bzrlib/builtins.py:5836
3596
3644
msgid ""
3597
3645
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3598
3646
"strict disables the check."
3599
3647
msgstr ""
3600
3648
3601
#: bzrlib/builtins.py:5819
3649
#: bzrlib/builtins.py:5838
3602
3650
msgid "Mail the request to this address."
3603
3651
msgstr ""
3604
3652
3605
#: bzrlib/builtins.py:5823
3653
#: bzrlib/builtins.py:5842
3606
3654
msgid "Body for the email."
3607
3655
msgstr ""
3608
3656
3609
#: bzrlib/builtins.py:5876
3657
#: bzrlib/builtins.py:5895
3610
3658
msgid "Do not include a bundle in the merge directive."
3611
3659
msgstr ""
3612
3660
3613
#: bzrlib/builtins.py:5877
3661
#: bzrlib/builtins.py:5896
3614
3662
msgid "Do not include a preview patch in the merge directive."
3615
3663
msgstr ""
3616
3664
3617
#: bzrlib/builtins.py:5880
3665
#: bzrlib/builtins.py:5899
3618
3666
msgid "Remember submit and public branch."
3619
3667
msgstr ""
3620
3668
3621
#: bzrlib/builtins.py:5882
3669
#: bzrlib/builtins.py:5901
3622
3670
msgid ""
3623
3671
"Branch to generate the submission from, rather than the one containing the "
3624
3672
"working directory."
3625
3673
msgstr ""
3626
3674
3627
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3675
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3628
3676
msgid "format"
3629
3677
msgstr ""
3630
3678
3631
#: bzrlib/builtins.py:5893
3679
#: bzrlib/builtins.py:5912
3632
3680
msgid "Use the specified output format."
3633
3681
msgstr ""
3634
3682
3635
#: bzrlib/builtins.py:5915
3683
#: bzrlib/builtins.py:5934
3636
3684
msgid "Create, remove or modify a tag naming a revision."
3637
3685
msgstr ""
3638
3686
3639
#: bzrlib/builtins.py:5917
3687
#: bzrlib/builtins.py:5936
3640
3688
msgid ""
3641
3689
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3642
3690
"(--revision) option can be given -rtag:X, where X is any previously\n"
3643
3691
"created tag."
3644
3692
msgstr ""
3645
3693
3646
#: bzrlib/builtins.py:5921
3694
#: bzrlib/builtins.py:5940
3647
3695
msgid ""
3648
3696
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3649
3697
"along when you branch, push, pull or merge."
3650
3698
msgstr ""
3651
3699
3652
#: bzrlib/builtins.py:5924
3700
#: bzrlib/builtins.py:5943
3653
3701
msgid ""
3654
3702
"It is an error to give a tag name that already exists unless you pass\n"
3655
3703
"--force, in which case the tag is moved to point to the new revision."
3656
3704
msgstr ""
3657
3705
3658
#: bzrlib/builtins.py:5927
3706
#: bzrlib/builtins.py:5946
3659
3707
msgid ""
3660
3708
"To rename a tag (change the name but keep it on the same revsion), run "
3661
3709
"``bzr\n"
3662
3710
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3663
3711
msgstr ""
3664
3712
3665
#: bzrlib/builtins.py:5930
3713
#: bzrlib/builtins.py:5949
3666
3714
msgid ""
3667
3715
"If no tag name is specified it will be determined through the \n"
3668
3716
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3670
3718
"details."
3671
3719
msgstr ""
3672
3720
3673
#: bzrlib/builtins.py:5940
3721
#: bzrlib/builtins.py:5959
3674
3722
msgid "Delete this tag rather than placing it."
3675
3723
msgstr ""
3676
3724
3677
#: bzrlib/builtins.py:5943
3725
#: bzrlib/builtins.py:5962
3678
3726
msgid "Branch in which to place the tag."
3679
3727
msgstr ""
3680
3728
3681
#: bzrlib/builtins.py:5945
3729
#: bzrlib/builtins.py:5964
3682
3730
msgid "Replace existing tags."
3683
3731
msgstr ""
3684
3732
3685
#: bzrlib/builtins.py:5960
3733
#: bzrlib/builtins.py:5979
3686
3734
msgid "No tag specified to delete."
3687
3735
msgstr ""
3688
3736
3689
#: bzrlib/builtins.py:5962
3737
#: bzrlib/builtins.py:5981
3690
3738
#, python-format
3691
3739
msgid "Deleted tag %s."
3692
3740
msgstr ""
3693
3741
3694
#: bzrlib/builtins.py:5976
3742
#: bzrlib/builtins.py:5995
3695
3743
msgid "Please specify a tag name."
3696
3744
msgstr ""
3697
3745
3698
#: bzrlib/builtins.py:5984
3746
#: bzrlib/builtins.py:6003
3699
3747
#, python-format
3700
3748
msgid "Tag %s already exists for that revision."
3701
3749
msgstr ""
3702
3750
3703
#: bzrlib/builtins.py:5988
3751
#: bzrlib/builtins.py:6007
3704
3752
#, python-format
3705
3753
msgid "Created tag %s."
3706
3754
msgstr ""
3707
3755
3708
#: bzrlib/builtins.py:5990
3756
#: bzrlib/builtins.py:6009
3709
3757
#, python-format
3710
3758
msgid "Updated tag %s."
3711
3759
msgstr ""
3712
3760
3713
#: bzrlib/builtins.py:5994
3761
#: bzrlib/builtins.py:6013
3714
3762
msgid "List tags."
3715
3763
msgstr ""
3716
3764
3717
#: bzrlib/builtins.py:5996
3765
#: bzrlib/builtins.py:6015
3718
3766
msgid ""
3719
3767
"This command shows a table of tag names and the revisions they reference."
3720
3768
msgstr ""
3721
3769
3722
#: bzrlib/builtins.py:6002
3770
#: bzrlib/builtins.py:6021
3723
3771
msgid "Branch whose tags should be displayed."
3724
3772
msgstr ""
3725
3773
3726
#: bzrlib/builtins.py:6004
3774
#: bzrlib/builtins.py:6023
3727
3775
msgid "Sort tags by different criteria."
3728
3776
msgstr ""
3729
3777
3730
#: bzrlib/builtins.py:6004
3778
#: bzrlib/builtins.py:6023
3731
3779
msgid "Sorting"
3732
3780
msgstr ""
3733
3781
3734
#: bzrlib/builtins.py:6073
3782
#: bzrlib/builtins.py:6092
3735
3783
msgid "Reconfigure the type of a bzr directory."
3736
3784
msgstr ""
3737
3785
3738
#: bzrlib/builtins.py:6075
3786
#: bzrlib/builtins.py:6094
3739
3787
msgid "A target configuration must be specified."
3740
3788
msgstr ""
3741
3789
3742
#: bzrlib/builtins.py:6077
3790
#: bzrlib/builtins.py:6096
3743
3791
msgid ""
3744
3792
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3745
3793
"The order of preference is\n"
3750
3798
"If none of these is available, --bind-to must be specified."
3751
3799
msgstr ""
3752
3800
3753
#: bzrlib/builtins.py:6091
3801
#: bzrlib/builtins.py:6110
3754
3802
msgid "Tree type"
3755
3803
msgstr ""
3756
3804
3757
#: bzrlib/builtins.py:6092
3805
#: bzrlib/builtins.py:6111
3758
3806
msgid "The relation between branch and tree."
3759
3807
msgstr ""
3760
3808
3761
#: bzrlib/builtins.py:6094
3809
#: bzrlib/builtins.py:6113
3762
3810
msgid "Reconfigure to be an unbound branch with no working tree."
3763
3811
msgstr ""
3764
3812
3765
#: bzrlib/builtins.py:6095
3813
#: bzrlib/builtins.py:6114
3766
3814
msgid "Reconfigure to be an unbound branch with a working tree."
3767
3815
msgstr ""
3768
3816
3769
#: bzrlib/builtins.py:6096
3817
#: bzrlib/builtins.py:6115
3770
3818
msgid "Reconfigure to be a bound branch with a working tree."
3771
3819
msgstr ""
3772
3820
3773
#: bzrlib/builtins.py:6097
3821
#: bzrlib/builtins.py:6116
3774
3822
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3775
3823
msgstr ""
3776
3824
3777
#: bzrlib/builtins.py:6102
3825
#: bzrlib/builtins.py:6121
3778
3826
msgid "Repository type"
3779
3827
msgstr ""
3780
3828
3781
#: bzrlib/builtins.py:6103
3829
#: bzrlib/builtins.py:6122
3782
3830
msgid "Location fo the repository."
3783
3831
msgstr ""
3784
3832
3785
#: bzrlib/builtins.py:6105
3833
#: bzrlib/builtins.py:6124
3786
3834
msgid ""
3787
3835
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3788
3836
msgstr ""
3789
3837
3790
#: bzrlib/builtins.py:6107
3838
#: bzrlib/builtins.py:6126
3791
3839
msgid "Reconfigure to use a shared repository."
3792
3840
msgstr ""
3793
3841
3794
#: bzrlib/builtins.py:6111
3842
#: bzrlib/builtins.py:6130
3795
3843
msgid "Trees in Repository"
3796
3844
msgstr ""
3797
3845
3798
#: bzrlib/builtins.py:6112
3846
#: bzrlib/builtins.py:6131
3799
3847
msgid "Whether new branches in the repository have trees."
3800
3848
msgstr ""
3801
3849
3802
#: bzrlib/builtins.py:6114
3850
#: bzrlib/builtins.py:6133
3803
3851
msgid ""
3804
3852
"Reconfigure repository to create working trees on branches by default."
3805
3853
msgstr ""
3806
3854
3807
#: bzrlib/builtins.py:6116
3855
#: bzrlib/builtins.py:6135
3808
3856
msgid ""
3809
3857
"Reconfigure repository to not create working trees on branches by default."
3810
3858
msgstr ""
3811
3859
3812
#: bzrlib/builtins.py:6119
3860
#: bzrlib/builtins.py:6138
3813
3861
msgid "Branch to bind checkout to."
3814
3862
msgstr ""
3815
3863
3816
#: bzrlib/builtins.py:6121
3864
#: bzrlib/builtins.py:6140
3817
3865
msgid "Perform reconfiguration even if local changes will be lost."
3818
3866
msgstr ""
3819
3867
3820
#: bzrlib/builtins.py:6124
3868
#: bzrlib/builtins.py:6143
3821
3869
msgid "Reconfigure a branch to be stacked on another branch."
3822
3870
msgstr ""
3823
3871
3824
#: bzrlib/builtins.py:6128
3872
#: bzrlib/builtins.py:6147
3825
3873
msgid ""
3826
3874
"Reconfigure a branch to be unstacked. This may require copying substantial "
3827
3875
"data into it."
3828
3876
msgstr ""
3829
3877
3830
#: bzrlib/builtins.py:6138
3878
#: bzrlib/builtins.py:6157
3831
3879
msgid "Can't use both --stacked-on and --unstacked"
3832
3880
msgstr ""
3833
3881
3834
#: bzrlib/builtins.py:6152
3882
#: bzrlib/builtins.py:6171
3835
3883
msgid "No target configuration specified"
3836
3884
msgstr ""
3837
3885
3838
#: bzrlib/builtins.py:6187
3886
#: bzrlib/builtins.py:6206
3839
3887
msgid "Set the branch of a checkout and update."
3840
3888
msgstr ""
3841
3889
3842
#: bzrlib/builtins.py:6189
3890
#: bzrlib/builtins.py:6208
3843
3891
msgid ""
3844
3892
"For lightweight checkouts, this changes the branch being referenced.\n"
3845
3893
"For heavyweight checkouts, this checks that there are no local commits\n"
3847
3895
"of the new location and binds to it."
3848
3896
msgstr ""
3849
3897
3850
#: bzrlib/builtins.py:6194
3898
#: bzrlib/builtins.py:6213
3851
3899
msgid ""
3852
3900
"In both cases, the working tree is updated and uncommitted changes\n"
3853
3901
"are merged. The user can commit or revert these as they desire."
3854
3902
msgstr ""
3855
3903
3856
#: bzrlib/builtins.py:6197
3904
#: bzrlib/builtins.py:6216
3857
3905
msgid "Pending merges need to be committed or reverted before using switch."
3858
3906
msgstr ""
3859
3907
3860
#: bzrlib/builtins.py:6199
3908
#: bzrlib/builtins.py:6218
3861
3909
msgid ""
3862
3910
"The path to the branch to switch to can be specified relative to the parent\n"
3863
3911
"directory of the current branch. For example, if you are currently in a\n"
3865
3913
"/path/to/newbranch."
3866
3914
msgstr ""
3867
3915
3868
#: bzrlib/builtins.py:6204
3916
#: bzrlib/builtins.py:6223
3869
3917
msgid ""
3870
3918
"Bound branches use the nickname of its master branch unless it is set\n"
3871
3919
"locally, in which case switching will update the local nickname to be\n"
3872
3920
"that of the master."
3873
3921
msgstr ""
3874
3922
3875
#: bzrlib/builtins.py:6212
3923
#: bzrlib/builtins.py:6231
3876
3924
msgid "Switch even if local commits will be lost."
3877
3925
msgstr ""
3878
3926
3879
#: bzrlib/builtins.py:6215
3927
#: bzrlib/builtins.py:6234
3880
3928
msgid "Create the target branch from this one before switching to it."
3881
3929
msgstr ""
3882
3930
3883
#: bzrlib/builtins.py:6229
3931
#: bzrlib/builtins.py:6248
3884
3932
msgid "You must supply either a revision or a location"
3885
3933
msgstr ""
3886
3934
3887
#: bzrlib/builtins.py:6242
3935
#: bzrlib/builtins.py:6261
3888
3936
msgid "cannot create branch without source branch"
3889
3937
msgstr ""
3890
3938
3891
#: bzrlib/builtins.py:6262
3939
#: bzrlib/builtins.py:6286
3892
3940
msgid "Manage filtered views."
3893
3941
msgstr ""
3894
3942
3895
#: bzrlib/builtins.py:6264
3943
#: bzrlib/builtins.py:6288
3896
3944
msgid ""
3897
3945
"Views provide a mask over the tree so that users can focus on\n"
3898
3946
"a subset of a tree when doing their work. After creating a view,\n"
3902
3950
"must be within the current view."
3903
3951
msgstr ""
3904
3952
3905
#: bzrlib/builtins.py:6271
3953
#: bzrlib/builtins.py:6295
3906
3954
msgid ""
3907
3955
"In most cases, a view has a short life-span: it is created to make\n"
3908
3956
"a selected change and is deleted once that change is committed.\n"
3910
3958
"and switch between them."
3911
3959
msgstr ""
3912
3960
3913
#: bzrlib/builtins.py:6276
3961
#: bzrlib/builtins.py:6300
3914
3962
msgid ""
3915
3963
"To disable the current view without deleting it, you can switch to\n"
3916
3964
"the pseudo view called ``off``. This can be useful when you need\n"
3918
3966
"want to switch back to your view after that."
3919
3967
msgstr ""
3920
3968
3921
#: bzrlib/builtins.py:6281
3969
#: bzrlib/builtins.py:6305
3922
3970
msgid ""
3923
3971
":Examples:\n"
3924
3972
" To define the current view::"
3925
3973
msgstr ""
3926
3974
3927
#: bzrlib/builtins.py:6284
3975
#: bzrlib/builtins.py:6308
3928
3976
msgid " bzr view file1 dir1 ..."
3929
3977
msgstr ""
3930
3978
3931
#: bzrlib/builtins.py:6286
3979
#: bzrlib/builtins.py:6310
3932
3980
msgid " To list the current view::"
3933
3981
msgstr ""
3934
3982
3935
#: bzrlib/builtins.py:6288
3983
#: bzrlib/builtins.py:6312
3936
3984
msgid " bzr view"
3937
3985
msgstr ""
3938
3986
3939
#: bzrlib/builtins.py:6290
3987
#: bzrlib/builtins.py:6314
3940
3988
msgid " To delete the current view::"
3941
3989
msgstr ""
3942
3990
3943
#: bzrlib/builtins.py:6292
3991
#: bzrlib/builtins.py:6316
3944
3992
msgid " bzr view --delete"
3945
3993
msgstr ""
3946
3994
3947
#: bzrlib/builtins.py:6294
3995
#: bzrlib/builtins.py:6318
3948
3996
msgid " To disable the current view without deleting it::"
3949
3997
msgstr ""
3950
3998
3951
#: bzrlib/builtins.py:6296
3999
#: bzrlib/builtins.py:6320
3952
4000
msgid " bzr view --switch off"
3953
4001
msgstr ""
3954
4002
3955
#: bzrlib/builtins.py:6298
4003
#: bzrlib/builtins.py:6322
3956
4004
msgid " To define a named view and switch to it::"
3957
4005
msgstr ""
3958
4006
3959
#: bzrlib/builtins.py:6300
4007
#: bzrlib/builtins.py:6324
3960
4008
msgid " bzr view --name view-name file1 dir1 ..."
3961
4009
msgstr ""
3962
4010
3963
#: bzrlib/builtins.py:6302
4011
#: bzrlib/builtins.py:6326
3964
4012
msgid " To list a named view::"
3965
4013
msgstr ""
3966
4014
3967
#: bzrlib/builtins.py:6304
4015
#: bzrlib/builtins.py:6328
3968
4016
msgid " bzr view --name view-name"
3969
4017
msgstr ""
3970
4018
3971
#: bzrlib/builtins.py:6306
4019
#: bzrlib/builtins.py:6330
3972
4020
msgid " To delete a named view::"
3973
4021
msgstr ""
3974
4022
3975
#: bzrlib/builtins.py:6308
4023
#: bzrlib/builtins.py:6332
3976
4024
msgid " bzr view --name view-name --delete"
3977
4025
msgstr ""
3978
4026
3979
#: bzrlib/builtins.py:6310
4027
#: bzrlib/builtins.py:6334
3980
4028
msgid " To switch to a named view::"
3981
4029
msgstr ""
3982
4030
3983
#: bzrlib/builtins.py:6312
4031
#: bzrlib/builtins.py:6336
3984
4032
msgid " bzr view --switch view-name"
3985
4033
msgstr ""
3986
4034
3987
#: bzrlib/builtins.py:6314
4035
#: bzrlib/builtins.py:6338
3988
4036
msgid " To list all views defined::"
3989
4037
msgstr ""
3990
4038
3991
#: bzrlib/builtins.py:6316
4039
#: bzrlib/builtins.py:6340
3992
4040
msgid " bzr view --all"
3993
4041
msgstr ""
3994
4042
3995
#: bzrlib/builtins.py:6318
4043
#: bzrlib/builtins.py:6342
3996
4044
msgid " To delete all views::"
3997
4045
msgstr ""
3998
4046
3999
#: bzrlib/builtins.py:6320
4047
#: bzrlib/builtins.py:6344
4000
4048
msgid " bzr view --delete --all"
4001
4049
msgstr ""
4002
4050
4003
#: bzrlib/builtins.py:6327
4051
#: bzrlib/builtins.py:6351
4004
4052
msgid "Apply list or delete action to all views."
4005
4053
msgstr ""
4006
4054
4007
#: bzrlib/builtins.py:6330
4055
#: bzrlib/builtins.py:6354
4008
4056
msgid "Delete the view."
4009
4057
msgstr ""
4010
4058
4011
#: bzrlib/builtins.py:6333
4059
#: bzrlib/builtins.py:6357
4012
4060
msgid "Name of the view to define, list or delete."
4013
4061
msgstr ""
4014
4062
4015
#: bzrlib/builtins.py:6337
4063
#: bzrlib/builtins.py:6361
4016
4064
msgid "Name of the view to switch to."
4017
4065
msgstr ""
4018
4066
4019
#: bzrlib/builtins.py:6356
4067
#: bzrlib/builtins.py:6380
4020
4068
msgid "Both --delete and a file list specified"
4021
4069
msgstr ""
4022
4070
4023
#: bzrlib/builtins.py:6359
4071
#: bzrlib/builtins.py:6383
4024
4072
msgid "Both --delete and --switch specified"
4025
4073
msgstr ""
4026
4074
4027
#: bzrlib/builtins.py:6362
4075
#: bzrlib/builtins.py:6386
4028
4076
msgid "Deleted all views.\n"
4029
4077
msgstr ""
4030
4078
4031
#: bzrlib/builtins.py:6364
4079
#: bzrlib/builtins.py:6388
4032
4080
msgid "No current view to delete"
4033
4081
msgstr ""
4034
4082
4035
#: bzrlib/builtins.py:6367
4083
#: bzrlib/builtins.py:6391
4036
4084
#, python-format
4037
4085
msgid "Deleted '%s' view.\n"
4038
4086
msgstr ""
4039
4087
4040
#: bzrlib/builtins.py:6371
4088
#: bzrlib/builtins.py:6395
4041
4089
msgid "Both --switch and a file list specified"
4042
4090
msgstr ""
4043
4091
4044
#: bzrlib/builtins.py:6374
4092
#: bzrlib/builtins.py:6398
4045
4093
msgid "Both --switch and --all specified"
4046
4094
msgstr ""
4047
4095
4048
#: bzrlib/builtins.py:6377
4096
#: bzrlib/builtins.py:6401
4049
4097
msgid "No current view to disable"
4050
4098
msgstr ""
4051
4099
4052
#: bzrlib/builtins.py:6379
4100
#: bzrlib/builtins.py:6403
4053
4101
#, python-format
4054
4102
msgid "Disabled '%s' view.\n"
4055
4103
msgstr ""
4056
4104
4057
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4105
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4058
4106
msgid "Using '{0}' view: {1}\n"
4059
4107
msgstr ""
4060
4108
4061
#: bzrlib/builtins.py:6386
4109
#: bzrlib/builtins.py:6410
4062
4110
msgid "Views defined:\n"
4063
4111
msgstr ""
4064
4112
4065
#: bzrlib/builtins.py:6395
4113
#: bzrlib/builtins.py:6419
4066
4114
msgid "No views defined.\n"
4067
4115
msgstr ""
4068
4116
4069
#: bzrlib/builtins.py:6402
4117
#: bzrlib/builtins.py:6426
4070
4118
msgid "Cannot change the 'off' pseudo view"
4071
4119
msgstr ""
4072
4120
4073
#: bzrlib/builtins.py:6410
4121
#: bzrlib/builtins.py:6434
4074
4122
msgid "No current view.\n"
4075
4123
msgstr ""
4076
4124
4077
#: bzrlib/builtins.py:6413
4125
#: bzrlib/builtins.py:6437
4078
4126
msgid "'{0}' view is: {1}\n"
4079
4127
msgstr ""
4080
4128
4081
#: bzrlib/builtins.py:6433
4129
#: bzrlib/builtins.py:6457
4082
4130
msgid " <no hooks installed>\n"
4083
4131
msgstr ""
4084
4132
4085
#: bzrlib/builtins.py:6437
4133
#: bzrlib/builtins.py:6461
4086
4134
msgid "Remove a branch."
4087
4135
msgstr ""
4088
4136
4089
#: bzrlib/builtins.py:6439
4137
#: bzrlib/builtins.py:6463
4090
4138
msgid ""
4091
4139
"This will remove the branch from the specified location but \n"
4092
4140
"will keep any working tree or repository in place."
4093
4141
msgstr ""
4094
4142
4095
#: bzrlib/builtins.py:6444
4143
#: bzrlib/builtins.py:6468
4096
4144
msgid " Remove the branch at repo/trunk::"
4097
4145
msgstr ""
4098
4146
4099
#: bzrlib/builtins.py:6446
4147
#: bzrlib/builtins.py:6470
4100
4148
msgid " bzr remove-branch repo/trunk"
4101
4149
msgstr ""
4102
4150
4103
#: bzrlib/builtins.py:6461
4151
#: bzrlib/builtins.py:6477
4152
msgid "Remove branch even if it is the active branch."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6491
4156
msgid "Branch is active. Use --force to remove it."
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6495
4104
4160
msgid "Plaintext diff output."
4105
4161
msgstr ""
4106
4162
4107
#: bzrlib/builtins.py:6462
4163
#: bzrlib/builtins.py:6496
4108
4164
msgid "Temporarily set aside some changes from the current tree."
4109
4165
msgstr ""
4110
4166
4111
#: bzrlib/builtins.py:6464
4167
#: bzrlib/builtins.py:6498
4112
4168
msgid ""
4113
4169
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4114
4170
"ie. out of the way, until a later time when you can bring them back from\n"
4117
4173
"will they survive its deletion."
4118
4174
msgstr ""
4119
4175
4120
#: bzrlib/builtins.py:6470
4176
#: bzrlib/builtins.py:6504
4121
4177
msgid "If shelve --list is specified, previously-shelved changes are listed."
4122
4178
msgstr ""
4123
4179
4124
#: bzrlib/builtins.py:6472
4180
#: bzrlib/builtins.py:6506
4125
4181
msgid ""
4126
4182
"Shelve is intended to help separate several sets of changes that have\n"
4127
4183
"been inappropriately mingled. If you just want to get rid of all changes\n"
4129
4185
"shelve all text changes at once, use shelve --all."
4130
4186
msgstr ""
4131
4187
4132
#: bzrlib/builtins.py:6477
4188
#: bzrlib/builtins.py:6511
4133
4189
msgid ""
4134
4190
"If filenames are specified, only the changes to those files will be\n"
4135
4191
"shelved. Other files will be left untouched."
4136
4192
msgstr ""
4137
4193
4138
#: bzrlib/builtins.py:6480
4194
#: bzrlib/builtins.py:6514
4139
4195
msgid ""
4140
4196
"If a revision is specified, changes since that revision will be shelved."
4141
4197
msgstr ""
4142
4198
4143
#: bzrlib/builtins.py:6482
4199
#: bzrlib/builtins.py:6516
4144
4200
msgid ""
4145
4201
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4146
4202
"restore the most recently shelved changes."
4147
4203
msgstr ""
4148
4204
4149
#: bzrlib/builtins.py:6485
4205
#: bzrlib/builtins.py:6519
4150
4206
msgid ""
4151
4207
"For complicated changes, it is possible to edit the changes in a separate\n"
4152
4208
"editor program to decide what the file remaining in the working copy\n"
4153
4209
"should look like. To do this, add the configuration option"
4154
4210
msgstr ""
4155
4211
4156
#: bzrlib/builtins.py:6489
4212
#: bzrlib/builtins.py:6523
4157
4213
msgid " change_editor = PROGRAM @new_path @old_path"
4158
4214
msgstr ""
4159
4215
4160
#: bzrlib/builtins.py:6491
4216
#: bzrlib/builtins.py:6525
4161
4217
msgid ""
4162
4218
"where @new_path is replaced with the path of the new version of the \n"
4163
4219
"file and @old_path is replaced with the path of the old version of \n"
4166
4222
" "
4167
4223
msgstr ""
4168
4224
4169
#: bzrlib/builtins.py:6503
4225
#: bzrlib/builtins.py:6537
4170
4226
msgid "Shelve all changes."
4171
4227
msgstr ""
4172
4228
4173
#: bzrlib/builtins.py:6505
4229
#: bzrlib/builtins.py:6539
4174
4230
msgid "Method to use for writing diffs."
4175
4231
msgstr ""
4176
4232
4177
#: bzrlib/builtins.py:6505
4233
#: bzrlib/builtins.py:6539
4178
4234
msgid "writer"
4179
4235
msgstr ""
4180
4236
4181
#: bzrlib/builtins.py:6509
4237
#: bzrlib/builtins.py:6543
4182
4238
msgid "List shelved changes."
4183
4239
msgstr ""
4184
4240
4185
#: bzrlib/builtins.py:6511
4241
#: bzrlib/builtins.py:6545
4186
4242
msgid "Destroy removed changes instead of shelving them."
4187
4243
msgstr ""
4188
4244
4189
#: bzrlib/builtins.py:6540
4245
#: bzrlib/builtins.py:6574
4190
4246
msgid "No shelved changes."
4191
4247
msgstr ""
4192
4248
4193
#: bzrlib/builtins.py:6551
4249
#: bzrlib/builtins.py:6585
4194
4250
msgid "Restore shelved changes."
4195
4251
msgstr ""
4196
4252
4197
#: bzrlib/builtins.py:6553
4253
#: bzrlib/builtins.py:6587
4198
4254
msgid ""
4199
4255
"By default, the most recently shelved changes are restored. However if you\n"
4200
4256
"specify a shelf by id those changes will be restored instead. This works\n"
4201
4257
"best when the changes don't depend on each other."
4202
4258
msgstr ""
4203
4259
4204
#: bzrlib/builtins.py:6562
4260
#: bzrlib/builtins.py:6596
4205
4261
msgid "The action to perform."
4206
4262
msgstr ""
4207
4263
4208
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4264
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4209
4265
msgid "action"
4210
4266
msgstr ""
4211
4267
4212
#: bzrlib/builtins.py:6564
4268
#: bzrlib/builtins.py:6598
4213
4269
msgid "Apply changes and remove from the shelf."
4214
4270
msgstr ""
4215
4271
4216
#: bzrlib/builtins.py:6565
4272
#: bzrlib/builtins.py:6599
4217
4273
msgid "Show changes, but do not apply or remove them."
4218
4274
msgstr ""
4219
4275
4220
#: bzrlib/builtins.py:6566
4276
#: bzrlib/builtins.py:6600
4221
4277
msgid ""
4222
4278
"Instead of unshelving the changes, show the diff that would result from "
4223
4279
"unshelving."
4224
4280
msgstr ""
4225
4281
4226
#: bzrlib/builtins.py:6568
4282
#: bzrlib/builtins.py:6602
4227
4283
msgid "Delete changes without applying them."
4228
4284
msgstr ""
4229
4285
4230
#: bzrlib/builtins.py:6569
4286
#: bzrlib/builtins.py:6603
4231
4287
msgid "Apply changes but don't delete them."
4232
4288
msgstr ""
4233
4289
4234
#: bzrlib/builtins.py:6584
4290
#: bzrlib/builtins.py:6618
4235
4291
msgid "Remove unwanted files from working tree."
4236
4292
msgstr ""
4237
4293
4238
#: bzrlib/builtins.py:6586
4294
#: bzrlib/builtins.py:6620
4239
4295
msgid ""
4240
4296
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4241
4297
"files are never deleted."
4242
4298
msgstr ""
4243
4299
4244
#: bzrlib/builtins.py:6589
4300
#: bzrlib/builtins.py:6623
4245
4301
msgid ""
4246
4302
"Another class is 'detritus', which includes files emitted by bzr during\n"
4247
4303
"normal operations and selftests. (The value of these files decreases with\n"
4248
4304
"time.)"
4249
4305
msgstr ""
4250
4306
4251
#: bzrlib/builtins.py:6593
4307
#: bzrlib/builtins.py:6627
4252
4308
msgid ""
4253
4309
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4254
4310
"flags are respected, and may be combined."
4255
4311
msgstr ""
4256
4312
4257
#: bzrlib/builtins.py:6596
4313
#: bzrlib/builtins.py:6630
4258
4314
msgid "To check what clean-tree will do, use --dry-run."
4259
4315
msgstr ""
4260
4316
4261
#: bzrlib/builtins.py:6599
4317
#: bzrlib/builtins.py:6633
4262
4318
msgid "Delete all ignored files."
4263
4319
msgstr ""
4264
4320
4265
#: bzrlib/builtins.py:6600
4321
#: bzrlib/builtins.py:6634
4266
4322
msgid ""
4267
4323
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4268
4324
msgstr ""
4269
4325
4270
#: bzrlib/builtins.py:6603
4326
#: bzrlib/builtins.py:6637
4271
4327
msgid "Delete files unknown to bzr (default)."
4272
4328
msgstr ""
4273
4329
4274
#: bzrlib/builtins.py:6604
4330
#: bzrlib/builtins.py:6638
4275
4331
msgid "Show files to delete instead of deleting them."
4276
4332
msgstr ""
4277
4333
4278
#: bzrlib/builtins.py:6606
4334
#: bzrlib/builtins.py:6640
4279
4335
msgid "Do not prompt before deleting."
4280
4336
msgstr ""
4281
4337
4335
4391
msgstr[0] ""
4336
4392
msgstr[1] ""
4337
4393
4338
#: bzrlib/bzrdir.py:490
4394
#: bzrlib/bzrdir.py:487
4339
4395
msgid ""
4340
4396
"making backup of {0}\n"
4341
4397
" to {1}"
4342
4398
msgstr ""
4343
4399
4344
#: bzrlib/bzrdir.py:513
4400
#: bzrlib/bzrdir.py:510
4345
4401
msgid "renamed {0} to {1}"
4346
4402
msgstr ""
4347
4403
4348
#: bzrlib/bzrdir.py:1652
4404
#: bzrlib/bzrdir.py:1639
4349
4405
#, python-format
4350
4406
msgid ""
4351
4407
"Source repository format does not support stacking, using format:\n"
4352
4408
" %s"
4353
4409
msgstr ""
4354
4410
4355
#: bzrlib/bzrdir.py:1672
4411
#: bzrlib/bzrdir.py:1659
4356
4412
#, python-format
4357
4413
msgid ""
4358
4414
"Source branch format does not support stacking, using format:\n"
4359
4415
" %s"
4360
4416
msgstr ""
4361
4417
4362
#: bzrlib/bzrdir.py:1818
4418
#: bzrlib/bzrdir.py:1805
4363
4419
msgid "starting repository conversion"
4364
4420
msgstr ""
4365
4421
4366
#: bzrlib/bzrdir.py:2039
4422
#: bzrlib/bzrdir.py:2026
4367
4423
msgid "Using default stacking branch {0} at {1}"
4368
4424
msgstr ""
4369
4425
4546
4602
"supported formats or in a custom format based on a template."
4547
4603
msgstr ""
4548
4604
4549
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4550
#: en/help_topics/configuration.txt:710
4605
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4606
#: en/help_topics/configuration.txt:722
4551
4607
msgid "For example::"
4552
4608
msgstr ""
4553
4609
4666
4722
msgid ":See also: %s"
4667
4723
msgstr ""
4668
4724
4669
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4725
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4670
4726
msgid "Only ASCII permitted in option names"
4671
4727
msgstr ""
4672
4728
4673
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4729
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4674
4730
msgid "command {0!r} needs one or more {1}"
4675
4731
msgstr ""
4676
4732
4677
#: bzrlib/commands.py:858
4733
#: bzrlib/commands.py:868
4678
4734
msgid "command {0!r} requires argument {1}"
4679
4735
msgstr ""
4680
4736
4681
#: bzrlib/commands.py:865
4737
#: bzrlib/commands.py:875
4682
4738
msgid "extra argument to command {0}: {1}"
4683
4739
msgstr ""
4684
4740
4685
#: bzrlib/commands.py:962
4741
#: bzrlib/commands.py:972
4686
4742
#, python-format
4687
4743
msgid "Profile data written to \"%s\"."
4688
4744
msgstr ""
4725
4781
msgid "renamed"
4726
4782
msgstr ""
4727
4783
4728
#: bzrlib/commit.py:977
4784
#: bzrlib/commit.py:976
4729
4785
msgid "unchanged"
4730
4786
msgstr ""
4731
4787
4732
#: bzrlib/commit.py:999
4788
#: bzrlib/commit.py:998
4733
4789
msgid "{0} [{1}] - Stage"
4734
4790
msgstr ""
4735
4791
4736
#: bzrlib/commit.py:1002
4792
#: bzrlib/commit.py:1001
4737
4793
#, python-format
4738
4794
msgid "%s - Stage"
4739
4795
msgstr ""
4740
4796
4797
#: bzrlib/commit_signature_commands.py:34
4798
msgid "Sign all commits by a given committer."
4799
msgstr ""
4800
4741
4801
#: bzrlib/commit_signature_commands.py:36
4742
msgid "Sign all commits by a given committer."
4743
msgstr ""
4744
4745
#: bzrlib/commit_signature_commands.py:38
4746
4802
msgid ""
4747
4803
"If location is not specified the local tree is used.\n"
4748
4804
"If committer is not specified the default committer is used."
4749
4805
msgstr ""
4750
4806
4751
#: bzrlib/commit_signature_commands.py:41
4807
#: bzrlib/commit_signature_commands.py:39
4752
4808
msgid "This does not sign commits that already have signatures."
4753
4809
msgstr ""
4754
4810
4755
#: bzrlib/commit_signature_commands.py:49
4811
#: bzrlib/commit_signature_commands.py:47
4756
4812
msgid ""
4757
4813
"Don't actually sign anything, just print the revisions that would be signed."
4758
4814
msgstr ""
4759
4815
4816
#: bzrlib/commit_signature_commands.py:98
4817
#, python-format
4818
msgid "Signed %d revision.\n"
4819
msgid_plural "Signed %d revisions.\n"
4820
msgstr[0] ""
4821
msgstr[1] ""
4822
4760
4823
#: bzrlib/commit_signature_commands.py:103
4761
4824
msgid "Verify all commit signatures."
4762
4825
msgstr ""
4772
4835
"verification."
4773
4836
msgstr ""
4774
4837
4775
#: bzrlib/commit_signature_commands.py:147
4838
#: bzrlib/commit_signature_commands.py:148
4776
4839
msgid "Cannot verify a range of non-revision-history revisions"
4777
4840
msgstr ""
4778
4841
4779
#: bzrlib/commit_signature_commands.py:168
4842
#: bzrlib/commit_signature_commands.py:166
4780
4843
msgid "All commits signed with verifiable keys"
4781
4844
msgstr ""
4782
4845
4783
#: bzrlib/config.py:475
4846
#: bzrlib/config.py:436
4784
4847
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4785
4848
msgstr ""
4786
4849
4787
#: bzrlib/config.py:2485
4850
#: bzrlib/config.py:2452
4788
4851
msgid "{0} is not an SI unit."
4789
4852
msgstr ""
4790
4853
4791
#: bzrlib/config.py:2949
4854
#: bzrlib/config.py:2971
4792
4855
msgid ""
4793
4856
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4794
4857
"will be saved."
4795
4858
msgstr ""
4796
4859
4797
#: bzrlib/config.py:3093
4860
#: bzrlib/config.py:3116
4798
4861
#, python-format
4799
4862
msgid "Invalid '%s', should be of the form 'name=value'"
4800
4863
msgstr ""
4801
4864
4802
#: bzrlib/config.py:3962
4865
#: bzrlib/config.py:4018
4803
4866
msgid "Display, set or remove a configuration option."
4804
4867
msgstr ""
4805
4868
4806
#: bzrlib/config.py:3964
4869
#: bzrlib/config.py:4020
4807
4870
msgid "Display the active value for a given option."
4808
4871
msgstr ""
4809
4872
4810
#: bzrlib/config.py:3966
4873
#: bzrlib/config.py:4022
4811
4874
msgid ""
4812
4875
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4813
4876
"matching options are displayed mentioning their scope. The active value\n"
4814
4877
"that bzr will take into account is the first one displayed for each option."
4815
4878
msgstr ""
4816
4879
4817
#: bzrlib/config.py:3970
4880
#: bzrlib/config.py:4026
4818
4881
msgid "If no NAME is given, --all .* is implied."
4819
4882
msgstr ""
4820
4883
4821
#: bzrlib/config.py:3972
4884
#: bzrlib/config.py:4028
4822
4885
msgid ""
4823
4886
"Setting a value is achieved by using name=value without spaces. The value\n"
4824
4887
"is set in the most relevant scope and can be checked by displaying the\n"
4825
4888
"option again."
4826
4889
msgstr ""
4827
4890
4828
#: bzrlib/config.py:3984
4891
#: bzrlib/config.py:4040
4829
4892
msgid "Reduce the scope to the specified configuration file."
4830
4893
msgstr ""
4831
4894
4832
#: bzrlib/config.py:3988
4895
#: bzrlib/config.py:4044
4833
4896
msgid "Display all the defined values for the matching options."
4834
4897
msgstr ""
4835
4898
4836
#: bzrlib/config.py:3990
4899
#: bzrlib/config.py:4046
4837
4900
msgid "Remove the option from the configuration file."
4838
4901
msgstr ""
4839
4902
4913
4976
msgstr[0] ""
4914
4977
msgstr[1] ""
4915
4978
4916
#: bzrlib/controldir.py:710
4979
#: bzrlib/controldir.py:712
4917
4980
msgid "{0} is{1} redirected to {2}"
4918
4981
msgstr ""
4919
4982
5111
5174
5112
5175
#: bzrlib/errors.py:646
5113
5176
msgid "Path \"%(path)s\" is not unicode normalized"
5114
msgstr ""
5177
msgstr "Path \"%(path)s\" is not unicode normalised"
5115
5178
5116
5179
#: bzrlib/errors.py:654
5117
5180
msgid "Not a branch: \"%(path)s\"%(detail)s."
5130
5193
msgstr ""
5131
5194
5132
5195
#: bzrlib/errors.py:715
5196
msgid "Invalid branch name: %(name)s"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:724
5133
5200
msgid "Parent branch already exists: \"%(path)s\"."
5134
5201
msgstr ""
5135
5202
5136
#: bzrlib/errors.py:721
5203
#: bzrlib/errors.py:730
5137
5204
msgid ""
5138
5205
"Directory contains a branch, but no working tree (use bzr checkout if you "
5139
5206
"wish to build a working tree): \"%(path)s\""
5140
5207
msgstr ""
5141
5208
5142
#: bzrlib/errors.py:726
5209
#: bzrlib/errors.py:735
5143
5210
msgid ""
5144
5211
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5145
5212
msgstr ""
5146
5213
5147
#: bzrlib/errors.py:736
5214
#: bzrlib/errors.py:745
5148
5215
msgid ""
5149
5216
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5150
5217
msgstr ""
5151
5218
5152
#: bzrlib/errors.py:746
5219
#: bzrlib/errors.py:755
5153
5220
msgid "No repository present: \"%(path)s\""
5154
5221
msgstr ""
5155
5222
5156
#: bzrlib/errors.py:753
5223
#: bzrlib/errors.py:762
5157
5224
msgid ""
5158
5225
"Unsupported branch format: %(format)s\n"
5159
5226
"Please run 'bzr upgrade'"
5160
5227
msgstr ""
5161
5228
5162
#: bzrlib/errors.py:759
5229
#: bzrlib/errors.py:768
5163
5230
msgid "Unknown %(kind)s format: %(format)r"
5164
5231
msgstr "Unknown %(kind)s format: %(format)r"
5165
5232
5166
#: bzrlib/errors.py:768
5233
#: bzrlib/errors.py:777
5167
5234
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5168
5235
msgstr ""
5169
5236
5170
#: bzrlib/errors.py:778
5237
#: bzrlib/errors.py:787
5171
5238
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5172
5239
msgstr ""
5173
5240
5174
#: bzrlib/errors.py:793
5241
#: bzrlib/errors.py:802
5175
5242
msgid ""
5176
5243
"%(target)s\n"
5177
5244
"is not compatible with\n"
5179
5246
"%(details)s"
5180
5247
msgstr ""
5181
5248
5182
#: bzrlib/errors.py:809
5249
#: bzrlib/errors.py:818
5183
5250
msgid "Revision is not compatible with %(repo_format)s"
5184
5251
msgstr ""
5185
5252
5186
#: bzrlib/errors.py:819
5253
#: bzrlib/errors.py:828
5187
5254
msgid "%(context_info)s%(path)s is already versioned."
5188
5255
msgstr ""
5189
5256
5190
#: bzrlib/errors.py:840
5257
#: bzrlib/errors.py:849
5191
5258
msgid "%(context_info)s%(path)s is not versioned."
5192
5259
msgstr ""
5193
5260
5194
#: bzrlib/errors.py:861
5261
#: bzrlib/errors.py:870
5195
5262
msgid "Path(s) are not versioned: %(paths_as_string)s"
5196
5263
msgstr ""
5197
5264
5198
#: bzrlib/errors.py:872
5265
#: bzrlib/errors.py:881
5199
5266
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5200
5267
msgstr ""
5201
5268
5202
#: bzrlib/errors.py:891
5269
#: bzrlib/errors.py:900
5203
5270
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5204
5271
msgstr "Cannot operate on \"%(filename)s\" of unsupported type \"%(kind)s\""
5205
5272
5206
#: bzrlib/errors.py:899
5273
#: bzrlib/errors.py:908
5207
5274
msgid ""
5208
5275
"Filename %(filename)r is not valid in your current filesystem encoding "
5209
5276
"%(fs_encoding)s"
5210
5277
msgstr ""
5211
5278
5212
#: bzrlib/errors.py:910
5279
#: bzrlib/errors.py:919
5213
5280
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5214
5281
msgstr ""
5215
5282
5216
#: bzrlib/errors.py:928
5283
#: bzrlib/errors.py:937
5217
5284
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5218
5285
msgstr ""
5219
5286
5220
#: bzrlib/errors.py:967
5287
#: bzrlib/errors.py:976
5221
5288
msgid "Cannot lock %(lock)s: %(why)s"
5222
5289
msgstr ""
5223
5290
5224
#: bzrlib/errors.py:977
5291
#: bzrlib/errors.py:986
5225
5292
msgid ""
5226
5293
"A transaction related operation was attempted after the transaction finished."
5227
5294
msgstr ""
5228
5295
5229
#: bzrlib/errors.py:1004
5296
#: bzrlib/errors.py:1013
5230
5297
msgid "Cannot lock: transport is read only: %(transport)s"
5231
5298
msgstr ""
5232
5299
5233
#: bzrlib/errors.py:1012
5300
#: bzrlib/errors.py:1021
5234
5301
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5235
5302
msgstr ""
5236
5303
5237
#: bzrlib/errors.py:1023
5304
#: bzrlib/errors.py:1032
5238
5305
msgid ""
5239
5306
"Lock was broken while still open: %(lock)s - check storage consistency!"
5240
5307
msgstr ""
5241
5308
5242
#: bzrlib/errors.py:1034
5309
#: bzrlib/errors.py:1043
5243
5310
msgid ""
5244
5311
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5245
5312
"%(holder)r, wanted to break %(target)r"
5246
5313
msgstr ""
5247
5314
5248
#: bzrlib/errors.py:1046
5315
#: bzrlib/errors.py:1055
5249
5316
msgid ""
5250
5317
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5251
5318
"Use 'bzr break-lock' to clear it"
5252
5319
msgstr ""
5253
5320
5254
#: bzrlib/errors.py:1059
5321
#: bzrlib/errors.py:1068
5255
5322
msgid "Lock not held: %(lock)s"
5256
5323
msgstr ""
5257
5324
5258
#: bzrlib/errors.py:1088
5325
#: bzrlib/errors.py:1097
5259
5326
msgid "No changes to commit"
5260
5327
msgstr ""
5261
5328
5262
#: bzrlib/errors.py:1093
5329
#: bzrlib/errors.py:1102
5263
5330
msgid ""
5264
5331
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5265
5332
msgstr ""
5266
5333
5267
#: bzrlib/errors.py:1103
5334
#: bzrlib/errors.py:1112
5268
5335
msgid ""
5269
5336
"Excluding paths during commit is not supported by repository at "
5270
5337
"%(repository)r."
5271
5338
msgstr ""
5272
5339
5273
#: bzrlib/errors.py:1112
5340
#: bzrlib/errors.py:1121
5274
5341
msgid ""
5275
5342
"The specified commit message contains characters unsupported by the current "
5276
5343
"encoding."
5277
5344
msgstr ""
5278
5345
5279
#: bzrlib/errors.py:1118
5346
#: bzrlib/errors.py:1127
5280
5347
msgid "Upgrade URL cannot work with readonly URLs."
5281
5348
msgstr ""
5282
5349
5283
#: bzrlib/errors.py:1123
5350
#: bzrlib/errors.py:1132
5284
5351
msgid "The branch format %(format)s is already at the most recent format."
5285
5352
msgstr ""
5286
5353
5287
#: bzrlib/errors.py:1146
5354
#: bzrlib/errors.py:1155
5288
5355
msgid "Option --change does not accept revision ranges"
5289
5356
msgstr ""
5290
5357
5291
#: bzrlib/errors.py:1151
5358
#: bzrlib/errors.py:1160
5292
5359
msgid "No namespace registered for string: %(spec)r"
5293
5360
msgstr ""
5294
5361
5295
#: bzrlib/errors.py:1170
5362
#: bzrlib/errors.py:1179
5296
5363
msgid ""
5297
5364
"Requested revision: '%(spec)s' does not exist in branch: "
5298
5365
"%(branch_url)s%(extra)s"
5299
5366
msgstr ""
5300
5367
5301
#: bzrlib/errors.py:1184
5368
#: bzrlib/errors.py:1193
5302
5369
msgid ""
5303
5370
"Operation denied because it would change the main history, which is not "
5304
5371
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5305
5372
msgstr ""
5306
5373
5307
#: bzrlib/errors.py:1195
5374
#: bzrlib/errors.py:1204
5308
5375
msgid ""
5309
5376
"These branches have diverged. Use the missing command to see how.\n"
5310
5377
"Use the merge command to reconcile them."
5311
5378
msgstr ""
5312
5379
5313
#: bzrlib/errors.py:1215
5380
#: bzrlib/errors.py:1224
5314
5381
msgid ""
5315
5382
"Branches have no common ancestor, and no merge base revision was specified."
5316
5383
msgstr ""
5317
5384
5318
#: bzrlib/errors.py:1221
5385
#: bzrlib/errors.py:1230
5319
5386
msgid ""
5320
5387
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5321
5388
msgstr ""
5322
5389
5323
#: bzrlib/errors.py:1227
5390
#: bzrlib/errors.py:1236
5324
5391
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5325
5392
msgstr ""
5326
5393
5327
#: bzrlib/errors.py:1236
5394
#: bzrlib/errors.py:1245
5328
5395
msgid ""
5329
5396
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5330
5397
msgstr ""
5331
5398
5332
#: bzrlib/errors.py:1245
5399
#: bzrlib/errors.py:1254
5333
5400
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5334
5401
msgstr ""
5335
5402
5336
#: bzrlib/errors.py:1254
5403
#: bzrlib/errors.py:1263
5337
5404
msgid "Branch %(branch)s has no commits."
5338
5405
msgstr ""
5339
5406
5340
#: bzrlib/errors.py:1272
5407
#: bzrlib/errors.py:1281
5341
5408
msgid ""
5342
5409
"Bound branch %(branch)s is out of date with master branch "
5343
5410
"%(master)s.%(extra_help)s"
5344
5411
msgstr ""
5345
5412
5346
#: bzrlib/errors.py:1284
5413
#: bzrlib/errors.py:1293
5347
5414
msgid ""
5348
5415
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5349
5416
"bound to %(remote)s."
5350
5417
msgstr ""
5351
5418
5352
#: bzrlib/errors.py:1296
5419
#: bzrlib/errors.py:1305
5353
5420
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5354
5421
msgstr ""
5355
5422
5356
#: bzrlib/errors.py:1305
5423
#: bzrlib/errors.py:1314
5357
5424
msgid ""
5358
5425
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5359
5426
"%(error)s"
5360
5427
msgstr ""
5361
5428
5362
#: bzrlib/errors.py:1317
5429
#: bzrlib/errors.py:1326
5363
5430
msgid "Error in processing weave: %(msg)s"
5364
5431
msgstr ""
5365
5432
5366
#: bzrlib/errors.py:1326
5433
#: bzrlib/errors.py:1335
5367
5434
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5368
5435
msgstr ""
5369
5436
5370
#: bzrlib/errors.py:1337
5437
#: bzrlib/errors.py:1346
5371
5438
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5372
5439
msgstr ""
5373
5440
5374
#: bzrlib/errors.py:1347
5441
#: bzrlib/errors.py:1356
5375
5442
msgid "Weave invariant violated: %(what)s"
5376
5443
msgstr ""
5377
5444
5378
#: bzrlib/errors.py:1356
5445
#: bzrlib/errors.py:1365
5379
5446
msgid "Parents are mismatched between two revisions. %(msg)s"
5380
5447
msgstr ""
5381
5448
5382
#: bzrlib/errors.py:1378
5449
#: bzrlib/errors.py:1387
5383
5450
msgid ""
5384
5451
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5385
5452
"%(weave_b)s"
5386
5453
msgstr ""
5387
5454
5388
#: bzrlib/errors.py:1390
5455
#: bzrlib/errors.py:1399
5389
5456
msgid "Versioned file error"
5390
5457
msgstr ""
5391
5458
5392
#: bzrlib/errors.py:1395
5459
#: bzrlib/errors.py:1404
5393
5460
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5394
5461
msgstr ""
5395
5462
5396
#: bzrlib/errors.py:1405
5463
#: bzrlib/errors.py:1414
5397
5464
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5398
5465
msgstr ""
5399
5466
5400
#: bzrlib/errors.py:1415
5467
#: bzrlib/errors.py:1424
5401
5468
msgid "Text did not match its checksum: %(msg)s"
5402
5469
msgstr ""
5403
5470
5404
#: bzrlib/errors.py:1541
5471
#: bzrlib/errors.py:1550
5405
5472
msgid "Export format %(format)r not supported"
5406
5473
msgstr ""
5407
5474
5408
#: bzrlib/errors.py:1550
5475
#: bzrlib/errors.py:1559
5409
5476
msgid "Transport error: %(msg)s %(orig_error)s"
5410
5477
msgstr ""
5411
5478
5412
#: bzrlib/errors.py:1576
5479
#: bzrlib/errors.py:1585
5413
5480
msgid "Generic bzr smart protocol error: %(details)s"
5414
5481
msgstr ""
5415
5482
5416
#: bzrlib/errors.py:1584
5483
#: bzrlib/errors.py:1593
5417
5484
msgid "Received bad protocol version marker: %(marker)r"
5418
5485
msgstr ""
5419
5486
5420
#: bzrlib/errors.py:1616
5487
#: bzrlib/errors.py:1625
5421
5488
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5422
5489
msgstr ""
5423
5490
5424
#: bzrlib/errors.py:1621
5491
#: bzrlib/errors.py:1630
5425
5492
msgid "Connection error: %(msg)s %(orig_error)s"
5426
5493
msgstr ""
5427
5494
5428
#: bzrlib/errors.py:1626
5495
#: bzrlib/errors.py:1635
5429
5496
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5430
5497
msgstr ""
5431
5498
5432
#: bzrlib/errors.py:1647
5499
#: bzrlib/errors.py:1656
5433
5500
msgid "Connection closed: %(msg)s %(orig_error)s"
5434
5501
msgstr ""
5435
5502
5436
#: bzrlib/errors.py:1652
5503
#: bzrlib/errors.py:1661
5437
5504
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5438
5505
msgstr ""
5439
5506
5440
#: bzrlib/errors.py:1657
5507
#: bzrlib/errors.py:1666
5441
5508
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5442
5509
msgstr ""
5443
5510
5444
#: bzrlib/errors.py:1667
5511
#: bzrlib/errors.py:1676
5445
5512
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5446
5513
msgstr ""
5447
5514
5448
#: bzrlib/errors.py:1682
5515
#: bzrlib/errors.py:1691
5449
5516
msgid "Certificate error: %(error)s"
5450
5517
msgstr ""
5451
5518
5452
#: bzrlib/errors.py:1690
5519
#: bzrlib/errors.py:1699
5453
5520
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5454
5521
msgstr ""
5455
5522
5456
#: bzrlib/errors.py:1704
5523
#: bzrlib/errors.py:1713
5457
5524
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5458
5525
msgstr ""
5459
5526
5460
#: bzrlib/errors.py:1712
5527
#: bzrlib/errors.py:1721
5461
5528
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5462
5529
msgstr ""
5463
5530
5464
#: bzrlib/errors.py:1721
5531
#: bzrlib/errors.py:1730
5465
5532
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5466
5533
msgstr ""
5467
5534
5468
#: bzrlib/errors.py:1735
5535
#: bzrlib/errors.py:1744
5469
5536
msgid "Too many redirections"
5470
5537
msgstr ""
5471
5538
5472
#: bzrlib/errors.py:1740
5539
#: bzrlib/errors.py:1749
5473
5540
msgid "Working tree has conflicts."
5474
5541
msgstr ""
5475
5542
5476
#: bzrlib/errors.py:1744
5543
#: bzrlib/errors.py:1753
5477
5544
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5478
5545
msgstr ""
5479
5546
5480
#: bzrlib/errors.py:1753
5547
#: bzrlib/errors.py:1762
5481
5548
msgid ""
5482
5549
"Error(s) parsing config file %(filename)s:\n"
5483
5550
"%(errors)s"
5484
5551
msgstr ""
5485
5552
5486
#: bzrlib/errors.py:1763
5553
#: bzrlib/errors.py:1772
5487
5554
msgid ""
5488
5555
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5489
5556
"See ``bzr help %(name)s``"
5490
5557
msgstr ""
5491
5558
5492
#: bzrlib/errors.py:1773
5559
#: bzrlib/errors.py:1782
5493
5560
msgid "%(username)r does not seem to contain a reasonable email address"
5494
5561
msgstr ""
5495
5562
5496
#: bzrlib/errors.py:1782
5563
#: bzrlib/errors.py:1791
5497
5564
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5498
5565
msgstr ""
5499
5566
5500
#: bzrlib/errors.py:1790
5567
#: bzrlib/errors.py:1799
5501
5568
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5502
5569
msgstr ""
5503
5570
5504
#: bzrlib/errors.py:1798
5571
#: bzrlib/errors.py:1807
5505
5572
msgid "Unable to import library \"%(library)s\": %(error)s"
5506
5573
msgstr ""
5507
5574
5508
#: bzrlib/errors.py:1806
5575
#: bzrlib/errors.py:1815
5509
5576
msgid "python-gpgme is not installed, it is needed to verify signatures"
5510
5577
msgstr ""
5511
5578
5512
#: bzrlib/errors.py:1814
5579
#: bzrlib/errors.py:1823
5513
5580
msgid ""
5514
5581
"The working tree for %(basedir)s has changed since the last commit, but "
5515
5582
"weave merge requires that it be unchanged"
5516
5583
msgstr ""
5517
5584
5518
#: bzrlib/errors.py:1824
5585
#: bzrlib/errors.py:1833
5519
5586
msgid ""
5520
5587
"Can't reprocess and show base, because reprocessing obscures the "
5521
5588
"relationship of conflicting lines to the base"
5522
5589
msgstr ""
5523
5590
5524
#: bzrlib/errors.py:1830
5591
#: bzrlib/errors.py:1839
5525
5592
msgid "Cycle in graph %(graph)r"
5526
5593
msgstr ""
5527
5594
5528
#: bzrlib/errors.py:1858
5595
#: bzrlib/errors.py:1867
5529
5596
msgid "File %(filename)s is not conflicted."
5530
5597
msgstr ""
5531
5598
5532
#: bzrlib/errors.py:1880
5599
#: bzrlib/errors.py:1889
5533
5600
msgid "No bundle was found in \"%(filename)s\"."
5534
5601
msgstr ""
5535
5602
5536
#: bzrlib/errors.py:1889
5603
#: bzrlib/errors.py:1898
5537
5604
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5538
5605
msgstr ""
5539
5606
5540
#: bzrlib/errors.py:1899
5607
#: bzrlib/errors.py:1908
5541
5608
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5542
5609
msgstr ""
5543
5610
5544
#: bzrlib/errors.py:1912
5611
#: bzrlib/errors.py:1921
5545
5612
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5546
5613
msgstr ""
5547
5614
5548
#: bzrlib/errors.py:1922
5615
#: bzrlib/errors.py:1931
5549
5616
msgid "Key %(key)s is already present in map"
5550
5617
msgstr ""
5551
5618
5552
#: bzrlib/errors.py:1927
5619
#: bzrlib/errors.py:1936
5553
5620
msgid "The prefix %(prefix)s is in the help search path twice."
5554
5621
msgstr ""
5555
5622
5556
#: bzrlib/errors.py:1937
5623
#: bzrlib/errors.py:1946
5557
5624
msgid ""
5558
5625
"No final name for trans_id %(trans_id)r\n"
5559
5626
"file-id: %(file_id)r\n"
5560
5627
"root trans-id: %(root_trans_id)r\n"
5561
5628
msgstr ""
5562
5629
5563
#: bzrlib/errors.py:1969
5630
#: bzrlib/errors.py:1978
5564
5631
msgid "Attempt to reuse a transform that has already been applied."
5565
5632
msgstr ""
5566
5633
5567
#: bzrlib/errors.py:1974
5634
#: bzrlib/errors.py:1983
5568
5635
msgid "Moving the root directory is not supported at this time"
5569
5636
msgstr ""
5570
5637
5571
#: bzrlib/errors.py:1979
5638
#: bzrlib/errors.py:1988
5572
5639
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5573
5640
msgstr ""
5574
5641
5575
#: bzrlib/errors.py:1990
5642
#: bzrlib/errors.py:1999
5576
5643
msgid ""
5577
5644
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5578
5645
msgstr ""
5579
5646
5580
#: bzrlib/errors.py:2026
5647
#: bzrlib/errors.py:2035
5581
5648
msgid ""
5582
5649
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5583
5650
msgstr ""
5584
5651
5585
#: bzrlib/errors.py:2056
5652
#: bzrlib/errors.py:2065
5586
5653
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5587
5654
msgstr ""
5588
5655
5589
#: bzrlib/errors.py:2064
5656
#: bzrlib/errors.py:2073
5590
5657
msgid "Nothing to merge."
5591
5658
msgstr ""
5592
5659
5593
#: bzrlib/errors.py:2069
5660
#: bzrlib/errors.py:2078
5594
5661
msgid "Format %(format)s cannot be initialised by this version of bzr."
5595
5662
msgstr ""
5596
5663
5597
#: bzrlib/errors.py:2078
5664
#: bzrlib/errors.py:2087
5598
5665
msgid ""
5599
5666
"Cannot convert from format %(from_format)s to format %(format)s. "
5600
5667
"%(problem)s"
5601
5668
msgstr ""
5602
5669
5603
#: bzrlib/errors.py:2090
5670
#: bzrlib/errors.py:2099
5604
5671
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5605
5672
msgstr ""
5606
5673
5607
#: bzrlib/errors.py:2098
5674
#: bzrlib/errors.py:2107
5608
5675
msgid "%(exe_name)s could not be found on this machine"
5609
5676
msgstr ""
5610
5677
5611
#: bzrlib/errors.py:2106
5678
#: bzrlib/errors.py:2115
5612
5679
msgid "Diff is not installed on this machine: %(msg)s"
5613
5680
msgstr ""
5614
5681
5615
#: bzrlib/errors.py:2114
5682
#: bzrlib/errors.py:2123
5616
5683
msgid "Diff3 is not installed on this machine."
5617
5684
msgstr ""
5618
5685
5619
#: bzrlib/errors.py:2120
5686
#: bzrlib/errors.py:2129
5620
5687
msgid "The content being inserted is already present."
5621
5688
msgstr ""
5622
5689
5623
#: bzrlib/errors.py:2125
5690
#: bzrlib/errors.py:2134
5624
5691
msgid ""
5625
5692
"This tree contains left-over files from a failed operation.\n"
5626
5693
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5628
5695
" keep, and delete it when you are done."
5629
5696
msgstr ""
5630
5697
5631
#: bzrlib/errors.py:2136
5698
#: bzrlib/errors.py:2145
5632
5699
msgid ""
5633
5700
"This tree contains left-over files from a failed operation.\n"
5634
5701
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5635
5702
" wish to keep, and delete it when you are done."
5636
5703
msgstr ""
5637
5704
5638
#: bzrlib/errors.py:2146
5705
#: bzrlib/errors.py:2155
5639
5706
msgid ""
5640
5707
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5641
5708
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5643
5710
" keep, and delete it when you are done."
5644
5711
msgstr ""
5645
5712
5646
#: bzrlib/errors.py:2157
5713
#: bzrlib/errors.py:2166
5647
5714
msgid ""
5648
5715
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5649
5716
"examine %(pending_deletion)s to see if it contains any files you wish to "
5650
5717
"keep, and delete it when you are done."
5651
5718
msgstr ""
5652
5719
5653
#: bzrlib/errors.py:2167
5720
#: bzrlib/errors.py:2176
5654
5721
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5655
5722
msgstr ""
5656
5723
5657
#: bzrlib/errors.py:2181
5724
#: bzrlib/errors.py:2190
5658
5725
msgid ""
5659
5726
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5660
5727
msgstr ""
5661
5728
5662
#: bzrlib/errors.py:2194
5729
#: bzrlib/errors.py:2203
5663
5730
msgid "Error in merge modified format"
5664
5731
msgstr ""
5665
5732
5666
#: bzrlib/errors.py:2199
5733
#: bzrlib/errors.py:2208
5667
5734
msgid "Format error in conflict listings"
5668
5735
msgstr ""
5669
5736
5670
#: bzrlib/errors.py:2203
5737
#: bzrlib/errors.py:2212
5671
5738
msgid ""
5672
5739
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5673
5740
"Error: %(description)s"
5674
5741
msgstr ""
5675
5742
5676
#: bzrlib/errors.py:2214
5743
#: bzrlib/errors.py:2223
5677
5744
msgid ""
5678
5745
"An error has been detected in the repository %(repo_path)s.\n"
5679
5746
"Please run bzr reconcile on this repository."
5680
5747
msgstr ""
5681
5748
5682
#: bzrlib/errors.py:2225
5749
#: bzrlib/errors.py:2234
5683
5750
msgid ""
5684
5751
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5685
5752
"reason: %(reason)s"
5686
5753
msgstr ""
5687
5754
5688
#: bzrlib/errors.py:2238
5755
#: bzrlib/errors.py:2247
5689
5756
msgid ""
5690
5757
"An inconsistent delta was supplied: %(delta)r\n"
5691
5758
"reason: %(reason)s"
5692
5759
msgstr ""
5693
5760
5694
#: bzrlib/errors.py:2250
5761
#: bzrlib/errors.py:2259
5695
5762
msgid "To use this feature you must upgrade your branch at %(path)s."
5696
5763
msgstr ""
5697
5764
5698
#: bzrlib/errors.py:2259
5765
#: bzrlib/errors.py:2268
5699
5766
msgid "To use this feature you must upgrade your repository at %(path)s."
5700
5767
msgstr ""
5701
5768
5702
#: bzrlib/errors.py:2264
5769
#: bzrlib/errors.py:2273
5703
5770
msgid ""
5704
5771
"To use this feature you must upgrade your branch at %(path)s to a format "
5705
5772
"which supports rich roots."
5706
5773
msgstr ""
5707
5774
5708
#: bzrlib/errors.py:2270
5775
#: bzrlib/errors.py:2279
5709
5776
msgid "Cannot perform local-only commits on unbound branches."
5710
5777
msgstr ""
5711
5778
5712
#: bzrlib/errors.py:2275
5779
#: bzrlib/errors.py:2284
5713
5780
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5714
5781
msgstr ""
5715
5782
5716
#: bzrlib/errors.py:2296
5783
#: bzrlib/errors.py:2305
5717
5784
msgid "Ghost tags not supported by format %(format)r."
5718
5785
msgstr ""
5719
5786
5720
#: bzrlib/errors.py:2304
5787
#: bzrlib/errors.py:2313
5721
5788
msgid "File is binary but should be text."
5722
5789
msgstr ""
5723
5790
5724
#: bzrlib/errors.py:2309
5791
#: bzrlib/errors.py:2318
5725
5792
msgid "The path %(path)s is not permitted on this platform"
5726
5793
msgstr ""
5727
5794
5728
#: bzrlib/errors.py:2318
5795
#: bzrlib/errors.py:2327
5729
5796
msgid ""
5730
5797
"Testament did not match expected value.\n"
5731
5798
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5732
5799
" {%(measured)s}"
5733
5800
msgstr ""
5734
5801
5735
#: bzrlib/errors.py:2330
5802
#: bzrlib/errors.py:2339
5736
5803
msgid "Not a bzr revision-bundle: %(text)r"
5737
5804
msgstr ""
5738
5805
5739
#: bzrlib/errors.py:2339
5806
#: bzrlib/errors.py:2348
5740
5807
msgid "Bad bzr revision-bundle: %(text)r"
5741
5808
msgstr ""
5742
5809
5743
#: bzrlib/errors.py:2348
5810
#: bzrlib/errors.py:2357
5744
5811
msgid "Malformed bzr revision-bundle header: %(text)r"
5745
5812
msgstr ""
5746
5813
5747
#: bzrlib/errors.py:2353
5814
#: bzrlib/errors.py:2362
5748
5815
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5749
5816
msgstr ""
5750
5817
5751
#: bzrlib/errors.py:2358
5818
#: bzrlib/errors.py:2367
5752
5819
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5753
5820
msgstr ""
5754
5821
5755
#: bzrlib/errors.py:2363
5822
#: bzrlib/errors.py:2372
5756
5823
msgid "End of line marker was not \\n in bzr revision-bundle"
5757
5824
msgstr ""
5758
5825
5759
#: bzrlib/errors.py:2373
5826
#: bzrlib/errors.py:2382
5760
5827
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5761
5828
msgstr ""
5762
5829
5763
#: bzrlib/errors.py:2383
5830
#: bzrlib/errors.py:2392
5764
5831
msgid "Root class for inventory serialization errors"
5765
msgstr ""
5832
msgstr "Root class for inventory serialisation errors"
5766
5833
5767
#: bzrlib/errors.py:2387
5834
#: bzrlib/errors.py:2396
5768
5835
msgid ""
5769
5836
"The inventory was not in the expected format:\n"
5770
5837
" %(msg)s"
5771
5838
msgstr ""
5772
5839
5773
#: bzrlib/errors.py:2396
5840
#: bzrlib/errors.py:2405
5774
5841
msgid "This operation requires rich root data storage"
5775
5842
msgstr ""
5776
5843
5777
#: bzrlib/errors.py:2409
5844
#: bzrlib/errors.py:2418
5778
5845
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5779
5846
msgstr ""
5780
5847
5781
#: bzrlib/errors.py:2418
5848
#: bzrlib/errors.py:2427
5782
5849
msgid ""
5783
5850
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5784
5851
"variable."
5785
5852
msgstr ""
5786
5853
5787
#: bzrlib/errors.py:2425
5854
#: bzrlib/errors.py:2434
5788
5855
msgid ""
5789
5856
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5790
5857
"ghost at {%(ghost_revision_id)s}"
5791
5858
msgstr ""
5792
5859
5793
#: bzrlib/errors.py:2435
5860
#: bzrlib/errors.py:2444
5794
5861
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5795
5862
msgstr ""
5796
5863
5797
#: bzrlib/errors.py:2486
5864
#: bzrlib/errors.py:2495
5798
5865
msgid ""
5799
5866
"A merge directive must provide either a bundle or a public branch location."
5800
5867
msgstr ""
5801
5868
5802
#: bzrlib/errors.py:2493
5869
#: bzrlib/errors.py:2502
5803
5870
msgid "Bad merge directive payload %(start)r"
5804
5871
msgstr ""
5805
5872
5806
#: bzrlib/errors.py:2503
5873
#: bzrlib/errors.py:2512
5807
5874
msgid "Preview patch does not match requested changes."
5808
5875
msgstr ""
5809
5876
5810
#: bzrlib/errors.py:2509
5877
#: bzrlib/errors.py:2518
5811
5878
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5812
5879
msgstr ""
5813
5880
5814
#: bzrlib/errors.py:2519
5881
#: bzrlib/errors.py:2528
5815
5882
msgid ""
5816
5883
"Your branch does not have all of the revisions required in order to merge "
5817
5884
"this merge directive and the target location specified in the merge "
5818
5885
"directive is not a branch: %(location)s."
5819
5886
msgstr ""
5820
5887
5821
#: bzrlib/errors.py:2531
5888
#: bzrlib/errors.py:2540
5822
5889
msgid "Unsupported entry kind %(kind)s"
5823
5890
msgstr "Unsupported entry type %(kind)s"
5824
5891
5825
#: bzrlib/errors.py:2539
5892
#: bzrlib/errors.py:2548
5826
5893
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5827
5894
msgstr ""
5828
5895
5829
#: bzrlib/errors.py:2549
5896
#: bzrlib/errors.py:2558
5830
5897
msgid "Subsume target %(other_tree)s needs to be upgraded."
5831
5898
msgstr ""
5832
5899
5833
#: bzrlib/errors.py:2568
5900
#: bzrlib/errors.py:2577
5834
5901
msgid "No such tag: %(tag_name)s"
5835
5902
msgstr ""
5836
5903
5837
#: bzrlib/errors.py:2576
5904
#: bzrlib/errors.py:2585
5838
5905
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5839
5906
msgstr ""
5840
5907
5841
#: bzrlib/errors.py:2585
5908
#: bzrlib/errors.py:2594
5842
5909
msgid "Tag %(tag_name)s already exists."
5843
5910
msgstr ""
5844
5911
5845
#: bzrlib/errors.py:2593
5912
#: bzrlib/errors.py:2602
5846
5913
msgid ""
5847
5914
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5848
5915
"bugs\" for more information on this feature."
5849
5916
msgstr ""
5850
5917
5851
#: bzrlib/errors.py:2603
5918
#: bzrlib/errors.py:2612
5852
5919
msgid ""
5853
5920
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5854
5921
msgstr ""
5855
5922
5856
#: bzrlib/errors.py:2613
5923
#: bzrlib/errors.py:2622
5857
5924
msgid ""
5858
5925
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5859
5926
msgstr ""
5860
5927
5861
#: bzrlib/errors.py:2623
5928
#: bzrlib/errors.py:2632
5862
5929
msgid "Invalid line in bugs property: '%(line)s'"
5863
5930
msgstr ""
5864
5931
5865
#: bzrlib/errors.py:2631
5932
#: bzrlib/errors.py:2640
5866
5933
msgid "Invalid bug status: '%(status)s'"
5867
5934
msgstr ""
5868
5935
5869
#: bzrlib/errors.py:2639
5936
#: bzrlib/errors.py:2648
5870
5937
msgid "Could not understand response from smart server: %(response_tuple)r"
5871
5938
msgstr ""
5872
5939
5873
#: bzrlib/errors.py:2678
5940
#: bzrlib/errors.py:2687
5874
5941
msgid "Server sent an unexpected error: %(error_tuple)r"
5875
5942
msgstr ""
5876
5943
5877
#: bzrlib/errors.py:2697
5944
#: bzrlib/errors.py:2706
5878
5945
msgid "Unrecognised container format: %(container_format)r"
5879
5946
msgstr ""
5880
5947
5881
#: bzrlib/errors.py:2705
5948
#: bzrlib/errors.py:2714
5882
5949
msgid "Unexpected end of container stream"
5883
5950
msgstr ""
5884
5951
5885
#: bzrlib/errors.py:2710
5952
#: bzrlib/errors.py:2719
5886
5953
msgid "Unknown record type: %(record_type)r"
5887
5954
msgstr ""
5888
5955
5889
#: bzrlib/errors.py:2718
5956
#: bzrlib/errors.py:2727
5890
5957
msgid "Invalid record: %(reason)s"
5891
5958
msgstr ""
5892
5959
5893
#: bzrlib/errors.py:2726
5960
#: bzrlib/errors.py:2735
5894
5961
msgid "Container has data after end marker: %(excess)r"
5895
5962
msgstr ""
5896
5963
5897
#: bzrlib/errors.py:2734
5964
#: bzrlib/errors.py:2743
5898
5965
msgid "Container has multiple records with the same name: %(name)s"
5899
5966
msgstr ""
5900
5967
5901
#: bzrlib/errors.py:2747
5968
#: bzrlib/errors.py:2756
5902
5969
msgid "Corrupt or incompatible data stream: %(reason)s"
5903
5970
msgstr ""
5904
5971
5905
#: bzrlib/errors.py:2755
5972
#: bzrlib/errors.py:2764
5906
5973
msgid "SMTP error: %(error)s"
5907
5974
msgstr ""
5908
5975
5909
#: bzrlib/errors.py:2763
5976
#: bzrlib/errors.py:2772
5910
5977
msgid "No message supplied."
5911
5978
msgstr ""
5912
5979
5913
#: bzrlib/errors.py:2768
5980
#: bzrlib/errors.py:2777
5914
5981
msgid "No mail-to address (--mail-to) or output (-o) specified."
5915
5982
msgstr ""
5916
5983
5917
#: bzrlib/errors.py:2773
5918
msgid "Unknown mail client: %(mail_client)s"
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2781
5984
#: bzrlib/errors.py:2782
5922
5985
msgid ""
5923
5986
"Unable to find mail client with the following names: "
5924
5987
"%(mail_command_list_string)s"
5925
5988
msgstr ""
5926
5989
5927
#: bzrlib/errors.py:2791
5990
#: bzrlib/errors.py:2792
5928
5991
msgid "SMTP connection to %(host)s refused"
5929
5992
msgstr ""
5930
5993
5931
#: bzrlib/errors.py:2800
5994
#: bzrlib/errors.py:2801
5932
5995
msgid "Please specify smtp_server. No server at default %(host)s."
5933
5996
msgstr ""
5934
5997
5935
#: bzrlib/errors.py:2814
5998
#: bzrlib/errors.py:2815
5936
5999
msgid ""
5937
6000
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5938
6001
"reconfigure."
5939
6002
msgstr ""
5940
6003
5941
#: bzrlib/errors.py:2826
6004
#: bzrlib/errors.py:2827
5942
6005
msgid "'%(display_url)s' is already a branch."
5943
6006
msgstr ""
5944
6007
5945
#: bzrlib/errors.py:2831
6008
#: bzrlib/errors.py:2832
5946
6009
msgid "'%(display_url)s' is already a tree."
5947
6010
msgstr ""
5948
6011
5949
#: bzrlib/errors.py:2836
6012
#: bzrlib/errors.py:2837
5950
6013
msgid "'%(display_url)s' is already a checkout."
5951
6014
msgstr ""
5952
6015
5953
#: bzrlib/errors.py:2841
6016
#: bzrlib/errors.py:2842
5954
6017
msgid "'%(display_url)s' is already a lightweight checkout."
5955
6018
msgstr ""
5956
6019
5957
#: bzrlib/errors.py:2846
6020
#: bzrlib/errors.py:2847
5958
6021
msgid "'%(display_url)s' is already using a shared repository."
5959
6022
msgstr ""
5960
6023
5961
#: bzrlib/errors.py:2851
6024
#: bzrlib/errors.py:2852
5962
6025
msgid "'%(display_url)s' is already standalone."
5963
6026
msgstr ""
5964
6027
5965
#: bzrlib/errors.py:2856
6028
#: bzrlib/errors.py:2857
5966
6029
msgid "Shared repository '%(display_url)s' already creates working trees."
5967
6030
msgstr ""
5968
6031
5969
#: bzrlib/errors.py:2862
6032
#: bzrlib/errors.py:2863
5970
6033
msgid ""
5971
6034
"Shared repository '%(display_url)s' already doesn't create working trees."
5972
6035
msgstr ""
5973
6036
5974
#: bzrlib/errors.py:2868
6037
#: bzrlib/errors.py:2869
5975
6038
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5976
6039
msgstr ""
5977
6040
5978
#: bzrlib/errors.py:2873
6041
#: bzrlib/errors.py:2874
5979
6042
msgid "No location could be found to bind to at %(display_url)s."
5980
6043
msgstr ""
5981
6044
5982
#: bzrlib/errors.py:2878
6045
#: bzrlib/errors.py:2879
5983
6046
msgid ""
5984
6047
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5985
6048
"status).%(more)s"
5986
6049
msgstr ""
5987
6050
5988
#: bzrlib/errors.py:2897
6051
#: bzrlib/errors.py:2898
5989
6052
msgid ""
5990
6053
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5991
6054
"list).%(more)s"
5992
6055
msgstr ""
5993
6056
5994
#: bzrlib/errors.py:2903
6057
#: bzrlib/errors.py:2904
5995
6058
msgid "Variable {%(name)s} is not available."
5996
6059
msgstr ""
5997
6060
5998
#: bzrlib/errors.py:2911
6061
#: bzrlib/errors.py:2912
5999
6062
msgid "No template specified."
6000
6063
msgstr ""
6001
6064
6002
#: bzrlib/errors.py:2916
6065
#: bzrlib/errors.py:2917
6003
6066
msgid "Unable to create symlink %(path_str)son this platform"
6004
6067
msgstr ""
6005
6068
6006
#: bzrlib/errors.py:2931
6069
#: bzrlib/errors.py:2932
6007
6070
msgid ""
6008
6071
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6009
6072
"\"original\", \"local\"."
6010
6073
msgstr ""
6011
6074
6012
#: bzrlib/errors.py:2965
6075
#: bzrlib/errors.py:2966
6013
6076
msgid ""
6014
6077
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6015
6078
msgstr ""
6016
6079
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6017
6080
6018
#: bzrlib/errors.py:2977
6081
#: bzrlib/errors.py:2978
6019
6082
msgid "The \"%(config_id)s\" configuration does not exist."
6020
6083
msgstr ""
6021
6084
6022
#: bzrlib/errors.py:2985
6085
#: bzrlib/errors.py:2986
6023
6086
msgid "The \"%(option_name)s\" configuration option does not exist."
6024
6087
msgstr ""
6025
6088
6026
#: bzrlib/errors.py:2993
6089
#: bzrlib/errors.py:2994
6027
6090
msgid "The alias \"%(alias_name)s\" does not exist."
6028
6091
msgstr ""
6029
6092
6030
#: bzrlib/errors.py:3007
6093
#: bzrlib/errors.py:3008
6031
6094
msgid "\"%(alias_name)s\" is not a valid location alias."
6032
6095
msgstr ""
6033
6096
6034
#: bzrlib/errors.py:3015
6097
#: bzrlib/errors.py:3016
6035
6098
msgid "No %(alias_name)s location assigned."
6036
6099
msgstr ""
6037
6100
6038
#: bzrlib/errors.py:3023
6101
#: bzrlib/errors.py:3024
6039
6102
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6040
6103
msgstr ""
6041
6104
6042
#: bzrlib/errors.py:3033
6105
#: bzrlib/errors.py:3034
6043
6106
msgid "Unknown rules detected: %(unknowns_str)s."
6044
6107
msgstr ""
6045
6108
6046
#: bzrlib/errors.py:3044
6109
#: bzrlib/errors.py:3045
6047
6110
msgid "Tip change rejected: %(msg)s"
6048
6111
msgstr ""
6049
6112
6050
#: bzrlib/errors.py:3052
6113
#: bzrlib/errors.py:3053
6051
6114
msgid "Shelf corrupt."
6052
6115
msgstr ""
6053
6116
6054
#: bzrlib/errors.py:3057
6117
#: bzrlib/errors.py:3058
6055
6118
msgid "Corruption while decompressing repository file%(orig_error)s"
6056
6119
msgstr ""
6057
6120
6058
#: bzrlib/errors.py:3069
6121
#: bzrlib/errors.py:3070
6059
6122
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6060
6123
msgstr ""
6061
6124
6062
#: bzrlib/errors.py:3077
6125
#: bzrlib/errors.py:3078
6063
6126
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6064
6127
msgstr ""
6065
6128
6066
#: bzrlib/errors.py:3085
6129
#: bzrlib/errors.py:3086
6067
6130
msgid ""
6068
6131
"An attempt to access a url outside the server jail was made: '%(url)s'."
6069
6132
msgstr ""
6070
6133
6071
#: bzrlib/errors.py:3093
6134
#: bzrlib/errors.py:3094
6072
6135
msgid "The user aborted the operation."
6073
6136
msgstr ""
6074
6137
6075
#: bzrlib/errors.py:3098
6138
#: bzrlib/errors.py:3099
6076
6139
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6077
6140
msgstr ""
6078
6141
6079
#: bzrlib/errors.py:3108
6142
#: bzrlib/errors.py:3109
6080
6143
msgid "No such view: %(view_name)s."
6081
6144
msgstr ""
6082
6145
6083
#: bzrlib/errors.py:3118
6146
#: bzrlib/errors.py:3119
6084
6147
msgid ""
6085
6148
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6086
6149
"to a later format."
6087
6150
msgstr ""
6088
6151
6089
#: bzrlib/errors.py:3127
6152
#: bzrlib/errors.py:3128
6090
6153
msgid ""
6091
6154
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6092
6155
msgstr ""
6093
6156
6094
#: bzrlib/errors.py:3194
6157
#: bzrlib/errors.py:3195
6095
6158
msgid "%(bzrdir)r does not support co-located branches."
6096
6159
msgstr ""
6097
6160
6098
#: bzrlib/errors.py:3200
6161
#: bzrlib/errors.py:3201
6099
6162
msgid ""
6100
6163
"Unable to determine your name.\n"
6101
6164
"Please, set your name with the 'whoami' command.\n"
6102
6165
"E.g. bzr whoami \"Your Name <name@example.com>\""
6103
6166
msgstr ""
6104
6167
6105
#: bzrlib/errors.py:3209
6168
#: bzrlib/errors.py:3210
6106
6169
msgid "Invalid pattern(s) found. %(msg)s"
6107
6170
msgstr ""
6108
6171
6109
#: bzrlib/errors.py:3217
6172
#: bzrlib/errors.py:3218
6110
6173
msgid ""
6111
6174
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6112
6175
"unbind` to fix."
6113
6176
msgstr ""
6114
6177
6115
#: bzrlib/errors.py:3228
6178
#: bzrlib/errors.py:3229
6116
6179
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6117
6180
msgstr ""
6118
6181
6119
#: bzrlib/errors.py:3237
6182
#: bzrlib/errors.py:3238
6120
6183
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6121
6184
msgstr ""
6122
6185
6123
#: bzrlib/errors.py:3246
6186
#: bzrlib/errors.py:3247
6124
6187
msgid ""
6125
6188
"No compatible object available for operations from %(source)r to %(target)r."
6126
6189
msgstr ""
6127
6190
6128
#: bzrlib/errors.py:3256
6191
#: bzrlib/errors.py:3257
6129
6192
msgid ""
6130
6193
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6131
6194
"%(arguments)s."
6132
6195
msgstr ""
6133
6196
6134
#: bzrlib/errors.py:3266
6197
#: bzrlib/errors.py:3267
6135
6198
msgid ""
6136
6199
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6137
6200
"format %(format)r"
6139
6202
"Type change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6140
6203
"format %(format)r"
6141
6204
6142
#: bzrlib/errors.py:3278
6205
#: bzrlib/errors.py:3279
6143
6206
msgid ""
6144
6207
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6145
6208
"plugin."
6146
6209
msgstr ""
6147
6210
6148
#: bzrlib/errors.py:3291
6211
#: bzrlib/errors.py:3292
6149
6212
msgid "Binary files section encountered."
6150
6213
msgstr ""
6151
6214
6152
#: bzrlib/errors.py:3299
6215
#: bzrlib/errors.py:3300
6153
6216
msgid ""
6154
6217
"Malformed patch header. %(desc)s\n"
6155
6218
"%(line)r"
6156
6219
msgstr ""
6157
6220
6158
#: bzrlib/errors.py:3308
6221
#: bzrlib/errors.py:3309
6159
6222
msgid ""
6160
6223
"Malformed hunk header. %(desc)s\n"
6161
6224
"%(line)r"
6162
6225
msgstr ""
6163
6226
6164
#: bzrlib/errors.py:3317
6227
#: bzrlib/errors.py:3318
6165
6228
msgid ""
6166
6229
"Malformed line. %(desc)s\n"
6167
6230
"%(line)r"
6168
6231
msgstr ""
6169
6232
6170
#: bzrlib/errors.py:3327
6233
#: bzrlib/errors.py:3328
6171
6234
msgid ""
6172
6235
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6173
6236
"but patch says it should be \"%(patch_line)s\""
6174
6237
msgstr ""
6175
6238
6176
#: bzrlib/errors.py:3338
6239
#: bzrlib/errors.py:3339
6177
6240
msgid "The feature %(feature)s has already been registered."
6178
6241
msgstr ""
6179
6242
6225
6288
"regular push."
6226
6289
msgstr ""
6227
6290
6228
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6291
#: bzrlib/gpg.py:366
6292
msgid "No GnuPG key results for pattern: {0}"
6293
msgstr ""
6294
6295
#: bzrlib/gpg.py:439
6229
6296
msgid "{0} commits with valid signatures"
6230
6297
msgstr ""
6231
6298
6232
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6299
#: bzrlib/gpg.py:445
6233
6300
msgid "{0} commit with unknown key"
6234
6301
msgid_plural "{0} commits with unknown keys"
6235
6302
msgstr[0] ""
6236
6303
msgstr[1] ""
6237
6304
6238
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6305
#: bzrlib/gpg.py:453
6239
6306
msgid "{0} commit not valid"
6240
6307
msgid_plural "{0} commits not valid"
6241
6308
msgstr[0] ""
6242
6309
msgstr[1] ""
6243
6310
6244
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6311
#: bzrlib/gpg.py:461
6245
6312
msgid "{0} commit not signed"
6246
6313
msgid_plural "{0} commits not signed"
6247
6314
msgstr[0] ""
6248
6315
msgstr[1] ""
6249
6316
6250
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6317
#: bzrlib/gpg.py:469
6251
6318
msgid "{0} commit with key now expired"
6252
6319
msgid_plural "{0} commits with key now expired"
6253
6320
msgstr[0] ""
6254
6321
msgstr[1] ""
6255
6322
6256
#: bzrlib/gpg.py:343
6257
msgid "No GnuPG key results for pattern: {0}"
6258
msgstr ""
6323
#: bzrlib/gpg.py:489
6324
msgid "{0} commit by author {1} with key {2} now expired"
6325
msgid_plural "{0} commits by author {1} with key {2} now expired"
6326
msgstr[0] ""
6327
msgstr[1] ""
6259
6328
6260
#: bzrlib/gpg.py:386
6329
#: bzrlib/gpg.py:505
6261
6330
msgid "{0} signed {1} commit"
6262
6331
msgid_plural "{0} signed {1} commits"
6263
6332
msgstr[0] ""
6264
6333
msgstr[1] ""
6265
6334
6266
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6335
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6267
6336
msgid "{0} commit by author {1}"
6268
6337
msgid_plural "{0} commits by author {1}"
6269
6338
msgstr[0] ""
6270
6339
msgstr[1] ""
6271
6340
6272
#: bzrlib/gpg.py:433
6341
#: bzrlib/gpg.py:554
6273
6342
msgid "Unknown key {0} signed {1} commit"
6274
6343
msgid_plural "Unknown key {0} signed {1} commits"
6275
6344
msgstr[0] ""
6276
6345
msgstr[1] ""
6277
6346
6278
#: bzrlib/gpg.py:452
6279
msgid "{0} commit by author {1} with key {2} now expired"
6280
msgid_plural "{0} commits by author {1} with key {2} now expired"
6281
msgstr[0] ""
6282
msgstr[1] ""
6283
6284
6347
#: bzrlib/groupcompress.py:1739
6285
6348
#, python-format
6286
6349
msgid "Insert claimed random_id=True, but then inserted %r two times"
6287
6350
msgstr ""
6288
6351
6289
#: bzrlib/hooks.py:331
6352
#: bzrlib/hooks.py:313
6290
6353
#, python-format
6291
6354
msgid "Introduced in: %s"
6292
6355
msgstr ""
6293
6356
6294
#: bzrlib/hooks.py:334
6357
#: bzrlib/hooks.py:316
6295
6358
#, python-format
6296
6359
msgid "Deprecated in: %s"
6297
6360
msgstr ""
6340
6403
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6341
6404
msgstr ""
6342
6405
6343
#: bzrlib/log.py:572
6406
#: bzrlib/log.py:563
6344
6407
msgid "--exclude-common-ancestry requires two different revisions"
6345
6408
msgstr ""
6346
6409
6347
#: bzrlib/log.py:574
6410
#: bzrlib/log.py:565
6348
6411
#, python-format
6349
6412
msgid "invalid direction %r"
6350
6413
msgstr ""
6351
6414
6352
#: bzrlib/log.py:662
6415
#: bzrlib/log.py:653
6353
6416
msgid "Start revision not found in history of end revision."
6354
6417
msgstr ""
6355
6418
6356
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6419
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6357
6420
msgid "Logging revision 0 is invalid."
6358
6421
msgstr ""
6359
6422
6360
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6423
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6361
6424
msgid "Start revision must be older than the end revision."
6362
6425
msgstr ""
6363
6426
6364
#: bzrlib/log.py:1827
6427
#: bzrlib/log.py:1818
6365
6428
#, python-format
6366
6429
msgid "unknown log formatter: %r"
6367
6430
msgstr ""
6368
6431
6369
#: bzrlib/log.py:2123
6432
#: bzrlib/log.py:2114
6370
6433
msgid "fixes bug"
6371
6434
msgid_plural "fixes bugs"
6372
6435
msgstr[0] ""
6381
6444
msgid "%d conflicts encountered."
6382
6445
msgstr ""
6383
6446
6384
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6447
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6385
6448
msgid "Preparing file merge"
6386
6449
msgstr ""
6387
6450
6503
6566
msgid "lstat/stat of ({0!r}): {1!r}"
6504
6567
msgstr ""
6505
6568
6506
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6569
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6507
6570
#, python-format
6508
6571
msgid "sorry, %r not allowed in path"
6509
6572
msgstr ""
6510
6573
6511
#: bzrlib/osutils.py:1237
6574
#: bzrlib/osutils.py:1259
6512
6575
#, python-format
6513
6576
msgid "%r is too short to calculate a relative path"
6514
6577
msgstr ""
6547
6610
msgid "Generate only the shell function, don't enable it"
6548
6611
msgstr ""
6549
6612
6550
#: bzrlib/plugins/launchpad/__init__.py:81
6613
#: bzrlib/plugins/launchpad/account.py:66
6614
msgid "Setting ssh/sftp usernames for launchpad.net."
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/cmds.py:44
6551
6618
msgid "Register a branch with launchpad.net."
6552
6619
msgstr ""
6553
6620
6554
#: bzrlib/plugins/launchpad/__init__.py:83
6621
#: bzrlib/plugins/launchpad/cmds.py:46
6555
6622
msgid ""
6556
6623
"This command lists a bzr branch in the directory of branches on\n"
6557
6624
"launchpad.net. Registration allows the branch to be associated with\n"
6558
6625
"bugs or specifications."
6559
6626
msgstr ""
6560
6627
6561
#: bzrlib/plugins/launchpad/__init__.py:87
6628
#: bzrlib/plugins/launchpad/cmds.py:50
6562
6629
msgid ""
6563
6630
"Before using this command you must register the project to which the\n"
6564
6631
"branch belongs, and create an account for yourself on launchpad.net."
6565
6632
msgstr ""
6566
6633
6567
#: bzrlib/plugins/launchpad/__init__.py:90
6634
#: bzrlib/plugins/launchpad/cmds.py:53
6568
6635
msgid ""
6569
6636
"arguments:\n"
6570
6637
" public_url: The publicly visible url for the branch to register.\n"
6576
6643
" otherwise error."
6577
6644
msgstr ""
6578
6645
6579
#: bzrlib/plugins/launchpad/__init__.py:99
6646
#: bzrlib/plugins/launchpad/cmds.py:62
6580
6647
msgid ""
6581
6648
"example:\n"
6582
6649
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6583
6650
" --project fooproject"
6584
6651
msgstr ""
6585
6652
6586
#: bzrlib/plugins/launchpad/__init__.py:106
6653
#: bzrlib/plugins/launchpad/cmds.py:69
6587
6654
msgid "Launchpad project short name to associate with the branch."
6588
6655
msgstr ""
6589
6656
6590
#: bzrlib/plugins/launchpad/__init__.py:113
6657
#: bzrlib/plugins/launchpad/cmds.py:76
6591
6658
msgid ""
6592
6659
"Short name for the branch; by default taken from the last component of the "
6593
6660
"url."
6594
6661
msgstr ""
6595
6662
6596
#: bzrlib/plugins/launchpad/__init__.py:117
6663
#: bzrlib/plugins/launchpad/cmds.py:80
6597
6664
msgid "One-sentence description of the branch."
6598
6665
msgstr ""
6599
6666
6600
#: bzrlib/plugins/launchpad/__init__.py:120
6667
#: bzrlib/plugins/launchpad/cmds.py:83
6601
6668
msgid "Longer description of the purpose or contents of the branch."
6602
6669
msgstr ""
6603
6670
6604
#: bzrlib/plugins/launchpad/__init__.py:123
6671
#: bzrlib/plugins/launchpad/cmds.py:86
6605
6672
msgid "Branch author's email address, if not yourself."
6606
6673
msgstr ""
6607
6674
6608
#: bzrlib/plugins/launchpad/__init__.py:126
6675
#: bzrlib/plugins/launchpad/cmds.py:89
6609
6676
msgid "The bug this branch fixes."
6610
6677
msgstr ""
6611
6678
6612
#: bzrlib/plugins/launchpad/__init__.py:129
6679
#: bzrlib/plugins/launchpad/cmds.py:92
6613
6680
msgid "Prepare the request but don't actually send it."
6614
6681
msgstr ""
6615
6682
6616
#: bzrlib/plugins/launchpad/__init__.py:151
6683
#: bzrlib/plugins/launchpad/cmds.py:114
6617
6684
msgid ""
6618
6685
"register-branch requires a public branch url - see bzr help register-branch."
6619
6686
msgstr ""
6620
6687
6621
#: bzrlib/plugins/launchpad/__init__.py:159
6688
#: bzrlib/plugins/launchpad/cmds.py:122
6622
6689
msgid "--product is deprecated; please use --project."
6623
6690
msgstr ""
6624
6691
6625
#: bzrlib/plugins/launchpad/__init__.py:191
6692
#: bzrlib/plugins/launchpad/cmds.py:152
6626
6693
msgid "Open a Launchpad branch page in your web browser."
6627
6694
msgstr ""
6628
6695
6629
#: bzrlib/plugins/launchpad/__init__.py:196
6696
#: bzrlib/plugins/launchpad/cmds.py:157
6630
6697
msgid "Do not actually open the browser. Just say the URL we would use."
6631
6698
msgstr ""
6632
6699
6633
#: bzrlib/plugins/launchpad/__init__.py:231
6700
#: bzrlib/plugins/launchpad/cmds.py:192
6634
6701
#, python-format
6635
6702
msgid "Opening %s in web browser"
6636
6703
msgstr ""
6637
6704
6638
#: bzrlib/plugins/launchpad/__init__.py:241
6705
#: bzrlib/plugins/launchpad/cmds.py:200
6639
6706
msgid "Show or set the Launchpad user ID."
6640
6707
msgstr ""
6641
6708
6642
#: bzrlib/plugins/launchpad/__init__.py:243
6709
#: bzrlib/plugins/launchpad/cmds.py:202
6643
6710
msgid ""
6644
6711
"When communicating with Launchpad, some commands need to know your\n"
6645
6712
"Launchpad user ID. This command can be used to set or show the\n"
6646
6713
"user ID that Bazaar will use for such communication."
6647
6714
msgstr ""
6648
6715
6649
#: bzrlib/plugins/launchpad/__init__.py:247
6716
#: bzrlib/plugins/launchpad/cmds.py:206
6650
6717
msgid ""
6651
6718
":Examples:\n"
6652
6719
" Show the Launchpad ID of the current user::"
6653
6720
msgstr ""
6654
6721
6655
#: bzrlib/plugins/launchpad/__init__.py:250
6722
#: bzrlib/plugins/launchpad/cmds.py:209
6656
6723
msgid " bzr launchpad-login"
6657
6724
msgstr ""
6658
6725
6659
#: bzrlib/plugins/launchpad/__init__.py:252
6726
#: bzrlib/plugins/launchpad/cmds.py:211
6660
6727
msgid " Set the Launchpad ID of the current user to 'bob'::"
6661
6728
msgstr ""
6662
6729
6663
#: bzrlib/plugins/launchpad/__init__.py:254
6730
#: bzrlib/plugins/launchpad/cmds.py:213
6664
6731
msgid " bzr launchpad-login bob"
6665
6732
msgstr ""
6666
6733
6667
#: bzrlib/plugins/launchpad/__init__.py:261
6734
#: bzrlib/plugins/launchpad/cmds.py:220
6668
6735
msgid "Don't check that the user name is valid."
6669
6736
msgstr ""
6670
6737
6671
#: bzrlib/plugins/launchpad/__init__.py:276
6672
#: bzrlib/plugins/launchpad/__init__.py:287
6738
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6673
6739
msgid "Launchpad user ID exists and has SSH keys.\n"
6674
6740
msgstr ""
6675
6741
6676
#: bzrlib/plugins/launchpad/__init__.py:279
6742
#: bzrlib/plugins/launchpad/cmds.py:238
6677
6743
msgid "No Launchpad user ID configured.\n"
6678
6744
msgstr ""
6679
6745
6680
#: bzrlib/plugins/launchpad/__init__.py:290
6746
#: bzrlib/plugins/launchpad/cmds.py:249
6681
6747
#, python-format
6682
6748
msgid "Launchpad user ID set to '%s'.\n"
6683
6749
msgstr ""
6684
6750
6685
#: bzrlib/plugins/launchpad/__init__.py:298
6751
#: bzrlib/plugins/launchpad/cmds.py:255
6686
6752
msgid "Ask Launchpad to mirror a branch now."
6687
6753
msgstr ""
6688
6754
6689
#: bzrlib/plugins/launchpad/__init__.py:318
6755
#: bzrlib/plugins/launchpad/cmds.py:272
6690
6756
msgid "Propose merging a branch on Launchpad."
6691
6757
msgstr ""
6692
6758
6693
#: bzrlib/plugins/launchpad/__init__.py:320
6759
#: bzrlib/plugins/launchpad/cmds.py:274
6694
6760
msgid ""
6695
6761
"This will open your usual editor to provide the initial comment. When it\n"
6696
6762
"has created the proposal, it will open it in your default web browser."
6697
6763
msgstr ""
6698
6764
6699
#: bzrlib/plugins/launchpad/__init__.py:323
6765
#: bzrlib/plugins/launchpad/cmds.py:277
6700
6766
msgid ""
6701
6767
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6702
6768
"is not supplied, the remembered submit branch will be used. If no submit\n"
6703
6769
"branch is remembered, the development focus will be used."
6704
6770
msgstr ""
6705
6771
6706
#: bzrlib/plugins/launchpad/__init__.py:327
6772
#: bzrlib/plugins/launchpad/cmds.py:281
6707
6773
msgid ""
6708
6774
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6709
6775
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6711
6777
"may optionally be followed by '=' and the review type. For example:"
6712
6778
msgstr ""
6713
6779
6714
#: bzrlib/plugins/launchpad/__init__.py:332
6780
#: bzrlib/plugins/launchpad/cmds.py:286
6715
6781
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6716
6782
msgstr ""
6717
6783
6718
#: bzrlib/plugins/launchpad/__init__.py:334
6784
#: bzrlib/plugins/launchpad/cmds.py:288
6719
6785
msgid ""
6720
6786
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6721
6787
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6722
6788
msgstr ""
6723
6789
6724
#: bzrlib/plugins/launchpad/__init__.py:339
6790
#: bzrlib/plugins/launchpad/cmds.py:293
6725
6791
msgid "Propose the merge on staging."
6726
6792
msgstr ""
6727
6793
6728
#: bzrlib/plugins/launchpad/__init__.py:341
6794
#: bzrlib/plugins/launchpad/cmds.py:295
6729
6795
msgid "Commit message."
6730
6796
msgstr ""
6731
6797
6732
#: bzrlib/plugins/launchpad/__init__.py:343
6798
#: bzrlib/plugins/launchpad/cmds.py:297
6733
6799
msgid "Mark the proposal as approved immediately."
6734
6800
msgstr ""
6735
6801
6736
#: bzrlib/plugins/launchpad/__init__.py:345
6802
#: bzrlib/plugins/launchpad/cmds.py:298
6803
msgid "The bug this proposal fixes."
6804
msgstr ""
6805
6806
#: bzrlib/plugins/launchpad/cmds.py:300
6737
6807
msgid "Requested reviewer and optional type."
6738
6808
msgstr ""
6739
6809
6740
#: bzrlib/plugins/launchpad/__init__.py:382
6810
#: bzrlib/plugins/launchpad/cmds.py:335
6741
6811
msgid "Find the proposal to merge this revision."
6742
6812
msgstr ""
6743
6813
6744
#: bzrlib/plugins/launchpad/__init__.py:384
6814
#: bzrlib/plugins/launchpad/cmds.py:337
6745
6815
msgid ""
6746
6816
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6747
6817
"This works only if the selected branch was the merge proposal target, and\n"
6749
6819
"are opened in a web browser."
6750
6820
msgstr ""
6751
6821
6752
#: bzrlib/plugins/launchpad/__init__.py:389
6822
#: bzrlib/plugins/launchpad/cmds.py:342
6753
6823
msgid ""
6754
6824
"Any revision involved in the merge may be specified-- the revision in\n"
6755
6825
"which the merge was performed, or one of the revisions that was merged."
6756
6826
msgstr ""
6757
6827
6758
#: bzrlib/plugins/launchpad/__init__.py:392
6828
#: bzrlib/plugins/launchpad/cmds.py:345
6759
6829
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6760
6830
msgstr ""
6761
6831
6762
#: bzrlib/plugins/launchpad/__init__.py:394
6832
#: bzrlib/plugins/launchpad/cmds.py:347
6763
6833
msgid " bzr lp-find-proposal -r annotate:README:1"
6764
6834
msgstr ""
6765
6835
6766
#: bzrlib/plugins/launchpad/__init__.py:409
6836
#: bzrlib/plugins/launchpad/cmds.py:363
6767
6837
msgid "No review found."
6768
6838
msgstr ""
6769
6839
6770
#: bzrlib/plugins/launchpad/__init__.py:410
6840
#: bzrlib/plugins/launchpad/cmds.py:364
6771
6841
#, python-format
6772
6842
msgid "%d proposals(s) found."
6773
6843
msgstr ""
6774
6844
6775
#: bzrlib/plugins/launchpad/__init__.py:420
6845
#: bzrlib/plugins/launchpad/cmds.py:374
6776
6846
msgid "Finding revision-id"
6777
6847
msgstr ""
6778
6848
6779
#: bzrlib/plugins/launchpad/__init__.py:427
6849
#: bzrlib/plugins/launchpad/cmds.py:381
6780
6850
msgid "Finding merge"
6781
6851
msgstr ""
6782
6852
6783
#: bzrlib/plugins/launchpad/__init__.py:432
6853
#: bzrlib/plugins/launchpad/cmds.py:386
6784
6854
msgid "Finding revno"
6785
6855
msgstr ""
6786
6856
6787
#: bzrlib/plugins/launchpad/__init__.py:437
6857
#: bzrlib/plugins/launchpad/cmds.py:392
6788
6858
msgid "Finding Launchpad branch"
6789
6859
msgstr ""
6790
6860
6791
#: bzrlib/plugins/launchpad/__init__.py:440
6861
#: bzrlib/plugins/launchpad/cmds.py:395
6792
6862
msgid "Finding proposals"
6793
6863
msgstr ""
6794
6864
6795
#: bzrlib/plugins/launchpad/account.py:66
6796
msgid "Setting ssh/sftp usernames for launchpad.net."
6797
msgstr ""
6798
6799
6865
#: bzrlib/plugins/launchpad/lp_api.py:241
6800
6866
#: bzrlib/plugins/launchpad/lp_api.py:246
6801
6867
#, python-format
6839
6905
" remote: {2}"
6840
6906
msgstr ""
6841
6907
6842
#: bzrlib/plugins/launchpad/lp_propose.py:149
6908
#: bzrlib/plugins/launchpad/lp_propose.py:150
6843
6909
#, python-format
6844
6910
msgid "There is already a branch merge proposal: %s"
6845
6911
msgstr ""
6846
6912
6847
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6848
6914
msgid "pb parameter to convert() is deprecated"
6849
6915
msgstr ""
6850
6916
6851
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6852
6918
msgid "starting upgrade from format 4 to 5"
6853
6919
msgstr ""
6854
6920
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6856
6922
msgid "note: upgrade may be faster if all store files are ungzipped first"
6857
6923
msgstr ""
6858
6924
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6860
6926
msgid "converting revision"
6861
6927
msgstr ""
6862
6928
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6864
6930
msgid "upgraded to weaves:"
6865
6931
msgstr ""
6866
6932
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6868
6934
#, python-format
6869
6935
msgid "%6d revisions and inventories"
6870
6936
msgstr ""
6871
6937
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6938
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6873
6939
#, python-format
6874
6940
msgid "%6d revisions not present"
6875
6941
msgstr ""
6876
6942
6877
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6943
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6878
6944
#, python-format
6879
6945
msgid "%6d texts"
6880
6946
msgstr ""
6881
6947
6882
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6883
6949
msgid "writing weave"
6884
6950
msgstr ""
6885
6951
6886
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6952
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6888
6954
msgid "inventory"
6889
6955
msgstr ""
6890
6956
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6892
6958
msgid "write revision"
6893
6959
msgstr ""
6894
6960
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6896
6962
msgid "loading revision"
6897
6963
msgstr ""
6898
6964
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6965
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6900
6966
#, python-format
6901
6967
msgid "revision {%s} not present in branch; will be converted as a ghost"
6902
6968
msgstr ""
6903
6969
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6905
6971
msgid "starting upgrade from format 5 to 6"
6906
6972
msgstr ""
6907
6973
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6974
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6909
6975
#, python-format
6910
6976
msgid "adding prefixes to %s"
6911
6977
msgstr ""
6912
6978
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6979
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6914
6980
msgid "starting upgrade from format 6 to metadir"
6915
6981
msgstr ""
6916
6982
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6983
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6918
6984
msgid "Removing ancestry.weave"
6919
6985
msgstr ""
6920
6986
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6987
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6922
6988
msgid "Finding branch files"
6923
6989
msgstr ""
6924
6990
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6991
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6926
6992
msgid "Upgrading repository"
6927
6993
msgstr ""
6928
6994
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6995
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6930
6996
msgid "Upgrading branch"
6931
6997
msgstr ""
6932
6998
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6999
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6934
7000
msgid "No working tree."
6935
7001
msgstr ""
6936
7002
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6938
7004
msgid "Upgrading working tree"
6939
7005
msgstr ""
6940
7006
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7007
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6942
7008
#, python-format
6943
7009
msgid "Make %s lock"
6944
7010
msgstr ""
6945
7011
6946
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7012
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6947
7013
#, python-format
6948
7014
msgid "Moving %s"
6949
7015
msgstr ""
6970
7036
msgid "Too many redirections trying to make %s."
6971
7037
msgstr ""
6972
7038
6973
#: bzrlib/push.py:147
7039
#: bzrlib/push.py:148
6974
7040
msgid ""
6975
7041
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6976
7042
"information."
6977
7043
msgstr ""
6978
7044
6979
#: bzrlib/push.py:151
7045
#: bzrlib/push.py:152
6980
7046
#, python-format
6981
7047
msgid ""
6982
7048
"It is not possible to losslessly push to %s. You may want to use dpush "
6983
7049
"instead."
6984
7050
msgstr ""
6985
7051
6986
#: bzrlib/push.py:157
7052
#: bzrlib/push.py:158
6987
7053
#, python-format
6988
7054
msgid ""
6989
7055
"At %s you have a valid .bzr control directory, but not a branch or "
7008
7074
#: bzrlib/reconcile.py:111
7009
7075
#, python-format
7010
7076
msgid "%s cannot canonicalize CHKs."
7011
msgstr ""
7077
msgstr "%s cannot canonicalise CHKs."
7012
7078
7013
7079
#: bzrlib/reconcile.py:119
7014
7080
msgid "Reconcile aborted: revision index has inconsistent parents."
7084
7150
msgid "bzr: ERROR (ignored): %s"
7085
7151
msgstr ""
7086
7152
7087
#: bzrlib/remote.py:2541
7153
#: bzrlib/remote.py:2534
7088
7154
msgid "Copying repository content as tarball..."
7089
7155
msgstr ""
7090
7156
7100
7166
msgid "{0} => {1}"
7101
7167
msgstr ""
7102
7168
7103
#: bzrlib/repository.py:1787
7169
#: bzrlib/repository.py:1738
7104
7170
msgid "Moving repository to repository.backup"
7105
7171
msgstr ""
7106
7172
7107
#: bzrlib/repository.py:1794
7173
#: bzrlib/repository.py:1745
7108
7174
msgid "Creating new repository"
7109
7175
msgstr ""
7110
7176
7111
#: bzrlib/repository.py:1799
7177
#: bzrlib/repository.py:1750
7112
7178
msgid "Copying content"
7113
7179
msgstr ""
7114
7180
7115
#: bzrlib/repository.py:1803
7181
#: bzrlib/repository.py:1754
7116
7182
msgid "Deleting old repository content"
7117
7183
msgstr ""
7118
7184
7119
#: bzrlib/repository.py:1805
7185
#: bzrlib/repository.py:1756
7120
7186
msgid "repository converted"
7121
7187
msgstr ""
7122
7188
7124
7190
msgid "Using {0} {1}"
7125
7191
msgstr ""
7126
7192
7127
#: bzrlib/send.py:58
7193
#: bzrlib/send.py:59
7128
7194
#, python-format
7129
7195
msgid "Mail client \"%s\" does not support specifying body"
7130
7196
msgstr ""
7131
7197
7132
#: bzrlib/send.py:62
7198
#: bzrlib/send.py:63
7133
7199
msgid "--remember requires a branch to be specified."
7134
7200
msgstr ""
7135
7201
7136
#: bzrlib/send.py:77
7202
#: bzrlib/send.py:78
7137
7203
msgid "No submit branch known or specified"
7138
7204
msgstr ""
7139
7205
7140
#: bzrlib/send.py:80
7206
#: bzrlib/send.py:81
7141
7207
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7142
7208
msgstr ""
7143
7209
7144
#: bzrlib/send.py:98
7210
#: bzrlib/send.py:99
7145
7211
#, python-format
7146
7212
msgid "No such send format '%s'."
7147
7213
msgstr ""
7148
7214
7149
#: bzrlib/send.py:114
7215
#: bzrlib/send.py:115
7150
7216
msgid "bzr send takes at most two one revision identifiers"
7151
7217
msgstr ""
7152
7218
7153
#: bzrlib/send.py:127
7219
#: bzrlib/send.py:128
7154
7220
msgid "No revisions to submit."
7155
7221
msgstr ""
7156
7222
7157
#: bzrlib/send.py:139
7223
#: bzrlib/send.py:140
7158
7224
msgid ""
7159
7225
"- not supported for merge directives that use more than one output file."
7160
7226
msgstr ""
7161
7227
7162
#: bzrlib/send.py:185
7228
#: bzrlib/send.py:186
7163
7229
msgid "Format 0.9 does not permit bundle with no patch"
7164
7230
msgstr ""
7165
7231
7316
7382
"anyway, use --force."
7317
7383
msgstr ""
7318
7384
7319
#: bzrlib/switch.py:125
7385
#: bzrlib/switch.py:129
7320
7386
msgid "Cannot switch a branch, only a checkout."
7321
7387
msgstr ""
7322
7388
7323
#: bzrlib/switch.py:163
7389
#: bzrlib/switch.py:167
7324
7390
#, python-format
7325
7391
msgid "Tree is up to date at revision %d."
7326
7392
msgstr ""
7327
7393
7328
#: bzrlib/switch.py:169
7394
#: bzrlib/switch.py:173
7329
7395
#, python-format
7330
7396
msgid "Updated to revision %d."
7331
7397
msgstr ""
7332
7398
7333
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7399
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7334
7400
msgid "Apply phase"
7335
7401
msgstr ""
7336
7402
7337
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7403
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7338
7404
msgid "removing file"
7339
7405
msgstr ""
7340
7406
7341
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7407
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7342
7408
msgid "adding file"
7343
7409
msgstr ""
7344
7410
7345
#: bzrlib/transform.py:2591
7411
#: bzrlib/transform.py:2598
7346
7412
msgid "Building tree"
7347
7413
msgstr ""
7348
7414
7349
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7415
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7350
7416
msgid "Adding file contents"
7351
7417
msgstr ""
7352
7418
7353
#: bzrlib/transform.py:3028
7419
#: bzrlib/transform.py:3017
7354
7420
msgid "Resolution pass"
7355
7421
msgstr ""
7356
7422
7359
7425
msgid "Authenticated as %s"
7360
7426
msgstr ""
7361
7427
7362
#: bzrlib/tree.py:634
7428
#: bzrlib/tree.py:647
7363
7429
msgid "*** {0} content-filter: {1} => {2!r}"
7364
7430
msgstr ""
7365
7431
7418
7484
msgid "failed to clean-up {0}: {1}"
7419
7485
msgstr ""
7420
7486
7421
#: bzrlib/vf_repository.py:1090
7487
#: bzrlib/vf_repository.py:1091
7422
7488
msgid "inventories"
7423
7489
msgstr ""
7424
7490
7425
#: bzrlib/vf_repository.py:1116
7491
#: bzrlib/vf_repository.py:1117
7426
7492
msgid "texts"
7427
7493
msgstr ""
7428
7494
7429
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7495
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7430
7496
msgid "Calculating text parents"
7431
7497
msgstr ""
7432
7498
7433
#: bzrlib/vf_repository.py:1706
7499
#: bzrlib/vf_repository.py:1707
7434
7500
msgid "Fetch texts"
7435
7501
msgstr ""
7436
7502
7437
#: bzrlib/vf_repository.py:2535
7503
#: bzrlib/vf_repository.py:2536
7438
7504
msgid "loading text store"
7439
7505
msgstr ""
7440
7506
7441
#: bzrlib/vf_repository.py:2541
7507
#: bzrlib/vf_repository.py:2542
7442
7508
msgid "checking text graph"
7443
7509
msgstr ""
7444
7510
7445
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7446
#: bzrlib/vf_repository.py:3124
7511
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7512
#: bzrlib/vf_repository.py:3127
7447
7513
msgid "Transferring revisions"
7448
7514
msgstr ""
7449
7515
7457
7523
7458
7524
#: bzrlib/win32utils.py:172
7459
7525
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7460
msgstr ""
7526
msgstr "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7461
7527
7462
7528
#: bzrlib/win32utils.py:180
7463
7529
#, python-format
7464
7530
msgid "WorkingSize %8d KiB"
7465
msgstr ""
7531
msgstr "WorkingSize %8d KiB"
7466
7532
7467
7533
#: bzrlib/win32utils.py:181
7468
7534
#, python-format
7489
7555
msgid "PageFaultCount %8d"
7490
7556
msgstr ""
7491
7557
7492
#: bzrlib/workingtree.py:1478
7558
#: bzrlib/workingtree.py:1482
7493
7559
msgid "Rerun update after fixing the conflicts."
7494
7560
msgstr ""
7495
7561
7499
7565
7500
7566
#: dummy/help_topics/basic/detail.txt:1
7501
7567
msgid ""
7502
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7568
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7503
7569
"http://bazaar.canonical.com/"
7504
7570
msgstr ""
7505
7571
7522
7588
" bzr status summarize changes in working copy\n"
7523
7589
" bzr diff show detailed diffs"
7524
7590
msgstr ""
7591
" bzr status summarise changes in working copy\n"
7592
" bzr diff show detailed diffs"
7525
7593
7526
7594
#: dummy/help_topics/basic/detail.txt:15
7527
7595
msgid ""
7605
7673
"doesn't have the same restrictions. And using checkouts still allows\n"
7606
7674
"others working on the project to use whatever workflow they like."
7607
7675
msgstr ""
7676
"Checkouts are source trees that are connected to a branch, so that when\n"
7677
"you commit in the source tree, the commit goes into that branch. They\n"
7678
"allow you to use a simpler, more centralised workflow, ignoring some of\n"
7679
"Bazaar's decentralised features until you want them.\n"
7680
"Using checkouts with shared repositories is very similar to working with \n"
7681
"SVN or CVS, but doesn't have the same restrictions. \n"
7682
"And using checkouts still allows others working on the project to use \n"
7683
"whatever workflow they like."
7608
7684
7609
7685
#: dummy/help_topics/checkouts/detail.txt:11
7610
7686
msgid ""
7817
7893
msgid "How to fix diverged branches"
7818
7894
msgstr ""
7819
7895
7820
#: dummy/help_topics/env-variables/detail.txt:1
7821
msgid "Environment Variables"
7822
msgstr ""
7823
7824
#: dummy/help_topics/env-variables/detail.txt:3
7825
msgid ""
7826
"=================== "
7827
"===========================================================\n"
7828
"BZRPATH Path where bzr is to look for shell plugin external\n"
7829
" commands.\n"
7830
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7831
"EMAIL E-Mail address of the user.\n"
7832
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7833
"EDITOR Editor for editing commit messages.\n"
7834
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7835
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7836
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7837
"BZR_PLUGIN_PATH.\n"
7838
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7839
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7840
"and\n"
7841
" HOME.\n"
7842
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7843
"URLs).\n"
7844
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7845
"sshcorp,\n"
7846
" plink or lsh.\n"
7847
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7848
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7849
"BZR_COLUMNS Override implicit terminal width.\n"
7850
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7851
"(selftest)\n"
7852
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7853
"'text'.\n"
7854
"BZR_PDB Control whether to launch a debugger on error.\n"
7855
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7856
" breakin debugger.\n"
7857
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7858
"(instead\n"
7859
" of char-based).\n"
7860
"=================== "
7861
"===========================================================\n"
7862
msgstr ""
7863
7864
7896
#: dummy/help_topics/env-variables/summary.txt:1
7865
7897
msgid "Environment variable names and values"
7866
7898
msgstr ""
8461
8493
msgid ""
8462
8494
"The intent is to make this file as small as possible to minimize maintenance."
8463
8495
msgstr ""
8496
"The intent is to make this file as small as possible to minimise maintenance."
8464
8497
8465
8498
#: en/help_topics/authentication.txt:21
8466
8499
msgid ""
8844
8877
"but\n"
8845
8878
"ignored in the actual implementation.\n"
8846
8879
msgstr ""
8880
"The ``password_encoding`` and ``verify_certificates`` fields are recognised "
8881
"but\n"
8882
"ignored in the actual implementation.\n"
8847
8883
8848
8884
#: en/help_topics/bugs.txt:1
8849
8885
msgid "Bug Tracker Settings"
8868
8904
msgid " bzr commit --fixes <tracker>:<id>"
8869
8905
msgstr ""
8870
8906
8871
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8907
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8872
8908
msgid "or::"
8873
8909
msgstr ""
8874
8910
9103
9139
"remove-tree Remove the working tree from a given branch/checkout.\n"
9104
9140
"renames Show list of renamed files.\n"
9105
9141
"resolve Mark a conflict as resolved.\n"
9106
"revert Revert files to a previous revision.\n"
9142
"revert Set files in the working tree back to the contents of a\n"
9143
" previous revision.\n"
9107
9144
"revno Show current revision number.\n"
9108
9145
"root Show the tree root directory.\n"
9109
9146
"send Mail or create a merge-directive for submitting changes.\n"
9761
9798
9762
9799
#: en/help_topics/configuration.txt:336
9763
9800
msgid ""
9801
"Another such option is ``branchname``, which refers to the name of a "
9802
"colocated\n"
9803
"branch. For non-colocated branches, it behaves like basename. It can be "
9804
"used\n"
9805
"like this::"
9806
msgstr ""
9807
9808
#: en/help_topics/configuration.txt:340
9809
msgid ""
9810
" [/home/vila/src/bzr/bugs]\n"
9811
" mypush = lp:~vila/bzr/{branchname}"
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:343
9815
msgid ""
9816
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9817
"get::"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:345
9821
msgid ""
9822
" bzr config mypush\n"
9823
" lp:~vila/bzr/832013-expand-in-stack"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:348
9827
msgid ""
9764
9828
"When an option is local to a Section, it cannot be referred to from option\n"
9765
9829
"values in any other section from the same ``Store`` nor from any other\n"
9766
9830
"``Store``."
9767
9831
msgstr ""
9768
9832
9769
#: en/help_topics/configuration.txt:340
9833
#: en/help_topics/configuration.txt:352
9770
9834
msgid ""
9771
9835
"\n"
9772
9836
"The main configuration file, bazaar.conf\n"
9773
9837
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9774
9838
msgstr ""
9775
9839
9776
#: en/help_topics/configuration.txt:344
9840
#: en/help_topics/configuration.txt:356
9777
9841
msgid ""
9778
9842
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9779
9843
"The default section contains the default\n"
9781
9845
"overriden by providing a branch-specific section in ``locations.conf``."
9782
9846
msgstr ""
9783
9847
9784
#: en/help_topics/configuration.txt:349
9848
#: en/help_topics/configuration.txt:361
9785
9849
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9786
9850
msgstr ""
9787
9851
9788
#: en/help_topics/configuration.txt:351
9852
#: en/help_topics/configuration.txt:363
9789
9853
msgid ""
9790
9854
" [DEFAULT]\n"
9791
9855
" email = John Doe <jdoe@isp.com>\n"
9793
9857
" create_signatures = when-required"
9794
9858
msgstr ""
9795
9859
9796
#: en/help_topics/configuration.txt:356
9860
#: en/help_topics/configuration.txt:368
9797
9861
msgid ""
9798
9862
"\n"
9799
9863
"The branch location configuration file, locations.conf\n"
9800
9864
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9801
9865
msgstr ""
9802
9866
9803
#: en/help_topics/configuration.txt:360
9867
#: en/help_topics/configuration.txt:372
9804
9868
msgid ""
9805
9869
"``locations.conf`` allows one to specify overriding settings for\n"
9806
9870
"a specific branch. The format is almost identical to the default section in\n"
9810
9874
"for. The '?' and '*' wildcards are supported::"
9811
9875
msgstr ""
9812
9876
9813
#: en/help_topics/configuration.txt:366
9877
#: en/help_topics/configuration.txt:378
9814
9878
msgid ""
9815
9879
" [/home/jdoe/branches/nethack]\n"
9816
9880
" email = Nethack Admin <nethack@nethack.com>"
9817
9881
msgstr ""
9818
9882
9819
#: en/help_topics/configuration.txt:369
9883
#: en/help_topics/configuration.txt:381
9820
9884
msgid ""
9821
9885
" [http://hypothetical.site.com/branches/devel-branch]\n"
9822
9886
" create_signatures = always"
9823
9887
msgstr ""
9824
9888
9825
#: en/help_topics/configuration.txt:372
9889
#: en/help_topics/configuration.txt:384
9826
9890
msgid ""
9827
9891
"The authentication configuration file, authentication.conf\n"
9828
9892
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9829
9893
msgstr ""
9830
9894
9831
#: en/help_topics/configuration.txt:375
9895
#: en/help_topics/configuration.txt:387
9832
9896
msgid ""
9833
9897
"``authentication.conf`` allows one to specify credentials for\n"
9834
9898
"remote servers. This can be used for all the supported transports and any "
9836
9900
"of bzr that requires authentication (smtp for example)."
9837
9901
msgstr ""
9838
9902
9839
#: en/help_topics/configuration.txt:379
9903
#: en/help_topics/configuration.txt:391
9840
9904
msgid ""
9841
9905
"The syntax of the file obeys the same rules as the others except for the\n"
9842
9906
"option policies which don't apply."
9843
9907
msgstr ""
9844
9908
9845
#: en/help_topics/configuration.txt:382
9909
#: en/help_topics/configuration.txt:394
9846
9910
msgid ""
9847
9911
"For more information on the possible uses of the authentication "
9848
9912
"configuration\n"
9849
9913
"file see :doc:`authentication-help`."
9850
9914
msgstr ""
9851
9915
9852
#: en/help_topics/configuration.txt:385
9916
#: en/help_topics/configuration.txt:397
9853
9917
msgid ""
9854
9918
"\n"
9855
9919
"Common options\n"
9856
9920
"--------------"
9857
9921
msgstr ""
9858
9922
9859
#: en/help_topics/configuration.txt:389
9923
#: en/help_topics/configuration.txt:401
9860
9924
msgid ""
9861
9925
"debug_flags\n"
9862
9926
"~~~~~~~~~~~"
9863
9927
msgstr ""
9864
9928
9865
#: en/help_topics/configuration.txt:392
9929
#: en/help_topics/configuration.txt:404
9866
9930
msgid ""
9867
9931
"A comma-separated list of debugging options to turn on. The same values\n"
9868
9932
"can be used as with the -D command-line option (see `help global-options`).\n"
9869
9933
"For example::"
9870
9934
msgstr ""
9871
9935
9872
#: en/help_topics/configuration.txt:396
9936
#: en/help_topics/configuration.txt:408
9873
9937
msgid " debug_flags = hpss"
9874
9938
msgstr ""
9875
9939
9876
#: en/help_topics/configuration.txt:400
9940
#: en/help_topics/configuration.txt:412
9877
9941
msgid " debug_flags = hpss,evil"
9878
9942
msgstr ""
9879
9943
9880
#: en/help_topics/configuration.txt:402
9944
#: en/help_topics/configuration.txt:414
9881
9945
msgid ""
9882
9946
"email\n"
9883
9947
"~~~~~"
9884
9948
msgstr ""
9885
9949
9886
#: en/help_topics/configuration.txt:405
9950
#: en/help_topics/configuration.txt:417
9887
9951
msgid ""
9888
9952
"The email address to use when committing a branch. Typically takes the form\n"
9889
9953
"of::"
9890
9954
msgstr ""
9891
9955
9892
#: en/help_topics/configuration.txt:408
9956
#: en/help_topics/configuration.txt:420
9893
9957
msgid " email = Full Name <account@hostname.tld>"
9894
9958
msgstr ""
9895
9959
9896
#: en/help_topics/configuration.txt:410
9960
#: en/help_topics/configuration.txt:422
9897
9961
msgid ""
9898
9962
"editor\n"
9899
9963
"~~~~~~"
9900
9964
msgstr ""
9901
9965
9902
#: en/help_topics/configuration.txt:413
9966
#: en/help_topics/configuration.txt:425
9903
9967
msgid ""
9904
9968
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9905
9969
"a commit message. This setting is trumped by the environment variable\n"
9907
9971
"variables."
9908
9972
msgstr ""
9909
9973
9910
#: en/help_topics/configuration.txt:418
9974
#: en/help_topics/configuration.txt:430
9911
9975
msgid ""
9912
9976
"log_format\n"
9913
9977
"~~~~~~~~~~"
9914
9978
msgstr ""
9915
9979
9916
#: en/help_topics/configuration.txt:421
9980
#: en/help_topics/configuration.txt:433
9917
9981
msgid ""
9918
9982
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9919
9983
"and ``line``. Additional formats may be provided by plugins. The default\n"
9920
9984
"value is ``long``."
9921
9985
msgstr ""
9922
9986
9923
#: en/help_topics/configuration.txt:425
9987
#: en/help_topics/configuration.txt:437
9924
9988
msgid ""
9925
9989
"check_signatures\n"
9926
9990
"~~~~~~~~~~~~~~~~"
9927
9991
msgstr ""
9928
9992
9929
#: en/help_topics/configuration.txt:428
9993
#: en/help_topics/configuration.txt:440
9930
9994
msgid ""
9931
9995
"Reserved for future use. These options will allow a policy for branches to\n"
9932
9996
"require signatures."
9933
9997
msgstr ""
9934
9998
9935
#: en/help_topics/configuration.txt:431
9999
#: en/help_topics/configuration.txt:443
9936
10000
msgid ""
9937
10001
"require\n"
9938
10002
" The gnupg signature for revisions must be present and must be valid."
9939
10003
msgstr ""
9940
10004
9941
#: en/help_topics/configuration.txt:434
10005
#: en/help_topics/configuration.txt:446
9942
10006
msgid ""
9943
10007
"ignore\n"
9944
10008
" Do not check gnupg signatures of revisions."
9945
10009
msgstr ""
9946
10010
9947
#: en/help_topics/configuration.txt:437
10011
#: en/help_topics/configuration.txt:449
9948
10012
msgid ""
9949
10013
"check-available\n"
9950
10014
" (default) If gnupg signatures for revisions are present, check them.\n"
9952
10016
" no signature is present."
9953
10017
msgstr ""
9954
10018
9955
#: en/help_topics/configuration.txt:442
10019
#: en/help_topics/configuration.txt:454
9956
10020
msgid ""
9957
10021
"create_signatures\n"
9958
10022
"~~~~~~~~~~~~~~~~~"
9959
10023
msgstr ""
9960
10024
9961
#: en/help_topics/configuration.txt:445
10025
#: en/help_topics/configuration.txt:457
9962
10026
msgid ""
9963
10027
"Defines the behaviour of signing revisions on commits. By default bzr will "
9964
10028
"not\n"
9965
10029
"sign new commits."
9966
10030
msgstr ""
9967
10031
9968
#: en/help_topics/configuration.txt:448
10032
#: en/help_topics/configuration.txt:460
9969
10033
msgid ""
9970
10034
"always\n"
9971
10035
" Sign every new revision that is committed. If the signing fails then "
9973
10037
" commit will not be made."
9974
10038
msgstr ""
9975
10039
9976
#: en/help_topics/configuration.txt:452
10040
#: en/help_topics/configuration.txt:464
9977
10041
msgid ""
9978
10042
"when-required\n"
9979
10043
" Reserved for future use."
9980
10044
msgstr ""
9981
10045
9982
#: en/help_topics/configuration.txt:455
10046
#: en/help_topics/configuration.txt:467
9983
10047
msgid ""
9984
10048
"never\n"
9985
10049
" Reserved for future use."
9986
10050
msgstr ""
9987
10051
9988
#: en/help_topics/configuration.txt:458
10052
#: en/help_topics/configuration.txt:470
9989
10053
msgid ""
9990
10054
"In future it is planned that ``when-required`` will sign newly\n"
9991
10055
"committed revisions only when the branch requires them. ``never`` will "
9993
10057
"to sign newly committed revisions, even if the branch requires signatures."
9994
10058
msgstr ""
9995
10059
9996
#: en/help_topics/configuration.txt:462
10060
#: en/help_topics/configuration.txt:474
9997
10061
msgid ""
9998
10062
"dirstate.fdatasync\n"
9999
10063
"~~~~~~~~~~~~~~~~~~"
10000
10064
msgstr ""
10001
10065
10002
#: en/help_topics/configuration.txt:465
10066
#: en/help_topics/configuration.txt:477
10003
10067
msgid ""
10004
10068
"If true (default), working tree metadata changes are flushed through the\n"
10005
10069
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10006
10070
"should not be lost if the machine crashes. See also repository.fdatasync."
10007
10071
msgstr ""
10008
10072
10009
#: en/help_topics/configuration.txt:469
10073
#: en/help_topics/configuration.txt:481
10010
10074
msgid ""
10011
10075
"gpg_signing_key\n"
10012
10076
"~~~~~~~~~~~~~~~"
10013
10077
msgstr ""
10014
10078
10015
#: en/help_topics/configuration.txt:472
10079
#: en/help_topics/configuration.txt:484
10016
10080
msgid ""
10017
10081
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10018
10082
"address, key fingerprint or full key ID. When unset or when set to\n"
10019
10083
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10020
10084
msgstr ""
10021
10085
10022
#: en/help_topics/configuration.txt:476
10086
#: en/help_topics/configuration.txt:488
10023
10087
msgid ""
10024
10088
"recurse\n"
10025
10089
"~~~~~~~"
10026
10090
msgstr ""
10027
10091
10028
#: en/help_topics/configuration.txt:479
10092
#: en/help_topics/configuration.txt:491
10029
10093
msgid ""
10030
10094
"Only useful in ``locations.conf``. Defines whether or not the\n"
10031
10095
"configuration for this section applies to subdirectories:"
10032
10096
msgstr ""
10033
10097
10034
#: en/help_topics/configuration.txt:482
10098
#: en/help_topics/configuration.txt:494
10035
10099
msgid ""
10036
10100
"true\n"
10037
10101
" (default) This section applies to subdirectories as well."
10038
10102
msgstr ""
10039
10103
10040
#: en/help_topics/configuration.txt:485
10104
#: en/help_topics/configuration.txt:497
10041
10105
msgid ""
10042
10106
"false\n"
10043
10107
" This section only applies to the branch at this directory and not\n"
10044
10108
" branches below it."
10045
10109
msgstr ""
10046
10110
10047
#: en/help_topics/configuration.txt:489
10111
#: en/help_topics/configuration.txt:501
10048
10112
msgid ""
10049
10113
"gpg_signing_command\n"
10050
10114
"~~~~~~~~~~~~~~~~~~~"
10051
10115
msgstr ""
10052
10116
10053
#: en/help_topics/configuration.txt:492
10117
#: en/help_topics/configuration.txt:504
10054
10118
msgid ""
10055
10119
"(Default: \"gpg\"). Which program should be used to sign and check "
10056
10120
"revisions.\n"
10057
10121
"For example::"
10058
10122
msgstr ""
10059
10123
10060
#: en/help_topics/configuration.txt:495
10124
#: en/help_topics/configuration.txt:507
10061
10125
msgid " gpg_signing_command = /usr/bin/gnpg"
10062
10126
msgstr ""
10063
10127
10064
#: en/help_topics/configuration.txt:497
10128
#: en/help_topics/configuration.txt:509
10065
10129
msgid ""
10066
10130
"The specified command must accept the options \"--clearsign\" and \"-u "
10067
10131
"<email>\"."
10068
10132
msgstr ""
10069
10133
10070
#: en/help_topics/configuration.txt:499
10134
#: en/help_topics/configuration.txt:511
10071
10135
msgid ""
10072
10136
"bzr_remote_path\n"
10073
10137
"~~~~~~~~~~~~~~~"
10074
10138
msgstr ""
10075
10139
10076
#: en/help_topics/configuration.txt:502
10140
#: en/help_topics/configuration.txt:514
10077
10141
msgid ""
10078
10142
"(Default: \"bzr\"). The path to the command that should be used to run the "
10079
10143
"smart\n"
10080
10144
"server for bzr. This value may only be specified in locations.conf, because:"
10081
10145
msgstr ""
10082
10146
10083
#: en/help_topics/configuration.txt:505
10147
#: en/help_topics/configuration.txt:517
10084
10148
msgid ""
10085
10149
"- it's needed before branch.conf is accessible\n"
10086
10150
"- allowing remote branch.conf files to specify commands would be a security\n"
10087
10151
" risk"
10088
10152
msgstr ""
10089
10153
10090
#: en/help_topics/configuration.txt:509
10154
#: en/help_topics/configuration.txt:521
10091
10155
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10092
10156
msgstr ""
10093
10157
10094
#: en/help_topics/configuration.txt:511
10158
#: en/help_topics/configuration.txt:523
10095
10159
msgid ""
10096
10160
"smtp_server\n"
10097
10161
"~~~~~~~~~~~"
10098
10162
msgstr ""
10099
10163
10100
#: en/help_topics/configuration.txt:514
10164
#: en/help_topics/configuration.txt:526
10101
10165
msgid ""
10102
10166
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10103
10167
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10104
10168
msgstr ""
10105
10169
10106
#: en/help_topics/configuration.txt:517
10170
#: en/help_topics/configuration.txt:529
10107
10171
msgid ""
10108
10172
"smtp_username, smtp_password\n"
10109
10173
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10110
10174
msgstr ""
10111
10175
10112
#: en/help_topics/configuration.txt:520
10176
#: en/help_topics/configuration.txt:532
10113
10177
msgid ""
10114
10178
"User and password to authenticate to the SMTP server. If smtp_username\n"
10115
10179
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10117
10181
"to send mail."
10118
10182
msgstr ""
10119
10183
10120
#: en/help_topics/configuration.txt:525
10184
#: en/help_topics/configuration.txt:537
10121
10185
msgid ""
10122
10186
"locks.steal_dead\n"
10123
10187
"~~~~~~~~~~~~~~~~"
10124
10188
msgstr ""
10125
10189
10126
#: en/help_topics/configuration.txt:528
10190
#: en/help_topics/configuration.txt:540
10127
10191
msgid ""
10128
10192
"If set to true, bzr will automatically break locks held by processes from\n"
10129
10193
"the same machine and user that are no longer alive. Otherwise, it will\n"
10131
10195
"the object is no longer in use."
10132
10196
msgstr ""
10133
10197
10134
#: en/help_topics/configuration.txt:533
10198
#: en/help_topics/configuration.txt:545
10135
10199
msgid ""
10136
10200
"mail_client\n"
10137
10201
"~~~~~~~~~~~"
10138
10202
msgstr ""
10139
10203
10140
#: en/help_topics/configuration.txt:536
10204
#: en/help_topics/configuration.txt:548
10141
10205
msgid ""
10142
10206
"A mail client to use for sending merge requests.\n"
10143
10207
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10146
10210
"``editor``."
10147
10211
msgstr ""
10148
10212
10149
#: en/help_topics/configuration.txt:541
10213
#: en/help_topics/configuration.txt:553
10150
10214
msgid "Supported values for specific clients:"
10151
10215
msgstr ""
10152
10216
10153
#: en/help_topics/configuration.txt:543
10217
#: en/help_topics/configuration.txt:555
10154
10218
msgid ""
10155
10219
":claws: Use Claws. This skips a dialog for attaching files.\n"
10156
10220
":evolution: Use Evolution.\n"
10161
10225
" this works around some bugs that xdg-email doesn't handle."
10162
10226
msgstr ""
10163
10227
10164
#: en/help_topics/configuration.txt:550
10228
#: en/help_topics/configuration.txt:562
10165
10229
msgid "Supported generic values are:"
10166
10230
msgstr ""
10167
10231
10168
#: en/help_topics/configuration.txt:552
10232
#: en/help_topics/configuration.txt:564
10169
10233
msgid ""
10170
10234
":default: See above.\n"
10171
10235
":editor: Use your editor to compose the merge request. This also uses\n"
10175
10239
":xdg-email: Use xdg-email to run your preferred mail program"
10176
10240
msgstr ""
10177
10241
10178
#: en/help_topics/configuration.txt:559
10242
#: en/help_topics/configuration.txt:571
10179
10243
msgid ""
10180
10244
"repository.fdatasync\n"
10181
10245
"~~~~~~~~~~~~~~~~~~~~"
10182
10246
msgstr ""
10183
10247
10184
#: en/help_topics/configuration.txt:562
10248
#: en/help_topics/configuration.txt:574
10185
10249
msgid ""
10186
10250
"If true (default), repository changes are flushed through the OS buffers\n"
10187
10251
"to physical disk. This is somewhat slower, but means data should not be\n"
10188
10252
"lost if the machine crashes. See also dirstate.fdatasync."
10189
10253
msgstr ""
10190
10254
10191
#: en/help_topics/configuration.txt:566
10255
#: en/help_topics/configuration.txt:578
10192
10256
msgid ""
10193
10257
"submit_branch\n"
10194
10258
"~~~~~~~~~~~~~"
10195
10259
msgstr ""
10196
10260
10197
#: en/help_topics/configuration.txt:569
10261
#: en/help_topics/configuration.txt:581
10198
10262
msgid ""
10199
10263
"The branch you intend to submit your current work to. This is "
10200
10264
"automatically\n"
10203
10267
"should usually be set on a per-branch or per-location basis."
10204
10268
msgstr ""
10205
10269
10206
#: en/help_topics/configuration.txt:573
10270
#: en/help_topics/configuration.txt:585
10207
10271
msgid ""
10208
10272
"public_branch\n"
10209
10273
"~~~~~~~~~~~~~"
10210
10274
msgstr ""
10211
10275
10212
#: en/help_topics/configuration.txt:576
10276
#: en/help_topics/configuration.txt:588
10213
10277
msgid ""
10214
10278
"A publically-accessible version of this branch (implying that this version "
10215
10279
"is\n"
10216
10280
"not publically-accessible). Used (and set) by ``bzr send``."
10217
10281
msgstr ""
10218
10282
10219
#: en/help_topics/configuration.txt:579
10283
#: en/help_topics/configuration.txt:591
10220
10284
msgid ""
10221
10285
"suppress_warnings\n"
10222
10286
"~~~~~~~~~~~~~~~~~"
10223
10287
msgstr ""
10224
10288
10225
#: en/help_topics/configuration.txt:582
10289
#: en/help_topics/configuration.txt:594
10226
10290
msgid ""
10227
10291
"A list of strings, each string represent a warning that can be emitted by\n"
10228
10292
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10229
10293
msgstr ""
10230
10294
10231
#: en/help_topics/configuration.txt:585
10295
#: en/help_topics/configuration.txt:597
10232
10296
msgid "Valid values:"
10233
10297
msgstr ""
10234
10298
10235
#: en/help_topics/configuration.txt:587
10299
#: en/help_topics/configuration.txt:599
10236
10300
msgid ""
10237
10301
"* ``format_deprecation``:\n"
10238
10302
" whether the format deprecation warning is shown on repositories that "
10240
10304
" using deprecated formats."
10241
10305
msgstr ""
10242
10306
10243
#: en/help_topics/configuration.txt:591
10307
#: en/help_topics/configuration.txt:603
10244
10308
msgid ""
10245
10309
"default_format\n"
10246
10310
"~~~~~~~~~~~~~~"
10247
10311
msgstr ""
10248
10312
10249
#: en/help_topics/configuration.txt:594
10313
#: en/help_topics/configuration.txt:606
10250
10314
msgid ""
10251
10315
"A format name for the default format used when creating branches. See "
10252
10316
"``bzr\n"
10253
10317
"help formats`` for possible values."
10254
10318
msgstr ""
10255
10319
10256
#: en/help_topics/configuration.txt:597
10320
#: en/help_topics/configuration.txt:609
10257
10321
msgid ""
10258
10322
"\n"
10259
10323
"Unicode options\n"
10260
10324
"---------------"
10261
10325
msgstr ""
10262
10326
10263
#: en/help_topics/configuration.txt:601
10327
#: en/help_topics/configuration.txt:613
10264
10328
msgid ""
10265
10329
"output_encoding\n"
10266
10330
"~~~~~~~~~~~~~~~"
10267
10331
msgstr ""
10268
10332
10269
#: en/help_topics/configuration.txt:604
10333
#: en/help_topics/configuration.txt:616
10270
10334
msgid ""
10271
10335
"A Python unicode encoding name for text output from bzr, such as log\n"
10272
10336
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10273
10337
"is the terminal encoding prefered by the operating system."
10274
10338
msgstr ""
10275
10339
10276
#: en/help_topics/configuration.txt:608
10340
#: en/help_topics/configuration.txt:620
10277
10341
msgid ""
10278
10342
"\n"
10279
10343
"Branch type specific options\n"
10280
10344
"----------------------------"
10281
10345
msgstr ""
10282
10346
10283
#: en/help_topics/configuration.txt:612
10347
#: en/help_topics/configuration.txt:624
10284
10348
msgid ""
10285
10349
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10286
10350
"later format. They\n"
10288
10352
"manually set in ``locations.conf`` or ``bazaar.conf``."
10289
10353
msgstr ""
10290
10354
10291
#: en/help_topics/configuration.txt:617
10355
#: en/help_topics/configuration.txt:629
10292
10356
msgid ""
10293
10357
"append_revisions_only\n"
10294
10358
"~~~~~~~~~~~~~~~~~~~~~"
10295
10359
msgstr ""
10296
10360
10297
#: en/help_topics/configuration.txt:620
10361
#: en/help_topics/configuration.txt:632
10298
10362
msgid ""
10299
10363
"If set to \"True\" then revisions can only be appended to the log, not\n"
10300
10364
"removed. A branch with this setting enabled can only pull from another\n"
10304
10368
"compatibility with previous bzr versions (older than 2.2)."
10305
10369
msgstr ""
10306
10370
10307
#: en/help_topics/configuration.txt:627
10371
#: en/help_topics/configuration.txt:639
10308
10372
msgid ""
10309
10373
"parent_location\n"
10310
10374
"~~~~~~~~~~~~~~~"
10311
10375
msgstr ""
10312
10376
10313
#: en/help_topics/configuration.txt:630
10377
#: en/help_topics/configuration.txt:642
10314
10378
msgid ""
10315
10379
"If present, the location of the default branch for pull or merge. This "
10316
10380
"option\n"
10318
10382
"--remember``."
10319
10383
msgstr ""
10320
10384
10321
#: en/help_topics/configuration.txt:634
10385
#: en/help_topics/configuration.txt:646
10322
10386
msgid ""
10323
10387
"push_location\n"
10324
10388
"~~~~~~~~~~~~~"
10325
10389
msgstr ""
10326
10390
10327
#: en/help_topics/configuration.txt:637
10391
#: en/help_topics/configuration.txt:649
10328
10392
msgid ""
10329
10393
"If present, the location of the default branch for push. This option\n"
10330
10394
"is normally set by the first ``push`` or ``push --remember``."
10331
10395
msgstr ""
10332
10396
10333
#: en/help_topics/configuration.txt:640
10397
#: en/help_topics/configuration.txt:652
10334
10398
msgid ""
10335
10399
"push_strict\n"
10336
10400
"~~~~~~~~~~~"
10337
10401
msgstr ""
10338
10402
10339
#: en/help_topics/configuration.txt:643
10403
#: en/help_topics/configuration.txt:655
10340
10404
msgid ""
10341
10405
"If present, defines the ``--strict`` option default value for checking\n"
10342
10406
"uncommitted changes before pushing."
10343
10407
msgstr ""
10344
10408
10345
#: en/help_topics/configuration.txt:646
10409
#: en/help_topics/configuration.txt:658
10346
10410
msgid ""
10347
10411
"dpush_strict\n"
10348
10412
"~~~~~~~~~~~~"
10349
10413
msgstr ""
10350
10414
10351
#: en/help_topics/configuration.txt:649
10415
#: en/help_topics/configuration.txt:661
10352
10416
msgid ""
10353
10417
"If present, defines the ``--strict`` option default value for checking\n"
10354
10418
"uncommitted changes before pushing into a different VCS without any\n"
10355
10419
"custom bzr metadata."
10356
10420
msgstr ""
10357
10421
10358
#: en/help_topics/configuration.txt:653
10422
#: en/help_topics/configuration.txt:665
10359
10423
msgid ""
10360
10424
"bound_location\n"
10361
10425
"~~~~~~~~~~~~~~"
10362
10426
msgstr ""
10363
10427
10364
#: en/help_topics/configuration.txt:656
10428
#: en/help_topics/configuration.txt:668
10365
10429
msgid ""
10366
10430
"The location that commits should go to when acting as a checkout.\n"
10367
10431
"This option is normally set by ``bind``."
10368
10432
msgstr ""
10369
10433
10370
#: en/help_topics/configuration.txt:659
10434
#: en/help_topics/configuration.txt:671
10371
10435
msgid ""
10372
10436
"bound\n"
10373
10437
"~~~~~"
10374
10438
msgstr ""
10375
10439
10376
#: en/help_topics/configuration.txt:662
10440
#: en/help_topics/configuration.txt:674
10377
10441
msgid ""
10378
10442
"If set to \"True\", the branch should act as a checkout, and push each "
10379
10443
"commit to\n"
10380
10444
"the bound_location. This option is normally set by ``bind``/``unbind``."
10381
10445
msgstr ""
10382
10446
10383
#: en/help_topics/configuration.txt:665
10447
#: en/help_topics/configuration.txt:677
10384
10448
msgid ""
10385
10449
"send_strict\n"
10386
10450
"~~~~~~~~~~~"
10387
10451
msgstr ""
10388
10452
10389
#: en/help_topics/configuration.txt:668
10453
#: en/help_topics/configuration.txt:680
10390
10454
msgid ""
10391
10455
"If present, defines the ``--strict`` option default value for checking\n"
10392
10456
"uncommitted changes before sending a merge directive."
10393
10457
msgstr ""
10394
10458
10395
#: en/help_topics/configuration.txt:671
10396
msgid ""
10397
"add.maximum_file_size\n"
10398
"~~~~~~~~~~~~~~~~~~~~~"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:674
10402
msgid ""
10403
"Defines the maximum file size the command line \"add\" operation will allow\n"
10404
"in recursive mode, with files larger than this value being skipped. You may "
10405
"\n"
10406
"specify this value as an integer (in which case it is interpreted as bytes), "
10407
"\n"
10408
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10409
"0 \n"
10410
"will disable skipping."
10411
msgstr ""
10412
10413
#: en/help_topics/configuration.txt:680
10459
#: en/help_topics/configuration.txt:683
10460
msgid ""
10461
"add.maximum_file_size\n"
10462
"~~~~~~~~~~~~~~~~~~~~~"
10463
msgstr ""
10464
"add.maximum_file_size\n"
10465
"~~~~~~~~~~~~~~~~~~~~~"
10466
10467
#: en/help_topics/configuration.txt:686
10468
msgid ""
10469
"Defines the maximum file size the command line \"add\" operation will allow\n"
10470
"in recursive mode, with files larger than this value being skipped. You may "
10471
"\n"
10472
"specify this value as an integer (in which case it is interpreted as bytes), "
10473
"\n"
10474
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10475
"0 \n"
10476
"will disable skipping."
10477
msgstr ""
10478
"Defines the maximum file size the command line \"add\" operation will allow\n"
10479
"in recursive mode, with files larger than this value being skipped. You may "
10480
"\n"
10481
"specify this value as an integer (in which case it is interpreted as bytes), "
10482
"\n"
10483
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10484
"0 \n"
10485
"will disable skipping."
10486
10487
#: en/help_topics/configuration.txt:692
10414
10488
msgid ""
10415
10489
"External Merge Tools\n"
10416
10490
"--------------------"
10417
10491
msgstr ""
10418
10492
10419
#: en/help_topics/configuration.txt:683
10493
#: en/help_topics/configuration.txt:695
10420
10494
msgid ""
10421
10495
"bzr.mergetool.<name>\n"
10422
10496
"~~~~~~~~~~~~~~~~~~~~"
10423
10497
msgstr ""
10424
10498
10425
#: en/help_topics/configuration.txt:686
10499
#: en/help_topics/configuration.txt:698
10426
10500
msgid ""
10427
10501
"Defines an external merge tool called <name> with the given command-line.\n"
10428
10502
"Arguments containing spaces should be quoted using single or double quotes. "
10430
10504
"executable may omit its path if it can be found on the PATH."
10431
10505
msgstr ""
10432
10506
10433
#: en/help_topics/configuration.txt:690
10507
#: en/help_topics/configuration.txt:702
10434
10508
msgid ""
10435
10509
"The following markers can be used in the command-line to substitute "
10436
10510
"filenames\n"
10437
10511
"involved in the merge conflict::"
10438
10512
msgstr ""
10439
10513
10440
#: en/help_topics/configuration.txt:693
10514
#: en/help_topics/configuration.txt:705
10441
10515
msgid ""
10442
10516
" {base} file.BASE\n"
10443
10517
" {this} file.THIS\n"
10448
10522
" succeeds."
10449
10523
msgstr ""
10450
10524
10451
#: en/help_topics/configuration.txt:702
10525
#: en/help_topics/configuration.txt:714
10452
10526
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10453
10527
msgstr ""
10454
10528
10455
#: en/help_topics/configuration.txt:704
10529
#: en/help_topics/configuration.txt:716
10456
10530
msgid ""
10457
10531
"bzr.default_mergetool\n"
10458
10532
"~~~~~~~~~~~~~~~~~~~~~"
10459
10533
msgstr ""
10460
10534
10461
#: en/help_topics/configuration.txt:707
10535
#: en/help_topics/configuration.txt:719
10462
10536
msgid ""
10463
10537
"Specifies which external merge tool (as defined above) should be selected "
10464
10538
"by\n"
10465
10539
"default in tools such as ``bzr qconflicts``."
10466
10540
msgstr ""
10467
10541
10468
#: en/help_topics/configuration.txt:712
10542
#: en/help_topics/configuration.txt:724
10469
10543
msgid " bzr.default_mergetool = kdiff3\n"
10470
10544
msgstr ""
10471
10545
10760
10834
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10761
10835
#: en/help_topics/conflict-types.txt:361
10762
10836
msgid "``bzr resolve`` recognizes the following actions:"
10763
msgstr ""
10837
msgstr "``bzr resolve`` recognises the following actions:"
10764
10838
10765
10839
#: en/help_topics/conflict-types.txt:139
10766
10840
msgid ""
11162
11236
11163
11237
#: en/help_topics/content-filters.txt:16
11164
11238
msgid "To generalize, there are two content formats supported by Bazaar:"
11165
msgstr ""
11239
msgstr "To generalise, there are two content formats supported by Bazaar:"
11166
11240
11167
11241
#: en/help_topics/content-filters.txt:18
11168
11242
msgid ""
11370
11444
"appropriate\n"
11371
11445
" for the format, even for non-local fetches.\n"
11372
11446
msgstr ""
11447
"-Dauth Trace authentication sections used.\n"
11448
"-Dbytes Print out how many bytes were transferred\n"
11449
"-Ddirstate Trace dirstate activity (verbose!)\n"
11450
"-Derror Instead of normal error handling, always print a "
11451
"traceback\n"
11452
" on error.\n"
11453
"-Devil Capture call sites that do expensive or badly-scaling\n"
11454
" operations.\n"
11455
"-Dfetch Trace history copying between repositories.\n"
11456
"-Dfilters Emit information for debugging content filtering.\n"
11457
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11458
"fetch.\n"
11459
"-Dgraph Trace graph traversal.\n"
11460
"-Dhashcache Log every time a working file is read to determine its "
11461
"hash.\n"
11462
"-Dhooks Trace hook execution.\n"
11463
"-Dhpss Trace smart protocol requests and responses.\n"
11464
"-Dhpssdetail More hpss details.\n"
11465
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11466
"-Dhttp Trace http connections, requests and responses.\n"
11467
"-Dindex Trace major index operations.\n"
11468
"-Dknit Trace knit operations.\n"
11469
"-Dlock Trace when lockdir locks are taken or released.\n"
11470
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11471
" retrying the request.\n"
11472
"-Dprogress Trace progress bar operations.\n"
11473
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11474
"-Dmerge Emit information for debugging merges.\n"
11475
"-Dno_apport Don't use apport to report crashes.\n"
11476
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11477
"-Dpack Emit information about pack operations.\n"
11478
"-Drelock Emit a message every time a branch or repository object "
11479
"is\n"
11480
" unlocked then relocked the same way.\n"
11481
"-Dsftp Trace SFTP internals.\n"
11482
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11483
"expected\n"
11484
"-Dstream Trace fetch streams.\n"
11485
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11486
"portable\n"
11487
" manner.\n"
11488
"-Dunlock Some errors during unlock are treated as warnings.\n"
11489
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11490
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11491
"appropriate\n"
11492
" for the format, even for non-local fetches.\n"
11373
11493
11374
11494
#: en/help_topics/diverged-branches.txt:1
11375
11495
msgid ""
11399
11519
"last pull and you have local commits that have not yet been pushed to the\n"
11400
11520
"mainline, then your local branch and the mainline have diverged."
11401
11521
msgstr ""
11522
"This situation commonly arises when using a centralised workflow with local\n"
11523
"commits. If someone else has committed new work to the mainline since your\n"
11524
"last pull and you have local commits that have not yet been pushed to the\n"
11525
"mainline, then your local branch and the mainline have diverged."
11402
11526
11403
11527
#: en/help_topics/diverged-branches.txt:17
11404
11528
msgid ""
11445
11569
"branch can now be pushed to the mainline.\n"
11446
11570
msgstr ""
11447
11571
11572
#: en/help_topics/env-variables.txt:1
11573
msgid "Environment Variables"
11574
msgstr ""
11575
11576
#: en/help_topics/env-variables.txt:3
11577
msgid ""
11578
"=================== "
11579
"===========================================================\n"
11580
"BZRPATH Path where bzr is to look for shell plugin external\n"
11581
" commands.\n"
11582
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11583
"EMAIL E-Mail address of the user.\n"
11584
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11585
"EDITOR Editor for editing commit messages.\n"
11586
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11587
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11588
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11589
"BZR_PLUGIN_PATH.\n"
11590
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11591
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11592
"and\n"
11593
" HOME.\n"
11594
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11595
"URLs).\n"
11596
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11597
"sshcorp,\n"
11598
" plink or lsh.\n"
11599
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11600
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11601
"BZR_COLUMNS Override implicit terminal width.\n"
11602
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11603
"(selftest)\n"
11604
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11605
"'text'.\n"
11606
"BZR_PDB Control whether to launch a debugger on error.\n"
11607
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11608
" breakin debugger.\n"
11609
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11610
"(instead\n"
11611
" of char-based).\n"
11612
"=================== "
11613
"===========================================================\n"
11614
msgstr ""
11615
11448
11616
#: en/help_topics/eol.txt:1
11449
11617
msgid ""
11450
11618
"End of Line Conversion\n"
11752
11920
msgstr ""
11753
11921
11754
11922
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11755
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11923
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11756
11924
msgid "Introduced in: 2.2"
11757
11925
msgstr ""
11758
11926
11770
11938
"~~~~"
11771
11939
msgstr ""
11772
11940
11773
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11774
#: en/help_topics/hooks.txt:304
11941
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11942
#: en/help_topics/hooks.txt:307
11775
11943
msgid "Introduced in: 1.8"
11776
11944
msgstr ""
11777
11945
11794
11962
"branch and checkout (both heavyweight and lightweight) will all\n"
11795
11963
"trigger this hook."
11796
11964
msgstr ""
11965
"Called after new branch initialisation completes. post_branch_init is\n"
11966
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11967
"branch and checkout (both heavyweight and lightweight) will all\n"
11968
"trigger this hook."
11797
11969
11798
11970
#: en/help_topics/hooks.txt:63
11799
11971
msgid ""
11801
11973
"~~~~~~~~~~~~~~~~~~~~~~"
11802
11974
msgstr ""
11803
11975
11804
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11976
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11805
11977
msgid "Introduced in: 1.4"
11806
11978
msgstr ""
11807
11979
11813
11985
"uncommit will all trigger this hook."
11814
11986
msgstr ""
11815
11987
11816
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11988
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11817
11989
msgid ""
11818
11990
"post_commit\n"
11819
11991
"~~~~~~~~~~~"
11821
11993
11822
11994
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11823
11995
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11824
#: en/help_topics/hooks.txt:145
11825
11996
msgid "Introduced in: 0.15"
11826
11997
msgstr ""
11827
11998
11926
12097
11927
12098
#: en/help_topics/hooks.txt:142
11928
12099
msgid ""
11929
"set_rh\n"
11930
"~~~~~~"
11931
msgstr ""
11932
11933
#: en/help_topics/hooks.txt:147
11934
msgid ""
11935
"Invoked whenever the revision history has been set via\n"
11936
"set_revision_history. The api signature is (branch, revision_history),\n"
11937
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11938
"for bzr to trigger, a better hook to use is\n"
11939
"Branch.post_change_branch_tip."
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:153
11943
msgid ""
11944
12100
"transform_fallback_location\n"
11945
12101
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11946
12102
msgstr ""
11947
12103
11948
#: en/help_topics/hooks.txt:156
12104
#: en/help_topics/hooks.txt:145
11949
12105
msgid "Introduced in: 1.9"
11950
12106
msgstr ""
11951
12107
11952
#: en/help_topics/hooks.txt:158
12108
#: en/help_topics/hooks.txt:147
11953
12109
msgid ""
11954
12110
"Called when a stacked branch is activating its fallback locations.\n"
11955
12111
"transform_fallback_location is called with (branch, url), and should\n"
11963
12119
"however undefined."
11964
12120
msgstr ""
11965
12121
11966
#: en/help_topics/hooks.txt:169
12122
#: en/help_topics/hooks.txt:158
11967
12123
msgid ""
11968
12124
"CommandHooks\n"
11969
12125
"------------"
11970
12126
msgstr ""
11971
12127
11972
#: en/help_topics/hooks.txt:172
12128
#: en/help_topics/hooks.txt:161
11973
12129
msgid ""
11974
12130
"extend_command\n"
11975
12131
"~~~~~~~~~~~~~~"
11976
12132
msgstr ""
11977
12133
11978
#: en/help_topics/hooks.txt:175
12134
#: en/help_topics/hooks.txt:164
11979
12135
msgid "Introduced in: 1.13"
11980
12136
msgstr ""
11981
12137
11982
#: en/help_topics/hooks.txt:177
12138
#: en/help_topics/hooks.txt:166
11983
12139
msgid ""
11984
12140
"Called after creating a command object to allow modifications such as\n"
11985
12141
"adding or removing options, docs etc. Called with the new\n"
11986
12142
"bzrlib.commands.Command object."
11987
12143
msgstr ""
11988
12144
11989
#: en/help_topics/hooks.txt:181
12145
#: en/help_topics/hooks.txt:170
11990
12146
msgid ""
11991
12147
"get_command\n"
11992
12148
"~~~~~~~~~~~"
11993
12149
msgstr ""
11994
12150
11995
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11996
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12151
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12152
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11997
12153
msgid "Introduced in: 1.17"
11998
12154
msgstr ""
11999
12155
12000
#: en/help_topics/hooks.txt:186
12156
#: en/help_topics/hooks.txt:175
12001
12157
msgid ""
12002
12158
"Called when creating a single command. Called with (cmd_or_None,\n"
12003
12159
"command_name). get_command should either return the cmd_or_None\n"
12007
12163
"plugin_cmds.register_lazy."
12008
12164
msgstr ""
12009
12165
12010
#: en/help_topics/hooks.txt:193
12166
#: en/help_topics/hooks.txt:182
12011
12167
msgid ""
12012
12168
"get_missing_command\n"
12013
12169
"~~~~~~~~~~~~~~~~~~~"
12014
12170
msgstr ""
12015
12171
12016
#: en/help_topics/hooks.txt:198
12172
#: en/help_topics/hooks.txt:187
12017
12173
msgid ""
12018
12174
"Called when creating a single command if no command could be found.\n"
12019
12175
"Called with (command_name). get_missing_command should either return\n"
12020
12176
"None, or a Command object to be used for the command."
12021
12177
msgstr ""
12022
12178
12023
#: en/help_topics/hooks.txt:202
12179
#: en/help_topics/hooks.txt:191
12024
12180
msgid ""
12025
12181
"list_commands\n"
12026
12182
"~~~~~~~~~~~~~"
12027
12183
msgstr ""
12028
12184
12029
#: en/help_topics/hooks.txt:207
12185
#: en/help_topics/hooks.txt:196
12030
12186
msgid ""
12031
12187
"Called when enumerating commands. Called with a set of cmd_name\n"
12032
12188
"strings for all the commands found so far. This set is safe to mutate\n"
12034
12190
"set of command names."
12035
12191
msgstr ""
12036
12192
12037
#: en/help_topics/hooks.txt:212
12193
#: en/help_topics/hooks.txt:201
12194
msgid ""
12195
"post_command\n"
12196
"~~~~~~~~~~~~"
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12200
msgid "Introduced in: 2.6"
12201
msgstr ""
12202
12203
#: en/help_topics/hooks.txt:206
12204
msgid "Called after executing a command. Called with the command object."
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:208
12208
msgid ""
12209
"pre_command\n"
12210
"~~~~~~~~~~~"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:213
12214
msgid "Called prior to executing a command. Called with the command object."
12215
msgstr ""
12216
12217
#: en/help_topics/hooks.txt:215
12038
12218
msgid ""
12039
12219
"_ConfigHooks\n"
12040
12220
"------------"
12041
12221
msgstr ""
12042
12222
12043
#: en/help_topics/hooks.txt:215
12223
#: en/help_topics/hooks.txt:218
12044
12224
msgid ""
12045
12225
"get\n"
12046
12226
"~~~"
12047
12227
msgstr ""
12048
12228
12049
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12050
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12051
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12052
#: en/help_topics/hooks.txt:443
12229
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12230
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12231
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12232
#: en/help_topics/hooks.txt:446
12053
12233
msgid "Introduced in: 2.4"
12054
12234
msgstr ""
12055
12235
12056
#: en/help_topics/hooks.txt:220
12236
#: en/help_topics/hooks.txt:223
12057
12237
msgid ""
12058
12238
"Invoked when a config option is read. The signature is (stack, name,\n"
12059
12239
"value)."
12060
12240
msgstr ""
12061
12241
12062
#: en/help_topics/hooks.txt:223
12242
#: en/help_topics/hooks.txt:226
12063
12243
msgid ""
12064
12244
"load\n"
12065
12245
"~~~~"
12066
12246
msgstr ""
12067
12247
12068
#: en/help_topics/hooks.txt:228
12248
#: en/help_topics/hooks.txt:231
12069
12249
msgid "Invoked when a config store is loaded. The signature is (store)."
12070
12250
msgstr ""
12071
12251
12072
#: en/help_topics/hooks.txt:230
12252
#: en/help_topics/hooks.txt:233
12073
12253
msgid ""
12074
12254
"remove\n"
12075
12255
"~~~~~~"
12076
12256
msgstr ""
12077
12257
12078
#: en/help_topics/hooks.txt:235
12258
#: en/help_topics/hooks.txt:238
12079
12259
msgid ""
12080
12260
"Invoked when a config option is removed. The signature is (stack,\n"
12081
12261
"name)."
12082
12262
msgstr ""
12083
12263
12084
#: en/help_topics/hooks.txt:238
12264
#: en/help_topics/hooks.txt:241
12085
12265
msgid ""
12086
12266
"save\n"
12087
12267
"~~~~"
12088
12268
msgstr ""
12089
12269
12090
#: en/help_topics/hooks.txt:243
12270
#: en/help_topics/hooks.txt:246
12091
12271
msgid "Invoked when a config store is saved. The signature is (store)."
12092
12272
msgstr ""
12093
12273
12094
#: en/help_topics/hooks.txt:245
12274
#: en/help_topics/hooks.txt:248
12095
12275
msgid ""
12096
12276
"set\n"
12097
12277
"~~~"
12098
12278
msgstr ""
12099
12279
12100
#: en/help_topics/hooks.txt:250
12280
#: en/help_topics/hooks.txt:253
12101
12281
msgid ""
12102
12282
"Invoked when a config option is set. The signature is (stack, name,\n"
12103
12283
"value)."
12104
12284
msgstr ""
12105
12285
12106
#: en/help_topics/hooks.txt:253
12286
#: en/help_topics/hooks.txt:256
12107
12287
msgid ""
12108
12288
"ControlDirHooks\n"
12109
12289
"---------------"
12110
12290
msgstr ""
12111
12291
12112
#: en/help_topics/hooks.txt:256
12292
#: en/help_topics/hooks.txt:259
12113
12293
msgid ""
12114
12294
"post_repo_init\n"
12115
12295
"~~~~~~~~~~~~~~"
12116
12296
msgstr ""
12117
12297
12118
#: en/help_topics/hooks.txt:261
12298
#: en/help_topics/hooks.txt:264
12119
12299
msgid ""
12120
12300
"Invoked after a repository has been initialized. post_repo_init is\n"
12121
12301
"called with a bzrlib.controldir.RepoInitHookParams."
12122
12302
msgstr ""
12303
"Invoked after a repository has been initialised. post_repo_init is\n"
12304
"called with a bzrlib.controldir.RepoInitHookParams."
12123
12305
12124
#: en/help_topics/hooks.txt:264
12306
#: en/help_topics/hooks.txt:267
12125
12307
msgid ""
12126
12308
"pre_open\n"
12127
12309
"~~~~~~~~"
12128
12310
msgstr ""
12129
12311
12130
#: en/help_topics/hooks.txt:267
12312
#: en/help_topics/hooks.txt:270
12131
12313
msgid "Introduced in: 1.14"
12132
12314
msgstr ""
12133
12315
12134
#: en/help_topics/hooks.txt:269
12316
#: en/help_topics/hooks.txt:272
12135
12317
msgid ""
12136
12318
"Invoked before attempting to open a ControlDir with the transport that\n"
12137
12319
"the open will use."
12138
12320
msgstr ""
12139
12321
12140
#: en/help_topics/hooks.txt:272
12322
#: en/help_topics/hooks.txt:275
12141
12323
msgid ""
12142
12324
"InfoHooks\n"
12143
12325
"---------"
12144
12326
msgstr ""
12145
12327
12146
#: en/help_topics/hooks.txt:275
12328
#: en/help_topics/hooks.txt:278
12147
12329
msgid ""
12148
12330
"repository\n"
12149
12331
"~~~~~~~~~~"
12150
12332
msgstr ""
12151
12333
12152
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12153
#: en/help_topics/hooks.txt:521
12334
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12335
#: en/help_topics/hooks.txt:524
12154
12336
msgid "Introduced in: 1.15"
12155
12337
msgstr ""
12156
12338
12157
#: en/help_topics/hooks.txt:280
12339
#: en/help_topics/hooks.txt:283
12158
12340
msgid ""
12159
12341
"Invoked when displaying the statistics for a repository. repository is\n"
12160
12342
"called with a statistics dictionary as returned by the repository and\n"
12161
12343
"a file-like object to write to."
12162
12344
msgstr ""
12163
12345
12164
#: en/help_topics/hooks.txt:284
12346
#: en/help_topics/hooks.txt:287
12165
12347
msgid ""
12166
12348
"LockHooks\n"
12167
12349
"---------"
12168
12350
msgstr ""
12169
12351
12170
#: en/help_topics/hooks.txt:287
12352
#: en/help_topics/hooks.txt:290
12171
12353
msgid ""
12172
12354
"lock_acquired\n"
12173
12355
"~~~~~~~~~~~~~"
12174
12356
msgstr ""
12175
12357
12176
#: en/help_topics/hooks.txt:292
12358
#: en/help_topics/hooks.txt:295
12177
12359
msgid ""
12178
12360
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12179
12361
msgstr ""
12180
12362
12181
#: en/help_topics/hooks.txt:294
12363
#: en/help_topics/hooks.txt:297
12182
12364
msgid ""
12183
12365
"lock_broken\n"
12184
12366
"~~~~~~~~~~~"
12185
12367
msgstr ""
12186
12368
12187
#: en/help_topics/hooks.txt:299
12369
#: en/help_topics/hooks.txt:302
12188
12370
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12189
12371
msgstr ""
12190
12372
12191
#: en/help_topics/hooks.txt:301
12373
#: en/help_topics/hooks.txt:304
12192
12374
msgid ""
12193
12375
"lock_released\n"
12194
12376
"~~~~~~~~~~~~~"
12195
12377
msgstr ""
12196
12378
12197
#: en/help_topics/hooks.txt:306
12379
#: en/help_topics/hooks.txt:309
12198
12380
msgid ""
12199
12381
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12200
12382
msgstr ""
12201
12383
12202
#: en/help_topics/hooks.txt:308
12384
#: en/help_topics/hooks.txt:311
12203
12385
msgid ""
12204
12386
"MergeHooks\n"
12205
12387
"----------"
12206
12388
msgstr ""
12207
12389
12208
#: en/help_topics/hooks.txt:311
12390
#: en/help_topics/hooks.txt:314
12209
12391
msgid ""
12210
12392
"merge_file_content\n"
12211
12393
"~~~~~~~~~~~~~~~~~~"
12212
12394
msgstr ""
12213
12395
12214
#: en/help_topics/hooks.txt:314
12396
#: en/help_topics/hooks.txt:317
12215
12397
msgid "Introduced in: 2.1"
12216
12398
msgstr ""
12217
12399
12218
#: en/help_topics/hooks.txt:316
12400
#: en/help_topics/hooks.txt:319
12219
12401
msgid ""
12220
12402
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12221
12403
"object when starting a merge. Should return either None or a subclass\n"
12225
12407
"AbstractPerFileMerger API docs for details on how it is used by merge."
12226
12408
msgstr ""
12227
12409
12228
#: en/help_topics/hooks.txt:323
12410
#: en/help_topics/hooks.txt:326
12229
12411
msgid ""
12230
12412
"post_merge\n"
12231
12413
"~~~~~~~~~~"
12232
12414
msgstr ""
12233
12415
12234
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12235
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12236
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12416
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12417
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12418
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12237
12419
msgid "Introduced in: 2.5"
12238
12420
msgstr ""
12239
12421
12240
#: en/help_topics/hooks.txt:328
12422
#: en/help_topics/hooks.txt:331
12241
12423
msgid ""
12242
12424
"Called after a merge. Receives a Merger object as the single argument.\n"
12243
12425
"The return value is ignored."
12244
12426
msgstr ""
12245
12427
12246
#: en/help_topics/hooks.txt:331
12428
#: en/help_topics/hooks.txt:334
12247
12429
msgid ""
12248
12430
"pre_merge\n"
12249
12431
"~~~~~~~~~"
12250
12432
msgstr ""
12251
12433
12252
#: en/help_topics/hooks.txt:336
12434
#: en/help_topics/hooks.txt:339
12253
12435
msgid ""
12254
12436
"Called before a merge. Receives a Merger object as the single\n"
12255
12437
"argument."
12256
12438
msgstr ""
12257
12439
12258
#: en/help_topics/hooks.txt:339
12440
#: en/help_topics/hooks.txt:342
12259
12441
msgid ""
12260
12442
"MergeDirectiveHooks\n"
12261
12443
"-------------------"
12262
12444
msgstr ""
12263
12445
12264
#: en/help_topics/hooks.txt:342
12446
#: en/help_topics/hooks.txt:345
12265
12447
msgid ""
12266
12448
"merge_request_body\n"
12267
12449
"~~~~~~~~~~~~~~~~~~"
12268
12450
msgstr ""
12269
12451
12270
#: en/help_topics/hooks.txt:345
12452
#: en/help_topics/hooks.txt:348
12271
12453
msgid "Introduced in: 1.15.0"
12272
12454
msgstr ""
12273
12455
12274
#: en/help_topics/hooks.txt:347
12456
#: en/help_topics/hooks.txt:350
12275
12457
msgid ""
12276
12458
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12277
12459
"request. Callbacks must return a body. If more than one callback is\n"
12278
12460
"registered, the output of one callback is provided to the next."
12279
12461
msgstr ""
12280
12462
12281
#: en/help_topics/hooks.txt:351
12463
#: en/help_topics/hooks.txt:354
12282
12464
msgid ""
12283
12465
"MessageEditorHooks\n"
12284
12466
"------------------"
12285
12467
msgstr ""
12286
12468
12287
#: en/help_topics/hooks.txt:354
12469
#: en/help_topics/hooks.txt:357
12288
12470
msgid ""
12289
12471
"commit_message_template\n"
12290
12472
"~~~~~~~~~~~~~~~~~~~~~~~"
12291
12473
msgstr ""
12292
12474
12293
#: en/help_topics/hooks.txt:357
12475
#: en/help_topics/hooks.txt:360
12294
12476
msgid "Introduced in: 1.10"
12295
12477
msgstr ""
12296
12478
12297
#: en/help_topics/hooks.txt:359
12479
#: en/help_topics/hooks.txt:362
12298
12480
msgid ""
12299
12481
"Called when a commit message is being generated.\n"
12300
12482
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12305
12487
"second, and so on."
12306
12488
msgstr ""
12307
12489
12308
#: en/help_topics/hooks.txt:367
12490
#: en/help_topics/hooks.txt:370
12309
12491
msgid ""
12310
12492
"set_commit_message\n"
12311
12493
"~~~~~~~~~~~~~~~~~~"
12312
12494
msgstr ""
12313
12495
12314
#: en/help_topics/hooks.txt:372
12496
#: en/help_topics/hooks.txt:375
12315
12497
msgid ""
12316
12498
"Set a fixed commit message. set_commit_message is called with the\n"
12317
12499
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12320
12502
"should use the message editor as normal."
12321
12503
msgstr ""
12322
12504
12323
#: en/help_topics/hooks.txt:378
12505
#: en/help_topics/hooks.txt:381
12324
12506
msgid ""
12325
12507
"MutableTreeHooks\n"
12326
12508
"----------------"
12327
12509
msgstr ""
12328
12510
12329
#: en/help_topics/hooks.txt:381
12511
#: en/help_topics/hooks.txt:384
12330
12512
msgid ""
12331
12513
"post_build_tree\n"
12332
12514
"~~~~~~~~~~~~~~~"
12333
12515
msgstr ""
12334
12516
12335
#: en/help_topics/hooks.txt:386
12517
#: en/help_topics/hooks.txt:389
12336
12518
msgid ""
12337
12519
"Called after a completely new tree is built. The hook is called with\n"
12338
12520
"the tree as its only argument."
12339
12521
msgstr ""
12340
12522
12341
#: en/help_topics/hooks.txt:392
12523
#: en/help_topics/hooks.txt:395
12342
12524
msgid "Introduced in: 2.0"
12343
12525
msgstr ""
12344
12526
12345
#: en/help_topics/hooks.txt:394
12527
#: en/help_topics/hooks.txt:397
12346
12528
msgid ""
12347
12529
"Called after a commit is performed on a tree. The hook is called with\n"
12348
12530
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12350
12532
"that object."
12351
12533
msgstr ""
12352
12534
12353
#: en/help_topics/hooks.txt:399
12535
#: en/help_topics/hooks.txt:402
12354
12536
msgid ""
12355
12537
"post_transform\n"
12356
12538
"~~~~~~~~~~~~~~"
12357
12539
msgstr ""
12358
12540
12359
#: en/help_topics/hooks.txt:404
12541
#: en/help_topics/hooks.txt:407
12360
12542
msgid ""
12361
12543
"Called after a tree transform has been performed on a tree. The hook\n"
12362
12544
"is called with the tree that is being transformed and the transform."
12363
12545
msgstr ""
12364
12546
12365
#: en/help_topics/hooks.txt:407
12547
#: en/help_topics/hooks.txt:410
12366
12548
msgid ""
12367
12549
"pre_transform\n"
12368
12550
"~~~~~~~~~~~~~"
12369
12551
msgstr ""
12370
12552
12371
#: en/help_topics/hooks.txt:412
12553
#: en/help_topics/hooks.txt:415
12372
12554
msgid ""
12373
12555
"Called before a tree transform on this tree. The hook is called with\n"
12374
12556
"the tree that is being transformed and the transform."
12375
12557
msgstr ""
12376
12558
12377
#: en/help_topics/hooks.txt:415
12559
#: en/help_topics/hooks.txt:418
12378
12560
msgid ""
12379
12561
"start_commit\n"
12380
12562
"~~~~~~~~~~~~"
12381
12563
msgstr ""
12382
12564
12383
#: en/help_topics/hooks.txt:420
12565
#: en/help_topics/hooks.txt:423
12384
12566
msgid ""
12385
12567
"Called before a commit is performed on a tree. The start commit hook\n"
12386
12568
"is able to change the tree before the commit takes place. start_commit\n"
12388
12570
"being performed on."
12389
12571
msgstr ""
12390
12572
12391
#: en/help_topics/hooks.txt:425
12573
#: en/help_topics/hooks.txt:428
12392
12574
msgid ""
12393
12575
"SmartClientHooks\n"
12394
12576
"----------------"
12395
12577
msgstr ""
12396
12578
12397
#: en/help_topics/hooks.txt:428
12579
#: en/help_topics/hooks.txt:431
12398
12580
msgid ""
12399
12581
"call\n"
12400
12582
"~~~~"
12401
12583
msgstr ""
12402
12584
12403
#: en/help_topics/hooks.txt:431
12585
#: en/help_topics/hooks.txt:434
12404
12586
msgid "Introduced in: unknown"
12405
12587
msgstr ""
12406
12588
12407
#: en/help_topics/hooks.txt:433
12589
#: en/help_topics/hooks.txt:436
12408
12590
msgid ""
12409
12591
"Called when the smart client is submitting a request to the smart\n"
12410
12592
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12411
12593
"Streaming request bodies, and responses, are not accessible."
12412
12594
msgstr ""
12413
12595
12414
#: en/help_topics/hooks.txt:437
12596
#: en/help_topics/hooks.txt:440
12415
12597
msgid ""
12416
12598
"SmartServerHooks\n"
12417
12599
"----------------"
12418
12600
msgstr ""
12419
12601
12420
#: en/help_topics/hooks.txt:440
12602
#: en/help_topics/hooks.txt:443
12421
12603
msgid ""
12422
12604
"server_exception\n"
12423
12605
"~~~~~~~~~~~~~~~~"
12424
12606
msgstr ""
12425
12607
12426
#: en/help_topics/hooks.txt:445
12608
#: en/help_topics/hooks.txt:448
12427
12609
msgid ""
12428
12610
"Called by the bzr server when an exception occurs. server_exception is\n"
12429
12611
"called with the sys.exc_info() tuple return true for the hook if the\n"
12431
12613
"normally."
12432
12614
msgstr ""
12433
12615
12434
#: en/help_topics/hooks.txt:450
12616
#: en/help_topics/hooks.txt:453
12435
12617
msgid ""
12436
12618
"server_started\n"
12437
12619
"~~~~~~~~~~~~~~"
12438
12620
msgstr ""
12439
12621
12440
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12622
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12441
12623
msgid "Introduced in: 0.16"
12442
12624
msgstr ""
12443
12625
12444
#: en/help_topics/hooks.txt:455
12626
#: en/help_topics/hooks.txt:458
12445
12627
msgid ""
12446
12628
"Called by the bzr server when it starts serving a directory.\n"
12447
12629
"server_started is called with (backing urls, public url), where\n"
12450
12632
"served."
12451
12633
msgstr ""
12452
12634
12453
#: en/help_topics/hooks.txt:461
12635
#: en/help_topics/hooks.txt:464
12454
12636
msgid ""
12455
12637
"server_started_ex\n"
12456
12638
"~~~~~~~~~~~~~~~~~"
12457
12639
msgstr ""
12458
12640
12459
#: en/help_topics/hooks.txt:466
12641
#: en/help_topics/hooks.txt:469
12460
12642
msgid ""
12461
12643
"Called by the bzr server when it starts serving a directory.\n"
12462
12644
"server_started is called with (backing_urls, server_obj)."
12463
12645
msgstr ""
12464
12646
12465
#: en/help_topics/hooks.txt:469
12647
#: en/help_topics/hooks.txt:472
12466
12648
msgid ""
12467
12649
"server_stopped\n"
12468
12650
"~~~~~~~~~~~~~~"
12469
12651
msgstr ""
12470
12652
12471
#: en/help_topics/hooks.txt:474
12653
#: en/help_topics/hooks.txt:477
12472
12654
msgid ""
12473
12655
"Called by the bzr server when it stops serving a directory.\n"
12474
12656
"server_stopped is called with the same parameters as the\n"
12475
12657
"server_started hook: (backing_urls, public_url)."
12476
12658
msgstr ""
12477
12659
12478
#: en/help_topics/hooks.txt:478
12660
#: en/help_topics/hooks.txt:481
12479
12661
msgid ""
12480
12662
"StatusHooks\n"
12481
12663
"-----------"
12482
12664
msgstr ""
12483
12665
12484
#: en/help_topics/hooks.txt:481
12666
#: en/help_topics/hooks.txt:484
12485
12667
msgid ""
12486
12668
"post_status\n"
12487
12669
"~~~~~~~~~~~"
12488
12670
msgstr ""
12489
12671
12490
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12672
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12491
12673
msgid "Introduced in: 2.3"
12492
12674
msgstr ""
12493
12675
12494
#: en/help_topics/hooks.txt:486
12676
#: en/help_topics/hooks.txt:489
12495
12677
msgid ""
12496
12678
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12497
12679
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12500
12682
"status command. to_file is the output stream for writing."
12501
12683
msgstr ""
12502
12684
12503
#: en/help_topics/hooks.txt:492
12685
#: en/help_topics/hooks.txt:495
12504
12686
msgid ""
12505
12687
"pre_status\n"
12506
12688
"~~~~~~~~~~"
12507
12689
msgstr ""
12508
12690
12509
#: en/help_topics/hooks.txt:497
12691
#: en/help_topics/hooks.txt:500
12510
12692
msgid ""
12511
12693
"Called with argument StatusHookParams before Bazaar displays the\n"
12512
12694
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12515
12697
"status command. to_file is the output stream for writing."
12516
12698
msgstr ""
12517
12699
12518
#: en/help_topics/hooks.txt:503
12700
#: en/help_topics/hooks.txt:506
12519
12701
msgid ""
12520
12702
"TransportHooks\n"
12521
12703
"--------------"
12522
12704
msgstr ""
12523
12705
12524
#: en/help_topics/hooks.txt:506
12706
#: en/help_topics/hooks.txt:509
12525
12707
msgid ""
12526
12708
"post_connect\n"
12527
12709
"~~~~~~~~~~~~"
12528
12710
msgstr ""
12529
12711
12530
#: en/help_topics/hooks.txt:511
12712
#: en/help_topics/hooks.txt:514
12531
12713
msgid ""
12532
12714
"Called after a new connection is established or a reconnect occurs.\n"
12533
12715
"The sole argument passed is either the connected transport or smart\n"
12534
12716
"medium instance."
12535
12717
msgstr ""
12536
12718
12537
#: en/help_topics/hooks.txt:515
12719
#: en/help_topics/hooks.txt:518
12538
12720
msgid ""
12539
12721
"RioVersionInfoBuilderHooks\n"
12540
12722
"--------------------------"
12541
12723
msgstr ""
12542
12724
12543
#: en/help_topics/hooks.txt:518
12725
#: en/help_topics/hooks.txt:521
12544
12726
msgid ""
12545
12727
"revision\n"
12546
12728
"~~~~~~~~"
12547
12729
msgstr ""
12548
12730
12549
#: en/help_topics/hooks.txt:523
12731
#: en/help_topics/hooks.txt:526
12550
12732
msgid ""
12551
12733
"Invoked when adding information about a revision to the RIO stanza\n"
12552
12734
"that is printed. revision is called with a revision object and a RIO\n"
13318
13500
"Many commands that accept URLs also accept location aliases too.\n"
13319
13501
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13320
13502
msgstr ""
13321
13322
#~ msgid ""
13323
#~ "Merge will do its best to combine the changes in two branches, but there\n"
13324
#~ "are some kinds of problems only a human can fix. When it encounters those,\n"
13325
#~ "it will mark a conflict. A conflict means that you need to fix something,\n"
13326
#~ "before you should commit."
13327
#~ msgstr ""
13328
#~ "Merge will do its best to combine the changes in two branches, but there\n"
13329
#~ "are some kinds of problems only a human can fix. When it encounters those,\n"
13330
#~ "it will mark a conflict. A conflict means that you need to fix something,\n"
13331
#~ "before you should commit."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1