« back to all changes in this revision
Viewing changes to po/en_AU.po
- browse files at revision 6472
- compare with another revision
- download diff
- download tarball
- view history from revision 6472
- Committer: Patch Queue Manager
- Date: 2012-02-22 13:39:51 UTC
- mfrom: (6470.1.1 less-inventory-use-2)
- Revision ID: pqm@pqm.ubuntu.com-20120222133951-cqvnnx710wox7905
(jelmer) Use inventories directly in fewer places. (Jelmer Vernooij)
- files added:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- files removed:
- bzrlib/plugins/launchpad/cmds.py
- files renamed:
- bzrlib/tests/per_branch/test_bound_sftp.py.THIS => bzrlib/tests/per_branch/test_bound_sftp.py
- files modified:
- Makefile
added
removed
po/en_AU.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"
10
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
11
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
"Language-Team: English (Australia) <en_AU@li.org>\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:22+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:18+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
20
21
21
#: bzrlib/add.py:95
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
26
26
msgid "Unstacking"
27
27
msgstr "Unstacking"
28
28
29
#: bzrlib/branch.py:3205
29
#: bzrlib/branch.py:3183
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:3185
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] ""
39
39
msgstr[1] ""
40
40
41
#: bzrlib/branch.py:3210
41
#: bzrlib/branch.py:3188
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:3190
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:3210
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3235
53
#: bzrlib/branch.py:3213
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:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
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:130
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:215
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."
109
110
#: bzrlib/builtins.py:320
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:323
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"kind changed\n"
124
" File kind has been changed (e.g. from file to directory)."
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
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
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'."
205
206
#: bzrlib/builtins.py:363
72
#: bzrlib/builtins.py:217
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:220
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:223
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:227
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:232
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:235
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"kind changed\n"
124
" File kind has been changed (e.g. from file to directory)."
125
126
#: bzrlib/builtins.py:238
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:241
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:246
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:249
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:253
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:258
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:263
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:266
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:275
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:277
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:279
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:282
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:297
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:341 bzrlib/builtins.py:5090
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:344 bzrlib/builtins.py:5092
231
231
msgid "You must supply either --revision or a revision_id"
232
232
msgstr "You must supply either --revision or a revision_id"
233
233
234
#: bzrlib/builtins.py:439
234
#: bzrlib/builtins.py:351
235
235
#, python-format
236
236
msgid "Repository %r does not support access to raw revision texts"
237
237
msgstr "Repository %r does not support access to raw revision texts"
238
238
239
#: bzrlib/builtins.py:450
239
#: bzrlib/builtins.py:362
240
240
msgid "The repository {0} contains no revision {1}."
241
241
msgstr "The repository {0} contains no revision {1}."
242
242
243
#: bzrlib/builtins.py:457
243
#: bzrlib/builtins.py:369
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:461
248
248
msgid "Remove the working tree from a given branch/checkout."
249
249
msgstr "Remove the working tree from a given branch/checkout."
250
250
251
#: bzrlib/builtins.py:551
251
#: bzrlib/builtins.py:463
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."
256
256
"Since a lightweight checkout is little more than a working tree\n"
257
257
"this will refuse to run against one."
258
258
259
#: bzrlib/builtins.py:554
259
#: bzrlib/builtins.py:466
260
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
262
262
263
#: bzrlib/builtins.py:560
263
#: bzrlib/builtins.py:472
264
264
msgid ""
265
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
266
msgstr ""
267
267
"Remove the working tree even if it has uncommitted or shelved changes."
268
268
269
#: bzrlib/builtins.py:574
269
#: bzrlib/builtins.py:486
270
270
msgid "No working tree to remove"
271
271
msgstr "No working tree to remove"
272
272
273
#: bzrlib/builtins.py:576
273
#: bzrlib/builtins.py:488
274
274
msgid "You cannot remove the working tree of a remote path"
275
275
msgstr "You cannot remove the working tree of a remote path"
276
276
277
#: bzrlib/builtins.py:585
277
#: bzrlib/builtins.py:497
278
278
msgid "You cannot remove the working tree from a lightweight checkout"
279
279
msgstr "You cannot remove the working tree from a lightweight checkout"
280
280
281
#: bzrlib/builtins.py:625
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:636
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:640
281
#: bzrlib/builtins.py:537
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:548
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:552
298
298
msgid "failed to reset the tree state{0}"
299
299
msgstr "failed to reset the tree state{0}"
300
300
301
#: bzrlib/builtins.py:644
301
#: bzrlib/builtins.py:556
302
302
msgid "Show current revision number."
303
303
msgstr "Show current revision number."
304
304
305
#: bzrlib/builtins.py:646
305
#: bzrlib/builtins.py:558
306
306
msgid "This is equal to the number of revisions on this branch."
307
307
msgstr "This is equal to the number of revisions on this branch."
308
308
309
#: bzrlib/builtins.py:659
309
#: bzrlib/builtins.py:571
310
310
msgid "--tree and --revision can not be used together"
311
311
msgstr ""
312
312
313
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
313
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
314
314
msgid "Tags can only be placed on a single revision, not on a range"
315
315
msgstr ""
316
316
317
#: bzrlib/builtins.py:700
317
#: bzrlib/builtins.py:612
318
318
msgid "Show revno of working tree."
319
319
msgstr ""
320
320
321
#: bzrlib/builtins.py:748
321
#: bzrlib/builtins.py:660
322
322
msgid "Add specified files or directories."
323
323
msgstr "Add specified files or directories."
324
324
325
#: bzrlib/builtins.py:750
326
msgid ""
327
"In non-recursive mode, all the named items are added, regardless\n"
328
"of whether they were previously ignored. A warning is given if\n"
329
"any of the named files are already versioned."
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."
334
335
#: bzrlib/builtins.py:754
336
msgid ""
337
"In recursive mode (the default), files are treated the same way\n"
338
"but the behaviour for directories is different. Directories that\n"
339
"are already versioned do not give a warning. All directories,\n"
340
"whether already versioned or not, are searched for files or\n"
341
"subdirectories that are neither versioned or ignored, and these\n"
342
"are added. This search proceeds recursively into versioned\n"
343
"directories. If no names are given '.' is assumed."
344
msgstr ""
345
"In recursive mode (the default), files are treated the same way\n"
346
"but the behaviour for directories is different. Directories that\n"
347
"are already versioned do not give a warning. All directories,\n"
348
"whether already versioned or not, are searched for files or\n"
349
"subdirectories that are neither versioned or ignored, and these\n"
350
"are added. This search proceeds recursively into versioned\n"
351
"directories. If no names are given '.' is assumed."
352
353
#: bzrlib/builtins.py:762
325
#: bzrlib/builtins.py:662
326
msgid ""
327
"In non-recursive mode, all the named items are added, regardless\n"
328
"of whether they were previously ignored. A warning is given if\n"
329
"any of the named files are already versioned."
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."
334
335
#: bzrlib/builtins.py:666
336
msgid ""
337
"In recursive mode (the default), files are treated the same way\n"
338
"but the behaviour for directories is different. Directories that\n"
339
"are already versioned do not give a warning. All directories,\n"
340
"whether already versioned or not, are searched for files or\n"
341
"subdirectories that are neither versioned or ignored, and these\n"
342
"are added. This search proceeds recursively into versioned\n"
343
"directories. If no names are given '.' is assumed."
344
msgstr ""
345
"In recursive mode (the default), files are treated the same way\n"
346
"but the behaviour for directories is different. Directories that\n"
347
"are already versioned do not give a warning. All directories,\n"
348
"whether already versioned or not, are searched for files or\n"
349
"subdirectories that are neither versioned or ignored, and these\n"
350
"are added. This search proceeds recursively into versioned\n"
351
"directories. If no names are given '.' is assumed."
352
353
#: bzrlib/builtins.py:674
354
354
msgid ""
355
355
"A warning will be printed when nested trees are encountered,\n"
356
356
"unless they are explicitly ignored."
357
357
msgstr ""
358
358
359
#: bzrlib/builtins.py:765
360
msgid ""
361
"Therefore simply saying 'bzr add' will version all files that\n"
362
"are currently unknown."
363
msgstr ""
364
"Therefore simply saying 'bzr add' will version all files that\n"
365
"are currently unknown."
366
367
#: bzrlib/builtins.py:768
368
msgid ""
369
"Adding a file whose parent directory is not versioned will\n"
370
"implicitly add the parent, and so on up to the root. This means\n"
371
"you should never need to explicitly add a directory, they'll just\n"
372
"get added when you add a file in the directory."
373
msgstr ""
374
"Adding a file whose parent directory is not versioned will\n"
375
"implicitly add the parent, and so on up to the root. This means\n"
376
"you should never need to explicitly add a directory, they'll just\n"
377
"get added when you add a file in the directory."
378
379
#: bzrlib/builtins.py:773
380
msgid ""
381
"--dry-run will show which files would be added, but not actually\n"
382
"add them."
383
msgstr ""
384
"--dry-run will show which files would be added, but not actually\n"
385
"add them."
386
387
#: bzrlib/builtins.py:776
388
msgid ""
389
"--file-ids-from will try to use the file ids from the supplied path.\n"
390
"It looks up ids trying to find a matching parent directory with the\n"
391
"same filename, and then by pure path. This option is rarely needed\n"
392
"but can be useful when adding the same logical file into two\n"
393
"branches that will be merged later (without showing the two different\n"
394
"adds as a conflict). It is also useful when merging another project\n"
395
"into a subdirectory of this one."
396
msgstr ""
397
"--file-ids-from will try to use the file ids from the supplied path.\n"
398
"It looks up ids trying to find a matching parent directory with the\n"
399
"same filename, and then by pure path. This option is rarely needed\n"
400
"but can be useful when adding the same logical file into two\n"
401
"branches that will be merged later (without showing the two different\n"
402
"adds as a conflict). It is also useful when merging another project\n"
403
"into a subdirectory of this one."
404
405
#: bzrlib/builtins.py:784
406
msgid ""
407
"Any files matching patterns in the ignore list will not be added\n"
408
"unless they are explicitly mentioned."
409
msgstr ""
410
"Any files matching patterns in the ignore list will not be added\n"
411
"unless they are explicitly mentioned."
412
413
#: bzrlib/builtins.py:787
414
msgid ""
415
"In recursive mode, files larger than the configuration option \n"
416
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
417
"to file size."
418
msgstr ""
419
"In recursive mode, files larger than the configuration option \n"
420
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
421
"to file size."
422
423
#: bzrlib/builtins.py:794
359
#: bzrlib/builtins.py:677
360
msgid ""
361
"Therefore simply saying 'bzr add' will version all files that\n"
362
"are currently unknown."
363
msgstr ""
364
"Therefore simply saying 'bzr add' will version all files that\n"
365
"are currently unknown."
366
367
#: bzrlib/builtins.py:680
368
msgid ""
369
"Adding a file whose parent directory is not versioned will\n"
370
"implicitly add the parent, and so on up to the root. This means\n"
371
"you should never need to explicitly add a directory, they'll just\n"
372
"get added when you add a file in the directory."
373
msgstr ""
374
"Adding a file whose parent directory is not versioned will\n"
375
"implicitly add the parent, and so on up to the root. This means\n"
376
"you should never need to explicitly add a directory, they'll just\n"
377
"get added when you add a file in the directory."
378
379
#: bzrlib/builtins.py:685
380
msgid ""
381
"--dry-run will show which files would be added, but not actually\n"
382
"add them."
383
msgstr ""
384
"--dry-run will show which files would be added, but not actually\n"
385
"add them."
386
387
#: bzrlib/builtins.py:688
388
msgid ""
389
"--file-ids-from will try to use the file ids from the supplied path.\n"
390
"It looks up ids trying to find a matching parent directory with the\n"
391
"same filename, and then by pure path. This option is rarely needed\n"
392
"but can be useful when adding the same logical file into two\n"
393
"branches that will be merged later (without showing the two different\n"
394
"adds as a conflict). It is also useful when merging another project\n"
395
"into a subdirectory of this one."
396
msgstr ""
397
"--file-ids-from will try to use the file ids from the supplied path.\n"
398
"It looks up ids trying to find a matching parent directory with the\n"
399
"same filename, and then by pure path. This option is rarely needed\n"
400
"but can be useful when adding the same logical file into two\n"
401
"branches that will be merged later (without showing the two different\n"
402
"adds as a conflict). It is also useful when merging another project\n"
403
"into a subdirectory of this one."
404
405
#: bzrlib/builtins.py:696
406
msgid ""
407
"Any files matching patterns in the ignore list will not be added\n"
408
"unless they are explicitly mentioned."
409
msgstr ""
410
"Any files matching patterns in the ignore list will not be added\n"
411
"unless they are explicitly mentioned."
412
413
#: bzrlib/builtins.py:699
414
msgid ""
415
"In recursive mode, files larger than the configuration option \n"
416
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
417
"to file size."
418
msgstr ""
419
"In recursive mode, files larger than the configuration option \n"
420
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
421
"to file size."
422
423
#: bzrlib/builtins.py:706
424
424
msgid "Don't recursively add the contents of directories."
425
425
msgstr "Don't recursively add the contents of directories."
426
426
427
#: bzrlib/builtins.py:800
427
#: bzrlib/builtins.py:712
428
428
msgid "Lookup file ids from this tree."
429
429
msgstr "Lookup file ids from this tree."
430
430
431
#: bzrlib/builtins.py:836
431
#: bzrlib/builtins.py:748
432
432
msgid "ignored {0} matching \"{1}\"\n"
433
433
msgstr "ignored {0} matching \"{1}\"\n"
434
434
435
#: bzrlib/builtins.py:841
435
#: bzrlib/builtins.py:753
436
436
msgid "Create a new versioned directory."
437
437
msgstr "Create a new versioned directory."
438
438
439
#: bzrlib/builtins.py:843
439
#: bzrlib/builtins.py:755
440
440
msgid "This is equivalent to creating the directory and then adding it."
441
441
msgstr "This is equivalent to creating the directory and then adding it."
442
442
443
#: bzrlib/builtins.py:850
443
#: bzrlib/builtins.py:762
444
444
msgid "No error if existing, make parent directories as needed."
445
msgstr "No error if existing, make parent directories as needed."
445
msgstr ""
446
446
447
#: bzrlib/builtins.py:884
447
#: bzrlib/builtins.py:796
448
448
#, python-format
449
449
msgid "added %s\n"
450
450
msgstr "added %s\n"
451
451
452
#: bzrlib/builtins.py:926
452
#: bzrlib/builtins.py:838
453
453
#, python-format
454
454
msgid "invalid kind %r specified"
455
455
msgstr "invalid kind %r specified"
456
456
457
#: bzrlib/builtins.py:963
457
#: bzrlib/builtins.py:875
458
458
msgid "Move or rename a file."
459
459
msgstr "Move or rename a file."
460
460
461
#: bzrlib/builtins.py:965
461
#: bzrlib/builtins.py:877
462
462
msgid " bzr mv SOURCE... DESTINATION"
463
463
msgstr " bzr mv SOURCE... DESTINATION"
464
464
465
#: bzrlib/builtins.py:967
466
msgid ""
467
"If the last argument is a versioned directory, all the other names\n"
468
"are moved into it. Otherwise, there must be exactly two arguments\n"
469
"and the file is changed to a new name."
470
msgstr ""
471
"If the last argument is a versioned directory, all the other names\n"
472
"are moved into it. Otherwise, there must be exactly two arguments\n"
473
"and the file is changed to a new name."
474
475
#: bzrlib/builtins.py:971
476
msgid ""
477
"If OLDNAME does not exist on the filesystem but is versioned and\n"
478
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
479
"assumes that the file has been manually moved and only updates\n"
480
"its internal inventory to reflect that change.\n"
481
"The same is valid when moving many SOURCE files to a DESTINATION."
482
msgstr ""
483
"If OLDNAME does not exist on the filesystem but is versioned and\n"
484
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
485
"assumes that the file has been manually moved and only updates\n"
486
"its internal inventory to reflect that change.\n"
487
"The same is valid when moving many SOURCE files to a DESTINATION."
488
489
#: bzrlib/builtins.py:977
465
#: bzrlib/builtins.py:879
466
msgid ""
467
"If the last argument is a versioned directory, all the other names\n"
468
"are moved into it. Otherwise, there must be exactly two arguments\n"
469
"and the file is changed to a new name."
470
msgstr ""
471
"If the last argument is a versioned directory, all the other names\n"
472
"are moved into it. Otherwise, there must be exactly two arguments\n"
473
"and the file is changed to a new name."
474
475
#: bzrlib/builtins.py:883
476
msgid ""
477
"If OLDNAME does not exist on the filesystem but is versioned and\n"
478
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
479
"assumes that the file has been manually moved and only updates\n"
480
"its internal inventory to reflect that change.\n"
481
"The same is valid when moving many SOURCE files to a DESTINATION."
482
msgstr ""
483
"If OLDNAME does not exist on the filesystem but is versioned and\n"
484
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
485
"assumes that the file has been manually moved and only updates\n"
486
"its internal inventory to reflect that change.\n"
487
"The same is valid when moving many SOURCE files to a DESTINATION."
488
489
#: bzrlib/builtins.py:889
490
490
msgid "Files cannot be moved between branches."
491
491
msgstr "Files cannot be moved between branches."
492
492
493
#: bzrlib/builtins.py:984
493
#: bzrlib/builtins.py:896
494
494
msgid ""
495
495
"Move only the bzr identifier of the file, because the file has already been "
496
496
"moved."
498
498
"Move only the bzr identifier of the file, because the file has already been "
499
499
"moved."
500
500
501
#: bzrlib/builtins.py:986
501
#: bzrlib/builtins.py:898
502
502
msgid "Automatically guess renames."
503
503
msgstr "Automatically guess renames."
504
504
505
#: bzrlib/builtins.py:987
505
#: bzrlib/builtins.py:899
506
506
msgid "Avoid making changes when guessing renames."
507
507
msgstr "Avoid making changes when guessing renames."
508
508
509
#: bzrlib/builtins.py:996
509
#: bzrlib/builtins.py:908
510
510
msgid "--dry-run requires --auto."
511
511
msgstr "--dry-run requires --auto."
512
512
513
#: bzrlib/builtins.py:1000
513
#: bzrlib/builtins.py:912
514
514
msgid "missing file argument"
515
515
msgstr "missing file argument"
516
516
517
#: bzrlib/builtins.py:1004
517
#: bzrlib/builtins.py:916
518
518
msgid "can not move root of branch"
519
519
msgstr ""
520
520
521
#: bzrlib/builtins.py:1010
521
#: bzrlib/builtins.py:922
522
522
msgid "Only one path may be specified to --auto."
523
523
msgstr "Only one path may be specified to --auto."
524
524
525
#: bzrlib/builtins.py:1013
525
#: bzrlib/builtins.py:925
526
526
msgid "--after cannot be specified with --auto."
527
527
msgstr "--after cannot be specified with --auto."
528
528
529
#: bzrlib/builtins.py:1050
529
#: bzrlib/builtins.py:962
530
530
msgid "to mv multiple files the destination must be a versioned directory"
531
531
msgstr "to mv multiple files the destination must be a versioned directory"
532
532
533
#: bzrlib/builtins.py:1102
533
#: bzrlib/builtins.py:1014
534
534
msgid "Turn this branch into a mirror of another branch."
535
535
msgstr "Turn this branch into a mirror of another branch."
536
536
537
#: bzrlib/builtins.py:1104
538
msgid ""
539
"By default, this command only works on branches that have not diverged.\n"
540
"Branches are considered diverged if the destination branch's most recent \n"
541
"commit is one that has not been merged (directly or indirectly) into the \n"
542
"parent."
543
msgstr ""
544
"By default, this command only works on branches that have not diverged.\n"
545
"Branches are considered diverged if the destination branch's most recent \n"
546
"commit is one that has not been merged (directly or indirectly) into the \n"
547
"parent."
548
549
#: bzrlib/builtins.py:1109
550
msgid ""
551
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
552
"from one into the other. Once one branch has merged, the other should\n"
553
"be able to pull it again."
554
msgstr ""
555
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
556
"from one into the other. Once one branch has merged, the other should\n"
557
"be able to pull it again."
558
559
#: bzrlib/builtins.py:1113
560
msgid ""
561
"If you want to replace your local changes and just want your branch to\n"
562
"match the remote one, use pull --overwrite. This will work even if the two\n"
563
"branches have diverged."
564
msgstr ""
565
"If you want to replace your local changes and just want your branch to\n"
566
"match the remote one, use pull --overwrite. This will work even if the two\n"
567
"branches have diverged."
568
569
#: bzrlib/builtins.py:1117
570
msgid ""
571
"If there is no default location set, the first pull will set it (use\n"
572
"--no-remember to avoid setting it). After that, you can omit the\n"
573
"location to use the default. To change the default, use --remember. The\n"
574
"value will only be saved if the remote location can be accessed."
575
msgstr ""
576
"If there is no default location set, the first pull will set it (use\n"
577
"--no-remember to avoid setting it). After that, you can omit the\n"
578
"location to use the default. To change the default, use --remember. The\n"
579
"value will only be saved if the remote location can be accessed."
580
581
#: bzrlib/builtins.py:1122
537
#: bzrlib/builtins.py:1016
538
msgid ""
539
"By default, this command only works on branches that have not diverged.\n"
540
"Branches are considered diverged if the destination branch's most recent \n"
541
"commit is one that has not been merged (directly or indirectly) into the \n"
542
"parent."
543
msgstr ""
544
"By default, this command only works on branches that have not diverged.\n"
545
"Branches are considered diverged if the destination branch's most recent \n"
546
"commit is one that has not been merged (directly or indirectly) into the \n"
547
"parent."
548
549
#: bzrlib/builtins.py:1021
550
msgid ""
551
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
552
"from one into the other. Once one branch has merged, the other should\n"
553
"be able to pull it again."
554
msgstr ""
555
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
556
"from one into the other. Once one branch has merged, the other should\n"
557
"be able to pull it again."
558
559
#: bzrlib/builtins.py:1025
560
msgid ""
561
"If you want to replace your local changes and just want your branch to\n"
562
"match the remote one, use pull --overwrite. This will work even if the two\n"
563
"branches have diverged."
564
msgstr ""
565
"If you want to replace your local changes and just want your branch to\n"
566
"match the remote one, use pull --overwrite. This will work even if the two\n"
567
"branches have diverged."
568
569
#: bzrlib/builtins.py:1029
570
msgid ""
571
"If there is no default location set, the first pull will set it (use\n"
572
"--no-remember to avoid setting it). After that, you can omit the\n"
573
"location to use the default. To change the default, use --remember. The\n"
574
"value will only be saved if the remote location can be accessed."
575
msgstr ""
576
"If there is no default location set, the first pull will set it (use\n"
577
"--no-remember to avoid setting it). After that, you can omit the\n"
578
"location to use the default. To change the default, use --remember. The\n"
579
"value will only be saved if the remote location can be accessed."
580
581
#: bzrlib/builtins.py:1034
582
582
msgid ""
583
583
"The --verbose option will display the revisions pulled using the log_format\n"
584
584
"configuration option. You can use a different format by overriding it with\n"
585
585
"-Olog_format=<other_format>."
586
586
msgstr ""
587
587
588
#: bzrlib/builtins.py:1126
588
#: bzrlib/builtins.py:1038
589
589
msgid ""
590
590
"Note: The location can be specified either in the form of a branch,\n"
591
591
"or in the form of a path to a file containing a merge directive generated\n"
595
595
"or in the form of a path to a file containing a merge directive generated\n"
596
596
"with bzr send."
597
597
598
#: bzrlib/builtins.py:1134
598
#: bzrlib/builtins.py:1046
599
599
msgid "Show logs of pulled revisions."
600
600
msgstr "Show logs of pulled revisions."
601
601
602
#: bzrlib/builtins.py:1136
603
msgid ""
604
"Branch to pull into, rather than the one containing the working directory."
605
msgstr ""
606
"Branch to pull into, rather than the one containing the working directory."
607
608
#: bzrlib/builtins.py:1139
609
msgid ""
610
"Perform a local pull in a bound branch. Local pulls are not applied to the "
611
"master branch."
612
msgstr ""
613
"Perform a local pull in a bound branch. Local pulls are not applied to the "
614
"master branch."
615
616
#: bzrlib/builtins.py:1168
602
#: bzrlib/builtins.py:1048
603
msgid ""
604
"Branch to pull into, rather than the one containing the working directory."
605
msgstr ""
606
"Branch to pull into, rather than the one containing the working directory."
607
608
#: bzrlib/builtins.py:1051
609
msgid ""
610
"Perform a local pull in a bound branch. Local pulls are not applied to the "
611
"master branch."
612
msgstr ""
613
"Perform a local pull in a bound branch. Local pulls are not applied to the "
614
"master branch."
615
616
#: bzrlib/builtins.py:1080
617
617
msgid "Need working tree for --show-base."
618
618
msgstr "Need working tree for --show-base."
619
619
620
#: bzrlib/builtins.py:1184
620
#: bzrlib/builtins.py:1096
621
621
msgid "No pull location known or specified."
622
622
msgstr "No pull location known or specified."
623
623
624
#: bzrlib/builtins.py:1190
624
#: bzrlib/builtins.py:1102
625
625
#, python-format
626
626
msgid "Using saved parent location: %s\n"
627
627
msgstr "Using saved parent location: %s\n"
628
628
629
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
629
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
630
630
msgid "Cannot use -r with merge directives or bundles"
631
631
msgstr "Cannot use -r with merge directives or bundles"
632
632
633
#: bzrlib/builtins.py:1238
633
#: bzrlib/builtins.py:1150
634
634
msgid "Update a mirror of this branch."
635
635
msgstr "Update a mirror of this branch."
636
636
637
#: bzrlib/builtins.py:1240
637
#: bzrlib/builtins.py:1152
638
638
msgid ""
639
639
"The target branch will not have its working tree populated because this\n"
640
640
"is both expensive, and is not supported on remote file systems."
642
642
"The target branch will not have its working tree populated because this\n"
643
643
"is both expensive and is not supported on remote file systems."
644
644
645
#: bzrlib/builtins.py:1243
646
msgid ""
647
"Some smart servers or protocols *may* put the working tree in place in\n"
648
"the future."
649
msgstr ""
650
"Some smart servers or protocols *may* put the working tree in place in\n"
651
"the future."
652
653
#: bzrlib/builtins.py:1246
654
msgid ""
655
"This command only works on branches that have not diverged. Branches are\n"
656
"considered diverged if the destination branch's most recent commit is one\n"
657
"that has not been merged (directly or indirectly) by the source branch."
658
msgstr ""
659
"This command only works on branches that have not diverged. Branches are\n"
660
"considered diverged if the destination branch's most recent commit is one\n"
661
"that has not been merged (directly or indirectly) by the source branch."
662
663
#: bzrlib/builtins.py:1250
664
msgid ""
665
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
666
"the other branch completely, discarding its unmerged changes."
667
msgstr ""
668
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
669
"the other branch completely, discarding its unmerged changes."
670
671
#: bzrlib/builtins.py:1253
672
msgid ""
673
"If you want to ensure you have the different changes in the other branch,\n"
674
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
675
"After that you will be able to do a push without '--overwrite'."
676
msgstr ""
677
"If you want to ensure you have the different changes in the other branch,\n"
678
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
679
"After that you will be able to do a push without '--overwrite'."
680
681
#: bzrlib/builtins.py:1257
682
msgid ""
683
"If there is no default push location set, the first push will set it (use\n"
684
"--no-remember to avoid setting it). After that, you can omit the\n"
685
"location to use the default. To change the default, use --remember. The\n"
686
"value will only be saved if the remote location can be accessed."
687
msgstr ""
688
"If there is no default push location set, the first push will set it (use\n"
689
"--no-remember to avoid setting it). After that, you can omit the\n"
690
"location to use the default. To change the default, use --remember. The\n"
691
"value will only be saved if the remote location can be accessed."
692
693
#: bzrlib/builtins.py:1262
645
#: bzrlib/builtins.py:1155
646
msgid ""
647
"Some smart servers or protocols *may* put the working tree in place in\n"
648
"the future."
649
msgstr ""
650
"Some smart servers or protocols *may* put the working tree in place in\n"
651
"the future."
652
653
#: bzrlib/builtins.py:1158
654
msgid ""
655
"This command only works on branches that have not diverged. Branches are\n"
656
"considered diverged if the destination branch's most recent commit is one\n"
657
"that has not been merged (directly or indirectly) by the source branch."
658
msgstr ""
659
"This command only works on branches that have not diverged. Branches are\n"
660
"considered diverged if the destination branch's most recent commit is one\n"
661
"that has not been merged (directly or indirectly) by the source branch."
662
663
#: bzrlib/builtins.py:1162
664
msgid ""
665
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
666
"the other branch completely, discarding its unmerged changes."
667
msgstr ""
668
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
669
"the other branch completely, discarding its unmerged changes."
670
671
#: bzrlib/builtins.py:1165
672
msgid ""
673
"If you want to ensure you have the different changes in the other branch,\n"
674
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
675
"After that you will be able to do a push without '--overwrite'."
676
msgstr ""
677
"If you want to ensure you have the different changes in the other branch,\n"
678
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
679
"After that you will be able to do a push without '--overwrite'."
680
681
#: bzrlib/builtins.py:1169
682
msgid ""
683
"If there is no default push location set, the first push will set it (use\n"
684
"--no-remember to avoid setting it). After that, you can omit the\n"
685
"location to use the default. To change the default, use --remember. The\n"
686
"value will only be saved if the remote location can be accessed."
687
msgstr ""
688
"If there is no default push location set, the first push will set it (use\n"
689
"--no-remember to avoid setting it). After that, you can omit the\n"
690
"location to use the default. To change the default, use --remember. The\n"
691
"value will only be saved if the remote location can be accessed."
692
693
#: bzrlib/builtins.py:1174
694
694
msgid ""
695
695
"The --verbose option will display the revisions pushed using the log_format\n"
696
696
"configuration option. You can use a different format by overriding it with\n"
697
697
"-Olog_format=<other_format>."
698
698
msgstr ""
699
699
700
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
701
msgid ""
702
"Branch to push from, rather than the one containing the working directory."
703
msgstr ""
704
"Branch to push from, rather than the one containing the working directory."
705
706
#: bzrlib/builtins.py:1276
707
msgid ""
708
"By default push will fail if the target directory exists, but does not "
709
"already have a control directory. This flag will allow push to proceed."
710
msgstr ""
711
"By default push will fail if the target directory exists, but does not "
712
"already have a control directory. This flag will allow push to proceed."
713
714
#: bzrlib/builtins.py:1281
715
msgid ""
716
"Create a stacked branch that references the public location of the parent "
717
"branch."
718
msgstr ""
719
"Create a stacked branch that references the public location of the parent "
720
"branch."
721
722
#: bzrlib/builtins.py:1284
700
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
701
msgid ""
702
"Branch to push from, rather than the one containing the working directory."
703
msgstr ""
704
"Branch to push from, rather than the one containing the working directory."
705
706
#: bzrlib/builtins.py:1188
707
msgid ""
708
"By default push will fail if the target directory exists, but does not "
709
"already have a control directory. This flag will allow push to proceed."
710
msgstr ""
711
"By default push will fail if the target directory exists, but does not "
712
"already have a control directory. This flag will allow push to proceed."
713
714
#: bzrlib/builtins.py:1193
715
msgid ""
716
"Create a stacked branch that references the public location of the parent "
717
"branch."
718
msgstr ""
719
"Create a stacked branch that references the public location of the parent "
720
"branch."
721
722
#: bzrlib/builtins.py:1196
723
723
msgid ""
724
724
"Create a stacked branch that refers to another branch for the commit "
725
725
"history. Only the work not present in the referenced branch is included in "
726
726
"the branch created."
727
727
msgstr ""
728
728
729
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
729
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
730
730
msgid ""
731
731
"Refuse to push if there are uncommitted changes in the working tree, --no-"
732
732
"strict disables the check."
733
733
msgstr ""
734
734
735
#: bzrlib/builtins.py:1292
735
#: bzrlib/builtins.py:1204
736
736
msgid "Don't populate the working tree, even for protocols that support it."
737
737
msgstr ""
738
738
739
#: bzrlib/builtins.py:1336
739
#: bzrlib/builtins.py:1248
740
740
msgid "Could not determine branch to refer to."
741
741
msgstr ""
742
742
743
#: bzrlib/builtins.py:1345
743
#: bzrlib/builtins.py:1257
744
744
#, python-format
745
745
msgid ""
746
746
"No push location known or specified. To push to the parent branch (at %s), "
747
747
"use 'bzr push :parent'."
748
748
msgstr ""
749
"No push location known or specified. To push to the parent branch (at %s), "
750
"use 'bzr push :parent'."
751
749
752
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
750
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
753
751
msgid "No push location known or specified."
754
752
msgstr ""
755
753
756
#: bzrlib/builtins.py:1355
754
#: bzrlib/builtins.py:1267
757
755
#, python-format
758
756
msgid "Using saved push location: %s"
759
757
msgstr ""
760
758
761
#: bzrlib/builtins.py:1365
759
#: bzrlib/builtins.py:1277
762
760
msgid "Create a new branch that is a copy of an existing branch."
763
761
msgstr ""
764
762
765
#: bzrlib/builtins.py:1367
763
#: bzrlib/builtins.py:1279
766
764
msgid ""
767
765
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
768
766
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
773
771
"create ./foo-bar."
774
772
msgstr ""
775
773
776
#: bzrlib/builtins.py:1374
774
#: bzrlib/builtins.py:1286
777
775
msgid ""
778
776
"To retrieve the branch as of a particular revision, supply the --revision\n"
779
777
"parameter, as in \"branch foo/bar -r 5\"."
780
778
msgstr ""
781
779
782
#: bzrlib/builtins.py:1377
780
#: bzrlib/builtins.py:1289
783
781
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
784
782
msgstr ""
785
783
786
#: bzrlib/builtins.py:1387
784
#: bzrlib/builtins.py:1299
787
785
msgid "Create a branch without a working-tree."
788
786
msgstr ""
789
787
790
#: bzrlib/builtins.py:1389
788
#: bzrlib/builtins.py:1301
791
789
msgid "Switch the checkout in the current directory to the new branch."
792
790
msgstr ""
793
791
794
#: bzrlib/builtins.py:1392
792
#: bzrlib/builtins.py:1304
795
793
msgid ""
796
794
"Create a stacked branch referring to the source branch. The new branch will "
797
795
"depend on the availability of the source branch for all operations."
798
796
msgstr ""
799
797
800
#: bzrlib/builtins.py:1396
798
#: bzrlib/builtins.py:1308
801
799
msgid "Do not use a shared repository, even if available."
802
800
msgstr ""
803
801
804
#: bzrlib/builtins.py:1398
802
#: bzrlib/builtins.py:1310
805
803
msgid ""
806
804
"By default branch will fail if the target directory exists, but does not "
807
805
"already have a control directory. This flag will allow branch to proceed."
808
806
msgstr ""
809
807
810
#: bzrlib/builtins.py:1403
808
#: bzrlib/builtins.py:1315
811
809
msgid "Bind new branch to from location."
812
810
msgstr ""
813
811
814
#: bzrlib/builtins.py:1450
812
#: bzrlib/builtins.py:1362
815
813
#, python-format
816
814
msgid "Target directory \"%s\" already exists."
817
815
msgstr ""
818
816
819
#: bzrlib/builtins.py:1462
817
#: bzrlib/builtins.py:1374
820
818
#, python-format
821
819
msgid "Parent of \"%s\" does not exist."
822
820
msgstr ""
823
821
824
#: bzrlib/builtins.py:1481
822
#: bzrlib/builtins.py:1393
825
823
msgid "The branch {0} has no revision {1}."
826
824
msgstr ""
827
825
828
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
826
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
829
827
#, python-format
830
828
msgid "Created new stacked branch referring to %s."
831
829
msgstr ""
832
830
833
#: bzrlib/builtins.py:1500
831
#: bzrlib/builtins.py:1407
834
832
#, python-format
835
833
msgid "Branched %d revision."
836
834
msgid_plural "Branched %d revisions."
837
835
msgstr[0] ""
838
836
msgstr[1] ""
839
837
840
#: bzrlib/builtins.py:1505
838
#: bzrlib/builtins.py:1412
841
839
#, python-format
842
840
msgid "New branch bound to %s"
843
841
msgstr ""
844
842
845
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
843
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
846
844
#, python-format
847
845
msgid "Switched to branch: %s"
848
846
msgstr ""
849
847
850
#: bzrlib/builtins.py:1515
848
#: bzrlib/builtins.py:1422
851
849
msgid "List the branches available at the current location."
852
850
msgstr ""
853
851
854
#: bzrlib/builtins.py:1517
852
#: bzrlib/builtins.py:1424
855
853
msgid ""
856
854
"This command will print the names of all the branches at the current\n"
857
855
"location."
858
856
msgstr ""
859
857
860
#: bzrlib/builtins.py:1524
858
#: bzrlib/builtins.py:1431
861
859
msgid ""
862
860
"Recursively scan for branches rather than just looking in the specified "
863
861
"location."
864
862
msgstr ""
865
863
866
#: bzrlib/builtins.py:1554
864
#: bzrlib/builtins.py:1461
867
865
msgid "(default)"
868
msgstr "(default)"
866
msgstr ""
869
867
870
#: bzrlib/builtins.py:1566
868
#: bzrlib/builtins.py:1473
871
869
msgid "Create a new checkout of an existing branch."
872
870
msgstr ""
873
871
874
#: bzrlib/builtins.py:1568
872
#: bzrlib/builtins.py:1475
875
873
msgid ""
876
874
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
877
875
"for\n"
881
879
"location using SFTP."
882
880
msgstr ""
883
881
884
#: bzrlib/builtins.py:1573
882
#: bzrlib/builtins.py:1480
885
883
msgid ""
886
884
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
887
885
"will\n"
893
891
"create ./foo-bar."
894
892
msgstr ""
895
893
896
#: bzrlib/builtins.py:1580
894
#: bzrlib/builtins.py:1487
897
895
msgid ""
898
896
"To retrieve the branch as of a particular revision, supply the --revision\n"
899
897
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
903
901
"code.)"
904
902
msgstr ""
905
903
906
#: bzrlib/builtins.py:1590
904
#: bzrlib/builtins.py:1497
907
905
msgid ""
908
906
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
909
907
"the branch for every operation. Normal checkouts can perform common "
911
909
"commits."
912
910
msgstr ""
913
911
914
#: bzrlib/builtins.py:1597
912
#: bzrlib/builtins.py:1504
915
913
msgid "Get file contents from this tree."
916
914
msgstr ""
917
915
918
#: bzrlib/builtins.py:1599
916
#: bzrlib/builtins.py:1506
919
917
msgid "Hard-link working tree files where possible."
920
918
msgstr ""
921
919
922
#: bzrlib/builtins.py:1640
920
#: bzrlib/builtins.py:1547
923
921
msgid ""
924
922
"Show list of renamed files.\n"
925
923
" "
926
924
msgstr ""
927
925
928
#: bzrlib/builtins.py:1670
926
#: bzrlib/builtins.py:1577
929
927
msgid "Update a working tree to a new revision."
930
928
msgstr ""
931
929
932
#: bzrlib/builtins.py:1672
930
#: bzrlib/builtins.py:1579
933
931
msgid ""
934
932
"This will perform a merge of the destination revision (the tip of the\n"
935
933
"branch, or the specified revision) into the working tree, and then make\n"
936
934
"that revision the basis revision for the working tree. "
937
935
msgstr ""
938
936
939
#: bzrlib/builtins.py:1676
937
#: bzrlib/builtins.py:1583
940
938
msgid ""
941
939
"You can use this to visit an older revision, or to update a working tree\n"
942
940
"that is out of date from its branch."
943
941
msgstr ""
944
942
945
#: bzrlib/builtins.py:1679
943
#: bzrlib/builtins.py:1586
946
944
msgid ""
947
945
"If there are any uncommitted changes in the tree, they will be carried\n"
948
946
"across and remain as uncommitted changes after the update. To discard\n"
950
948
"with the changes brought in by the change in basis revision."
951
949
msgstr ""
952
950
953
#: bzrlib/builtins.py:1684
951
#: bzrlib/builtins.py:1591
954
952
msgid ""
955
953
"If the tree's branch is bound to a master branch, bzr will also update\n"
956
954
"the branch from the master."
957
955
msgstr ""
958
956
959
#: bzrlib/builtins.py:1687
957
#: bzrlib/builtins.py:1594
960
958
msgid ""
961
959
"You cannot update just a single file or directory, because each Bazaar\n"
962
960
"working tree has just a single basis revision. If you want to restore a\n"
966
964
"out the old content of that file to a new location."
967
965
msgstr ""
968
966
969
#: bzrlib/builtins.py:1694
967
#: bzrlib/builtins.py:1601
970
968
msgid ""
971
969
"The 'dir' argument, if given, must be the location of the root of a\n"
972
970
"working tree to update. By default, the working tree that contains the \n"
973
971
"current working directory is used."
974
972
msgstr ""
975
973
976
#: bzrlib/builtins.py:1710
974
#: bzrlib/builtins.py:1617
977
975
msgid "bzr update --revision takes exactly one revision"
978
976
msgstr ""
979
977
980
#: bzrlib/builtins.py:1718
978
#: bzrlib/builtins.py:1625
981
979
msgid "bzr update can only update a whole tree, not a file or subdirectory"
982
980
msgstr ""
983
981
984
#: bzrlib/builtins.py:1749
982
#: bzrlib/builtins.py:1656
985
983
msgid "Tree is up to date at revision {0} of branch {1}"
986
984
msgstr ""
987
985
988
#: bzrlib/builtins.py:1765
986
#: bzrlib/builtins.py:1672
989
987
#, python-format
990
988
msgid ""
991
989
"branch has no revision %s\n"
992
990
"bzr update --revision only works for a revision in the branch history"
993
991
msgstr ""
994
992
995
#: bzrlib/builtins.py:1771
993
#: bzrlib/builtins.py:1678
996
994
msgid "Updated to revision {0} of branch {1}"
997
995
msgstr ""
998
996
999
#: bzrlib/builtins.py:1775
997
#: bzrlib/builtins.py:1682
1000
998
msgid ""
1001
999
"Your local commits will now show as pending merges with 'bzr status', and "
1002
1000
"can be committed with 'bzr commit'."
1003
1001
msgstr ""
1004
1002
1005
#: bzrlib/builtins.py:1784
1003
#: bzrlib/builtins.py:1691
1006
1004
msgid "Show information about a working tree, branch or repository."
1007
1005
msgstr ""
1008
1006
1009
#: bzrlib/builtins.py:1786
1007
#: bzrlib/builtins.py:1693
1010
1008
msgid ""
1011
1009
"This command will show all known locations and formats associated to the\n"
1012
1010
"tree, branch or repository."
1013
1011
msgstr ""
1014
1012
1015
#: bzrlib/builtins.py:1789
1013
#: bzrlib/builtins.py:1696
1016
1014
msgid ""
1017
1015
"In verbose mode, statistical information is included with each report.\n"
1018
1016
"To see extended statistic information, use a verbosity level of 2 or\n"
1019
1017
"higher by specifying the verbose option multiple times, e.g. -vv."
1020
1018
msgstr ""
1021
1019
1022
#: bzrlib/builtins.py:1793
1020
#: bzrlib/builtins.py:1700
1023
1021
msgid "Branches and working trees will also report any missing revisions."
1024
1022
msgstr ""
1025
1023
1026
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1027
#: bzrlib/builtins.py:6442
1024
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
1025
#: bzrlib/builtins.py:6389
1028
1026
msgid ":Examples:"
1029
1027
msgstr ""
1030
1028
1031
#: bzrlib/builtins.py:1797
1029
#: bzrlib/builtins.py:1704
1032
1030
msgid " Display information on the format and related locations:"
1033
1031
msgstr ""
1034
1032
1035
#: bzrlib/builtins.py:1799
1033
#: bzrlib/builtins.py:1706
1036
1034
msgid " bzr info"
1037
1035
msgstr ""
1038
1036
1039
#: bzrlib/builtins.py:1801
1037
#: bzrlib/builtins.py:1708
1040
1038
msgid ""
1041
1039
" Display the above together with extended format information and\n"
1042
1040
" basic statistics (like the number of files in the working tree and\n"
1043
1041
" number of revisions in the branch and repository):"
1044
1042
msgstr ""
1045
1043
1046
#: bzrlib/builtins.py:1805
1044
#: bzrlib/builtins.py:1712
1047
1045
msgid " bzr info -v"
1048
1046
msgstr ""
1049
1047
1050
#: bzrlib/builtins.py:1807
1048
#: bzrlib/builtins.py:1714
1051
1049
msgid " Display the above together with number of committers to the branch:"
1052
1050
msgstr ""
1053
1051
1054
#: bzrlib/builtins.py:1809
1052
#: bzrlib/builtins.py:1716
1055
1053
msgid " bzr info -vv"
1056
1054
msgstr ""
1057
1055
1058
#: bzrlib/builtins.py:1828
1056
#: bzrlib/builtins.py:1735
1059
1057
msgid "Remove files or directories."
1060
1058
msgstr ""
1061
1059
1062
#: bzrlib/builtins.py:1830
1060
#: bzrlib/builtins.py:1737
1063
1061
msgid ""
1064
1062
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1065
1063
"delete them if they can easily be recovered using revert otherwise they\n"
1068
1066
"Bazaar but missing in your tree and stop tracking them for you."
1069
1067
msgstr ""
1070
1068
1071
#: bzrlib/builtins.py:1838
1069
#: bzrlib/builtins.py:1745
1072
1070
msgid "Only remove files that have never been committed."
1073
1071
msgstr ""
1074
1072
1075
#: bzrlib/builtins.py:1840
1073
#: bzrlib/builtins.py:1747
1076
1074
msgid "The file deletion mode to be used."
1077
1075
msgstr ""
1078
1076
1079
#: bzrlib/builtins.py:1841
1077
#: bzrlib/builtins.py:1748
1080
1078
msgid "Deletion Strategy"
1081
1079
msgstr ""
1082
1080
1083
#: bzrlib/builtins.py:1842
1081
#: bzrlib/builtins.py:1749
1084
1082
msgid "Backup changed files (default)."
1085
1083
msgstr ""
1086
1084
1087
#: bzrlib/builtins.py:1843
1085
#: bzrlib/builtins.py:1750
1088
1086
msgid "Delete from bzr but leave the working copy."
1089
1087
msgstr ""
1090
1088
1091
#: bzrlib/builtins.py:1844
1089
#: bzrlib/builtins.py:1751
1092
1090
msgid "Don't backup changed files."
1093
1091
msgstr ""
1094
1092
1095
#: bzrlib/builtins.py:1845
1093
#: bzrlib/builtins.py:1752
1096
1094
msgid ""
1097
1095
"Delete all the specified files, even if they can not be recovered and even "
1098
1096
"if they are non-empty directories. (deprecated, use no-backup)"
1099
1097
msgstr ""
1100
1098
1101
#: bzrlib/builtins.py:1854
1099
#: bzrlib/builtins.py:1761
1102
1100
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1103
1101
msgstr ""
1104
1102
1105
#: bzrlib/builtins.py:1871
1103
#: bzrlib/builtins.py:1778
1106
1104
msgid "No matching files."
1107
1105
msgstr ""
1108
1106
1109
#: bzrlib/builtins.py:1932
1107
#: bzrlib/builtins.py:1839
1110
1108
msgid "Reconcile bzr metadata in a branch."
1111
1109
msgstr ""
1112
1110
1113
#: bzrlib/builtins.py:1934
1111
#: bzrlib/builtins.py:1841
1114
1112
msgid ""
1115
1113
"This can correct data mismatches that may have been caused by\n"
1116
1114
"previous ghost operations or bzr upgrades. You should only\n"
1118
1116
"advises you to run it."
1119
1117
msgstr ""
1120
1118
1121
#: bzrlib/builtins.py:1939
1119
#: bzrlib/builtins.py:1846
1122
1120
msgid ""
1123
1121
"If a second branch is provided, cross-branch reconciliation is\n"
1124
1122
"also attempted, which will check that data like the tree root\n"
1126
1124
"correctly in both branches."
1127
1125
msgstr ""
1128
1126
1129
#: bzrlib/builtins.py:1944
1127
#: bzrlib/builtins.py:1851
1130
1128
msgid ""
1131
1129
"At the same time it is run it may recompress data resulting in\n"
1132
1130
"a potential saving in disk space or performance gain."
1133
1131
msgstr ""
1134
1132
1135
#: bzrlib/builtins.py:1947
1133
#: bzrlib/builtins.py:1854
1136
1134
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1137
1135
msgstr ""
1138
1136
1139
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1137
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1140
1138
msgid ""
1141
1139
"Format for the bzr 2.0 series.\n"
1142
1140
"Uses group-compress storage.\n"
1143
1141
"Provides rich roots which are a one-way transition.\n"
1144
1142
msgstr ""
1145
1143
1146
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1144
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1147
1145
msgid ""
1148
1146
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1149
1147
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1150
1148
msgstr ""
1151
1149
1152
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1150
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1153
1151
msgid "The 2a format with experimental support for colocated branches.\n"
1154
1152
msgstr ""
1155
1153
1156
#: bzrlib/builtins.py:2015
1154
#: bzrlib/builtins.py:1922
1157
1155
msgid "Make a directory into a versioned branch."
1158
1156
msgstr ""
1159
1157
1160
#: bzrlib/builtins.py:2017
1158
#: bzrlib/builtins.py:1924
1161
1159
msgid ""
1162
1160
"Use this to create an empty branch, or before importing an\n"
1163
1161
"existing project."
1164
1162
msgstr ""
1165
1163
1166
#: bzrlib/builtins.py:2020
1164
#: bzrlib/builtins.py:1927
1167
1165
msgid ""
1168
1166
"If there is a repository in a parent directory of the location, then\n"
1169
1167
"the history of the branch will be stored in the repository. Otherwise\n"
1171
1169
"in the .bzr directory."
1172
1170
msgstr ""
1173
1171
1174
#: bzrlib/builtins.py:2025
1172
#: bzrlib/builtins.py:1932
1175
1173
msgid ""
1176
1174
"If there is already a branch at the location but it has no working tree,\n"
1177
1175
"the tree can be populated with 'bzr checkout'."
1178
1176
msgstr ""
1179
1177
1180
#: bzrlib/builtins.py:2028
1178
#: bzrlib/builtins.py:1935
1181
1179
msgid "Recipe for importing a tree of files::"
1182
1180
msgstr ""
1183
1181
1184
#: bzrlib/builtins.py:2030
1182
#: bzrlib/builtins.py:1937
1185
1183
msgid ""
1186
1184
" cd ~/project\n"
1187
1185
" bzr init\n"
1190
1188
" bzr commit -m \"imported project\""
1191
1189
msgstr ""
1192
1190
1193
#: bzrlib/builtins.py:2041
1191
#: bzrlib/builtins.py:1948
1194
1192
msgid ""
1195
1193
"Create the path leading up to the branch if it does not already exist."
1196
1194
msgstr ""
1197
1195
1198
#: bzrlib/builtins.py:2044
1196
#: bzrlib/builtins.py:1951
1199
1197
msgid "Specify a format for this branch. See \"help formats\"."
1200
1198
msgstr ""
1201
1199
1202
#: bzrlib/builtins.py:2052
1200
#: bzrlib/builtins.py:1959
1203
1201
msgid ""
1204
1202
"Never change revnos or the existing log. Append revisions to it only."
1205
1203
msgstr ""
1206
1204
1207
#: bzrlib/builtins.py:2055
1205
#: bzrlib/builtins.py:1962
1208
1206
msgid "Create a branch without a working tree."
1209
1207
msgstr ""
1210
1208
1211
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1209
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1212
1210
#, python-format
1213
1211
msgid ""
1214
1212
"Parent directory of %s does not exist.\n"
1215
1213
"You may supply --create-prefix to create all leading parent directories."
1216
1214
msgstr ""
1217
1215
1218
#: bzrlib/builtins.py:2109
1216
#: bzrlib/builtins.py:2016
1219
1217
msgid ""
1220
1218
"This branch format cannot be set to append-revisions-only. Try --default."
1221
1219
msgstr ""
1222
1220
1223
#: bzrlib/builtins.py:2120
1221
#: bzrlib/builtins.py:2027
1224
1222
msgid "Created a {0} (format: {1})\n"
1225
1223
msgstr ""
1226
1224
1227
#: bzrlib/builtins.py:2129
1225
#: bzrlib/builtins.py:2036
1228
1226
#, python-format
1229
1227
msgid "Using shared repository: %s\n"
1230
1228
msgstr ""
1231
1229
1232
#: bzrlib/builtins.py:2133
1230
#: bzrlib/builtins.py:2040
1233
1231
msgid "Create a shared repository for branches to share storage space."
1234
1232
msgstr ""
1235
1233
1236
#: bzrlib/builtins.py:2135
1234
#: bzrlib/builtins.py:2042
1237
1235
msgid ""
1238
1236
"New branches created under the repository directory will store their\n"
1239
1237
"revisions in the repository, not in the branch directory. For branches\n"
1241
1239
"speeds up the creation of new branches."
1242
1240
msgstr ""
1243
1241
1244
#: bzrlib/builtins.py:2140
1242
#: bzrlib/builtins.py:2047
1245
1243
msgid ""
1246
1244
"If the --no-trees option is given then the branches in the repository\n"
1247
1245
"will not have working trees by default. They will still exist as \n"
1251
1249
"branches, such as on a server."
1252
1250
msgstr ""
1253
1251
1254
#: bzrlib/builtins.py:2147
1252
#: bzrlib/builtins.py:2054
1255
1253
msgid ""
1256
1254
":Examples:\n"
1257
1255
" Create a shared repository holding just branches::"
1258
1256
msgstr ""
1259
1257
1260
#: bzrlib/builtins.py:2150
1258
#: bzrlib/builtins.py:2057
1261
1259
msgid ""
1262
1260
" bzr init-repo --no-trees repo\n"
1263
1261
" bzr init repo/trunk"
1264
1262
msgstr ""
1265
1263
1266
#: bzrlib/builtins.py:2153
1264
#: bzrlib/builtins.py:2060
1267
1265
msgid " Make a lightweight checkout elsewhere::"
1268
1266
msgstr ""
1269
1267
1270
#: bzrlib/builtins.py:2155
1268
#: bzrlib/builtins.py:2062
1271
1269
msgid ""
1272
1270
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1273
1271
" cd trunk-checkout\n"
1274
1272
" (add files here)"
1275
1273
msgstr ""
1276
1274
1277
#: bzrlib/builtins.py:2163
1275
#: bzrlib/builtins.py:2070
1278
1276
msgid ""
1279
1277
"Specify a format for this repository. See \"bzr help formats\" for details."
1280
1278
msgstr ""
1281
1279
1282
#: bzrlib/builtins.py:2167
1280
#: bzrlib/builtins.py:2074
1283
1281
msgid "Repository format"
1284
1282
msgstr ""
1285
1283
1286
#: bzrlib/builtins.py:2169
1284
#: bzrlib/builtins.py:2076
1287
1285
msgid "Branches in the repository will default to not having a working tree."
1288
1286
msgstr ""
1289
1287
1290
#: bzrlib/builtins.py:2195
1288
#: bzrlib/builtins.py:2102
1291
1289
msgid "Show differences in the working tree, between revisions or branches."
1292
1290
msgstr ""
1293
1291
1294
#: bzrlib/builtins.py:2197
1292
#: bzrlib/builtins.py:2104
1295
1293
msgid ""
1296
1294
"If no arguments are given, all changes for the current tree are listed.\n"
1297
1295
"If files are given, only the changes in those files are listed.\n"
1301
1299
"given."
1302
1300
msgstr ""
1303
1301
1304
#: bzrlib/builtins.py:2204
1302
#: bzrlib/builtins.py:2111
1305
1303
msgid ""
1306
1304
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1307
1305
"produces patches suitable for \"patch -p1\"."
1308
1306
msgstr ""
1309
1307
1310
#: bzrlib/builtins.py:2207
1308
#: bzrlib/builtins.py:2114
1311
1309
msgid ""
1312
1310
"Note that when using the -r argument with a range of revisions, the\n"
1313
1311
"differences are computed between the two specified revisions. That\n"
1317
1315
"in the range."
1318
1316
msgstr ""
1319
1317
1320
#: bzrlib/builtins.py:2214
1318
#: bzrlib/builtins.py:2121
1321
1319
msgid ""
1322
1320
":Exit values:\n"
1323
1321
" 1 - changed\n"
1326
1324
" 0 - no change"
1327
1325
msgstr ""
1328
1326
1329
#: bzrlib/builtins.py:2220
1327
#: bzrlib/builtins.py:2127
1330
1328
msgid ""
1331
1329
":Examples:\n"
1332
1330
" Shows the difference in the working tree versus the last commit::"
1333
1331
msgstr ""
1334
1332
1335
#: bzrlib/builtins.py:2223
1333
#: bzrlib/builtins.py:2130
1336
1334
msgid " bzr diff"
1337
1335
msgstr ""
1338
1336
1339
#: bzrlib/builtins.py:2225
1337
#: bzrlib/builtins.py:2132
1340
1338
msgid " Difference between the working tree and revision 1::"
1341
1339
msgstr ""
1342
1340
1343
#: bzrlib/builtins.py:2227
1341
#: bzrlib/builtins.py:2134
1344
1342
msgid " bzr diff -r1"
1345
1343
msgstr ""
1346
1344
1347
#: bzrlib/builtins.py:2229
1345
#: bzrlib/builtins.py:2136
1348
1346
msgid " Difference between revision 3 and revision 1::"
1349
1347
msgstr ""
1350
1348
1351
#: bzrlib/builtins.py:2231
1349
#: bzrlib/builtins.py:2138
1352
1350
msgid " bzr diff -r1..3"
1353
1351
msgstr ""
1354
1352
1355
#: bzrlib/builtins.py:2233
1353
#: bzrlib/builtins.py:2140
1356
1354
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1357
1355
msgstr ""
1358
1356
1359
#: bzrlib/builtins.py:2235
1357
#: bzrlib/builtins.py:2142
1360
1358
msgid " bzr diff -r1..3 xxx"
1361
1359
msgstr ""
1362
1360
1363
#: bzrlib/builtins.py:2237
1361
#: bzrlib/builtins.py:2144
1364
1362
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1365
1363
msgstr ""
1366
1364
1367
#: bzrlib/builtins.py:2239
1365
#: bzrlib/builtins.py:2146
1368
1366
msgid " bzr diff -c2"
1369
1367
msgstr ""
1370
1368
1371
#: bzrlib/builtins.py:2241
1369
#: bzrlib/builtins.py:2148
1372
1370
msgid ""
1373
1371
" To see the changes introduced by revision X::\n"
1374
1372
" \n"
1375
1373
" bzr diff -cX"
1376
1374
msgstr ""
1377
1375
1378
#: bzrlib/builtins.py:2245
1376
#: bzrlib/builtins.py:2152
1379
1377
msgid ""
1380
1378
" Note that in the case of a merge, the -c option shows the changes\n"
1381
1379
" compared to the left hand parent. To see the changes against\n"
1382
1380
" another parent, use::"
1383
1381
msgstr ""
1384
1382
1385
#: bzrlib/builtins.py:2249
1383
#: bzrlib/builtins.py:2156
1386
1384
msgid " bzr diff -r<chosen_parent>..X"
1387
1385
msgstr ""
1388
1386
1389
#: bzrlib/builtins.py:2251
1387
#: bzrlib/builtins.py:2158
1390
1388
msgid ""
1391
1389
" The changes between the current revision and the previous revision\n"
1392
1390
" (equivalent to -c-1 and -r-2..-1)"
1393
1391
msgstr ""
1394
1392
1395
#: bzrlib/builtins.py:2254
1393
#: bzrlib/builtins.py:2161
1396
1394
msgid " bzr diff -r-2.."
1397
1395
msgstr ""
1398
1396
1399
#: bzrlib/builtins.py:2256
1397
#: bzrlib/builtins.py:2163
1400
1398
msgid " Show just the differences for file NEWS::"
1401
1399
msgstr ""
1402
1400
1403
#: bzrlib/builtins.py:2258
1401
#: bzrlib/builtins.py:2165
1404
1402
msgid " bzr diff NEWS"
1405
1403
msgstr ""
1406
1404
1407
#: bzrlib/builtins.py:2260
1405
#: bzrlib/builtins.py:2167
1408
1406
msgid " Show the differences in working tree xxx for file NEWS::"
1409
1407
msgstr ""
1410
1408
1411
#: bzrlib/builtins.py:2262
1409
#: bzrlib/builtins.py:2169
1412
1410
msgid " bzr diff xxx/NEWS"
1413
1411
msgstr ""
1414
1412
1415
#: bzrlib/builtins.py:2264
1413
#: bzrlib/builtins.py:2171
1416
1414
msgid " Show the differences from branch xxx to this working tree:"
1417
1415
msgstr ""
1418
1416
1419
#: bzrlib/builtins.py:2266
1417
#: bzrlib/builtins.py:2173
1420
1418
msgid " bzr diff --old xxx"
1421
1419
msgstr ""
1422
1420
1423
#: bzrlib/builtins.py:2268
1421
#: bzrlib/builtins.py:2175
1424
1422
msgid " Show the differences between two branches for file NEWS::"
1425
1423
msgstr ""
1426
1424
1427
#: bzrlib/builtins.py:2270
1425
#: bzrlib/builtins.py:2177
1428
1426
msgid " bzr diff --old xxx --new yyy NEWS"
1429
1427
msgstr ""
1430
1428
1431
#: bzrlib/builtins.py:2272
1429
#: bzrlib/builtins.py:2179
1432
1430
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1433
1431
msgstr ""
1434
1432
1435
#: bzrlib/builtins.py:2274
1433
#: bzrlib/builtins.py:2181
1436
1434
msgid ""
1437
1435
" bzr diff --prefix old/:new/\n"
1438
1436
" \n"
1441
1439
" bzr diff --using /usr/bin/diff --diff-options -wu"
1442
1440
msgstr ""
1443
1441
1444
#: bzrlib/builtins.py:2284
1442
#: bzrlib/builtins.py:2191
1445
1443
msgid "Pass these options to the external diff program."
1446
1444
msgstr ""
1447
1445
1448
#: bzrlib/builtins.py:2287
1446
#: bzrlib/builtins.py:2194
1449
1447
msgid ""
1450
1448
"Set prefixes added to old and new filenames, as two values separated by a "
1451
1449
"colon. (eg \"old/:new/\")."
1452
1450
msgstr ""
1453
1451
1454
#: bzrlib/builtins.py:2290
1452
#: bzrlib/builtins.py:2197
1455
1453
msgid "Branch/tree to compare from."
1456
1454
msgstr ""
1457
1455
1458
#: bzrlib/builtins.py:2294
1456
#: bzrlib/builtins.py:2201
1459
1457
msgid "Branch/tree to compare to."
1460
1458
msgstr ""
1461
1459
1462
#: bzrlib/builtins.py:2300
1460
#: bzrlib/builtins.py:2207
1463
1461
msgid "Use this command to compare files."
1464
1462
msgstr ""
1465
1463
1466
#: bzrlib/builtins.py:2305
1464
#: bzrlib/builtins.py:2212
1467
1465
msgid "Diff format to use."
1468
1466
msgstr ""
1469
1467
1470
#: bzrlib/builtins.py:2307
1468
#: bzrlib/builtins.py:2214
1471
1469
msgid "Diff format"
1472
1470
msgstr ""
1473
1471
1474
#: bzrlib/builtins.py:2329
1472
#: bzrlib/builtins.py:2236
1475
1473
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1476
1474
msgstr ""
1477
1475
1478
#: bzrlib/builtins.py:2333
1476
#: bzrlib/builtins.py:2240
1479
1477
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1480
1478
msgstr ""
1481
1479
1482
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1483
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1480
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1481
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1484
1482
msgid "{0} and {1} are mutually exclusive"
1485
1483
msgstr ""
1486
1484
1487
#: bzrlib/builtins.py:2358
1485
#: bzrlib/builtins.py:2265
1488
1486
msgid ""
1489
1487
"List files deleted in the working tree.\n"
1490
1488
" "
1491
1489
msgstr ""
1492
1490
1493
#: bzrlib/builtins.py:2436
1491
#: bzrlib/builtins.py:2343
1494
1492
msgid "Show the tree root directory."
1495
1493
msgstr ""
1496
1494
1497
#: bzrlib/builtins.py:2438
1495
#: bzrlib/builtins.py:2345
1498
1496
msgid ""
1499
1497
"The root is the nearest enclosing directory with a .bzr control\n"
1500
1498
"directory."
1501
1499
msgstr ""
1502
1500
1503
#: bzrlib/builtins.py:2453
1501
#: bzrlib/builtins.py:2360
1504
1502
msgid "The limit argument must be an integer."
1505
1503
msgstr ""
1506
1504
1507
#: bzrlib/builtins.py:2461
1505
#: bzrlib/builtins.py:2368
1508
1506
msgid "The levels argument must be an integer."
1509
1507
msgstr ""
1510
1508
1511
#: bzrlib/builtins.py:2466
1509
#: bzrlib/builtins.py:2373
1512
1510
msgid "Show historical log for a branch or subset of a branch."
1513
1511
msgstr ""
1514
1512
1515
#: bzrlib/builtins.py:2468
1513
#: bzrlib/builtins.py:2375
1516
1514
msgid ""
1517
1515
"log is bzr's default tool for exploring the history of a branch.\n"
1518
1516
"The branch to use is taken from the first parameter. If no parameters\n"
1520
1518
"Here are some simple examples::"
1521
1519
msgstr ""
1522
1520
1523
#: bzrlib/builtins.py:2473
1521
#: bzrlib/builtins.py:2380
1524
1522
msgid ""
1525
1523
" bzr log log the current branch\n"
1526
1524
" bzr log foo.py log a file in its branch\n"
1527
1525
" bzr log http://server/branch log a branch on a server"
1528
1526
msgstr ""
1529
1527
1530
#: bzrlib/builtins.py:2477
1528
#: bzrlib/builtins.py:2384
1531
1529
msgid ""
1532
1530
"The filtering, ordering and information shown for each revision can\n"
1533
1531
"be controlled as explained below. By default, all revisions are\n"
1537
1535
"were merged."
1538
1536
msgstr ""
1539
1537
1540
#: bzrlib/builtins.py:2484
1538
#: bzrlib/builtins.py:2391
1541
1539
msgid ":Output control:"
1542
1540
msgstr ""
1543
1541
1544
#: bzrlib/builtins.py:2486
1542
#: bzrlib/builtins.py:2393
1545
1543
msgid ""
1546
1544
" The log format controls how information about each revision is\n"
1547
1545
" displayed. The standard log formats are called ``long``, ``short``\n"
1549
1547
" for more details on log formats."
1550
1548
msgstr ""
1551
1549
1552
#: bzrlib/builtins.py:2491
1550
#: bzrlib/builtins.py:2398
1553
1551
msgid ""
1554
1552
" The following options can be used to control what information is\n"
1555
1553
" displayed::"
1556
1554
msgstr ""
1557
1555
1558
#: bzrlib/builtins.py:2494
1556
#: bzrlib/builtins.py:2401
1559
1557
msgid ""
1560
1558
" -l N display a maximum of N revisions\n"
1561
1559
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1564
1562
" --show-ids display revision-ids (and file-ids), not just revnos"
1565
1563
msgstr ""
1566
1564
1567
#: bzrlib/builtins.py:2500
1565
#: bzrlib/builtins.py:2407
1568
1566
msgid ""
1569
1567
" Note that the default number of levels to display is a function of the\n"
1570
1568
" log format. If the -n option is not used, the standard log formats show\n"
1571
1569
" just the top level (mainline)."
1572
1570
msgstr ""
1573
1571
1574
#: bzrlib/builtins.py:2504
1572
#: bzrlib/builtins.py:2411
1575
1573
msgid ""
1576
1574
" Status summaries are shown using status flags like A, M, etc. To see\n"
1577
1575
" the changes explained using words like ``added`` and ``modified``\n"
1578
1576
" instead, use the -vv option."
1579
1577
msgstr ""
1580
1578
1581
#: bzrlib/builtins.py:2508
1579
#: bzrlib/builtins.py:2415
1582
1580
msgid ":Ordering control:"
1583
1581
msgstr ""
1584
1582
1585
#: bzrlib/builtins.py:2510
1583
#: bzrlib/builtins.py:2417
1586
1584
msgid ""
1587
1585
" To display revisions from oldest to newest, use the --forward option.\n"
1588
1586
" In most cases, using this option will have little impact on the total\n"
1590
1588
" display revisions like --reverse does when it can."
1591
1589
msgstr ""
1592
1590
1593
#: bzrlib/builtins.py:2515
1591
#: bzrlib/builtins.py:2422
1594
1592
msgid ":Revision filtering:"
1595
1593
msgstr ""
1596
1594
1597
#: bzrlib/builtins.py:2517
1595
#: bzrlib/builtins.py:2424
1598
1596
msgid ""
1599
1597
" The -r option can be used to specify what revision or range of revisions\n"
1600
1598
" to filter against. The various forms are shown below::"
1601
1599
msgstr ""
1602
1600
1603
#: bzrlib/builtins.py:2520
1601
#: bzrlib/builtins.py:2427
1604
1602
msgid ""
1605
1603
" -rX display revision X\n"
1606
1604
" -rX.. display revision X and later\n"
1608
1606
" -rX..Y display from X to Y inclusive"
1609
1607
msgstr ""
1610
1608
1611
#: bzrlib/builtins.py:2525
1609
#: bzrlib/builtins.py:2432
1612
1610
msgid ""
1613
1611
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1614
1612
" Some common examples are given below::"
1615
1613
msgstr ""
1616
1614
1617
#: bzrlib/builtins.py:2528
1615
#: bzrlib/builtins.py:2435
1618
1616
msgid ""
1619
1617
" -r-1 show just the tip\n"
1620
1618
" -r-10.. show the last 10 mainline revisions\n"
1624
1622
" -rdate:yesterday.. show changes since yesterday"
1625
1623
msgstr ""
1626
1624
1627
#: bzrlib/builtins.py:2535
1625
#: bzrlib/builtins.py:2442
1628
1626
msgid ""
1629
1627
" When logging a range of revisions using -rX..Y, log starts at\n"
1630
1628
" revision Y and searches back in history through the primary\n"
1634
1632
" a nested merge revision and the log will be truncated accordingly."
1635
1633
msgstr ""
1636
1634
1637
#: bzrlib/builtins.py:2542
1635
#: bzrlib/builtins.py:2449
1638
1636
msgid ":Path filtering:"
1639
1637
msgstr ""
1640
1638
1641
#: bzrlib/builtins.py:2544
1639
#: bzrlib/builtins.py:2451
1642
1640
msgid ""
1643
1641
" If parameters are given and the first one is not a branch, the log\n"
1644
1642
" will be filtered to show only those revisions that changed the\n"
1645
1643
" nominated files or directories."
1646
1644
msgstr ""
1647
1645
1648
#: bzrlib/builtins.py:2548
1646
#: bzrlib/builtins.py:2455
1649
1647
msgid ""
1650
1648
" Filenames are interpreted within their historical context. To log a\n"
1651
1649
" deleted file, specify a revision range so that the file existed at\n"
1652
1650
" the end or start of the range."
1653
1651
msgstr ""
1654
1652
1655
#: bzrlib/builtins.py:2552
1653
#: bzrlib/builtins.py:2459
1656
1654
msgid ""
1657
1655
" Historical context is also important when interpreting pathnames of\n"
1658
1656
" renamed files/directories. Consider the following example:"
1659
1657
msgstr ""
1660
1658
1661
#: bzrlib/builtins.py:2555
1659
#: bzrlib/builtins.py:2462
1662
1660
msgid ""
1663
1661
" * revision 1: add tutorial.txt\n"
1664
1662
" * revision 2: modify tutorial.txt\n"
1665
1663
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1666
1664
msgstr ""
1667
1665
1668
#: bzrlib/builtins.py:2559
1666
#: bzrlib/builtins.py:2466
1669
1667
msgid " In this case:"
1670
1668
msgstr ""
1671
1669
1672
#: bzrlib/builtins.py:2561
1670
#: bzrlib/builtins.py:2468
1673
1671
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1674
1672
msgstr ""
1675
1673
1676
#: bzrlib/builtins.py:2563
1674
#: bzrlib/builtins.py:2470
1677
1675
msgid ""
1678
1676
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1679
1677
msgstr ""
1680
1678
1681
#: bzrlib/builtins.py:2565
1679
#: bzrlib/builtins.py:2472
1682
1680
msgid ""
1683
1681
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1684
1682
" the original file in revision 2."
1685
1683
msgstr ""
1686
1684
1687
#: bzrlib/builtins.py:2568
1685
#: bzrlib/builtins.py:2475
1688
1686
msgid ""
1689
1687
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1690
1688
" was no file called guide.txt in revision 2."
1691
1689
msgstr ""
1692
1690
1693
#: bzrlib/builtins.py:2571
1691
#: bzrlib/builtins.py:2478
1694
1692
msgid ""
1695
1693
" Renames are always followed by log. By design, there is no need to\n"
1696
1694
" explicitly ask for this (and no way to stop logging a file back\n"
1697
1695
" until it was last renamed)."
1698
1696
msgstr ""
1699
1697
1700
#: bzrlib/builtins.py:2575
1698
#: bzrlib/builtins.py:2482
1701
1699
msgid ":Other filtering:"
1702
1700
msgstr ""
1703
1701
1704
#: bzrlib/builtins.py:2577
1702
#: bzrlib/builtins.py:2484
1705
1703
msgid ""
1706
1704
" The --match option can be used for finding revisions that match a\n"
1707
1705
" regular expression in a commit message, committer, author or bug.\n"
1710
1708
" --match-message can be used to only match a specific field."
1711
1709
msgstr ""
1712
1710
1713
#: bzrlib/builtins.py:2583
1711
#: bzrlib/builtins.py:2490
1714
1712
msgid ":Tips & tricks:"
1715
1713
msgstr ""
1716
1714
1717
#: bzrlib/builtins.py:2585
1715
#: bzrlib/builtins.py:2492
1718
1716
msgid ""
1719
1717
" GUI tools and IDEs are often better at exploring history than command\n"
1720
1718
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1723
1721
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1724
1722
msgstr ""
1725
1723
1726
#: bzrlib/builtins.py:2591
1724
#: bzrlib/builtins.py:2498
1727
1725
msgid ""
1728
1726
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1729
1727
msgstr ""
1730
1728
1731
#: bzrlib/builtins.py:2593
1729
#: bzrlib/builtins.py:2500
1732
1730
msgid ""
1733
1731
" [ALIASES]\n"
1734
1732
" tip = log -r-1\n"
1736
1734
" show = log -v -p"
1737
1735
msgstr ""
1738
1736
1739
#: bzrlib/builtins.py:2598
1737
#: bzrlib/builtins.py:2505
1740
1738
msgid ""
1741
1739
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1742
1740
" will show the last 10 mainline revisions. To see the details of a\n"
1743
1741
" particular revision X, ``bzr show -rX``."
1744
1742
msgstr ""
1745
1743
1746
#: bzrlib/builtins.py:2602
1744
#: bzrlib/builtins.py:2509
1747
1745
msgid ""
1748
1746
" If you are interested in looking deeper into a particular merge X,\n"
1749
1747
" use ``bzr log -n0 -rX``."
1750
1748
msgstr ""
1751
1749
1752
#: bzrlib/builtins.py:2605
1750
#: bzrlib/builtins.py:2512
1753
1751
msgid ""
1754
1752
" ``bzr log -v`` on a branch with lots of history is currently\n"
1755
1753
" very slow. A fix for this issue is currently under development.\n"
1757
1755
" be given when using the -v option."
1758
1756
msgstr ""
1759
1757
1760
#: bzrlib/builtins.py:2610
1758
#: bzrlib/builtins.py:2517
1761
1759
msgid ""
1762
1760
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1763
1761
" used to find revisions matching user names, commit messages, etc.\n"
1765
1763
" a list of words but not others."
1766
1764
msgstr ""
1767
1765
1768
#: bzrlib/builtins.py:2615
1766
#: bzrlib/builtins.py:2522
1769
1767
msgid ""
1770
1768
" When exploring non-mainline history on large projects with deep\n"
1771
1769
" history, the performance of log can be greatly improved by installing\n"
1773
1771
" trading disk space for faster speed."
1774
1772
msgstr ""
1775
1773
1776
#: bzrlib/builtins.py:2624
1774
#: bzrlib/builtins.py:2531
1777
1775
msgid "Show from oldest to newest."
1778
1776
msgstr ""
1779
1777
1780
#: bzrlib/builtins.py:2627
1778
#: bzrlib/builtins.py:2534
1781
1779
msgid "Show files changed in each revision."
1782
1780
msgstr ""
1783
1781
1784
#: bzrlib/builtins.py:2633
1782
#: bzrlib/builtins.py:2540
1785
1783
msgid "Show just the specified revision. See also \"help revisionspec\"."
1786
1784
msgstr ""
1787
1785
1788
#: bzrlib/builtins.py:2637
1786
#: bzrlib/builtins.py:2544
1789
1787
msgid "What names to list as authors - first, all or committer."
1790
1788
msgstr ""
1791
1789
1792
#: bzrlib/builtins.py:2638
1790
#: bzrlib/builtins.py:2545
1793
1791
msgid "Authors"
1794
1792
msgstr ""
1795
1793
1796
#: bzrlib/builtins.py:2643
1794
#: bzrlib/builtins.py:2550
1797
1795
msgid "Number of levels to display - 0 for all, 1 for flat."
1798
1796
msgstr ""
1799
1797
1800
#: bzrlib/builtins.py:2653
1798
#: bzrlib/builtins.py:2560
1801
1799
msgid "Limit the output to the first N revisions."
1802
1800
msgstr ""
1803
1801
1804
#: bzrlib/builtins.py:2658
1802
#: bzrlib/builtins.py:2565
1805
1803
msgid "Show changes made in each revision as a patch."
1806
1804
msgstr ""
1807
1805
1808
#: bzrlib/builtins.py:2660
1806
#: bzrlib/builtins.py:2567
1809
1807
msgid "Show merged revisions like --levels 0 does."
1810
1808
msgstr ""
1811
1809
1812
#: bzrlib/builtins.py:2664
1810
#: bzrlib/builtins.py:2571
1813
1811
msgid "Do not report commits with more than one parent."
1814
1812
msgstr ""
1815
1813
1816
#: bzrlib/builtins.py:2666
1814
#: bzrlib/builtins.py:2573
1817
1815
msgid ""
1818
1816
"Display only the revisions that are not part of both ancestries (require -"
1819
1817
"rX..Y)."
1820
1818
msgstr ""
1821
1819
1822
#: bzrlib/builtins.py:2670
1820
#: bzrlib/builtins.py:2577
1823
1821
msgid "Show digital signature validity."
1824
1822
msgstr ""
1825
1823
1826
#: bzrlib/builtins.py:2673
1824
#: bzrlib/builtins.py:2580
1827
1825
msgid "Show revisions whose properties match this expression."
1828
1826
msgstr ""
1829
1827
1830
#: bzrlib/builtins.py:2677
1828
#: bzrlib/builtins.py:2584
1831
1829
msgid "Show revisions whose message matches this expression."
1832
1830
msgstr ""
1833
1831
1834
#: bzrlib/builtins.py:2681
1832
#: bzrlib/builtins.py:2588
1835
1833
msgid "Show revisions whose committer matches this expression."
1836
1834
msgstr ""
1837
1835
1838
#: bzrlib/builtins.py:2685
1836
#: bzrlib/builtins.py:2592
1839
1837
msgid "Show revisions whose authors match this expression."
1840
1838
msgstr ""
1841
1839
1842
#: bzrlib/builtins.py:2689
1840
#: bzrlib/builtins.py:2596
1843
1841
msgid "Show revisions whose bugs match this expression."
1844
1842
msgstr ""
1845
1843
1846
#: bzrlib/builtins.py:2743
1844
#: bzrlib/builtins.py:2650
1847
1845
msgid "--exclude-common-ancestry requires -r with two revisions"
1848
1846
msgstr ""
1849
1847
1850
#: bzrlib/builtins.py:2771
1848
#: bzrlib/builtins.py:2678
1851
1849
#, python-format
1852
1850
msgid "Path unknown at end or start of revision range: %s"
1853
1851
msgstr ""
1854
1852
1855
#: bzrlib/builtins.py:2888
1853
#: bzrlib/builtins.py:2795
1856
1854
#, python-format
1857
1855
msgid "bzr %s doesn't accept two revisions in different branches."
1858
1856
msgstr ""
1859
1857
1860
#: bzrlib/builtins.py:2904
1858
#: bzrlib/builtins.py:2811
1861
1859
#, python-format
1862
1860
msgid "bzr %s --revision takes one or two values."
1863
1861
msgstr ""
1864
1862
1865
#: bzrlib/builtins.py:2949
1863
#: bzrlib/builtins.py:2856
1866
1864
msgid ""
1867
1865
"List files in a tree.\n"
1868
1866
" "
1869
1867
msgstr ""
1870
1868
1871
#: bzrlib/builtins.py:2958
1869
#: bzrlib/builtins.py:2865
1872
1870
msgid "Recurse into subdirectories."
1873
1871
msgstr ""
1874
1872
1875
#: bzrlib/builtins.py:2960
1873
#: bzrlib/builtins.py:2867
1876
1874
msgid "Print paths relative to the root of the branch."
1877
1875
msgstr ""
1878
1876
1879
#: bzrlib/builtins.py:2962
1877
#: bzrlib/builtins.py:2869
1880
1878
msgid "Print unknown files."
1881
1879
msgstr ""
1882
1880
1883
#: bzrlib/builtins.py:2963
1881
#: bzrlib/builtins.py:2870
1884
1882
msgid "Print versioned files."
1885
1883
msgstr ""
1886
1884
1887
#: bzrlib/builtins.py:2966
1885
#: bzrlib/builtins.py:2873
1888
1886
msgid "Print ignored files."
1889
1887
msgstr ""
1890
1888
1891
#: bzrlib/builtins.py:2968
1889
#: bzrlib/builtins.py:2875
1892
1890
msgid "List entries of a particular kind: file, directory, symlink."
1893
1891
msgstr ""
1894
1892
1895
#: bzrlib/builtins.py:2981
1893
#: bzrlib/builtins.py:2888
1896
1894
msgid "invalid kind specified"
1897
1895
msgstr ""
1898
1896
1899
#: bzrlib/builtins.py:2984
1897
#: bzrlib/builtins.py:2891
1900
1898
msgid "Cannot set both --verbose and --null"
1901
1899
msgstr ""
1902
1900
1903
#: bzrlib/builtins.py:2993
1901
#: bzrlib/builtins.py:2900
1904
1902
msgid "cannot specify both --from-root and PATH"
1905
1903
msgstr ""
1906
1904
1907
#: bzrlib/builtins.py:3080
1905
#: bzrlib/builtins.py:2987
1908
1906
msgid "Ignore specified files or patterns."
1909
1907
msgstr ""
1910
1908
1911
#: bzrlib/builtins.py:3082
1909
#: bzrlib/builtins.py:2989
1912
1910
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1913
1911
msgstr ""
1914
1912
1915
#: bzrlib/builtins.py:3084
1913
#: bzrlib/builtins.py:2991
1916
1914
msgid ""
1917
1915
"If a .bzrignore file does not exist, the ignore command\n"
1918
1916
"will create one and add the specified files or patterns to the newly\n"
1921
1919
"the use of the ignore command will require an explicit add command."
1922
1920
msgstr ""
1923
1921
1924
#: bzrlib/builtins.py:3090
1922
#: bzrlib/builtins.py:2997
1925
1923
msgid ""
1926
1924
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1927
1925
"After adding, editing or deleting that file either indirectly by\n"
1929
1927
"it."
1930
1928
msgstr ""
1931
1929
1932
#: bzrlib/builtins.py:3095
1930
#: bzrlib/builtins.py:3002
1933
1931
msgid ""
1934
1932
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1935
1933
"the global ignore file can be found in the application data directory as\n"
1938
1936
"can be edited directly using an editor."
1939
1937
msgstr ""
1940
1938
1941
#: bzrlib/builtins.py:3101
1939
#: bzrlib/builtins.py:3008
1942
1940
msgid ""
1943
1941
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1944
1942
"precedence over regular ignores. Such exceptions are used to specify\n"
1945
1943
"files that should be versioned which would otherwise be ignored."
1946
1944
msgstr ""
1947
1945
1948
#: bzrlib/builtins.py:3105
1946
#: bzrlib/builtins.py:3012
1949
1947
msgid ""
1950
1948
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1951
1949
"precedence over the '!' exception patterns."
1952
1950
msgstr ""
1953
1951
1954
#: bzrlib/builtins.py:3108
1952
#: bzrlib/builtins.py:3015
1955
1953
msgid ""
1956
1954
":Notes: \n"
1957
1955
" \n"
1959
1957
" the shell on Unix."
1960
1958
msgstr ""
1961
1959
1962
#: bzrlib/builtins.py:3113
1960
#: bzrlib/builtins.py:3020
1963
1961
msgid ""
1964
1962
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1965
1963
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1966
1964
msgstr ""
1967
1965
1968
#: bzrlib/builtins.py:3116
1966
#: bzrlib/builtins.py:3023
1969
1967
msgid ""
1970
1968
":Examples:\n"
1971
1969
" Ignore the top level Makefile::"
1972
1970
msgstr ""
1973
1971
1974
#: bzrlib/builtins.py:3119
1972
#: bzrlib/builtins.py:3026
1975
1973
msgid " bzr ignore ./Makefile"
1976
1974
msgstr ""
1977
1975
1978
#: bzrlib/builtins.py:3121
1976
#: bzrlib/builtins.py:3028
1979
1977
msgid " Ignore .class files in all directories...::"
1980
1978
msgstr ""
1981
1979
1982
#: bzrlib/builtins.py:3123
1980
#: bzrlib/builtins.py:3030
1983
1981
msgid " bzr ignore \"*.class\""
1984
1982
msgstr ""
1985
1983
1986
#: bzrlib/builtins.py:3125
1984
#: bzrlib/builtins.py:3032
1987
1985
msgid " ...but do not ignore \"special.class\"::"
1988
1986
msgstr ""
1989
1987
1990
#: bzrlib/builtins.py:3127
1988
#: bzrlib/builtins.py:3034
1991
1989
msgid " bzr ignore \"!special.class\""
1992
1990
msgstr ""
1993
1991
1994
#: bzrlib/builtins.py:3129
1992
#: bzrlib/builtins.py:3036
1995
1993
msgid " Ignore files whose name begins with the \"#\" character::"
1996
1994
msgstr ""
1997
1995
1998
#: bzrlib/builtins.py:3131
1996
#: bzrlib/builtins.py:3038
1999
1997
msgid " bzr ignore \"RE:^#\""
2000
1998
msgstr ""
2001
1999
2002
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2000
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
2003
2001
msgid " Ignore .o files under the lib directory::"
2004
2002
msgstr ""
2005
2003
2006
#: bzrlib/builtins.py:3135
2004
#: bzrlib/builtins.py:3042
2007
2005
msgid " bzr ignore \"lib/**/*.o\""
2008
2006
msgstr ""
2009
2007
2010
#: bzrlib/builtins.py:3139
2008
#: bzrlib/builtins.py:3046
2011
2009
msgid " bzr ignore \"RE:lib/.*\\.o\""
2012
2010
msgstr ""
2013
2011
2014
#: bzrlib/builtins.py:3141
2012
#: bzrlib/builtins.py:3048
2015
2013
msgid " Ignore everything but the \"debian\" toplevel directory::"
2016
2014
msgstr ""
2017
2015
2018
#: bzrlib/builtins.py:3143
2016
#: bzrlib/builtins.py:3050
2019
2017
msgid ""
2020
2018
" bzr ignore \"RE:(?!debian/).*\"\n"
2021
2019
" \n"
2027
2025
" bzr ignore \"!!*~\""
2028
2026
msgstr ""
2029
2027
2030
#: bzrlib/builtins.py:3157
2028
#: bzrlib/builtins.py:3064
2031
2029
msgid "Display the default ignore rules that bzr uses."
2032
2030
msgstr ""
2033
2031
2034
#: bzrlib/builtins.py:3169
2032
#: bzrlib/builtins.py:3076
2035
2033
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2036
2034
msgstr ""
2037
2035
2038
#: bzrlib/builtins.py:3180
2036
#: bzrlib/builtins.py:3087
2039
2037
#, python-format
2040
2038
msgid "Invalid ignore pattern found. %s"
2041
2039
msgid_plural "Invalid ignore patterns found. %s"
2042
2040
msgstr[0] ""
2043
2041
msgstr[1] ""
2044
2042
2045
#: bzrlib/builtins.py:3189
2043
#: bzrlib/builtins.py:3096
2046
2044
msgid "NAME_PATTERN should not be an absolute path"
2047
2045
msgstr ""
2048
2046
2049
#: bzrlib/builtins.py:3202
2047
#: bzrlib/builtins.py:3109
2050
2048
#, python-format
2051
2049
msgid ""
2052
2050
"Warning: the following files are version controlled and match your ignore "
2056
2054
"them.\n"
2057
2055
msgstr ""
2058
2056
2059
#: bzrlib/builtins.py:3209
2057
#: bzrlib/builtins.py:3116
2060
2058
msgid "List ignored files and the patterns that matched them."
2061
2059
msgstr ""
2062
2060
2063
#: bzrlib/builtins.py:3211
2061
#: bzrlib/builtins.py:3118
2064
2062
msgid ""
2065
2063
"List all the ignored files and the ignore pattern that caused the file to\n"
2066
2064
"be ignored."
2067
2065
msgstr ""
2068
2066
2069
#: bzrlib/builtins.py:3214
2067
#: bzrlib/builtins.py:3121
2070
2068
msgid "Alternatively, to list just the files::"
2071
2069
msgstr ""
2072
2070
2073
#: bzrlib/builtins.py:3216
2071
#: bzrlib/builtins.py:3123
2074
2072
msgid " bzr ls --ignored"
2075
2073
msgstr ""
2076
2074
2077
#: bzrlib/builtins.py:3250
2075
#: bzrlib/builtins.py:3157
2078
2076
#, python-format
2079
2077
msgid "not a valid revision-number: %r"
2080
2078
msgstr ""
2081
2079
2082
#: bzrlib/builtins.py:3257
2080
#: bzrlib/builtins.py:3164
2083
2081
msgid ""
2084
2082
"Export current or past revision to a destination directory or archive."
2085
2083
msgstr ""
2086
2084
2087
#: bzrlib/builtins.py:3259
2085
#: bzrlib/builtins.py:3166
2088
2086
msgid "If no revision is specified this exports the last committed revision."
2089
2087
msgstr ""
2090
2088
2091
#: bzrlib/builtins.py:3261
2089
#: bzrlib/builtins.py:3168
2092
2090
msgid ""
2093
2091
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2094
2092
"given, try to find the format with the extension. If no extension\n"
2095
2093
"is found exports to a directory (equivalent to --format=dir)."
2096
2094
msgstr ""
2097
2095
2098
#: bzrlib/builtins.py:3265
2096
#: bzrlib/builtins.py:3172
2099
2097
msgid ""
2100
2098
"If root is supplied, it will be used as the root directory inside\n"
2101
2099
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2102
2100
"to the exported filename. The root option has no effect for 'dir' format."
2103
2101
msgstr ""
2104
2102
2105
#: bzrlib/builtins.py:3269
2103
#: bzrlib/builtins.py:3176
2106
2104
msgid ""
2107
2105
"If branch is omitted then the branch containing the current working\n"
2108
2106
"directory will be used."
2109
2107
msgstr ""
2110
2108
2111
#: bzrlib/builtins.py:3272
2109
#: bzrlib/builtins.py:3179
2112
2110
msgid ""
2113
2111
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2114
2112
msgstr ""
2115
2113
2116
#: bzrlib/builtins.py:3274
2114
#: bzrlib/builtins.py:3181
2117
2115
msgid ""
2118
2116
" ================= =========================\n"
2119
2117
" Supported formats Autodetected by extension\n"
2126
2124
" ================= ========================="
2127
2125
msgstr ""
2128
2126
2129
#: bzrlib/builtins.py:3288
2127
#: bzrlib/builtins.py:3195
2130
2128
msgid "Type of file to export to."
2131
2129
msgstr ""
2132
2130
2133
#: bzrlib/builtins.py:3291
2131
#: bzrlib/builtins.py:3198
2134
2132
msgid "Apply content filters to export the convenient form."
2135
2133
msgstr ""
2136
2134
2137
#: bzrlib/builtins.py:3295
2135
#: bzrlib/builtins.py:3202
2138
2136
msgid "Name of the root directory inside the exported file."
2139
2137
msgstr ""
2140
2138
2141
#: bzrlib/builtins.py:3297
2139
#: bzrlib/builtins.py:3204
2142
2140
msgid ""
2143
2141
"Set modification time of files to that of the last revision in which it was "
2144
2142
"changed."
2145
2143
msgstr ""
2146
2144
2147
#: bzrlib/builtins.py:3300
2145
#: bzrlib/builtins.py:3207
2148
2146
msgid ""
2149
2147
"Export the working tree contents rather than that of the last revision."
2150
2148
msgstr ""
2151
2149
2152
#: bzrlib/builtins.py:3319
2150
#: bzrlib/builtins.py:3226
2153
2151
msgid "--uncommitted requires a working tree"
2154
2152
msgstr ""
2155
2153
2156
#: bzrlib/builtins.py:3328
2154
#: bzrlib/builtins.py:3235
2157
2155
#, python-format
2158
2156
msgid "Unsupported export format: %s"
2159
2157
msgstr ""
2160
2158
2161
#: bzrlib/builtins.py:3332
2159
#: bzrlib/builtins.py:3239
2162
2160
msgid ""
2163
2161
"Write the contents of a file as of a given revision to standard output."
2164
2162
msgstr ""
2165
2163
2166
#: bzrlib/builtins.py:3334
2164
#: bzrlib/builtins.py:3241
2167
2165
msgid "If no revision is nominated, the last revision is used."
2168
2166
msgstr ""
2169
2167
2170
#: bzrlib/builtins.py:3336
2168
#: bzrlib/builtins.py:3243
2171
2169
msgid ""
2172
2170
"Note: Take care to redirect standard output when using this command on a\n"
2173
2171
"binary file."
2174
2172
msgstr ""
2175
2173
2176
#: bzrlib/builtins.py:3342
2174
#: bzrlib/builtins.py:3249
2177
2175
msgid "The path name in the old tree."
2178
2176
msgstr ""
2179
2177
2180
#: bzrlib/builtins.py:3343
2178
#: bzrlib/builtins.py:3250
2181
2179
msgid "Apply content filters to display the convenience form."
2182
2180
msgstr ""
2183
2181
2184
#: bzrlib/builtins.py:3354
2182
#: bzrlib/builtins.py:3261
2185
2183
msgid "bzr cat --revision takes exactly one revision specifier"
2186
2184
msgstr ""
2187
2185
2188
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2186
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2189
2187
msgid "{0!r} is not present in revision {1}"
2190
2188
msgstr ""
2191
2189
2192
#: bzrlib/builtins.py:3414
2190
#: bzrlib/builtins.py:3321
2193
2191
msgid "Commit changes into a new revision."
2194
2192
msgstr ""
2195
2193
2196
#: bzrlib/builtins.py:3416
2194
#: bzrlib/builtins.py:3323
2197
2195
msgid ""
2198
2196
"An explanatory message needs to be given for each commit. This is\n"
2199
2197
"often done by using the --message option (getting the message from the\n"
2203
2201
"boilerplate text loaded into the editor, use the --show-diff option."
2204
2202
msgstr ""
2205
2203
2206
#: bzrlib/builtins.py:3423
2204
#: bzrlib/builtins.py:3330
2207
2205
msgid ""
2208
2206
"By default, the entire tree is committed and the person doing the\n"
2209
2207
"commit is assumed to be the author. These defaults can be overridden\n"
2210
2208
"as explained below."
2211
2209
msgstr ""
2212
2210
2213
#: bzrlib/builtins.py:3427
2211
#: bzrlib/builtins.py:3334
2214
2212
msgid ":Selective commits:"
2215
2213
msgstr ""
2216
2214
2217
#: bzrlib/builtins.py:3429
2215
#: bzrlib/builtins.py:3336
2218
2216
msgid ""
2219
2217
" If selected files are specified, only changes to those files are\n"
2220
2218
" committed. If a directory is specified then the directory and\n"
2221
2219
" everything within it is committed."
2222
2220
msgstr ""
2223
2221
2224
#: bzrlib/builtins.py:3433
2222
#: bzrlib/builtins.py:3340
2225
2223
msgid ""
2226
2224
" When excludes are given, they take precedence over selected files.\n"
2227
2225
" For example, to commit only changes within foo, but not changes\n"
2228
2226
" within foo/bar::"
2229
2227
msgstr ""
2230
2228
2231
#: bzrlib/builtins.py:3437
2229
#: bzrlib/builtins.py:3344
2232
2230
msgid " bzr commit foo -x foo/bar"
2233
2231
msgstr ""
2234
2232
2235
#: bzrlib/builtins.py:3439
2233
#: bzrlib/builtins.py:3346
2236
2234
msgid " A selective commit after a merge is not yet supported."
2237
2235
msgstr ""
2238
2236
2239
#: bzrlib/builtins.py:3441
2237
#: bzrlib/builtins.py:3348
2240
2238
msgid ":Custom authors:"
2241
2239
msgstr ""
2242
2240
2243
#: bzrlib/builtins.py:3443
2241
#: bzrlib/builtins.py:3350
2244
2242
msgid ""
2245
2243
" If the author of the change is not the same person as the committer,\n"
2246
2244
" you can specify the author's name using the --author option. The\n"
2250
2248
" author."
2251
2249
msgstr ""
2252
2250
2253
#: bzrlib/builtins.py:3450
2251
#: bzrlib/builtins.py:3357
2254
2252
msgid ":Checks:"
2255
2253
msgstr ""
2256
2254
2257
#: bzrlib/builtins.py:3452
2255
#: bzrlib/builtins.py:3359
2258
2256
msgid ""
2259
2257
" A common mistake is to forget to add a new file or directory before\n"
2260
2258
" running the commit command. The --strict option checks for unknown\n"
2263
2261
" for details."
2264
2262
msgstr ""
2265
2263
2266
#: bzrlib/builtins.py:3458
2264
#: bzrlib/builtins.py:3365
2267
2265
msgid ":Things to note:"
2268
2266
msgstr ""
2269
2267
2270
#: bzrlib/builtins.py:3460
2268
#: bzrlib/builtins.py:3367
2271
2269
msgid ""
2272
2270
" If you accidentially commit the wrong changes or make a spelling\n"
2273
2271
" mistake in the commit message say, you can use the uncommit command\n"
2274
2272
" to undo it. See ``bzr help uncommit`` for details."
2275
2273
msgstr ""
2276
2274
2277
#: bzrlib/builtins.py:3464
2275
#: bzrlib/builtins.py:3371
2278
2276
msgid ""
2279
2277
" Hooks can also be configured to run after a commit. This allows you\n"
2280
2278
" to trigger updates to external systems like bug trackers. The --fixes\n"
2282
2280
" one or more bugs. See ``bzr help bugs`` for details."
2283
2281
msgstr ""
2284
2282
2285
#: bzrlib/builtins.py:3474
2283
#: bzrlib/builtins.py:3381
2286
2284
msgid "Do not consider changes made to a given path."
2287
2285
msgstr ""
2288
2286
2289
#: bzrlib/builtins.py:3477
2287
#: bzrlib/builtins.py:3384
2290
2288
msgid "Description of the new revision."
2291
2289
msgstr ""
2292
2290
2293
#: bzrlib/builtins.py:3480
2291
#: bzrlib/builtins.py:3387
2294
2292
msgid "Commit even if nothing has changed."
2295
2293
msgstr ""
2296
2294
2297
#: bzrlib/builtins.py:3484
2295
#: bzrlib/builtins.py:3391
2298
2296
msgid "Take commit message from this file."
2299
2297
msgstr ""
2300
2298
2301
#: bzrlib/builtins.py:3486
2299
#: bzrlib/builtins.py:3393
2302
2300
msgid "Refuse to commit if there are unknown files in the working tree."
2303
2301
msgstr ""
2304
2302
2305
#: bzrlib/builtins.py:3489
2303
#: bzrlib/builtins.py:3396
2306
2304
msgid ""
2307
2305
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2308
2306
"08:00:00 +0100'."
2309
2307
msgstr ""
2310
2308
2311
#: bzrlib/builtins.py:3492
2309
#: bzrlib/builtins.py:3399
2312
2310
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2313
2311
msgstr ""
2314
2312
2315
#: bzrlib/builtins.py:3495
2313
#: bzrlib/builtins.py:3402
2316
2314
msgid "Set the author's name, if it's different from the committer."
2317
2315
msgstr ""
2318
2316
2319
#: bzrlib/builtins.py:3498
2317
#: bzrlib/builtins.py:3405
2320
2318
msgid ""
2321
2319
"Perform a local commit in a bound branch. Local commits are not pushed to "
2322
2320
"the master branch until a normal commit is performed."
2323
2321
msgstr ""
2324
2322
2325
#: bzrlib/builtins.py:3504
2323
#: bzrlib/builtins.py:3411
2326
2324
msgid ""
2327
2325
"When no message is supplied, show the diff along with the status summary in "
2328
2326
"the message editor."
2329
2327
msgstr ""
2330
2328
2331
#: bzrlib/builtins.py:3507
2329
#: bzrlib/builtins.py:3414
2332
2330
msgid ""
2333
2331
"When committing to a foreign version control system do not push data that "
2334
2332
"can not be natively represented."
2335
2333
msgstr ""
2336
2334
2337
#: bzrlib/builtins.py:3525
2335
#: bzrlib/builtins.py:3432
2338
2336
#, python-format
2339
2337
msgid ""
2340
2338
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2342
2340
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2343
2341
msgstr ""
2344
2342
2345
#: bzrlib/builtins.py:3534
2343
#: bzrlib/builtins.py:3441
2346
2344
#, python-format
2347
2345
msgid ""
2348
2346
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2350
2348
"Commit refused."
2351
2349
msgstr ""
2352
2350
2353
#: bzrlib/builtins.py:3543
2351
#: bzrlib/builtins.py:3450
2354
2352
#, python-format
2355
2353
msgid "Unrecognized bug %s. Commit refused."
2356
2354
msgstr ""
2357
2355
2358
#: bzrlib/builtins.py:3546
2356
#: bzrlib/builtins.py:3453
2359
2357
#, python-format
2360
2358
msgid ""
2361
2359
"%s\n"
2362
2360
"Commit refused."
2363
2361
msgstr ""
2364
2362
2365
#: bzrlib/builtins.py:3570
2363
#: bzrlib/builtins.py:3477
2366
2364
msgid "Could not parse --commit-time: "
2367
2365
msgstr ""
2368
2366
2369
#: bzrlib/builtins.py:3610
2367
#: bzrlib/builtins.py:3517
2370
2368
msgid "please specify either --message or --file"
2371
2369
msgstr ""
2372
2370
2373
#: bzrlib/builtins.py:3639
2371
#: bzrlib/builtins.py:3546
2374
2372
msgid "please specify a commit message with either --message or --file"
2375
2373
msgstr ""
2376
2374
2377
#: bzrlib/builtins.py:3642
2375
#: bzrlib/builtins.py:3549
2378
2376
msgid ""
2379
2377
"Empty commit message specified. Please specify a commit message with either -"
2380
2378
"-message or --file or leave a blank message with --message \"\"."
2381
2379
msgstr ""
2382
2380
2383
#: bzrlib/builtins.py:3662
2381
#: bzrlib/builtins.py:3569
2384
2382
msgid ""
2385
2383
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2386
2384
"-unchanged to force an empty commit."
2387
2385
msgstr ""
2388
2386
2389
#: bzrlib/builtins.py:3666
2387
#: bzrlib/builtins.py:3573
2390
2388
msgid ""
2391
2389
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2392
2390
"resolve FILE\" to resolve."
2393
2391
msgstr ""
2394
2392
2395
#: bzrlib/builtins.py:3670
2393
#: bzrlib/builtins.py:3577
2396
2394
msgid "Commit refused because there are unknown files in the working tree."
2397
2395
msgstr ""
2398
2396
2399
#: bzrlib/builtins.py:3673
2397
#: bzrlib/builtins.py:3580
2400
2398
msgid ""
2401
2399
"\n"
2402
2400
"To commit to master branch, run update and then commit.\n"
2403
2401
"You can also pass --local to commit to continue working disconnected."
2404
2402
msgstr ""
2405
2403
2406
#: bzrlib/builtins.py:3681
2404
#: bzrlib/builtins.py:3588
2407
2405
msgid ""
2408
2406
"Validate working tree structure, branch consistency and repository history."
2409
2407
msgstr ""
2410
2408
2411
#: bzrlib/builtins.py:3683
2409
#: bzrlib/builtins.py:3590
2412
2410
msgid ""
2413
2411
"This command checks various invariants about branch and repository storage\n"
2414
2412
"to detect data corruption or bzr bugs."
2415
2413
msgstr ""
2416
2414
2417
#: bzrlib/builtins.py:3686
2415
#: bzrlib/builtins.py:3593
2418
2416
msgid ""
2419
2417
"The working tree and branch checks will only give output if a problem is\n"
2420
2418
"detected. The output fields of the repository check are:"
2421
2419
msgstr ""
2422
2420
2423
#: bzrlib/builtins.py:3689
2421
#: bzrlib/builtins.py:3596
2424
2422
msgid ""
2425
2423
"revisions\n"
2426
2424
" This is just the number of revisions checked. It doesn't\n"
2427
2425
" indicate a problem."
2428
2426
msgstr ""
2429
2427
2430
#: bzrlib/builtins.py:3693
2428
#: bzrlib/builtins.py:3600
2431
2429
msgid ""
2432
2430
"versionedfiles\n"
2433
2431
" This is just the number of versionedfiles checked. It\n"
2434
2432
" doesn't indicate a problem."
2435
2433
msgstr ""
2436
2434
2437
#: bzrlib/builtins.py:3697
2435
#: bzrlib/builtins.py:3604
2438
2436
msgid ""
2439
2437
"unreferenced ancestors\n"
2440
2438
" Texts that are ancestors of other texts, but\n"
2442
2440
" subtle problem that Bazaar can work around."
2443
2441
msgstr ""
2444
2442
2445
#: bzrlib/builtins.py:3702
2443
#: bzrlib/builtins.py:3609
2446
2444
msgid ""
2447
2445
"unique file texts\n"
2448
2446
" This is the total number of unique file contents\n"
2449
2447
" seen in the checked revisions. It does not indicate a problem."
2450
2448
msgstr ""
2451
2449
2452
#: bzrlib/builtins.py:3706
2450
#: bzrlib/builtins.py:3613
2453
2451
msgid ""
2454
2452
"repeated file texts\n"
2455
2453
" This is the total number of repeated texts seen\n"
2458
2456
" indicate a problem."
2459
2457
msgstr ""
2460
2458
2461
#: bzrlib/builtins.py:3712
2459
#: bzrlib/builtins.py:3619
2462
2460
msgid ""
2463
2461
"If no restrictions are specified, all Bazaar data that is found at the "
2464
2462
"given\n"
2465
2463
"location will be checked."
2466
2464
msgstr ""
2467
2465
2468
#: bzrlib/builtins.py:3717
2466
#: bzrlib/builtins.py:3624
2469
2467
msgid " Check the tree and branch at 'foo'::"
2470
2468
msgstr ""
2471
2469
2472
#: bzrlib/builtins.py:3719
2470
#: bzrlib/builtins.py:3626
2473
2471
msgid " bzr check --tree --branch foo"
2474
2472
msgstr ""
2475
2473
2476
#: bzrlib/builtins.py:3721
2474
#: bzrlib/builtins.py:3628
2477
2475
msgid " Check only the repository at 'bar'::"
2478
2476
msgstr ""
2479
2477
2480
#: bzrlib/builtins.py:3723
2478
#: bzrlib/builtins.py:3630
2481
2479
msgid " bzr check --repo bar"
2482
2480
msgstr ""
2483
2481
2484
#: bzrlib/builtins.py:3725
2482
#: bzrlib/builtins.py:3632
2485
2483
msgid " Check everything at 'baz'::"
2486
2484
msgstr ""
2487
2485
2488
#: bzrlib/builtins.py:3727
2486
#: bzrlib/builtins.py:3634
2489
2487
msgid " bzr check baz"
2490
2488
msgstr ""
2491
2489
2492
#: bzrlib/builtins.py:3733
2490
#: bzrlib/builtins.py:3640
2493
2491
msgid "Check the branch related to the current directory."
2494
2492
msgstr ""
2495
2493
2496
#: bzrlib/builtins.py:3735
2494
#: bzrlib/builtins.py:3642
2497
2495
msgid "Check the repository related to the current directory."
2498
2496
msgstr ""
2499
2497
2500
#: bzrlib/builtins.py:3737
2498
#: bzrlib/builtins.py:3644
2501
2499
msgid "Check the working tree related to the current directory."
2502
2500
msgstr ""
2503
2501
2504
#: bzrlib/builtins.py:3751
2502
#: bzrlib/builtins.py:3658
2505
2503
msgid "Upgrade a repository, branch or working tree to a newer format."
2506
2504
msgstr ""
2507
2505
2508
#: bzrlib/builtins.py:3753
2506
#: bzrlib/builtins.py:3660
2509
2507
msgid ""
2510
2508
"When the default format has changed after a major new release of\n"
2511
2509
"Bazaar, you may be informed during certain operations that you\n"
2514
2512
"with older repositories or with older versions of Bazaar."
2515
2513
msgstr ""
2516
2514
2517
#: bzrlib/builtins.py:3759
2515
#: bzrlib/builtins.py:3666
2518
2516
msgid ""
2519
2517
"If you wish to upgrade to a particular format rather than the\n"
2520
2518
"current default, that can be specified using the --format option.\n"
2524
2522
"2.x default) so downgrading is not always possible."
2525
2523
msgstr ""
2526
2524
2527
#: bzrlib/builtins.py:3766
2525
#: bzrlib/builtins.py:3673
2528
2526
msgid ""
2529
2527
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2530
2528
"process (where # is a number). By default, this is left there on\n"
2535
2533
"afterwards."
2536
2534
msgstr ""
2537
2535
2538
#: bzrlib/builtins.py:3774
2536
#: bzrlib/builtins.py:3681
2539
2537
msgid ""
2540
2538
"If the location given is a shared repository, dependent branches\n"
2541
2539
"are also converted provided the repository converts successfully.\n"
2543
2541
"tried."
2544
2542
msgstr ""
2545
2543
2546
#: bzrlib/builtins.py:3779
2544
#: bzrlib/builtins.py:3686
2547
2545
msgid ""
2548
2546
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2549
2547
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2550
2548
msgstr ""
2551
2549
2552
#: bzrlib/builtins.py:3787
2550
#: bzrlib/builtins.py:3694
2553
2551
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2554
2552
msgstr ""
2555
2553
2556
#: bzrlib/builtins.py:3791
2554
#: bzrlib/builtins.py:3698
2557
2555
msgid "Branch format"
2558
2556
msgstr ""
2559
2557
2560
#: bzrlib/builtins.py:3793
2558
#: bzrlib/builtins.py:3700
2561
2559
msgid "Remove the backup.bzr directory if successful."
2562
2560
msgstr ""
2563
2561
2564
#: bzrlib/builtins.py:3795
2562
#: bzrlib/builtins.py:3702
2565
2563
msgid "Show what would be done, but don't actually do anything."
2566
2564
msgstr ""
2567
2565
2568
#: bzrlib/builtins.py:3810
2566
#: bzrlib/builtins.py:3717
2569
2567
msgid "Show or set bzr user id."
2570
2568
msgstr ""
2571
2569
2572
#: bzrlib/builtins.py:3812
2570
#: bzrlib/builtins.py:3719
2573
2571
msgid ""
2574
2572
":Examples:\n"
2575
2573
" Show the email of the current user::"
2576
2574
msgstr ""
2577
2575
2578
#: bzrlib/builtins.py:3815
2576
#: bzrlib/builtins.py:3722
2579
2577
msgid " bzr whoami --email"
2580
2578
msgstr ""
2581
2579
2582
#: bzrlib/builtins.py:3817
2580
#: bzrlib/builtins.py:3724
2583
2581
msgid " Set the current user::"
2584
2582
msgstr ""
2585
2583
2586
#: bzrlib/builtins.py:3819
2584
#: bzrlib/builtins.py:3726
2587
2585
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2588
2586
msgstr ""
2589
2587
2590
#: bzrlib/builtins.py:3823
2588
#: bzrlib/builtins.py:3730
2591
2589
msgid "Display email address only."
2592
2590
msgstr ""
2593
2591
2594
#: bzrlib/builtins.py:3825
2592
#: bzrlib/builtins.py:3732
2595
2593
msgid "Set identity for the current branch instead of globally."
2596
2594
msgstr ""
2597
2595
2598
#: bzrlib/builtins.py:3851
2596
#: bzrlib/builtins.py:3758
2599
2597
msgid "--email can only be used to display existing identity"
2600
2598
msgstr ""
2601
2599
2602
#: bzrlib/builtins.py:3873
2600
#: bzrlib/builtins.py:3780
2603
2601
msgid "Print or set the branch nickname."
2604
2602
msgstr ""
2605
2603
2606
#: bzrlib/builtins.py:3875
2604
#: bzrlib/builtins.py:3782
2607
2605
msgid ""
2608
2606
"If unset, the tree root directory name is used as the nickname.\n"
2609
2607
"To print the current nickname, execute with no argument."
2610
2608
msgstr ""
2611
2609
2612
#: bzrlib/builtins.py:3878
2610
#: bzrlib/builtins.py:3785
2613
2611
msgid ""
2614
2612
"Bound branches use the nickname of its master branch unless it is set\n"
2615
2613
"locally."
2616
2614
msgstr ""
2617
2615
2618
#: bzrlib/builtins.py:3898
2616
#: bzrlib/builtins.py:3805
2619
2617
msgid "Set/unset and display aliases."
2620
2618
msgstr ""
2621
2619
2622
#: bzrlib/builtins.py:3900
2620
#: bzrlib/builtins.py:3807
2623
2621
msgid ""
2624
2622
":Examples:\n"
2625
2623
" Show the current aliases::"
2626
2624
msgstr ""
2627
2625
2628
#: bzrlib/builtins.py:3903
2626
#: bzrlib/builtins.py:3810
2629
2627
msgid " bzr alias"
2630
2628
msgstr ""
2631
2629
2632
#: bzrlib/builtins.py:3905
2630
#: bzrlib/builtins.py:3812
2633
2631
msgid " Show the alias specified for 'll'::"
2634
2632
msgstr ""
2635
2633
2636
#: bzrlib/builtins.py:3907
2634
#: bzrlib/builtins.py:3814
2637
2635
msgid " bzr alias ll"
2638
2636
msgstr ""
2639
2637
2640
#: bzrlib/builtins.py:3909
2638
#: bzrlib/builtins.py:3816
2641
2639
msgid " Set an alias for 'll'::"
2642
2640
msgstr ""
2643
2641
2644
#: bzrlib/builtins.py:3911
2642
#: bzrlib/builtins.py:3818
2645
2643
msgid " bzr alias ll=\"log --line -r-10..-1\""
2646
2644
msgstr ""
2647
2645
2648
#: bzrlib/builtins.py:3913
2646
#: bzrlib/builtins.py:3820
2649
2647
msgid " To remove an alias for 'll'::"
2650
2648
msgstr ""
2651
2649
2652
#: bzrlib/builtins.py:3915
2650
#: bzrlib/builtins.py:3822
2653
2651
msgid " bzr alias --remove ll"
2654
2652
msgstr ""
2655
2653
2656
#: bzrlib/builtins.py:3920
2654
#: bzrlib/builtins.py:3827
2657
2655
msgid "Remove the alias."
2658
2656
msgstr ""
2659
2657
2660
#: bzrlib/builtins.py:3938
2658
#: bzrlib/builtins.py:3845
2661
2659
msgid "bzr alias --remove expects an alias to remove."
2662
2660
msgstr ""
2663
2661
2664
#: bzrlib/builtins.py:4119
2662
#: bzrlib/builtins.py:4026
2665
2663
msgid ""
2666
2664
"subunit not available. subunit needs to be installed to use --subunit."
2667
2665
msgstr ""
2668
2666
2669
#: bzrlib/builtins.py:4136
2667
#: bzrlib/builtins.py:4043
2670
2668
msgid ""
2671
2669
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2672
2670
msgstr ""
2673
2671
2674
#: bzrlib/builtins.py:4183
2672
#: bzrlib/builtins.py:4090
2675
2673
msgid "Show version of bzr."
2676
2674
msgstr ""
2677
2675
2678
#: bzrlib/builtins.py:4187
2676
#: bzrlib/builtins.py:4094
2679
2677
msgid "Print just the version number."
2680
2678
msgstr ""
2681
2679
2682
#: bzrlib/builtins.py:4206
2680
#: bzrlib/builtins.py:4113
2683
2681
msgid "It sure does!\n"
2684
2682
msgstr ""
2685
2683
2686
#: bzrlib/builtins.py:4230
2684
#: bzrlib/builtins.py:4137
2687
2685
#, python-format
2688
2686
msgid "merge base is revision %s\n"
2689
2687
msgstr ""
2690
2688
2691
#: bzrlib/builtins.py:4234
2689
#: bzrlib/builtins.py:4141
2692
2690
msgid "Perform a three-way merge."
2693
2691
msgstr ""
2694
2692
2695
#: bzrlib/builtins.py:4236
2693
#: bzrlib/builtins.py:4143
2696
2694
msgid ""
2697
2695
"The source of the merge can be specified either in the form of a branch,\n"
2698
2696
"or in the form of a path to a file containing a merge directive generated\n"
2703
2701
"the current working tree."
2704
2702
msgstr ""
2705
2703
2706
#: bzrlib/builtins.py:4244
2704
#: bzrlib/builtins.py:4151
2707
2705
msgid ""
2708
2706
"When merging from a branch, by default bzr will try to merge in all new\n"
2709
2707
"work from the other branch, automatically determining an appropriate base\n"
2710
2708
"revision. If this fails, you may need to give an explicit base."
2711
2709
msgstr ""
2712
2710
2713
#: bzrlib/builtins.py:4248
2711
#: bzrlib/builtins.py:4155
2714
2712
msgid ""
2715
2713
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2716
2714
"try to merge in all new work up to and including revision OTHER."
2717
2715
msgstr ""
2718
2716
2719
#: bzrlib/builtins.py:4251
2717
#: bzrlib/builtins.py:4158
2720
2718
msgid ""
2721
2719
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2722
2720
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2727
2725
"changes from the other branch is not stored in the commit."
2728
2726
msgstr ""
2729
2727
2730
#: bzrlib/builtins.py:4259
2728
#: bzrlib/builtins.py:4166
2731
2729
msgid "Revision numbers are always relative to the source branch."
2732
2730
msgstr ""
2733
2731
2734
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2732
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2735
2733
msgid ""
2736
2734
"Merge will do its best to combine the changes in two branches, but there\n"
2737
2735
"are some kinds of problems only a human can fix. When it encounters those,\n"
2738
2736
"it will mark a conflict. A conflict means that you need to fix something,\n"
2739
"before you can commit."
2737
"before you should commit."
2740
2738
msgstr ""
2741
2739
2742
#: bzrlib/builtins.py:4266
2740
#: bzrlib/builtins.py:4173
2743
2741
msgid ""
2744
2742
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2745
2743
msgstr ""
2746
2744
2747
#: bzrlib/builtins.py:4268
2745
#: bzrlib/builtins.py:4175
2748
2746
msgid ""
2749
2747
"If there is no default branch set, the first merge will set it (use\n"
2750
2748
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2752
2750
"only be saved if the remote location can be accessed."
2753
2751
msgstr ""
2754
2752
2755
#: bzrlib/builtins.py:4273
2753
#: bzrlib/builtins.py:4180
2756
2754
msgid ""
2757
2755
"The results of the merge are placed into the destination working\n"
2758
2756
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2759
2757
"committed to record the result of the merge."
2760
2758
msgstr ""
2761
2759
2762
#: bzrlib/builtins.py:4277
2760
#: bzrlib/builtins.py:4184
2763
2761
msgid ""
2764
2762
"merge refuses to run if there are any uncommitted changes, unless\n"
2765
2763
"--force is given. If --force is given, then the changes from the source \n"
2768
2766
"merge revision which has more than two parents."
2769
2767
msgstr ""
2770
2768
2771
#: bzrlib/builtins.py:4283
2769
#: bzrlib/builtins.py:4190
2772
2770
msgid ""
2773
2771
"If one would like to merge changes from the working tree of the other\n"
2774
2772
"branch without merging any committed revisions, the --uncommitted option\n"
2775
2773
"can be given."
2776
2774
msgstr ""
2777
2775
2778
#: bzrlib/builtins.py:4287
2776
#: bzrlib/builtins.py:4194
2779
2777
msgid ""
2780
2778
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2781
2779
"you to apply each diff hunk and file change, similar to \"shelve\"."
2782
2780
msgstr ""
2783
2781
2784
#: bzrlib/builtins.py:4290
2782
#: bzrlib/builtins.py:4197
2785
2783
msgid ""
2786
2784
":Examples:\n"
2787
2785
" To merge all new revisions from bzr.dev::"
2788
2786
msgstr ""
2789
2787
2790
#: bzrlib/builtins.py:4293
2788
#: bzrlib/builtins.py:4200
2791
2789
msgid " bzr merge ../bzr.dev"
2792
2790
msgstr ""
2793
2791
2794
#: bzrlib/builtins.py:4295
2792
#: bzrlib/builtins.py:4202
2795
2793
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2796
2794
msgstr ""
2797
2795
2798
#: bzrlib/builtins.py:4297
2796
#: bzrlib/builtins.py:4204
2799
2797
msgid " bzr merge -r 82 ../bzr.dev"
2800
2798
msgstr ""
2801
2799
2802
#: bzrlib/builtins.py:4299
2800
#: bzrlib/builtins.py:4206
2803
2801
msgid " To merge the changes introduced by 82, without previous changes::"
2804
2802
msgstr ""
2805
2803
2806
#: bzrlib/builtins.py:4301
2804
#: bzrlib/builtins.py:4208
2807
2805
msgid " bzr merge -r 81..82 ../bzr.dev"
2808
2806
msgstr ""
2809
2807
2810
#: bzrlib/builtins.py:4303
2808
#: bzrlib/builtins.py:4210
2811
2809
msgid " To apply a merge directive contained in /tmp/merge::"
2812
2810
msgstr ""
2813
2811
2814
#: bzrlib/builtins.py:4305
2812
#: bzrlib/builtins.py:4212
2815
2813
msgid " bzr merge /tmp/merge"
2816
2814
msgstr ""
2817
2815
2818
#: bzrlib/builtins.py:4307
2816
#: bzrlib/builtins.py:4214
2819
2817
msgid ""
2820
2818
" To create a merge revision with three parents from two branches\n"
2821
2819
" feature1a and feature1b:"
2822
2820
msgstr ""
2823
2821
2824
#: bzrlib/builtins.py:4310
2822
#: bzrlib/builtins.py:4217
2825
2823
msgid ""
2826
2824
" bzr merge ../feature1a\n"
2827
2825
" bzr merge ../feature1b --force\n"
2828
2826
" bzr commit -m 'revision with three parents'"
2829
2827
msgstr ""
2830
2828
2831
#: bzrlib/builtins.py:4322
2829
#: bzrlib/builtins.py:4229
2832
2830
msgid "Merge even if the destination tree has uncommitted changes."
2833
2831
msgstr ""
2834
2832
2835
#: bzrlib/builtins.py:4328
2833
#: bzrlib/builtins.py:4235
2836
2834
msgid ""
2837
2835
"Apply uncommitted changes from a working copy, instead of branch changes."
2838
2836
msgstr ""
2839
2837
2840
#: bzrlib/builtins.py:4330
2838
#: bzrlib/builtins.py:4237
2841
2839
msgid ""
2842
2840
"If the destination is already completely merged into the source, pull from "
2843
2841
"the source rather than merging. When this happens, you do not need to "
2844
2842
"commit the result."
2845
2843
msgstr ""
2846
2844
2847
#: bzrlib/builtins.py:4335
2845
#: bzrlib/builtins.py:4242
2848
2846
msgid ""
2849
2847
"Branch to merge into, rather than the one containing the working directory."
2850
2848
msgstr ""
2851
2849
2852
#: bzrlib/builtins.py:4337
2850
#: bzrlib/builtins.py:4244
2853
2851
msgid "Instead of merging, show a diff of the merge."
2854
2852
msgstr ""
2855
2853
2856
#: bzrlib/builtins.py:4339
2854
#: bzrlib/builtins.py:4246
2857
2855
msgid "Select changes interactively."
2858
2856
msgstr ""
2859
2857
2860
#: bzrlib/builtins.py:4361
2858
#: bzrlib/builtins.py:4268
2861
2859
msgid ""
2862
2860
"Merging into empty branches not currently supported, "
2863
2861
"https://bugs.launchpad.net/bzr/+bug/308562"
2864
2862
msgstr ""
2865
2863
2866
#: bzrlib/builtins.py:4388
2864
#: bzrlib/builtins.py:4295
2867
2865
msgid "Cannot use --uncommitted with bundles or merge directives."
2868
2866
msgstr ""
2869
2867
2870
#: bzrlib/builtins.py:4399
2868
#: bzrlib/builtins.py:4306
2871
2869
msgid "Cannot use --uncommitted and --revision at the same time."
2872
2870
msgstr ""
2873
2871
2874
#: bzrlib/builtins.py:4419
2872
#: bzrlib/builtins.py:4326
2875
2873
msgid "merger: "
2876
2874
msgstr ""
2877
2875
2878
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2876
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2879
2877
msgid "Nothing to do."
2880
2878
msgstr ""
2881
2879
2882
#: bzrlib/builtins.py:4425
2880
#: bzrlib/builtins.py:4332
2883
2881
msgid "Cannot pull individual files"
2884
2882
msgstr ""
2885
2883
2886
#: bzrlib/builtins.py:4433
2884
#: bzrlib/builtins.py:4340
2887
2885
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2888
2886
msgstr ""
2889
2887
2890
#: bzrlib/builtins.py:4491
2888
#: bzrlib/builtins.py:4398
2891
2889
#, python-format
2892
2890
msgid "Show-base is not supported for this merge type. %s"
2893
2891
msgstr ""
2894
2892
2895
#: bzrlib/builtins.py:4500
2893
#: bzrlib/builtins.py:4407
2896
2894
#, python-format
2897
2895
msgid "Conflict reduction is not supported for merge type %s."
2898
2896
msgstr ""
2899
2897
2900
#: bzrlib/builtins.py:4504
2898
#: bzrlib/builtins.py:4411
2901
2899
msgid "Cannot do conflict reduction and show base."
2902
2900
msgstr ""
2903
2901
2904
#: bzrlib/builtins.py:4615
2902
#: bzrlib/builtins.py:4522
2905
2903
msgid "No location specified or remembered"
2906
2904
msgstr ""
2907
2905
2908
#: bzrlib/builtins.py:4617
2906
#: bzrlib/builtins.py:4524
2909
2907
msgid "{0} remembered {1} location {2}"
2910
2908
msgstr ""
2911
2909
2912
#: bzrlib/builtins.py:4623
2910
#: bzrlib/builtins.py:4530
2913
2911
msgid "Redo a merge."
2914
2912
msgstr ""
2915
2913
2916
#: bzrlib/builtins.py:4625
2914
#: bzrlib/builtins.py:4532
2917
2915
msgid ""
2918
2916
"Use this if you want to try a different merge technique while resolving\n"
2919
2917
"conflicts. Some merge techniques are better than others, and remerge\n"
2920
2918
"lets you try different ones on different files."
2921
2919
msgstr ""
2922
2920
2923
#: bzrlib/builtins.py:4629
2921
#: bzrlib/builtins.py:4536
2924
2922
msgid ""
2925
2923
"The options for remerge have the same meaning and defaults as the ones for\n"
2926
2924
"merge. The difference is that remerge can (only) be run when there is a\n"
2927
2925
"pending merge, and it lets you specify particular files."
2928
2926
msgstr ""
2929
2927
2930
#: bzrlib/builtins.py:4633
2928
#: bzrlib/builtins.py:4540
2931
2929
msgid ""
2932
2930
":Examples:\n"
2933
2931
" Re-do the merge of all conflicted files, and show the base text in\n"
2934
2932
" conflict regions, in addition to the usual THIS and OTHER texts::"
2935
2933
msgstr ""
2936
2934
2937
#: bzrlib/builtins.py:4637
2935
#: bzrlib/builtins.py:4544
2938
2936
msgid " bzr remerge --show-base"
2939
2937
msgstr ""
2940
2938
2941
#: bzrlib/builtins.py:4639
2939
#: bzrlib/builtins.py:4546
2942
2940
msgid ""
2943
2941
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2944
2942
" additional processing to reduce the size of conflict regions::"
2945
2943
msgstr ""
2946
2944
2947
#: bzrlib/builtins.py:4642
2945
#: bzrlib/builtins.py:4549
2948
2946
msgid " bzr remerge --merge-type weave --reprocess foobar"
2949
2947
msgstr ""
2950
2948
2951
#: bzrlib/builtins.py:4649
2949
#: bzrlib/builtins.py:4556
2952
2950
msgid "Show base revision text in conflicts."
2953
2951
msgstr ""
2954
2952
2955
#: bzrlib/builtins.py:4661
2953
#: bzrlib/builtins.py:4568
2956
2954
msgid ""
2957
2955
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2958
2956
"merges."
2959
2957
msgstr ""
2960
2958
2961
#: bzrlib/builtins.py:4717
2959
#: bzrlib/builtins.py:4624
2962
2960
msgid "Revert files to a previous revision."
2963
2961
msgstr ""
2964
2962
2965
#: bzrlib/builtins.py:4719
2963
#: bzrlib/builtins.py:4626
2966
2964
msgid ""
2967
2965
"Giving a list of files will revert only those files. Otherwise, all files\n"
2968
2966
"will be reverted. If the revision is not specified with '--revision', the\n"
2969
2967
"last committed revision is used."
2970
2968
msgstr ""
2971
2969
2972
#: bzrlib/builtins.py:4723
2970
#: bzrlib/builtins.py:4630
2973
2971
msgid ""
2974
2972
"To remove only some changes, without reverting to a prior version, use\n"
2975
2973
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2978
2976
"certain changes on a hunk-by-hunk basis, see the shelve command."
2979
2977
msgstr ""
2980
2978
2981
#: bzrlib/builtins.py:4729
2979
#: bzrlib/builtins.py:4636
2982
2980
msgid ""
2983
2981
"By default, any files that have been manually changed will be backed up\n"
2984
2982
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2985
2983
"'.~#~' appended to their name, where # is a number."
2986
2984
msgstr ""
2987
2985
2988
#: bzrlib/builtins.py:4733
2986
#: bzrlib/builtins.py:4640
2989
2987
msgid ""
2990
2988
"When you provide files, you can use their current pathname or the pathname\n"
2991
2989
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2993
2991
"reverted."
2994
2992
msgstr ""
2995
2993
2996
#: bzrlib/builtins.py:4738
2994
#: bzrlib/builtins.py:4645
2997
2995
msgid ""
2998
2996
"If you have newly added files since the target revision, they will be\n"
2999
2997
"removed. If the files to be removed have been changed, backups will be\n"
3001
2999
"deleted."
3002
3000
msgstr ""
3003
3001
3004
#: bzrlib/builtins.py:4743
3002
#: bzrlib/builtins.py:4650
3005
3003
msgid ""
3006
3004
"The working tree contains a list of revisions that have been merged but\n"
3007
3005
"not yet committed. These revisions will be included as additional parents\n"
3013
3011
"reverting any files."
3014
3012
msgstr ""
3015
3013
3016
#: bzrlib/builtins.py:4752
3014
#: bzrlib/builtins.py:4659
3017
3015
msgid ""
3018
3016
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3019
3017
"changes from a branch in a single revision. To do this, perform the merge\n"
3027
3025
"target branches."
3028
3026
msgstr ""
3029
3027
3030
#: bzrlib/builtins.py:4766
3028
#: bzrlib/builtins.py:4673
3031
3029
msgid "Do not save backups of reverted files."
3032
3030
msgstr ""
3033
3031
3034
#: bzrlib/builtins.py:4768
3032
#: bzrlib/builtins.py:4675
3035
3033
msgid "Remove pending merge marker, without changing any files."
3036
3034
msgstr ""
3037
3035
3038
#: bzrlib/builtins.py:4799
3036
#: bzrlib/builtins.py:4706
3039
3037
msgid ""
3040
3038
"Show help on a command or other topic.\n"
3041
3039
" "
3042
3040
msgstr ""
3043
3041
3044
#: bzrlib/builtins.py:4804
3042
#: bzrlib/builtins.py:4711
3045
3043
msgid "Show help on all commands."
3046
3044
msgstr ""
3047
3045
3048
#: bzrlib/builtins.py:4833
3046
#: bzrlib/builtins.py:4740
3049
3047
msgid "Show unmerged/unpulled revisions between two branches."
3050
3048
msgstr ""
3051
3049
3052
#: bzrlib/builtins.py:4835
3050
#: bzrlib/builtins.py:4742
3053
3051
msgid "OTHER_BRANCH may be local or remote."
3054
3052
msgstr ""
3055
3053
3056
#: bzrlib/builtins.py:4837
3054
#: bzrlib/builtins.py:4744
3057
3055
msgid ""
3058
3056
"To filter on a range of revisions, you can use the command -r begin..end\n"
3059
3057
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3064
3062
" 0 - no missing revisions"
3065
3063
msgstr ""
3066
3064
3067
#: bzrlib/builtins.py:4847
3065
#: bzrlib/builtins.py:4754
3068
3066
msgid ""
3069
3067
" Determine the missing revisions between this and the branch at the\n"
3070
3068
" remembered pull location::"
3071
3069
msgstr ""
3072
3070
3073
#: bzrlib/builtins.py:4850
3071
#: bzrlib/builtins.py:4757
3074
3072
msgid " bzr missing"
3075
3073
msgstr ""
3076
3074
3077
#: bzrlib/builtins.py:4852
3075
#: bzrlib/builtins.py:4759
3078
3076
msgid " Determine the missing revisions between this and another branch::"
3079
3077
msgstr ""
3080
3078
3081
#: bzrlib/builtins.py:4854
3079
#: bzrlib/builtins.py:4761
3082
3080
msgid " bzr missing http://server/branch"
3083
3081
msgstr ""
3084
3082
3085
#: bzrlib/builtins.py:4856
3083
#: bzrlib/builtins.py:4763
3086
3084
msgid ""
3087
3085
" Determine the missing revisions up to a specific revision on the other\n"
3088
3086
" branch::"
3089
3087
msgstr ""
3090
3088
3091
#: bzrlib/builtins.py:4859
3089
#: bzrlib/builtins.py:4766
3092
3090
msgid " bzr missing -r ..-10"
3093
3091
msgstr ""
3094
3092
3095
#: bzrlib/builtins.py:4861
3093
#: bzrlib/builtins.py:4768
3096
3094
msgid ""
3097
3095
" Determine the missing revisions up to a specific revision on this\n"
3098
3096
" branch::"
3099
3097
msgstr ""
3100
3098
3101
#: bzrlib/builtins.py:4864
3099
#: bzrlib/builtins.py:4771
3102
3100
msgid " bzr missing --my-revision ..-10"
3103
3101
msgstr ""
3104
3102
3105
#: bzrlib/builtins.py:4871
3103
#: bzrlib/builtins.py:4778
3106
3104
msgid "Reverse the order of revisions."
3107
3105
msgstr ""
3108
3106
3109
#: bzrlib/builtins.py:4873
3107
#: bzrlib/builtins.py:4780
3110
3108
msgid "Display changes in the local branch only."
3111
3109
msgstr ""
3112
3110
3113
#: bzrlib/builtins.py:4874
3111
#: bzrlib/builtins.py:4781
3114
3112
msgid "Same as --mine-only."
3115
3113
msgstr ""
3116
3114
3117
#: bzrlib/builtins.py:4876
3115
#: bzrlib/builtins.py:4783
3118
3116
msgid "Display changes in the remote branch only."
3119
3117
msgstr ""
3120
3118
3121
#: bzrlib/builtins.py:4877
3119
#: bzrlib/builtins.py:4784
3122
3120
msgid "Same as --theirs-only."
3123
3121
msgstr ""
3124
3122
3125
#: bzrlib/builtins.py:4882
3123
#: bzrlib/builtins.py:4789
3126
3124
msgid ""
3127
3125
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3128
3126
"details."
3129
3127
msgstr ""
3130
3128
3131
#: bzrlib/builtins.py:4886
3129
#: bzrlib/builtins.py:4793
3132
3130
msgid ""
3133
3131
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3134
3132
"details."
3135
3133
msgstr ""
3136
3134
3137
#: bzrlib/builtins.py:4889
3135
#: bzrlib/builtins.py:4796
3138
3136
msgid "Show all revisions in addition to the mainline ones."
3139
3137
msgstr ""
3140
3138
3141
#: bzrlib/builtins.py:4943
3139
#: bzrlib/builtins.py:4850
3142
3140
msgid "No peer location known or specified."
3143
3141
msgstr ""
3144
3142
3145
#: bzrlib/builtins.py:4947
3143
#: bzrlib/builtins.py:4854
3146
3144
msgid "Using saved parent location: {0}\n"
3147
3145
msgstr ""
3148
3146
3149
#: bzrlib/builtins.py:4980
3147
#: bzrlib/builtins.py:4887
3150
3148
#, python-format
3151
3149
msgid "You have %d extra revision:\n"
3152
3150
msgid_plural "You have %d extra revisions:\n"
3153
3151
msgstr[0] ""
3154
3152
msgstr[1] ""
3155
3153
3156
#: bzrlib/builtins.py:4996
3154
#: bzrlib/builtins.py:4903
3157
3155
#, python-format
3158
3156
msgid "You are missing %d revision:\n"
3159
3157
msgid_plural "You are missing %d revisions:\n"
3160
3158
msgstr[0] ""
3161
3159
msgstr[1] ""
3162
3160
3163
#: bzrlib/builtins.py:5008
3161
#: bzrlib/builtins.py:4915
3164
3162
msgid "This branch has no new revisions.\n"
3165
3163
msgstr ""
3166
3164
3167
#: bzrlib/builtins.py:5011
3165
#: bzrlib/builtins.py:4918
3168
3166
msgid "Other branch has no new revisions.\n"
3169
3167
msgstr ""
3170
3168
3171
#: bzrlib/builtins.py:5016
3169
#: bzrlib/builtins.py:4923
3172
3170
msgid "Branches are up to date.\n"
3173
3171
msgstr ""
3174
3172
3175
#: bzrlib/builtins.py:5027
3173
#: bzrlib/builtins.py:4934
3176
3174
msgid "Compress the data within a repository."
3177
3175
msgstr ""
3178
3176
3179
#: bzrlib/builtins.py:5029
3177
#: bzrlib/builtins.py:4936
3180
3178
msgid ""
3181
3179
"This operation compresses the data within a bazaar repository. As\n"
3182
3180
"bazaar supports automatic packing of repository, this operation is\n"
3183
3181
"normally not required to be done manually."
3184
3182
msgstr ""
3185
3183
3186
#: bzrlib/builtins.py:5033
3184
#: bzrlib/builtins.py:4940
3187
3185
msgid ""
3188
3186
"During the pack operation, bazaar takes a backup of existing repository\n"
3189
3187
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3192
3190
"used."
3193
3191
msgstr ""
3194
3192
3195
#: bzrlib/builtins.py:5039
3193
#: bzrlib/builtins.py:4946
3196
3194
msgid ""
3197
3195
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3198
3196
"during or immediately after repacking, you may be left with a state\n"
3200
3198
"been. In this case the repository may be unusable."
3201
3199
msgstr ""
3202
3200
3203
#: bzrlib/builtins.py:5048
3201
#: bzrlib/builtins.py:4955
3204
3202
msgid "Delete obsolete packs to save disk space."
3205
3203
msgstr ""
3206
3204
3207
#: bzrlib/builtins.py:5062
3205
#: bzrlib/builtins.py:4969
3208
3206
msgid "List the installed plugins."
3209
3207
msgstr ""
3210
3208
3211
#: bzrlib/builtins.py:5064
3209
#: bzrlib/builtins.py:4971
3212
3210
msgid ""
3213
3211
"This command displays the list of installed plugins including\n"
3214
3212
"version of plugin and a short description of each."
3215
3213
msgstr ""
3216
3214
3217
#: bzrlib/builtins.py:5067
3215
#: bzrlib/builtins.py:4974
3218
3216
msgid "--verbose shows the path where each plugin is located."
3219
3217
msgstr ""
3220
3218
3221
#: bzrlib/builtins.py:5069
3219
#: bzrlib/builtins.py:4976
3222
3220
msgid ""
3223
3221
"A plugin is an external component for Bazaar that extends the\n"
3224
3222
"revision control system, by adding or replacing code in Bazaar.\n"
3227
3225
"customizing log output."
3228
3226
msgstr ""
3229
3227
3230
#: bzrlib/builtins.py:5075
3228
#: bzrlib/builtins.py:4982
3231
3229
msgid ""
3232
3230
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3233
3231
"for further information on plugins including where to find them and how to\n"
3235
3233
"plugins using the Python programming language."
3236
3234
msgstr ""
3237
3235
3238
#: bzrlib/builtins.py:5091
3236
#: bzrlib/builtins.py:4998
3239
3237
msgid "Show testament (signing-form) of a revision."
3240
3238
msgstr ""
3241
3239
3242
#: bzrlib/builtins.py:5094
3240
#: bzrlib/builtins.py:5001
3243
3241
msgid "Produce long-format testament."
3244
3242
msgstr ""
3245
3243
3246
#: bzrlib/builtins.py:5096
3244
#: bzrlib/builtins.py:5003
3247
3245
msgid "Produce a strict-format testament."
3248
3246
msgstr ""
3249
3247
3250
#: bzrlib/builtins.py:5122
3248
#: bzrlib/builtins.py:5029
3251
3249
msgid "Show the origin of each line in a file."
3252
3250
msgstr ""
3253
3251
3254
#: bzrlib/builtins.py:5124
3252
#: bzrlib/builtins.py:5031
3255
3253
msgid ""
3256
3254
"This prints out the given file with an annotation on the left side\n"
3257
3255
"indicating which revision, author and date introduced the change."
3258
3256
msgstr ""
3259
3257
3260
#: bzrlib/builtins.py:5127
3258
#: bzrlib/builtins.py:5034
3261
3259
msgid ""
3262
3260
"If the origin is the same for a run of consecutive lines, it is\n"
3263
3261
"shown only at the top, unless the --all option is given."
3264
3262
msgstr ""
3265
3263
3266
#: bzrlib/builtins.py:5135
3264
#: bzrlib/builtins.py:5042
3267
3265
msgid "Show annotations on all lines."
3268
3266
msgstr ""
3269
3267
3270
#: bzrlib/builtins.py:5136
3268
#: bzrlib/builtins.py:5043
3271
3269
msgid "Show commit date in annotations."
3272
3270
msgstr ""
3273
3271
3274
#: bzrlib/builtins.py:5223
3272
#: bzrlib/builtins.py:5130
3275
3273
msgid "Cannot sign a range of non-revision-history revisions"
3276
3274
msgstr ""
3277
3275
3278
#: bzrlib/builtins.py:5235
3276
#: bzrlib/builtins.py:5142
3279
3277
msgid "Please supply either one revision, or a range."
3280
3278
msgstr ""
3281
3279
3282
#: bzrlib/builtins.py:5239
3280
#: bzrlib/builtins.py:5146
3283
3281
msgid ""
3284
3282
"Convert the current branch into a checkout of the supplied branch.\n"
3285
3283
"If no branch is supplied, rebind to the last bound location."
3286
3284
msgstr ""
3287
3285
3288
#: bzrlib/builtins.py:5242
3286
#: bzrlib/builtins.py:5149
3289
3287
msgid ""
3290
3288
"Once converted into a checkout, commits must succeed on the master branch\n"
3291
3289
"before they will be applied to the local branch."
3292
3290
msgstr ""
3293
3291
3294
#: bzrlib/builtins.py:5245
3292
#: bzrlib/builtins.py:5152
3295
3293
msgid ""
3296
3294
"Bound branches use the nickname of its master branch unless it is set\n"
3297
3295
"locally, in which case binding will update the local nickname to be\n"
3298
3296
"that of the master."
3299
3297
msgstr ""
3300
3298
3301
#: bzrlib/builtins.py:5260
3299
#: bzrlib/builtins.py:5167
3302
3300
msgid "No location supplied. This format does not remember old locations."
3303
3301
msgstr ""
3304
3302
3305
#: bzrlib/builtins.py:5265
3303
#: bzrlib/builtins.py:5172
3306
3304
msgid "Branch is already bound"
3307
3305
msgstr ""
3308
3306
3309
#: bzrlib/builtins.py:5267
3307
#: bzrlib/builtins.py:5174
3310
3308
msgid "No location supplied and no previous location known"
3311
3309
msgstr ""
3312
3310
3313
#: bzrlib/builtins.py:5273
3311
#: bzrlib/builtins.py:5180
3314
3312
msgid "These branches have diverged. Try merging, and then bind again."
3315
3313
msgstr ""
3316
3314
3317
#: bzrlib/builtins.py:5280
3315
#: bzrlib/builtins.py:5187
3318
3316
msgid "Convert the current checkout into a regular branch."
3319
3317
msgstr ""
3320
3318
3321
#: bzrlib/builtins.py:5282
3319
#: bzrlib/builtins.py:5189
3322
3320
msgid ""
3323
3321
"After unbinding, the local branch is considered independent and subsequent\n"
3324
3322
"commits will be local only."
3325
3323
msgstr ""
3326
3324
3327
#: bzrlib/builtins.py:5293
3325
#: bzrlib/builtins.py:5200
3328
3326
msgid "Local branch is not bound"
3329
3327
msgstr ""
3330
3328
3331
#: bzrlib/builtins.py:5297
3329
#: bzrlib/builtins.py:5204
3332
3330
msgid "Remove the last committed revision."
3333
3331
msgstr ""
3334
3332
3335
#: bzrlib/builtins.py:5299
3333
#: bzrlib/builtins.py:5206
3336
3334
msgid ""
3337
3335
"--verbose will print out what is being removed.\n"
3338
3336
"--dry-run will go through all the motions, but not actually\n"
3339
3337
"remove anything."
3340
3338
msgstr ""
3341
3339
3342
#: bzrlib/builtins.py:5303
3340
#: bzrlib/builtins.py:5210
3343
3341
msgid ""
3344
3342
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3345
3343
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3346
3344
"branch at revision 15."
3347
3345
msgstr ""
3348
3346
3349
#: bzrlib/builtins.py:5307
3347
#: bzrlib/builtins.py:5214
3350
3348
msgid ""
3351
3349
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3352
3350
"it may make is to restore any pending merges that were present before\n"
3353
3351
"the commit."
3354
3352
msgstr ""
3355
3353
3356
#: bzrlib/builtins.py:5318
3354
#: bzrlib/builtins.py:5225
3357
3355
msgid "Don't actually make changes."
3358
3356
msgstr ""
3359
3357
3360
#: bzrlib/builtins.py:5319
3358
#: bzrlib/builtins.py:5226
3361
3359
msgid "Say yes to all questions."
3362
3360
msgstr ""
3363
3361
3364
#: bzrlib/builtins.py:5321
3362
#: bzrlib/builtins.py:5228
3365
3363
msgid "Keep tags that point to removed revisions."
3366
3364
msgstr ""
3367
3365
3368
#: bzrlib/builtins.py:5323
3366
#: bzrlib/builtins.py:5230
3369
3367
msgid "Only remove the commits from the local branch when in a checkout."
3370
3368
msgstr ""
3371
3369
3372
#: bzrlib/builtins.py:5372
3370
#: bzrlib/builtins.py:5279
3373
3371
msgid "No revisions to uncommit.\n"
3374
3372
msgstr ""
3375
3373
3376
#: bzrlib/builtins.py:5387
3374
#: bzrlib/builtins.py:5294
3377
3375
msgid "Dry-run, pretending to remove the above revisions.\n"
3378
3376
msgstr ""
3379
3377
3380
#: bzrlib/builtins.py:5390
3378
#: bzrlib/builtins.py:5297
3381
3379
msgid "The above revision(s) will be removed.\n"
3382
3380
msgstr ""
3383
3381
3384
#: bzrlib/builtins.py:5394
3382
#: bzrlib/builtins.py:5301
3385
3383
msgid "Uncommit these revisions"
3386
3384
msgstr ""
3387
3385
3388
#: bzrlib/builtins.py:5397
3386
#: bzrlib/builtins.py:5304
3389
3387
msgid "Canceled\n"
3390
3388
msgstr ""
3391
3389
3392
#: bzrlib/builtins.py:5404
3390
#: bzrlib/builtins.py:5311
3393
3391
#, python-format
3394
3392
msgid ""
3395
3393
"You can restore the old tip by running:\n"
3396
3394
" bzr pull . -r revid:%s\n"
3397
3395
msgstr ""
3398
3396
3399
#: bzrlib/builtins.py:5409
3397
#: bzrlib/builtins.py:5316
3400
3398
msgid "Break a dead lock."
3401
3399
msgstr ""
3402
3400
3403
#: bzrlib/builtins.py:5411
3401
#: bzrlib/builtins.py:5318
3404
3402
msgid ""
3405
3403
"This command breaks a lock on a repository, branch, working directory or\n"
3406
3404
"config file."
3407
3405
msgstr ""
3408
3406
3409
#: bzrlib/builtins.py:5414
3407
#: bzrlib/builtins.py:5321
3410
3408
msgid ""
3411
3409
"CAUTION: Locks should only be broken when you are sure that the process\n"
3412
3410
"holding the lock has been stopped."
3413
3411
msgstr ""
3414
3412
3415
#: bzrlib/builtins.py:5417
3413
#: bzrlib/builtins.py:5324
3416
3414
msgid ""
3417
3415
"You can get information on what locks are open via the 'bzr info\n"
3418
3416
"[location]' command."
3419
3417
msgstr ""
3420
3418
3421
#: bzrlib/builtins.py:5420
3419
#: bzrlib/builtins.py:5327
3422
3420
msgid ""
3423
3421
":Examples:\n"
3424
3422
" bzr break-lock\n"
3426
3424
" bzr break-lock --conf ~/.bazaar"
3427
3425
msgstr ""
3428
3426
3429
#: bzrlib/builtins.py:5429
3427
#: bzrlib/builtins.py:5336
3430
3428
msgid "LOCATION is the directory where the config lock is."
3431
3429
msgstr ""
3432
3430
3433
#: bzrlib/builtins.py:5431
3431
#: bzrlib/builtins.py:5338
3434
3432
msgid "Do not ask for confirmation before breaking the lock."
3435
3433
msgstr ""
3436
3434
3437
#: bzrlib/builtins.py:5466
3435
#: bzrlib/builtins.py:5373
3438
3436
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3439
3437
msgstr ""
3440
3438
3441
#: bzrlib/builtins.py:5467
3439
#: bzrlib/builtins.py:5374
3442
3440
msgid "Run the bzr server."
3443
3441
msgstr ""
3444
3442
3445
#: bzrlib/builtins.py:5473
3443
#: bzrlib/builtins.py:5380
3446
3444
msgid "Serve on stdin/out for use from inetd or sshd."
3447
3445
msgstr ""
3448
3446
3449
#: bzrlib/builtins.py:5474
3447
#: bzrlib/builtins.py:5381
3450
3448
msgid "protocol"
3451
3449
msgstr ""
3452
3450
3453
#: bzrlib/builtins.py:5475
3451
#: bzrlib/builtins.py:5382
3454
3452
msgid "Protocol to serve."
3455
3453
msgstr ""
3456
3454
3457
#: bzrlib/builtins.py:5479
3455
#: bzrlib/builtins.py:5386
3458
3456
msgid ""
3459
3457
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3460
3458
"Passing 0 as the port number will result in a dynamically allocated port. "
3461
3459
"The default port depends on the protocol."
3462
3460
msgstr ""
3463
3461
3464
#: bzrlib/builtins.py:5485
3462
#: bzrlib/builtins.py:5392
3465
3463
msgid "Serve contents of this directory."
3466
3464
msgstr ""
3467
3465
3468
#: bzrlib/builtins.py:5487
3466
#: bzrlib/builtins.py:5394
3469
3467
msgid ""
3470
3468
"By default the server is a readonly server. Supplying --allow-writes "
3471
3469
"enables write access to the contents of the served directory and below. "
3474
3472
"uncontrolled write access to your file system."
3475
3473
msgstr ""
3476
3474
3477
#: bzrlib/builtins.py:5496
3475
#: bzrlib/builtins.py:5403
3478
3476
msgid "Override the default idle client timeout (5min)."
3479
3477
msgstr ""
3480
3478
3481
#: bzrlib/builtins.py:5546
3479
#: bzrlib/builtins.py:5453
3482
3480
msgid "Combine a tree into its containing tree."
3483
3481
msgstr ""
3484
3482
3485
#: bzrlib/builtins.py:5548
3483
#: bzrlib/builtins.py:5455
3486
3484
msgid "This command requires the target tree to be in a rich-root format."
3487
3485
msgstr ""
3488
3486
3489
#: bzrlib/builtins.py:5550
3487
#: bzrlib/builtins.py:5457
3490
3488
msgid ""
3491
3489
"The TREE argument should be an independent tree, inside another tree, but\n"
3492
3490
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3493
3491
"running \"bzr branch\" with the target inside a tree.)"
3494
3492
msgstr ""
3495
3493
3496
#: bzrlib/builtins.py:5554
3494
#: bzrlib/builtins.py:5461
3497
3495
msgid ""
3498
3496
"The result is a combined tree, with the subtree no longer an independent\n"
3499
3497
"part. This is marked as a merge of the subtree into the containing tree,\n"
3500
3498
"and all history is preserved."
3501
3499
msgstr ""
3502
3500
3503
#: bzrlib/builtins.py:5572
3501
#: bzrlib/builtins.py:5479
3504
3502
#, python-format
3505
3503
msgid ""
3506
3504
"Can't join trees because %s doesn't support rich root data.\n"
3507
3505
"You can use bzr upgrade on the repository."
3508
3506
msgstr ""
3509
3507
3510
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3508
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3511
3509
msgid "Cannot join {0}. {1}"
3512
3510
msgstr ""
3513
3511
3514
#: bzrlib/builtins.py:5592
3512
#: bzrlib/builtins.py:5499
3515
3513
msgid "Split a subdirectory of a tree into a separate tree."
3516
3514
msgstr ""
3517
3515
3518
#: bzrlib/builtins.py:5594
3516
#: bzrlib/builtins.py:5501
3519
3517
msgid ""
3520
3518
"This command will produce a target tree in a format that supports\n"
3521
3519
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3522
3520
"converted into earlier formats like 'dirstate-tags'."
3523
3521
msgstr ""
3524
3522
3525
#: bzrlib/builtins.py:5598
3523
#: bzrlib/builtins.py:5505
3526
3524
msgid ""
3527
3525
"The TREE argument should be a subdirectory of a working tree. That\n"
3528
3526
"subdirectory will be converted into an independent tree, with its own\n"
3529
3527
"branch. Commits in the top-level tree will not apply to the new subtree."
3530
3528
msgstr ""
3531
3529
3532
#: bzrlib/builtins.py:5678
3530
#: bzrlib/builtins.py:5585
3533
3531
msgid "No submit branch specified or known"
3534
3532
msgstr ""
3535
3533
3536
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3534
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3537
3535
msgid "No public branch specified or known"
3538
3536
msgstr ""
3539
3537
3540
#: bzrlib/builtins.py:5691
3538
#: bzrlib/builtins.py:5598
3541
3539
msgid "bzr merge-directive takes at most two one revision identifiers"
3542
3540
msgstr ""
3543
3541
3544
#: bzrlib/builtins.py:5700
3542
#: bzrlib/builtins.py:5607
3545
3543
msgid "No revisions to bundle."
3546
3544
msgstr ""
3547
3545
3548
#: bzrlib/builtins.py:5719
3546
#: bzrlib/builtins.py:5626
3549
3547
msgid "Mail or create a merge-directive for submitting changes."
3550
3548
msgstr ""
3551
3549
3552
#: bzrlib/builtins.py:5721
3550
#: bzrlib/builtins.py:5628
3553
3551
msgid "A merge directive provides many things needed for requesting merges:"
3554
3552
msgstr ""
3555
3553
3556
#: bzrlib/builtins.py:5723
3554
#: bzrlib/builtins.py:5630
3557
3555
msgid "* A machine-readable description of the merge to perform"
3558
3556
msgstr ""
3559
3557
3560
#: bzrlib/builtins.py:5725
3558
#: bzrlib/builtins.py:5632
3561
3559
msgid "* An optional patch that is a preview of the changes requested"
3562
3560
msgstr ""
3563
3561
3564
#: bzrlib/builtins.py:5727
3562
#: bzrlib/builtins.py:5634
3565
3563
msgid ""
3566
3564
"* An optional bundle of revision data, so that the changes can be applied\n"
3567
3565
" directly from the merge directive, without retrieving data from a\n"
3568
3566
" branch."
3569
3567
msgstr ""
3570
3568
3571
#: bzrlib/builtins.py:5731
3569
#: bzrlib/builtins.py:5638
3572
3570
msgid ""
3573
3571
"`bzr send` creates a compact data set that, when applied using bzr\n"
3574
3572
"merge, has the same effect as merging from the source branch. "
3575
3573
msgstr ""
3576
3574
3577
#: bzrlib/builtins.py:5734
3575
#: bzrlib/builtins.py:5641
3578
3576
msgid ""
3579
3577
"By default the merge directive is self-contained and can be applied to any\n"
3580
3578
"branch containing submit_branch in its ancestory without needing access to\n"
3581
3579
"the source branch."
3582
3580
msgstr ""
3583
3581
3584
#: bzrlib/builtins.py:5738
3582
#: bzrlib/builtins.py:5645
3585
3583
msgid ""
3586
3584
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3587
3585
"revisions, but only a structured request to merge from the\n"
3590
3588
"included if known, so that people can check it later."
3591
3589
msgstr ""
3592
3590
3593
#: bzrlib/builtins.py:5744
3591
#: bzrlib/builtins.py:5651
3594
3592
msgid ""
3595
3593
"The submit branch defaults to the parent of the source branch, but can be\n"
3596
3594
"overridden. Both submit branch and public branch will be remembered in\n"
3599
3597
"be changed using --from."
3600
3598
msgstr ""
3601
3599
3602
#: bzrlib/builtins.py:5750
3600
#: bzrlib/builtins.py:5657
3603
3601
msgid ""
3604
3602
"Both the submit branch and the public branch follow the usual behavior with\n"
3605
3603
"respect to --remember: If there is no default location set, the first send\n"
3608
3606
"--remember. The value will only be saved if the location can be accessed."
3609
3607
msgstr ""
3610
3608
3611
#: bzrlib/builtins.py:5756
3609
#: bzrlib/builtins.py:5663
3612
3610
msgid ""
3613
3611
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3614
3612
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3616
3614
"in the merge directive."
3617
3615
msgstr ""
3618
3616
3619
#: bzrlib/builtins.py:5761
3617
#: bzrlib/builtins.py:5668
3620
3618
msgid ""
3621
3619
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3622
3620
"given, in which case it is sent to a file."
3623
3621
msgstr ""
3624
3622
3625
#: bzrlib/builtins.py:5764
3623
#: bzrlib/builtins.py:5671
3626
3624
msgid ""
3627
3625
"Mail is sent using your preferred mail program. This should be transparent\n"
3628
3626
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3629
3627
"If the preferred client can't be found (or used), your editor will be used."
3630
3628
msgstr ""
3631
3629
3632
#: bzrlib/builtins.py:5768
3630
#: bzrlib/builtins.py:5675
3633
3631
msgid ""
3634
3632
"To use a specific mail program, set the mail_client configuration option.\n"
3635
3633
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3641
3639
"supported clients."
3642
3640
msgstr ""
3643
3641
3644
#: bzrlib/builtins.py:5775
3642
#: bzrlib/builtins.py:5682
3645
3643
msgid ""
3646
3644
"If mail is being sent, a to address is required. This can be supplied\n"
3647
3645
"either on the commandline, by setting the submit_to configuration\n"
3649
3647
"in the submit branch."
3650
3648
msgstr ""
3651
3649
3652
#: bzrlib/builtins.py:5780
3650
#: bzrlib/builtins.py:5687
3653
3651
msgid ""
3654
3652
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3655
3653
"and\n"
3659
3657
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3660
3658
msgstr ""
3661
3659
3662
#: bzrlib/builtins.py:5786
3660
#: bzrlib/builtins.py:5693
3663
3661
msgid ""
3664
3662
"The merge directives created by bzr send may be applied using bzr merge or\n"
3665
3663
"bzr pull by specifying a file containing a merge directive as the location."
3666
3664
msgstr ""
3667
3665
3668
#: bzrlib/builtins.py:5789
3666
#: bzrlib/builtins.py:5696
3669
3667
msgid ""
3670
3668
"bzr send makes extensive use of public locations to map local locations "
3671
3669
"into\n"
3673
3671
"set them, and use `bzr info` to display them."
3674
3672
msgstr ""
3675
3673
3676
#: bzrlib/builtins.py:5813
3674
#: bzrlib/builtins.py:5720
3677
3675
msgid "Write merge directive to this file or directory; use - for stdout."
3678
3676
msgstr ""
3679
3677
3680
#: bzrlib/builtins.py:5817
3678
#: bzrlib/builtins.py:5724
3681
3679
msgid ""
3682
3680
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3683
3681
"strict disables the check."
3684
3682
msgstr ""
3685
3683
3686
#: bzrlib/builtins.py:5819
3684
#: bzrlib/builtins.py:5726
3687
3685
msgid "Mail the request to this address."
3688
3686
msgstr ""
3689
3687
3690
#: bzrlib/builtins.py:5823
3688
#: bzrlib/builtins.py:5730
3691
3689
msgid "Body for the email."
3692
3690
msgstr ""
3693
3691
3694
#: bzrlib/builtins.py:5876
3692
#: bzrlib/builtins.py:5783
3695
3693
msgid "Do not include a bundle in the merge directive."
3696
3694
msgstr ""
3697
3695
3698
#: bzrlib/builtins.py:5877
3696
#: bzrlib/builtins.py:5784
3699
3697
msgid "Do not include a preview patch in the merge directive."
3700
3698
msgstr ""
3701
3699
3702
#: bzrlib/builtins.py:5880
3700
#: bzrlib/builtins.py:5787
3703
3701
msgid "Remember submit and public branch."
3704
3702
msgstr ""
3705
3703
3706
#: bzrlib/builtins.py:5882
3704
#: bzrlib/builtins.py:5789
3707
3705
msgid ""
3708
3706
"Branch to generate the submission from, rather than the one containing the "
3709
3707
"working directory."
3710
3708
msgstr ""
3711
3709
3712
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3710
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3713
3711
msgid "format"
3714
3712
msgstr ""
3715
3713
3716
#: bzrlib/builtins.py:5893
3714
#: bzrlib/builtins.py:5800
3717
3715
msgid "Use the specified output format."
3718
3716
msgstr ""
3719
3717
3720
#: bzrlib/builtins.py:5915
3718
#: bzrlib/builtins.py:5822
3721
3719
msgid "Create, remove or modify a tag naming a revision."
3722
3720
msgstr ""
3723
3721
3724
#: bzrlib/builtins.py:5917
3722
#: bzrlib/builtins.py:5824
3725
3723
msgid ""
3726
3724
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3727
3725
"(--revision) option can be given -rtag:X, where X is any previously\n"
3728
3726
"created tag."
3729
3727
msgstr ""
3730
3728
3731
#: bzrlib/builtins.py:5921
3729
#: bzrlib/builtins.py:5828
3732
3730
msgid ""
3733
3731
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3734
3732
"along when you branch, push, pull or merge."
3735
3733
msgstr ""
3736
3734
3737
#: bzrlib/builtins.py:5924
3735
#: bzrlib/builtins.py:5831
3738
3736
msgid ""
3739
3737
"It is an error to give a tag name that already exists unless you pass\n"
3740
3738
"--force, in which case the tag is moved to point to the new revision."
3741
3739
msgstr ""
3742
3740
3743
#: bzrlib/builtins.py:5927
3741
#: bzrlib/builtins.py:5834
3744
3742
msgid ""
3745
3743
"To rename a tag (change the name but keep it on the same revsion), run "
3746
3744
"``bzr\n"
3747
3745
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3748
3746
msgstr ""
3749
3747
3750
#: bzrlib/builtins.py:5930
3748
#: bzrlib/builtins.py:5837
3751
3749
msgid ""
3752
3750
"If no tag name is specified it will be determined through the \n"
3753
3751
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3755
3753
"details."
3756
3754
msgstr ""
3757
3755
3758
#: bzrlib/builtins.py:5940
3756
#: bzrlib/builtins.py:5847
3759
3757
msgid "Delete this tag rather than placing it."
3760
3758
msgstr ""
3761
3759
3762
#: bzrlib/builtins.py:5943
3760
#: bzrlib/builtins.py:5850
3763
3761
msgid "Branch in which to place the tag."
3764
3762
msgstr ""
3765
3763
3766
#: bzrlib/builtins.py:5945
3764
#: bzrlib/builtins.py:5852
3767
3765
msgid "Replace existing tags."
3768
3766
msgstr ""
3769
3767
3770
#: bzrlib/builtins.py:5960
3768
#: bzrlib/builtins.py:5867
3771
3769
msgid "No tag specified to delete."
3772
3770
msgstr ""
3773
3771
3774
#: bzrlib/builtins.py:5962
3772
#: bzrlib/builtins.py:5869
3775
3773
#, python-format
3776
3774
msgid "Deleted tag %s."
3777
3775
msgstr ""
3778
3776
3779
#: bzrlib/builtins.py:5976
3777
#: bzrlib/builtins.py:5883
3780
3778
msgid "Please specify a tag name."
3781
3779
msgstr ""
3782
3780
3783
#: bzrlib/builtins.py:5984
3781
#: bzrlib/builtins.py:5891
3784
3782
#, python-format
3785
3783
msgid "Tag %s already exists for that revision."
3786
3784
msgstr ""
3787
3785
3788
#: bzrlib/builtins.py:5988
3786
#: bzrlib/builtins.py:5895
3789
3787
#, python-format
3790
3788
msgid "Created tag %s."
3791
3789
msgstr ""
3792
3790
3793
#: bzrlib/builtins.py:5990
3791
#: bzrlib/builtins.py:5897
3794
3792
#, python-format
3795
3793
msgid "Updated tag %s."
3796
3794
msgstr ""
3797
3795
3798
#: bzrlib/builtins.py:5994
3796
#: bzrlib/builtins.py:5901
3799
3797
msgid "List tags."
3800
3798
msgstr ""
3801
3799
3802
#: bzrlib/builtins.py:5996
3800
#: bzrlib/builtins.py:5903
3803
3801
msgid ""
3804
3802
"This command shows a table of tag names and the revisions they reference."
3805
3803
msgstr ""
3806
3804
3807
#: bzrlib/builtins.py:6002
3805
#: bzrlib/builtins.py:5909
3808
3806
msgid "Branch whose tags should be displayed."
3809
3807
msgstr ""
3810
3808
3811
#: bzrlib/builtins.py:6004
3809
#: bzrlib/builtins.py:5911
3812
3810
msgid "Sort tags by different criteria."
3813
3811
msgstr ""
3814
3812
3815
#: bzrlib/builtins.py:6004
3813
#: bzrlib/builtins.py:5911
3816
3814
msgid "Sorting"
3817
3815
msgstr ""
3818
3816
3819
#: bzrlib/builtins.py:6073
3817
#: bzrlib/builtins.py:5980
3820
3818
msgid "Reconfigure the type of a bzr directory."
3821
3819
msgstr ""
3822
3820
3823
#: bzrlib/builtins.py:6075
3821
#: bzrlib/builtins.py:5982
3824
3822
msgid "A target configuration must be specified."
3825
3823
msgstr ""
3826
3824
3827
#: bzrlib/builtins.py:6077
3825
#: bzrlib/builtins.py:5984
3828
3826
msgid ""
3829
3827
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3830
3828
"The order of preference is\n"
3835
3833
"If none of these is available, --bind-to must be specified."
3836
3834
msgstr ""
3837
3835
3838
#: bzrlib/builtins.py:6091
3836
#: bzrlib/builtins.py:5998
3839
3837
msgid "Tree type"
3840
3838
msgstr ""
3841
3839
3842
#: bzrlib/builtins.py:6092
3840
#: bzrlib/builtins.py:5999
3843
3841
msgid "The relation between branch and tree."
3844
3842
msgstr ""
3845
3843
3846
#: bzrlib/builtins.py:6094
3844
#: bzrlib/builtins.py:6001
3847
3845
msgid "Reconfigure to be an unbound branch with no working tree."
3848
3846
msgstr ""
3849
3847
3850
#: bzrlib/builtins.py:6095
3848
#: bzrlib/builtins.py:6002
3851
3849
msgid "Reconfigure to be an unbound branch with a working tree."
3852
3850
msgstr ""
3853
3851
3854
#: bzrlib/builtins.py:6096
3852
#: bzrlib/builtins.py:6003
3855
3853
msgid "Reconfigure to be a bound branch with a working tree."
3856
3854
msgstr ""
3857
3855
3858
#: bzrlib/builtins.py:6097
3856
#: bzrlib/builtins.py:6004
3859
3857
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3860
3858
msgstr ""
3861
3859
3862
#: bzrlib/builtins.py:6102
3860
#: bzrlib/builtins.py:6009
3863
3861
msgid "Repository type"
3864
3862
msgstr ""
3865
3863
3866
#: bzrlib/builtins.py:6103
3864
#: bzrlib/builtins.py:6010
3867
3865
msgid "Location fo the repository."
3868
3866
msgstr ""
3869
3867
3870
#: bzrlib/builtins.py:6105
3868
#: bzrlib/builtins.py:6012
3871
3869
msgid ""
3872
3870
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3873
3871
msgstr ""
3874
3872
3875
#: bzrlib/builtins.py:6107
3873
#: bzrlib/builtins.py:6014
3876
3874
msgid "Reconfigure to use a shared repository."
3877
3875
msgstr ""
3878
3876
3879
#: bzrlib/builtins.py:6111
3877
#: bzrlib/builtins.py:6018
3880
3878
msgid "Trees in Repository"
3881
3879
msgstr ""
3882
3880
3883
#: bzrlib/builtins.py:6112
3881
#: bzrlib/builtins.py:6019
3884
3882
msgid "Whether new branches in the repository have trees."
3885
3883
msgstr ""
3886
3884
3887
#: bzrlib/builtins.py:6114
3885
#: bzrlib/builtins.py:6021
3888
3886
msgid ""
3889
3887
"Reconfigure repository to create working trees on branches by default."
3890
3888
msgstr ""
3891
3889
3892
#: bzrlib/builtins.py:6116
3890
#: bzrlib/builtins.py:6023
3893
3891
msgid ""
3894
3892
"Reconfigure repository to not create working trees on branches by default."
3895
3893
msgstr ""
3896
3894
3897
#: bzrlib/builtins.py:6119
3895
#: bzrlib/builtins.py:6026
3898
3896
msgid "Branch to bind checkout to."
3899
3897
msgstr ""
3900
3898
3901
#: bzrlib/builtins.py:6121
3899
#: bzrlib/builtins.py:6028
3902
3900
msgid "Perform reconfiguration even if local changes will be lost."
3903
3901
msgstr ""
3904
3902
3905
#: bzrlib/builtins.py:6124
3903
#: bzrlib/builtins.py:6031
3906
3904
msgid "Reconfigure a branch to be stacked on another branch."
3907
3905
msgstr ""
3908
3906
3909
#: bzrlib/builtins.py:6128
3907
#: bzrlib/builtins.py:6035
3910
3908
msgid ""
3911
3909
"Reconfigure a branch to be unstacked. This may require copying substantial "
3912
3910
"data into it."
3913
3911
msgstr ""
3914
3912
3915
#: bzrlib/builtins.py:6138
3913
#: bzrlib/builtins.py:6045
3916
3914
msgid "Can't use both --stacked-on and --unstacked"
3917
3915
msgstr ""
3918
3916
3919
#: bzrlib/builtins.py:6152
3917
#: bzrlib/builtins.py:6059
3920
3918
msgid "No target configuration specified"
3921
3919
msgstr ""
3922
3920
3923
#: bzrlib/builtins.py:6187
3921
#: bzrlib/builtins.py:6094
3924
3922
msgid "Set the branch of a checkout and update."
3925
3923
msgstr ""
3926
3924
3927
#: bzrlib/builtins.py:6189
3925
#: bzrlib/builtins.py:6096
3928
3926
msgid ""
3929
3927
"For lightweight checkouts, this changes the branch being referenced.\n"
3930
3928
"For heavyweight checkouts, this checks that there are no local commits\n"
3932
3930
"of the new location and binds to it."
3933
3931
msgstr ""
3934
3932
3935
#: bzrlib/builtins.py:6194
3933
#: bzrlib/builtins.py:6101
3936
3934
msgid ""
3937
3935
"In both cases, the working tree is updated and uncommitted changes\n"
3938
3936
"are merged. The user can commit or revert these as they desire."
3939
3937
msgstr ""
3940
3938
3941
#: bzrlib/builtins.py:6197
3939
#: bzrlib/builtins.py:6104
3942
3940
msgid "Pending merges need to be committed or reverted before using switch."
3943
3941
msgstr ""
3944
3942
3945
#: bzrlib/builtins.py:6199
3943
#: bzrlib/builtins.py:6106
3946
3944
msgid ""
3947
3945
"The path to the branch to switch to can be specified relative to the parent\n"
3948
3946
"directory of the current branch. For example, if you are currently in a\n"
3950
3948
"/path/to/newbranch."
3951
3949
msgstr ""
3952
3950
3953
#: bzrlib/builtins.py:6204
3951
#: bzrlib/builtins.py:6111
3954
3952
msgid ""
3955
3953
"Bound branches use the nickname of its master branch unless it is set\n"
3956
3954
"locally, in which case switching will update the local nickname to be\n"
3957
3955
"that of the master."
3958
3956
msgstr ""
3959
3957
3960
#: bzrlib/builtins.py:6212
3958
#: bzrlib/builtins.py:6119
3961
3959
msgid "Switch even if local commits will be lost."
3962
3960
msgstr ""
3963
3961
3964
#: bzrlib/builtins.py:6215
3962
#: bzrlib/builtins.py:6122
3965
3963
msgid "Create the target branch from this one before switching to it."
3966
3964
msgstr ""
3967
3965
3968
#: bzrlib/builtins.py:6229
3966
#: bzrlib/builtins.py:6134
3969
3967
msgid "You must supply either a revision or a location"
3970
3968
msgstr ""
3971
3969
3972
#: bzrlib/builtins.py:6242
3970
#: bzrlib/builtins.py:6145
3973
3971
msgid "cannot create branch without source branch"
3974
3972
msgstr ""
3975
3973
3976
#: bzrlib/builtins.py:6262
3974
#: bzrlib/builtins.py:6209
3977
3975
msgid "Manage filtered views."
3978
3976
msgstr ""
3979
3977
3980
#: bzrlib/builtins.py:6264
3978
#: bzrlib/builtins.py:6211
3981
3979
msgid ""
3982
3980
"Views provide a mask over the tree so that users can focus on\n"
3983
3981
"a subset of a tree when doing their work. After creating a view,\n"
3987
3985
"must be within the current view."
3988
3986
msgstr ""
3989
3987
3990
#: bzrlib/builtins.py:6271
3988
#: bzrlib/builtins.py:6218
3991
3989
msgid ""
3992
3990
"In most cases, a view has a short life-span: it is created to make\n"
3993
3991
"a selected change and is deleted once that change is committed.\n"
3995
3993
"and switch between them."
3996
3994
msgstr ""
3997
3995
3998
#: bzrlib/builtins.py:6276
3996
#: bzrlib/builtins.py:6223
3999
3997
msgid ""
4000
3998
"To disable the current view without deleting it, you can switch to\n"
4001
3999
"the pseudo view called ``off``. This can be useful when you need\n"
4003
4001
"want to switch back to your view after that."
4004
4002
msgstr ""
4005
4003
4006
#: bzrlib/builtins.py:6281
4004
#: bzrlib/builtins.py:6228
4007
4005
msgid ""
4008
4006
":Examples:\n"
4009
4007
" To define the current view::"
4010
4008
msgstr ""
4011
4009
4012
#: bzrlib/builtins.py:6284
4010
#: bzrlib/builtins.py:6231
4013
4011
msgid " bzr view file1 dir1 ..."
4014
4012
msgstr ""
4015
4013
4016
#: bzrlib/builtins.py:6286
4014
#: bzrlib/builtins.py:6233
4017
4015
msgid " To list the current view::"
4018
4016
msgstr ""
4019
4017
4020
#: bzrlib/builtins.py:6288
4018
#: bzrlib/builtins.py:6235
4021
4019
msgid " bzr view"
4022
4020
msgstr ""
4023
4021
4024
#: bzrlib/builtins.py:6290
4022
#: bzrlib/builtins.py:6237
4025
4023
msgid " To delete the current view::"
4026
4024
msgstr ""
4027
4025
4028
#: bzrlib/builtins.py:6292
4026
#: bzrlib/builtins.py:6239
4029
4027
msgid " bzr view --delete"
4030
4028
msgstr ""
4031
4029
4032
#: bzrlib/builtins.py:6294
4030
#: bzrlib/builtins.py:6241
4033
4031
msgid " To disable the current view without deleting it::"
4034
4032
msgstr ""
4035
4033
4036
#: bzrlib/builtins.py:6296
4034
#: bzrlib/builtins.py:6243
4037
4035
msgid " bzr view --switch off"
4038
4036
msgstr ""
4039
4037
4040
#: bzrlib/builtins.py:6298
4038
#: bzrlib/builtins.py:6245
4041
4039
msgid " To define a named view and switch to it::"
4042
4040
msgstr ""
4043
4041
4044
#: bzrlib/builtins.py:6300
4042
#: bzrlib/builtins.py:6247
4045
4043
msgid " bzr view --name view-name file1 dir1 ..."
4046
4044
msgstr ""
4047
4045
4048
#: bzrlib/builtins.py:6302
4046
#: bzrlib/builtins.py:6249
4049
4047
msgid " To list a named view::"
4050
4048
msgstr ""
4051
4049
4052
#: bzrlib/builtins.py:6304
4050
#: bzrlib/builtins.py:6251
4053
4051
msgid " bzr view --name view-name"
4054
4052
msgstr ""
4055
4053
4056
#: bzrlib/builtins.py:6306
4054
#: bzrlib/builtins.py:6253
4057
4055
msgid " To delete a named view::"
4058
4056
msgstr ""
4059
4057
4060
#: bzrlib/builtins.py:6308
4058
#: bzrlib/builtins.py:6255
4061
4059
msgid " bzr view --name view-name --delete"
4062
4060
msgstr ""
4063
4061
4064
#: bzrlib/builtins.py:6310
4062
#: bzrlib/builtins.py:6257
4065
4063
msgid " To switch to a named view::"
4066
4064
msgstr ""
4067
4065
4068
#: bzrlib/builtins.py:6312
4066
#: bzrlib/builtins.py:6259
4069
4067
msgid " bzr view --switch view-name"
4070
4068
msgstr ""
4071
4069
4072
#: bzrlib/builtins.py:6314
4070
#: bzrlib/builtins.py:6261
4073
4071
msgid " To list all views defined::"
4074
4072
msgstr ""
4075
4073
4076
#: bzrlib/builtins.py:6316
4074
#: bzrlib/builtins.py:6263
4077
4075
msgid " bzr view --all"
4078
4076
msgstr ""
4079
4077
4080
#: bzrlib/builtins.py:6318
4078
#: bzrlib/builtins.py:6265
4081
4079
msgid " To delete all views::"
4082
4080
msgstr ""
4083
4081
4084
#: bzrlib/builtins.py:6320
4082
#: bzrlib/builtins.py:6267
4085
4083
msgid " bzr view --delete --all"
4086
4084
msgstr ""
4087
4085
4088
#: bzrlib/builtins.py:6327
4086
#: bzrlib/builtins.py:6274
4089
4087
msgid "Apply list or delete action to all views."
4090
4088
msgstr ""
4091
4089
4092
#: bzrlib/builtins.py:6330
4090
#: bzrlib/builtins.py:6277
4093
4091
msgid "Delete the view."
4094
4092
msgstr ""
4095
4093
4096
#: bzrlib/builtins.py:6333
4094
#: bzrlib/builtins.py:6280
4097
4095
msgid "Name of the view to define, list or delete."
4098
4096
msgstr ""
4099
4097
4100
#: bzrlib/builtins.py:6337
4098
#: bzrlib/builtins.py:6284
4101
4099
msgid "Name of the view to switch to."
4102
4100
msgstr ""
4103
4101
4104
#: bzrlib/builtins.py:6356
4102
#: bzrlib/builtins.py:6303
4105
4103
msgid "Both --delete and a file list specified"
4106
4104
msgstr ""
4107
4105
4108
#: bzrlib/builtins.py:6359
4106
#: bzrlib/builtins.py:6306
4109
4107
msgid "Both --delete and --switch specified"
4110
4108
msgstr ""
4111
4109
4112
#: bzrlib/builtins.py:6362
4110
#: bzrlib/builtins.py:6309
4113
4111
msgid "Deleted all views.\n"
4114
4112
msgstr ""
4115
4113
4116
#: bzrlib/builtins.py:6364
4114
#: bzrlib/builtins.py:6311
4117
4115
msgid "No current view to delete"
4118
4116
msgstr ""
4119
4117
4120
#: bzrlib/builtins.py:6367
4118
#: bzrlib/builtins.py:6314
4121
4119
#, python-format
4122
4120
msgid "Deleted '%s' view.\n"
4123
4121
msgstr ""
4124
4122
4125
#: bzrlib/builtins.py:6371
4123
#: bzrlib/builtins.py:6318
4126
4124
msgid "Both --switch and a file list specified"
4127
4125
msgstr ""
4128
4126
4129
#: bzrlib/builtins.py:6374
4127
#: bzrlib/builtins.py:6321
4130
4128
msgid "Both --switch and --all specified"
4131
4129
msgstr ""
4132
4130
4133
#: bzrlib/builtins.py:6377
4131
#: bzrlib/builtins.py:6324
4134
4132
msgid "No current view to disable"
4135
4133
msgstr ""
4136
4134
4137
#: bzrlib/builtins.py:6379
4135
#: bzrlib/builtins.py:6326
4138
4136
#, python-format
4139
4137
msgid "Disabled '%s' view.\n"
4140
4138
msgstr ""
4141
4139
4142
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4140
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4143
4141
msgid "Using '{0}' view: {1}\n"
4144
4142
msgstr ""
4145
4143
4146
#: bzrlib/builtins.py:6386
4144
#: bzrlib/builtins.py:6333
4147
4145
msgid "Views defined:\n"
4148
4146
msgstr ""
4149
4147
4150
#: bzrlib/builtins.py:6395
4148
#: bzrlib/builtins.py:6342
4151
4149
msgid "No views defined.\n"
4152
4150
msgstr ""
4153
4151
4154
#: bzrlib/builtins.py:6402
4152
#: bzrlib/builtins.py:6349
4155
4153
msgid "Cannot change the 'off' pseudo view"
4156
4154
msgstr ""
4157
4155
4158
#: bzrlib/builtins.py:6410
4156
#: bzrlib/builtins.py:6357
4159
4157
msgid "No current view.\n"
4160
4158
msgstr ""
4161
4159
4162
#: bzrlib/builtins.py:6413
4160
#: bzrlib/builtins.py:6360
4163
4161
msgid "'{0}' view is: {1}\n"
4164
4162
msgstr ""
4165
4163
4166
#: bzrlib/builtins.py:6433
4164
#: bzrlib/builtins.py:6380
4167
4165
msgid " <no hooks installed>\n"
4168
4166
msgstr ""
4169
4167
4170
#: bzrlib/builtins.py:6437
4168
#: bzrlib/builtins.py:6384
4171
4169
msgid "Remove a branch."
4172
4170
msgstr ""
4173
4171
4174
#: bzrlib/builtins.py:6439
4172
#: bzrlib/builtins.py:6386
4175
4173
msgid ""
4176
4174
"This will remove the branch from the specified location but \n"
4177
4175
"will keep any working tree or repository in place."
4178
4176
msgstr ""
4179
4177
4180
#: bzrlib/builtins.py:6444
4178
#: bzrlib/builtins.py:6391
4181
4179
msgid " Remove the branch at repo/trunk::"
4182
4180
msgstr ""
4183
4181
4184
#: bzrlib/builtins.py:6446
4182
#: bzrlib/builtins.py:6393
4185
4183
msgid " bzr remove-branch repo/trunk"
4186
4184
msgstr ""
4187
4185
4188
#: bzrlib/builtins.py:6461
4186
#: bzrlib/builtins.py:6408
4189
4187
msgid "Plaintext diff output."
4190
4188
msgstr ""
4191
4189
4192
#: bzrlib/builtins.py:6462
4190
#: bzrlib/builtins.py:6409
4193
4191
msgid "Temporarily set aside some changes from the current tree."
4194
4192
msgstr ""
4195
4193
4196
#: bzrlib/builtins.py:6464
4194
#: bzrlib/builtins.py:6411
4197
4195
msgid ""
4198
4196
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4199
4197
"ie. out of the way, until a later time when you can bring them back from\n"
4202
4200
"will they survive its deletion."
4203
4201
msgstr ""
4204
4202
4205
#: bzrlib/builtins.py:6470
4203
#: bzrlib/builtins.py:6417
4206
4204
msgid "If shelve --list is specified, previously-shelved changes are listed."
4207
4205
msgstr ""
4208
4206
4209
#: bzrlib/builtins.py:6472
4207
#: bzrlib/builtins.py:6419
4210
4208
msgid ""
4211
4209
"Shelve is intended to help separate several sets of changes that have\n"
4212
4210
"been inappropriately mingled. If you just want to get rid of all changes\n"
4214
4212
"shelve all text changes at once, use shelve --all."
4215
4213
msgstr ""
4216
4214
4217
#: bzrlib/builtins.py:6477
4215
#: bzrlib/builtins.py:6424
4218
4216
msgid ""
4219
4217
"If filenames are specified, only the changes to those files will be\n"
4220
4218
"shelved. Other files will be left untouched."
4221
4219
msgstr ""
4222
4220
4223
#: bzrlib/builtins.py:6480
4221
#: bzrlib/builtins.py:6427
4224
4222
msgid ""
4225
4223
"If a revision is specified, changes since that revision will be shelved."
4226
4224
msgstr ""
4227
4225
4228
#: bzrlib/builtins.py:6482
4226
#: bzrlib/builtins.py:6429
4229
4227
msgid ""
4230
4228
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4231
4229
"restore the most recently shelved changes."
4232
4230
msgstr ""
4233
4231
4234
#: bzrlib/builtins.py:6485
4232
#: bzrlib/builtins.py:6432
4235
4233
msgid ""
4236
4234
"For complicated changes, it is possible to edit the changes in a separate\n"
4237
4235
"editor program to decide what the file remaining in the working copy\n"
4238
4236
"should look like. To do this, add the configuration option"
4239
4237
msgstr ""
4240
4238
4241
#: bzrlib/builtins.py:6489
4239
#: bzrlib/builtins.py:6436
4242
4240
msgid " change_editor = PROGRAM @new_path @old_path"
4243
4241
msgstr ""
4244
4242
4245
#: bzrlib/builtins.py:6491
4243
#: bzrlib/builtins.py:6438
4246
4244
msgid ""
4247
4245
"where @new_path is replaced with the path of the new version of the \n"
4248
4246
"file and @old_path is replaced with the path of the old version of \n"
4251
4249
" "
4252
4250
msgstr ""
4253
4251
4254
#: bzrlib/builtins.py:6503
4252
#: bzrlib/builtins.py:6450
4255
4253
msgid "Shelve all changes."
4256
4254
msgstr ""
4257
4255
4258
#: bzrlib/builtins.py:6505
4256
#: bzrlib/builtins.py:6452
4259
4257
msgid "Method to use for writing diffs."
4260
4258
msgstr ""
4261
4259
4262
#: bzrlib/builtins.py:6505
4260
#: bzrlib/builtins.py:6452
4263
4261
msgid "writer"
4264
4262
msgstr ""
4265
4263
4266
#: bzrlib/builtins.py:6509
4264
#: bzrlib/builtins.py:6456
4267
4265
msgid "List shelved changes."
4268
4266
msgstr ""
4269
4267
4270
#: bzrlib/builtins.py:6511
4268
#: bzrlib/builtins.py:6458
4271
4269
msgid "Destroy removed changes instead of shelving them."
4272
4270
msgstr ""
4273
4271
4274
#: bzrlib/builtins.py:6540
4272
#: bzrlib/builtins.py:6487
4275
4273
msgid "No shelved changes."
4276
4274
msgstr ""
4277
4275
4278
#: bzrlib/builtins.py:6551
4276
#: bzrlib/builtins.py:6498
4279
4277
msgid "Restore shelved changes."
4280
4278
msgstr ""
4281
4279
4282
#: bzrlib/builtins.py:6553
4280
#: bzrlib/builtins.py:6500
4283
4281
msgid ""
4284
4282
"By default, the most recently shelved changes are restored. However if you\n"
4285
4283
"specify a shelf by id those changes will be restored instead. This works\n"
4286
4284
"best when the changes don't depend on each other."
4287
4285
msgstr ""
4288
4286
4289
#: bzrlib/builtins.py:6562
4287
#: bzrlib/builtins.py:6509
4290
4288
msgid "The action to perform."
4291
4289
msgstr ""
4292
4290
4293
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4291
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4294
4292
msgid "action"
4295
4293
msgstr ""
4296
4294
4297
#: bzrlib/builtins.py:6564
4295
#: bzrlib/builtins.py:6511
4298
4296
msgid "Apply changes and remove from the shelf."
4299
4297
msgstr ""
4300
4298
4301
#: bzrlib/builtins.py:6565
4299
#: bzrlib/builtins.py:6512
4302
4300
msgid "Show changes, but do not apply or remove them."
4303
4301
msgstr ""
4304
4302
4305
#: bzrlib/builtins.py:6566
4303
#: bzrlib/builtins.py:6513
4306
4304
msgid ""
4307
4305
"Instead of unshelving the changes, show the diff that would result from "
4308
4306
"unshelving."
4309
4307
msgstr ""
4310
4308
4311
#: bzrlib/builtins.py:6568
4309
#: bzrlib/builtins.py:6515
4312
4310
msgid "Delete changes without applying them."
4313
4311
msgstr ""
4314
4312
4315
#: bzrlib/builtins.py:6569
4313
#: bzrlib/builtins.py:6516
4316
4314
msgid "Apply changes but don't delete them."
4317
4315
msgstr ""
4318
4316
4319
#: bzrlib/builtins.py:6584
4317
#: bzrlib/builtins.py:6531
4320
4318
msgid "Remove unwanted files from working tree."
4321
4319
msgstr ""
4322
4320
4323
#: bzrlib/builtins.py:6586
4321
#: bzrlib/builtins.py:6533
4324
4322
msgid ""
4325
4323
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4326
4324
"files are never deleted."
4327
4325
msgstr ""
4328
4326
4329
#: bzrlib/builtins.py:6589
4327
#: bzrlib/builtins.py:6536
4330
4328
msgid ""
4331
4329
"Another class is 'detritus', which includes files emitted by bzr during\n"
4332
4330
"normal operations and selftests. (The value of these files decreases with\n"
4333
4331
"time.)"
4334
4332
msgstr ""
4335
4333
4336
#: bzrlib/builtins.py:6593
4334
#: bzrlib/builtins.py:6540
4337
4335
msgid ""
4338
4336
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4339
4337
"flags are respected, and may be combined."
4340
4338
msgstr ""
4341
4339
4342
#: bzrlib/builtins.py:6596
4340
#: bzrlib/builtins.py:6543
4343
4341
msgid "To check what clean-tree will do, use --dry-run."
4344
4342
msgstr ""
4345
4343
4346
#: bzrlib/builtins.py:6599
4344
#: bzrlib/builtins.py:6546
4347
4345
msgid "Delete all ignored files."
4348
4346
msgstr ""
4349
4347
4350
#: bzrlib/builtins.py:6600
4348
#: bzrlib/builtins.py:6547
4351
4349
msgid ""
4352
4350
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4353
4351
msgstr ""
4354
4352
4355
#: bzrlib/builtins.py:6603
4353
#: bzrlib/builtins.py:6550
4356
4354
msgid "Delete files unknown to bzr (default)."
4357
4355
msgstr ""
4358
4356
4359
#: bzrlib/builtins.py:6604
4357
#: bzrlib/builtins.py:6551
4360
4358
msgid "Show files to delete instead of deleting them."
4361
4359
msgstr ""
4362
4360
4363
#: bzrlib/builtins.py:6606
4361
#: bzrlib/builtins.py:6553
4364
4362
msgid "Do not prompt before deleting."
4365
4363
msgstr ""
4366
4364
4420
4418
msgstr[0] ""
4421
4419
msgstr[1] ""
4422
4420
4423
#: bzrlib/bzrdir.py:490
4421
#: bzrlib/bzrdir.py:489
4424
4422
msgid ""
4425
4423
"making backup of {0}\n"
4426
4424
" to {1}"
4427
4425
msgstr ""
4428
4426
4429
#: bzrlib/bzrdir.py:513
4427
#: bzrlib/bzrdir.py:512
4430
4428
msgid "renamed {0} to {1}"
4431
4429
msgstr ""
4432
4430
4433
#: bzrlib/bzrdir.py:1652
4431
#: bzrlib/bzrdir.py:1663
4434
4432
#, python-format
4435
4433
msgid ""
4436
4434
"Source repository format does not support stacking, using format:\n"
4437
4435
" %s"
4438
4436
msgstr ""
4439
4437
4440
#: bzrlib/bzrdir.py:1672
4438
#: bzrlib/bzrdir.py:1683
4441
4439
#, python-format
4442
4440
msgid ""
4443
4441
"Source branch format does not support stacking, using format:\n"
4444
4442
" %s"
4445
4443
msgstr ""
4446
4444
4447
#: bzrlib/bzrdir.py:1818
4445
#: bzrlib/bzrdir.py:1829
4448
4446
msgid "starting repository conversion"
4449
4447
msgstr ""
4450
4448
4451
#: bzrlib/bzrdir.py:2039
4449
#: bzrlib/bzrdir.py:2058
4452
4450
msgid "Using default stacking branch {0} at {1}"
4453
4451
msgstr ""
4454
4452
4687
4685
msgid "bzr version-info --revision takes exactly one revision specifier"
4688
4686
msgstr ""
4689
4687
4690
#: bzrlib/commands.py:229
4688
#: bzrlib/commands.py:228
4691
4689
#, python-format
4692
4690
msgid "unknown command \"%s\""
4693
4691
msgstr ""
4694
4692
4695
#: bzrlib/commands.py:476
4693
#: bzrlib/commands.py:475
4696
4694
msgid "No help for this command."
4697
4695
msgstr ""
4698
4696
4699
#: bzrlib/commands.py:489
4697
#: bzrlib/commands.py:488
4700
4698
#, python-format
4701
4699
msgid ":Purpose: %s\n"
4702
4700
msgstr ""
4703
4701
4704
#: bzrlib/commands.py:491
4702
#: bzrlib/commands.py:490
4705
4703
#, python-format
4706
4704
msgid ""
4707
4705
":Usage:\n"
4708
4706
"%s\n"
4709
4707
msgstr ""
4710
4708
4711
#: bzrlib/commands.py:493
4709
#: bzrlib/commands.py:492
4712
4710
#, python-format
4713
4711
msgid ":Usage: %s\n"
4714
4712
msgstr ""
4715
4713
4716
#: bzrlib/commands.py:512
4714
#: bzrlib/commands.py:511
4717
4715
#, python-format
4718
4716
msgid ":Options:%s"
4719
4717
msgstr ""
4720
4718
4721
#: bzrlib/commands.py:523
4719
#: bzrlib/commands.py:522
4722
4720
#, python-format
4723
4721
msgid ""
4724
4722
":Description:\n"
4726
4724
"\n"
4727
4725
msgstr ""
4728
4726
4729
#: bzrlib/commands.py:533
4727
#: bzrlib/commands.py:532
4730
4728
#, python-format
4731
4729
msgid ""
4732
4730
"See bzr help %s for more details and examples.\n"
4733
4731
"\n"
4734
4732
msgstr ""
4735
4733
4736
#: bzrlib/commands.py:538
4734
#: bzrlib/commands.py:537
4737
4735
msgid ":Aliases: "
4738
4736
msgstr ""
4739
4737
4740
#: bzrlib/commands.py:542
4738
#: bzrlib/commands.py:541
4741
4739
#, python-format
4742
4740
msgid ":From: plugin \"%s\"\n"
4743
4741
msgstr ""
4744
4742
4745
#: bzrlib/commands.py:554
4743
#: bzrlib/commands.py:553
4746
4744
msgid ":doc:`{0} <{1}-help>`"
4747
4745
msgstr ""
4748
4746
4749
#: bzrlib/commands.py:558
4747
#: bzrlib/commands.py:557
4750
4748
#, python-format
4751
4749
msgid ":See also: %s"
4752
4750
msgstr ""
4753
4751
4754
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4752
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4755
4753
msgid "Only ASCII permitted in option names"
4756
4754
msgstr ""
4757
4755
4758
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4756
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4759
4757
msgid "command {0!r} needs one or more {1}"
4760
4758
msgstr ""
4761
4759
4762
#: bzrlib/commands.py:858
4760
#: bzrlib/commands.py:857
4763
4761
msgid "command {0!r} requires argument {1}"
4764
4762
msgstr ""
4765
4763
4766
#: bzrlib/commands.py:865
4764
#: bzrlib/commands.py:864
4767
4765
msgid "extra argument to command {0}: {1}"
4768
4766
msgstr ""
4769
4767
4770
#: bzrlib/commands.py:962
4768
#: bzrlib/commands.py:961
4771
4769
#, python-format
4772
4770
msgid "Profile data written to \"%s\"."
4773
4771
msgstr ""
4869
4867
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4870
4868
msgstr ""
4871
4869
4872
#: bzrlib/config.py:2485
4870
#: bzrlib/config.py:2499
4873
4871
msgid "{0} is not an SI unit."
4874
msgstr "{0} is not an SI unit."
4872
msgstr ""
4875
4873
4876
#: bzrlib/config.py:2949
4874
#: bzrlib/config.py:2956
4877
4875
msgid ""
4878
4876
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4879
4877
"will be saved."
4880
4878
msgstr ""
4881
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4882
"will be saved."
4883
4879
4884
#: bzrlib/config.py:3093
4880
#: bzrlib/config.py:3100
4885
4881
#, python-format
4886
4882
msgid "Invalid '%s', should be of the form 'name=value'"
4887
4883
msgstr ""
4888
4884
4889
#: bzrlib/config.py:3962
4885
#: bzrlib/config.py:3969
4890
4886
msgid "Display, set or remove a configuration option."
4891
4887
msgstr ""
4892
4888
4893
#: bzrlib/config.py:3964
4889
#: bzrlib/config.py:3971
4894
4890
msgid "Display the active value for a given option."
4895
4891
msgstr ""
4896
4892
4897
#: bzrlib/config.py:3966
4893
#: bzrlib/config.py:3973
4898
4894
msgid ""
4899
4895
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4900
4896
"matching options are displayed mentioning their scope. The active value\n"
4901
4897
"that bzr will take into account is the first one displayed for each option."
4902
4898
msgstr ""
4903
4899
4904
#: bzrlib/config.py:3970
4900
#: bzrlib/config.py:3977
4905
4901
msgid "If no NAME is given, --all .* is implied."
4906
4902
msgstr ""
4907
4903
4908
#: bzrlib/config.py:3972
4904
#: bzrlib/config.py:3979
4909
4905
msgid ""
4910
4906
"Setting a value is achieved by using name=value without spaces. The value\n"
4911
4907
"is set in the most relevant scope and can be checked by displaying the\n"
4912
4908
"option again."
4913
4909
msgstr ""
4914
4910
4915
#: bzrlib/config.py:3984
4911
#: bzrlib/config.py:3991
4916
4912
msgid "Reduce the scope to the specified configuration file."
4917
4913
msgstr ""
4918
4914
4919
#: bzrlib/config.py:3988
4915
#: bzrlib/config.py:3995
4920
4916
msgid "Display all the defined values for the matching options."
4921
4917
msgstr ""
4922
4918
4923
#: bzrlib/config.py:3990
4919
#: bzrlib/config.py:3997
4924
4920
msgid "Remove the option from the configuration file."
4925
4921
msgstr ""
4926
4922
5000
4996
msgstr[0] ""
5001
4997
msgstr[1] ""
5002
4998
5003
#: bzrlib/controldir.py:710
4999
#: bzrlib/controldir.py:698
5004
5000
msgid "{0} is{1} redirected to {2}"
5005
5001
msgstr ""
5006
5002
5106
5102
msgid "The value '%(value)s' is not a valid value."
5107
5103
msgstr ""
5108
5104
5109
#: bzrlib/errors.py:424
5110
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5111
msgstr ""
5112
5113
5105
#: bzrlib/errors.py:443
5114
5106
msgid "Generic path error: %(path)r%(extra)s)"
5115
5107
msgstr ""
5209
5201
msgstr ""
5210
5202
5211
5203
#: bzrlib/errors.py:705
5212
msgid "A control directory already exists: \"%(path)s\"."
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:710
5216
5204
msgid "Already a branch: \"%(path)s\"."
5217
5205
msgstr ""
5218
5206
5219
#: bzrlib/errors.py:715
5220
msgid "Parent branch already exists: \"%(path)s\"."
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:721
5207
#: bzrlib/errors.py:711
5224
5208
msgid ""
5225
5209
"Directory contains a branch, but no working tree (use bzr checkout if you "
5226
5210
"wish to build a working tree): \"%(path)s\""
5227
5211
msgstr ""
5228
5212
5213
#: bzrlib/errors.py:716
5214
msgid ""
5215
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5216
msgstr ""
5217
5229
5218
#: bzrlib/errors.py:726
5230
5219
msgid ""
5231
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5220
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5232
5221
msgstr ""
5233
5222
5234
5223
#: bzrlib/errors.py:736
5235
msgid ""
5236
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:746
5240
5224
msgid "No repository present: \"%(path)s\""
5241
5225
msgstr ""
5242
5226
5243
#: bzrlib/errors.py:753
5227
#: bzrlib/errors.py:743
5244
5228
msgid ""
5245
5229
"Unsupported branch format: %(format)s\n"
5246
5230
"Please run 'bzr upgrade'"
5247
5231
msgstr ""
5248
5232
5249
#: bzrlib/errors.py:759
5233
#: bzrlib/errors.py:749
5250
5234
msgid "Unknown %(kind)s format: %(format)r"
5251
5235
msgstr ""
5252
5236
5237
#: bzrlib/errors.py:758
5238
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5239
msgstr ""
5240
5253
5241
#: bzrlib/errors.py:768
5254
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5255
msgstr ""
5256
5257
#: bzrlib/errors.py:778
5258
5242
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5259
msgstr "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5243
msgstr ""
5260
5244
5261
#: bzrlib/errors.py:793
5245
#: bzrlib/errors.py:783
5262
5246
msgid ""
5263
5247
"%(target)s\n"
5264
5248
"is not compatible with\n"
5266
5250
"%(details)s"
5267
5251
msgstr ""
5268
5252
5253
#: bzrlib/errors.py:799
5254
msgid "Revision is not compatible with %(repo_format)s"
5255
msgstr ""
5256
5269
5257
#: bzrlib/errors.py:809
5270
msgid "Revision is not compatible with %(repo_format)s"
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:819
5274
5258
msgid "%(context_info)s%(path)s is already versioned."
5275
5259
msgstr ""
5276
5260
5277
#: bzrlib/errors.py:840
5261
#: bzrlib/errors.py:830
5278
5262
msgid "%(context_info)s%(path)s is not versioned."
5279
5263
msgstr ""
5280
5264
5281
#: bzrlib/errors.py:861
5265
#: bzrlib/errors.py:851
5282
5266
msgid "Path(s) are not versioned: %(paths_as_string)s"
5283
5267
msgstr ""
5284
5268
5285
#: bzrlib/errors.py:872
5269
#: bzrlib/errors.py:862
5286
5270
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5287
5271
msgstr ""
5288
5272
5289
#: bzrlib/errors.py:891
5273
#: bzrlib/errors.py:881
5290
5274
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5291
5275
msgstr ""
5292
5276
5293
#: bzrlib/errors.py:899
5277
#: bzrlib/errors.py:889
5294
5278
msgid ""
5295
5279
"Filename %(filename)r is not valid in your current filesystem encoding "
5296
5280
"%(fs_encoding)s"
5297
5281
msgstr ""
5298
5282
5299
#: bzrlib/errors.py:910
5283
#: bzrlib/errors.py:900
5300
5284
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5301
5285
msgstr ""
5302
5286
5303
#: bzrlib/errors.py:928
5287
#: bzrlib/errors.py:918
5304
5288
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5305
5289
msgstr ""
5306
5290
5291
#: bzrlib/errors.py:957
5292
msgid "Cannot lock %(lock)s: %(why)s"
5293
msgstr ""
5294
5307
5295
#: bzrlib/errors.py:967
5308
msgid "Cannot lock %(lock)s: %(why)s"
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:977
5312
5296
msgid ""
5313
5297
"A transaction related operation was attempted after the transaction finished."
5314
5298
msgstr ""
5315
5299
5316
#: bzrlib/errors.py:1004
5300
#: bzrlib/errors.py:994
5317
5301
msgid "Cannot lock: transport is read only: %(transport)s"
5318
5302
msgstr ""
5319
5303
5320
#: bzrlib/errors.py:1012
5304
#: bzrlib/errors.py:1002
5321
5305
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5322
5306
msgstr ""
5323
5307
5324
#: bzrlib/errors.py:1023
5308
#: bzrlib/errors.py:1013
5325
5309
msgid ""
5326
5310
"Lock was broken while still open: %(lock)s - check storage consistency!"
5327
5311
msgstr ""
5328
5312
5329
#: bzrlib/errors.py:1034
5313
#: bzrlib/errors.py:1024
5330
5314
msgid ""
5331
5315
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5332
5316
"%(holder)r, wanted to break %(target)r"
5333
5317
msgstr ""
5334
5318
5335
#: bzrlib/errors.py:1046
5319
#: bzrlib/errors.py:1036
5336
5320
msgid ""
5337
5321
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5338
5322
"Use 'bzr break-lock' to clear it"
5339
5323
msgstr ""
5340
5324
5341
#: bzrlib/errors.py:1059
5325
#: bzrlib/errors.py:1049
5342
5326
msgid "Lock not held: %(lock)s"
5343
5327
msgstr ""
5344
5328
5345
#: bzrlib/errors.py:1088
5329
#: bzrlib/errors.py:1078
5346
5330
msgid "No changes to commit"
5347
5331
msgstr ""
5348
5332
5333
#: bzrlib/errors.py:1083
5334
msgid ""
5335
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5336
msgstr ""
5337
5349
5338
#: bzrlib/errors.py:1093
5350
5339
msgid ""
5351
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1103
5355
msgid ""
5356
5340
"Excluding paths during commit is not supported by repository at "
5357
5341
"%(repository)r."
5358
5342
msgstr ""
5359
5343
5360
#: bzrlib/errors.py:1112
5344
#: bzrlib/errors.py:1102
5361
5345
msgid ""
5362
5346
"The specified commit message contains characters unsupported by the current "
5363
5347
"encoding."
5364
5348
msgstr ""
5365
5349
5366
#: bzrlib/errors.py:1118
5350
#: bzrlib/errors.py:1108
5367
5351
msgid "Upgrade URL cannot work with readonly URLs."
5368
5352
msgstr ""
5369
5353
5370
#: bzrlib/errors.py:1123
5354
#: bzrlib/errors.py:1113
5371
5355
msgid "The branch format %(format)s is already at the most recent format."
5372
5356
msgstr ""
5373
5357
5374
#: bzrlib/errors.py:1146
5358
#: bzrlib/errors.py:1136
5375
5359
msgid "Option --change does not accept revision ranges"
5376
5360
msgstr ""
5377
5361
5378
#: bzrlib/errors.py:1151
5362
#: bzrlib/errors.py:1141
5379
5363
msgid "No namespace registered for string: %(spec)r"
5380
5364
msgstr ""
5381
5365
5382
#: bzrlib/errors.py:1170
5366
#: bzrlib/errors.py:1160
5383
5367
msgid ""
5384
5368
"Requested revision: '%(spec)s' does not exist in branch: "
5385
5369
"%(branch_url)s%(extra)s"
5386
5370
msgstr ""
5387
5371
5388
#: bzrlib/errors.py:1184
5372
#: bzrlib/errors.py:1174
5389
5373
msgid ""
5390
5374
"Operation denied because it would change the main history, which is not "
5391
5375
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5392
5376
msgstr ""
5393
5377
5394
#: bzrlib/errors.py:1195
5378
#: bzrlib/errors.py:1185
5395
5379
msgid ""
5396
5380
"These branches have diverged. Use the missing command to see how.\n"
5397
5381
"Use the merge command to reconcile them."
5398
5382
msgstr ""
5399
5383
5400
#: bzrlib/errors.py:1215
5384
#: bzrlib/errors.py:1205
5401
5385
msgid ""
5402
5386
"Branches have no common ancestor, and no merge base revision was specified."
5403
5387
msgstr ""
5404
5388
5405
#: bzrlib/errors.py:1221
5389
#: bzrlib/errors.py:1211
5406
5390
msgid ""
5407
5391
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5408
5392
msgstr ""
5409
5393
5410
#: bzrlib/errors.py:1227
5394
#: bzrlib/errors.py:1217
5411
5395
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5412
5396
msgstr ""
5413
5397
5414
#: bzrlib/errors.py:1236
5398
#: bzrlib/errors.py:1226
5415
5399
msgid ""
5416
5400
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5417
5401
msgstr ""
5418
5402
5419
#: bzrlib/errors.py:1245
5403
#: bzrlib/errors.py:1235
5420
5404
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5421
5405
msgstr ""
5422
5406
5423
#: bzrlib/errors.py:1254
5407
#: bzrlib/errors.py:1244
5424
5408
msgid "Branch %(branch)s has no commits."
5425
5409
msgstr ""
5426
5410
5427
#: bzrlib/errors.py:1272
5411
#: bzrlib/errors.py:1262
5428
5412
msgid ""
5429
5413
"Bound branch %(branch)s is out of date with master branch "
5430
5414
"%(master)s.%(extra_help)s"
5431
5415
msgstr ""
5432
5416
5433
#: bzrlib/errors.py:1284
5417
#: bzrlib/errors.py:1274
5434
5418
msgid ""
5435
5419
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5436
5420
"bound to %(remote)s."
5437
5421
msgstr ""
5438
5422
5439
#: bzrlib/errors.py:1296
5423
#: bzrlib/errors.py:1286
5440
5424
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5441
5425
msgstr ""
5442
5426
5443
#: bzrlib/errors.py:1305
5427
#: bzrlib/errors.py:1295
5444
5428
msgid ""
5445
5429
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5446
5430
"%(error)s"
5447
5431
msgstr ""
5448
5432
5449
#: bzrlib/errors.py:1317
5433
#: bzrlib/errors.py:1307
5450
5434
msgid "Error in processing weave: %(msg)s"
5451
5435
msgstr ""
5452
5436
5453
#: bzrlib/errors.py:1326
5437
#: bzrlib/errors.py:1316
5454
5438
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5455
5439
msgstr ""
5456
5440
5441
#: bzrlib/errors.py:1327
5442
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5443
msgstr ""
5444
5457
5445
#: bzrlib/errors.py:1337
5458
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1347
5462
5446
msgid "Weave invariant violated: %(what)s"
5463
5447
msgstr ""
5464
5448
5465
#: bzrlib/errors.py:1356
5449
#: bzrlib/errors.py:1346
5466
5450
msgid "Parents are mismatched between two revisions. %(msg)s"
5467
5451
msgstr ""
5468
5452
5469
#: bzrlib/errors.py:1378
5453
#: bzrlib/errors.py:1368
5470
5454
msgid ""
5471
5455
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5472
5456
"%(weave_b)s"
5473
5457
msgstr ""
5474
5458
5475
#: bzrlib/errors.py:1390
5459
#: bzrlib/errors.py:1380
5476
5460
msgid "Versioned file error"
5477
5461
msgstr ""
5478
5462
5463
#: bzrlib/errors.py:1385
5464
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5465
msgstr ""
5466
5479
5467
#: bzrlib/errors.py:1395
5480
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5468
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5481
5469
msgstr ""
5482
5470
5483
5471
#: bzrlib/errors.py:1405
5484
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1415
5488
5472
msgid "Text did not match its checksum: %(msg)s"
5489
5473
msgstr ""
5490
5474
5491
#: bzrlib/errors.py:1541
5475
#: bzrlib/errors.py:1531
5492
5476
msgid "Export format %(format)r not supported"
5493
5477
msgstr ""
5494
5478
5495
#: bzrlib/errors.py:1550
5479
#: bzrlib/errors.py:1540
5496
5480
msgid "Transport error: %(msg)s %(orig_error)s"
5497
5481
msgstr ""
5498
5482
5499
#: bzrlib/errors.py:1576
5483
#: bzrlib/errors.py:1566
5500
5484
msgid "Generic bzr smart protocol error: %(details)s"
5501
5485
msgstr ""
5502
5486
5503
#: bzrlib/errors.py:1584
5487
#: bzrlib/errors.py:1574
5504
5488
msgid "Received bad protocol version marker: %(marker)r"
5505
5489
msgstr ""
5506
5490
5507
#: bzrlib/errors.py:1616
5491
#: bzrlib/errors.py:1606
5508
5492
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5509
5493
msgstr ""
5510
5494
5511
#: bzrlib/errors.py:1621
5495
#: bzrlib/errors.py:1611
5512
5496
msgid "Connection error: %(msg)s %(orig_error)s"
5513
5497
msgstr ""
5514
5498
5515
#: bzrlib/errors.py:1626
5499
#: bzrlib/errors.py:1616
5516
5500
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5517
5501
msgstr ""
5518
5502
5519
#: bzrlib/errors.py:1647
5503
#: bzrlib/errors.py:1637
5520
5504
msgid "Connection closed: %(msg)s %(orig_error)s"
5521
5505
msgstr ""
5522
5506
5523
#: bzrlib/errors.py:1652
5507
#: bzrlib/errors.py:1642
5524
5508
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5525
5509
msgstr ""
5526
5510
5511
#: bzrlib/errors.py:1647
5512
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5513
msgstr ""
5514
5527
5515
#: bzrlib/errors.py:1657
5528
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1667
5532
5516
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5533
5517
msgstr ""
5534
5518
5535
#: bzrlib/errors.py:1682
5536
msgid "Certificate error: %(error)s"
5537
msgstr ""
5538
5539
#: bzrlib/errors.py:1690
5519
#: bzrlib/errors.py:1672
5540
5520
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5541
5521
msgstr ""
5542
5522
5543
#: bzrlib/errors.py:1704
5523
#: bzrlib/errors.py:1686
5544
5524
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5545
5525
msgstr ""
5546
5526
5547
#: bzrlib/errors.py:1712
5527
#: bzrlib/errors.py:1694
5548
5528
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5549
5529
msgstr ""
5550
5530
5551
#: bzrlib/errors.py:1721
5531
#: bzrlib/errors.py:1703
5552
5532
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5553
5533
msgstr ""
5554
5534
5555
#: bzrlib/errors.py:1735
5535
#: bzrlib/errors.py:1717
5556
5536
msgid "Too many redirections"
5557
5537
msgstr ""
5558
5538
5559
#: bzrlib/errors.py:1740
5539
#: bzrlib/errors.py:1722
5560
5540
msgid "Working tree has conflicts."
5561
5541
msgstr ""
5562
5542
5563
#: bzrlib/errors.py:1744
5543
#: bzrlib/errors.py:1726
5564
5544
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5565
5545
msgstr ""
5566
5546
5567
#: bzrlib/errors.py:1753
5547
#: bzrlib/errors.py:1735
5568
5548
msgid ""
5569
5549
"Error(s) parsing config file %(filename)s:\n"
5570
5550
"%(errors)s"
5571
5551
msgstr ""
5572
5552
5553
#: bzrlib/errors.py:1746
5554
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:1754
5558
msgid "%(username)r does not seem to contain a reasonable email address"
5559
msgstr ""
5560
5573
5561
#: bzrlib/errors.py:1763
5574
msgid ""
5575
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5576
"See ``bzr help %(name)s``"
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:1773
5580
msgid "%(username)r does not seem to contain a reasonable email address"
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:1782
5584
5562
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5585
5563
msgstr ""
5586
5564
5587
#: bzrlib/errors.py:1790
5565
#: bzrlib/errors.py:1771
5588
5566
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5589
5567
msgstr ""
5590
5568
5591
#: bzrlib/errors.py:1798
5569
#: bzrlib/errors.py:1779
5592
5570
msgid "Unable to import library \"%(library)s\": %(error)s"
5593
5571
msgstr ""
5594
5572
5595
#: bzrlib/errors.py:1806
5573
#: bzrlib/errors.py:1787
5596
5574
msgid "python-gpgme is not installed, it is needed to verify signatures"
5597
5575
msgstr ""
5598
5576
5599
#: bzrlib/errors.py:1814
5577
#: bzrlib/errors.py:1795
5600
5578
msgid ""
5601
5579
"The working tree for %(basedir)s has changed since the last commit, but "
5602
5580
"weave merge requires that it be unchanged"
5603
5581
msgstr ""
5604
5582
5605
#: bzrlib/errors.py:1824
5583
#: bzrlib/errors.py:1805
5606
5584
msgid ""
5607
5585
"Can't reprocess and show base, because reprocessing obscures the "
5608
5586
"relationship of conflicting lines to the base"
5609
5587
msgstr ""
5610
5588
5611
#: bzrlib/errors.py:1830
5589
#: bzrlib/errors.py:1811
5612
5590
msgid "Cycle in graph %(graph)r"
5613
5591
msgstr ""
5614
5592
5615
#: bzrlib/errors.py:1858
5593
#: bzrlib/errors.py:1839
5616
5594
msgid "File %(filename)s is not conflicted."
5617
5595
msgstr ""
5618
5596
5619
#: bzrlib/errors.py:1880
5597
#: bzrlib/errors.py:1861
5620
5598
msgid "No bundle was found in \"%(filename)s\"."
5621
5599
msgstr ""
5622
5600
5623
#: bzrlib/errors.py:1889
5601
#: bzrlib/errors.py:1870
5624
5602
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5625
5603
msgstr ""
5626
5604
5627
#: bzrlib/errors.py:1899
5605
#: bzrlib/errors.py:1880
5628
5606
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5629
5607
msgstr ""
5630
5608
5631
#: bzrlib/errors.py:1912
5609
#: bzrlib/errors.py:1893
5632
5610
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5633
5611
msgstr ""
5634
5612
5635
#: bzrlib/errors.py:1922
5613
#: bzrlib/errors.py:1903
5636
5614
msgid "Key %(key)s is already present in map"
5637
5615
msgstr ""
5638
5616
5639
#: bzrlib/errors.py:1927
5617
#: bzrlib/errors.py:1908
5640
5618
msgid "The prefix %(prefix)s is in the help search path twice."
5641
5619
msgstr ""
5642
5620
5643
#: bzrlib/errors.py:1937
5621
#: bzrlib/errors.py:1918
5644
5622
msgid ""
5645
5623
"No final name for trans_id %(trans_id)r\n"
5646
5624
"file-id: %(file_id)r\n"
5647
5625
"root trans-id: %(root_trans_id)r\n"
5648
5626
msgstr ""
5649
5627
5650
#: bzrlib/errors.py:1969
5628
#: bzrlib/errors.py:1950
5651
5629
msgid "Attempt to reuse a transform that has already been applied."
5652
5630
msgstr ""
5653
5631
5654
#: bzrlib/errors.py:1974
5632
#: bzrlib/errors.py:1955
5655
5633
msgid "Moving the root directory is not supported at this time"
5656
5634
msgstr ""
5657
5635
5658
#: bzrlib/errors.py:1979
5636
#: bzrlib/errors.py:1960
5659
5637
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5660
5638
msgstr ""
5661
5639
5662
#: bzrlib/errors.py:1990
5640
#: bzrlib/errors.py:1971
5663
5641
msgid ""
5664
5642
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5665
5643
msgstr ""
5666
5644
5667
#: bzrlib/errors.py:2026
5645
#: bzrlib/errors.py:2007
5668
5646
msgid ""
5669
5647
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5670
5648
msgstr ""
5671
5649
5672
#: bzrlib/errors.py:2056
5650
#: bzrlib/errors.py:2037
5673
5651
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5674
5652
msgstr ""
5675
5653
5676
#: bzrlib/errors.py:2064
5654
#: bzrlib/errors.py:2045
5677
5655
msgid "Nothing to merge."
5678
5656
msgstr ""
5679
5657
5680
#: bzrlib/errors.py:2069
5658
#: bzrlib/errors.py:2050
5681
5659
msgid "Format %(format)s cannot be initialised by this version of bzr."
5682
5660
msgstr ""
5683
5661
5684
#: bzrlib/errors.py:2078
5662
#: bzrlib/errors.py:2059
5685
5663
msgid ""
5686
5664
"Cannot convert from format %(from_format)s to format %(format)s. "
5687
5665
"%(problem)s"
5688
5666
msgstr ""
5689
5667
5690
#: bzrlib/errors.py:2090
5668
#: bzrlib/errors.py:2071
5691
5669
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5692
5670
msgstr ""
5693
5671
5694
#: bzrlib/errors.py:2098
5672
#: bzrlib/errors.py:2079
5695
5673
msgid "%(exe_name)s could not be found on this machine"
5696
5674
msgstr ""
5697
5675
5698
#: bzrlib/errors.py:2106
5676
#: bzrlib/errors.py:2087
5699
5677
msgid "Diff is not installed on this machine: %(msg)s"
5700
5678
msgstr ""
5701
5679
5702
#: bzrlib/errors.py:2114
5680
#: bzrlib/errors.py:2095
5703
5681
msgid "Diff3 is not installed on this machine."
5704
5682
msgstr ""
5705
5683
5706
#: bzrlib/errors.py:2120
5684
#: bzrlib/errors.py:2101
5707
5685
msgid "The content being inserted is already present."
5708
5686
msgstr ""
5709
5687
5710
#: bzrlib/errors.py:2125
5688
#: bzrlib/errors.py:2106
5711
5689
msgid ""
5712
5690
"This tree contains left-over files from a failed operation.\n"
5713
5691
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5715
5693
" keep, and delete it when you are done."
5716
5694
msgstr ""
5717
5695
5718
#: bzrlib/errors.py:2136
5696
#: bzrlib/errors.py:2117
5719
5697
msgid ""
5720
5698
"This tree contains left-over files from a failed operation.\n"
5721
5699
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5722
5700
" wish to keep, and delete it when you are done."
5723
5701
msgstr ""
5724
5702
5725
#: bzrlib/errors.py:2146
5703
#: bzrlib/errors.py:2127
5726
5704
msgid ""
5727
5705
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5728
5706
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5730
5708
" keep, and delete it when you are done."
5731
5709
msgstr ""
5732
5710
5733
#: bzrlib/errors.py:2157
5711
#: bzrlib/errors.py:2138
5734
5712
msgid ""
5735
5713
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5736
5714
"examine %(pending_deletion)s to see if it contains any files you wish to "
5737
5715
"keep, and delete it when you are done."
5738
5716
msgstr ""
5739
5717
5740
#: bzrlib/errors.py:2167
5718
#: bzrlib/errors.py:2148
5741
5719
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5742
5720
msgstr ""
5743
5721
5744
#: bzrlib/errors.py:2181
5722
#: bzrlib/errors.py:2162
5745
5723
msgid ""
5746
5724
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5747
5725
msgstr ""
5748
5726
5749
#: bzrlib/errors.py:2194
5727
#: bzrlib/errors.py:2175
5750
5728
msgid "Error in merge modified format"
5751
5729
msgstr ""
5752
5730
5753
#: bzrlib/errors.py:2199
5731
#: bzrlib/errors.py:2180
5754
5732
msgid "Format error in conflict listings"
5755
5733
msgstr ""
5756
5734
5757
#: bzrlib/errors.py:2203
5735
#: bzrlib/errors.py:2184
5758
5736
msgid ""
5759
5737
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5760
5738
"Error: %(description)s"
5761
5739
msgstr ""
5762
5740
5763
#: bzrlib/errors.py:2214
5741
#: bzrlib/errors.py:2195
5764
5742
msgid ""
5765
5743
"An error has been detected in the repository %(repo_path)s.\n"
5766
5744
"Please run bzr reconcile on this repository."
5767
5745
msgstr ""
5768
5746
5769
#: bzrlib/errors.py:2225
5747
#: bzrlib/errors.py:2206
5770
5748
msgid ""
5771
5749
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5772
5750
"reason: %(reason)s"
5773
5751
msgstr ""
5774
5752
5775
#: bzrlib/errors.py:2238
5753
#: bzrlib/errors.py:2219
5776
5754
msgid ""
5777
5755
"An inconsistent delta was supplied: %(delta)r\n"
5778
5756
"reason: %(reason)s"
5779
5757
msgstr ""
5780
5758
5781
#: bzrlib/errors.py:2250
5759
#: bzrlib/errors.py:2231
5782
5760
msgid "To use this feature you must upgrade your branch at %(path)s."
5783
5761
msgstr ""
5784
5762
5785
#: bzrlib/errors.py:2259
5763
#: bzrlib/errors.py:2240
5786
5764
msgid "To use this feature you must upgrade your repository at %(path)s."
5787
5765
msgstr ""
5788
5766
5789
#: bzrlib/errors.py:2264
5767
#: bzrlib/errors.py:2245
5790
5768
msgid ""
5791
5769
"To use this feature you must upgrade your branch at %(path)s to a format "
5792
5770
"which supports rich roots."
5793
5771
msgstr ""
5794
5772
5795
#: bzrlib/errors.py:2270
5773
#: bzrlib/errors.py:2251
5796
5774
msgid "Cannot perform local-only commits on unbound branches."
5797
5775
msgstr ""
5798
5776
5799
#: bzrlib/errors.py:2275
5777
#: bzrlib/errors.py:2256
5800
5778
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5801
5779
msgstr ""
5802
5780
5803
#: bzrlib/errors.py:2296
5781
#: bzrlib/errors.py:2277
5804
5782
msgid "Ghost tags not supported by format %(format)r."
5805
5783
msgstr ""
5806
5784
5807
#: bzrlib/errors.py:2304
5785
#: bzrlib/errors.py:2285
5808
5786
msgid "File is binary but should be text."
5809
5787
msgstr ""
5810
5788
5811
#: bzrlib/errors.py:2309
5789
#: bzrlib/errors.py:2290
5812
5790
msgid "The path %(path)s is not permitted on this platform"
5813
5791
msgstr ""
5814
5792
5815
#: bzrlib/errors.py:2318
5793
#: bzrlib/errors.py:2299
5816
5794
msgid ""
5817
5795
"Testament did not match expected value.\n"
5818
5796
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5819
5797
" {%(measured)s}"
5820
5798
msgstr ""
5821
5799
5822
#: bzrlib/errors.py:2330
5800
#: bzrlib/errors.py:2311
5823
5801
msgid "Not a bzr revision-bundle: %(text)r"
5824
5802
msgstr ""
5825
5803
5826
#: bzrlib/errors.py:2339
5804
#: bzrlib/errors.py:2320
5827
5805
msgid "Bad bzr revision-bundle: %(text)r"
5828
5806
msgstr ""
5829
5807
5830
#: bzrlib/errors.py:2348
5808
#: bzrlib/errors.py:2329
5831
5809
msgid "Malformed bzr revision-bundle header: %(text)r"
5832
5810
msgstr ""
5833
5811
5834
#: bzrlib/errors.py:2353
5812
#: bzrlib/errors.py:2334
5835
5813
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5836
5814
msgstr ""
5837
5815
5838
#: bzrlib/errors.py:2358
5816
#: bzrlib/errors.py:2339
5839
5817
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5840
5818
msgstr ""
5841
5819
5842
#: bzrlib/errors.py:2363
5820
#: bzrlib/errors.py:2344
5843
5821
msgid "End of line marker was not \\n in bzr revision-bundle"
5844
5822
msgstr ""
5845
5823
5846
#: bzrlib/errors.py:2373
5824
#: bzrlib/errors.py:2354
5847
5825
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5848
5826
msgstr ""
5849
5827
5850
#: bzrlib/errors.py:2383
5828
#: bzrlib/errors.py:2364
5851
5829
msgid "Root class for inventory serialization errors"
5852
5830
msgstr ""
5853
5831
5854
#: bzrlib/errors.py:2387
5832
#: bzrlib/errors.py:2368
5855
5833
msgid ""
5856
5834
"The inventory was not in the expected format:\n"
5857
5835
" %(msg)s"
5858
5836
msgstr ""
5859
5837
5860
#: bzrlib/errors.py:2396
5838
#: bzrlib/errors.py:2377
5861
5839
msgid "This operation requires rich root data storage"
5862
5840
msgstr ""
5863
5841
5864
#: bzrlib/errors.py:2409
5842
#: bzrlib/errors.py:2390
5865
5843
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5866
5844
msgstr ""
5867
5845
5868
#: bzrlib/errors.py:2418
5846
#: bzrlib/errors.py:2399
5869
5847
msgid ""
5870
5848
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5871
5849
"variable."
5872
5850
msgstr ""
5873
5851
5874
#: bzrlib/errors.py:2425
5852
#: bzrlib/errors.py:2406
5875
5853
msgid ""
5876
5854
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5877
5855
"ghost at {%(ghost_revision_id)s}"
5878
5856
msgstr ""
5879
5857
5880
#: bzrlib/errors.py:2435
5858
#: bzrlib/errors.py:2416
5881
5859
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5882
5860
msgstr ""
5883
5861
5884
#: bzrlib/errors.py:2486
5862
#: bzrlib/errors.py:2467
5885
5863
msgid ""
5886
5864
"A merge directive must provide either a bundle or a public branch location."
5887
5865
msgstr ""
5888
5866
5889
#: bzrlib/errors.py:2493
5867
#: bzrlib/errors.py:2474
5890
5868
msgid "Bad merge directive payload %(start)r"
5891
5869
msgstr ""
5892
5870
5893
#: bzrlib/errors.py:2503
5871
#: bzrlib/errors.py:2484
5894
5872
msgid "Preview patch does not match requested changes."
5895
5873
msgstr ""
5896
5874
5897
#: bzrlib/errors.py:2509
5875
#: bzrlib/errors.py:2490
5898
5876
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5899
5877
msgstr ""
5900
5878
5901
#: bzrlib/errors.py:2519
5879
#: bzrlib/errors.py:2500
5902
5880
msgid ""
5903
5881
"Your branch does not have all of the revisions required in order to merge "
5904
5882
"this merge directive and the target location specified in the merge "
5905
5883
"directive is not a branch: %(location)s."
5906
5884
msgstr ""
5907
5885
5908
#: bzrlib/errors.py:2531
5886
#: bzrlib/errors.py:2512
5909
5887
msgid "Unsupported entry kind %(kind)s"
5910
5888
msgstr ""
5911
5889
5912
#: bzrlib/errors.py:2539
5890
#: bzrlib/errors.py:2520
5913
5891
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5914
5892
msgstr ""
5915
5893
5894
#: bzrlib/errors.py:2530
5895
msgid "Subsume target %(other_tree)s needs to be upgraded."
5896
msgstr ""
5897
5916
5898
#: bzrlib/errors.py:2549
5917
msgid "Subsume target %(other_tree)s needs to be upgraded."
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:2568
5921
5899
msgid "No such tag: %(tag_name)s"
5922
5900
msgstr ""
5923
5901
5924
#: bzrlib/errors.py:2576
5902
#: bzrlib/errors.py:2557
5925
5903
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5926
5904
msgstr ""
5927
5905
5928
#: bzrlib/errors.py:2585
5906
#: bzrlib/errors.py:2566
5929
5907
msgid "Tag %(tag_name)s already exists."
5930
5908
msgstr ""
5931
5909
5932
#: bzrlib/errors.py:2593
5910
#: bzrlib/errors.py:2574
5933
5911
msgid ""
5934
5912
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5935
5913
"bugs\" for more information on this feature."
5936
5914
msgstr ""
5937
5915
5938
#: bzrlib/errors.py:2603
5916
#: bzrlib/errors.py:2584
5939
5917
msgid ""
5940
5918
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5941
5919
msgstr ""
5942
5920
5943
#: bzrlib/errors.py:2613
5921
#: bzrlib/errors.py:2594
5944
5922
msgid ""
5945
5923
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5946
5924
msgstr ""
5947
5925
5948
#: bzrlib/errors.py:2623
5926
#: bzrlib/errors.py:2604
5949
5927
msgid "Invalid line in bugs property: '%(line)s'"
5950
5928
msgstr ""
5951
5929
5952
#: bzrlib/errors.py:2631
5930
#: bzrlib/errors.py:2612
5953
5931
msgid "Invalid bug status: '%(status)s'"
5954
5932
msgstr ""
5955
5933
5956
#: bzrlib/errors.py:2639
5934
#: bzrlib/errors.py:2620
5957
5935
msgid "Could not understand response from smart server: %(response_tuple)r"
5958
5936
msgstr ""
5959
5937
5938
#: bzrlib/errors.py:2659
5939
msgid "Server sent an unexpected error: %(error_tuple)r"
5940
msgstr ""
5941
5960
5942
#: bzrlib/errors.py:2678
5961
msgid "Server sent an unexpected error: %(error_tuple)r"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2697
5965
5943
msgid "Unrecognised container format: %(container_format)r"
5966
5944
msgstr ""
5967
5945
5968
#: bzrlib/errors.py:2705
5946
#: bzrlib/errors.py:2686
5969
5947
msgid "Unexpected end of container stream"
5970
5948
msgstr ""
5971
5949
5972
#: bzrlib/errors.py:2710
5950
#: bzrlib/errors.py:2691
5973
5951
msgid "Unknown record type: %(record_type)r"
5974
5952
msgstr ""
5975
5953
5976
#: bzrlib/errors.py:2718
5954
#: bzrlib/errors.py:2699
5977
5955
msgid "Invalid record: %(reason)s"
5978
5956
msgstr ""
5979
5957
5980
#: bzrlib/errors.py:2726
5958
#: bzrlib/errors.py:2707
5981
5959
msgid "Container has data after end marker: %(excess)r"
5982
5960
msgstr ""
5983
5961
5984
#: bzrlib/errors.py:2734
5962
#: bzrlib/errors.py:2715
5985
5963
msgid "Container has multiple records with the same name: %(name)s"
5986
5964
msgstr ""
5987
5965
5988
#: bzrlib/errors.py:2747
5966
#: bzrlib/errors.py:2728
5989
5967
msgid "Corrupt or incompatible data stream: %(reason)s"
5990
5968
msgstr ""
5991
5969
5992
#: bzrlib/errors.py:2755
5970
#: bzrlib/errors.py:2736
5993
5971
msgid "SMTP error: %(error)s"
5994
5972
msgstr ""
5995
5973
5996
#: bzrlib/errors.py:2763
5974
#: bzrlib/errors.py:2744
5997
5975
msgid "No message supplied."
5998
5976
msgstr ""
5999
5977
6000
#: bzrlib/errors.py:2768
5978
#: bzrlib/errors.py:2749
6001
5979
msgid "No mail-to address (--mail-to) or output (-o) specified."
6002
5980
msgstr ""
6003
5981
6004
#: bzrlib/errors.py:2773
5982
#: bzrlib/errors.py:2754
6005
5983
msgid "Unknown mail client: %(mail_client)s"
6006
5984
msgstr ""
6007
5985
6008
#: bzrlib/errors.py:2781
5986
#: bzrlib/errors.py:2762
6009
5987
msgid ""
6010
5988
"Unable to find mail client with the following names: "
6011
5989
"%(mail_command_list_string)s"
6012
5990
msgstr ""
6013
5991
6014
#: bzrlib/errors.py:2791
5992
#: bzrlib/errors.py:2772
6015
5993
msgid "SMTP connection to %(host)s refused"
6016
5994
msgstr ""
6017
5995
6018
#: bzrlib/errors.py:2800
5996
#: bzrlib/errors.py:2781
6019
5997
msgid "Please specify smtp_server. No server at default %(host)s."
6020
5998
msgstr ""
6021
5999
6022
#: bzrlib/errors.py:2814
6000
#: bzrlib/errors.py:2795
6023
6001
msgid ""
6024
6002
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6025
6003
"reconfigure."
6026
6004
msgstr ""
6027
6005
6028
#: bzrlib/errors.py:2826
6006
#: bzrlib/errors.py:2807
6029
6007
msgid "'%(display_url)s' is already a branch."
6030
6008
msgstr ""
6031
6009
6032
#: bzrlib/errors.py:2831
6010
#: bzrlib/errors.py:2812
6033
6011
msgid "'%(display_url)s' is already a tree."
6034
6012
msgstr ""
6035
6013
6036
#: bzrlib/errors.py:2836
6014
#: bzrlib/errors.py:2817
6037
6015
msgid "'%(display_url)s' is already a checkout."
6038
6016
msgstr ""
6039
6017
6040
#: bzrlib/errors.py:2841
6018
#: bzrlib/errors.py:2822
6041
6019
msgid "'%(display_url)s' is already a lightweight checkout."
6042
6020
msgstr ""
6043
6021
6044
#: bzrlib/errors.py:2846
6022
#: bzrlib/errors.py:2827
6045
6023
msgid "'%(display_url)s' is already using a shared repository."
6046
6024
msgstr ""
6047
6025
6048
#: bzrlib/errors.py:2851
6026
#: bzrlib/errors.py:2832
6049
6027
msgid "'%(display_url)s' is already standalone."
6050
6028
msgstr ""
6051
6029
6052
#: bzrlib/errors.py:2856
6030
#: bzrlib/errors.py:2837
6053
6031
msgid "Shared repository '%(display_url)s' already creates working trees."
6054
6032
msgstr ""
6055
6033
6056
#: bzrlib/errors.py:2862
6034
#: bzrlib/errors.py:2843
6057
6035
msgid ""
6058
6036
"Shared repository '%(display_url)s' already doesn't create working trees."
6059
6037
msgstr ""
6060
6038
6061
#: bzrlib/errors.py:2868
6039
#: bzrlib/errors.py:2849
6062
6040
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6063
6041
msgstr ""
6064
6042
6065
#: bzrlib/errors.py:2873
6043
#: bzrlib/errors.py:2854
6066
6044
msgid "No location could be found to bind to at %(display_url)s."
6067
6045
msgstr ""
6068
6046
6069
#: bzrlib/errors.py:2878
6047
#: bzrlib/errors.py:2859
6070
6048
msgid ""
6071
6049
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6072
6050
"status).%(more)s"
6073
6051
msgstr ""
6074
6052
6075
#: bzrlib/errors.py:2897
6053
#: bzrlib/errors.py:2878
6076
6054
msgid ""
6077
6055
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6078
6056
"list).%(more)s"
6079
6057
msgstr ""
6080
6058
6081
#: bzrlib/errors.py:2903
6059
#: bzrlib/errors.py:2884
6082
6060
msgid "Variable {%(name)s} is not available."
6083
6061
msgstr ""
6084
6062
6085
#: bzrlib/errors.py:2911
6063
#: bzrlib/errors.py:2892
6086
6064
msgid "No template specified."
6087
6065
msgstr ""
6088
6066
6089
#: bzrlib/errors.py:2916
6067
#: bzrlib/errors.py:2897
6090
6068
msgid "Unable to create symlink %(path_str)son this platform"
6091
6069
msgstr ""
6092
6070
6093
#: bzrlib/errors.py:2931
6071
#: bzrlib/errors.py:2912
6094
6072
msgid ""
6095
6073
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6096
6074
"\"original\", \"local\"."
6097
6075
msgstr ""
6098
6076
6099
#: bzrlib/errors.py:2965
6077
#: bzrlib/errors.py:2946
6100
6078
msgid ""
6101
6079
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6102
6080
msgstr ""
6103
6081
6104
#: bzrlib/errors.py:2977
6082
#: bzrlib/errors.py:2958
6105
6083
msgid "The \"%(config_id)s\" configuration does not exist."
6106
6084
msgstr ""
6107
6085
6108
#: bzrlib/errors.py:2985
6086
#: bzrlib/errors.py:2966
6109
6087
msgid "The \"%(option_name)s\" configuration option does not exist."
6110
6088
msgstr ""
6111
6089
6112
#: bzrlib/errors.py:2993
6090
#: bzrlib/errors.py:2974
6113
6091
msgid "The alias \"%(alias_name)s\" does not exist."
6114
6092
msgstr ""
6115
6093
6116
#: bzrlib/errors.py:3007
6094
#: bzrlib/errors.py:2988
6117
6095
msgid "\"%(alias_name)s\" is not a valid location alias."
6118
6096
msgstr ""
6119
6097
6120
#: bzrlib/errors.py:3015
6098
#: bzrlib/errors.py:2996
6121
6099
msgid "No %(alias_name)s location assigned."
6122
6100
msgstr ""
6123
6101
6124
#: bzrlib/errors.py:3023
6102
#: bzrlib/errors.py:3004
6125
6103
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6126
6104
msgstr ""
6127
6105
6128
#: bzrlib/errors.py:3033
6106
#: bzrlib/errors.py:3014
6129
6107
msgid "Unknown rules detected: %(unknowns_str)s."
6130
6108
msgstr ""
6131
6109
6132
#: bzrlib/errors.py:3044
6110
#: bzrlib/errors.py:3025
6133
6111
msgid "Tip change rejected: %(msg)s"
6134
6112
msgstr ""
6135
6113
6136
#: bzrlib/errors.py:3052
6114
#: bzrlib/errors.py:3033
6137
6115
msgid "Shelf corrupt."
6138
6116
msgstr ""
6139
6117
6140
#: bzrlib/errors.py:3057
6118
#: bzrlib/errors.py:3038
6141
6119
msgid "Corruption while decompressing repository file%(orig_error)s"
6142
6120
msgstr ""
6143
6121
6144
#: bzrlib/errors.py:3069
6122
#: bzrlib/errors.py:3050
6145
6123
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6146
6124
msgstr ""
6147
6125
6148
#: bzrlib/errors.py:3077
6126
#: bzrlib/errors.py:3058
6149
6127
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6150
6128
msgstr ""
6151
6129
6152
#: bzrlib/errors.py:3085
6130
#: bzrlib/errors.py:3066
6153
6131
msgid ""
6154
6132
"An attempt to access a url outside the server jail was made: '%(url)s'."
6155
6133
msgstr ""
6156
6134
6157
#: bzrlib/errors.py:3093
6135
#: bzrlib/errors.py:3074
6158
6136
msgid "The user aborted the operation."
6159
6137
msgstr ""
6160
6138
6161
#: bzrlib/errors.py:3098
6139
#: bzrlib/errors.py:3079
6162
6140
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6163
6141
msgstr ""
6164
6142
6165
#: bzrlib/errors.py:3108
6143
#: bzrlib/errors.py:3089
6166
6144
msgid "No such view: %(view_name)s."
6167
6145
msgstr ""
6168
6146
6169
#: bzrlib/errors.py:3118
6147
#: bzrlib/errors.py:3099
6170
6148
msgid ""
6171
6149
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6172
6150
"to a later format."
6173
6151
msgstr ""
6174
6152
6175
#: bzrlib/errors.py:3127
6153
#: bzrlib/errors.py:3108
6176
6154
msgid ""
6177
6155
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6178
6156
msgstr ""
6179
6157
6180
#: bzrlib/errors.py:3194
6158
#: bzrlib/errors.py:3175
6181
6159
msgid "%(bzrdir)r does not support co-located branches."
6182
6160
msgstr ""
6183
6161
6184
#: bzrlib/errors.py:3200
6162
#: bzrlib/errors.py:3181
6185
6163
msgid ""
6186
6164
"Unable to determine your name.\n"
6187
6165
"Please, set your name with the 'whoami' command.\n"
6188
6166
"E.g. bzr whoami \"Your Name <name@example.com>\""
6189
6167
msgstr ""
6190
6168
6191
#: bzrlib/errors.py:3209
6169
#: bzrlib/errors.py:3190
6192
6170
msgid "Invalid pattern(s) found. %(msg)s"
6193
6171
msgstr ""
6194
6172
6195
#: bzrlib/errors.py:3217
6173
#: bzrlib/errors.py:3198
6196
6174
msgid ""
6197
6175
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6198
6176
"unbind` to fix."
6199
6177
msgstr ""
6200
6178
6201
#: bzrlib/errors.py:3228
6179
#: bzrlib/errors.py:3209
6202
6180
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6203
6181
msgstr ""
6204
6182
6205
#: bzrlib/errors.py:3237
6183
#: bzrlib/errors.py:3218
6206
6184
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6207
6185
msgstr ""
6208
6186
6209
#: bzrlib/errors.py:3246
6187
#: bzrlib/errors.py:3227
6210
6188
msgid ""
6211
6189
"No compatible object available for operations from %(source)r to %(target)r."
6212
6190
msgstr ""
6213
6191
6214
#: bzrlib/errors.py:3256
6192
#: bzrlib/errors.py:3237
6215
6193
msgid ""
6216
6194
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6217
6195
"%(arguments)s."
6218
6196
msgstr ""
6219
6197
6220
#: bzrlib/errors.py:3266
6198
#: bzrlib/errors.py:3247
6221
6199
msgid ""
6222
6200
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6223
6201
"format %(format)r"
6224
6202
msgstr ""
6225
6203
6226
#: bzrlib/errors.py:3278
6204
#: bzrlib/errors.py:3259
6227
6205
msgid ""
6228
6206
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6229
6207
"plugin."
6230
6208
msgstr ""
6231
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6232
"plugin."
6233
6209
6234
#: bzrlib/errors.py:3291
6210
#: bzrlib/errors.py:3272
6235
6211
msgid "Binary files section encountered."
6236
6212
msgstr ""
6237
6213
6238
#: bzrlib/errors.py:3299
6214
#: bzrlib/errors.py:3280
6239
6215
msgid ""
6240
6216
"Malformed patch header. %(desc)s\n"
6241
6217
"%(line)r"
6242
6218
msgstr ""
6243
6219
6244
#: bzrlib/errors.py:3308
6220
#: bzrlib/errors.py:3289
6245
6221
msgid ""
6246
6222
"Malformed hunk header. %(desc)s\n"
6247
6223
"%(line)r"
6248
6224
msgstr ""
6249
6225
6250
#: bzrlib/errors.py:3317
6226
#: bzrlib/errors.py:3298
6251
6227
msgid ""
6252
6228
"Malformed line. %(desc)s\n"
6253
6229
"%(line)r"
6254
6230
msgstr ""
6255
6231
6256
#: bzrlib/errors.py:3327
6232
#: bzrlib/errors.py:3308
6257
6233
msgid ""
6258
6234
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6259
6235
"but patch says it should be \"%(patch_line)s\""
6260
6236
msgstr ""
6261
6237
6262
#: bzrlib/errors.py:3338
6238
#: bzrlib/errors.py:3319
6263
6239
msgid "The feature %(feature)s has already been registered."
6264
msgstr "The feature %(feature)s has already been registered."
6240
msgstr ""
6265
6241
6266
6242
#: bzrlib/export_pot.py:252
6267
6243
#, python-format
6589
6565
msgid "lstat/stat of ({0!r}): {1!r}"
6590
6566
msgstr ""
6591
6567
6592
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6568
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6593
6569
#, python-format
6594
6570
msgid "sorry, %r not allowed in path"
6595
6571
msgstr ""
6596
6572
6597
#: bzrlib/osutils.py:1237
6573
#: bzrlib/osutils.py:1226
6598
6574
#, python-format
6599
6575
msgid "%r is too short to calculate a relative path"
6600
6576
msgstr ""
7038
7014
msgid "Created new branch."
7039
7015
msgstr ""
7040
7016
7041
#: bzrlib/push.py:97
7017
#: bzrlib/push.py:98
7042
7018
#, python-format
7043
7019
msgid ""
7044
7020
"Target directory %s already contains a .bzr directory, but it is not valid."
7165
7141
msgid "%s is now not stacked\n"
7166
7142
msgstr ""
7167
7143
7168
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7144
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7169
7145
#, python-format
7170
7146
msgid "bzr: ERROR (ignored): %s"
7171
7147
msgstr ""
7172
7148
7173
#: bzrlib/remote.py:2541
7149
#: bzrlib/remote.py:2493
7174
7150
msgid "Copying repository content as tarball..."
7175
7151
msgstr ""
7176
7152
7385
7361
msgid "listening on port: %s"
7386
7362
msgstr ""
7387
7363
7388
#: bzrlib/switch.py:73
7364
#: bzrlib/switch.py:69
7389
7365
msgid "Pending merges must be committed or reverted before using switch."
7390
7366
msgstr ""
7391
7367
7392
#: bzrlib/switch.py:100
7368
#: bzrlib/switch.py:96
7393
7369
msgid ""
7394
7370
"Cannot switch as local commits found in the checkout. Commit these to the "
7395
7371
"bound branch or use --force to throw them away."
7396
7372
msgstr ""
7397
7373
7398
#: bzrlib/switch.py:105
7374
#: bzrlib/switch.py:101
7399
7375
#, python-format
7400
7376
msgid ""
7401
7377
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7402
7378
"anyway, use --force."
7403
7379
msgstr ""
7404
7380
7405
#: bzrlib/switch.py:125
7381
#: bzrlib/switch.py:110
7406
7382
msgid "Cannot switch a branch, only a checkout."
7407
7383
msgstr ""
7408
7384
7409
#: bzrlib/switch.py:163
7385
#: bzrlib/switch.py:146
7410
7386
#, python-format
7411
7387
msgid "Tree is up to date at revision %d."
7412
7388
msgstr ""
7413
7389
7414
#: bzrlib/switch.py:169
7390
#: bzrlib/switch.py:152
7415
7391
#, python-format
7416
7392
msgid "Updated to revision %d."
7417
7393
msgstr ""
7418
7394
7419
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7395
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7420
7396
msgid "Apply phase"
7421
7397
msgstr ""
7422
7398
7423
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7399
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7424
7400
msgid "removing file"
7425
7401
msgstr ""
7426
7402
7427
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7403
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7428
7404
msgid "adding file"
7429
7405
msgstr ""
7430
7406
7431
#: bzrlib/transform.py:2591
7407
#: bzrlib/transform.py:2587
7432
7408
msgid "Building tree"
7433
7409
msgstr ""
7434
7410
7435
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7411
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7436
7412
msgid "Adding file contents"
7437
7413
msgstr ""
7438
7414
7439
#: bzrlib/transform.py:3028
7415
#: bzrlib/transform.py:3024
7440
7416
msgid "Resolution pass"
7441
7417
msgstr ""
7442
7418
7585
7561
7586
7562
#: dummy/help_topics/basic/detail.txt:1
7587
7563
msgid ""
7588
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7564
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7589
7565
"http://bazaar.canonical.com/"
7590
7566
msgstr ""
7591
7567
11851
11827
"~~~~~~~~~~~~~~~~~~~~~~"
11852
11828
msgstr ""
11853
11829
11854
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11830
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11855
11831
msgid "Introduced in: 1.4"
11856
11832
msgstr ""
11857
11833
12043
12019
msgstr ""
12044
12020
12045
12021
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12046
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12022
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12047
12023
msgid "Introduced in: 1.17"
12048
12024
msgstr ""
12049
12025
12099
12075
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12100
12076
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12101
12077
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12102
#: en/help_topics/hooks.txt:443
12078
#: en/help_topics/hooks.txt:427
12103
12079
msgid "Introduced in: 2.4"
12104
12080
msgstr ""
12105
12081
12200
12176
msgstr ""
12201
12177
12202
12178
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12203
#: en/help_topics/hooks.txt:521
12179
#: en/help_topics/hooks.txt:505
12204
12180
msgid "Introduced in: 1.15"
12205
12181
msgstr ""
12206
12182
12280
12256
"post_merge\n"
12281
12257
"~~~~~~~~~~"
12282
12258
msgstr ""
12283
"post_merge\n"
12284
"~~~~~~~~~~"
12285
12259
12286
12260
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12287
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12288
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12261
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12289
12262
msgid "Introduced in: 2.5"
12290
msgstr "Introduced in: 2.5"
12263
msgstr ""
12291
12264
12292
12265
#: en/help_topics/hooks.txt:328
12293
12266
msgid ""
12294
12267
"Called after a merge. Receives a Merger object as the single argument.\n"
12295
12268
"The return value is ignored."
12296
12269
msgstr ""
12297
"Called after a merge. Receives a Merger object as the single argument.\n"
12298
"The return value is ignored."
12299
12270
12300
12271
#: en/help_topics/hooks.txt:331
12301
12272
msgid ""
12302
12273
"pre_merge\n"
12303
12274
"~~~~~~~~~"
12304
12275
msgstr ""
12305
"pre_merge\n"
12306
"~~~~~~~~~"
12307
12276
12308
12277
#: en/help_topics/hooks.txt:336
12309
12278
msgid ""
12310
12279
"Called before a merge. Receives a Merger object as the single\n"
12311
12280
"argument."
12312
12281
msgstr ""
12313
"Called before a merge. Receives a Merger object as the single\n"
12314
"argument."
12315
12282
12316
12283
#: en/help_topics/hooks.txt:339
12317
12284
msgid ""
12389
12356
"post_build_tree\n"
12390
12357
"~~~~~~~~~~~~~~~"
12391
12358
msgstr ""
12392
"post_build_tree\n"
12393
"~~~~~~~~~~~~~~~"
12394
12359
12395
12360
#: en/help_topics/hooks.txt:386
12396
12361
msgid ""
12397
12362
"Called after a completely new tree is built. The hook is called with\n"
12398
12363
"the tree as its only argument."
12399
12364
msgstr ""
12400
"Called after a completely new tree is built. The hook is called with\n"
12401
"the tree as its only argument."
12402
12365
12403
12366
#: en/help_topics/hooks.txt:392
12404
12367
msgid "Introduced in: 2.0"
12414
12377
12415
12378
#: en/help_topics/hooks.txt:399
12416
12379
msgid ""
12417
"post_transform\n"
12418
"~~~~~~~~~~~~~~"
12380
"start_commit\n"
12381
"~~~~~~~~~~~~"
12419
12382
msgstr ""
12420
12383
12421
12384
#: en/help_topics/hooks.txt:404
12422
12385
msgid ""
12423
"Called after a tree transform has been performed on a tree. The hook\n"
12424
"is called with the tree that is being transformed and the transform."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:407
12428
msgid ""
12429
"pre_transform\n"
12430
"~~~~~~~~~~~~~"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:412
12434
msgid ""
12435
"Called before a tree transform on this tree. The hook is called with\n"
12436
"the tree that is being transformed and the transform."
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:415
12440
msgid ""
12441
"start_commit\n"
12442
"~~~~~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:420
12446
msgid ""
12447
12386
"Called before a commit is performed on a tree. The start commit hook\n"
12448
12387
"is able to change the tree before the commit takes place. start_commit\n"
12449
12388
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12450
12389
"being performed on."
12451
12390
msgstr ""
12452
12391
12453
#: en/help_topics/hooks.txt:425
12392
#: en/help_topics/hooks.txt:409
12454
12393
msgid ""
12455
12394
"SmartClientHooks\n"
12456
12395
"----------------"
12457
12396
msgstr ""
12458
12397
12459
#: en/help_topics/hooks.txt:428
12398
#: en/help_topics/hooks.txt:412
12460
12399
msgid ""
12461
12400
"call\n"
12462
12401
"~~~~"
12463
12402
msgstr ""
12464
12403
12465
#: en/help_topics/hooks.txt:431
12404
#: en/help_topics/hooks.txt:415
12466
12405
msgid "Introduced in: unknown"
12467
12406
msgstr ""
12468
12407
12469
#: en/help_topics/hooks.txt:433
12408
#: en/help_topics/hooks.txt:417
12470
12409
msgid ""
12471
12410
"Called when the smart client is submitting a request to the smart\n"
12472
12411
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12473
12412
"Streaming request bodies, and responses, are not accessible."
12474
12413
msgstr ""
12475
12414
12476
#: en/help_topics/hooks.txt:437
12415
#: en/help_topics/hooks.txt:421
12477
12416
msgid ""
12478
12417
"SmartServerHooks\n"
12479
12418
"----------------"
12480
12419
msgstr ""
12481
12420
12482
#: en/help_topics/hooks.txt:440
12421
#: en/help_topics/hooks.txt:424
12483
12422
msgid ""
12484
12423
"server_exception\n"
12485
12424
"~~~~~~~~~~~~~~~~"
12486
12425
msgstr ""
12487
12426
12488
#: en/help_topics/hooks.txt:445
12427
#: en/help_topics/hooks.txt:429
12489
12428
msgid ""
12490
12429
"Called by the bzr server when an exception occurs. server_exception is\n"
12491
12430
"called with the sys.exc_info() tuple return true for the hook if the\n"
12493
12432
"normally."
12494
12433
msgstr ""
12495
12434
12496
#: en/help_topics/hooks.txt:450
12435
#: en/help_topics/hooks.txt:434
12497
12436
msgid ""
12498
12437
"server_started\n"
12499
12438
"~~~~~~~~~~~~~~"
12500
12439
msgstr ""
12501
12440
12502
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12441
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12503
12442
msgid "Introduced in: 0.16"
12504
12443
msgstr ""
12505
12444
12506
#: en/help_topics/hooks.txt:455
12445
#: en/help_topics/hooks.txt:439
12507
12446
msgid ""
12508
12447
"Called by the bzr server when it starts serving a directory.\n"
12509
12448
"server_started is called with (backing urls, public url), where\n"
12512
12451
"served."
12513
12452
msgstr ""
12514
12453
12515
#: en/help_topics/hooks.txt:461
12454
#: en/help_topics/hooks.txt:445
12516
12455
msgid ""
12517
12456
"server_started_ex\n"
12518
12457
"~~~~~~~~~~~~~~~~~"
12519
12458
msgstr ""
12520
12459
12521
#: en/help_topics/hooks.txt:466
12460
#: en/help_topics/hooks.txt:450
12522
12461
msgid ""
12523
12462
"Called by the bzr server when it starts serving a directory.\n"
12524
12463
"server_started is called with (backing_urls, server_obj)."
12525
12464
msgstr ""
12526
12465
12527
#: en/help_topics/hooks.txt:469
12466
#: en/help_topics/hooks.txt:453
12528
12467
msgid ""
12529
12468
"server_stopped\n"
12530
12469
"~~~~~~~~~~~~~~"
12531
12470
msgstr ""
12532
12471
12533
#: en/help_topics/hooks.txt:474
12472
#: en/help_topics/hooks.txt:458
12534
12473
msgid ""
12535
12474
"Called by the bzr server when it stops serving a directory.\n"
12536
12475
"server_stopped is called with the same parameters as the\n"
12537
12476
"server_started hook: (backing_urls, public_url)."
12538
12477
msgstr ""
12539
12478
12540
#: en/help_topics/hooks.txt:478
12479
#: en/help_topics/hooks.txt:462
12541
12480
msgid ""
12542
12481
"StatusHooks\n"
12543
12482
"-----------"
12544
12483
msgstr ""
12545
12484
12546
#: en/help_topics/hooks.txt:481
12485
#: en/help_topics/hooks.txt:465
12547
12486
msgid ""
12548
12487
"post_status\n"
12549
12488
"~~~~~~~~~~~"
12550
12489
msgstr ""
12551
12490
12552
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12491
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12553
12492
msgid "Introduced in: 2.3"
12554
12493
msgstr ""
12555
12494
12556
#: en/help_topics/hooks.txt:486
12495
#: en/help_topics/hooks.txt:470
12557
12496
msgid ""
12558
12497
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12559
12498
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12562
12501
"status command. to_file is the output stream for writing."
12563
12502
msgstr ""
12564
12503
12565
#: en/help_topics/hooks.txt:492
12504
#: en/help_topics/hooks.txt:476
12566
12505
msgid ""
12567
12506
"pre_status\n"
12568
12507
"~~~~~~~~~~"
12569
12508
msgstr ""
12570
12509
12571
#: en/help_topics/hooks.txt:497
12510
#: en/help_topics/hooks.txt:481
12572
12511
msgid ""
12573
12512
"Called with argument StatusHookParams before Bazaar displays the\n"
12574
12513
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12577
12516
"status command. to_file is the output stream for writing."
12578
12517
msgstr ""
12579
12518
12580
#: en/help_topics/hooks.txt:503
12581
msgid ""
12582
"TransportHooks\n"
12583
"--------------"
12584
msgstr ""
12585
"TransportHooks\n"
12586
"--------------"
12587
12588
#: en/help_topics/hooks.txt:506
12589
msgid ""
12590
"post_connect\n"
12591
"~~~~~~~~~~~~"
12592
msgstr ""
12593
"post_connect\n"
12594
"~~~~~~~~~~~~"
12595
12596
#: en/help_topics/hooks.txt:511
12597
msgid ""
12598
"Called after a new connection is established or a reconnect occurs.\n"
12599
"The sole argument passed is either the connected transport or smart\n"
12600
"medium instance."
12601
msgstr ""
12602
"Called after a new connection is established or a reconnect occurs.\n"
12603
"The sole argument passed is either the connected transport or smart\n"
12604
"medium instance."
12605
12606
#: en/help_topics/hooks.txt:515
12519
#: en/help_topics/hooks.txt:487
12520
msgid ""
12521
"TransportHooks\n"
12522
"--------------"
12523
msgstr ""
12524
12525
#: en/help_topics/hooks.txt:490
12526
msgid ""
12527
"post_connect\n"
12528
"~~~~~~~~~~~~"
12529
msgstr ""
12530
12531
#: en/help_topics/hooks.txt:495
12532
msgid ""
12533
"Called after a new connection is established or a reconnect occurs.\n"
12534
"The sole argument passed is either the connected transport or smart\n"
12535
"medium instance."
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:499
12607
12539
msgid ""
12608
12540
"RioVersionInfoBuilderHooks\n"
12609
12541
"--------------------------"
12610
12542
msgstr ""
12611
12543
12612
#: en/help_topics/hooks.txt:518
12544
#: en/help_topics/hooks.txt:502
12613
12545
msgid ""
12614
12546
"revision\n"
12615
12547
"~~~~~~~~"
12616
12548
msgstr ""
12617
12549
12618
#: en/help_topics/hooks.txt:523
12550
#: en/help_topics/hooks.txt:507
12619
12551
msgid ""
12620
12552
"Invoked when adding information about a revision to the RIO stanza\n"
12621
12553
"that is printed. revision is called with a revision object and a RIO\n"
13387
13319
"Many commands that accept URLs also accept location aliases too.\n"
13388
13320
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13389
13321
msgstr ""
13390
13391
#~ msgid ""
13392
#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
13393
#~ "http://bazaar.canonical.com/"
13394
#~ msgstr ""
13395
#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
13396
#~ "http://bazaar.canonical.com/"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1