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