« back to all changes in this revision
Viewing changes to po/en_AU.po
- browse files at revision 6617
- compare with another revision
- download diff
- download tarball
- view history from revision 6617
- Committer: Patch Queue Manager
- Date: 2016-04-21 04:10:52 UTC
- mfrom: (6616.1.1 fix-en-user-guide)
- Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
even when user's locale specifies a different language. (Jelmer Vernooij)
even when user's locale specifies a different language. (Jelmer Vernooij)
- files added:
- bzrlib/tests/blackbox/test_verify_signatures.py
- files modified:
- Makefile
added
removed
po/en_AU.po
1
1
# English (Australia) translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
5
#
6
6
msgid ""
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-07-20 14:35+0000\n"
12
"Last-Translator: Rafael Neri <Unknown>\n"
13
13
"Language-Team: English (Australia) <en_AU@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:22+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
18
"X-Launchpad-Export-Date: 2012-07-21 04:30+0000\n"
19
"X-Generator: Launchpad (build 15654)\n"
20
20
21
#: bzrlib/add.py:95
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
24
25
#: bzrlib/branch.py:872
25
#: bzrlib/branch.py:854
26
26
msgid "Unstacking"
27
27
msgstr "Unstacking"
28
28
29
#: bzrlib/branch.py:3205
29
#: bzrlib/branch.py:2955
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr "Pushed up to revision %d."
33
33
34
#: bzrlib/branch.py:3207
34
#: bzrlib/branch.py:2957
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
38
msgstr[0] "%d tag updated."
39
msgstr[1] "%d tags updated."
40
40
41
#: bzrlib/branch.py:3210
41
#: bzrlib/branch.py:2960
42
42
msgid "No new revisions or tags to push."
43
43
msgstr "No new revisions or tags to push."
44
44
45
#: bzrlib/branch.py:3212
45
#: bzrlib/branch.py:2962
46
46
msgid "No new revisions to push."
47
47
msgstr "No new revisions to push."
48
48
49
#: bzrlib/branch.py:3232
49
#: bzrlib/branch.py:2982
50
50
msgid "checked branch {0} format {1}"
51
msgstr ""
51
msgstr "checked branch {0} format {1}"
52
52
53
#: bzrlib/branch.py:3235
53
#: bzrlib/branch.py:2985
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr "found error:%s"
57
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr "Ignoring files outside view. View is %s"
62
62
63
#: bzrlib/builtins.py:218
63
#: bzrlib/builtins.py:260
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
67
68
#: bzrlib/builtins.py:303
68
#: bzrlib/builtins.py:315
69
69
msgid "Display status summary."
70
70
msgstr "Display status summary."
71
71
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
87
88
#: bzrlib/builtins.py:311
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:315
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
109
79
110
80
#: bzrlib/builtins.py:320
111
81
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
114
84
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
117
87
118
88
#: bzrlib/builtins.py:323
119
89
msgid ""
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."
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:327
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
109
110
#: bzrlib/builtins.py:332
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
118
#: bzrlib/builtins.py:335
119
msgid ""
120
"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:338
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
163
133
164
134
#: bzrlib/builtins.py:341
165
135
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."
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."
170
140
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."
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."
175
145
176
146
#: bzrlib/builtins.py:346
177
147
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'."
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:349
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
163
164
#: bzrlib/builtins.py:353
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
175
176
#: bzrlib/builtins.py:358
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
205
187
206
188
#: bzrlib/builtins.py:363
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:366
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
205
206
#: bzrlib/builtins.py:375
207
207
msgid "Use short status indicators."
208
208
msgstr "Use short status indicators."
209
209
210
#: bzrlib/builtins.py:365
210
#: bzrlib/builtins.py:377
211
211
msgid "Only show versioned files."
212
212
msgstr "Only show versioned files."
213
213
214
#: bzrlib/builtins.py:367
214
#: bzrlib/builtins.py:379
215
215
msgid "Don't show pending merges."
216
216
msgstr "Don't show pending merges."
217
217
218
#: bzrlib/builtins.py:370
218
#: bzrlib/builtins.py:382
219
219
msgid "Do not mark object type using indicator."
220
220
msgstr "Do not mark object type using indicator."
221
221
222
#: bzrlib/builtins.py:385
222
#: bzrlib/builtins.py:397
223
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
225
225
226
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
227
227
msgid "You can only supply one of revision_id or --revision"
228
228
msgstr "You can only supply one of revision_id or --revision"
229
229
230
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
231
231
msgid "You must supply either --revision or a revision_id"
232
232
msgstr "You must supply either --revision or a revision_id"
233
233
234
#: bzrlib/builtins.py:439
234
#: bzrlib/builtins.py:451
235
235
#, python-format
236
236
msgid "Repository %r does not support access to raw revision texts"
237
237
msgstr "Repository %r does not support access to raw revision texts"
238
238
239
#: bzrlib/builtins.py:450
239
#: bzrlib/builtins.py:462
240
240
msgid "The repository {0} contains no revision {1}."
241
241
msgstr "The repository {0} contains no revision {1}."
242
242
243
#: bzrlib/builtins.py:457
243
#: bzrlib/builtins.py:469
244
244
msgid "You cannot specify a NULL revision."
245
245
msgstr "You cannot specify a NULL revision."
246
246
247
#: bzrlib/builtins.py:549
247
#: bzrlib/builtins.py:561
248
248
msgid "Remove the working tree from a given branch/checkout."
249
249
msgstr "Remove the working tree from a given branch/checkout."
250
250
251
#: bzrlib/builtins.py:551
251
#: bzrlib/builtins.py:563
252
252
msgid ""
253
253
"Since a lightweight checkout is little more than a working tree\n"
254
254
"this will refuse to run against one."
256
256
"Since a lightweight checkout is little more than a working tree\n"
257
257
"this will refuse to run against one."
258
258
259
#: bzrlib/builtins.py:554
259
#: bzrlib/builtins.py:566
260
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
262
262
263
#: bzrlib/builtins.py:560
263
#: bzrlib/builtins.py:572
264
264
msgid ""
265
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
266
msgstr ""
267
267
"Remove the working tree even if it has uncommitted or shelved changes."
268
268
269
#: bzrlib/builtins.py:574
269
#: bzrlib/builtins.py:586
270
270
msgid "No working tree to remove"
271
271
msgstr "No working tree to remove"
272
272
273
#: bzrlib/builtins.py:576
273
#: bzrlib/builtins.py:588
274
274
msgid "You cannot remove the working tree of a remote path"
275
275
msgstr "You cannot remove the working tree of a remote path"
276
276
277
#: bzrlib/builtins.py:585
277
#: bzrlib/builtins.py:597
278
278
msgid "You cannot remove the working tree from a lightweight checkout"
279
279
msgstr "You cannot remove the working tree from a lightweight checkout"
280
280
281
#: bzrlib/builtins.py:625
282
msgid ""
283
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
284
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
msgstr ""
286
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
287
"instead. Use \"--force\" if you are sure you want to reset the working tree."
288
289
#: bzrlib/builtins.py:636
290
msgid ""
291
", the header appears corrupt, try passing -r -1 to set the state to the last "
292
"commit"
293
msgstr ""
294
", the header appears corrupt, try passing -r -1 to set the state to the last "
295
"commit"
296
297
#: bzrlib/builtins.py:640
281
#: bzrlib/builtins.py:637
282
msgid ""
283
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
284
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
msgstr ""
286
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
287
"instead. Use \"--force\" if you are sure you want to reset the working tree."
288
289
#: bzrlib/builtins.py:648
290
msgid ""
291
", the header appears corrupt, try passing -r -1 to set the state to the last "
292
"commit"
293
msgstr ""
294
", the header appears corrupt, try passing -r -1 to set the state to the last "
295
"commit"
296
297
#: bzrlib/builtins.py:652
298
298
msgid "failed to reset the tree state{0}"
299
299
msgstr "failed to reset the tree state{0}"
300
300
301
#: bzrlib/builtins.py:644
301
#: bzrlib/builtins.py:656
302
302
msgid "Show current revision number."
303
303
msgstr "Show current revision number."
304
304
305
#: bzrlib/builtins.py:646
305
#: bzrlib/builtins.py:658
306
306
msgid "This is equal to the number of revisions on this branch."
307
307
msgstr "This is equal to the number of revisions on this branch."
308
308
309
#: bzrlib/builtins.py:659
309
#: bzrlib/builtins.py:671
310
310
msgid "--tree and --revision can not be used together"
311
msgstr ""
311
msgstr "--tree and --revision can not be used together"
312
312
313
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
313
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
314
314
msgid "Tags can only be placed on a single revision, not on a range"
315
msgstr ""
315
msgstr "Tags can only be placed on a single revision, not on a range"
316
316
317
#: bzrlib/builtins.py:700
317
#: bzrlib/builtins.py:712
318
318
msgid "Show revno of working tree."
319
msgstr ""
319
msgstr "Show revno of working tree."
320
320
321
#: bzrlib/builtins.py:748
321
#: bzrlib/builtins.py:760
322
322
msgid "Add specified files or directories."
323
323
msgstr "Add specified files or directories."
324
324
325
#: bzrlib/builtins.py:750
326
msgid ""
327
"In non-recursive mode, all the named items are added, regardless\n"
328
"of whether they were previously ignored. A warning is given if\n"
329
"any of the named files are already versioned."
330
msgstr ""
331
"In non-recursive mode, all the named items are added, regardless\n"
332
"of whether they were previously ignored. A warning is given if\n"
333
"any of the named files are already versioned."
334
335
#: bzrlib/builtins.py:754
336
msgid ""
337
"In recursive mode (the default), files are treated the same way\n"
338
"but the behaviour for directories is different. Directories that\n"
339
"are already versioned do not give a warning. All directories,\n"
340
"whether already versioned or not, are searched for files or\n"
341
"subdirectories that are neither versioned or ignored, and these\n"
342
"are added. This search proceeds recursively into versioned\n"
343
"directories. If no names are given '.' is assumed."
344
msgstr ""
345
"In recursive mode (the default), files are treated the same way\n"
346
"but the behaviour for directories is different. Directories that\n"
347
"are already versioned do not give a warning. All directories,\n"
348
"whether already versioned or not, are searched for files or\n"
349
"subdirectories that are neither versioned or ignored, and these\n"
350
"are added. This search proceeds recursively into versioned\n"
351
"directories. If no names are given '.' is assumed."
352
353
325
#: bzrlib/builtins.py:762
354
326
msgid ""
355
"A warning will be printed when nested trees are encountered,\n"
356
"unless they are explicitly ignored."
357
msgstr ""
358
359
#: bzrlib/builtins.py:765
360
msgid ""
361
"Therefore simply saying 'bzr add' will version all files that\n"
362
"are currently unknown."
363
msgstr ""
364
"Therefore simply saying 'bzr add' will version all files that\n"
365
"are currently unknown."
366
367
#: bzrlib/builtins.py:768
368
msgid ""
369
"Adding a file whose parent directory is not versioned will\n"
370
"implicitly add the parent, and so on up to the root. This means\n"
371
"you should never need to explicitly add a directory, they'll just\n"
372
"get added when you add a file in the directory."
373
msgstr ""
374
"Adding a file whose parent directory is not versioned will\n"
375
"implicitly add the parent, and so on up to the root. This means\n"
376
"you should never need to explicitly add a directory, they'll just\n"
377
"get added when you add a file in the directory."
378
379
#: bzrlib/builtins.py:773
380
msgid ""
381
"--dry-run will show which files would be added, but not actually\n"
382
"add them."
383
msgstr ""
384
"--dry-run will show which files would be added, but not actually\n"
385
"add them."
386
387
#: bzrlib/builtins.py:776
388
msgid ""
389
"--file-ids-from will try to use the file ids from the supplied path.\n"
390
"It looks up ids trying to find a matching parent directory with the\n"
391
"same filename, and then by pure path. This option is rarely needed\n"
392
"but can be useful when adding the same logical file into two\n"
393
"branches that will be merged later (without showing the two different\n"
394
"adds as a conflict). It is also useful when merging another project\n"
395
"into a subdirectory of this one."
396
msgstr ""
397
"--file-ids-from will try to use the file ids from the supplied path.\n"
398
"It looks up ids trying to find a matching parent directory with the\n"
399
"same filename, and then by pure path. This option is rarely needed\n"
400
"but can be useful when adding the same logical file into two\n"
401
"branches that will be merged later (without showing the two different\n"
402
"adds as a conflict). It is also useful when merging another project\n"
403
"into a subdirectory of this one."
404
405
#: bzrlib/builtins.py:784
406
msgid ""
407
"Any files matching patterns in the ignore list will not be added\n"
408
"unless they are explicitly mentioned."
409
msgstr ""
410
"Any files matching patterns in the ignore list will not be added\n"
411
"unless they are explicitly mentioned."
412
413
#: bzrlib/builtins.py:787
414
msgid ""
415
"In recursive mode, files larger than the configuration option \n"
416
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
417
"to file size."
418
msgstr ""
419
"In recursive mode, files larger than the configuration option \n"
420
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
421
"to file size."
422
423
#: bzrlib/builtins.py:794
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:766
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:774
354
msgid ""
355
"A warning will be printed when nested trees are encountered,\n"
356
"unless they are explicitly ignored."
357
msgstr ""
358
"A warning will be printed when nested trees are encountered,\n"
359
"unless they are explicitly ignored."
360
361
#: bzrlib/builtins.py:777
362
msgid ""
363
"Therefore simply saying 'bzr add' will version all files that\n"
364
"are currently unknown."
365
msgstr ""
366
"Therefore simply saying 'bzr add' will version all files that\n"
367
"are currently unknown."
368
369
#: bzrlib/builtins.py:780
370
msgid ""
371
"Adding a file whose parent directory is not versioned will\n"
372
"implicitly add the parent, and so on up to the root. This means\n"
373
"you should never need to explicitly add a directory, they'll just\n"
374
"get added when you add a file in the directory."
375
msgstr ""
376
"Adding a file whose parent directory is not versioned will\n"
377
"implicitly add the parent, and so on up to the root. This means\n"
378
"you should never need to explicitly add a directory, they'll just\n"
379
"get added when you add a file in the directory."
380
381
#: bzrlib/builtins.py:785
382
msgid ""
383
"--dry-run will show which files would be added, but not actually\n"
384
"add them."
385
msgstr ""
386
"--dry-run will show which files would be added, but not actually\n"
387
"add them."
388
389
#: bzrlib/builtins.py:788
390
msgid ""
391
"--file-ids-from will try to use the file ids from the supplied path.\n"
392
"It looks up ids trying to find a matching parent directory with the\n"
393
"same filename, and then by pure path. This option is rarely needed\n"
394
"but can be useful when adding the same logical file into two\n"
395
"branches that will be merged later (without showing the two different\n"
396
"adds as a conflict). It is also useful when merging another project\n"
397
"into a subdirectory of this one."
398
msgstr ""
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
"It looks up ids trying to find a matching parent directory with the\n"
401
"same filename, and then by pure path. This option is rarely needed\n"
402
"but can be useful when adding the same logical file into two\n"
403
"branches that will be merged later (without showing the two different\n"
404
"adds as a conflict). It is also useful when merging another project\n"
405
"into a subdirectory of this one."
406
407
#: bzrlib/builtins.py:796
408
msgid ""
409
"Any files matching patterns in the ignore list will not be added\n"
410
"unless they are explicitly mentioned."
411
msgstr ""
412
"Any files matching patterns in the ignore list will not be added\n"
413
"unless they are explicitly mentioned."
414
415
#: bzrlib/builtins.py:799
416
msgid ""
417
"In recursive mode, files larger than the configuration option \n"
418
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
419
"to file size."
420
msgstr ""
421
"In recursive mode, files larger than the configuration option \n"
422
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
423
"to file size."
424
425
#: bzrlib/builtins.py:806
424
426
msgid "Don't recursively add the contents of directories."
425
427
msgstr "Don't recursively add the contents of directories."
426
428
427
#: bzrlib/builtins.py:800
429
#: bzrlib/builtins.py:813
428
430
msgid "Lookup file ids from this tree."
429
431
msgstr "Lookup file ids from this tree."
430
432
431
#: bzrlib/builtins.py:836
433
#: bzrlib/builtins.py:849
432
434
msgid "ignored {0} matching \"{1}\"\n"
433
435
msgstr "ignored {0} matching \"{1}\"\n"
434
436
435
#: bzrlib/builtins.py:841
437
#: bzrlib/builtins.py:854
436
438
msgid "Create a new versioned directory."
437
439
msgstr "Create a new versioned directory."
438
440
439
#: bzrlib/builtins.py:843
441
#: bzrlib/builtins.py:856
440
442
msgid "This is equivalent to creating the directory and then adding it."
441
443
msgstr "This is equivalent to creating the directory and then adding it."
442
444
443
#: bzrlib/builtins.py:850
445
#: bzrlib/builtins.py:863
444
446
msgid "No error if existing, make parent directories as needed."
445
447
msgstr "No error if existing, make parent directories as needed."
446
448
447
#: bzrlib/builtins.py:884
449
#: bzrlib/builtins.py:897
448
450
#, python-format
449
451
msgid "added %s\n"
450
452
msgstr "added %s\n"
451
453
452
#: bzrlib/builtins.py:926
454
#: bzrlib/builtins.py:939
453
455
#, python-format
454
456
msgid "invalid kind %r specified"
455
457
msgstr "invalid kind %r specified"
456
458
457
#: bzrlib/builtins.py:963
459
#: bzrlib/builtins.py:976
458
460
msgid "Move or rename a file."
459
461
msgstr "Move or rename a file."
460
462
461
#: bzrlib/builtins.py:965
463
#: bzrlib/builtins.py:978
462
464
msgid " bzr mv SOURCE... DESTINATION"
463
465
msgstr " bzr mv SOURCE... DESTINATION"
464
466
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
467
#: bzrlib/builtins.py:980
468
msgid ""
469
"If the last argument is a versioned directory, all the other names\n"
470
"are moved into it. Otherwise, there must be exactly two arguments\n"
471
"and the file is changed to a new name."
472
msgstr ""
473
"If the last argument is a versioned directory, all the other names\n"
474
"are moved into it. Otherwise, there must be exactly two arguments\n"
475
"and the file is changed to a new name."
476
477
#: bzrlib/builtins.py:984
478
msgid ""
479
"If OLDNAME does not exist on the filesystem but is versioned and\n"
480
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
481
"assumes that the file has been manually moved and only updates\n"
482
"its internal inventory to reflect that change.\n"
483
"The same is valid when moving many SOURCE files to a DESTINATION."
484
msgstr ""
485
"If OLDNAME does not exist on the filesystem but is versioned and\n"
486
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
487
"assumes that the file has been manually moved and only updates\n"
488
"its internal inventory to reflect that change.\n"
489
"The same is valid when moving many SOURCE files to a DESTINATION."
490
491
#: bzrlib/builtins.py:990
490
492
msgid "Files cannot be moved between branches."
491
493
msgstr "Files cannot be moved between branches."
492
494
493
#: bzrlib/builtins.py:984
495
#: bzrlib/builtins.py:997
494
496
msgid ""
495
497
"Move only the bzr identifier of the file, because the file has already been "
496
498
"moved."
498
500
"Move only the bzr identifier of the file, because the file has already been "
499
501
"moved."
500
502
501
#: bzrlib/builtins.py:986
503
#: bzrlib/builtins.py:999
502
504
msgid "Automatically guess renames."
503
505
msgstr "Automatically guess renames."
504
506
505
#: bzrlib/builtins.py:987
507
#: bzrlib/builtins.py:1000
506
508
msgid "Avoid making changes when guessing renames."
507
509
msgstr "Avoid making changes when guessing renames."
508
510
509
#: bzrlib/builtins.py:996
511
#: bzrlib/builtins.py:1009
510
512
msgid "--dry-run requires --auto."
511
513
msgstr "--dry-run requires --auto."
512
514
513
#: bzrlib/builtins.py:1000
515
#: bzrlib/builtins.py:1013
514
516
msgid "missing file argument"
515
517
msgstr "missing file argument"
516
518
517
#: bzrlib/builtins.py:1004
519
#: bzrlib/builtins.py:1017
518
520
msgid "can not move root of branch"
519
msgstr ""
521
msgstr "can not move root of branch"
520
522
521
#: bzrlib/builtins.py:1010
523
#: bzrlib/builtins.py:1023
522
524
msgid "Only one path may be specified to --auto."
523
525
msgstr "Only one path may be specified to --auto."
524
526
525
#: bzrlib/builtins.py:1013
527
#: bzrlib/builtins.py:1026
526
528
msgid "--after cannot be specified with --auto."
527
529
msgstr "--after cannot be specified with --auto."
528
530
529
#: bzrlib/builtins.py:1050
531
#: bzrlib/builtins.py:1062
530
532
msgid "to mv multiple files the destination must be a versioned directory"
531
533
msgstr "to mv multiple files the destination must be a versioned directory"
532
534
533
#: bzrlib/builtins.py:1102
535
#: bzrlib/builtins.py:1114
534
536
msgid "Turn this branch into a mirror of another branch."
535
537
msgstr "Turn this branch into a mirror of another branch."
536
538
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
msgid ""
583
"The --verbose option will display the revisions pulled using the log_format\n"
584
"configuration option. You can use a different format by overriding it with\n"
585
"-Olog_format=<other_format>."
586
msgstr ""
587
588
#: bzrlib/builtins.py:1126
589
msgid ""
590
"Note: The location can be specified either in the form of a branch,\n"
591
"or in the form of a path to a file containing a merge directive generated\n"
592
"with bzr send."
593
msgstr ""
594
"Note: The location can be specified either in the form of a branch,\n"
595
"or in the form of a path to a file containing a merge directive generated\n"
596
"with bzr send."
539
#: bzrlib/builtins.py:1116
540
msgid ""
541
"By default, this command only works on branches that have not diverged.\n"
542
"Branches are considered diverged if the destination branch's most recent \n"
543
"commit is one that has not been merged (directly or indirectly) into the \n"
544
"parent."
545
msgstr ""
546
"By default, this command only works on branches that have not diverged.\n"
547
"Branches are considered diverged if the destination branch's most recent \n"
548
"commit is one that has not been merged (directly or indirectly) into the \n"
549
"parent."
550
551
#: bzrlib/builtins.py:1121
552
msgid ""
553
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
554
"from one into the other. Once one branch has merged, the other should\n"
555
"be able to pull it again."
556
msgstr ""
557
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
558
"from one into the other. Once one branch has merged, the other should\n"
559
"be able to pull it again."
560
561
#: bzrlib/builtins.py:1125
562
msgid ""
563
"If you want to replace your local changes and just want your branch to\n"
564
"match the remote one, use pull --overwrite. This will work even if the two\n"
565
"branches have diverged."
566
msgstr ""
567
"If you want to replace your local changes and just want your branch to\n"
568
"match the remote one, use pull --overwrite. This will work even if the two\n"
569
"branches have diverged."
570
571
#: bzrlib/builtins.py:1129
572
msgid ""
573
"If there is no default location set, the first pull will set it (use\n"
574
"--no-remember to avoid setting it). After that, you can omit the\n"
575
"location to use the default. To change the default, use --remember. The\n"
576
"value will only be saved if the remote location can be accessed."
577
msgstr ""
578
"If there is no default location set, the first pull will set it (use\n"
579
"--no-remember to avoid setting it). After that, you can omit the\n"
580
"location to use the default. To change the default, use --remember. The\n"
581
"value will only be saved if the remote location can be accessed."
597
582
598
583
#: bzrlib/builtins.py:1134
584
msgid ""
585
"The --verbose option will display the revisions pulled using the log_format\n"
586
"configuration option. You can use a different format by overriding it with\n"
587
"-Olog_format=<other_format>."
588
msgstr ""
589
"The --verbose option will display the revisions pulled using the log_format\n"
590
"configuration option. You can use a different format by overriding it with\n"
591
"-Olog_format=<other_format>."
592
593
#: bzrlib/builtins.py:1138
594
msgid ""
595
"Note: The location can be specified either in the form of a branch,\n"
596
"or in the form of a path to a file containing a merge directive generated\n"
597
"with bzr send."
598
msgstr ""
599
"Note: The location can be specified either in the form of a branch,\n"
600
"or in the form of a path to a file containing a merge directive generated\n"
601
"with bzr send."
602
603
#: bzrlib/builtins.py:1146
599
604
msgid "Show logs of pulled revisions."
600
605
msgstr "Show logs of pulled revisions."
601
606
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
607
#: bzrlib/builtins.py:1148
608
msgid ""
609
"Branch to pull into, rather than the one containing the working directory."
610
msgstr ""
611
"Branch to pull into, rather than the one containing the working directory."
612
613
#: bzrlib/builtins.py:1151
614
msgid ""
615
"Perform a local pull in a bound branch. Local pulls are not applied to the "
616
"master branch."
617
msgstr ""
618
"Perform a local pull in a bound branch. Local pulls are not applied to the "
619
"master branch."
620
621
#: bzrlib/builtins.py:1189
617
622
msgid "Need working tree for --show-base."
618
623
msgstr "Need working tree for --show-base."
619
624
620
#: bzrlib/builtins.py:1184
625
#: bzrlib/builtins.py:1205
621
626
msgid "No pull location known or specified."
622
627
msgstr "No pull location known or specified."
623
628
624
#: bzrlib/builtins.py:1190
629
#: bzrlib/builtins.py:1211
625
630
#, python-format
626
631
msgid "Using saved parent location: %s\n"
627
632
msgstr "Using saved parent location: %s\n"
628
633
629
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
634
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
630
635
msgid "Cannot use -r with merge directives or bundles"
631
636
msgstr "Cannot use -r with merge directives or bundles"
632
637
633
#: bzrlib/builtins.py:1238
638
#: bzrlib/builtins.py:1261
634
639
msgid "Update a mirror of this branch."
635
640
msgstr "Update a mirror of this branch."
636
641
637
#: bzrlib/builtins.py:1240
642
#: bzrlib/builtins.py:1263
638
643
msgid ""
639
644
"The target branch will not have its working tree populated because this\n"
640
645
"is both expensive, and is not supported on remote file systems."
642
647
"The target branch will not have its working tree populated because this\n"
643
648
"is both expensive and is not supported on remote file systems."
644
649
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
msgid ""
695
"The --verbose option will display the revisions pushed using the log_format\n"
696
"configuration option. You can use a different format by overriding it with\n"
697
"-Olog_format=<other_format>."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
701
msgid ""
702
"Branch to push from, rather than the one containing the working directory."
703
msgstr ""
704
"Branch to push from, rather than the one containing the working directory."
650
#: bzrlib/builtins.py:1266
651
msgid ""
652
"Some smart servers or protocols *may* put the working tree in place in\n"
653
"the future."
654
msgstr ""
655
"Some smart servers or protocols *may* put the working tree in place in\n"
656
"the future."
657
658
#: bzrlib/builtins.py:1269
659
msgid ""
660
"This command only works on branches that have not diverged. Branches are\n"
661
"considered diverged if the destination branch's most recent commit is one\n"
662
"that has not been merged (directly or indirectly) by the source branch."
663
msgstr ""
664
"This command only works on branches that have not diverged. Branches are\n"
665
"considered diverged if the destination branch's most recent commit is one\n"
666
"that has not been merged (directly or indirectly) by the source branch."
667
668
#: bzrlib/builtins.py:1273
669
msgid ""
670
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
671
"the other branch completely, discarding its unmerged changes."
672
msgstr ""
673
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
674
"the other branch completely, discarding its unmerged changes."
705
675
706
676
#: bzrlib/builtins.py:1276
707
677
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
msgid ""
724
"Create a stacked branch that refers to another branch for the commit "
725
"history. Only the work not present in the referenced branch is included in "
726
"the branch created."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
730
msgid ""
731
"Refuse to push if there are uncommitted changes in the working tree, --no-"
732
"strict disables the check."
733
msgstr ""
734
735
#: bzrlib/builtins.py:1292
678
"If you want to ensure you have the different changes in the other branch,\n"
679
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
680
"After that you will be able to do a push without '--overwrite'."
681
msgstr ""
682
"If you want to ensure you have the different changes in the other branch,\n"
683
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
684
"After that you will be able to do a push without '--overwrite'."
685
686
#: bzrlib/builtins.py:1280
687
msgid ""
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
msgstr ""
693
"If there is no default push location set, the first push will set it (use\n"
694
"--no-remember to avoid setting it). After that, you can omit the\n"
695
"location to use the default. To change the default, use --remember. The\n"
696
"value will only be saved if the remote location can be accessed."
697
698
#: bzrlib/builtins.py:1285
699
msgid ""
700
"The --verbose option will display the revisions pushed using the log_format\n"
701
"configuration option. You can use a different format by overriding it with\n"
702
"-Olog_format=<other_format>."
703
msgstr ""
704
"The --verbose option will display the revisions pushed using the log_format\n"
705
"configuration option. You can use a different format by overriding it with\n"
706
"-Olog_format=<other_format>."
707
708
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
709
msgid ""
710
"Branch to push from, rather than the one containing the working directory."
711
msgstr ""
712
"Branch to push from, rather than the one containing the working directory."
713
714
#: bzrlib/builtins.py:1299
715
msgid ""
716
"By default push will fail if the target directory exists, but does not "
717
"already have a control directory. This flag will allow push to proceed."
718
msgstr ""
719
"By default push will fail if the target directory exists, but does not "
720
"already have a control directory. This flag will allow push to proceed."
721
722
#: bzrlib/builtins.py:1304
723
msgid ""
724
"Create a stacked branch that references the public location of the parent "
725
"branch."
726
msgstr ""
727
"Create a stacked branch that references the public location of the parent "
728
"branch."
729
730
#: bzrlib/builtins.py:1307
731
msgid ""
732
"Create a stacked branch that refers to another branch for the commit "
733
"history. Only the work not present in the referenced branch is included in "
734
"the branch created."
735
msgstr ""
736
"Create a stacked branch that refers to another branch for the commit "
737
"history. Only the work not present in the referenced branch is included in "
738
"the branch created."
739
740
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
741
msgid ""
742
"Refuse to push if there are uncommitted changes in the working tree, --no-"
743
"strict disables the check."
744
msgstr ""
745
"Refuse to push if there are uncommitted changes in the working tree, --no-"
746
"strict disables the check."
747
748
#: bzrlib/builtins.py:1315
736
749
msgid "Don't populate the working tree, even for protocols that support it."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1336
750
msgstr "Don't populate the working tree, even for protocols that support it."
751
752
#: bzrlib/builtins.py:1318
753
msgid "Overwrite tags only."
754
msgstr "Overwrite tags only."
755
756
#: bzrlib/builtins.py:1369
740
757
msgid "Could not determine branch to refer to."
741
msgstr ""
758
msgstr "Could not determine branch to refer to."
742
759
743
#: bzrlib/builtins.py:1345
760
#: bzrlib/builtins.py:1378
744
761
#, python-format
745
762
msgid ""
746
763
"No push location known or specified. To push to the parent branch (at %s), "
749
766
"No push location known or specified. To push to the parent branch (at %s), "
750
767
"use 'bzr push :parent'."
751
768
752
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
769
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
753
770
msgid "No push location known or specified."
754
msgstr ""
771
msgstr "No push location known or specified."
755
772
756
#: bzrlib/builtins.py:1355
773
#: bzrlib/builtins.py:1388
757
774
#, python-format
758
775
msgid "Using saved push location: %s"
759
msgstr ""
776
msgstr "Using saved push location: %s"
760
777
761
#: bzrlib/builtins.py:1365
778
#: bzrlib/builtins.py:1398
762
779
msgid "Create a new branch that is a copy of an existing branch."
763
msgstr ""
764
765
#: bzrlib/builtins.py:1367
766
msgid ""
767
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
768
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
769
"./bar.\n"
770
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
771
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
772
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
773
"create ./foo-bar."
774
msgstr ""
775
776
#: bzrlib/builtins.py:1374
777
msgid ""
778
"To retrieve the branch as of a particular revision, supply the --revision\n"
779
"parameter, as in \"branch foo/bar -r 5\"."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1377
780
msgstr "Create a new branch that is a copy of an existing branch."
781
782
#: bzrlib/builtins.py:1400
783
msgid ""
784
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
785
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
786
"./bar.\n"
787
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
788
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
789
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
790
"create ./foo-bar."
791
msgstr ""
792
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
793
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
794
"./bar.\n"
795
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
796
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
797
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
798
"create ./foo-bar."
799
800
#: bzrlib/builtins.py:1407
801
msgid ""
802
"To retrieve the branch as of a particular revision, supply the --revision\n"
803
"parameter, as in \"branch foo/bar -r 5\"."
804
msgstr ""
805
"To retrieve the branch as of a particular revision, supply the --revision\n"
806
"parameter, as in \"branch foo/bar -r 5\"."
807
808
#: bzrlib/builtins.py:1410
783
809
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
784
msgstr ""
810
msgstr "The synonyms 'clone' and 'get' for this command are deprecated."
785
811
786
#: bzrlib/builtins.py:1387
812
#: bzrlib/builtins.py:1420
787
813
msgid "Create a branch without a working-tree."
788
msgstr ""
814
msgstr "Create a branch without a working-tree."
789
815
790
#: bzrlib/builtins.py:1389
816
#: bzrlib/builtins.py:1422
791
817
msgid "Switch the checkout in the current directory to the new branch."
792
msgstr ""
818
msgstr "Switch the checkout in the current directory to the new branch."
793
819
794
#: bzrlib/builtins.py:1392
820
#: bzrlib/builtins.py:1425
795
821
msgid ""
796
822
"Create a stacked branch referring to the source branch. The new branch will "
797
823
"depend on the availability of the source branch for all operations."
798
824
msgstr ""
825
"Create a stacked branch referring to the source branch. The new branch will "
826
"depend on the availability of the source branch for all operations."
799
827
800
#: bzrlib/builtins.py:1396
828
#: bzrlib/builtins.py:1429
801
829
msgid "Do not use a shared repository, even if available."
802
msgstr ""
830
msgstr "Do not use a shared repository, even if available."
803
831
804
#: bzrlib/builtins.py:1398
832
#: bzrlib/builtins.py:1431
805
833
msgid ""
806
834
"By default branch will fail if the target directory exists, but does not "
807
835
"already have a control directory. This flag will allow branch to proceed."
808
836
msgstr ""
837
"By default branch will fail if the target directory exists, but does not "
838
"already have a control directory. This flag will allow branch to proceed."
809
839
810
#: bzrlib/builtins.py:1403
840
#: bzrlib/builtins.py:1436
811
841
msgid "Bind new branch to from location."
812
msgstr ""
842
msgstr "Bind new branch to from location."
813
843
814
#: bzrlib/builtins.py:1450
844
#: bzrlib/builtins.py:1483
815
845
#, python-format
816
846
msgid "Target directory \"%s\" already exists."
817
msgstr ""
847
msgstr "Target directory \"%s\" already exists."
818
848
819
#: bzrlib/builtins.py:1462
849
#: bzrlib/builtins.py:1495
820
850
#, python-format
821
851
msgid "Parent of \"%s\" does not exist."
822
msgstr ""
852
msgstr "Parent of \"%s\" does not exist."
823
853
824
#: bzrlib/builtins.py:1481
854
#: bzrlib/builtins.py:1514
825
855
msgid "The branch {0} has no revision {1}."
826
msgstr ""
856
msgstr "The branch {0} has no revision {1}."
827
857
828
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
858
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
829
859
#, python-format
830
860
msgid "Created new stacked branch referring to %s."
831
msgstr ""
861
msgstr "Created new stacked branch referring to %s."
832
862
833
#: bzrlib/builtins.py:1500
863
#: bzrlib/builtins.py:1533
834
864
#, python-format
835
865
msgid "Branched %d revision."
836
866
msgid_plural "Branched %d revisions."
837
msgstr[0] ""
838
msgstr[1] ""
867
msgstr[0] "Branched %d revision."
868
msgstr[1] "Branched %d revisions."
839
869
840
#: bzrlib/builtins.py:1505
870
#: bzrlib/builtins.py:1538
841
871
#, python-format
842
872
msgid "New branch bound to %s"
843
msgstr ""
873
msgstr "New branch bound to %s"
844
874
845
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
875
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
846
876
#, python-format
847
877
msgid "Switched to branch: %s"
848
msgstr ""
878
msgstr "Switched to branch: %s"
849
879
850
#: bzrlib/builtins.py:1515
880
#: bzrlib/builtins.py:1548
851
881
msgid "List the branches available at the current location."
852
msgstr ""
853
854
#: bzrlib/builtins.py:1517
855
msgid ""
856
"This command will print the names of all the branches at the current\n"
857
"location."
858
msgstr ""
859
860
#: bzrlib/builtins.py:1524
861
msgid ""
862
"Recursively scan for branches rather than just looking in the specified "
863
"location."
864
msgstr ""
865
866
#: bzrlib/builtins.py:1554
882
msgstr "List the branches available at the current location."
883
884
#: bzrlib/builtins.py:1550
885
msgid ""
886
"This command will print the names of all the branches at the current\n"
887
"location."
888
msgstr ""
889
"This command will print the names of all the branches at the current\n"
890
"location."
891
892
#: bzrlib/builtins.py:1557
893
msgid ""
894
"Recursively scan for branches rather than just looking in the specified "
895
"location."
896
msgstr ""
897
"Recursively scan for branches rather than just looking in the specified "
898
"location."
899
900
#: bzrlib/builtins.py:1586
867
901
msgid "(default)"
868
902
msgstr "(default)"
869
903
870
#: bzrlib/builtins.py:1566
904
#: bzrlib/builtins.py:1598
871
905
msgid "Create a new checkout of an existing branch."
872
msgstr ""
873
874
#: bzrlib/builtins.py:1568
875
msgid ""
876
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
877
"for\n"
878
"the branch found in '.'. This is useful if you have removed the working "
879
"tree\n"
880
"or if it was never created - i.e. if you pushed the branch to its current\n"
881
"location using SFTP."
882
msgstr ""
883
884
#: bzrlib/builtins.py:1573
885
msgid ""
886
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
887
"will\n"
888
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
889
"./bar.\n"
890
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
891
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
892
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
893
"create ./foo-bar."
894
msgstr ""
895
896
#: bzrlib/builtins.py:1580
897
msgid ""
898
"To retrieve the branch as of a particular revision, supply the --revision\n"
899
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
900
"immediately\n"
901
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
902
"old\n"
903
"code.)"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1590
907
msgid ""
908
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
909
"the branch for every operation. Normal checkouts can perform common "
910
"operations like diff and status without such access, and also support local "
911
"commits."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1597
906
msgstr "Create a new checkout of an existing branch."
907
908
#: bzrlib/builtins.py:1600
909
msgid ""
910
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
911
"for\n"
912
"the branch found in '.'. This is useful if you have removed the working "
913
"tree\n"
914
"or if it was never created - i.e. if you pushed the branch to its current\n"
915
"location using SFTP."
916
msgstr ""
917
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
918
"for\n"
919
"the branch found in '.'. This is useful if you have removed the working "
920
"tree\n"
921
"or if it was never created - i.e. if you pushed the branch to its current\n"
922
"location using SFTP."
923
924
#: bzrlib/builtins.py:1605
925
msgid ""
926
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
927
"will\n"
928
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
929
"./bar.\n"
930
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
931
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
932
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
933
"create ./foo-bar."
934
msgstr ""
935
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
936
"will\n"
937
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
938
"./bar.\n"
939
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
940
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
941
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
942
"create ./foo-bar."
943
944
#: bzrlib/builtins.py:1612
945
msgid ""
946
"To retrieve the branch as of a particular revision, supply the --revision\n"
947
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
948
"immediately\n"
949
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
950
"old\n"
951
"code.)"
952
msgstr ""
953
"To retrieve the branch as of a particular revision, supply the --revision\n"
954
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
955
"immediately\n"
956
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
957
"old\n"
958
"code.)"
959
960
#: bzrlib/builtins.py:1622
961
msgid ""
962
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
963
"the branch for every operation. Normal checkouts can perform common "
964
"operations like diff and status without such access, and also support local "
965
"commits."
966
msgstr ""
967
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
968
"the branch for every operation. Normal checkouts can perform common "
969
"operations like diff and status without such access, and also support local "
970
"commits."
971
972
#: bzrlib/builtins.py:1629
915
973
msgid "Get file contents from this tree."
916
msgstr ""
974
msgstr "Get file contents from this tree."
917
975
918
#: bzrlib/builtins.py:1599
976
#: bzrlib/builtins.py:1631
919
977
msgid "Hard-link working tree files where possible."
920
msgstr ""
978
msgstr "Hard-link working tree files where possible."
921
979
922
#: bzrlib/builtins.py:1640
980
#: bzrlib/builtins.py:1672
923
981
msgid ""
924
982
"Show list of renamed files.\n"
925
983
" "
926
984
msgstr ""
985
"Show list of renamed files.\n"
986
" "
927
987
928
#: bzrlib/builtins.py:1670
988
#: bzrlib/builtins.py:1700
929
989
msgid "Update a working tree to a new revision."
930
msgstr ""
931
932
#: bzrlib/builtins.py:1672
933
msgid ""
934
"This will perform a merge of the destination revision (the tip of the\n"
935
"branch, or the specified revision) into the working tree, and then make\n"
936
"that revision the basis revision for the working tree. "
937
msgstr ""
938
939
#: bzrlib/builtins.py:1676
940
msgid ""
941
"You can use this to visit an older revision, or to update a working tree\n"
942
"that is out of date from its branch."
943
msgstr ""
944
945
#: bzrlib/builtins.py:1679
946
msgid ""
947
"If there are any uncommitted changes in the tree, they will be carried\n"
948
"across and remain as uncommitted changes after the update. To discard\n"
949
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
950
"with the changes brought in by the change in basis revision."
951
msgstr ""
952
953
#: bzrlib/builtins.py:1684
954
msgid ""
955
"If the tree's branch is bound to a master branch, bzr will also update\n"
956
"the branch from the master."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1687
960
msgid ""
961
"You cannot update just a single file or directory, because each Bazaar\n"
962
"working tree has just a single basis revision. If you want to restore a\n"
963
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
964
"update'. If you want to restore a file to its state in a previous\n"
965
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
966
"out the old content of that file to a new location."
967
msgstr ""
968
969
#: bzrlib/builtins.py:1694
970
msgid ""
971
"The 'dir' argument, if given, must be the location of the root of a\n"
972
"working tree to update. By default, the working tree that contains the \n"
973
"current working directory is used."
974
msgstr ""
975
976
#: bzrlib/builtins.py:1710
990
msgstr "Update a working tree to a new revision."
991
992
#: bzrlib/builtins.py:1702
993
msgid ""
994
"This will perform a merge of the destination revision (the tip of the\n"
995
"branch, or the specified revision) into the working tree, and then make\n"
996
"that revision the basis revision for the working tree. "
997
msgstr ""
998
"This will perform a merge of the destination revision (the tip of the\n"
999
"branch, or the specified revision) into the working tree, and then make\n"
1000
"that revision the basis revision for the working tree. "
1001
1002
#: bzrlib/builtins.py:1706
1003
msgid ""
1004
"You can use this to visit an older revision, or to update a working tree\n"
1005
"that is out of date from its branch."
1006
msgstr ""
1007
"You can use this to visit an older revision, or to update a working tree\n"
1008
"that is out of date from its branch."
1009
1010
#: bzrlib/builtins.py:1709
1011
msgid ""
1012
"If there are any uncommitted changes in the tree, they will be carried\n"
1013
"across and remain as uncommitted changes after the update. To discard\n"
1014
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1015
"with the changes brought in by the change in basis revision."
1016
msgstr ""
1017
"If there are any uncommitted changes in the tree, they will be carried\n"
1018
"across and remain as uncommitted changes after the update. To discard\n"
1019
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1020
"with the changes brought in by the change in basis revision."
1021
1022
#: bzrlib/builtins.py:1714
1023
msgid ""
1024
"If the tree's branch is bound to a master branch, bzr will also update\n"
1025
"the branch from the master."
1026
msgstr ""
1027
"If the tree's branch is bound to a master branch, bzr will also update\n"
1028
"the branch from the master."
1029
1030
#: bzrlib/builtins.py:1717
1031
msgid ""
1032
"You cannot update just a single file or directory, because each Bazaar\n"
1033
"working tree has just a single basis revision. If you want to restore a\n"
1034
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1035
"update'. If you want to restore a file to its state in a previous\n"
1036
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1037
"out the old content of that file to a new location."
1038
msgstr ""
1039
"You cannot update just a single file or directory, because each Bazaar\n"
1040
"working tree has just a single basis revision. If you want to restore a\n"
1041
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1042
"update'. If you want to restore a file to its state in a previous\n"
1043
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1044
"out the old content of that file to a new location."
1045
1046
#: bzrlib/builtins.py:1724
1047
msgid ""
1048
"The 'dir' argument, if given, must be the location of the root of a\n"
1049
"working tree to update. By default, the working tree that contains the \n"
1050
"current working directory is used."
1051
msgstr ""
1052
"The 'dir' argument, if given, must be the location of the root of a\n"
1053
"working tree to update. By default, the working tree that contains the \n"
1054
"current working directory is used."
1055
1056
#: bzrlib/builtins.py:1740
977
1057
msgid "bzr update --revision takes exactly one revision"
978
msgstr ""
1058
msgstr "bzr update --revision takes exactly one revision"
979
1059
980
#: bzrlib/builtins.py:1718
1060
#: bzrlib/builtins.py:1748
981
1061
msgid "bzr update can only update a whole tree, not a file or subdirectory"
982
msgstr ""
1062
msgstr "bzr update can only update a whole tree, not a file or subdirectory"
983
1063
984
#: bzrlib/builtins.py:1749
1064
#: bzrlib/builtins.py:1779
985
1065
msgid "Tree is up to date at revision {0} of branch {1}"
986
msgstr ""
1066
msgstr "Tree is up to date at revision {0} of branch {1}"
987
1067
988
#: bzrlib/builtins.py:1765
1068
#: bzrlib/builtins.py:1795
989
1069
#, python-format
990
1070
msgid ""
991
1071
"branch has no revision %s\n"
992
1072
"bzr update --revision only works for a revision in the branch history"
993
1073
msgstr ""
1074
"branch has no revision %s\n"
1075
"bzr update --revision only works for a revision in the branch history"
994
1076
995
#: bzrlib/builtins.py:1771
1077
#: bzrlib/builtins.py:1801
996
1078
msgid "Updated to revision {0} of branch {1}"
997
msgstr ""
1079
msgstr "Updated to revision {0} of branch {1}"
998
1080
999
#: bzrlib/builtins.py:1775
1081
#: bzrlib/builtins.py:1805
1000
1082
msgid ""
1001
1083
"Your local commits will now show as pending merges with 'bzr status', and "
1002
1084
"can be committed with 'bzr commit'."
1003
1085
msgstr ""
1086
"Your local commits will now show as pending merges with 'bzr status', and "
1087
"can be committed with 'bzr commit'."
1004
1088
1005
#: bzrlib/builtins.py:1784
1089
#: bzrlib/builtins.py:1814
1006
1090
msgid "Show information about a working tree, branch or repository."
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1786
1010
msgid ""
1011
"This command will show all known locations and formats associated to the\n"
1012
"tree, branch or repository."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1789
1016
msgid ""
1017
"In verbose mode, statistical information is included with each report.\n"
1018
"To see extended statistic information, use a verbosity level of 2 or\n"
1019
"higher by specifying the verbose option multiple times, e.g. -vv."
1020
msgstr ""
1021
1022
#: bzrlib/builtins.py:1793
1091
msgstr "Show information about a working tree, branch or repository."
1092
1093
#: bzrlib/builtins.py:1816
1094
msgid ""
1095
"This command will show all known locations and formats associated to the\n"
1096
"tree, branch or repository."
1097
msgstr ""
1098
"This command will show all known locations and formats associated to the\n"
1099
"tree, branch or repository."
1100
1101
#: bzrlib/builtins.py:1819
1102
msgid ""
1103
"In verbose mode, statistical information is included with each report.\n"
1104
"To see extended statistic information, use a verbosity level of 2 or\n"
1105
"higher by specifying the verbose option multiple times, e.g. -vv."
1106
msgstr ""
1107
"In verbose mode, statistical information is included with each report.\n"
1108
"To see extended statistic information, use a verbosity level of 2 or\n"
1109
"higher by specifying the verbose option multiple times, e.g. -vv."
1110
1111
#: bzrlib/builtins.py:1823
1023
1112
msgid "Branches and working trees will also report any missing revisions."
1024
msgstr ""
1113
msgstr "Branches and working trees will also report any missing revisions."
1025
1114
1026
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1027
#: bzrlib/builtins.py:6442
1115
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1116
#: bzrlib/builtins.py:6466
1028
1117
msgid ":Examples:"
1029
msgstr ""
1118
msgstr ":Examples:"
1030
1119
1031
#: bzrlib/builtins.py:1797
1120
#: bzrlib/builtins.py:1827
1032
1121
msgid " Display information on the format and related locations:"
1033
msgstr ""
1122
msgstr " Display information on the format and related locations:"
1034
1123
1035
#: bzrlib/builtins.py:1799
1124
#: bzrlib/builtins.py:1829
1036
1125
msgid " bzr info"
1037
msgstr ""
1126
msgstr " bzr info"
1038
1127
1039
#: bzrlib/builtins.py:1801
1128
#: bzrlib/builtins.py:1831
1040
1129
msgid ""
1041
1130
" Display the above together with extended format information and\n"
1042
1131
" basic statistics (like the number of files in the working tree and\n"
1043
1132
" number of revisions in the branch and repository):"
1044
1133
msgstr ""
1134
" Display the above together with extended format information and\n"
1135
" basic statistics (like the number of files in the working tree and\n"
1136
" number of revisions in the branch and repository):"
1045
1137
1046
#: bzrlib/builtins.py:1805
1138
#: bzrlib/builtins.py:1835
1047
1139
msgid " bzr info -v"
1048
msgstr ""
1140
msgstr " bzr info -v"
1049
1141
1050
#: bzrlib/builtins.py:1807
1142
#: bzrlib/builtins.py:1837
1051
1143
msgid " Display the above together with number of committers to the branch:"
1052
1144
msgstr ""
1145
" Display the above together with number of committers to the branch:"
1053
1146
1054
#: bzrlib/builtins.py:1809
1147
#: bzrlib/builtins.py:1839
1055
1148
msgid " bzr info -vv"
1056
msgstr ""
1149
msgstr " bzr info -vv"
1057
1150
1058
#: bzrlib/builtins.py:1828
1151
#: bzrlib/builtins.py:1858
1059
1152
msgid "Remove files or directories."
1060
msgstr ""
1153
msgstr "Remove files or directories."
1061
1154
1062
#: bzrlib/builtins.py:1830
1155
#: bzrlib/builtins.py:1860
1063
1156
msgid ""
1064
1157
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1065
1158
"delete them if they can easily be recovered using revert otherwise they\n"
1066
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1159
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1067
1160
"parameters are given Bazaar will scan for files that are being tracked by\n"
1068
1161
"Bazaar but missing in your tree and stop tracking them for you."
1069
1162
msgstr ""
1163
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1164
"delete them if they can easily be recovered using revert otherwise they\n"
1165
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1166
"parameters are given Bazaar will scan for files that are being tracked by\n"
1167
"Bazaar but missing in your tree and stop tracking them for you."
1070
1168
1071
#: bzrlib/builtins.py:1838
1169
#: bzrlib/builtins.py:1868
1072
1170
msgid "Only remove files that have never been committed."
1073
msgstr ""
1171
msgstr "Only remove files that have never been committed."
1074
1172
1075
#: bzrlib/builtins.py:1840
1173
#: bzrlib/builtins.py:1870
1076
1174
msgid "The file deletion mode to be used."
1077
msgstr ""
1175
msgstr "The file deletion mode to be used."
1078
1176
1079
#: bzrlib/builtins.py:1841
1177
#: bzrlib/builtins.py:1871
1080
1178
msgid "Deletion Strategy"
1081
msgstr ""
1179
msgstr "Deletion Strategy"
1082
1180
1083
#: bzrlib/builtins.py:1842
1181
#: bzrlib/builtins.py:1872
1084
1182
msgid "Backup changed files (default)."
1085
msgstr ""
1183
msgstr "Backup changed files (default)."
1086
1184
1087
#: bzrlib/builtins.py:1843
1185
#: bzrlib/builtins.py:1873
1088
1186
msgid "Delete from bzr but leave the working copy."
1089
msgstr ""
1187
msgstr "Delete from bzr but leave the working copy."
1090
1188
1091
#: bzrlib/builtins.py:1844
1189
#: bzrlib/builtins.py:1874
1092
1190
msgid "Don't backup changed files."
1093
msgstr ""
1191
msgstr "Don't backup changed files."
1094
1192
1095
#: bzrlib/builtins.py:1845
1193
#: bzrlib/builtins.py:1875
1096
1194
msgid ""
1097
1195
"Delete all the specified files, even if they can not be recovered and even "
1098
1196
"if they are non-empty directories. (deprecated, use no-backup)"
1099
1197
msgstr ""
1198
"Delete all the specified files, even if they can not be recovered and even "
1199
"if they are non-empty directories. (deprecated, use no-backup)"
1100
1200
1101
#: bzrlib/builtins.py:1854
1201
#: bzrlib/builtins.py:1884
1102
1202
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1103
1203
msgstr ""
1204
"(The --force option is deprecated, rather use --no-backup in future.)"
1104
1205
1105
#: bzrlib/builtins.py:1871
1206
#: bzrlib/builtins.py:1901
1106
1207
msgid "No matching files."
1107
msgstr ""
1208
msgstr "No matching files."
1108
1209
1109
#: bzrlib/builtins.py:1932
1210
#: bzrlib/builtins.py:1962
1110
1211
msgid "Reconcile bzr metadata in a branch."
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:1934
1114
msgid ""
1115
"This can correct data mismatches that may have been caused by\n"
1116
"previous ghost operations or bzr upgrades. You should only\n"
1117
"need to run this command if 'bzr check' or a bzr developer\n"
1118
"advises you to run it."
1119
msgstr ""
1120
1121
#: bzrlib/builtins.py:1939
1122
msgid ""
1123
"If a second branch is provided, cross-branch reconciliation is\n"
1124
"also attempted, which will check that data like the tree root\n"
1125
"id which was not present in very early bzr versions is represented\n"
1126
"correctly in both branches."
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:1944
1130
msgid ""
1131
"At the same time it is run it may recompress data resulting in\n"
1132
"a potential saving in disk space or performance gain."
1133
msgstr ""
1134
1135
#: bzrlib/builtins.py:1947
1212
msgstr "Reconcile bzr metadata in a branch."
1213
1214
#: bzrlib/builtins.py:1964
1215
msgid ""
1216
"This can correct data mismatches that may have been caused by\n"
1217
"previous ghost operations or bzr upgrades. You should only\n"
1218
"need to run this command if 'bzr check' or a bzr developer\n"
1219
"advises you to run it."
1220
msgstr ""
1221
"This can correct data mismatches that may have been caused by\n"
1222
"previous ghost operations or bzr upgrades. You should only\n"
1223
"need to run this command if 'bzr check' or a bzr developer\n"
1224
"advises you to run it."
1225
1226
#: bzrlib/builtins.py:1969
1227
msgid ""
1228
"If a second branch is provided, cross-branch reconciliation is\n"
1229
"also attempted, which will check that data like the tree root\n"
1230
"id which was not present in very early bzr versions is represented\n"
1231
"correctly in both branches."
1232
msgstr ""
1233
"If a second branch is provided, cross-branch reconciliation is\n"
1234
"also attempted, which will check that data like the tree root\n"
1235
"id which was not present in very early bzr versions is represented\n"
1236
"correctly in both branches."
1237
1238
#: bzrlib/builtins.py:1974
1239
msgid ""
1240
"At the same time it is run it may recompress data resulting in\n"
1241
"a potential saving in disk space or performance gain."
1242
msgstr ""
1243
"At the same time it is run it may recompress data resulting in\n"
1244
"a potential saving in disk space or performance gain."
1245
1246
#: bzrlib/builtins.py:1977
1136
1247
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1137
1248
msgstr ""
1138
1139
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1140
msgid ""
1141
"Format for the bzr 2.0 series.\n"
1142
"Uses group-compress storage.\n"
1143
"Provides rich roots which are a one-way transition.\n"
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1147
msgid ""
1148
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1149
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1150
msgstr ""
1151
1152
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1249
"The branch *MUST* be on a listable system such as local disk or sftp."
1250
1251
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1252
msgid ""
1253
"Format for the bzr 2.0 series.\n"
1254
"Uses group-compress storage.\n"
1255
"Provides rich roots which are a one-way transition.\n"
1256
msgstr ""
1257
"Format for the bzr 2.0 series.\n"
1258
"Uses group-compress storage.\n"
1259
"Provides rich roots which are a one-way transition.\n"
1260
1261
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1262
msgid ""
1263
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1264
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1265
msgstr ""
1266
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1267
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1268
1269
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1153
1270
msgid "The 2a format with experimental support for colocated branches.\n"
1154
msgstr ""
1271
msgstr "The 2a format with experimental support for collocated branches.\n"
1155
1272
1156
#: bzrlib/builtins.py:2015
1273
#: bzrlib/builtins.py:2045
1157
1274
msgid "Make a directory into a versioned branch."
1158
msgstr ""
1159
1160
#: bzrlib/builtins.py:2017
1161
msgid ""
1162
"Use this to create an empty branch, or before importing an\n"
1163
"existing project."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2020
1167
msgid ""
1168
"If there is a repository in a parent directory of the location, then\n"
1169
"the history of the branch will be stored in the repository. Otherwise\n"
1170
"init creates a standalone branch which carries its own history\n"
1171
"in the .bzr directory."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2025
1175
msgid ""
1176
"If there is already a branch at the location but it has no working tree,\n"
1177
"the tree can be populated with 'bzr checkout'."
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2028
1275
msgstr "Make a directory into a versioned branch."
1276
1277
#: bzrlib/builtins.py:2047
1278
msgid ""
1279
"Use this to create an empty branch, or before importing an\n"
1280
"existing project."
1281
msgstr ""
1282
"Use this to create an empty branch, or before importing an\n"
1283
"existing project."
1284
1285
#: bzrlib/builtins.py:2050
1286
msgid ""
1287
"If there is a repository in a parent directory of the location, then\n"
1288
"the history of the branch will be stored in the repository. Otherwise\n"
1289
"init creates a standalone branch which carries its own history\n"
1290
"in the .bzr directory."
1291
msgstr ""
1292
"If there is a repository in a parent directory of the location, then\n"
1293
"the history of the branch will be stored in the repository. Otherwise\n"
1294
"init creates a standalone branch which carries its own history\n"
1295
"in the .bzr directory."
1296
1297
#: bzrlib/builtins.py:2055
1298
msgid ""
1299
"If there is already a branch at the location but it has no working tree,\n"
1300
"the tree can be populated with 'bzr checkout'."
1301
msgstr ""
1302
"If there is already a branch at the location but it has no working tree,\n"
1303
"the tree can be populated with 'bzr checkout'."
1304
1305
#: bzrlib/builtins.py:2058
1181
1306
msgid "Recipe for importing a tree of files::"
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2030
1185
msgid ""
1186
" cd ~/project\n"
1187
" bzr init\n"
1188
" bzr add .\n"
1189
" bzr status\n"
1190
" bzr commit -m \"imported project\""
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2041
1194
msgid ""
1195
"Create the path leading up to the branch if it does not already exist."
1196
msgstr ""
1197
1198
#: bzrlib/builtins.py:2044
1307
msgstr "Recipe for importing a tree of files::"
1308
1309
#: bzrlib/builtins.py:2060
1310
msgid ""
1311
" cd ~/project\n"
1312
" bzr init\n"
1313
" bzr add .\n"
1314
" bzr status\n"
1315
" bzr commit -m \"imported project\""
1316
msgstr ""
1317
" cd ~/project\n"
1318
" bzr init\n"
1319
" bzr add .\n"
1320
" bzr status\n"
1321
" bzr commit -m \"imported project\""
1322
1323
#: bzrlib/builtins.py:2071
1324
msgid ""
1325
"Create the path leading up to the branch if it does not already exist."
1326
msgstr ""
1327
"Create the path leading up to the branch if it does not already exist."
1328
1329
#: bzrlib/builtins.py:2074
1199
1330
msgid "Specify a format for this branch. See \"help formats\"."
1200
msgstr ""
1331
msgstr "Specify a format for this branch. See \"help formats\"."
1201
1332
1202
#: bzrlib/builtins.py:2052
1333
#: bzrlib/builtins.py:2082
1203
1334
msgid ""
1204
1335
"Never change revnos or the existing log. Append revisions to it only."
1205
1336
msgstr ""
1337
"Never change revnos or the existing log. Append revisions to it only."
1206
1338
1207
#: bzrlib/builtins.py:2055
1339
#: bzrlib/builtins.py:2085
1208
1340
msgid "Create a branch without a working tree."
1209
msgstr ""
1341
msgstr "Create a branch without a working tree."
1210
1342
1211
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1343
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1212
1344
#, python-format
1213
1345
msgid ""
1214
1346
"Parent directory of %s does not exist.\n"
1215
1347
"You may supply --create-prefix to create all leading parent directories."
1216
1348
msgstr ""
1349
"Parent directory of %s does not exist.\n"
1350
"You may supply --create-prefix to create all leading parent directories."
1217
1351
1218
#: bzrlib/builtins.py:2109
1352
#: bzrlib/builtins.py:2139
1219
1353
msgid ""
1220
1354
"This branch format cannot be set to append-revisions-only. Try --default."
1221
1355
msgstr ""
1356
"This branch format cannot be set to append-revisions-only. Try --default."
1222
1357
1223
#: bzrlib/builtins.py:2120
1358
#: bzrlib/builtins.py:2150
1224
1359
msgid "Created a {0} (format: {1})\n"
1225
msgstr ""
1360
msgstr "Created a {0} (format: {1})\n"
1226
1361
1227
#: bzrlib/builtins.py:2129
1362
#: bzrlib/builtins.py:2159
1228
1363
#, python-format
1229
1364
msgid "Using shared repository: %s\n"
1230
msgstr ""
1365
msgstr "Using shared repository: %s\n"
1231
1366
1232
#: bzrlib/builtins.py:2133
1367
#: bzrlib/builtins.py:2163
1233
1368
msgid "Create a shared repository for branches to share storage space."
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2135
1237
msgid ""
1238
"New branches created under the repository directory will store their\n"
1239
"revisions in the repository, not in the branch directory. For branches\n"
1240
"with shared history, this reduces the amount of storage needed and \n"
1241
"speeds up the creation of new branches."
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2140
1245
msgid ""
1246
"If the --no-trees option is given then the branches in the repository\n"
1247
"will not have working trees by default. They will still exist as \n"
1248
"directories on disk, but they will not have separate copies of the \n"
1249
"files at a certain revision. This can be useful for repositories that\n"
1250
"store branches which are interacted with through checkouts or remote\n"
1251
"branches, such as on a server."
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2147
1255
msgid ""
1256
":Examples:\n"
1257
" Create a shared repository holding just branches::"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2150
1261
msgid ""
1262
" bzr init-repo --no-trees repo\n"
1263
" bzr init repo/trunk"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2153
1369
msgstr "Create a shared repository for branches to share storage space."
1370
1371
#: bzrlib/builtins.py:2165
1372
msgid ""
1373
"New branches created under the repository directory will store their\n"
1374
"revisions in the repository, not in the branch directory. For branches\n"
1375
"with shared history, this reduces the amount of storage needed and \n"
1376
"speeds up the creation of new branches."
1377
msgstr ""
1378
"New branches created under the repository directory will store their\n"
1379
"revisions in the repository, not in the branch directory. For branches\n"
1380
"with shared history, this reduces the amount of storage needed and \n"
1381
"speeds up the creation of new branches."
1382
1383
#: bzrlib/builtins.py:2170
1384
msgid ""
1385
"If the --no-trees option is given then the branches in the repository\n"
1386
"will not have working trees by default. They will still exist as \n"
1387
"directories on disk, but they will not have separate copies of the \n"
1388
"files at a certain revision. This can be useful for repositories that\n"
1389
"store branches which are interacted with through checkouts or remote\n"
1390
"branches, such as on a server."
1391
msgstr ""
1392
"If the --no-trees option is given then the branches in the repository\n"
1393
"will not have working trees by default. They will still exist as \n"
1394
"directories on disk, but they will not have separate copies of the \n"
1395
"files at a certain revision. This can be useful for repositories that\n"
1396
"store branches which are interacted with through checkouts or remote\n"
1397
"branches, such as on a server."
1398
1399
#: bzrlib/builtins.py:2177
1400
msgid ""
1401
":Examples:\n"
1402
" Create a shared repository holding just branches::"
1403
msgstr ""
1404
":Examples:\n"
1405
" Create a shared repository holding just branches::"
1406
1407
#: bzrlib/builtins.py:2180
1408
msgid ""
1409
" bzr init-repo --no-trees repo\n"
1410
" bzr init repo/trunk"
1411
msgstr ""
1412
" bzr init-repo --no-trees repo\n"
1413
" bzr init repo/trunk"
1414
1415
#: bzrlib/builtins.py:2183
1267
1416
msgid " Make a lightweight checkout elsewhere::"
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2155
1271
msgid ""
1272
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1273
" cd trunk-checkout\n"
1274
" (add files here)"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2163
1278
msgid ""
1279
"Specify a format for this repository. See \"bzr help formats\" for details."
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2167
1417
msgstr " Make a lightweight checkout elsewhere::"
1418
1419
#: bzrlib/builtins.py:2185
1420
msgid ""
1421
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1422
" cd trunk-checkout\n"
1423
" (add files here)"
1424
msgstr ""
1425
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1426
" cd trunk-checkout\n"
1427
" (add files here)"
1428
1429
#: bzrlib/builtins.py:2193
1430
msgid ""
1431
"Specify a format for this repository. See \"bzr help formats\" for details."
1432
msgstr ""
1433
"Specify a format for this repository. See \"bzr help formats\" for details."
1434
1435
#: bzrlib/builtins.py:2197
1283
1436
msgid "Repository format"
1284
msgstr ""
1437
msgstr "Repository format"
1285
1438
1286
#: bzrlib/builtins.py:2169
1439
#: bzrlib/builtins.py:2199
1287
1440
msgid "Branches in the repository will default to not having a working tree."
1288
1441
msgstr ""
1442
"Branches in the repository will default to not having a working tree."
1289
1443
1290
#: bzrlib/builtins.py:2195
1444
#: bzrlib/builtins.py:2225
1291
1445
msgid "Show differences in the working tree, between revisions or branches."
1292
msgstr ""
1293
1294
#: bzrlib/builtins.py:2197
1295
msgid ""
1296
"If no arguments are given, all changes for the current tree are listed.\n"
1297
"If files are given, only the changes in those files are listed.\n"
1298
"Remote and multiple branches can be compared by using the --old and\n"
1299
"--new options. If not provided, the default for both is derived from\n"
1300
"the first argument, if any, or the current tree if no arguments are\n"
1301
"given."
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2204
1305
msgid ""
1306
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1307
"produces patches suitable for \"patch -p1\"."
1308
msgstr ""
1309
1310
#: bzrlib/builtins.py:2207
1311
msgid ""
1312
"Note that when using the -r argument with a range of revisions, the\n"
1313
"differences are computed between the two specified revisions. That\n"
1314
"is, the command does not show the changes introduced by the first \n"
1315
"revision in the range. This differs from the interpretation of \n"
1316
"revision ranges used by \"bzr log\" which includes the first revision\n"
1317
"in the range."
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2214
1321
msgid ""
1322
":Exit values:\n"
1323
" 1 - changed\n"
1324
" 2 - unrepresentable changes\n"
1325
" 3 - error\n"
1326
" 0 - no change"
1327
msgstr ""
1328
1329
#: bzrlib/builtins.py:2220
1330
msgid ""
1331
":Examples:\n"
1332
" Shows the difference in the working tree versus the last commit::"
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2223
1446
msgstr "Show differences in the working tree, between revisions or branches."
1447
1448
#: bzrlib/builtins.py:2227
1449
msgid ""
1450
"If no arguments are given, all changes for the current tree are listed.\n"
1451
"If files are given, only the changes in those files are listed.\n"
1452
"Remote and multiple branches can be compared by using the --old and\n"
1453
"--new options. If not provided, the default for both is derived from\n"
1454
"the first argument, if any, or the current tree if no arguments are\n"
1455
"given."
1456
msgstr ""
1457
"If no arguments are given, all changes for the current tree are listed.\n"
1458
"If files are given, only the changes in those files are listed.\n"
1459
"Remote and multiple branches can be compared by using the --old and\n"
1460
"--new options. If not provided, the default for both is derived from\n"
1461
"the first argument, if any, or the current tree if no arguments are\n"
1462
"given."
1463
1464
#: bzrlib/builtins.py:2234
1465
msgid ""
1466
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1467
"produces patches suitable for \"patch -p1\"."
1468
msgstr ""
1469
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1470
"produces patches suitable for \"patch -p1\"."
1471
1472
#: bzrlib/builtins.py:2237
1473
msgid ""
1474
"Note that when using the -r argument with a range of revisions, the\n"
1475
"differences are computed between the two specified revisions. That\n"
1476
"is, the command does not show the changes introduced by the first \n"
1477
"revision in the range. This differs from the interpretation of \n"
1478
"revision ranges used by \"bzr log\" which includes the first revision\n"
1479
"in the range."
1480
msgstr ""
1481
"Note that when using the -r argument with a range of revisions, the\n"
1482
"differences are computed between the two specified revisions. That\n"
1483
"is, the command does not show the changes introduced by the first \n"
1484
"revision in the range. This differs from the interpretation of \n"
1485
"revision ranges used by \"bzr log\" which includes the first revision\n"
1486
"in the range."
1487
1488
#: bzrlib/builtins.py:2244
1489
msgid ""
1490
":Exit values:\n"
1491
" 1 - changed\n"
1492
" 2 - unrepresentable changes\n"
1493
" 3 - error\n"
1494
" 0 - no change"
1495
msgstr ""
1496
":Exit values:\n"
1497
" 1 - changed\n"
1498
" 2 - unrepresentable changes\n"
1499
" 3 - error\n"
1500
" 0 - no change"
1501
1502
#: bzrlib/builtins.py:2250
1503
msgid ""
1504
":Examples:\n"
1505
" Shows the difference in the working tree versus the last commit::"
1506
msgstr ""
1507
":Examples:\n"
1508
" Shows the difference in the working tree versus the last commit::"
1509
1510
#: bzrlib/builtins.py:2253
1336
1511
msgid " bzr diff"
1337
msgstr ""
1512
msgstr " bzr diff"
1338
1513
1339
#: bzrlib/builtins.py:2225
1514
#: bzrlib/builtins.py:2255
1340
1515
msgid " Difference between the working tree and revision 1::"
1341
msgstr ""
1516
msgstr " Difference between the working tree and revision 1::"
1342
1517
1343
#: bzrlib/builtins.py:2227
1518
#: bzrlib/builtins.py:2257
1344
1519
msgid " bzr diff -r1"
1345
msgstr ""
1520
msgstr " bzr diff -r1"
1346
1521
1347
#: bzrlib/builtins.py:2229
1522
#: bzrlib/builtins.py:2259
1348
1523
msgid " Difference between revision 3 and revision 1::"
1349
msgstr ""
1524
msgstr " Difference between revision 3 and revision 1::"
1350
1525
1351
#: bzrlib/builtins.py:2231
1526
#: bzrlib/builtins.py:2261
1352
1527
msgid " bzr diff -r1..3"
1353
msgstr ""
1528
msgstr " bzr diff -r1..3"
1354
1529
1355
#: bzrlib/builtins.py:2233
1530
#: bzrlib/builtins.py:2263
1356
1531
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1357
msgstr ""
1532
msgstr " Difference between revision 3 and revision 1 for branch xxx::"
1358
1533
1359
#: bzrlib/builtins.py:2235
1534
#: bzrlib/builtins.py:2265
1360
1535
msgid " bzr diff -r1..3 xxx"
1361
msgstr ""
1536
msgstr " bzr diff -r1..3 xxx"
1362
1537
1363
#: bzrlib/builtins.py:2237
1538
#: bzrlib/builtins.py:2267
1364
1539
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1365
msgstr ""
1540
msgstr " The changes introduced by revision 2 (equivalent to -r1..2)::"
1366
1541
1367
#: bzrlib/builtins.py:2239
1542
#: bzrlib/builtins.py:2269
1368
1543
msgid " bzr diff -c2"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2241
1372
msgid ""
1373
" To see the changes introduced by revision X::\n"
1374
" \n"
1375
" bzr diff -cX"
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2245
1379
msgid ""
1380
" Note that in the case of a merge, the -c option shows the changes\n"
1381
" compared to the left hand parent. To see the changes against\n"
1382
" another parent, use::"
1383
msgstr ""
1384
1385
#: bzrlib/builtins.py:2249
1544
msgstr " bzr diff -c2"
1545
1546
#: bzrlib/builtins.py:2271
1547
msgid ""
1548
" To see the changes introduced by revision X::\n"
1549
" \n"
1550
" bzr diff -cX"
1551
msgstr ""
1552
" To see the changes introduced by revision X::\n"
1553
" \n"
1554
" bzr diff -cX"
1555
1556
#: bzrlib/builtins.py:2275
1557
msgid ""
1558
" Note that in the case of a merge, the -c option shows the changes\n"
1559
" compared to the left hand parent. To see the changes against\n"
1560
" another parent, use::"
1561
msgstr ""
1562
" Note that in the case of a merge, the -c option shows the changes\n"
1563
" compared to the left hand parent. To see the changes against\n"
1564
" another parent, use::"
1565
1566
#: bzrlib/builtins.py:2279
1386
1567
msgid " bzr diff -r<chosen_parent>..X"
1387
msgstr ""
1568
msgstr " bzr diff -r<chosen_parent>..X"
1388
1569
1389
#: bzrlib/builtins.py:2251
1570
#: bzrlib/builtins.py:2281
1390
1571
msgid ""
1391
1572
" The changes between the current revision and the previous revision\n"
1392
1573
" (equivalent to -c-1 and -r-2..-1)"
1393
1574
msgstr ""
1575
" The changes between the current revision and the previous revision\n"
1576
" (equivalent to -c-1 and -r-2..-1)"
1394
1577
1395
#: bzrlib/builtins.py:2254
1578
#: bzrlib/builtins.py:2284
1396
1579
msgid " bzr diff -r-2.."
1397
msgstr ""
1580
msgstr " bzr diff -r-2.."
1398
1581
1399
#: bzrlib/builtins.py:2256
1582
#: bzrlib/builtins.py:2286
1400
1583
msgid " Show just the differences for file NEWS::"
1401
msgstr ""
1584
msgstr " Show just the differences for file NEWS::"
1402
1585
1403
#: bzrlib/builtins.py:2258
1586
#: bzrlib/builtins.py:2288
1404
1587
msgid " bzr diff NEWS"
1405
msgstr ""
1588
msgstr " bzr diff NEWS"
1406
1589
1407
#: bzrlib/builtins.py:2260
1590
#: bzrlib/builtins.py:2290
1408
1591
msgid " Show the differences in working tree xxx for file NEWS::"
1409
msgstr ""
1592
msgstr " Show the differences in working tree xxx for file NEWS::"
1410
1593
1411
#: bzrlib/builtins.py:2262
1594
#: bzrlib/builtins.py:2292
1412
1595
msgid " bzr diff xxx/NEWS"
1413
msgstr ""
1596
msgstr " bzr diff xxx/NEWS"
1414
1597
1415
#: bzrlib/builtins.py:2264
1598
#: bzrlib/builtins.py:2294
1416
1599
msgid " Show the differences from branch xxx to this working tree:"
1417
msgstr ""
1600
msgstr " Show the differences from branch xxx to this working tree:"
1418
1601
1419
#: bzrlib/builtins.py:2266
1602
#: bzrlib/builtins.py:2296
1420
1603
msgid " bzr diff --old xxx"
1421
msgstr ""
1604
msgstr " bzr diff --old xxx"
1422
1605
1423
#: bzrlib/builtins.py:2268
1606
#: bzrlib/builtins.py:2298
1424
1607
msgid " Show the differences between two branches for file NEWS::"
1425
msgstr ""
1608
msgstr " Show the differences between two branches for file NEWS::"
1426
1609
1427
#: bzrlib/builtins.py:2270
1610
#: bzrlib/builtins.py:2300
1428
1611
msgid " bzr diff --old xxx --new yyy NEWS"
1429
msgstr ""
1612
msgstr " bzr diff --old xxx --new yyy NEWS"
1430
1613
1431
#: bzrlib/builtins.py:2272
1614
#: bzrlib/builtins.py:2302
1432
1615
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1433
msgstr ""
1616
msgstr " Same as 'bzr diff' but prefix paths with old/ and new/::"
1434
1617
1435
#: bzrlib/builtins.py:2274
1618
#: bzrlib/builtins.py:2304
1436
1619
msgid ""
1437
1620
" bzr diff --prefix old/:new/\n"
1438
1621
" \n"
1440
1623
" \n"
1441
1624
" bzr diff --using /usr/bin/diff --diff-options -wu"
1442
1625
msgstr ""
1626
" bzr diff --prefix old/:new/\n"
1627
" \n"
1628
" Show the differences using a custom diff program with options::\n"
1629
" \n"
1630
" bzr diff --using /usr/bin/diff --diff-options -wu"
1443
1631
1444
#: bzrlib/builtins.py:2284
1632
#: bzrlib/builtins.py:2314
1445
1633
msgid "Pass these options to the external diff program."
1446
msgstr ""
1634
msgstr "Pass these options to the external diff program."
1447
1635
1448
#: bzrlib/builtins.py:2287
1636
#: bzrlib/builtins.py:2317
1449
1637
msgid ""
1450
1638
"Set prefixes added to old and new filenames, as two values separated by a "
1451
1639
"colon. (eg \"old/:new/\")."
1452
1640
msgstr ""
1641
"Set prefixes added to old and new filenames, as two values separated by a "
1642
"colon. (eg \"old/:new/\")."
1453
1643
1454
#: bzrlib/builtins.py:2290
1644
#: bzrlib/builtins.py:2320
1455
1645
msgid "Branch/tree to compare from."
1456
msgstr ""
1646
msgstr "Branch/tree to compare from."
1457
1647
1458
#: bzrlib/builtins.py:2294
1648
#: bzrlib/builtins.py:2324
1459
1649
msgid "Branch/tree to compare to."
1460
msgstr ""
1650
msgstr "Branch/tree to compare to."
1461
1651
1462
#: bzrlib/builtins.py:2300
1652
#: bzrlib/builtins.py:2330
1463
1653
msgid "Use this command to compare files."
1464
msgstr ""
1654
msgstr "Use this command to compare files."
1465
1655
1466
#: bzrlib/builtins.py:2305
1656
#: bzrlib/builtins.py:2335
1467
1657
msgid "Diff format to use."
1468
msgstr ""
1658
msgstr "Diff format to use."
1469
1659
1470
#: bzrlib/builtins.py:2307
1660
#: bzrlib/builtins.py:2337
1471
1661
msgid "Diff format"
1472
msgstr ""
1662
msgstr "Diff format"
1473
1663
1474
#: bzrlib/builtins.py:2329
1664
#: bzrlib/builtins.py:2359
1475
1665
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1476
msgstr ""
1666
msgstr "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1477
1667
1478
#: bzrlib/builtins.py:2333
1668
#: bzrlib/builtins.py:2363
1479
1669
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1480
msgstr ""
1670
msgstr "bzr diff --revision takes exactly one or two revision specifiers"
1481
1671
1482
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1483
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1672
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1673
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1484
1674
msgid "{0} and {1} are mutually exclusive"
1485
msgstr ""
1675
msgstr "{0} and {1} are mutually exclusive"
1486
1676
1487
#: bzrlib/builtins.py:2358
1677
#: bzrlib/builtins.py:2388
1488
1678
msgid ""
1489
1679
"List files deleted in the working tree.\n"
1490
1680
" "
1491
1681
msgstr ""
1682
"List files deleted in the working tree.\n"
1683
" "
1492
1684
1493
#: bzrlib/builtins.py:2436
1685
#: bzrlib/builtins.py:2465
1494
1686
msgid "Show the tree root directory."
1495
msgstr ""
1687
msgstr "Show the tree root directory."
1496
1688
1497
#: bzrlib/builtins.py:2438
1689
#: bzrlib/builtins.py:2467
1498
1690
msgid ""
1499
1691
"The root is the nearest enclosing directory with a .bzr control\n"
1500
1692
"directory."
1501
1693
msgstr ""
1694
"The root is the nearest enclosing directory with a .bzr control\n"
1695
"directory."
1502
1696
1503
#: bzrlib/builtins.py:2453
1697
#: bzrlib/builtins.py:2482
1504
1698
msgid "The limit argument must be an integer."
1505
msgstr ""
1699
msgstr "The limit argument must be an integer."
1506
1700
1507
#: bzrlib/builtins.py:2461
1701
#: bzrlib/builtins.py:2490
1508
1702
msgid "The levels argument must be an integer."
1509
msgstr ""
1703
msgstr "The levels argument must be an integer."
1510
1704
1511
#: bzrlib/builtins.py:2466
1705
#: bzrlib/builtins.py:2495
1512
1706
msgid "Show historical log for a branch or subset of a branch."
1513
msgstr ""
1514
1515
#: bzrlib/builtins.py:2468
1516
msgid ""
1517
"log is bzr's default tool for exploring the history of a branch.\n"
1518
"The branch to use is taken from the first parameter. If no parameters\n"
1519
"are given, the branch containing the working directory is logged.\n"
1520
"Here are some simple examples::"
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2473
1524
msgid ""
1525
" bzr log log the current branch\n"
1526
" bzr log foo.py log a file in its branch\n"
1527
" bzr log http://server/branch log a branch on a server"
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2477
1531
msgid ""
1532
"The filtering, ordering and information shown for each revision can\n"
1533
"be controlled as explained below. By default, all revisions are\n"
1534
"shown sorted (topologically) so that newer revisions appear before\n"
1535
"older ones and descendants always appear before ancestors. If displayed,\n"
1536
"merged revisions are shown indented under the revision in which they\n"
1537
"were merged."
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2484
1707
msgstr "Show historical log for a branch or subset of a branch."
1708
1709
#: bzrlib/builtins.py:2497
1710
msgid ""
1711
"log is bzr's default tool for exploring the history of a branch.\n"
1712
"The branch to use is taken from the first parameter. If no parameters\n"
1713
"are given, the branch containing the working directory is logged.\n"
1714
"Here are some simple examples::"
1715
msgstr ""
1716
"log is bzr's default tool for exploring the history of a branch.\n"
1717
"The branch to use is taken from the first parameter. If no parameters\n"
1718
"are given, the branch containing the working directory is logged.\n"
1719
"Here are some simple examples::"
1720
1721
#: bzrlib/builtins.py:2502
1722
msgid ""
1723
" bzr log log the current branch\n"
1724
" bzr log foo.py log a file in its branch\n"
1725
" bzr log http://server/branch log a branch on a server"
1726
msgstr ""
1727
" bzr log log the current branch\n"
1728
" bzr log foo.py log a file in its branch\n"
1729
" bzr log http://server/branch log a branch on a server"
1730
1731
#: bzrlib/builtins.py:2506
1732
msgid ""
1733
"The filtering, ordering and information shown for each revision can\n"
1734
"be controlled as explained below. By default, all revisions are\n"
1735
"shown sorted (topologically) so that newer revisions appear before\n"
1736
"older ones and descendants always appear before ancestors. If displayed,\n"
1737
"merged revisions are shown indented under the revision in which they\n"
1738
"were merged."
1739
msgstr ""
1740
"The filtering, ordering and information shown for each revision can\n"
1741
"be controlled as explained below. By default, all revisions are\n"
1742
"shown sorted (topologically) so that newer revisions appear before\n"
1743
"older ones and descendants always appear before ancestors. If displayed,\n"
1744
"merged revisions are shown indented under the revision in which they\n"
1745
"were merged."
1746
1747
#: bzrlib/builtins.py:2513
1541
1748
msgid ":Output control:"
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2486
1545
msgid ""
1546
" The log format controls how information about each revision is\n"
1547
" displayed. The standard log formats are called ``long``, ``short``\n"
1548
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1549
" for more details on log formats."
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2491
1553
msgid ""
1554
" The following options can be used to control what information is\n"
1555
" displayed::"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2494
1559
msgid ""
1560
" -l N display a maximum of N revisions\n"
1561
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1562
" -v display a status summary (delta) for each revision\n"
1563
" -p display a diff (patch) for each revision\n"
1564
" --show-ids display revision-ids (and file-ids), not just revnos"
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2500
1568
msgid ""
1569
" Note that the default number of levels to display is a function of the\n"
1570
" log format. If the -n option is not used, the standard log formats show\n"
1571
" just the top level (mainline)."
1572
msgstr ""
1573
1574
#: bzrlib/builtins.py:2504
1575
msgid ""
1576
" Status summaries are shown using status flags like A, M, etc. To see\n"
1577
" the changes explained using words like ``added`` and ``modified``\n"
1578
" instead, use the -vv option."
1579
msgstr ""
1580
1581
#: bzrlib/builtins.py:2508
1749
msgstr ":Output control:"
1750
1751
#: bzrlib/builtins.py:2515
1752
msgid ""
1753
" The log format controls how information about each revision is\n"
1754
" displayed. The standard log formats are called ``long``, ``short``\n"
1755
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1756
" for more details on log formats."
1757
msgstr ""
1758
" The log format controls how information about each revision is\n"
1759
" displayed. The standard log formats are called ``long``, ``short``\n"
1760
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1761
" for more details on log formats."
1762
1763
#: bzrlib/builtins.py:2520
1764
msgid ""
1765
" The following options can be used to control what information is\n"
1766
" displayed::"
1767
msgstr ""
1768
" The following options can be used to control what information is\n"
1769
" displayed::"
1770
1771
#: bzrlib/builtins.py:2523
1772
msgid ""
1773
" -l N display a maximum of N revisions\n"
1774
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1775
" -v display a status summary (delta) for each revision\n"
1776
" -p display a diff (patch) for each revision\n"
1777
" --show-ids display revision-ids (and file-ids), not just revnos"
1778
msgstr ""
1779
" -l N display a maximum of N revisions\n"
1780
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1781
" -v display a status summary (delta) for each revision\n"
1782
" -p display a diff (patch) for each revision\n"
1783
" --show-ids display revision-ids (and file-ids), not just revnos"
1784
1785
#: bzrlib/builtins.py:2529
1786
msgid ""
1787
" Note that the default number of levels to display is a function of the\n"
1788
" log format. If the -n option is not used, the standard log formats show\n"
1789
" just the top level (mainline)."
1790
msgstr ""
1791
" Note that the default number of levels to display is a function of the\n"
1792
" log format. If the -n option is not used, the standard log formats show\n"
1793
" just the top level (mainline)."
1794
1795
#: bzrlib/builtins.py:2533
1796
msgid ""
1797
" Status summaries are shown using status flags like A, M, etc. To see\n"
1798
" the changes explained using words like ``added`` and ``modified``\n"
1799
" instead, use the -vv option."
1800
msgstr ""
1801
" Status summaries are shown using status flags like A, M, etc. To see\n"
1802
" the changes explained using words like ``added`` and ``modified``\n"
1803
" instead, use the -vv option."
1804
1805
#: bzrlib/builtins.py:2537
1582
1806
msgid ":Ordering control:"
1583
msgstr ""
1807
msgstr ":Ordering control:"
1584
1808
1585
#: bzrlib/builtins.py:2510
1809
#: bzrlib/builtins.py:2539
1586
1810
msgid ""
1587
1811
" To display revisions from oldest to newest, use the --forward option.\n"
1588
1812
" In most cases, using this option will have little impact on the total\n"
1589
1813
" time taken to produce a log, though --forward does not incrementally\n"
1590
1814
" display revisions like --reverse does when it can."
1591
1815
msgstr ""
1816
" To display revisions from oldest to newest, use the --forward option.\n"
1817
" In most cases, using this option will have little impact on the total\n"
1818
" time taken to produce a log, though --forward does not incrementally\n"
1819
" display revisions like --reverse does when it can."
1592
1820
1593
#: bzrlib/builtins.py:2515
1821
#: bzrlib/builtins.py:2544
1594
1822
msgid ":Revision filtering:"
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2517
1598
msgid ""
1599
" The -r option can be used to specify what revision or range of revisions\n"
1600
" to filter against. The various forms are shown below::"
1601
msgstr ""
1602
1603
#: bzrlib/builtins.py:2520
1604
msgid ""
1605
" -rX display revision X\n"
1606
" -rX.. display revision X and later\n"
1607
" -r..Y display up to and including revision Y\n"
1608
" -rX..Y display from X to Y inclusive"
1609
msgstr ""
1610
1611
#: bzrlib/builtins.py:2525
1612
msgid ""
1613
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1614
" Some common examples are given below::"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2528
1618
msgid ""
1619
" -r-1 show just the tip\n"
1620
" -r-10.. show the last 10 mainline revisions\n"
1621
" -rsubmit:.. show what's new on this branch\n"
1622
" -rancestor:path.. show changes since the common ancestor of this\n"
1623
" branch and the one at location path\n"
1624
" -rdate:yesterday.. show changes since yesterday"
1625
msgstr ""
1626
1627
#: bzrlib/builtins.py:2535
1628
msgid ""
1629
" When logging a range of revisions using -rX..Y, log starts at\n"
1630
" revision Y and searches back in history through the primary\n"
1631
" (\"left-hand\") parents until it finds X. When logging just the\n"
1632
" top level (using -n1), an error is reported if X is not found\n"
1633
" along the way. If multi-level logging is used (-n0), X may be\n"
1634
" a nested merge revision and the log will be truncated accordingly."
1635
msgstr ""
1636
1637
#: bzrlib/builtins.py:2542
1823
msgstr ":Revision filtering:"
1824
1825
#: bzrlib/builtins.py:2546
1826
msgid ""
1827
" The -r option can be used to specify what revision or range of revisions\n"
1828
" to filter against. The various forms are shown below::"
1829
msgstr ""
1830
" The -r option can be used to specify what revision or range of revisions\n"
1831
" to filter against. The various forms are shown below::"
1832
1833
#: bzrlib/builtins.py:2549
1834
msgid ""
1835
" -rX display revision X\n"
1836
" -rX.. display revision X and later\n"
1837
" -r..Y display up to and including revision Y\n"
1838
" -rX..Y display from X to Y inclusive"
1839
msgstr ""
1840
" -rX display revision X\n"
1841
" -rX.. display revision X and later\n"
1842
" -r..Y display up to and including revision Y\n"
1843
" -rX..Y display from X to Y inclusive"
1844
1845
#: bzrlib/builtins.py:2554
1846
msgid ""
1847
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1848
" Some common examples are given below::"
1849
msgstr ""
1850
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1851
" Some common examples are given below::"
1852
1853
#: bzrlib/builtins.py:2557
1854
msgid ""
1855
" -r-1 show just the tip\n"
1856
" -r-10.. show the last 10 mainline revisions\n"
1857
" -rsubmit:.. show what's new on this branch\n"
1858
" -rancestor:path.. show changes since the common ancestor of this\n"
1859
" branch and the one at location path\n"
1860
" -rdate:yesterday.. show changes since yesterday"
1861
msgstr ""
1862
" -r-1 show just the tip\n"
1863
" -r-10.. show the last 10 mainline revisions\n"
1864
" -rsubmit:.. show what's new on this branch\n"
1865
" -rancestor:path.. show changes since the common ancestor of this\n"
1866
" branch and the one at location path\n"
1867
" -rdate:yesterday.. show changes since yesterday"
1868
1869
#: bzrlib/builtins.py:2564
1870
msgid ""
1871
" When logging a range of revisions using -rX..Y, log starts at\n"
1872
" revision Y and searches back in history through the primary\n"
1873
" (\"left-hand\") parents until it finds X. When logging just the\n"
1874
" top level (using -n1), an error is reported if X is not found\n"
1875
" along the way. If multi-level logging is used (-n0), X may be\n"
1876
" a nested merge revision and the log will be truncated accordingly."
1877
msgstr ""
1878
" When logging a range of revisions using -rX..Y, log starts at\n"
1879
" revision Y and searches back in history through the primary\n"
1880
" (\"left-hand\") parents until it finds X. When logging just the\n"
1881
" top level (using -n1), an error is reported if X is not found\n"
1882
" along the way. If multi-level logging is used (-n0), X may be\n"
1883
" a nested merge revision and the log will be truncated accordingly."
1884
1885
#: bzrlib/builtins.py:2571
1638
1886
msgid ":Path filtering:"
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2544
1642
msgid ""
1643
" If parameters are given and the first one is not a branch, the log\n"
1644
" will be filtered to show only those revisions that changed the\n"
1645
" nominated files or directories."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2548
1649
msgid ""
1650
" Filenames are interpreted within their historical context. To log a\n"
1651
" deleted file, specify a revision range so that the file existed at\n"
1652
" the end or start of the range."
1653
msgstr ""
1654
1655
#: bzrlib/builtins.py:2552
1656
msgid ""
1657
" Historical context is also important when interpreting pathnames of\n"
1658
" renamed files/directories. Consider the following example:"
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2555
1662
msgid ""
1663
" * revision 1: add tutorial.txt\n"
1664
" * revision 2: modify tutorial.txt\n"
1665
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2559
1887
msgstr ":Path filtering:"
1888
1889
#: bzrlib/builtins.py:2573
1890
msgid ""
1891
" If parameters are given and the first one is not a branch, the log\n"
1892
" will be filtered to show only those revisions that changed the\n"
1893
" nominated files or directories."
1894
msgstr ""
1895
" If parameters are given and the first one is not a branch, the log\n"
1896
" will be filtered to show only those revisions that changed the\n"
1897
" nominated files or directories."
1898
1899
#: bzrlib/builtins.py:2577
1900
msgid ""
1901
" Filenames are interpreted within their historical context. To log a\n"
1902
" deleted file, specify a revision range so that the file existed at\n"
1903
" the end or start of the range."
1904
msgstr ""
1905
" Filenames are interpreted within their historical context. To log a\n"
1906
" deleted file, specify a revision range so that the file existed at\n"
1907
" the end or start of the range."
1908
1909
#: bzrlib/builtins.py:2581
1910
msgid ""
1911
" Historical context is also important when interpreting pathnames of\n"
1912
" renamed files/directories. Consider the following example:"
1913
msgstr ""
1914
" Historical context is also important when interpreting pathnames of\n"
1915
" renamed files/directories. Consider the following example:"
1916
1917
#: bzrlib/builtins.py:2584
1918
msgid ""
1919
" * revision 1: add tutorial.txt\n"
1920
" * revision 2: modify tutorial.txt\n"
1921
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1922
msgstr ""
1923
" * revision 1: add tutorial.txt\n"
1924
" * revision 2: modify tutorial.txt\n"
1925
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1926
1927
#: bzrlib/builtins.py:2588
1669
1928
msgid " In this case:"
1670
msgstr ""
1929
msgstr " In this case:"
1671
1930
1672
#: bzrlib/builtins.py:2561
1931
#: bzrlib/builtins.py:2590
1673
1932
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2563
1677
msgid ""
1678
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2565
1682
msgid ""
1683
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1684
" the original file in revision 2."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2568
1688
msgid ""
1689
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1690
" was no file called guide.txt in revision 2."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2571
1694
msgid ""
1695
" Renames are always followed by log. By design, there is no need to\n"
1696
" explicitly ask for this (and no way to stop logging a file back\n"
1697
" until it was last renamed)."
1698
msgstr ""
1699
1700
#: bzrlib/builtins.py:2575
1933
msgstr " * ``bzr log guide.txt`` will log the file added in revision 1"
1934
1935
#: bzrlib/builtins.py:2592
1936
msgid ""
1937
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1938
msgstr ""
1939
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1940
1941
#: bzrlib/builtins.py:2594
1942
msgid ""
1943
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1944
" the original file in revision 2."
1945
msgstr ""
1946
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1947
" the original file in revision 2."
1948
1949
#: bzrlib/builtins.py:2597
1950
msgid ""
1951
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1952
" was no file called guide.txt in revision 2."
1953
msgstr ""
1954
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1955
" was no file called guide.txt in revision 2."
1956
1957
#: bzrlib/builtins.py:2600
1958
msgid ""
1959
" Renames are always followed by log. By design, there is no need to\n"
1960
" explicitly ask for this (and no way to stop logging a file back\n"
1961
" until it was last renamed)."
1962
msgstr ""
1963
" Renames are always followed by log. By design, there is no need to\n"
1964
" explicitly ask for this (and no way to stop logging a file back\n"
1965
" until it was last renamed)."
1966
1967
#: bzrlib/builtins.py:2604
1701
1968
msgid ":Other filtering:"
1702
msgstr ""
1969
msgstr ":Other filtering:"
1703
1970
1704
#: bzrlib/builtins.py:2577
1971
#: bzrlib/builtins.py:2606
1705
1972
msgid ""
1706
1973
" The --match option can be used for finding revisions that match a\n"
1707
1974
" regular expression in a commit message, committer, author or bug.\n"
1709
1976
" expressions. --match-author, --match-bugs, --match-committer and\n"
1710
1977
" --match-message can be used to only match a specific field."
1711
1978
msgstr ""
1979
" The --match option can be used for finding revisions that match a\n"
1980
" regular expression in a commit message, committer, author or bug.\n"
1981
" Specifying the option several times will match any of the supplied\n"
1982
" expressions. --match-author, --match-bugs, --match-committer and\n"
1983
" --match-message can be used to only match a specific field."
1712
1984
1713
#: bzrlib/builtins.py:2583
1985
#: bzrlib/builtins.py:2612
1714
1986
msgid ":Tips & tricks:"
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2585
1718
msgid ""
1719
" GUI tools and IDEs are often better at exploring history than command\n"
1720
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1721
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1722
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1723
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2591
1727
msgid ""
1728
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2593
1732
msgid ""
1733
" [ALIASES]\n"
1734
" tip = log -r-1\n"
1735
" top = log -l10 --line\n"
1736
" show = log -v -p"
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2598
1740
msgid ""
1741
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1742
" will show the last 10 mainline revisions. To see the details of a\n"
1743
" particular revision X, ``bzr show -rX``."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2602
1747
msgid ""
1748
" If you are interested in looking deeper into a particular merge X,\n"
1749
" use ``bzr log -n0 -rX``."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2605
1753
msgid ""
1754
" ``bzr log -v`` on a branch with lots of history is currently\n"
1755
" very slow. A fix for this issue is currently under development.\n"
1756
" With or without that fix, it is recommended that a revision range\n"
1757
" be given when using the -v option."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2610
1761
msgid ""
1762
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1763
" used to find revisions matching user names, commit messages, etc.\n"
1764
" Among other features, this plugin can find all revisions containing\n"
1765
" a list of words but not others."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2615
1769
msgid ""
1770
" When exploring non-mainline history on large projects with deep\n"
1771
" history, the performance of log can be greatly improved by installing\n"
1772
" the historycache plugin. This plugin buffers historical information\n"
1773
" trading disk space for faster speed."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2624
1987
msgstr ":Tips & tricks:"
1988
1989
#: bzrlib/builtins.py:2614
1990
msgid ""
1991
" GUI tools and IDEs are often better at exploring history than command\n"
1992
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1993
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1994
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1995
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1996
msgstr ""
1997
" GUI tools and IDEs are often better at exploring history than command\n"
1998
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1999
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
2000
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
2001
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
2002
2003
#: bzrlib/builtins.py:2620
2004
msgid ""
2005
" You may find it useful to add the aliases below to ``bazaar.conf``::"
2006
msgstr ""
2007
" You may find it useful to add the aliases below to ``bazaar.conf``::"
2008
2009
#: bzrlib/builtins.py:2622
2010
msgid ""
2011
" [ALIASES]\n"
2012
" tip = log -r-1\n"
2013
" top = log -l10 --line\n"
2014
" show = log -v -p"
2015
msgstr ""
2016
" [ALIASES]\n"
2017
" tip = log -r-1\n"
2018
" top = log -l10 --line\n"
2019
" show = log -v -p"
2020
2021
#: bzrlib/builtins.py:2627
2022
msgid ""
2023
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2024
" will show the last 10 mainline revisions. To see the details of a\n"
2025
" particular revision X, ``bzr show -rX``."
2026
msgstr ""
2027
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2028
" will show the last 10 mainline revisions. To see the details of a\n"
2029
" particular revision X, ``bzr show -rX``."
2030
2031
#: bzrlib/builtins.py:2631
2032
msgid ""
2033
" If you are interested in looking deeper into a particular merge X,\n"
2034
" use ``bzr log -n0 -rX``."
2035
msgstr ""
2036
" If you are interested in looking deeper into a particular merge X,\n"
2037
" use ``bzr log -n0 -rX``."
2038
2039
#: bzrlib/builtins.py:2634
2040
msgid ""
2041
" ``bzr log -v`` on a branch with lots of history is currently\n"
2042
" very slow. A fix for this issue is currently under development.\n"
2043
" With or without that fix, it is recommended that a revision range\n"
2044
" be given when using the -v option."
2045
msgstr ""
2046
" ``bzr log -v`` on a branch with lots of history is currently\n"
2047
" very slow. A fix for this issue is currently under development.\n"
2048
" With or without that fix, it is recommended that a revision range\n"
2049
" be given when using the -v option."
2050
2051
#: bzrlib/builtins.py:2639
2052
msgid ""
2053
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2054
" used to find revisions matching user names, commit messages, etc.\n"
2055
" Among other features, this plugin can find all revisions containing\n"
2056
" a list of words but not others."
2057
msgstr ""
2058
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2059
" used to find revisions matching user names, commit messages, etc.\n"
2060
" Among other features, this plugin can find all revisions containing\n"
2061
" a list of words but not others."
2062
2063
#: bzrlib/builtins.py:2644
2064
msgid ""
2065
" When exploring non-mainline history on large projects with deep\n"
2066
" history, the performance of log can be greatly improved by installing\n"
2067
" the historycache plugin. This plugin buffers historical information\n"
2068
" trading disk space for faster speed."
2069
msgstr ""
2070
" When exploring non-mainline history on large projects with deep\n"
2071
" history, the performance of log can be greatly improved by installing\n"
2072
" the historycache plugin. This plugin buffers historical information\n"
2073
" trading disk space for faster speed."
2074
2075
#: bzrlib/builtins.py:2653
1777
2076
msgid "Show from oldest to newest."
1778
msgstr ""
2077
msgstr "Show from oldest to newest."
1779
2078
1780
#: bzrlib/builtins.py:2627
2079
#: bzrlib/builtins.py:2656
1781
2080
msgid "Show files changed in each revision."
1782
msgstr ""
2081
msgstr "Show files changed in each revision."
1783
2082
1784
#: bzrlib/builtins.py:2633
2083
#: bzrlib/builtins.py:2662
1785
2084
msgid "Show just the specified revision. See also \"help revisionspec\"."
1786
msgstr ""
2085
msgstr "Show just the specified revision. See also \"help revisionspec\"."
1787
2086
1788
#: bzrlib/builtins.py:2637
2087
#: bzrlib/builtins.py:2666
1789
2088
msgid "What names to list as authors - first, all or committer."
1790
msgstr ""
2089
msgstr "What names to list as authors - first, all or committer."
1791
2090
1792
#: bzrlib/builtins.py:2638
2091
#: bzrlib/builtins.py:2667
1793
2092
msgid "Authors"
1794
msgstr ""
2093
msgstr "Authors"
1795
2094
1796
#: bzrlib/builtins.py:2643
2095
#: bzrlib/builtins.py:2672
1797
2096
msgid "Number of levels to display - 0 for all, 1 for flat."
1798
msgstr ""
2097
msgstr "Number of levels to display - 0 for all, 1 for flat."
1799
2098
1800
#: bzrlib/builtins.py:2653
2099
#: bzrlib/builtins.py:2682
1801
2100
msgid "Limit the output to the first N revisions."
1802
msgstr ""
2101
msgstr "Limit the output to the first N revisions."
1803
2102
1804
#: bzrlib/builtins.py:2658
2103
#: bzrlib/builtins.py:2687
1805
2104
msgid "Show changes made in each revision as a patch."
1806
msgstr ""
2105
msgstr "Show changes made in each revision as a patch."
1807
2106
1808
#: bzrlib/builtins.py:2660
2107
#: bzrlib/builtins.py:2689
1809
2108
msgid "Show merged revisions like --levels 0 does."
1810
msgstr ""
2109
msgstr "Show merged revisions like --levels 0 does."
1811
2110
1812
#: bzrlib/builtins.py:2664
2111
#: bzrlib/builtins.py:2693
1813
2112
msgid "Do not report commits with more than one parent."
1814
msgstr ""
2113
msgstr "Do not report commits with more than one parent."
1815
2114
1816
#: bzrlib/builtins.py:2666
2115
#: bzrlib/builtins.py:2695
1817
2116
msgid ""
1818
2117
"Display only the revisions that are not part of both ancestries (require -"
1819
2118
"rX..Y)."
1820
2119
msgstr ""
2120
"Display only the revisions that are not part of both ancestries (require -"
2121
"rX..Y)."
1821
2122
1822
#: bzrlib/builtins.py:2670
2123
#: bzrlib/builtins.py:2699
1823
2124
msgid "Show digital signature validity."
1824
msgstr ""
2125
msgstr "Show digital signature validity."
1825
2126
1826
#: bzrlib/builtins.py:2673
2127
#: bzrlib/builtins.py:2702
1827
2128
msgid "Show revisions whose properties match this expression."
1828
msgstr ""
2129
msgstr "Show revisions whose properties match this expression."
1829
2130
1830
#: bzrlib/builtins.py:2677
2131
#: bzrlib/builtins.py:2706
1831
2132
msgid "Show revisions whose message matches this expression."
1832
msgstr ""
2133
msgstr "Show revisions whose message matches this expression."
1833
2134
1834
#: bzrlib/builtins.py:2681
2135
#: bzrlib/builtins.py:2710
1835
2136
msgid "Show revisions whose committer matches this expression."
1836
msgstr ""
2137
msgstr "Show revisions whose committer matches this expression."
1837
2138
1838
#: bzrlib/builtins.py:2685
2139
#: bzrlib/builtins.py:2714
1839
2140
msgid "Show revisions whose authors match this expression."
1840
msgstr ""
2141
msgstr "Show revisions whose authors match this expression."
1841
2142
1842
#: bzrlib/builtins.py:2689
2143
#: bzrlib/builtins.py:2718
1843
2144
msgid "Show revisions whose bugs match this expression."
1844
msgstr ""
2145
msgstr "Show revisions whose bugs match this expression."
1845
2146
1846
#: bzrlib/builtins.py:2743
2147
#: bzrlib/builtins.py:2772
1847
2148
msgid "--exclude-common-ancestry requires -r with two revisions"
1848
msgstr ""
2149
msgstr "--exclude-common-ancestry requires -r with two revisions"
1849
2150
1850
#: bzrlib/builtins.py:2771
2151
#: bzrlib/builtins.py:2800
1851
2152
#, python-format
1852
2153
msgid "Path unknown at end or start of revision range: %s"
1853
msgstr ""
2154
msgstr "Path unknown at end or start of revision range: %s"
1854
2155
1855
#: bzrlib/builtins.py:2888
2156
#: bzrlib/builtins.py:2917
1856
2157
#, python-format
1857
2158
msgid "bzr %s doesn't accept two revisions in different branches."
1858
msgstr ""
2159
msgstr "bzr %s doesn't accept two revisions in different branches."
1859
2160
1860
#: bzrlib/builtins.py:2904
2161
#: bzrlib/builtins.py:2933
1861
2162
#, python-format
1862
2163
msgid "bzr %s --revision takes one or two values."
1863
msgstr ""
2164
msgstr "bzr %s --revision takes one or two values."
1864
2165
1865
#: bzrlib/builtins.py:2949
2166
#: bzrlib/builtins.py:2978
1866
2167
msgid ""
1867
2168
"List files in a tree.\n"
1868
2169
" "
1869
2170
msgstr ""
2171
"List files in a tree.\n"
2172
" "
1870
2173
1871
#: bzrlib/builtins.py:2958
2174
#: bzrlib/builtins.py:2987
1872
2175
msgid "Recurse into subdirectories."
1873
msgstr ""
2176
msgstr "Recurse into subdirectories."
1874
2177
1875
#: bzrlib/builtins.py:2960
2178
#: bzrlib/builtins.py:2989
1876
2179
msgid "Print paths relative to the root of the branch."
1877
msgstr ""
2180
msgstr "Print paths relative to the root of the branch."
1878
2181
1879
#: bzrlib/builtins.py:2962
2182
#: bzrlib/builtins.py:2991
1880
2183
msgid "Print unknown files."
1881
msgstr ""
2184
msgstr "Print unknown files."
1882
2185
1883
#: bzrlib/builtins.py:2963
2186
#: bzrlib/builtins.py:2992
1884
2187
msgid "Print versioned files."
1885
msgstr ""
2188
msgstr "Print versioned files."
1886
2189
1887
#: bzrlib/builtins.py:2966
2190
#: bzrlib/builtins.py:2995
1888
2191
msgid "Print ignored files."
1889
msgstr ""
2192
msgstr "Print ignored files."
1890
2193
1891
#: bzrlib/builtins.py:2968
2194
#: bzrlib/builtins.py:2997
1892
2195
msgid "List entries of a particular kind: file, directory, symlink."
1893
msgstr ""
2196
msgstr "List entries of a particular kind: file, directory, symlink."
1894
2197
1895
#: bzrlib/builtins.py:2981
2198
#: bzrlib/builtins.py:3010
1896
2199
msgid "invalid kind specified"
1897
msgstr ""
2200
msgstr "invalid kind specified"
1898
2201
1899
#: bzrlib/builtins.py:2984
2202
#: bzrlib/builtins.py:3013
1900
2203
msgid "Cannot set both --verbose and --null"
1901
msgstr ""
2204
msgstr "Cannot set both --verbose and --null"
1902
2205
1903
#: bzrlib/builtins.py:2993
2206
#: bzrlib/builtins.py:3022
1904
2207
msgid "cannot specify both --from-root and PATH"
1905
msgstr ""
2208
msgstr "cannot specify both --from-root and PATH"
1906
2209
1907
#: bzrlib/builtins.py:3080
2210
#: bzrlib/builtins.py:3109
1908
2211
msgid "Ignore specified files or patterns."
1909
msgstr ""
2212
msgstr "Ignore specified files or patterns."
1910
2213
1911
#: bzrlib/builtins.py:3082
2214
#: bzrlib/builtins.py:3111
1912
2215
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:3084
1916
msgid ""
1917
"If a .bzrignore file does not exist, the ignore command\n"
1918
"will create one and add the specified files or patterns to the newly\n"
1919
"created file. The ignore command will also automatically add the \n"
1920
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1921
"the use of the ignore command will require an explicit add command."
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:3090
1925
msgid ""
1926
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1927
"After adding, editing or deleting that file either indirectly by\n"
1928
"using this command or directly by using an editor, be sure to commit\n"
1929
"it."
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3095
1933
msgid ""
1934
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1935
"the global ignore file can be found in the application data directory as\n"
1936
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1937
"Global ignores are not touched by this command. The global ignore file\n"
1938
"can be edited directly using an editor."
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3101
1942
msgid ""
1943
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1944
"precedence over regular ignores. Such exceptions are used to specify\n"
1945
"files that should be versioned which would otherwise be ignored."
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3105
1949
msgid ""
1950
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1951
"precedence over the '!' exception patterns."
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3108
1955
msgid ""
1956
":Notes: \n"
1957
" \n"
1958
"* Ignore patterns containing shell wildcards must be quoted from\n"
1959
" the shell on Unix."
1960
msgstr ""
2216
msgstr "See ``bzr help patterns`` for details on the syntax of patterns."
1961
2217
1962
2218
#: bzrlib/builtins.py:3113
1963
2219
msgid ""
1964
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1965
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3116
1969
msgid ""
1970
":Examples:\n"
1971
" Ignore the top level Makefile::"
1972
msgstr ""
2220
"If a .bzrignore file does not exist, the ignore command\n"
2221
"will create one and add the specified files or patterns to the newly\n"
2222
"created file. The ignore command will also automatically add the \n"
2223
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2224
"the use of the ignore command will require an explicit add command."
2225
msgstr ""
2226
"If a .bzrignore file does not exist, the ignore command\n"
2227
"will create one and add the specified files or patterns to the newly\n"
2228
"created file. The ignore command will also automatically add the \n"
2229
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2230
"the use of the ignore command will require an explicit add command."
1973
2231
1974
2232
#: bzrlib/builtins.py:3119
2233
msgid ""
2234
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2235
"After adding, editing or deleting that file either indirectly by\n"
2236
"using this command or directly by using an editor, be sure to commit\n"
2237
"it."
2238
msgstr ""
2239
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2240
"After adding, editing or deleting that file either indirectly by\n"
2241
"using this command or directly by using an editor, be sure to commit\n"
2242
"it."
2243
2244
#: bzrlib/builtins.py:3124
2245
msgid ""
2246
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2247
"the global ignore file can be found in the application data directory as\n"
2248
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2249
"Global ignores are not touched by this command. The global ignore file\n"
2250
"can be edited directly using an editor."
2251
msgstr ""
2252
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2253
"the global ignore file can be found in the application data directory as\n"
2254
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2255
"Global ignores are not touched by this command. The global ignore file\n"
2256
"can be edited directly using an editor."
2257
2258
#: bzrlib/builtins.py:3130
2259
msgid ""
2260
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2261
"precedence over regular ignores. Such exceptions are used to specify\n"
2262
"files that should be versioned which would otherwise be ignored."
2263
msgstr ""
2264
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2265
"precedence over regular ignores. Such exceptions are used to specify\n"
2266
"files that should be versioned which would otherwise be ignored."
2267
2268
#: bzrlib/builtins.py:3134
2269
msgid ""
2270
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2271
"precedence over the '!' exception patterns."
2272
msgstr ""
2273
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2274
"precedence over the '!' exception patterns."
2275
2276
#: bzrlib/builtins.py:3137
2277
msgid ""
2278
":Notes: \n"
2279
" \n"
2280
"* Ignore patterns containing shell wildcards must be quoted from\n"
2281
" the shell on Unix."
2282
msgstr ""
2283
":Notes: \n"
2284
" \n"
2285
"* Ignore patterns containing shell wildcards must be quoted from\n"
2286
" the shell on Unix."
2287
2288
#: bzrlib/builtins.py:3142
2289
msgid ""
2290
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2291
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2292
msgstr ""
2293
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2294
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2295
2296
#: bzrlib/builtins.py:3145
2297
msgid ""
2298
":Examples:\n"
2299
" Ignore the top level Makefile::"
2300
msgstr ""
2301
":Examples:\n"
2302
" Ignore the top level Makefile::"
2303
2304
#: bzrlib/builtins.py:3148
1975
2305
msgid " bzr ignore ./Makefile"
1976
msgstr ""
2306
msgstr " bzr ignore ./Makefile"
1977
2307
1978
#: bzrlib/builtins.py:3121
2308
#: bzrlib/builtins.py:3150
1979
2309
msgid " Ignore .class files in all directories...::"
1980
msgstr ""
2310
msgstr " Ignore .class files in all directories...::"
1981
2311
1982
#: bzrlib/builtins.py:3123
2312
#: bzrlib/builtins.py:3152
1983
2313
msgid " bzr ignore \"*.class\""
1984
msgstr ""
2314
msgstr " bzr ignore \"*.class\""
1985
2315
1986
#: bzrlib/builtins.py:3125
2316
#: bzrlib/builtins.py:3154
1987
2317
msgid " ...but do not ignore \"special.class\"::"
1988
msgstr ""
2318
msgstr " ...but do not ignore \"special.class\"::"
1989
2319
1990
#: bzrlib/builtins.py:3127
2320
#: bzrlib/builtins.py:3156
1991
2321
msgid " bzr ignore \"!special.class\""
1992
msgstr ""
2322
msgstr " bzr ignore \"!special.class\""
1993
2323
1994
#: bzrlib/builtins.py:3129
2324
#: bzrlib/builtins.py:3158
1995
2325
msgid " Ignore files whose name begins with the \"#\" character::"
1996
msgstr ""
2326
msgstr " Ignore files whose name begins with the \"#\" character::"
1997
2327
1998
#: bzrlib/builtins.py:3131
2328
#: bzrlib/builtins.py:3160
1999
2329
msgid " bzr ignore \"RE:^#\""
2000
msgstr ""
2330
msgstr " bzr ignore \"RE:^#\""
2001
2331
2002
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2332
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2003
2333
msgid " Ignore .o files under the lib directory::"
2004
msgstr ""
2334
msgstr " Ignore .o files under the lib directory::"
2005
2335
2006
#: bzrlib/builtins.py:3135
2336
#: bzrlib/builtins.py:3164
2007
2337
msgid " bzr ignore \"lib/**/*.o\""
2008
msgstr ""
2338
msgstr " bzr ignore \"lib/**/*.o\""
2009
2339
2010
#: bzrlib/builtins.py:3139
2340
#: bzrlib/builtins.py:3168
2011
2341
msgid " bzr ignore \"RE:lib/.*\\.o\""
2012
msgstr ""
2342
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2013
2343
2014
#: bzrlib/builtins.py:3141
2344
#: bzrlib/builtins.py:3170
2015
2345
msgid " Ignore everything but the \"debian\" toplevel directory::"
2016
msgstr ""
2346
msgstr " Ignore everything but the \"debian\" top-level directory::"
2017
2347
2018
#: bzrlib/builtins.py:3143
2348
#: bzrlib/builtins.py:3172
2019
2349
msgid ""
2020
2350
" bzr ignore \"RE:(?!debian/).*\"\n"
2021
2351
" \n"
2026
2356
" bzr ignore \"!./local\"\n"
2027
2357
" bzr ignore \"!!*~\""
2028
2358
msgstr ""
2359
" bzr ignore \"RE:(?!debian/).*\"\n"
2360
" \n"
2361
" Ignore everything except the \"local\" top-level directory,\n"
2362
" but always ignore autosave files ending in ~, even under local/::\n"
2363
" \n"
2364
" bzr ignore \"*\"\n"
2365
" bzr ignore \"!./local\"\n"
2366
" bzr ignore \"!!*~\""
2029
2367
2030
#: bzrlib/builtins.py:3157
2368
#: bzrlib/builtins.py:3186
2031
2369
msgid "Display the default ignore rules that bzr uses."
2032
msgstr ""
2370
msgstr "Display the default ignore rules that bzr uses."
2033
2371
2034
#: bzrlib/builtins.py:3169
2372
#: bzrlib/builtins.py:3198
2035
2373
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2036
msgstr ""
2374
msgstr "ignore requires at least one NAME_PATTERN or --default-rules."
2037
2375
2038
#: bzrlib/builtins.py:3180
2376
#: bzrlib/builtins.py:3209
2039
2377
#, python-format
2040
2378
msgid "Invalid ignore pattern found. %s"
2041
2379
msgid_plural "Invalid ignore patterns found. %s"
2042
msgstr[0] ""
2043
msgstr[1] ""
2380
msgstr[0] "Invalid ignore pattern found. %s"
2381
msgstr[1] "Invalid ignore patterns found. %s"
2044
2382
2045
#: bzrlib/builtins.py:3189
2383
#: bzrlib/builtins.py:3218
2046
2384
msgid "NAME_PATTERN should not be an absolute path"
2047
msgstr ""
2385
msgstr "NAME_PATTERN should not be an absolute path"
2048
2386
2049
#: bzrlib/builtins.py:3202
2387
#: bzrlib/builtins.py:3231
2050
2388
#, python-format
2051
2389
msgid ""
2052
2390
"Warning: the following files are version controlled and match your ignore "
2055
2393
"These files will continue to be version controlled unless you 'bzr remove' "
2056
2394
"them.\n"
2057
2395
msgstr ""
2396
"Warning: the following files are version controlled and match your ignore "
2397
"pattern:\n"
2398
"%s\n"
2399
"These files will continue to be version controlled unless you 'bzr remove' "
2400
"them.\n"
2058
2401
2059
#: bzrlib/builtins.py:3209
2402
#: bzrlib/builtins.py:3238
2060
2403
msgid "List ignored files and the patterns that matched them."
2061
msgstr ""
2404
msgstr "List ignored files and the patterns that matched them."
2062
2405
2063
#: bzrlib/builtins.py:3211
2406
#: bzrlib/builtins.py:3240
2064
2407
msgid ""
2065
2408
"List all the ignored files and the ignore pattern that caused the file to\n"
2066
2409
"be ignored."
2067
2410
msgstr ""
2411
"List all the ignored files and the ignore pattern that caused the file to\n"
2412
"be ignored."
2068
2413
2069
#: bzrlib/builtins.py:3214
2414
#: bzrlib/builtins.py:3243
2070
2415
msgid "Alternatively, to list just the files::"
2071
msgstr ""
2416
msgstr "Alternatively, to list just the files::"
2072
2417
2073
#: bzrlib/builtins.py:3216
2418
#: bzrlib/builtins.py:3245
2074
2419
msgid " bzr ls --ignored"
2075
msgstr ""
2420
msgstr " bzr ls --ignored"
2076
2421
2077
#: bzrlib/builtins.py:3250
2422
#: bzrlib/builtins.py:3279
2078
2423
#, python-format
2079
2424
msgid "not a valid revision-number: %r"
2080
msgstr ""
2425
msgstr "not a valid revision-number: %r"
2081
2426
2082
#: bzrlib/builtins.py:3257
2427
#: bzrlib/builtins.py:3286
2083
2428
msgid ""
2084
2429
"Export current or past revision to a destination directory or archive."
2085
2430
msgstr ""
2431
"Export current or past revision to a destination directory or archive."
2086
2432
2087
#: bzrlib/builtins.py:3259
2433
#: bzrlib/builtins.py:3288
2088
2434
msgid "If no revision is specified this exports the last committed revision."
2089
2435
msgstr ""
2090
2091
#: bzrlib/builtins.py:3261
2092
msgid ""
2093
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2094
"given, try to find the format with the extension. If no extension\n"
2095
"is found exports to a directory (equivalent to --format=dir)."
2096
msgstr ""
2097
2098
#: bzrlib/builtins.py:3265
2099
msgid ""
2100
"If root is supplied, it will be used as the root directory inside\n"
2101
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2102
"to the exported filename. The root option has no effect for 'dir' format."
2103
msgstr ""
2104
2105
#: bzrlib/builtins.py:3269
2106
msgid ""
2107
"If branch is omitted then the branch containing the current working\n"
2108
"directory will be used."
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3272
2112
msgid ""
2113
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2114
msgstr ""
2115
2116
#: bzrlib/builtins.py:3274
2117
msgid ""
2118
" ================= =========================\n"
2119
" Supported formats Autodetected by extension\n"
2120
" ================= =========================\n"
2121
" dir (none)\n"
2122
" tar .tar\n"
2123
" tbz2 .tar.bz2, .tbz2\n"
2124
" tgz .tar.gz, .tgz\n"
2125
" zip .zip\n"
2126
" ================= ========================="
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3288
2436
"If no revision is specified this exports the last committed revision."
2437
2438
#: bzrlib/builtins.py:3290
2439
msgid ""
2440
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2441
"given, try to find the format with the extension. If no extension\n"
2442
"is found exports to a directory (equivalent to --format=dir)."
2443
msgstr ""
2444
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2445
"given, try to find the format with the extension. If no extension\n"
2446
"is found exports to a directory (equivalent to --format=dir)."
2447
2448
#: bzrlib/builtins.py:3294
2449
msgid ""
2450
"If root is supplied, it will be used as the root directory inside\n"
2451
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2452
"to the exported filename. The root option has no effect for 'dir' format."
2453
msgstr ""
2454
"If root is supplied, it will be used as the root directory inside\n"
2455
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2456
"to the exported filename. The root option has no effect for 'dir' format."
2457
2458
#: bzrlib/builtins.py:3298
2459
msgid ""
2460
"If branch is omitted then the branch containing the current working\n"
2461
"directory will be used."
2462
msgstr ""
2463
"If branch is omitted then the branch containing the current working\n"
2464
"directory will be used."
2465
2466
#: bzrlib/builtins.py:3301
2467
msgid ""
2468
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2469
msgstr ""
2470
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2471
2472
#: bzrlib/builtins.py:3303
2473
msgid ""
2474
" ================= =========================\n"
2475
" Supported formats Autodetected by extension\n"
2476
" ================= =========================\n"
2477
" dir (none)\n"
2478
" tar .tar\n"
2479
" tbz2 .tar.bz2, .tbz2\n"
2480
" tgz .tar.gz, .tgz\n"
2481
" zip .zip\n"
2482
" ================= ========================="
2483
msgstr ""
2484
" ================= =========================\n"
2485
" Supported formats Autodetected by extension\n"
2486
" ================= =========================\n"
2487
" dir (none)\n"
2488
" tar .tar\n"
2489
" tbz2 .tar.bz2, .tbz2\n"
2490
" tgz .tar.gz, .tgz\n"
2491
" zip .zip\n"
2492
" ================= ========================="
2493
2494
#: bzrlib/builtins.py:3317
2130
2495
msgid "Type of file to export to."
2131
msgstr ""
2496
msgstr "Type of file to export to."
2132
2497
2133
#: bzrlib/builtins.py:3291
2498
#: bzrlib/builtins.py:3320
2134
2499
msgid "Apply content filters to export the convenient form."
2135
msgstr ""
2500
msgstr "Apply content filters to export the convenient form."
2136
2501
2137
#: bzrlib/builtins.py:3295
2502
#: bzrlib/builtins.py:3324
2138
2503
msgid "Name of the root directory inside the exported file."
2139
msgstr ""
2140
2141
#: bzrlib/builtins.py:3297
2142
msgid ""
2143
"Set modification time of files to that of the last revision in which it was "
2144
"changed."
2145
msgstr ""
2146
2147
#: bzrlib/builtins.py:3300
2148
msgid ""
2149
"Export the working tree contents rather than that of the last revision."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3319
2504
msgstr "Name of the root directory inside the exported file."
2505
2506
#: bzrlib/builtins.py:3326
2507
msgid ""
2508
"Set modification time of files to that of the last revision in which it was "
2509
"changed."
2510
msgstr ""
2511
"Set modification time of files to that of the last revision in which it was "
2512
"changed."
2513
2514
#: bzrlib/builtins.py:3329
2515
msgid ""
2516
"Export the working tree contents rather than that of the last revision."
2517
msgstr ""
2518
"Export the working tree contents rather than that of the last revision."
2519
2520
#: bzrlib/builtins.py:3348
2153
2521
msgid "--uncommitted requires a working tree"
2154
msgstr ""
2522
msgstr "--uncommitted requires a working tree"
2155
2523
2156
#: bzrlib/builtins.py:3328
2524
#: bzrlib/builtins.py:3357
2157
2525
#, python-format
2158
2526
msgid "Unsupported export format: %s"
2159
msgstr ""
2527
msgstr "Unsupported export format: %s"
2160
2528
2161
#: bzrlib/builtins.py:3332
2529
#: bzrlib/builtins.py:3361
2162
2530
msgid ""
2163
2531
"Write the contents of a file as of a given revision to standard output."
2164
2532
msgstr ""
2533
"Write the contents of a file as of a given revision to standard output."
2165
2534
2166
#: bzrlib/builtins.py:3334
2535
#: bzrlib/builtins.py:3363
2167
2536
msgid "If no revision is nominated, the last revision is used."
2168
msgstr ""
2537
msgstr "If no revision is nominated, the last revision is used."
2169
2538
2170
#: bzrlib/builtins.py:3336
2539
#: bzrlib/builtins.py:3365
2171
2540
msgid ""
2172
2541
"Note: Take care to redirect standard output when using this command on a\n"
2173
2542
"binary file."
2174
2543
msgstr ""
2544
"Note: Take care to redirect standard output when using this command on a\n"
2545
"binary file."
2175
2546
2176
#: bzrlib/builtins.py:3342
2547
#: bzrlib/builtins.py:3371
2177
2548
msgid "The path name in the old tree."
2178
msgstr ""
2549
msgstr "The path name in the old tree."
2179
2550
2180
#: bzrlib/builtins.py:3343
2551
#: bzrlib/builtins.py:3372
2181
2552
msgid "Apply content filters to display the convenience form."
2182
msgstr ""
2553
msgstr "Apply content filters to display the convenience form."
2183
2554
2184
#: bzrlib/builtins.py:3354
2555
#: bzrlib/builtins.py:3383
2185
2556
msgid "bzr cat --revision takes exactly one revision specifier"
2186
msgstr ""
2557
msgstr "bzr cat --revision takes exactly one revision specifier"
2187
2558
2188
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2559
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2189
2560
msgid "{0!r} is not present in revision {1}"
2190
msgstr ""
2561
msgstr "{0!r} is not present in revision {1}"
2191
2562
2192
#: bzrlib/builtins.py:3414
2563
#: bzrlib/builtins.py:3443
2193
2564
msgid "Commit changes into a new revision."
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3416
2197
msgid ""
2198
"An explanatory message needs to be given for each commit. This is\n"
2199
"often done by using the --message option (getting the message from the\n"
2200
"command line) or by using the --file option (getting the message from\n"
2201
"a file). If neither of these options is given, an editor is opened for\n"
2202
"the user to enter the message. To see the changed files in the\n"
2203
"boilerplate text loaded into the editor, use the --show-diff option."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3423
2207
msgid ""
2208
"By default, the entire tree is committed and the person doing the\n"
2209
"commit is assumed to be the author. These defaults can be overridden\n"
2210
"as explained below."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3427
2565
msgstr "Commit changes into a new revision."
2566
2567
#: bzrlib/builtins.py:3445
2568
msgid ""
2569
"An explanatory message needs to be given for each commit. This is\n"
2570
"often done by using the --message option (getting the message from the\n"
2571
"command line) or by using the --file option (getting the message from\n"
2572
"a file). If neither of these options is given, an editor is opened for\n"
2573
"the user to enter the message. To see the changed files in the\n"
2574
"boilerplate text loaded into the editor, use the --show-diff option."
2575
msgstr ""
2576
"An explanatory message needs to be given for each commit. This is\n"
2577
"often done by using the --message option (getting the message from the\n"
2578
"command line) or by using the --file option (getting the message from\n"
2579
"a file). If neither of these options is given, an editor is opened for\n"
2580
"the user to enter the message. To see the changed files in the\n"
2581
"boilerplate text loaded into the editor, use the --show-diff option."
2582
2583
#: bzrlib/builtins.py:3452
2584
msgid ""
2585
"By default, the entire tree is committed and the person doing the\n"
2586
"commit is assumed to be the author. These defaults can be overridden\n"
2587
"as explained below."
2588
msgstr ""
2589
"By default, the entire tree is committed and the person doing the\n"
2590
"commit is assumed to be the author. These defaults can be overridden\n"
2591
"as explained below."
2592
2593
#: bzrlib/builtins.py:3456
2214
2594
msgid ":Selective commits:"
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3429
2218
msgid ""
2219
" If selected files are specified, only changes to those files are\n"
2220
" committed. If a directory is specified then the directory and\n"
2221
" everything within it is committed."
2222
msgstr ""
2223
2224
#: bzrlib/builtins.py:3433
2225
msgid ""
2226
" When excludes are given, they take precedence over selected files.\n"
2227
" For example, to commit only changes within foo, but not changes\n"
2228
" within foo/bar::"
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3437
2595
msgstr ":Selective commits:"
2596
2597
#: bzrlib/builtins.py:3458
2598
msgid ""
2599
" If selected files are specified, only changes to those files are\n"
2600
" committed. If a directory is specified then the directory and\n"
2601
" everything within it is committed."
2602
msgstr ""
2603
" If selected files are specified, only changes to those files are\n"
2604
" committed. If a directory is specified then the directory and\n"
2605
" everything within it is committed."
2606
2607
#: bzrlib/builtins.py:3462
2608
msgid ""
2609
" When excludes are given, they take precedence over selected files.\n"
2610
" For example, to commit only changes within foo, but not changes\n"
2611
" within foo/bar::"
2612
msgstr ""
2613
" When excludes are given, they take precedence over selected files.\n"
2614
" For example, to commit only changes within foo, but not changes\n"
2615
" within foo/bar::"
2616
2617
#: bzrlib/builtins.py:3466
2232
2618
msgid " bzr commit foo -x foo/bar"
2233
msgstr ""
2619
msgstr " bzr commit foo -x foo/bar"
2234
2620
2235
#: bzrlib/builtins.py:3439
2621
#: bzrlib/builtins.py:3468
2236
2622
msgid " A selective commit after a merge is not yet supported."
2237
msgstr ""
2623
msgstr " A selective commit after a merge is not yet supported."
2238
2624
2239
#: bzrlib/builtins.py:3441
2625
#: bzrlib/builtins.py:3470
2240
2626
msgid ":Custom authors:"
2241
msgstr ""
2627
msgstr ":Custom authors:"
2242
2628
2243
#: bzrlib/builtins.py:3443
2629
#: bzrlib/builtins.py:3472
2244
2630
msgid ""
2245
2631
" If the author of the change is not the same person as the committer,\n"
2246
2632
" you can specify the author's name using the --author option. The\n"
2249
2635
" the change you can specify the option multiple times, once for each\n"
2250
2636
" author."
2251
2637
msgstr ""
2638
" If the author of the change is not the same person as the committer,\n"
2639
" you can specify the author's name using the --author option. The\n"
2640
" name should be in the same format as a committer-id, e.g.\n"
2641
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2642
" the change you can specify the option multiple times, once for each\n"
2643
" author."
2252
2644
2253
#: bzrlib/builtins.py:3450
2645
#: bzrlib/builtins.py:3479
2254
2646
msgid ":Checks:"
2255
msgstr ""
2647
msgstr ":Checks:"
2256
2648
2257
#: bzrlib/builtins.py:3452
2649
#: bzrlib/builtins.py:3481
2258
2650
msgid ""
2259
2651
" A common mistake is to forget to add a new file or directory before\n"
2260
2652
" running the commit command. The --strict option checks for unknown\n"
2262
2654
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2263
2655
" for details."
2264
2656
msgstr ""
2657
" A common mistake is to forget to add a new file or directory before\n"
2658
" running the commit command. The --strict option checks for unknown\n"
2659
" files and aborts the commit if any are found. More advanced pre-commit\n"
2660
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2661
" for details."
2265
2662
2266
#: bzrlib/builtins.py:3458
2663
#: bzrlib/builtins.py:3487
2267
2664
msgid ":Things to note:"
2268
msgstr ""
2665
msgstr ":Things to note:"
2269
2666
2270
#: bzrlib/builtins.py:3460
2667
#: bzrlib/builtins.py:3489
2271
2668
msgid ""
2272
2669
" If you accidentially commit the wrong changes or make a spelling\n"
2273
2670
" mistake in the commit message say, you can use the uncommit command\n"
2274
2671
" to undo it. See ``bzr help uncommit`` for details."
2275
2672
msgstr ""
2673
" If you accidentally commit the wrong changes or make a spelling\n"
2674
" mistake in the commit message say, you can use the uncommit command\n"
2675
" to undo it. See ``bzr help uncommit`` for details."
2276
2676
2277
#: bzrlib/builtins.py:3464
2677
#: bzrlib/builtins.py:3493
2278
2678
msgid ""
2279
2679
" Hooks can also be configured to run after a commit. This allows you\n"
2280
2680
" to trigger updates to external systems like bug trackers. The --fixes\n"
2281
2681
" option can be used to record the association between a revision and\n"
2282
2682
" one or more bugs. See ``bzr help bugs`` for details."
2283
2683
msgstr ""
2684
" Hooks can also be configured to run after a commit. This allows you\n"
2685
" to trigger updates to external systems like bug trackers. The --fixes\n"
2686
" option can be used to record the association between a revision and\n"
2687
" one or more bugs. See ``bzr help bugs`` for details."
2284
2688
2285
#: bzrlib/builtins.py:3474
2689
#: bzrlib/builtins.py:3503
2286
2690
msgid "Do not consider changes made to a given path."
2287
msgstr ""
2691
msgstr "Do not consider changes made to a given path."
2288
2692
2289
#: bzrlib/builtins.py:3477
2693
#: bzrlib/builtins.py:3506
2290
2694
msgid "Description of the new revision."
2291
msgstr ""
2695
msgstr "Description of the new revision."
2292
2696
2293
#: bzrlib/builtins.py:3480
2697
#: bzrlib/builtins.py:3509
2294
2698
msgid "Commit even if nothing has changed."
2295
msgstr ""
2699
msgstr "Commit even if nothing has changed."
2296
2700
2297
#: bzrlib/builtins.py:3484
2701
#: bzrlib/builtins.py:3513
2298
2702
msgid "Take commit message from this file."
2299
msgstr ""
2703
msgstr "Take commit message from this file."
2300
2704
2301
#: bzrlib/builtins.py:3486
2705
#: bzrlib/builtins.py:3515
2302
2706
msgid "Refuse to commit if there are unknown files in the working tree."
2303
msgstr ""
2707
msgstr "Refuse to commit if there are unknown files in the working tree."
2304
2708
2305
#: bzrlib/builtins.py:3489
2709
#: bzrlib/builtins.py:3518
2306
2710
msgid ""
2307
2711
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2308
2712
"08:00:00 +0100'."
2309
2713
msgstr ""
2714
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2715
"08:00:00 +0100'."
2310
2716
2311
#: bzrlib/builtins.py:3492
2717
#: bzrlib/builtins.py:3521
2312
2718
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2313
msgstr ""
2719
msgstr "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2314
2720
2315
#: bzrlib/builtins.py:3495
2721
#: bzrlib/builtins.py:3524
2316
2722
msgid "Set the author's name, if it's different from the committer."
2317
msgstr ""
2318
2319
#: bzrlib/builtins.py:3498
2320
msgid ""
2321
"Perform a local commit in a bound branch. Local commits are not pushed to "
2322
"the master branch until a normal commit is performed."
2323
msgstr ""
2324
2325
#: bzrlib/builtins.py:3504
2326
msgid ""
2327
"When no message is supplied, show the diff along with the status summary in "
2328
"the message editor."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3507
2332
msgid ""
2333
"When committing to a foreign version control system do not push data that "
2334
"can not be natively represented."
2335
msgstr ""
2336
2337
#: bzrlib/builtins.py:3525
2338
#, python-format
2339
msgid ""
2340
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2341
"default bug tracker using the `bugtracker` option.\n"
2342
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3534
2346
#, python-format
2347
msgid ""
2348
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2349
"for more information on this feature.\n"
2350
"Commit refused."
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3543
2723
msgstr "Set the author's name, if it's different from the committer."
2724
2725
#: bzrlib/builtins.py:3527
2726
msgid ""
2727
"Perform a local commit in a bound branch. Local commits are not pushed to "
2728
"the master branch until a normal commit is performed."
2729
msgstr ""
2730
"Perform a local commit in a bound branch. Local commits are not pushed to "
2731
"the master branch until a normal commit is performed."
2732
2733
#: bzrlib/builtins.py:3533
2734
msgid ""
2735
"When no message is supplied, show the diff along with the status summary in "
2736
"the message editor."
2737
msgstr ""
2738
"When no message is supplied, show the diff along with the status summary in "
2739
"the message editor."
2740
2741
#: bzrlib/builtins.py:3536
2742
msgid ""
2743
"When committing to a foreign version control system do not push data that "
2744
"can not be natively represented."
2745
msgstr ""
2746
"When committing to a foreign version control system do not push data that "
2747
"can not be natively represented."
2748
2749
#: bzrlib/builtins.py:3554
2750
#, python-format
2751
msgid ""
2752
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2753
"default bug tracker using the `bugtracker` option.\n"
2754
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2755
msgstr ""
2756
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2757
"default bug tracker using the `bugtracker` option.\n"
2758
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2759
2760
#: bzrlib/builtins.py:3563
2761
#, python-format
2762
msgid ""
2763
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2764
"for more information on this feature.\n"
2765
"Commit refused."
2766
msgstr ""
2767
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2768
"for more information on this feature.\n"
2769
"Commit refused."
2770
2771
#: bzrlib/builtins.py:3572
2354
2772
#, python-format
2355
2773
msgid "Unrecognized bug %s. Commit refused."
2356
msgstr ""
2774
msgstr "Unrecognised bug %s. Commit refused."
2357
2775
2358
#: bzrlib/builtins.py:3546
2776
#: bzrlib/builtins.py:3575
2359
2777
#, python-format
2360
2778
msgid ""
2361
2779
"%s\n"
2362
2780
"Commit refused."
2363
2781
msgstr ""
2782
"%s\n"
2783
"Commit refused."
2364
2784
2365
#: bzrlib/builtins.py:3570
2785
#: bzrlib/builtins.py:3599
2366
2786
msgid "Could not parse --commit-time: "
2367
msgstr ""
2787
msgstr "Could not parse --commit-time: "
2368
2788
2369
#: bzrlib/builtins.py:3610
2789
#: bzrlib/builtins.py:3639
2370
2790
msgid "please specify either --message or --file"
2371
msgstr ""
2791
msgstr "please specify either --message or --file"
2372
2792
2373
#: bzrlib/builtins.py:3639
2793
#: bzrlib/builtins.py:3668
2374
2794
msgid "please specify a commit message with either --message or --file"
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3642
2378
msgid ""
2379
"Empty commit message specified. Please specify a commit message with either -"
2380
"-message or --file or leave a blank message with --message \"\"."
2381
msgstr ""
2382
2383
#: bzrlib/builtins.py:3662
2384
msgid ""
2385
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2386
"-unchanged to force an empty commit."
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3666
2390
msgid ""
2391
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2392
"resolve FILE\" to resolve."
2393
msgstr ""
2394
2395
#: bzrlib/builtins.py:3670
2795
msgstr "please specify a commit message with either --message or --file"
2796
2797
#: bzrlib/builtins.py:3671
2798
msgid ""
2799
"Empty commit message specified. Please specify a commit message with either -"
2800
"-message or --file or leave a blank message with --message \"\"."
2801
msgstr ""
2802
"Empty commit message specified. Please specify a commit message with either -"
2803
"-message or --file or leave a blank message with --message \"\"."
2804
2805
#: bzrlib/builtins.py:3691
2806
msgid ""
2807
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2808
"-unchanged to force an empty commit."
2809
msgstr ""
2810
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2811
"-unchanged to force an empty commit."
2812
2813
#: bzrlib/builtins.py:3695
2814
msgid ""
2815
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2816
"resolve FILE\" to resolve."
2817
msgstr ""
2818
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2819
"resolve FILE\" to resolve."
2820
2821
#: bzrlib/builtins.py:3699
2396
2822
msgid "Commit refused because there are unknown files in the working tree."
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3673
2400
msgid ""
2401
"\n"
2402
"To commit to master branch, run update and then commit.\n"
2403
"You can also pass --local to commit to continue working disconnected."
2404
msgstr ""
2405
2406
#: bzrlib/builtins.py:3681
2407
msgid ""
2408
"Validate working tree structure, branch consistency and repository history."
2409
msgstr ""
2410
2411
#: bzrlib/builtins.py:3683
2412
msgid ""
2413
"This command checks various invariants about branch and repository storage\n"
2414
"to detect data corruption or bzr bugs."
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3686
2418
msgid ""
2419
"The working tree and branch checks will only give output if a problem is\n"
2420
"detected. The output fields of the repository check are:"
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3689
2424
msgid ""
2425
"revisions\n"
2426
" This is just the number of revisions checked. It doesn't\n"
2427
" indicate a problem."
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3693
2431
msgid ""
2432
"versionedfiles\n"
2433
" This is just the number of versionedfiles checked. It\n"
2434
" doesn't indicate a problem."
2435
msgstr ""
2436
2437
#: bzrlib/builtins.py:3697
2438
msgid ""
2439
"unreferenced ancestors\n"
2440
" Texts that are ancestors of other texts, but\n"
2441
" are not properly referenced by the revision ancestry. This is a\n"
2442
" subtle problem that Bazaar can work around."
2443
msgstr ""
2823
msgstr "Commit refused because there are unknown files in the working tree."
2444
2824
2445
2825
#: bzrlib/builtins.py:3702
2446
2826
msgid ""
2447
"unique file texts\n"
2448
" This is the total number of unique file contents\n"
2449
" seen in the checked revisions. It does not indicate a problem."
2827
"\n"
2828
"To commit to master branch, run update and then commit.\n"
2829
"You can also pass --local to commit to continue working disconnected."
2450
2830
msgstr ""
2831
"\n"
2832
"To commit to master branch, run update and then commit.\n"
2833
"You can also pass --local to commit to continue working disconnected."
2451
2834
2452
#: bzrlib/builtins.py:3706
2835
#: bzrlib/builtins.py:3710
2453
2836
msgid ""
2454
"repeated file texts\n"
2455
" This is the total number of repeated texts seen\n"
2456
" in the checked revisions. Texts can be repeated when their file\n"
2457
" entries are modified, but the file contents are not. It does not\n"
2458
" indicate a problem."
2837
"Validate working tree structure, branch consistency and repository history."
2459
2838
msgstr ""
2839
"Validate working tree structure, branch consistency and repository history."
2460
2840
2461
2841
#: bzrlib/builtins.py:3712
2462
2842
msgid ""
2463
"If no restrictions are specified, all Bazaar data that is found at the "
2464
"given\n"
2465
"location will be checked."
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3717
2843
"This command checks various invariants about branch and repository storage\n"
2844
"to detect data corruption or bzr bugs."
2845
msgstr ""
2846
"This command checks various invariants about branch and repository storage\n"
2847
"to detect data corruption or bzr bugs."
2848
2849
#: bzrlib/builtins.py:3715
2850
msgid ""
2851
"The working tree and branch checks will only give output if a problem is\n"
2852
"detected. The output fields of the repository check are:"
2853
msgstr ""
2854
"The working tree and branch checks will only give output if a problem is\n"
2855
"detected. The output fields of the repository check are:"
2856
2857
#: bzrlib/builtins.py:3718
2858
msgid ""
2859
"revisions\n"
2860
" This is just the number of revisions checked. It doesn't\n"
2861
" indicate a problem."
2862
msgstr ""
2863
"revisions\n"
2864
" This is just the number of revisions checked. It doesn't\n"
2865
" indicate a problem."
2866
2867
#: bzrlib/builtins.py:3722
2868
msgid ""
2869
"versionedfiles\n"
2870
" This is just the number of versionedfiles checked. It\n"
2871
" doesn't indicate a problem."
2872
msgstr ""
2873
"versionedfiles\n"
2874
" This is just the number of versionedfiles checked. It\n"
2875
" doesn't indicate a problem."
2876
2877
#: bzrlib/builtins.py:3726
2878
msgid ""
2879
"unreferenced ancestors\n"
2880
" Texts that are ancestors of other texts, but\n"
2881
" are not properly referenced by the revision ancestry. This is a\n"
2882
" subtle problem that Bazaar can work around."
2883
msgstr ""
2884
"unreferenced ancestors\n"
2885
" Texts that are ancestors of other texts, but\n"
2886
" are not properly referenced by the revision ancestry. This is a\n"
2887
" subtle problem that Bazaar can work around."
2888
2889
#: bzrlib/builtins.py:3731
2890
msgid ""
2891
"unique file texts\n"
2892
" This is the total number of unique file contents\n"
2893
" seen in the checked revisions. It does not indicate a problem."
2894
msgstr ""
2895
"unique file texts\n"
2896
" This is the total number of unique file contents\n"
2897
" seen in the checked revisions. It does not indicate a problem."
2898
2899
#: bzrlib/builtins.py:3735
2900
msgid ""
2901
"repeated file texts\n"
2902
" This is the total number of repeated texts seen\n"
2903
" in the checked revisions. Texts can be repeated when their file\n"
2904
" entries are modified, but the file contents are not. It does not\n"
2905
" indicate a problem."
2906
msgstr ""
2907
"repeated file texts\n"
2908
" This is the total number of repeated texts seen\n"
2909
" in the checked revisions. Texts can be repeated when their file\n"
2910
" entries are modified, but the file contents are not. It does not\n"
2911
" indicate a problem."
2912
2913
#: bzrlib/builtins.py:3741
2914
msgid ""
2915
"If no restrictions are specified, all Bazaar data that is found at the "
2916
"given\n"
2917
"location will be checked."
2918
msgstr ""
2919
"If no restrictions are specified, all Bazaar data that is found at the "
2920
"given\n"
2921
"location will be checked."
2922
2923
#: bzrlib/builtins.py:3746
2469
2924
msgid " Check the tree and branch at 'foo'::"
2470
msgstr ""
2925
msgstr " Check the tree and branch at 'foo'::"
2471
2926
2472
#: bzrlib/builtins.py:3719
2927
#: bzrlib/builtins.py:3748
2473
2928
msgid " bzr check --tree --branch foo"
2474
msgstr ""
2929
msgstr " bzr check --tree --branch foo"
2475
2930
2476
#: bzrlib/builtins.py:3721
2931
#: bzrlib/builtins.py:3750
2477
2932
msgid " Check only the repository at 'bar'::"
2478
msgstr ""
2933
msgstr " Check only the repository at 'bar'::"
2479
2934
2480
#: bzrlib/builtins.py:3723
2935
#: bzrlib/builtins.py:3752
2481
2936
msgid " bzr check --repo bar"
2482
msgstr ""
2937
msgstr " bzr check --repo bar"
2483
2938
2484
#: bzrlib/builtins.py:3725
2939
#: bzrlib/builtins.py:3754
2485
2940
msgid " Check everything at 'baz'::"
2486
msgstr ""
2941
msgstr " Check everything at 'baz'::"
2487
2942
2488
#: bzrlib/builtins.py:3727
2943
#: bzrlib/builtins.py:3756
2489
2944
msgid " bzr check baz"
2490
msgstr ""
2945
msgstr " bzr check baz"
2491
2946
2492
#: bzrlib/builtins.py:3733
2947
#: bzrlib/builtins.py:3762
2493
2948
msgid "Check the branch related to the current directory."
2494
msgstr ""
2949
msgstr "Check the branch related to the current directory."
2495
2950
2496
#: bzrlib/builtins.py:3735
2951
#: bzrlib/builtins.py:3764
2497
2952
msgid "Check the repository related to the current directory."
2498
msgstr ""
2953
msgstr "Check the repository related to the current directory."
2499
2954
2500
#: bzrlib/builtins.py:3737
2955
#: bzrlib/builtins.py:3766
2501
2956
msgid "Check the working tree related to the current directory."
2502
msgstr ""
2957
msgstr "Check the working tree related to the current directory."
2503
2958
2504
#: bzrlib/builtins.py:3751
2959
#: bzrlib/builtins.py:3780
2505
2960
msgid "Upgrade a repository, branch or working tree to a newer format."
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3753
2509
msgid ""
2510
"When the default format has changed after a major new release of\n"
2511
"Bazaar, you may be informed during certain operations that you\n"
2512
"should upgrade. Upgrading to a newer format may improve performance\n"
2513
"or make new features available. It may however limit interoperability\n"
2514
"with older repositories or with older versions of Bazaar."
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3759
2518
msgid ""
2519
"If you wish to upgrade to a particular format rather than the\n"
2520
"current default, that can be specified using the --format option.\n"
2521
"As a consequence, you can use the upgrade command this way to\n"
2522
"\"downgrade\" to an earlier format, though some conversions are\n"
2523
"a one way process (e.g. changing from the 1.x default to the\n"
2524
"2.x default) so downgrading is not always possible."
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3766
2528
msgid ""
2529
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2530
"process (where # is a number). By default, this is left there on\n"
2531
"completion. If the conversion fails, delete the new .bzr directory\n"
2532
"and rename this one back in its place. Use the --clean option to ask\n"
2533
"for the backup.bzr directory to be removed on successful conversion.\n"
2534
"Alternatively, you can delete it by hand if everything looks good\n"
2535
"afterwards."
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3774
2539
msgid ""
2540
"If the location given is a shared repository, dependent branches\n"
2541
"are also converted provided the repository converts successfully.\n"
2542
"If the conversion of a branch fails, remaining branches are still\n"
2543
"tried."
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3779
2547
msgid ""
2548
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2549
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:3787
2961
msgstr "Upgrade a repository, branch or working tree to a newer format."
2962
2963
#: bzrlib/builtins.py:3782
2964
msgid ""
2965
"When the default format has changed after a major new release of\n"
2966
"Bazaar, you may be informed during certain operations that you\n"
2967
"should upgrade. Upgrading to a newer format may improve performance\n"
2968
"or make new features available. It may however limit interoperability\n"
2969
"with older repositories or with older versions of Bazaar."
2970
msgstr ""
2971
"When the default format has changed after a major new release of\n"
2972
"Bazaar, you may be informed during certain operations that you\n"
2973
"should upgrade. Upgrading to a newer format may improve performance\n"
2974
"or make new features available. It may however limit interoperability\n"
2975
"with older repositories or with older versions of Bazaar."
2976
2977
#: bzrlib/builtins.py:3788
2978
msgid ""
2979
"If you wish to upgrade to a particular format rather than the\n"
2980
"current default, that can be specified using the --format option.\n"
2981
"As a consequence, you can use the upgrade command this way to\n"
2982
"\"downgrade\" to an earlier format, though some conversions are\n"
2983
"a one way process (e.g. changing from the 1.x default to the\n"
2984
"2.x default) so downgrading is not always possible."
2985
msgstr ""
2986
"If you wish to upgrade to a particular format rather than the\n"
2987
"current default, that can be specified using the --format option.\n"
2988
"As a consequence, you can use the upgrade command this way to\n"
2989
"\"downgrade\" to an earlier format, though some conversions are\n"
2990
"a one way process (e.g. changing from the 1.x default to the\n"
2991
"2.x default) so downgrading is not always possible."
2992
2993
#: bzrlib/builtins.py:3795
2994
msgid ""
2995
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2996
"process (where # is a number). By default, this is left there on\n"
2997
"completion. If the conversion fails, delete the new .bzr directory\n"
2998
"and rename this one back in its place. Use the --clean option to ask\n"
2999
"for the backup.bzr directory to be removed on successful conversion.\n"
3000
"Alternatively, you can delete it by hand if everything looks good\n"
3001
"afterwards."
3002
msgstr ""
3003
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
3004
"process (where # is a number). By default, this is left there on\n"
3005
"completion. If the conversion fails, delete the new .bzr directory\n"
3006
"and rename this one back in its place. Use the --clean option to ask\n"
3007
"for the backup.bzr directory to be removed on successful conversion.\n"
3008
"Alternatively, you can delete it by hand if everything looks good\n"
3009
"afterwards."
3010
3011
#: bzrlib/builtins.py:3803
3012
msgid ""
3013
"If the location given is a shared repository, dependent branches\n"
3014
"are also converted provided the repository converts successfully.\n"
3015
"If the conversion of a branch fails, remaining branches are still\n"
3016
"tried."
3017
msgstr ""
3018
"If the location given is a shared repository, dependent branches\n"
3019
"are also converted provided the repository converts successfully.\n"
3020
"If the conversion of a branch fails, remaining branches are still\n"
3021
"tried."
3022
3023
#: bzrlib/builtins.py:3808
3024
msgid ""
3025
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3026
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
3027
msgstr ""
3028
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3029
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
3030
3031
#: bzrlib/builtins.py:3816
2553
3032
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2554
msgstr ""
3033
msgstr "Upgrade to a specific format. See \"bzr help formats\" for details."
2555
3034
2556
#: bzrlib/builtins.py:3791
3035
#: bzrlib/builtins.py:3820
2557
3036
msgid "Branch format"
2558
msgstr ""
3037
msgstr "Branch format"
2559
3038
2560
#: bzrlib/builtins.py:3793
3039
#: bzrlib/builtins.py:3822
2561
3040
msgid "Remove the backup.bzr directory if successful."
2562
msgstr ""
3041
msgstr "Remove the backup.bzr directory if successful."
2563
3042
2564
#: bzrlib/builtins.py:3795
3043
#: bzrlib/builtins.py:3824
2565
3044
msgid "Show what would be done, but don't actually do anything."
2566
msgstr ""
3045
msgstr "Show what would be done, but don't actually do anything."
2567
3046
2568
#: bzrlib/builtins.py:3810
3047
#: bzrlib/builtins.py:3839
2569
3048
msgid "Show or set bzr user id."
2570
msgstr ""
3049
msgstr "Show or set bzr user id."
2571
3050
2572
#: bzrlib/builtins.py:3812
3051
#: bzrlib/builtins.py:3841
2573
3052
msgid ""
2574
3053
":Examples:\n"
2575
3054
" Show the email of the current user::"
2576
3055
msgstr ""
3056
":Examples:\n"
3057
" Show the email of the current user::"
2577
3058
2578
#: bzrlib/builtins.py:3815
3059
#: bzrlib/builtins.py:3844
2579
3060
msgid " bzr whoami --email"
2580
msgstr ""
3061
msgstr " bzr whoami --email"
2581
3062
2582
#: bzrlib/builtins.py:3817
3063
#: bzrlib/builtins.py:3846
2583
3064
msgid " Set the current user::"
2584
msgstr ""
3065
msgstr " Set the current user::"
2585
3066
2586
#: bzrlib/builtins.py:3819
3067
#: bzrlib/builtins.py:3848
2587
3068
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2588
msgstr ""
3069
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2589
3070
2590
#: bzrlib/builtins.py:3823
3071
#: bzrlib/builtins.py:3852
2591
3072
msgid "Display email address only."
2592
msgstr ""
3073
msgstr "Display email address only."
2593
3074
2594
#: bzrlib/builtins.py:3825
3075
#: bzrlib/builtins.py:3854
2595
3076
msgid "Set identity for the current branch instead of globally."
2596
msgstr ""
3077
msgstr "Set identity for the current branch instead of globally."
2597
3078
2598
#: bzrlib/builtins.py:3851
3079
#: bzrlib/builtins.py:3880
2599
3080
msgid "--email can only be used to display existing identity"
2600
msgstr ""
3081
msgstr "--email can only be used to display existing identity"
2601
3082
2602
#: bzrlib/builtins.py:3873
3083
#: bzrlib/builtins.py:3904
2603
3084
msgid "Print or set the branch nickname."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:3875
2607
msgid ""
2608
"If unset, the tree root directory name is used as the nickname.\n"
2609
"To print the current nickname, execute with no argument."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:3878
2613
msgid ""
2614
"Bound branches use the nickname of its master branch unless it is set\n"
2615
"locally."
2616
msgstr ""
2617
2618
#: bzrlib/builtins.py:3898
3085
msgstr "Print or set the branch nickname."
3086
3087
#: bzrlib/builtins.py:3906
3088
msgid ""
3089
"If unset, the colocated branch name is used for colocated branches, and\n"
3090
"the branch directory name is used for other branches. To print the\n"
3091
"current nickname, execute with no argument."
3092
msgstr ""
3093
"If unset, the colocated branch name is used for colocated branches, and\n"
3094
"the branch directory name is used for other branches. To print the\n"
3095
"current nickname, execute with no argument."
3096
3097
#: bzrlib/builtins.py:3910
3098
msgid ""
3099
"Bound branches use the nickname of its master branch unless it is set\n"
3100
"locally."
3101
msgstr ""
3102
"Bound branches use the nickname of its master branch unless it is set\n"
3103
"locally."
3104
3105
#: bzrlib/builtins.py:3930
2619
3106
msgid "Set/unset and display aliases."
2620
msgstr ""
3107
msgstr "Set/unset and display aliases."
2621
3108
2622
#: bzrlib/builtins.py:3900
3109
#: bzrlib/builtins.py:3932
2623
3110
msgid ""
2624
3111
":Examples:\n"
2625
3112
" Show the current aliases::"
2626
3113
msgstr ""
3114
":Examples:\n"
3115
" Show the current aliases::"
2627
3116
2628
#: bzrlib/builtins.py:3903
3117
#: bzrlib/builtins.py:3935
2629
3118
msgid " bzr alias"
2630
msgstr ""
3119
msgstr " bzr alias"
2631
3120
2632
#: bzrlib/builtins.py:3905
3121
#: bzrlib/builtins.py:3937
2633
3122
msgid " Show the alias specified for 'll'::"
2634
msgstr ""
3123
msgstr " Show the alias specified for 'll'::"
2635
3124
2636
#: bzrlib/builtins.py:3907
3125
#: bzrlib/builtins.py:3939
2637
3126
msgid " bzr alias ll"
2638
msgstr ""
3127
msgstr " bzr alias ll"
2639
3128
2640
#: bzrlib/builtins.py:3909
3129
#: bzrlib/builtins.py:3941
2641
3130
msgid " Set an alias for 'll'::"
2642
msgstr ""
3131
msgstr " Set an alias for 'll'::"
2643
3132
2644
#: bzrlib/builtins.py:3911
3133
#: bzrlib/builtins.py:3943
2645
3134
msgid " bzr alias ll=\"log --line -r-10..-1\""
2646
msgstr ""
3135
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2647
3136
2648
#: bzrlib/builtins.py:3913
3137
#: bzrlib/builtins.py:3945
2649
3138
msgid " To remove an alias for 'll'::"
2650
msgstr ""
3139
msgstr " To remove an alias for 'll'::"
2651
3140
2652
#: bzrlib/builtins.py:3915
3141
#: bzrlib/builtins.py:3947
2653
3142
msgid " bzr alias --remove ll"
2654
msgstr ""
3143
msgstr " bzr alias --remove ll"
2655
3144
2656
#: bzrlib/builtins.py:3920
3145
#: bzrlib/builtins.py:3952
2657
3146
msgid "Remove the alias."
2658
msgstr ""
3147
msgstr "Remove the alias."
2659
3148
2660
#: bzrlib/builtins.py:3938
3149
#: bzrlib/builtins.py:3970
2661
3150
msgid "bzr alias --remove expects an alias to remove."
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4119
2665
msgid ""
2666
"subunit not available. subunit needs to be installed to use --subunit."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:4136
2670
msgid ""
2671
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4183
3151
msgstr "bzr alias --remove expects an alias to remove."
3152
3153
#: bzrlib/builtins.py:4151
3154
msgid ""
3155
"subunit not available. subunit needs to be installed to use --subunit."
3156
msgstr ""
3157
"subunit not available. subunit needs to be installed to use --subunit."
3158
3159
#: bzrlib/builtins.py:4168
3160
msgid ""
3161
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3162
msgstr ""
3163
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3164
3165
#: bzrlib/builtins.py:4215
2675
3166
msgid "Show version of bzr."
2676
msgstr ""
3167
msgstr "Show version of bzr."
2677
3168
2678
#: bzrlib/builtins.py:4187
3169
#: bzrlib/builtins.py:4219
2679
3170
msgid "Print just the version number."
2680
msgstr ""
3171
msgstr "Print just the version number."
2681
3172
2682
#: bzrlib/builtins.py:4206
3173
#: bzrlib/builtins.py:4238
2683
3174
msgid "It sure does!\n"
2684
msgstr ""
3175
msgstr "It sure does!\n"
2685
3176
2686
#: bzrlib/builtins.py:4230
3177
#: bzrlib/builtins.py:4262
2687
3178
#, python-format
2688
3179
msgid "merge base is revision %s\n"
2689
msgstr ""
3180
msgstr "merge base is revision %s\n"
2690
3181
2691
#: bzrlib/builtins.py:4234
3182
#: bzrlib/builtins.py:4266
2692
3183
msgid "Perform a three-way merge."
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4236
2696
msgid ""
2697
"The source of the merge can be specified either in the form of a branch,\n"
2698
"or in the form of a path to a file containing a merge directive generated\n"
2699
"with bzr send. If neither is specified, the default is the upstream branch\n"
2700
"or the branch most recently merged using --remember. The source of the\n"
2701
"merge may also be specified in the form of a path to a file in another\n"
2702
"branch: in this case, only the modifications to that file are merged into\n"
2703
"the current working tree."
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:4244
2707
msgid ""
2708
"When merging from a branch, by default bzr will try to merge in all new\n"
2709
"work from the other branch, automatically determining an appropriate base\n"
2710
"revision. If this fails, you may need to give an explicit base."
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:4248
2714
msgid ""
2715
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2716
"try to merge in all new work up to and including revision OTHER."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4251
2720
msgid ""
2721
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2722
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2723
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2724
"not already contain revision BASE, such a merge is commonly referred to as\n"
2725
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2726
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2727
"changes from the other branch is not stored in the commit."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4259
2731
msgid "Revision numbers are always relative to the source branch."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2735
msgid ""
2736
"Merge will do its best to combine the changes in two branches, but there\n"
2737
"are some kinds of problems only a human can fix. When it encounters those,\n"
2738
"it will mark a conflict. A conflict means that you need to fix something,\n"
2739
"before you can commit."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4266
2743
msgid ""
2744
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2745
msgstr ""
3184
msgstr "Perform a three-way merge."
2746
3185
2747
3186
#: bzrlib/builtins.py:4268
2748
3187
msgid ""
2749
"If there is no default branch set, the first merge will set it (use\n"
2750
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2751
"to use the default. To change the default, use --remember. The value will\n"
2752
"only be saved if the remote location can be accessed."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4273
2756
msgid ""
2757
"The results of the merge are placed into the destination working\n"
2758
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2759
"committed to record the result of the merge."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4277
2763
msgid ""
2764
"merge refuses to run if there are any uncommitted changes, unless\n"
2765
"--force is given. If --force is given, then the changes from the source \n"
2766
"will be merged with the current working tree, including any uncommitted\n"
2767
"changes in the tree. The --force option can also be used to create a\n"
2768
"merge revision which has more than two parents."
2769
msgstr ""
3188
"The source of the merge can be specified either in the form of a branch,\n"
3189
"or in the form of a path to a file containing a merge directive generated\n"
3190
"with bzr send. If neither is specified, the default is the upstream branch\n"
3191
"or the branch most recently merged using --remember. The source of the\n"
3192
"merge may also be specified in the form of a path to a file in another\n"
3193
"branch: in this case, only the modifications to that file are merged into\n"
3194
"the current working tree."
3195
msgstr ""
3196
"The source of the merge can be specified either in the form of a branch,\n"
3197
"or in the form of a path to a file containing a merge directive generated\n"
3198
"with bzr send. If neither is specified, the default is the upstream branch\n"
3199
"or the branch most recently merged using --remember. The source of the\n"
3200
"merge may also be specified in the form of a path to a file in another\n"
3201
"branch: in this case, only the modifications to that file are merged into\n"
3202
"the current working tree."
3203
3204
#: bzrlib/builtins.py:4276
3205
msgid ""
3206
"When merging from a branch, by default bzr will try to merge in all new\n"
3207
"work from the other branch, automatically determining an appropriate base\n"
3208
"revision. If this fails, you may need to give an explicit base."
3209
msgstr ""
3210
"When merging from a branch, by default bzr will try to merge in all new\n"
3211
"work from the other branch, automatically determining an appropriate base\n"
3212
"revision. If this fails, you may need to give an explicit base."
3213
3214
#: bzrlib/builtins.py:4280
3215
msgid ""
3216
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3217
"try to merge in all new work up to and including revision OTHER."
3218
msgstr ""
3219
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3220
"try to merge in all new work up to and including revision OTHER."
2770
3221
2771
3222
#: bzrlib/builtins.py:4283
2772
3223
msgid ""
2773
"If one would like to merge changes from the working tree of the other\n"
2774
"branch without merging any committed revisions, the --uncommitted option\n"
2775
"can be given."
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4287
2779
msgid ""
2780
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2781
"you to apply each diff hunk and file change, similar to \"shelve\"."
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4290
2785
msgid ""
2786
":Examples:\n"
2787
" To merge all new revisions from bzr.dev::"
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4293
3224
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3225
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3226
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3227
"not already contain revision BASE, such a merge is commonly referred to as\n"
3228
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3229
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3230
"changes from the other branch is not stored in the commit."
3231
msgstr ""
3232
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3233
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3234
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3235
"not already contain revision BASE, such a merge is commonly referred to as\n"
3236
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3237
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3238
"changes from the other branch is not stored in the commit."
3239
3240
#: bzrlib/builtins.py:4291
3241
msgid "Revision numbers are always relative to the source branch."
3242
msgstr "Revision numbers are always relative to the source branch."
3243
3244
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3245
msgid ""
3246
"Merge will do its best to combine the changes in two branches, but there\n"
3247
"are some kinds of problems only a human can fix. When it encounters those,\n"
3248
"it will mark a conflict. A conflict means that you need to fix something,\n"
3249
"before you can commit."
3250
msgstr ""
3251
"Merge will do its best to combine the changes in two branches, but there\n"
3252
"are some kinds of problems only a human can fix. When it encounters those,\n"
3253
"it will mark a conflict. A conflict means that you need to fix something,\n"
3254
"before you can commit."
3255
3256
#: bzrlib/builtins.py:4298
3257
msgid ""
3258
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3259
msgstr ""
3260
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3261
3262
#: bzrlib/builtins.py:4300
3263
msgid ""
3264
"If there is no default branch set, the first merge will set it (use\n"
3265
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3266
"to use the default. To change the default, use --remember. The value will\n"
3267
"only be saved if the remote location can be accessed."
3268
msgstr ""
3269
"If there is no default branch set, the first merge will set it (use\n"
3270
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3271
"to use the default. To change the default, use --remember. The value will\n"
3272
"only be saved if the remote location can be accessed."
3273
3274
#: bzrlib/builtins.py:4305
3275
msgid ""
3276
"The results of the merge are placed into the destination working\n"
3277
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3278
"committed to record the result of the merge."
3279
msgstr ""
3280
"The results of the merge are placed into the destination working\n"
3281
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3282
"committed to record the result of the merge."
3283
3284
#: bzrlib/builtins.py:4309
3285
msgid ""
3286
"merge refuses to run if there are any uncommitted changes, unless\n"
3287
"--force is given. If --force is given, then the changes from the source \n"
3288
"will be merged with the current working tree, including any uncommitted\n"
3289
"changes in the tree. The --force option can also be used to create a\n"
3290
"merge revision which has more than two parents."
3291
msgstr ""
3292
"merge refuses to run if there are any uncommitted changes, unless\n"
3293
"--force is given. If --force is given, then the changes from the source \n"
3294
"will be merged with the current working tree, including any uncommitted\n"
3295
"changes in the tree. The --force option can also be used to create a\n"
3296
"merge revision which has more than two parents."
3297
3298
#: bzrlib/builtins.py:4315
3299
msgid ""
3300
"If one would like to merge changes from the working tree of the other\n"
3301
"branch without merging any committed revisions, the --uncommitted option\n"
3302
"can be given."
3303
msgstr ""
3304
"If one would like to merge changes from the working tree of the other\n"
3305
"branch without merging any committed revisions, the --uncommitted option\n"
3306
"can be given."
3307
3308
#: bzrlib/builtins.py:4319
3309
msgid ""
3310
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3311
"you to apply each diff hunk and file change, similar to \"shelve\"."
3312
msgstr ""
3313
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3314
"you to apply each diff hunk and file change, similar to \"shelve\"."
3315
3316
#: bzrlib/builtins.py:4322
3317
msgid ""
3318
":Examples:\n"
3319
" To merge all new revisions from bzr.dev::"
3320
msgstr ""
3321
":Examples:\n"
3322
" To merge all new revisions from bzr.dev::"
3323
3324
#: bzrlib/builtins.py:4325
2791
3325
msgid " bzr merge ../bzr.dev"
2792
msgstr ""
3326
msgstr " bzr merge ../bzr.dev"
2793
3327
2794
#: bzrlib/builtins.py:4295
3328
#: bzrlib/builtins.py:4327
2795
3329
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2796
msgstr ""
3330
msgstr " To merge changes up to and including revision 82 from bzr.dev::"
2797
3331
2798
#: bzrlib/builtins.py:4297
3332
#: bzrlib/builtins.py:4329
2799
3333
msgid " bzr merge -r 82 ../bzr.dev"
2800
msgstr ""
3334
msgstr " bzr merge -r 82 ../bzr.dev"
2801
3335
2802
#: bzrlib/builtins.py:4299
3336
#: bzrlib/builtins.py:4331
2803
3337
msgid " To merge the changes introduced by 82, without previous changes::"
2804
3338
msgstr ""
3339
" To merge the changes introduced by 82, without previous changes::"
2805
3340
2806
#: bzrlib/builtins.py:4301
3341
#: bzrlib/builtins.py:4333
2807
3342
msgid " bzr merge -r 81..82 ../bzr.dev"
2808
msgstr ""
3343
msgstr " bzr merge -r 81..82 ../bzr.dev"
2809
3344
2810
#: bzrlib/builtins.py:4303
3345
#: bzrlib/builtins.py:4335
2811
3346
msgid " To apply a merge directive contained in /tmp/merge::"
2812
msgstr ""
3347
msgstr " To apply a merge directive contained in /tmp/merge::"
2813
3348
2814
#: bzrlib/builtins.py:4305
3349
#: bzrlib/builtins.py:4337
2815
3350
msgid " bzr merge /tmp/merge"
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4307
2819
msgid ""
2820
" To create a merge revision with three parents from two branches\n"
2821
" feature1a and feature1b:"
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4310
2825
msgid ""
2826
" bzr merge ../feature1a\n"
2827
" bzr merge ../feature1b --force\n"
2828
" bzr commit -m 'revision with three parents'"
2829
msgstr ""
2830
2831
#: bzrlib/builtins.py:4322
3351
msgstr " bzr merge /tmp/merge"
3352
3353
#: bzrlib/builtins.py:4339
3354
msgid ""
3355
" To create a merge revision with three parents from two branches\n"
3356
" feature1a and feature1b:"
3357
msgstr ""
3358
" To create a merge revision with three parents from two branches\n"
3359
" feature1a and feature1b:"
3360
3361
#: bzrlib/builtins.py:4342
3362
msgid ""
3363
" bzr merge ../feature1a\n"
3364
" bzr merge ../feature1b --force\n"
3365
" bzr commit -m 'revision with three parents'"
3366
msgstr ""
3367
" bzr merge ../feature1a\n"
3368
" bzr merge ../feature1b --force\n"
3369
" bzr commit -m 'revision with three parents'"
3370
3371
#: bzrlib/builtins.py:4354
2832
3372
msgid "Merge even if the destination tree has uncommitted changes."
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4328
2836
msgid ""
2837
"Apply uncommitted changes from a working copy, instead of branch changes."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4330
2841
msgid ""
2842
"If the destination is already completely merged into the source, pull from "
2843
"the source rather than merging. When this happens, you do not need to "
2844
"commit the result."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4335
2848
msgid ""
2849
"Branch to merge into, rather than the one containing the working directory."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4337
3373
msgstr "Merge even if the destination tree has uncommitted changes."
3374
3375
#: bzrlib/builtins.py:4360
3376
msgid ""
3377
"Apply uncommitted changes from a working copy, instead of branch changes."
3378
msgstr ""
3379
"Apply uncommitted changes from a working copy, instead of branch changes."
3380
3381
#: bzrlib/builtins.py:4362
3382
msgid ""
3383
"If the destination is already completely merged into the source, pull from "
3384
"the source rather than merging. When this happens, you do not need to "
3385
"commit the result."
3386
msgstr ""
3387
"If the destination is already completely merged into the source, pull from "
3388
"the source rather than merging. When this happens, you do not need to "
3389
"commit the result."
3390
3391
#: bzrlib/builtins.py:4367
3392
msgid ""
3393
"Branch to merge into, rather than the one containing the working directory."
3394
msgstr ""
3395
"Branch to merge into, rather than the one containing the working directory."
3396
3397
#: bzrlib/builtins.py:4369
2853
3398
msgid "Instead of merging, show a diff of the merge."
2854
msgstr ""
3399
msgstr "Instead of merging, show a diff of the merge."
2855
3400
2856
#: bzrlib/builtins.py:4339
3401
#: bzrlib/builtins.py:4371
2857
3402
msgid "Select changes interactively."
2858
msgstr ""
3403
msgstr "Select changes interactively."
2859
3404
2860
#: bzrlib/builtins.py:4361
3405
#: bzrlib/builtins.py:4393
2861
3406
msgid ""
2862
3407
"Merging into empty branches not currently supported, "
2863
3408
"https://bugs.launchpad.net/bzr/+bug/308562"
2864
3409
msgstr ""
3410
"Merging into empty branches not currently supported, "
3411
"https://bugs.launchpad.net/bzr/+bug/308562"
2865
3412
2866
#: bzrlib/builtins.py:4388
3413
#: bzrlib/builtins.py:4420
2867
3414
msgid "Cannot use --uncommitted with bundles or merge directives."
2868
msgstr ""
3415
msgstr "Cannot use --uncommitted with bundles or merge directives."
2869
3416
2870
#: bzrlib/builtins.py:4399
3417
#: bzrlib/builtins.py:4431
2871
3418
msgid "Cannot use --uncommitted and --revision at the same time."
2872
msgstr ""
3419
msgstr "Cannot use --uncommitted and --revision at the same time."
2873
3420
2874
#: bzrlib/builtins.py:4419
3421
#: bzrlib/builtins.py:4451
2875
3422
msgid "merger: "
2876
msgstr ""
3423
msgstr "merger: "
2877
3424
2878
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3425
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2879
3426
msgid "Nothing to do."
2880
msgstr ""
3427
msgstr "Nothing to do."
2881
3428
2882
#: bzrlib/builtins.py:4425
3429
#: bzrlib/builtins.py:4457
2883
3430
msgid "Cannot pull individual files"
2884
msgstr ""
3431
msgstr "Cannot pull individual files"
2885
3432
2886
#: bzrlib/builtins.py:4433
3433
#: bzrlib/builtins.py:4465
2887
3434
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2888
msgstr ""
3435
msgstr "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2889
3436
2890
#: bzrlib/builtins.py:4491
3437
#: bzrlib/builtins.py:4523
2891
3438
#, python-format
2892
3439
msgid "Show-base is not supported for this merge type. %s"
2893
msgstr ""
3440
msgstr "Show-base is not supported for this merge type. %s"
2894
3441
2895
#: bzrlib/builtins.py:4500
3442
#: bzrlib/builtins.py:4532
2896
3443
#, python-format
2897
3444
msgid "Conflict reduction is not supported for merge type %s."
2898
msgstr ""
3445
msgstr "Conflict reduction is not supported for merge type %s."
2899
3446
2900
#: bzrlib/builtins.py:4504
3447
#: bzrlib/builtins.py:4536
2901
3448
msgid "Cannot do conflict reduction and show base."
2902
msgstr ""
3449
msgstr "Cannot do conflict reduction and show base."
2903
3450
2904
#: bzrlib/builtins.py:4615
3451
#: bzrlib/builtins.py:4647
2905
3452
msgid "No location specified or remembered"
2906
msgstr ""
3453
msgstr "No location specified or remembered"
2907
3454
2908
#: bzrlib/builtins.py:4617
3455
#: bzrlib/builtins.py:4649
2909
3456
msgid "{0} remembered {1} location {2}"
2910
msgstr ""
3457
msgstr "{0} remembered {1} location {2}"
2911
3458
2912
#: bzrlib/builtins.py:4623
3459
#: bzrlib/builtins.py:4655
2913
3460
msgid "Redo a merge."
2914
msgstr ""
3461
msgstr "Redo a merge."
2915
3462
2916
#: bzrlib/builtins.py:4625
3463
#: bzrlib/builtins.py:4657
2917
3464
msgid ""
2918
3465
"Use this if you want to try a different merge technique while resolving\n"
2919
3466
"conflicts. Some merge techniques are better than others, and remerge\n"
2920
3467
"lets you try different ones on different files."
2921
3468
msgstr ""
3469
"Use this if you want to try a different merge technique while resolving\n"
3470
"conflicts. Some merge techniques are better than others, and re-merge\n"
3471
"lets you try different ones on different files."
2922
3472
2923
#: bzrlib/builtins.py:4629
3473
#: bzrlib/builtins.py:4661
2924
3474
msgid ""
2925
3475
"The options for remerge have the same meaning and defaults as the ones for\n"
2926
3476
"merge. The difference is that remerge can (only) be run when there is a\n"
2927
3477
"pending merge, and it lets you specify particular files."
2928
3478
msgstr ""
3479
"The options for re-merge have the same meaning and defaults as the ones for\n"
3480
"merge. The difference is that re-merge can (only) be run when there is a\n"
3481
"pending merge, and it lets you specify particular files."
2929
3482
2930
#: bzrlib/builtins.py:4633
3483
#: bzrlib/builtins.py:4665
2931
3484
msgid ""
2932
3485
":Examples:\n"
2933
3486
" Re-do the merge of all conflicted files, and show the base text in\n"
2934
3487
" conflict regions, in addition to the usual THIS and OTHER texts::"
2935
3488
msgstr ""
3489
":Examples:\n"
3490
" Re-do the merge of all conflicted files, and show the base text in\n"
3491
" conflict regions, in addition to the usual THIS and OTHER texts::"
2936
3492
2937
#: bzrlib/builtins.py:4637
3493
#: bzrlib/builtins.py:4669
2938
3494
msgid " bzr remerge --show-base"
2939
msgstr ""
3495
msgstr " bzr remerge --show-base"
2940
3496
2941
#: bzrlib/builtins.py:4639
3497
#: bzrlib/builtins.py:4671
2942
3498
msgid ""
2943
3499
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2944
3500
" additional processing to reduce the size of conflict regions::"
2945
3501
msgstr ""
3502
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3503
" additional processing to reduce the size of conflict regions::"
2946
3504
2947
#: bzrlib/builtins.py:4642
3505
#: bzrlib/builtins.py:4674
2948
3506
msgid " bzr remerge --merge-type weave --reprocess foobar"
2949
msgstr ""
3507
msgstr " bzr remerge --merge-type weave --reprocess foobar"
2950
3508
2951
#: bzrlib/builtins.py:4649
3509
#: bzrlib/builtins.py:4681
2952
3510
msgid "Show base revision text in conflicts."
2953
msgstr ""
3511
msgstr "Show base revision text in conflicts."
2954
3512
2955
#: bzrlib/builtins.py:4661
3513
#: bzrlib/builtins.py:4693
2956
3514
msgid ""
2957
3515
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2958
3516
"merges."
2959
3517
msgstr ""
2960
2961
#: bzrlib/builtins.py:4717
2962
msgid "Revert files to a previous revision."
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4719
2966
msgid ""
2967
"Giving a list of files will revert only those files. Otherwise, all files\n"
2968
"will be reverted. If the revision is not specified with '--revision', the\n"
2969
"last committed revision is used."
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4723
2973
msgid ""
2974
"To remove only some changes, without reverting to a prior version, use\n"
2975
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2976
"will remove the changes introduced by the second last commit (-2), without\n"
2977
"affecting the changes introduced by the last commit (-1). To remove\n"
2978
"certain changes on a hunk-by-hunk basis, see the shelve command."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4729
2982
msgid ""
2983
"By default, any files that have been manually changed will be backed up\n"
2984
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2985
"'.~#~' appended to their name, where # is a number."
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4733
2989
msgid ""
2990
"When you provide files, you can use their current pathname or the pathname\n"
2991
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2992
"name. If you name a directory, all the contents of that directory will be\n"
2993
"reverted."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4738
2997
msgid ""
2998
"If you have newly added files since the target revision, they will be\n"
2999
"removed. If the files to be removed have been changed, backups will be\n"
3000
"created as above. Directories containing unknown files will not be\n"
3001
"deleted."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4743
3005
msgid ""
3006
"The working tree contains a list of revisions that have been merged but\n"
3007
"not yet committed. These revisions will be included as additional parents\n"
3008
"of the next commit. Normally, using revert clears that list as well as\n"
3009
"reverting the files. If any files are specified, revert leaves the list\n"
3010
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3011
".`` in the tree root to revert all files but keep the recorded merges,\n"
3012
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3013
"reverting any files."
3014
msgstr ""
3015
3016
#: bzrlib/builtins.py:4752
3017
msgid ""
3018
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3019
"changes from a branch in a single revision. To do this, perform the merge\n"
3020
"as desired. Then doing revert with the \"--forget-merges\" option will "
3021
"keep\n"
3022
"the content of the tree as it was, but it will clear the list of pending\n"
3023
"merges. The next commit will then contain all of the changes that are\n"
3024
"present in the other branch, but without any other parent revisions.\n"
3025
"Because this technique forgets where these changes originated, it may\n"
3026
"cause additional conflicts on later merges involving the same source and\n"
3027
"target branches."
3028
msgstr ""
3029
3030
#: bzrlib/builtins.py:4766
3518
"Sorry, re-merge only works after normal merges. Not cherrypicking or multi-"
3519
"merges."
3520
3521
#: bzrlib/builtins.py:4751
3522
msgid ""
3523
"Set files in the working tree back to the contents of a previous revision."
3524
msgstr ""
3525
"Set files in the working tree back to the contents of a previous revision."
3526
3527
#: bzrlib/builtins.py:4753
3528
msgid ""
3529
"Giving a list of files will revert only those files. Otherwise, all files\n"
3530
"will be reverted. If the revision is not specified with '--revision', the\n"
3531
"working tree basis revision is used. A revert operation affects only the\n"
3532
"working tree, not any revision history like the branch and repository or\n"
3533
"the working tree basis revision."
3534
msgstr ""
3535
"Giving a list of files will revert only those files. Otherwise, all files\n"
3536
"will be reverted. If the revision is not specified with '--revision', the\n"
3537
"working tree basis revision is used. A revert operation affects only the\n"
3538
"working tree, not any revision history like the branch and repository or\n"
3539
"the working tree basis revision."
3540
3541
#: bzrlib/builtins.py:4759
3542
msgid ""
3543
"To remove only some changes, without reverting to a prior version, use\n"
3544
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3545
"will remove the changes introduced by the second last commit (-2), without\n"
3546
"affecting the changes introduced by the last commit (-1). To remove\n"
3547
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3548
"To update the branch to a specific revision or the latest revision and\n"
3549
"update the working tree accordingly while preserving local changes, see the\n"
3550
"update command."
3551
msgstr ""
3552
"To remove only some changes, without reverting to a prior version, use\n"
3553
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3554
"will remove the changes introduced by the second last commit (-2), without\n"
3555
"affecting the changes introduced by the last commit (-1). To remove\n"
3556
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3557
"To update the branch to a specific revision or the latest revision and\n"
3558
"update the working tree accordingly while preserving local changes, see the\n"
3559
"update command."
3560
3561
#: bzrlib/builtins.py:4768
3562
msgid ""
3563
"Uncommitted changes to files that are reverted will be discarded.\n"
3564
"Howver, by default, any files that have been manually changed will be\n"
3565
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3566
"files have '.~#~' appended to their name, where # is a number."
3567
msgstr ""
3568
"Uncommitted changes to files that are reverted will be discarded.\n"
3569
"Howver, by default, any files that have been manually changed will be\n"
3570
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3571
"files have '.~#~' appended to their name, where # is a number."
3572
3573
#: bzrlib/builtins.py:4773
3574
msgid ""
3575
"When you provide files, you can use their current pathname or the pathname\n"
3576
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3577
"name. If you name a directory, all the contents of that directory will be\n"
3578
"reverted."
3579
msgstr ""
3580
"When you provide files, you can use their current pathname or the pathname\n"
3581
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3582
"name. If you name a directory, all the contents of that directory will be\n"
3583
"reverted."
3584
3585
#: bzrlib/builtins.py:4778
3586
msgid ""
3587
"If you have newly added files since the target revision, they will be\n"
3588
"removed. If the files to be removed have been changed, backups will be\n"
3589
"created as above. Directories containing unknown files will not be\n"
3590
"deleted."
3591
msgstr ""
3592
"If you have newly added files since the target revision, they will be\n"
3593
"removed. If the files to be removed have been changed, backups will be\n"
3594
"created as above. Directories containing unknown files will not be\n"
3595
"deleted."
3596
3597
#: bzrlib/builtins.py:4783
3598
msgid ""
3599
"The working tree contains a list of revisions that have been merged but\n"
3600
"not yet committed. These revisions will be included as additional parents\n"
3601
"of the next commit. Normally, using revert clears that list as well as\n"
3602
"reverting the files. If any files are specified, revert leaves the list\n"
3603
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3604
".`` in the tree root to revert all files but keep the recorded merges,\n"
3605
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3606
"reverting any files."
3607
msgstr ""
3608
"The working tree contains a list of revisions that have been merged but\n"
3609
"not yet committed. These revisions will be included as additional parents\n"
3610
"of the next commit. Normally, using revert clears that list as well as\n"
3611
"reverting the files. If any files are specified, revert leaves the list\n"
3612
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3613
".`` in the tree root to revert all files but keep the recorded merges,\n"
3614
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3615
"reverting any files."
3616
3617
#: bzrlib/builtins.py:4792
3618
msgid ""
3619
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3620
"changes from a branch in a single revision. To do this, perform the merge\n"
3621
"as desired. Then doing revert with the \"--forget-merges\" option will "
3622
"keep\n"
3623
"the content of the tree as it was, but it will clear the list of pending\n"
3624
"merges. The next commit will then contain all of the changes that are\n"
3625
"present in the other branch, but without any other parent revisions.\n"
3626
"Because this technique forgets where these changes originated, it may\n"
3627
"cause additional conflicts on later merges involving the same source and\n"
3628
"target branches."
3629
msgstr ""
3630
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3631
"changes from a branch in a single revision. To do this, perform the merge\n"
3632
"as desired. Then doing revert with the \"--forget-merges\" option will "
3633
"keep\n"
3634
"the content of the tree as it was, but it will clear the list of pending\n"
3635
"merges. The next commit will then contain all of the changes that are\n"
3636
"present in the other branch, but without any other parent revisions.\n"
3637
"Because this technique forgets where these changes originated, it may\n"
3638
"cause additional conflicts on later merges involving the same source and\n"
3639
"target branches."
3640
3641
#: bzrlib/builtins.py:4806
3031
3642
msgid "Do not save backups of reverted files."
3032
msgstr ""
3643
msgstr "Do not save backups of reverted files."
3033
3644
3034
#: bzrlib/builtins.py:4768
3645
#: bzrlib/builtins.py:4808
3035
3646
msgid "Remove pending merge marker, without changing any files."
3036
msgstr ""
3647
msgstr "Remove pending merge marker, without changing any files."
3037
3648
3038
#: bzrlib/builtins.py:4799
3649
#: bzrlib/builtins.py:4839
3039
3650
msgid ""
3040
3651
"Show help on a command or other topic.\n"
3041
3652
" "
3042
3653
msgstr ""
3654
"Show help on a command or other topic.\n"
3655
" "
3043
3656
3044
#: bzrlib/builtins.py:4804
3657
#: bzrlib/builtins.py:4844
3045
3658
msgid "Show help on all commands."
3046
msgstr ""
3659
msgstr "Show help on all commands."
3047
3660
3048
#: bzrlib/builtins.py:4833
3661
#: bzrlib/builtins.py:4873
3049
3662
msgid "Show unmerged/unpulled revisions between two branches."
3050
msgstr ""
3663
msgstr "Show unmerged/unpulled revisions between two branches."
3051
3664
3052
#: bzrlib/builtins.py:4835
3665
#: bzrlib/builtins.py:4875
3053
3666
msgid "OTHER_BRANCH may be local or remote."
3054
msgstr ""
3055
3056
#: bzrlib/builtins.py:4837
3057
msgid ""
3058
"To filter on a range of revisions, you can use the command -r begin..end\n"
3059
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3060
"also valid.\n"
3061
" \n"
3062
":Exit values:\n"
3063
" 1 - some missing revisions\n"
3064
" 0 - no missing revisions"
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:4847
3068
msgid ""
3069
" Determine the missing revisions between this and the branch at the\n"
3070
" remembered pull location::"
3071
msgstr ""
3072
3073
#: bzrlib/builtins.py:4850
3667
msgstr "OTHER_BRANCH may be local or remote."
3668
3669
#: bzrlib/builtins.py:4877
3670
msgid ""
3671
"To filter on a range of revisions, you can use the command -r begin..end\n"
3672
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3673
"also valid.\n"
3674
" \n"
3675
":Exit values:\n"
3676
" 1 - some missing revisions\n"
3677
" 0 - no missing revisions"
3678
msgstr ""
3679
"To filter on a range of revisions, you can use the command -r begin..end\n"
3680
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3681
"also valid.\n"
3682
" \n"
3683
":Exit values:\n"
3684
" 1 - some missing revisions\n"
3685
" 0 - no missing revisions"
3686
3687
#: bzrlib/builtins.py:4887
3688
msgid ""
3689
" Determine the missing revisions between this and the branch at the\n"
3690
" remembered pull location::"
3691
msgstr ""
3692
" Determine the missing revisions between this and the branch at the\n"
3693
" remembered pull location::"
3694
3695
#: bzrlib/builtins.py:4890
3074
3696
msgid " bzr missing"
3075
msgstr ""
3697
msgstr " bzr missing"
3076
3698
3077
#: bzrlib/builtins.py:4852
3699
#: bzrlib/builtins.py:4892
3078
3700
msgid " Determine the missing revisions between this and another branch::"
3079
3701
msgstr ""
3702
" Determine the missing revisions between this and another branch::"
3080
3703
3081
#: bzrlib/builtins.py:4854
3704
#: bzrlib/builtins.py:4894
3082
3705
msgid " bzr missing http://server/branch"
3083
msgstr ""
3706
msgstr " bzr missing http://server/branch"
3084
3707
3085
#: bzrlib/builtins.py:4856
3708
#: bzrlib/builtins.py:4896
3086
3709
msgid ""
3087
3710
" Determine the missing revisions up to a specific revision on the other\n"
3088
3711
" branch::"
3089
3712
msgstr ""
3713
" Determine the missing revisions up to a specific revision on the other\n"
3714
" branch::"
3090
3715
3091
#: bzrlib/builtins.py:4859
3716
#: bzrlib/builtins.py:4899
3092
3717
msgid " bzr missing -r ..-10"
3093
msgstr ""
3718
msgstr " bzr missing -r ..-10"
3094
3719
3095
#: bzrlib/builtins.py:4861
3720
#: bzrlib/builtins.py:4901
3096
3721
msgid ""
3097
3722
" Determine the missing revisions up to a specific revision on this\n"
3098
3723
" branch::"
3099
3724
msgstr ""
3725
" Determine the missing revisions up to a specific revision on this\n"
3726
" branch::"
3100
3727
3101
#: bzrlib/builtins.py:4864
3728
#: bzrlib/builtins.py:4904
3102
3729
msgid " bzr missing --my-revision ..-10"
3103
msgstr ""
3730
msgstr " bzr missing --my-revision ..-10"
3104
3731
3105
#: bzrlib/builtins.py:4871
3732
#: bzrlib/builtins.py:4911
3106
3733
msgid "Reverse the order of revisions."
3107
msgstr ""
3734
msgstr "Reverse the order of revisions."
3108
3735
3109
#: bzrlib/builtins.py:4873
3736
#: bzrlib/builtins.py:4913
3110
3737
msgid "Display changes in the local branch only."
3111
msgstr ""
3738
msgstr "Display changes in the local branch only."
3112
3739
3113
#: bzrlib/builtins.py:4874
3740
#: bzrlib/builtins.py:4914
3114
3741
msgid "Same as --mine-only."
3115
msgstr ""
3742
msgstr "Same as --mine-only."
3116
3743
3117
#: bzrlib/builtins.py:4876
3744
#: bzrlib/builtins.py:4916
3118
3745
msgid "Display changes in the remote branch only."
3119
msgstr ""
3746
msgstr "Display changes in the remote branch only."
3120
3747
3121
#: bzrlib/builtins.py:4877
3748
#: bzrlib/builtins.py:4917
3122
3749
msgid "Same as --theirs-only."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:4882
3126
msgid ""
3127
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3128
"details."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:4886
3132
msgid ""
3133
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3134
"details."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:4889
3750
msgstr "Same as --theirs-only."
3751
3752
#: bzrlib/builtins.py:4922
3753
msgid ""
3754
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3755
"details."
3756
msgstr ""
3757
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3758
"details."
3759
3760
#: bzrlib/builtins.py:4926
3761
msgid ""
3762
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3763
"details."
3764
msgstr ""
3765
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3766
"details."
3767
3768
#: bzrlib/builtins.py:4929
3138
3769
msgid "Show all revisions in addition to the mainline ones."
3139
msgstr ""
3770
msgstr "Show all revisions in addition to the mainline ones."
3140
3771
3141
#: bzrlib/builtins.py:4943
3772
#: bzrlib/builtins.py:4983
3142
3773
msgid "No peer location known or specified."
3143
msgstr ""
3774
msgstr "No peer location known or specified."
3144
3775
3145
#: bzrlib/builtins.py:4947
3776
#: bzrlib/builtins.py:4987
3146
3777
msgid "Using saved parent location: {0}\n"
3147
msgstr ""
3778
msgstr "Using saved parent location: {0}\n"
3148
3779
3149
#: bzrlib/builtins.py:4980
3780
#: bzrlib/builtins.py:5020
3150
3781
#, python-format
3151
3782
msgid "You have %d extra revision:\n"
3152
3783
msgid_plural "You have %d extra revisions:\n"
3153
msgstr[0] ""
3154
msgstr[1] ""
3784
msgstr[0] "You have %d extra revision:\n"
3785
msgstr[1] "You have %d extra revisions:\n"
3155
3786
3156
#: bzrlib/builtins.py:4996
3787
#: bzrlib/builtins.py:5040
3157
3788
#, python-format
3158
3789
msgid "You are missing %d revision:\n"
3159
3790
msgid_plural "You are missing %d revisions:\n"
3160
msgstr[0] ""
3161
msgstr[1] ""
3791
msgstr[0] "You are missing %d revision:\n"
3792
msgstr[1] "You are missing %d revisions:\n"
3162
3793
3163
#: bzrlib/builtins.py:5008
3794
#: bzrlib/builtins.py:5055
3164
3795
msgid "This branch has no new revisions.\n"
3165
msgstr ""
3796
msgstr "This branch has no new revisions.\n"
3166
3797
3167
#: bzrlib/builtins.py:5011
3798
#: bzrlib/builtins.py:5058
3168
3799
msgid "Other branch has no new revisions.\n"
3169
msgstr ""
3800
msgstr "Other branch has no new revisions.\n"
3170
3801
3171
#: bzrlib/builtins.py:5016
3802
#: bzrlib/builtins.py:5063
3172
3803
msgid "Branches are up to date.\n"
3173
msgstr ""
3804
msgstr "Branches are up to date.\n"
3174
3805
3175
#: bzrlib/builtins.py:5027
3806
#: bzrlib/builtins.py:5074
3176
3807
msgid "Compress the data within a repository."
3177
msgstr ""
3178
3179
#: bzrlib/builtins.py:5029
3180
msgid ""
3181
"This operation compresses the data within a bazaar repository. As\n"
3182
"bazaar supports automatic packing of repository, this operation is\n"
3183
"normally not required to be done manually."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5033
3187
msgid ""
3188
"During the pack operation, bazaar takes a backup of existing repository\n"
3189
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3190
"automatically when it is safe to do so. To save disk space by removing\n"
3191
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3192
"used."
3193
msgstr ""
3194
3195
#: bzrlib/builtins.py:5039
3196
msgid ""
3197
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3198
"during or immediately after repacking, you may be left with a state\n"
3199
"where the deletion has been written to disk but the new packs have not\n"
3200
"been. In this case the repository may be unusable."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5048
3808
msgstr "Compress the data within a repository."
3809
3810
#: bzrlib/builtins.py:5076
3811
msgid ""
3812
"This operation compresses the data within a bazaar repository. As\n"
3813
"bazaar supports automatic packing of repository, this operation is\n"
3814
"normally not required to be done manually."
3815
msgstr ""
3816
"This operation compresses the data within a bazaar repository. As\n"
3817
"bazaar supports automatic packing of repository, this operation is\n"
3818
"normally not required to be done manually."
3819
3820
#: bzrlib/builtins.py:5080
3821
msgid ""
3822
"During the pack operation, bazaar takes a backup of existing repository\n"
3823
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3824
"automatically when it is safe to do so. To save disk space by removing\n"
3825
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3826
"used."
3827
msgstr ""
3828
"During the pack operation, bazaar takes a backup of existing repository\n"
3829
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3830
"automatically when it is safe to do so. To save disk space by removing\n"
3831
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3832
"used."
3833
3834
#: bzrlib/builtins.py:5086
3835
msgid ""
3836
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3837
"during or immediately after repacking, you may be left with a state\n"
3838
"where the deletion has been written to disk but the new packs have not\n"
3839
"been. In this case the repository may be unusable."
3840
msgstr ""
3841
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3842
"during or immediately after repacking, you may be left with a state\n"
3843
"where the deletion has been written to disk but the new packs have not\n"
3844
"been. In this case the repository may be unusable."
3845
3846
#: bzrlib/builtins.py:5095
3204
3847
msgid "Delete obsolete packs to save disk space."
3205
msgstr ""
3848
msgstr "Delete obsolete packs to save disk space."
3206
3849
3207
#: bzrlib/builtins.py:5062
3850
#: bzrlib/builtins.py:5109
3208
3851
msgid "List the installed plugins."
3209
msgstr ""
3852
msgstr "List the installed plugins."
3210
3853
3211
#: bzrlib/builtins.py:5064
3854
#: bzrlib/builtins.py:5111
3212
3855
msgid ""
3213
3856
"This command displays the list of installed plugins including\n"
3214
3857
"version of plugin and a short description of each."
3215
3858
msgstr ""
3859
"This command displays the list of installed plugins including\n"
3860
"version of plugin and a short description of each."
3216
3861
3217
#: bzrlib/builtins.py:5067
3862
#: bzrlib/builtins.py:5114
3218
3863
msgid "--verbose shows the path where each plugin is located."
3219
msgstr ""
3864
msgstr "--verbose shows the path where each plugin is located."
3220
3865
3221
#: bzrlib/builtins.py:5069
3866
#: bzrlib/builtins.py:5116
3222
3867
msgid ""
3223
3868
"A plugin is an external component for Bazaar that extends the\n"
3224
3869
"revision control system, by adding or replacing code in Bazaar.\n"
3226
3871
"adding new commands, providing additional network transports and\n"
3227
3872
"customizing log output."
3228
3873
msgstr ""
3874
"A plugin is an external component for Bazaar that extends the\n"
3875
"revision control system, by adding or replacing code in Bazaar.\n"
3876
"Plugins can do a variety of things, including overriding commands,\n"
3877
"adding new commands, providing additional network transports and\n"
3878
"customising log output."
3229
3879
3230
#: bzrlib/builtins.py:5075
3880
#: bzrlib/builtins.py:5122
3231
3881
msgid ""
3232
3882
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3233
3883
"for further information on plugins including where to find them and how to\n"
3234
3884
"install them. Instructions are also provided there on how to write new\n"
3235
3885
"plugins using the Python programming language."
3236
3886
msgstr ""
3887
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3888
"for further information on plugins including where to find them and how to\n"
3889
"install them. Instructions are also provided there on how to write new\n"
3890
"plugins using the Python programming language."
3237
3891
3238
#: bzrlib/builtins.py:5091
3892
#: bzrlib/builtins.py:5138
3239
3893
msgid "Show testament (signing-form) of a revision."
3240
msgstr ""
3894
msgstr "Show testament (signing-form) of a revision."
3241
3895
3242
#: bzrlib/builtins.py:5094
3896
#: bzrlib/builtins.py:5141
3243
3897
msgid "Produce long-format testament."
3244
msgstr ""
3898
msgstr "Produce long-format testament."
3245
3899
3246
#: bzrlib/builtins.py:5096
3900
#: bzrlib/builtins.py:5143
3247
3901
msgid "Produce a strict-format testament."
3248
msgstr ""
3902
msgstr "Produce a strict-format testament."
3249
3903
3250
#: bzrlib/builtins.py:5122
3904
#: bzrlib/builtins.py:5169
3251
3905
msgid "Show the origin of each line in a file."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5124
3255
msgid ""
3256
"This prints out the given file with an annotation on the left side\n"
3257
"indicating which revision, author and date introduced the change."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5127
3261
msgid ""
3262
"If the origin is the same for a run of consecutive lines, it is\n"
3263
"shown only at the top, unless the --all option is given."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5135
3906
msgstr "Show the origin of each line in a file."
3907
3908
#: bzrlib/builtins.py:5171
3909
msgid ""
3910
"This prints out the given file with an annotation on the left side\n"
3911
"indicating which revision, author and date introduced the change."
3912
msgstr ""
3913
"This prints out the given file with an annotation on the left side\n"
3914
"indicating which revision, author and date introduced the change."
3915
3916
#: bzrlib/builtins.py:5174
3917
msgid ""
3918
"If the origin is the same for a run of consecutive lines, it is\n"
3919
"shown only at the top, unless the --all option is given."
3920
msgstr ""
3921
"If the origin is the same for a run of consecutive lines, it is\n"
3922
"shown only at the top, unless the --all option is given."
3923
3924
#: bzrlib/builtins.py:5182
3267
3925
msgid "Show annotations on all lines."
3268
msgstr ""
3926
msgstr "Show annotations on all lines."
3269
3927
3270
#: bzrlib/builtins.py:5136
3928
#: bzrlib/builtins.py:5183
3271
3929
msgid "Show commit date in annotations."
3272
msgstr ""
3930
msgstr "Show commit date in annotations."
3273
3931
3274
#: bzrlib/builtins.py:5223
3932
#: bzrlib/builtins.py:5270
3275
3933
msgid "Cannot sign a range of non-revision-history revisions"
3276
msgstr ""
3934
msgstr "Cannot sign a range of non-revision-history revisions"
3277
3935
3278
#: bzrlib/builtins.py:5235
3936
#: bzrlib/builtins.py:5282
3279
3937
msgid "Please supply either one revision, or a range."
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:5239
3283
msgid ""
3284
"Convert the current branch into a checkout of the supplied branch.\n"
3285
"If no branch is supplied, rebind to the last bound location."
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5242
3289
msgid ""
3290
"Once converted into a checkout, commits must succeed on the master branch\n"
3291
"before they will be applied to the local branch."
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5245
3295
msgid ""
3296
"Bound branches use the nickname of its master branch unless it is set\n"
3297
"locally, in which case binding will update the local nickname to be\n"
3298
"that of the master."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5260
3938
msgstr "Please supply either one revision, or a range."
3939
3940
#: bzrlib/builtins.py:5286
3941
msgid ""
3942
"Convert the current branch into a checkout of the supplied branch.\n"
3943
"If no branch is supplied, rebind to the last bound location."
3944
msgstr ""
3945
"Convert the current branch into a checkout of the supplied branch.\n"
3946
"If no branch is supplied, rebind to the last bound location."
3947
3948
#: bzrlib/builtins.py:5289
3949
msgid ""
3950
"Once converted into a checkout, commits must succeed on the master branch\n"
3951
"before they will be applied to the local branch."
3952
msgstr ""
3953
"Once converted into a checkout, commits must succeed on the master branch\n"
3954
"before they will be applied to the local branch."
3955
3956
#: bzrlib/builtins.py:5292
3957
msgid ""
3958
"Bound branches use the nickname of its master branch unless it is set\n"
3959
"locally, in which case binding will update the local nickname to be\n"
3960
"that of the master."
3961
msgstr ""
3962
"Bound branches use the nickname of its master branch unless it is set\n"
3963
"locally, in which case binding will update the local nickname to be\n"
3964
"that of the master."
3965
3966
#: bzrlib/builtins.py:5307
3302
3967
msgid "No location supplied. This format does not remember old locations."
3303
msgstr ""
3968
msgstr "No location supplied. This format does not remember old locations."
3304
3969
3305
#: bzrlib/builtins.py:5265
3970
#: bzrlib/builtins.py:5313
3306
3971
msgid "Branch is already bound"
3307
msgstr ""
3972
msgstr "Branch is already bound"
3308
3973
3309
#: bzrlib/builtins.py:5267
3974
#: bzrlib/builtins.py:5316
3310
3975
msgid "No location supplied and no previous location known"
3311
msgstr ""
3976
msgstr "No location supplied and no previous location known"
3312
3977
3313
#: bzrlib/builtins.py:5273
3978
#: bzrlib/builtins.py:5322
3314
3979
msgid "These branches have diverged. Try merging, and then bind again."
3315
msgstr ""
3980
msgstr "These branches have diverged. Try merging, and then bind again."
3316
3981
3317
#: bzrlib/builtins.py:5280
3982
#: bzrlib/builtins.py:5329
3318
3983
msgid "Convert the current checkout into a regular branch."
3319
msgstr ""
3984
msgstr "Convert the current checkout into a regular branch."
3320
3985
3321
#: bzrlib/builtins.py:5282
3986
#: bzrlib/builtins.py:5331
3322
3987
msgid ""
3323
3988
"After unbinding, the local branch is considered independent and subsequent\n"
3324
3989
"commits will be local only."
3325
3990
msgstr ""
3991
"After unbinding, the local branch is considered independent and subsequent\n"
3992
"commits will be local only."
3326
3993
3327
#: bzrlib/builtins.py:5293
3994
#: bzrlib/builtins.py:5342
3328
3995
msgid "Local branch is not bound"
3329
msgstr ""
3996
msgstr "Local branch is not bound"
3330
3997
3331
#: bzrlib/builtins.py:5297
3998
#: bzrlib/builtins.py:5346
3332
3999
msgid "Remove the last committed revision."
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5299
3336
msgid ""
3337
"--verbose will print out what is being removed.\n"
3338
"--dry-run will go through all the motions, but not actually\n"
3339
"remove anything."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5303
3343
msgid ""
3344
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3345
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3346
"branch at revision 15."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5307
3350
msgid ""
3351
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3352
"it may make is to restore any pending merges that were present before\n"
3353
"the commit."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5318
4000
msgstr "Remove the last committed revision."
4001
4002
#: bzrlib/builtins.py:5348
4003
msgid ""
4004
"--verbose will print out what is being removed.\n"
4005
"--dry-run will go through all the motions, but not actually\n"
4006
"remove anything."
4007
msgstr ""
4008
"--verbose will print out what is being removed.\n"
4009
"--dry-run will go through all the motions, but not actually\n"
4010
"remove anything."
4011
4012
#: bzrlib/builtins.py:5352
4013
msgid ""
4014
"If --revision is specified, uncommit revisions to leave the branch at the\n"
4015
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
4016
"branch at revision 15."
4017
msgstr ""
4018
"If --revision is specified, uncommit revisions to leave the branch at the\n"
4019
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
4020
"branch at revision 15."
4021
4022
#: bzrlib/builtins.py:5356
4023
msgid ""
4024
"Uncommit leaves the working tree ready for a new commit. The only change\n"
4025
"it may make is to restore any pending merges that were present before\n"
4026
"the commit."
4027
msgstr ""
4028
"Uncommit leaves the working tree ready for a new commit. The only change\n"
4029
"it may make is to restore any pending merges that were present before\n"
4030
"the commit."
4031
4032
#: bzrlib/builtins.py:5367
3357
4033
msgid "Don't actually make changes."
3358
msgstr ""
4034
msgstr "Don't actually make changes."
3359
4035
3360
#: bzrlib/builtins.py:5319
4036
#: bzrlib/builtins.py:5368
3361
4037
msgid "Say yes to all questions."
3362
msgstr ""
4038
msgstr "Say yes to all questions."
3363
4039
3364
#: bzrlib/builtins.py:5321
4040
#: bzrlib/builtins.py:5370
3365
4041
msgid "Keep tags that point to removed revisions."
3366
msgstr ""
4042
msgstr "Keep tags that point to removed revisions."
3367
4043
3368
#: bzrlib/builtins.py:5323
4044
#: bzrlib/builtins.py:5372
3369
4045
msgid "Only remove the commits from the local branch when in a checkout."
3370
msgstr ""
4046
msgstr "Only remove the commits from the local branch when in a checkout."
3371
4047
3372
#: bzrlib/builtins.py:5372
4048
#: bzrlib/builtins.py:5421
3373
4049
msgid "No revisions to uncommit.\n"
3374
msgstr ""
4050
msgstr "No revisions to uncommit.\n"
3375
4051
3376
#: bzrlib/builtins.py:5387
4052
#: bzrlib/builtins.py:5436
3377
4053
msgid "Dry-run, pretending to remove the above revisions.\n"
3378
msgstr ""
4054
msgstr "Dry-run, pretending to remove the above revisions.\n"
3379
4055
3380
#: bzrlib/builtins.py:5390
4056
#: bzrlib/builtins.py:5439
3381
4057
msgid "The above revision(s) will be removed.\n"
3382
msgstr ""
4058
msgstr "The above revision(s) will be removed.\n"
3383
4059
3384
#: bzrlib/builtins.py:5394
4060
#: bzrlib/builtins.py:5443
3385
4061
msgid "Uncommit these revisions"
3386
msgstr ""
4062
msgstr "Uncommit these revisions"
3387
4063
3388
#: bzrlib/builtins.py:5397
4064
#: bzrlib/builtins.py:5446
3389
4065
msgid "Canceled\n"
3390
msgstr ""
4066
msgstr "Cancelled\n"
3391
4067
3392
#: bzrlib/builtins.py:5404
4068
#: bzrlib/builtins.py:5453
3393
4069
#, python-format
3394
4070
msgid ""
3395
4071
"You can restore the old tip by running:\n"
3396
4072
" bzr pull . -r revid:%s\n"
3397
4073
msgstr ""
4074
"You can restore the old tip by running:\n"
4075
" bzr pull . -r revid:%s\n"
3398
4076
3399
#: bzrlib/builtins.py:5409
4077
#: bzrlib/builtins.py:5458
3400
4078
msgid "Break a dead lock."
3401
msgstr ""
3402
3403
#: bzrlib/builtins.py:5411
3404
msgid ""
3405
"This command breaks a lock on a repository, branch, working directory or\n"
3406
"config file."
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5414
3410
msgid ""
3411
"CAUTION: Locks should only be broken when you are sure that the process\n"
3412
"holding the lock has been stopped."
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:5417
3416
msgid ""
3417
"You can get information on what locks are open via the 'bzr info\n"
3418
"[location]' command."
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5420
3422
msgid ""
3423
":Examples:\n"
3424
" bzr break-lock\n"
3425
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3426
" bzr break-lock --conf ~/.bazaar"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5429
4079
msgstr "Break a dead lock."
4080
4081
#: bzrlib/builtins.py:5460
4082
msgid ""
4083
"This command breaks a lock on a repository, branch, working directory or\n"
4084
"config file."
4085
msgstr ""
4086
"This command breaks a lock on a repository, branch, working directory or\n"
4087
"config file."
4088
4089
#: bzrlib/builtins.py:5463
4090
msgid ""
4091
"CAUTION: Locks should only be broken when you are sure that the process\n"
4092
"holding the lock has been stopped."
4093
msgstr ""
4094
"CAUTION: Locks should only be broken when you are sure that the process\n"
4095
"holding the lock has been stopped."
4096
4097
#: bzrlib/builtins.py:5466
4098
msgid ""
4099
"You can get information on what locks are open via the 'bzr info\n"
4100
"[location]' command."
4101
msgstr ""
4102
"You can get information on what locks are open via the 'bzr info\n"
4103
"[location]' command."
4104
4105
#: bzrlib/builtins.py:5469
4106
msgid ""
4107
":Examples:\n"
4108
" bzr break-lock\n"
4109
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
4110
" bzr break-lock --conf ~/.bazaar"
4111
msgstr ""
4112
":Examples:\n"
4113
" bzr break-lock\n"
4114
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
4115
" bzr break-lock --conf ~/.bazaar"
4116
4117
#: bzrlib/builtins.py:5478
3430
4118
msgid "LOCATION is the directory where the config lock is."
3431
msgstr ""
4119
msgstr "LOCATION is the directory where the config lock is."
3432
4120
3433
#: bzrlib/builtins.py:5431
4121
#: bzrlib/builtins.py:5480
3434
4122
msgid "Do not ask for confirmation before breaking the lock."
3435
msgstr ""
4123
msgstr "Do not ask for confirmation before breaking the lock."
3436
4124
3437
#: bzrlib/builtins.py:5466
4125
#: bzrlib/builtins.py:5515
3438
4126
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3439
msgstr ""
4127
msgstr "The Bazaar smart server protocol over TCP. (default port: 4155)"
3440
4128
3441
#: bzrlib/builtins.py:5467
4129
#: bzrlib/builtins.py:5516
3442
4130
msgid "Run the bzr server."
3443
msgstr ""
4131
msgstr "Run the bzr server."
3444
4132
3445
#: bzrlib/builtins.py:5473
4133
#: bzrlib/builtins.py:5522
3446
4134
msgid "Serve on stdin/out for use from inetd or sshd."
3447
msgstr ""
4135
msgstr "Serve on stdin/out for use from inetd or sshd."
3448
4136
3449
#: bzrlib/builtins.py:5474
4137
#: bzrlib/builtins.py:5523
3450
4138
msgid "protocol"
3451
msgstr ""
4139
msgstr "protocol"
3452
4140
3453
#: bzrlib/builtins.py:5475
4141
#: bzrlib/builtins.py:5524
3454
4142
msgid "Protocol to serve."
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5479
4143
msgstr "Protocol to serve."
4144
4145
#: bzrlib/builtins.py:5528
4146
msgid "Listen for connections on nominated address."
4147
msgstr "Listen for connections on nominated address."
4148
4149
#: bzrlib/builtins.py:5530
3458
4150
msgid ""
3459
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3460
"Passing 0 as the port number will result in a dynamically allocated port. "
3461
"The default port depends on the protocol."
4151
"Listen for connections on nominated port. Passing 0 as the port number will "
4152
"result in a dynamically allocated port. The default port depends on the "
4153
"protocol."
3462
4154
msgstr ""
4155
"Listen for connections on nominated port. Passing 0 as the port number will "
4156
"result in a dynamically allocated port. The default port depends on the "
4157
"protocol."
3463
4158
3464
#: bzrlib/builtins.py:5485
4159
#: bzrlib/builtins.py:5535
3465
4160
msgid "Serve contents of this directory."
3466
msgstr ""
4161
msgstr "Serve contents of this directory."
3467
4162
3468
#: bzrlib/builtins.py:5487
4163
#: bzrlib/builtins.py:5537
3469
4164
msgid ""
3470
4165
"By default the server is a readonly server. Supplying --allow-writes "
3471
4166
"enables write access to the contents of the served directory and below. "
3473
4168
"of external authentication is arranged supplying this option leads to global "
3474
4169
"uncontrolled write access to your file system."
3475
4170
msgstr ""
4171
"By default the server is a read-only server. Supplying --allow-writes "
4172
"enables write access to the contents of the served directory and below. "
4173
"Note that ``bzr serve`` does not perform authentication, so unless some form "
4174
"of external authentication is arranged supplying this option leads to global "
4175
"uncontrolled write access to your file system."
3476
4176
3477
#: bzrlib/builtins.py:5496
4177
#: bzrlib/builtins.py:5546
3478
4178
msgid "Override the default idle client timeout (5min)."
3479
msgstr ""
4179
msgstr "Override the default idle client timeout (5min)."
3480
4180
3481
#: bzrlib/builtins.py:5546
4181
#: bzrlib/builtins.py:5564
3482
4182
msgid "Combine a tree into its containing tree."
3483
msgstr ""
4183
msgstr "Combine a tree into its containing tree."
3484
4184
3485
#: bzrlib/builtins.py:5548
4185
#: bzrlib/builtins.py:5566
3486
4186
msgid "This command requires the target tree to be in a rich-root format."
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:5550
3490
msgid ""
3491
"The TREE argument should be an independent tree, inside another tree, but\n"
3492
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3493
"running \"bzr branch\" with the target inside a tree.)"
3494
msgstr ""
3495
3496
#: bzrlib/builtins.py:5554
3497
msgid ""
3498
"The result is a combined tree, with the subtree no longer an independent\n"
3499
"part. This is marked as a merge of the subtree into the containing tree,\n"
3500
"and all history is preserved."
3501
msgstr ""
4187
msgstr "This command requires the target tree to be in a rich-root format."
4188
4189
#: bzrlib/builtins.py:5568
4190
msgid ""
4191
"The TREE argument should be an independent tree, inside another tree, but\n"
4192
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
4193
"running \"bzr branch\" with the target inside a tree.)"
4194
msgstr ""
4195
"The TREE argument should be an independent tree, inside another tree, but\n"
4196
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
4197
"running \"bzr branch\" with the target inside a tree.)"
3502
4198
3503
4199
#: bzrlib/builtins.py:5572
4200
msgid ""
4201
"The result is a combined tree, with the subtree no longer an independent\n"
4202
"part. This is marked as a merge of the subtree into the containing tree,\n"
4203
"and all history is preserved."
4204
msgstr ""
4205
"The result is a combined tree, with the subtree no longer an independent\n"
4206
"part. This is marked as a merge of the subtree into the containing tree,\n"
4207
"and all history is preserved."
4208
4209
#: bzrlib/builtins.py:5590
3504
4210
#, python-format
3505
4211
msgid ""
3506
4212
"Can't join trees because %s doesn't support rich root data.\n"
3507
4213
"You can use bzr upgrade on the repository."
3508
4214
msgstr ""
4215
"Can't join trees because %s doesn't support rich root data.\n"
4216
"You can use bzr upgrade on the repository."
3509
4217
3510
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
4218
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3511
4219
msgid "Cannot join {0}. {1}"
3512
msgstr ""
4220
msgstr "Cannot join {0}. {1}"
3513
4221
3514
#: bzrlib/builtins.py:5592
4222
#: bzrlib/builtins.py:5610
3515
4223
msgid "Split a subdirectory of a tree into a separate tree."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5594
3519
msgid ""
3520
"This command will produce a target tree in a format that supports\n"
3521
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3522
"converted into earlier formats like 'dirstate-tags'."
3523
msgstr ""
3524
3525
#: bzrlib/builtins.py:5598
3526
msgid ""
3527
"The TREE argument should be a subdirectory of a working tree. That\n"
3528
"subdirectory will be converted into an independent tree, with its own\n"
3529
"branch. Commits in the top-level tree will not apply to the new subtree."
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5678
4224
msgstr "Split a subdirectory of a tree into a separate tree."
4225
4226
#: bzrlib/builtins.py:5612
4227
msgid ""
4228
"This command will produce a target tree in a format that supports\n"
4229
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
4230
"converted into earlier formats like 'dirstate-tags'."
4231
msgstr ""
4232
"This command will produce a target tree in a format that supports\n"
4233
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
4234
"converted into earlier formats like 'dirstate-tags'."
4235
4236
#: bzrlib/builtins.py:5616
4237
msgid ""
4238
"The TREE argument should be a subdirectory of a working tree. That\n"
4239
"subdirectory will be converted into an independent tree, with its own\n"
4240
"branch. Commits in the top-level tree will not apply to the new subtree."
4241
msgstr ""
4242
"The TREE argument should be a subdirectory of a working tree. That\n"
4243
"subdirectory will be converted into an independent tree, with its own\n"
4244
"branch. Commits in the top-level tree will not apply to the new subtree."
4245
4246
#: bzrlib/builtins.py:5696
3533
4247
msgid "No submit branch specified or known"
3534
msgstr ""
4248
msgstr "No submit branch specified or known"
3535
4249
3536
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
4250
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3537
4251
msgid "No public branch specified or known"
3538
msgstr ""
4252
msgstr "No public branch specified or known"
3539
4253
3540
#: bzrlib/builtins.py:5691
4254
#: bzrlib/builtins.py:5710
3541
4255
msgid "bzr merge-directive takes at most two one revision identifiers"
3542
msgstr ""
4256
msgstr "bzr merge-directive takes at most two one revision identifiers"
3543
4257
3544
#: bzrlib/builtins.py:5700
4258
#: bzrlib/builtins.py:5719
3545
4259
msgid "No revisions to bundle."
3546
msgstr ""
4260
msgstr "No revisions to bundle."
3547
4261
3548
#: bzrlib/builtins.py:5719
4262
#: bzrlib/builtins.py:5738
3549
4263
msgid "Mail or create a merge-directive for submitting changes."
3550
msgstr ""
4264
msgstr "Mail or create a merge-directive for submitting changes."
3551
4265
3552
#: bzrlib/builtins.py:5721
4266
#: bzrlib/builtins.py:5740
3553
4267
msgid "A merge directive provides many things needed for requesting merges:"
3554
msgstr ""
4268
msgstr "A merge directive provides many things needed for requesting merges:"
3555
4269
3556
#: bzrlib/builtins.py:5723
4270
#: bzrlib/builtins.py:5742
3557
4271
msgid "* A machine-readable description of the merge to perform"
3558
msgstr ""
4272
msgstr "* A machine-readable description of the merge to perform"
3559
4273
3560
#: bzrlib/builtins.py:5725
4274
#: bzrlib/builtins.py:5744
3561
4275
msgid "* An optional patch that is a preview of the changes requested"
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5727
3565
msgid ""
3566
"* An optional bundle of revision data, so that the changes can be applied\n"
3567
" directly from the merge directive, without retrieving data from a\n"
3568
" branch."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5731
3572
msgid ""
3573
"`bzr send` creates a compact data set that, when applied using bzr\n"
3574
"merge, has the same effect as merging from the source branch. "
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5734
3578
msgid ""
3579
"By default the merge directive is self-contained and can be applied to any\n"
3580
"branch containing submit_branch in its ancestory without needing access to\n"
3581
"the source branch."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5738
3585
msgid ""
3586
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3587
"revisions, but only a structured request to merge from the\n"
3588
"public_location. In that case the public_branch is needed and it must be\n"
3589
"up-to-date and accessible to the recipient. The public_branch is always\n"
3590
"included if known, so that people can check it later."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5744
3594
msgid ""
3595
"The submit branch defaults to the parent of the source branch, but can be\n"
3596
"overridden. Both submit branch and public branch will be remembered in\n"
3597
"branch.conf the first time they are used for a particular branch. The\n"
3598
"source branch defaults to that containing the working directory, but can\n"
3599
"be changed using --from."
3600
msgstr ""
4276
msgstr "* An optional patch that is a preview of the changes requested"
4277
4278
#: bzrlib/builtins.py:5746
4279
msgid ""
4280
"* An optional bundle of revision data, so that the changes can be applied\n"
4281
" directly from the merge directive, without retrieving data from a\n"
4282
" branch."
4283
msgstr ""
4284
"* An optional bundle of revision data, so that the changes can be applied\n"
4285
" directly from the merge directive, without retrieving data from a\n"
4286
" branch."
3601
4287
3602
4288
#: bzrlib/builtins.py:5750
3603
4289
msgid ""
4290
"`bzr send` creates a compact data set that, when applied using bzr\n"
4291
"merge, has the same effect as merging from the source branch. "
4292
msgstr ""
4293
"`bzr send` creates a compact data set that, when applied using bzr\n"
4294
"merge, has the same effect as merging from the source branch. "
4295
4296
#: bzrlib/builtins.py:5753
4297
msgid ""
4298
"By default the merge directive is self-contained and can be applied to any\n"
4299
"branch containing submit_branch in its ancestory without needing access to\n"
4300
"the source branch."
4301
msgstr ""
4302
"By default the merge directive is self-contained and can be applied to any\n"
4303
"branch containing submit_branch in its ancestory without needing access to\n"
4304
"the source branch."
4305
4306
#: bzrlib/builtins.py:5757
4307
msgid ""
4308
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4309
"revisions, but only a structured request to merge from the\n"
4310
"public_location. In that case the public_branch is needed and it must be\n"
4311
"up-to-date and accessible to the recipient. The public_branch is always\n"
4312
"included if known, so that people can check it later."
4313
msgstr ""
4314
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4315
"revisions, but only a structured request to merge from the\n"
4316
"public_location. In that case the public_branch is needed and it must be\n"
4317
"up-to-date and accessible to the recipient. The public_branch is always\n"
4318
"included if known, so that people can check it later."
4319
4320
#: bzrlib/builtins.py:5763
4321
msgid ""
4322
"The submit branch defaults to the parent of the source branch, but can be\n"
4323
"overridden. Both submit branch and public branch will be remembered in\n"
4324
"branch.conf the first time they are used for a particular branch. The\n"
4325
"source branch defaults to that containing the working directory, but can\n"
4326
"be changed using --from."
4327
msgstr ""
4328
"The submit branch defaults to the parent of the source branch, but can be\n"
4329
"overridden. Both submit branch and public branch will be remembered in\n"
4330
"branch.conf the first time they are used for a particular branch. The\n"
4331
"source branch defaults to that containing the working directory, but can\n"
4332
"be changed using --from."
4333
4334
#: bzrlib/builtins.py:5769
4335
msgid ""
3604
4336
"Both the submit branch and the public branch follow the usual behavior with\n"
3605
4337
"respect to --remember: If there is no default location set, the first send\n"
3606
4338
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3607
4339
"omit the location to use the default. To change the default, use\n"
3608
4340
"--remember. The value will only be saved if the location can be accessed."
3609
4341
msgstr ""
3610
3611
#: bzrlib/builtins.py:5756
3612
msgid ""
3613
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3614
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3615
"If a public location is known for the submit_branch, that location is used\n"
3616
"in the merge directive."
3617
msgstr ""
3618
3619
#: bzrlib/builtins.py:5761
3620
msgid ""
3621
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3622
"given, in which case it is sent to a file."
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5764
3626
msgid ""
3627
"Mail is sent using your preferred mail program. This should be transparent\n"
3628
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3629
"If the preferred client can't be found (or used), your editor will be used."
3630
msgstr ""
3631
3632
#: bzrlib/builtins.py:5768
3633
msgid ""
3634
"To use a specific mail program, set the mail_client configuration option.\n"
3635
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3636
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3637
"(MacOS X's\n"
3638
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3639
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3640
"add\n"
3641
"supported clients."
3642
msgstr ""
4342
"Both the submit branch and the public branch follow the usual behaviour "
4343
"with\n"
4344
"respect to --remember: If there is no default location set, the first send\n"
4345
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4346
"omit the location to use the default. To change the default, use\n"
4347
"--remember. The value will only be saved if the location can be accessed."
3643
4348
3644
4349
#: bzrlib/builtins.py:5775
3645
4350
msgid ""
3646
"If mail is being sent, a to address is required. This can be supplied\n"
3647
"either on the commandline, by setting the submit_to configuration\n"
3648
"option in the branch itself or the child_submit_to configuration option\n"
3649
"in the submit branch."
4351
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4352
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4353
"If a public location is known for the submit_branch, that location is used\n"
4354
"in the merge directive."
3650
4355
msgstr ""
4356
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4357
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4358
"If a public location is known for the submit_branch, that location is used\n"
4359
"in the merge directive."
3651
4360
3652
4361
#: bzrlib/builtins.py:5780
3653
4362
msgid ""
3654
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3655
"and\n"
3656
"merge directive format 2. It is significantly faster and smaller than\n"
3657
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3658
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3659
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5786
3663
msgid ""
3664
"The merge directives created by bzr send may be applied using bzr merge or\n"
3665
"bzr pull by specifying a file containing a merge directive as the location."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5789
3669
msgid ""
3670
"bzr send makes extensive use of public locations to map local locations "
3671
"into\n"
3672
"URLs that can be used by other people. See `bzr help configuration` to\n"
3673
"set them, and use `bzr info` to display them."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5813
4363
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4364
"given, in which case it is sent to a file."
4365
msgstr ""
4366
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4367
"given, in which case it is sent to a file."
4368
4369
#: bzrlib/builtins.py:5783
4370
msgid ""
4371
"Mail is sent using your preferred mail program. This should be transparent\n"
4372
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4373
"If the preferred client can't be found (or used), your editor will be used."
4374
msgstr ""
4375
"Mail is sent using your preferred mail program. This should be transparent\n"
4376
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4377
"If the preferred client can't be found (or used), your editor will be used."
4378
4379
#: bzrlib/builtins.py:5787
4380
msgid ""
4381
"To use a specific mail program, set the mail_client configuration option.\n"
4382
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4383
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4384
"(MacOS X's\n"
4385
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4386
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4387
"add\n"
4388
"supported clients."
4389
msgstr ""
4390
"To use a specific mail program, set the mail_client configuration option.\n"
4391
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4392
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4393
"(MacOS X's\n"
4394
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4395
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4396
"add\n"
4397
"supported clients."
4398
4399
#: bzrlib/builtins.py:5794
4400
msgid ""
4401
"If mail is being sent, a to address is required. This can be supplied\n"
4402
"either on the commandline, by setting the submit_to configuration\n"
4403
"option in the branch itself or the child_submit_to configuration option\n"
4404
"in the submit branch."
4405
msgstr ""
4406
"If mail is being sent, a to address is required. This can be supplied\n"
4407
"either on the commandline, by setting the submit_to configuration\n"
4408
"option in the branch itself or the child_submit_to configuration option\n"
4409
"in the submit branch."
4410
4411
#: bzrlib/builtins.py:5799
4412
msgid ""
4413
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4414
"and\n"
4415
"merge directive format 2. It is significantly faster and smaller than\n"
4416
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4417
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4418
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4419
msgstr ""
4420
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4421
"and\n"
4422
"merge directive format 2. It is significantly faster and smaller than\n"
4423
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4424
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4425
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4426
4427
#: bzrlib/builtins.py:5805
4428
msgid ""
4429
"The merge directives created by bzr send may be applied using bzr merge or\n"
4430
"bzr pull by specifying a file containing a merge directive as the location."
4431
msgstr ""
4432
"The merge directives created by bzr send may be applied using bzr merge or\n"
4433
"bzr pull by specifying a file containing a merge directive as the location."
4434
4435
#: bzrlib/builtins.py:5808
4436
msgid ""
4437
"bzr send makes extensive use of public locations to map local locations "
4438
"into\n"
4439
"URLs that can be used by other people. See `bzr help configuration` to\n"
4440
"set them, and use `bzr info` to display them."
4441
msgstr ""
4442
"bzr send makes extensive use of public locations to map local locations "
4443
"into\n"
4444
"URLs that can be used by other people. See `bzr help configuration` to\n"
4445
"set them, and use `bzr info` to display them."
4446
4447
#: bzrlib/builtins.py:5832
3677
4448
msgid "Write merge directive to this file or directory; use - for stdout."
3678
msgstr ""
4449
msgstr "Write merge directive to this file or directory; use - for stdout."
3679
4450
3680
#: bzrlib/builtins.py:5817
4451
#: bzrlib/builtins.py:5836
3681
4452
msgid ""
3682
4453
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3683
4454
"strict disables the check."
3684
4455
msgstr ""
4456
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4457
"strict disables the check."
3685
4458
3686
#: bzrlib/builtins.py:5819
4459
#: bzrlib/builtins.py:5838
3687
4460
msgid "Mail the request to this address."
3688
msgstr ""
4461
msgstr "Mail the request to this address."
3689
4462
3690
#: bzrlib/builtins.py:5823
4463
#: bzrlib/builtins.py:5842
3691
4464
msgid "Body for the email."
3692
msgstr ""
4465
msgstr "Body for the email."
3693
4466
3694
#: bzrlib/builtins.py:5876
4467
#: bzrlib/builtins.py:5895
3695
4468
msgid "Do not include a bundle in the merge directive."
3696
msgstr ""
4469
msgstr "Do not include a bundle in the merge directive."
3697
4470
3698
#: bzrlib/builtins.py:5877
4471
#: bzrlib/builtins.py:5896
3699
4472
msgid "Do not include a preview patch in the merge directive."
3700
msgstr ""
4473
msgstr "Do not include a preview patch in the merge directive."
3701
4474
3702
#: bzrlib/builtins.py:5880
4475
#: bzrlib/builtins.py:5899
3703
4476
msgid "Remember submit and public branch."
3704
msgstr ""
4477
msgstr "Remember submit and public branch."
3705
4478
3706
#: bzrlib/builtins.py:5882
4479
#: bzrlib/builtins.py:5901
3707
4480
msgid ""
3708
4481
"Branch to generate the submission from, rather than the one containing the "
3709
4482
"working directory."
3710
4483
msgstr ""
4484
"Branch to generate the submission from, rather than the one containing the "
4485
"working directory."
3711
4486
3712
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4487
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3713
4488
msgid "format"
3714
msgstr ""
4489
msgstr "format"
3715
4490
3716
#: bzrlib/builtins.py:5893
4491
#: bzrlib/builtins.py:5912
3717
4492
msgid "Use the specified output format."
3718
msgstr ""
4493
msgstr "Use the specified output format."
3719
4494
3720
#: bzrlib/builtins.py:5915
4495
#: bzrlib/builtins.py:5934
3721
4496
msgid "Create, remove or modify a tag naming a revision."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:5917
3725
msgid ""
3726
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3727
"(--revision) option can be given -rtag:X, where X is any previously\n"
3728
"created tag."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:5921
3732
msgid ""
3733
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3734
"along when you branch, push, pull or merge."
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:5924
3738
msgid ""
3739
"It is an error to give a tag name that already exists unless you pass\n"
3740
"--force, in which case the tag is moved to point to the new revision."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:5927
3744
msgid ""
3745
"To rename a tag (change the name but keep it on the same revsion), run "
3746
"``bzr\n"
3747
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:5930
3751
msgid ""
3752
"If no tag name is specified it will be determined through the \n"
3753
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3754
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3755
"details."
3756
msgstr ""
4497
msgstr "Create, remove or modify a tag naming a revision."
4498
4499
#: bzrlib/builtins.py:5936
4500
msgid ""
4501
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4502
"(--revision) option can be given -rtag:X, where X is any previously\n"
4503
"created tag."
4504
msgstr ""
4505
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4506
"(--revision) option can be given -rtag:X, where X is any previously\n"
4507
"created tag."
3757
4508
3758
4509
#: bzrlib/builtins.py:5940
4510
msgid ""
4511
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4512
"along when you branch, push, pull or merge."
4513
msgstr ""
4514
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4515
"along when you branch, push, pull or merge."
4516
4517
#: bzrlib/builtins.py:5943
4518
msgid ""
4519
"It is an error to give a tag name that already exists unless you pass\n"
4520
"--force, in which case the tag is moved to point to the new revision."
4521
msgstr ""
4522
"It is an error to give a tag name that already exists unless you pass\n"
4523
"--force, in which case the tag is moved to point to the new revision."
4524
4525
#: bzrlib/builtins.py:5946
4526
msgid ""
4527
"To rename a tag (change the name but keep it on the same revsion), run "
4528
"``bzr\n"
4529
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4530
msgstr ""
4531
"To rename a tag (change the name but keep it on the same revsion), run "
4532
"``bzr\n"
4533
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4534
4535
#: bzrlib/builtins.py:5949
4536
msgid ""
4537
"If no tag name is specified it will be determined through the \n"
4538
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4539
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4540
"details."
4541
msgstr ""
4542
"If no tag name is specified it will be determined through the \n"
4543
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4544
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4545
"details."
4546
4547
#: bzrlib/builtins.py:5959
3759
4548
msgid "Delete this tag rather than placing it."
3760
msgstr ""
4549
msgstr "Delete this tag rather than placing it."
3761
4550
3762
#: bzrlib/builtins.py:5943
4551
#: bzrlib/builtins.py:5962
3763
4552
msgid "Branch in which to place the tag."
3764
msgstr ""
4553
msgstr "Branch in which to place the tag."
3765
4554
3766
#: bzrlib/builtins.py:5945
4555
#: bzrlib/builtins.py:5964
3767
4556
msgid "Replace existing tags."
3768
msgstr ""
4557
msgstr "Replace existing tags."
3769
4558
3770
#: bzrlib/builtins.py:5960
4559
#: bzrlib/builtins.py:5979
3771
4560
msgid "No tag specified to delete."
3772
msgstr ""
4561
msgstr "No tag specified to delete."
3773
4562
3774
#: bzrlib/builtins.py:5962
4563
#: bzrlib/builtins.py:5981
3775
4564
#, python-format
3776
4565
msgid "Deleted tag %s."
3777
msgstr ""
4566
msgstr "Deleted tag %s."
3778
4567
3779
#: bzrlib/builtins.py:5976
4568
#: bzrlib/builtins.py:5995
3780
4569
msgid "Please specify a tag name."
3781
msgstr ""
4570
msgstr "Please specify a tag name."
3782
4571
3783
#: bzrlib/builtins.py:5984
4572
#: bzrlib/builtins.py:6003
3784
4573
#, python-format
3785
4574
msgid "Tag %s already exists for that revision."
3786
msgstr ""
4575
msgstr "Tag %s already exists for that revision."
3787
4576
3788
#: bzrlib/builtins.py:5988
4577
#: bzrlib/builtins.py:6007
3789
4578
#, python-format
3790
4579
msgid "Created tag %s."
3791
msgstr ""
4580
msgstr "Created tag %s."
3792
4581
3793
#: bzrlib/builtins.py:5990
4582
#: bzrlib/builtins.py:6009
3794
4583
#, python-format
3795
4584
msgid "Updated tag %s."
3796
msgstr ""
4585
msgstr "Updated tag %s."
3797
4586
3798
#: bzrlib/builtins.py:5994
4587
#: bzrlib/builtins.py:6013
3799
4588
msgid "List tags."
3800
msgstr ""
4589
msgstr "List tags."
3801
4590
3802
#: bzrlib/builtins.py:5996
4591
#: bzrlib/builtins.py:6015
3803
4592
msgid ""
3804
4593
"This command shows a table of tag names and the revisions they reference."
3805
4594
msgstr ""
4595
"This command shows a table of tag names and the revisions they reference."
3806
4596
3807
#: bzrlib/builtins.py:6002
4597
#: bzrlib/builtins.py:6021
3808
4598
msgid "Branch whose tags should be displayed."
3809
msgstr ""
4599
msgstr "Branch whose tags should be displayed."
3810
4600
3811
#: bzrlib/builtins.py:6004
4601
#: bzrlib/builtins.py:6023
3812
4602
msgid "Sort tags by different criteria."
3813
msgstr ""
4603
msgstr "Sort tags by different criteria."
3814
4604
3815
#: bzrlib/builtins.py:6004
4605
#: bzrlib/builtins.py:6023
3816
4606
msgid "Sorting"
3817
msgstr ""
4607
msgstr "Sorting"
3818
4608
3819
#: bzrlib/builtins.py:6073
4609
#: bzrlib/builtins.py:6092
3820
4610
msgid "Reconfigure the type of a bzr directory."
3821
msgstr ""
4611
msgstr "Reconfigure the type of a bzr directory."
3822
4612
3823
#: bzrlib/builtins.py:6075
4613
#: bzrlib/builtins.py:6094
3824
4614
msgid "A target configuration must be specified."
3825
msgstr ""
4615
msgstr "A target configuration must be specified."
3826
4616
3827
#: bzrlib/builtins.py:6077
4617
#: bzrlib/builtins.py:6096
3828
4618
msgid ""
3829
4619
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3830
4620
"The order of preference is\n"
3834
4624
"4. The parent location.\n"
3835
4625
"If none of these is available, --bind-to must be specified."
3836
4626
msgstr ""
4627
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4628
"The order of preference is\n"
4629
"1. For a lightweight checkout, the current bound location.\n"
4630
"2. For branches that used to be checkouts, the previously-bound location.\n"
4631
"3. The push location.\n"
4632
"4. The parent location.\n"
4633
"If none of these is available, --bind-to must be specified."
3837
4634
3838
#: bzrlib/builtins.py:6091
4635
#: bzrlib/builtins.py:6110
3839
4636
msgid "Tree type"
3840
msgstr ""
4637
msgstr "Tree type"
3841
4638
3842
#: bzrlib/builtins.py:6092
4639
#: bzrlib/builtins.py:6111
3843
4640
msgid "The relation between branch and tree."
3844
msgstr ""
4641
msgstr "The relation between branch and tree."
3845
4642
3846
#: bzrlib/builtins.py:6094
4643
#: bzrlib/builtins.py:6113
3847
4644
msgid "Reconfigure to be an unbound branch with no working tree."
3848
msgstr ""
4645
msgstr "Reconfigure to be an unbound branch with no working tree."
3849
4646
3850
#: bzrlib/builtins.py:6095
4647
#: bzrlib/builtins.py:6114
3851
4648
msgid "Reconfigure to be an unbound branch with a working tree."
3852
msgstr ""
4649
msgstr "Reconfigure to be an unbound branch with a working tree."
3853
4650
3854
#: bzrlib/builtins.py:6096
4651
#: bzrlib/builtins.py:6115
3855
4652
msgid "Reconfigure to be a bound branch with a working tree."
3856
msgstr ""
4653
msgstr "Reconfigure to be a bound branch with a working tree."
3857
4654
3858
#: bzrlib/builtins.py:6097
4655
#: bzrlib/builtins.py:6116
3859
4656
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3860
msgstr ""
4657
msgstr "Reconfigure to be a lightweight checkout (with no local history)."
3861
4658
3862
#: bzrlib/builtins.py:6102
4659
#: bzrlib/builtins.py:6121
3863
4660
msgid "Repository type"
3864
msgstr ""
4661
msgstr "Repository type"
3865
4662
3866
#: bzrlib/builtins.py:6103
4663
#: bzrlib/builtins.py:6122
3867
4664
msgid "Location fo the repository."
3868
msgstr ""
4665
msgstr "Location fo the repository."
3869
4666
3870
#: bzrlib/builtins.py:6105
4667
#: bzrlib/builtins.py:6124
3871
4668
msgid ""
3872
4669
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3873
4670
msgstr ""
4671
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3874
4672
3875
#: bzrlib/builtins.py:6107
4673
#: bzrlib/builtins.py:6126
3876
4674
msgid "Reconfigure to use a shared repository."
3877
msgstr ""
4675
msgstr "Reconfigure to use a shared repository."
3878
4676
3879
#: bzrlib/builtins.py:6111
4677
#: bzrlib/builtins.py:6130
3880
4678
msgid "Trees in Repository"
3881
msgstr ""
4679
msgstr "Trees in Repository"
3882
4680
3883
#: bzrlib/builtins.py:6112
4681
#: bzrlib/builtins.py:6131
3884
4682
msgid "Whether new branches in the repository have trees."
3885
msgstr ""
3886
3887
#: bzrlib/builtins.py:6114
3888
msgid ""
3889
"Reconfigure repository to create working trees on branches by default."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6116
3893
msgid ""
3894
"Reconfigure repository to not create working trees on branches by default."
3895
msgstr ""
3896
3897
#: bzrlib/builtins.py:6119
4683
msgstr "Whether new branches in the repository have trees."
4684
4685
#: bzrlib/builtins.py:6133
4686
msgid ""
4687
"Reconfigure repository to create working trees on branches by default."
4688
msgstr ""
4689
"Reconfigure repository to create working trees on branches by default."
4690
4691
#: bzrlib/builtins.py:6135
4692
msgid ""
4693
"Reconfigure repository to not create working trees on branches by default."
4694
msgstr ""
4695
"Reconfigure repository to not create working trees on branches by default."
4696
4697
#: bzrlib/builtins.py:6138
3898
4698
msgid "Branch to bind checkout to."
3899
msgstr ""
4699
msgstr "Branch to bind checkout to."
3900
4700
3901
#: bzrlib/builtins.py:6121
4701
#: bzrlib/builtins.py:6140
3902
4702
msgid "Perform reconfiguration even if local changes will be lost."
3903
msgstr ""
4703
msgstr "Perform reconfiguration even if local changes will be lost."
3904
4704
3905
#: bzrlib/builtins.py:6124
4705
#: bzrlib/builtins.py:6143
3906
4706
msgid "Reconfigure a branch to be stacked on another branch."
3907
msgstr ""
4707
msgstr "Reconfigure a branch to be stacked on another branch."
3908
4708
3909
#: bzrlib/builtins.py:6128
4709
#: bzrlib/builtins.py:6147
3910
4710
msgid ""
3911
4711
"Reconfigure a branch to be unstacked. This may require copying substantial "
3912
4712
"data into it."
3913
4713
msgstr ""
4714
"Reconfigure a branch to be unstacked. This may require copying substantial "
4715
"data into it."
3914
4716
3915
#: bzrlib/builtins.py:6138
4717
#: bzrlib/builtins.py:6157
3916
4718
msgid "Can't use both --stacked-on and --unstacked"
3917
msgstr ""
4719
msgstr "Can't use both --stacked-on and --unstacked"
3918
4720
3919
#: bzrlib/builtins.py:6152
4721
#: bzrlib/builtins.py:6171
3920
4722
msgid "No target configuration specified"
3921
msgstr ""
4723
msgstr "No target configuration specified"
3922
4724
3923
#: bzrlib/builtins.py:6187
4725
#: bzrlib/builtins.py:6206
3924
4726
msgid "Set the branch of a checkout and update."
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6189
3928
msgid ""
3929
"For lightweight checkouts, this changes the branch being referenced.\n"
3930
"For heavyweight checkouts, this checks that there are no local commits\n"
3931
"versus the current bound branch, then it makes the local branch a mirror\n"
3932
"of the new location and binds to it."
3933
msgstr ""
3934
3935
#: bzrlib/builtins.py:6194
3936
msgid ""
3937
"In both cases, the working tree is updated and uncommitted changes\n"
3938
"are merged. The user can commit or revert these as they desire."
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6197
4727
msgstr "Set the branch of a checkout and update."
4728
4729
#: bzrlib/builtins.py:6208
4730
msgid ""
4731
"For lightweight checkouts, this changes the branch being referenced.\n"
4732
"For heavyweight checkouts, this checks that there are no local commits\n"
4733
"versus the current bound branch, then it makes the local branch a mirror\n"
4734
"of the new location and binds to it."
4735
msgstr ""
4736
"For lightweight checkouts, this changes the branch being referenced.\n"
4737
"For heavyweight checkouts, this checks that there are no local commits\n"
4738
"versus the current bound branch, then it makes the local branch a mirror\n"
4739
"of the new location and binds to it."
4740
4741
#: bzrlib/builtins.py:6213
4742
msgid ""
4743
"In both cases, the working tree is updated and uncommitted changes\n"
4744
"are merged. The user can commit or revert these as they desire."
4745
msgstr ""
4746
"In both cases, the working tree is updated and uncommitted changes\n"
4747
"are merged. The user can commit or revert these as they desire."
4748
4749
#: bzrlib/builtins.py:6216
3942
4750
msgid "Pending merges need to be committed or reverted before using switch."
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6199
3946
msgid ""
3947
"The path to the branch to switch to can be specified relative to the parent\n"
3948
"directory of the current branch. For example, if you are currently in a\n"
3949
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3950
"/path/to/newbranch."
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6204
3954
msgid ""
3955
"Bound branches use the nickname of its master branch unless it is set\n"
3956
"locally, in which case switching will update the local nickname to be\n"
3957
"that of the master."
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6212
4751
msgstr "Pending merges need to be committed or reverted before using switch."
4752
4753
#: bzrlib/builtins.py:6218
4754
msgid ""
4755
"The path to the branch to switch to can be specified relative to the parent\n"
4756
"directory of the current branch. For example, if you are currently in a\n"
4757
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4758
"/path/to/newbranch."
4759
msgstr ""
4760
"The path to the branch to switch to can be specified relative to the parent\n"
4761
"directory of the current branch. For example, if you are currently in a\n"
4762
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4763
"/path/to/newbranch."
4764
4765
#: bzrlib/builtins.py:6223
4766
msgid ""
4767
"Bound branches use the nickname of its master branch unless it is set\n"
4768
"locally, in which case switching will update the local nickname to be\n"
4769
"that of the master."
4770
msgstr ""
4771
"Bound branches use the nickname of its master branch unless it is set\n"
4772
"locally, in which case switching will update the local nickname to be\n"
4773
"that of the master."
4774
4775
#: bzrlib/builtins.py:6231
3961
4776
msgid "Switch even if local commits will be lost."
3962
msgstr ""
4777
msgstr "Switch even if local commits will be lost."
3963
4778
3964
#: bzrlib/builtins.py:6215
4779
#: bzrlib/builtins.py:6234
3965
4780
msgid "Create the target branch from this one before switching to it."
3966
msgstr ""
4781
msgstr "Create the target branch from this one before switching to it."
3967
4782
3968
#: bzrlib/builtins.py:6229
4783
#: bzrlib/builtins.py:6248
3969
4784
msgid "You must supply either a revision or a location"
3970
msgstr ""
4785
msgstr "You must supply either a revision or a location"
3971
4786
3972
#: bzrlib/builtins.py:6242
4787
#: bzrlib/builtins.py:6261
3973
4788
msgid "cannot create branch without source branch"
3974
msgstr ""
4789
msgstr "cannot create branch without source branch"
3975
4790
3976
#: bzrlib/builtins.py:6262
4791
#: bzrlib/builtins.py:6286
3977
4792
msgid "Manage filtered views."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6264
3981
msgid ""
3982
"Views provide a mask over the tree so that users can focus on\n"
3983
"a subset of a tree when doing their work. After creating a view,\n"
3984
"commands that support a list of files - status, diff, commit, etc -\n"
3985
"effectively have that list of files implicitly given each time.\n"
3986
"An explicit list of files can still be given but those files\n"
3987
"must be within the current view."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6271
3991
msgid ""
3992
"In most cases, a view has a short life-span: it is created to make\n"
3993
"a selected change and is deleted once that change is committed.\n"
3994
"At other times, you may wish to create one or more named views\n"
3995
"and switch between them."
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6276
3999
msgid ""
4000
"To disable the current view without deleting it, you can switch to\n"
4001
"the pseudo view called ``off``. This can be useful when you need\n"
4002
"to see the whole tree for an operation or two (e.g. merge) but\n"
4003
"want to switch back to your view after that."
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6281
4007
msgid ""
4008
":Examples:\n"
4009
" To define the current view::"
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6284
4793
msgstr "Manage filtered views."
4794
4795
#: bzrlib/builtins.py:6288
4796
msgid ""
4797
"Views provide a mask over the tree so that users can focus on\n"
4798
"a subset of a tree when doing their work. After creating a view,\n"
4799
"commands that support a list of files - status, diff, commit, etc -\n"
4800
"effectively have that list of files implicitly given each time.\n"
4801
"An explicit list of files can still be given but those files\n"
4802
"must be within the current view."
4803
msgstr ""
4804
"Views provide a mask over the tree so that users can focus on\n"
4805
"a subset of a tree when doing their work. After creating a view,\n"
4806
"commands that support a list of files - status, diff, commit, etc -\n"
4807
"effectively have that list of files implicitly given each time.\n"
4808
"An explicit list of files can still be given but those files\n"
4809
"must be within the current view."
4810
4811
#: bzrlib/builtins.py:6295
4812
msgid ""
4813
"In most cases, a view has a short life-span: it is created to make\n"
4814
"a selected change and is deleted once that change is committed.\n"
4815
"At other times, you may wish to create one or more named views\n"
4816
"and switch between them."
4817
msgstr ""
4818
"In most cases, a view has a short life-span: it is created to make\n"
4819
"a selected change and is deleted once that change is committed.\n"
4820
"At other times, you may wish to create one or more named views\n"
4821
"and switch between them."
4822
4823
#: bzrlib/builtins.py:6300
4824
msgid ""
4825
"To disable the current view without deleting it, you can switch to\n"
4826
"the pseudo view called ``off``. This can be useful when you need\n"
4827
"to see the whole tree for an operation or two (e.g. merge) but\n"
4828
"want to switch back to your view after that."
4829
msgstr ""
4830
"To disable the current view without deleting it, you can switch to\n"
4831
"the pseudo view called ``off``. This can be useful when you need\n"
4832
"to see the whole tree for an operation or two (e.g. merge) but\n"
4833
"want to switch back to your view after that."
4834
4835
#: bzrlib/builtins.py:6305
4836
msgid ""
4837
":Examples:\n"
4838
" To define the current view::"
4839
msgstr ""
4840
":Examples:\n"
4841
" To define the current view::"
4842
4843
#: bzrlib/builtins.py:6308
4013
4844
msgid " bzr view file1 dir1 ..."
4014
msgstr ""
4845
msgstr " bzr view file1 dir1 ..."
4015
4846
4016
#: bzrlib/builtins.py:6286
4847
#: bzrlib/builtins.py:6310
4017
4848
msgid " To list the current view::"
4018
msgstr ""
4849
msgstr " To list the current view::"
4019
4850
4020
#: bzrlib/builtins.py:6288
4851
#: bzrlib/builtins.py:6312
4021
4852
msgid " bzr view"
4022
msgstr ""
4853
msgstr " bzr view"
4023
4854
4024
#: bzrlib/builtins.py:6290
4855
#: bzrlib/builtins.py:6314
4025
4856
msgid " To delete the current view::"
4026
msgstr ""
4857
msgstr " To delete the current view::"
4027
4858
4028
#: bzrlib/builtins.py:6292
4859
#: bzrlib/builtins.py:6316
4029
4860
msgid " bzr view --delete"
4030
msgstr ""
4861
msgstr " bzr view --delete"
4031
4862
4032
#: bzrlib/builtins.py:6294
4863
#: bzrlib/builtins.py:6318
4033
4864
msgid " To disable the current view without deleting it::"
4034
msgstr ""
4865
msgstr " To disable the current view without deleting it::"
4035
4866
4036
#: bzrlib/builtins.py:6296
4867
#: bzrlib/builtins.py:6320
4037
4868
msgid " bzr view --switch off"
4038
msgstr ""
4869
msgstr " bzr view --switch off"
4039
4870
4040
#: bzrlib/builtins.py:6298
4871
#: bzrlib/builtins.py:6322
4041
4872
msgid " To define a named view and switch to it::"
4042
msgstr ""
4873
msgstr " To define a named view and switch to it::"
4043
4874
4044
#: bzrlib/builtins.py:6300
4875
#: bzrlib/builtins.py:6324
4045
4876
msgid " bzr view --name view-name file1 dir1 ..."
4046
msgstr ""
4877
msgstr " bzr view --name view-name file1 dir1 ..."
4047
4878
4048
#: bzrlib/builtins.py:6302
4879
#: bzrlib/builtins.py:6326
4049
4880
msgid " To list a named view::"
4050
msgstr ""
4881
msgstr " To list a named view::"
4051
4882
4052
#: bzrlib/builtins.py:6304
4883
#: bzrlib/builtins.py:6328
4053
4884
msgid " bzr view --name view-name"
4054
msgstr ""
4885
msgstr " bzr view --name view-name"
4055
4886
4056
#: bzrlib/builtins.py:6306
4887
#: bzrlib/builtins.py:6330
4057
4888
msgid " To delete a named view::"
4058
msgstr ""
4889
msgstr " To delete a named view::"
4059
4890
4060
#: bzrlib/builtins.py:6308
4891
#: bzrlib/builtins.py:6332
4061
4892
msgid " bzr view --name view-name --delete"
4062
msgstr ""
4893
msgstr " bzr view --name view-name --delete"
4063
4894
4064
#: bzrlib/builtins.py:6310
4895
#: bzrlib/builtins.py:6334
4065
4896
msgid " To switch to a named view::"
4066
msgstr ""
4897
msgstr " To switch to a named view::"
4067
4898
4068
#: bzrlib/builtins.py:6312
4899
#: bzrlib/builtins.py:6336
4069
4900
msgid " bzr view --switch view-name"
4070
msgstr ""
4901
msgstr " bzr view --switch view-name"
4071
4902
4072
#: bzrlib/builtins.py:6314
4903
#: bzrlib/builtins.py:6338
4073
4904
msgid " To list all views defined::"
4074
msgstr ""
4905
msgstr " To list all views defined::"
4075
4906
4076
#: bzrlib/builtins.py:6316
4907
#: bzrlib/builtins.py:6340
4077
4908
msgid " bzr view --all"
4078
msgstr ""
4909
msgstr " bzr view --all"
4079
4910
4080
#: bzrlib/builtins.py:6318
4911
#: bzrlib/builtins.py:6342
4081
4912
msgid " To delete all views::"
4082
msgstr ""
4913
msgstr " To delete all views::"
4083
4914
4084
#: bzrlib/builtins.py:6320
4915
#: bzrlib/builtins.py:6344
4085
4916
msgid " bzr view --delete --all"
4086
msgstr ""
4917
msgstr " bzr view --delete --all"
4087
4918
4088
#: bzrlib/builtins.py:6327
4919
#: bzrlib/builtins.py:6351
4089
4920
msgid "Apply list or delete action to all views."
4090
msgstr ""
4921
msgstr "Apply list or delete action to all views."
4091
4922
4092
#: bzrlib/builtins.py:6330
4923
#: bzrlib/builtins.py:6354
4093
4924
msgid "Delete the view."
4094
msgstr ""
4925
msgstr "Delete the view."
4095
4926
4096
#: bzrlib/builtins.py:6333
4927
#: bzrlib/builtins.py:6357
4097
4928
msgid "Name of the view to define, list or delete."
4098
msgstr ""
4929
msgstr "Name of the view to define, list or delete."
4099
4930
4100
#: bzrlib/builtins.py:6337
4931
#: bzrlib/builtins.py:6361
4101
4932
msgid "Name of the view to switch to."
4102
msgstr ""
4933
msgstr "Name of the view to switch to."
4103
4934
4104
#: bzrlib/builtins.py:6356
4935
#: bzrlib/builtins.py:6380
4105
4936
msgid "Both --delete and a file list specified"
4106
msgstr ""
4937
msgstr "Both --delete and a file list specified"
4107
4938
4108
#: bzrlib/builtins.py:6359
4939
#: bzrlib/builtins.py:6383
4109
4940
msgid "Both --delete and --switch specified"
4110
msgstr ""
4941
msgstr "Both --delete and --switch specified"
4111
4942
4112
#: bzrlib/builtins.py:6362
4943
#: bzrlib/builtins.py:6386
4113
4944
msgid "Deleted all views.\n"
4114
msgstr ""
4945
msgstr "Deleted all views.\n"
4115
4946
4116
#: bzrlib/builtins.py:6364
4947
#: bzrlib/builtins.py:6388
4117
4948
msgid "No current view to delete"
4118
msgstr ""
4949
msgstr "No current view to delete"
4119
4950
4120
#: bzrlib/builtins.py:6367
4951
#: bzrlib/builtins.py:6391
4121
4952
#, python-format
4122
4953
msgid "Deleted '%s' view.\n"
4123
msgstr ""
4954
msgstr "Deleted '%s' view.\n"
4124
4955
4125
#: bzrlib/builtins.py:6371
4956
#: bzrlib/builtins.py:6395
4126
4957
msgid "Both --switch and a file list specified"
4127
msgstr ""
4958
msgstr "Both --switch and a file list specified"
4128
4959
4129
#: bzrlib/builtins.py:6374
4960
#: bzrlib/builtins.py:6398
4130
4961
msgid "Both --switch and --all specified"
4131
msgstr ""
4962
msgstr "Both --switch and --all specified"
4132
4963
4133
#: bzrlib/builtins.py:6377
4964
#: bzrlib/builtins.py:6401
4134
4965
msgid "No current view to disable"
4135
msgstr ""
4966
msgstr "No current view to disable"
4136
4967
4137
#: bzrlib/builtins.py:6379
4968
#: bzrlib/builtins.py:6403
4138
4969
#, python-format
4139
4970
msgid "Disabled '%s' view.\n"
4140
msgstr ""
4971
msgstr "Disabled '%s' view.\n"
4141
4972
4142
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4973
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4143
4974
msgid "Using '{0}' view: {1}\n"
4144
msgstr ""
4975
msgstr "Using '{0}' view: {1}\n"
4145
4976
4146
#: bzrlib/builtins.py:6386
4977
#: bzrlib/builtins.py:6410
4147
4978
msgid "Views defined:\n"
4148
msgstr ""
4979
msgstr "Views defined:\n"
4149
4980
4150
#: bzrlib/builtins.py:6395
4981
#: bzrlib/builtins.py:6419
4151
4982
msgid "No views defined.\n"
4152
msgstr ""
4983
msgstr "No views defined.\n"
4153
4984
4154
#: bzrlib/builtins.py:6402
4985
#: bzrlib/builtins.py:6426
4155
4986
msgid "Cannot change the 'off' pseudo view"
4156
msgstr ""
4987
msgstr "Cannot change the 'off' pseudo view"
4157
4988
4158
#: bzrlib/builtins.py:6410
4989
#: bzrlib/builtins.py:6434
4159
4990
msgid "No current view.\n"
4160
msgstr ""
4991
msgstr "No current view.\n"
4161
4992
4162
#: bzrlib/builtins.py:6413
4993
#: bzrlib/builtins.py:6437
4163
4994
msgid "'{0}' view is: {1}\n"
4164
msgstr ""
4995
msgstr "'{0}' view is: {1}\n"
4165
4996
4166
#: bzrlib/builtins.py:6433
4997
#: bzrlib/builtins.py:6457
4167
4998
msgid " <no hooks installed>\n"
4168
msgstr ""
4999
msgstr " <no hooks installed>\n"
4169
5000
4170
#: bzrlib/builtins.py:6437
5001
#: bzrlib/builtins.py:6461
4171
5002
msgid "Remove a branch."
4172
msgstr ""
5003
msgstr "Remove a branch."
4173
5004
4174
#: bzrlib/builtins.py:6439
5005
#: bzrlib/builtins.py:6463
4175
5006
msgid ""
4176
5007
"This will remove the branch from the specified location but \n"
4177
5008
"will keep any working tree or repository in place."
4178
5009
msgstr ""
5010
"This will remove the branch from the specified location but \n"
5011
"will keep any working tree or repository in place."
4179
5012
4180
#: bzrlib/builtins.py:6444
5013
#: bzrlib/builtins.py:6468
4181
5014
msgid " Remove the branch at repo/trunk::"
4182
msgstr ""
5015
msgstr " Remove the branch at repo/trunk::"
4183
5016
4184
#: bzrlib/builtins.py:6446
5017
#: bzrlib/builtins.py:6470
4185
5018
msgid " bzr remove-branch repo/trunk"
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6461
5019
msgstr " bzr remove-branch repo/trunk"
5020
5021
#: bzrlib/builtins.py:6477
5022
msgid "Remove branch even if it is the active branch."
5023
msgstr "Remove branch even if it is the active branch."
5024
5025
#: bzrlib/builtins.py:6491
5026
msgid "Branch is active. Use --force to remove it."
5027
msgstr "Branch is active. Use --force to remove it."
5028
5029
#: bzrlib/builtins.py:6495
4189
5030
msgid "Plaintext diff output."
4190
msgstr ""
5031
msgstr "Plaintext diff output."
4191
5032
4192
#: bzrlib/builtins.py:6462
5033
#: bzrlib/builtins.py:6496
4193
5034
msgid "Temporarily set aside some changes from the current tree."
4194
msgstr ""
5035
msgstr "Temporarily set aside some changes from the current tree."
4195
5036
4196
#: bzrlib/builtins.py:6464
5037
#: bzrlib/builtins.py:6498
4197
5038
msgid ""
4198
5039
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4199
5040
"ie. out of the way, until a later time when you can bring them back from\n"
4201
5042
"your working tree, and so they aren't propagated along with your branch nor\n"
4202
5043
"will they survive its deletion."
4203
5044
msgstr ""
5045
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
5046
"ie. out of the way, until a later time when you can bring them back from\n"
5047
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
5048
"your working tree, and so they aren't propagated along with your branch nor\n"
5049
"will they survive its deletion."
4204
5050
4205
#: bzrlib/builtins.py:6470
5051
#: bzrlib/builtins.py:6504
4206
5052
msgid "If shelve --list is specified, previously-shelved changes are listed."
4207
5053
msgstr ""
4208
4209
#: bzrlib/builtins.py:6472
4210
msgid ""
4211
"Shelve is intended to help separate several sets of changes that have\n"
4212
"been inappropriately mingled. If you just want to get rid of all changes\n"
4213
"and you don't need to restore them later, use revert. If you want to\n"
4214
"shelve all text changes at once, use shelve --all."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:6477
4218
msgid ""
4219
"If filenames are specified, only the changes to those files will be\n"
4220
"shelved. Other files will be left untouched."
4221
msgstr ""
4222
4223
#: bzrlib/builtins.py:6480
4224
msgid ""
4225
"If a revision is specified, changes since that revision will be shelved."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6482
4229
msgid ""
4230
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4231
"restore the most recently shelved changes."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6485
4235
msgid ""
4236
"For complicated changes, it is possible to edit the changes in a separate\n"
4237
"editor program to decide what the file remaining in the working copy\n"
4238
"should look like. To do this, add the configuration option"
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6489
5054
"If shelve --list is specified, previously-shelved changes are listed."
5055
5056
#: bzrlib/builtins.py:6506
5057
msgid ""
5058
"Shelve is intended to help separate several sets of changes that have\n"
5059
"been inappropriately mingled. If you just want to get rid of all changes\n"
5060
"and you don't need to restore them later, use revert. If you want to\n"
5061
"shelve all text changes at once, use shelve --all."
5062
msgstr ""
5063
"Shelve is intended to help separate several sets of changes that have\n"
5064
"been inappropriately mingled. If you just want to get rid of all changes\n"
5065
"and you don't need to restore them later, use revert. If you want to\n"
5066
"shelve all text changes at once, use shelve --all."
5067
5068
#: bzrlib/builtins.py:6511
5069
msgid ""
5070
"If filenames are specified, only the changes to those files will be\n"
5071
"shelved. Other files will be left untouched."
5072
msgstr ""
5073
"If filenames are specified, only the changes to those files will be\n"
5074
"shelved. Other files will be left untouched."
5075
5076
#: bzrlib/builtins.py:6514
5077
msgid ""
5078
"If a revision is specified, changes since that revision will be shelved."
5079
msgstr ""
5080
"If a revision is specified, changes since that revision will be shelved."
5081
5082
#: bzrlib/builtins.py:6516
5083
msgid ""
5084
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
5085
"restore the most recently shelved changes."
5086
msgstr ""
5087
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
5088
"restore the most recently shelved changes."
5089
5090
#: bzrlib/builtins.py:6519
5091
msgid ""
5092
"For complicated changes, it is possible to edit the changes in a separate\n"
5093
"editor program to decide what the file remaining in the working copy\n"
5094
"should look like. To do this, add the configuration option"
5095
msgstr ""
5096
"For complicated changes, it is possible to edit the changes in a separate\n"
5097
"editor program to decide what the file remaining in the working copy\n"
5098
"should look like. To do this, add the configuration option"
5099
5100
#: bzrlib/builtins.py:6523
4242
5101
msgid " change_editor = PROGRAM @new_path @old_path"
4243
msgstr ""
5102
msgstr " change_editor = PROGRAM @new_path @old_path"
4244
5103
4245
#: bzrlib/builtins.py:6491
5104
#: bzrlib/builtins.py:6525
4246
5105
msgid ""
4247
5106
"where @new_path is replaced with the path of the new version of the \n"
4248
5107
"file and @old_path is replaced with the path of the old version of \n"
4250
5109
"contents of the file in the working tree.\n"
4251
5110
" "
4252
5111
msgstr ""
5112
"where @new_path is replaced with the path of the new version of the \n"
5113
"file and @old_path is replaced with the path of the old version of \n"
5114
"the file. The PROGRAM should save the new file with the desired \n"
5115
"contents of the file in the working tree.\n"
5116
" "
4253
5117
4254
#: bzrlib/builtins.py:6503
5118
#: bzrlib/builtins.py:6537
4255
5119
msgid "Shelve all changes."
4256
msgstr ""
5120
msgstr "Shelve all changes."
4257
5121
4258
#: bzrlib/builtins.py:6505
5122
#: bzrlib/builtins.py:6539
4259
5123
msgid "Method to use for writing diffs."
4260
msgstr ""
5124
msgstr "Method to use for writing diffs."
4261
5125
4262
#: bzrlib/builtins.py:6505
5126
#: bzrlib/builtins.py:6539
4263
5127
msgid "writer"
4264
msgstr ""
5128
msgstr "writer"
4265
5129
4266
#: bzrlib/builtins.py:6509
5130
#: bzrlib/builtins.py:6543
4267
5131
msgid "List shelved changes."
4268
msgstr ""
5132
msgstr "List shelved changes."
4269
5133
4270
#: bzrlib/builtins.py:6511
5134
#: bzrlib/builtins.py:6545
4271
5135
msgid "Destroy removed changes instead of shelving them."
4272
msgstr ""
5136
msgstr "Destroy removed changes instead of shelving them."
4273
5137
4274
#: bzrlib/builtins.py:6540
5138
#: bzrlib/builtins.py:6574
4275
5139
msgid "No shelved changes."
4276
msgstr ""
5140
msgstr "No shelved changes."
4277
5141
4278
#: bzrlib/builtins.py:6551
5142
#: bzrlib/builtins.py:6585
4279
5143
msgid "Restore shelved changes."
4280
msgstr ""
5144
msgstr "Restore shelved changes."
4281
5145
4282
#: bzrlib/builtins.py:6553
5146
#: bzrlib/builtins.py:6587
4283
5147
msgid ""
4284
5148
"By default, the most recently shelved changes are restored. However if you\n"
4285
5149
"specify a shelf by id those changes will be restored instead. This works\n"
4286
5150
"best when the changes don't depend on each other."
4287
5151
msgstr ""
5152
"By default, the most recently shelved changes are restored. However if you\n"
5153
"specify a shelf by id those changes will be restored instead. This works\n"
5154
"best when the changes don't depend on each other."
4288
5155
4289
#: bzrlib/builtins.py:6562
5156
#: bzrlib/builtins.py:6596
4290
5157
msgid "The action to perform."
4291
msgstr ""
5158
msgstr "The action to perform."
4292
5159
4293
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
5160
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4294
5161
msgid "action"
4295
msgstr ""
5162
msgstr "action"
4296
5163
4297
#: bzrlib/builtins.py:6564
5164
#: bzrlib/builtins.py:6598
4298
5165
msgid "Apply changes and remove from the shelf."
4299
msgstr ""
5166
msgstr "Apply changes and remove from the shelf."
4300
5167
4301
#: bzrlib/builtins.py:6565
5168
#: bzrlib/builtins.py:6599
4302
5169
msgid "Show changes, but do not apply or remove them."
4303
msgstr ""
5170
msgstr "Show changes, but do not apply or remove them."
4304
5171
4305
#: bzrlib/builtins.py:6566
5172
#: bzrlib/builtins.py:6600
4306
5173
msgid ""
4307
5174
"Instead of unshelving the changes, show the diff that would result from "
4308
5175
"unshelving."
4309
5176
msgstr ""
5177
"Instead of unshelving the changes, show the diff that would result from "
5178
"unshelving."
4310
5179
4311
#: bzrlib/builtins.py:6568
5180
#: bzrlib/builtins.py:6602
4312
5181
msgid "Delete changes without applying them."
4313
msgstr ""
5182
msgstr "Delete changes without applying them."
4314
5183
4315
#: bzrlib/builtins.py:6569
5184
#: bzrlib/builtins.py:6603
4316
5185
msgid "Apply changes but don't delete them."
4317
msgstr ""
5186
msgstr "Apply changes but don't delete them."
4318
5187
4319
#: bzrlib/builtins.py:6584
5188
#: bzrlib/builtins.py:6618
4320
5189
msgid "Remove unwanted files from working tree."
4321
msgstr ""
4322
4323
#: bzrlib/builtins.py:6586
4324
msgid ""
4325
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4326
"files are never deleted."
4327
msgstr ""
4328
4329
#: bzrlib/builtins.py:6589
4330
msgid ""
4331
"Another class is 'detritus', which includes files emitted by bzr during\n"
4332
"normal operations and selftests. (The value of these files decreases with\n"
4333
"time.)"
4334
msgstr ""
4335
4336
#: bzrlib/builtins.py:6593
4337
msgid ""
4338
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4339
"flags are respected, and may be combined."
4340
msgstr ""
4341
4342
#: bzrlib/builtins.py:6596
5190
msgstr "Remove unwanted files from working tree."
5191
5192
#: bzrlib/builtins.py:6620
5193
msgid ""
5194
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
5195
"files are never deleted."
5196
msgstr ""
5197
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
5198
"files are never deleted."
5199
5200
#: bzrlib/builtins.py:6623
5201
msgid ""
5202
"Another class is 'detritus', which includes files emitted by bzr during\n"
5203
"normal operations and selftests. (The value of these files decreases with\n"
5204
"time.)"
5205
msgstr ""
5206
"Another class is 'detritus', which includes files emitted by bzr during\n"
5207
"normal operations and selftests. (The value of these files decreases with\n"
5208
"time.)"
5209
5210
#: bzrlib/builtins.py:6627
5211
msgid ""
5212
"If no options are specified, unknown files are deleted. Otherwise, option\n"
5213
"flags are respected, and may be combined."
5214
msgstr ""
5215
"If no options are specified, unknown files are deleted. Otherwise, option\n"
5216
"flags are respected, and may be combined."
5217
5218
#: bzrlib/builtins.py:6630
4343
5219
msgid "To check what clean-tree will do, use --dry-run."
4344
msgstr ""
5220
msgstr "To check what clean-tree will do, use --dry-run."
4345
5221
4346
#: bzrlib/builtins.py:6599
5222
#: bzrlib/builtins.py:6633
4347
5223
msgid "Delete all ignored files."
4348
msgstr ""
5224
msgstr "Delete all ignored files."
4349
5225
4350
#: bzrlib/builtins.py:6600
5226
#: bzrlib/builtins.py:6634
4351
5227
msgid ""
4352
5228
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4353
5229
msgstr ""
5230
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4354
5231
4355
#: bzrlib/builtins.py:6603
5232
#: bzrlib/builtins.py:6637
4356
5233
msgid "Delete files unknown to bzr (default)."
4357
msgstr ""
5234
msgstr "Delete files unknown to bzr (default)."
4358
5235
4359
#: bzrlib/builtins.py:6604
5236
#: bzrlib/builtins.py:6638
4360
5237
msgid "Show files to delete instead of deleting them."
4361
msgstr ""
5238
msgstr "Show files to delete instead of deleting them."
4362
5239
4363
#: bzrlib/builtins.py:6606
5240
#: bzrlib/builtins.py:6640
4364
5241
msgid "Do not prompt before deleting."
4365
msgstr ""
5242
msgstr "Do not prompt before deleting."
4366
5243
4367
5244
#: bzrlib/bundle/__init__.py:59
4368
5245
msgid "A directory cannot be a bundle"
4369
msgstr ""
5246
msgstr "A directory cannot be a bundle"
4370
5247
4371
5248
#: bzrlib/bundle/apply_bundle.py:40
4372
5249
msgid "Install revisions"
4373
msgstr ""
5250
msgstr "Install revisions"
4374
5251
4375
5252
#: bzrlib/bundle/commands.py:64
4376
5253
msgid "--verbose requires a merge directive"
4377
msgstr ""
5254
msgstr "--verbose requires a merge directive"
4378
5255
4379
5256
#: bzrlib/bundle/commands.py:67
4380
5257
msgid "Bundle format not supported"
4381
msgstr ""
5258
msgstr "Bundle format not supported"
4382
5259
4383
5260
#: bzrlib/bundle/commands.py:77
4384
5261
msgid "Records\n"
4385
msgstr ""
5262
msgstr "Records\n"
4386
5263
4387
5264
#: bzrlib/bundle/commands.py:81
4388
5265
msgid "{0}: {1} ({2} multiparent)\n"
4389
msgstr ""
5266
msgstr "{0}: {1} ({2} multiparent)\n"
4390
5267
4391
5268
#: bzrlib/bundle/commands.py:83
4392
5269
#, python-format
4393
5270
msgid "unique files: %d\n"
4394
msgstr ""
5271
msgstr "unique files: %d\n"
4395
5272
4396
5273
#: bzrlib/bundle/commands.py:92
4397
5274
msgid "Revisions\n"
4398
msgstr ""
5275
msgstr "Revisions\n"
4399
5276
4400
5277
#: bzrlib/bundle/commands.py:93
4401
5278
#, python-format
4402
5279
msgid "nicks: %s\n"
4403
msgstr ""
5280
msgstr "nicks: %s\n"
4404
5281
4405
5282
#: bzrlib/bundle/commands.py:95
4406
5283
#, python-format
4408
5285
"committers: \n"
4409
5286
"%s\n"
4410
5287
msgstr ""
5288
"committers: \n"
5289
"%s\n"
4411
5290
4412
5291
#: bzrlib/bundle/commands.py:103
4413
5292
msgid "Decoded contents\n"
4414
msgstr ""
5293
msgstr "Decoded contents\n"
4415
5294
4416
5295
#: bzrlib/bundle/serializer/v4.py:327
4417
5296
#, python-format
4418
5297
msgid "Bundling %d revision."
4419
5298
msgid_plural "Bundling %d revisions."
4420
msgstr[0] ""
4421
msgstr[1] ""
5299
msgstr[0] "Bundling %d revision."
5300
msgstr[1] "Bundling %d revisions."
4422
5301
4423
#: bzrlib/bzrdir.py:490
5302
#: bzrlib/bzrdir.py:487
4424
5303
msgid ""
4425
5304
"making backup of {0}\n"
4426
5305
" to {1}"
4427
5306
msgstr ""
5307
"making backup of {0}\n"
5308
" to {1}"
4428
5309
4429
#: bzrlib/bzrdir.py:513
5310
#: bzrlib/bzrdir.py:510
4430
5311
msgid "renamed {0} to {1}"
4431
msgstr ""
4432
4433
#: bzrlib/bzrdir.py:1652
4434
#, python-format
4435
msgid ""
4436
"Source repository format does not support stacking, using format:\n"
4437
" %s"
4438
msgstr ""
4439
4440
#: bzrlib/bzrdir.py:1672
4441
#, python-format
4442
msgid ""
4443
"Source branch format does not support stacking, using format:\n"
4444
" %s"
4445
msgstr ""
4446
4447
#: bzrlib/bzrdir.py:1818
5312
msgstr "renamed {0} to {1}"
5313
5314
#: bzrlib/bzrdir.py:1639
5315
#, python-format
5316
msgid ""
5317
"Source repository format does not support stacking, using format:\n"
5318
" %s"
5319
msgstr ""
5320
"Source repository format does not support stacking, using format:\n"
5321
" %s"
5322
5323
#: bzrlib/bzrdir.py:1659
5324
#, python-format
5325
msgid ""
5326
"Source branch format does not support stacking, using format:\n"
5327
" %s"
5328
msgstr ""
5329
"Source branch format does not support stacking, using format:\n"
5330
" %s"
5331
5332
#: bzrlib/bzrdir.py:1805
4448
5333
msgid "starting repository conversion"
4449
msgstr ""
5334
msgstr "starting repository conversion"
4450
5335
4451
#: bzrlib/bzrdir.py:2039
5336
#: bzrlib/bzrdir.py:2026
4452
5337
msgid "Using default stacking branch {0} at {1}"
4453
msgstr ""
5338
msgstr "Using default stacking branch {0} at {1}"
4454
5339
4455
5340
#: bzrlib/check.py:108
4456
5341
msgid "check"
4457
msgstr ""
5342
msgstr "check"
4458
5343
4459
5344
#: bzrlib/check.py:110
4460
5345
msgid "checking revisions"
4461
msgstr ""
5346
msgstr "checking revisions"
4462
5347
4463
5348
#: bzrlib/check.py:112
4464
5349
msgid "checking commit contents"
4465
msgstr ""
5350
msgstr "checking commit contents"
4466
5351
4467
5352
#: bzrlib/check.py:114
4468
5353
msgid "checking file graphs"
4469
msgstr ""
5354
msgstr "checking file graphs"
4470
5355
4471
5356
#: bzrlib/check.py:118
4472
5357
msgid "checking branches and trees"
4473
msgstr ""
5358
msgstr "checking branches and trees"
4474
5359
4475
5360
#: bzrlib/check.py:205
4476
5361
msgid "checked repository {0} format {1}"
4477
msgstr ""
5362
msgstr "checked repository {0} format {1}"
4478
5363
4479
5364
#: bzrlib/check.py:208
4480
5365
#, python-format
4481
5366
msgid "%6d revisions"
4482
msgstr ""
5367
msgstr "%6d revisions"
4483
5368
4484
5369
#: bzrlib/check.py:209
4485
5370
#, python-format
4486
5371
msgid "%6d file-ids"
4487
msgstr ""
5372
msgstr "%6d file-ids"
4488
5373
4489
5374
#: bzrlib/check.py:211
4490
5375
#, python-format
4491
5376
msgid "%6d unreferenced text versions"
4492
msgstr ""
5377
msgstr "%6d unreferenced text versions"
4493
5378
4494
5379
#: bzrlib/check.py:215
4495
5380
msgid "unreferenced version: {{{0}}} in {1}"
4496
msgstr ""
5381
msgstr "unreferenced version: {{{0}}} in {1}"
4497
5382
4498
5383
#: bzrlib/check.py:218
4499
5384
#, python-format
4500
5385
msgid "%6d revisions are missing inventory_sha1"
4501
msgstr ""
5386
msgstr "%6d revisions are missing inventory_sha1"
4502
5387
4503
5388
#: bzrlib/check.py:221
4504
5389
#, python-format
4505
5390
msgid "%6d revisions are mentioned but not present"
4506
msgstr ""
5391
msgstr "%6d revisions are mentioned but not present"
4507
5392
4508
5393
#: bzrlib/check.py:224
4509
5394
#, python-format
4510
5395
msgid "%6d ghost revisions"
4511
msgstr ""
5396
msgstr "%6d ghost revisions"
4512
5397
4513
5398
#: bzrlib/check.py:229
4514
5399
#, python-format
4515
5400
msgid "%6d revisions missing parents in ancestry"
4516
msgstr ""
5401
msgstr "%6d revisions missing parents in ancestry"
4517
5402
4518
5403
#: bzrlib/check.py:233
4519
5404
#, python-format
4520
5405
msgid " %s should be in the ancestry for:"
4521
msgstr ""
5406
msgstr " %s should be in the ancestry for:"
4522
5407
4523
5408
#: bzrlib/check.py:237
4524
5409
#, python-format
4525
5410
msgid "%6d inconsistent parents"
4526
msgstr ""
5411
msgstr "%6d inconsistent parents"
4527
5412
4528
5413
#: bzrlib/check.py:241
4529
5414
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4530
msgstr ""
5415
msgstr " * {0} version {1} has parents {2!r} but should have {3!r}"
4531
5416
4532
5417
#: bzrlib/check.py:247
4533
5418
#, python-format
4534
5419
msgid "%6d revisions have incorrect parents in the revision index"
4535
msgstr ""
5420
msgstr "%6d revisions have incorrect parents in the revision index"
4536
5421
4537
5422
#: bzrlib/check.py:253
4538
5423
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4539
msgstr ""
5424
msgstr " {0} has wrong parents in index: {1!r} should be {2!r}"
4540
5425
4541
5426
#: bzrlib/check.py:267
4542
5427
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4543
msgstr ""
5428
msgstr "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4544
5429
4545
5430
#: bzrlib/check.py:296
4546
5431
msgid ""
4547
5432
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4548
5433
"{{{4}}}"
4549
5434
msgstr ""
5435
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5436
"{{{4}}}"
4550
5437
4551
5438
#: bzrlib/check.py:354
4552
5439
#, python-format
4553
5440
msgid "Checking branch at '%s'."
4554
msgstr ""
5441
msgstr "Checking branch at '%s'."
4555
5442
4556
5443
#: bzrlib/check.py:374
4557
5444
#, python-format
4558
5445
msgid "Checking working tree at '%s'."
4559
msgstr ""
5446
msgstr "Checking working tree at '%s'."
4560
5447
4561
5448
#: bzrlib/check.py:427 bzrlib/check.py:441
4562
5449
msgid "No branch found at specified location."
4563
msgstr ""
5450
msgstr "No branch found at specified location."
4564
5451
4565
5452
#: bzrlib/check.py:429 bzrlib/check.py:439
4566
5453
msgid "No working tree found at specified location."
4567
msgstr ""
5454
msgstr "No working tree found at specified location."
4568
5455
4569
5456
#: bzrlib/check.py:432
4570
5457
#, python-format
4571
5458
msgid "Checking repository at '%s'."
4572
msgstr ""
5459
msgstr "Checking repository at '%s'."
4573
5460
4574
5461
#: bzrlib/check.py:443
4575
5462
msgid "No repository found at specified location."
4576
msgstr ""
5463
msgstr "No repository found at specified location."
4577
5464
4578
5465
#: bzrlib/clean_tree.py:63
4579
5466
msgid "Nothing to delete."
4580
msgstr ""
5467
msgstr "Nothing to delete."
4581
5468
4582
5469
#: bzrlib/clean_tree.py:68
4583
5470
msgid "Are you sure you wish to delete these"
4584
msgstr ""
5471
msgstr "Are you sure you wish to delete these"
4585
5472
4586
5473
#: bzrlib/clean_tree.py:70
4587
5474
msgid "Canceled"
4588
msgstr ""
5475
msgstr "Cancelled"
4589
5476
4590
5477
#: bzrlib/clean_tree.py:107
4591
5478
#, python-format
4592
5479
msgid "unable to remove %s"
4593
msgstr ""
5480
msgstr "unable to remove %s"
4594
5481
4595
5482
#: bzrlib/clean_tree.py:111
4596
5483
msgid "deleting paths:"
4597
msgstr ""
5484
msgstr "deleting paths:"
4598
5485
4599
5486
#: bzrlib/clean_tree.py:125
4600
5487
msgid "unable to remove \"{0}\": {1}."
4601
msgstr ""
5488
msgstr "unable to remove \"{0}\": {1}."
4602
5489
4603
5490
#: bzrlib/clean_tree.py:130
4604
5491
msgid "No files deleted."
4605
msgstr ""
5492
msgstr "No files deleted."
4606
5493
4607
5494
#: bzrlib/cmd_version_info.py:47
4608
5495
msgid "No known version info format {0}. Supported types are: {1}"
4609
msgstr ""
5496
msgstr "No known version info format {0}. Supported types are: {1}"
4610
5497
4611
5498
#: bzrlib/cmd_version_info.py:52
4612
5499
msgid "Version info in Custom template-based format."
4613
msgstr ""
5500
msgstr "Version info in Custom template-based format."
4614
5501
4615
5502
#: bzrlib/cmd_version_info.py:52
4616
5503
msgid "Version info in Python format."
4617
msgstr ""
5504
msgstr "Version info in Python format."
4618
5505
4619
5506
#: bzrlib/cmd_version_info.py:52
4620
5507
msgid "Version info in RIO (simple text) format (default)."
4621
msgstr ""
5508
msgstr "Version info in RIO (simple text) format (default)."
4622
5509
4623
5510
#: bzrlib/cmd_version_info.py:53
4624
5511
msgid "Show version information about this tree."
4625
msgstr ""
5512
msgstr "Show version information about this tree."
4626
5513
4627
5514
#: bzrlib/cmd_version_info.py:55
4628
5515
msgid ""
4630
5517
"source code of an application. The output can be in one of the\n"
4631
5518
"supported formats or in a custom format based on a template."
4632
5519
msgstr ""
5520
"You can use this command to add information about version into\n"
5521
"source code of an application. The output can be in one of the\n"
5522
"supported formats or in a custom format based on a template."
4633
5523
4634
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4635
#: en/help_topics/configuration.txt:710
5524
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5525
#: en/help_topics/configuration.txt:722
4636
5526
msgid "For example::"
4637
msgstr ""
5527
msgstr "For example::"
4638
5528
4639
5529
#: bzrlib/cmd_version_info.py:61
4640
5530
msgid ""
4641
5531
" bzr version-info --custom \\\n"
4642
5532
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4643
5533
msgstr ""
5534
" bzr version-info --custom \\\n"
5535
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4644
5536
4645
5537
#: bzrlib/cmd_version_info.py:64
4646
5538
msgid ""
4647
5539
"will produce a C header file with formatted string containing the\n"
4648
5540
"current revision number. Other supported variables in templates are:"
4649
5541
msgstr ""
5542
"will produce a C header file with formatted string containing the\n"
5543
"current revision number. Other supported variables in templates are:"
4650
5544
4651
5545
#: bzrlib/cmd_version_info.py:67
4652
5546
msgid ""
4658
5552
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4659
5553
" otherwise 1"
4660
5554
msgstr ""
5555
" * {date} - date of the last revision\n"
5556
" * {build_date} - current date\n"
5557
" * {revno} - revision number\n"
5558
" * {revision_id} - revision id\n"
5559
" * {branch_nick} - branch nickname\n"
5560
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5561
" otherwise 1"
4661
5562
4662
5563
#: bzrlib/cmd_version_info.py:77
4663
5564
msgid "Select the output format."
4664
msgstr ""
5565
msgstr "Select the output format."
4665
5566
4666
5567
#: bzrlib/cmd_version_info.py:81
4667
5568
msgid "Include all possible information."
4668
msgstr ""
5569
msgstr "Include all possible information."
4669
5570
4670
5571
#: bzrlib/cmd_version_info.py:82
4671
5572
msgid "Check if tree is clean."
4672
msgstr ""
5573
msgstr "Check if tree is clean."
4673
5574
4674
5575
#: bzrlib/cmd_version_info.py:84
4675
5576
msgid "Include the revision-history."
4676
msgstr ""
5577
msgstr "Include the revision-history."
4677
5578
4678
5579
#: bzrlib/cmd_version_info.py:86
4679
5580
msgid "Include the last revision for each file."
4680
msgstr ""
5581
msgstr "Include the last revision for each file."
4681
5582
4682
5583
#: bzrlib/cmd_version_info.py:87
4683
5584
msgid "Template for the output."
4684
msgstr ""
5585
msgstr "Template for the output."
4685
5586
4686
5587
#: bzrlib/cmd_version_info.py:101
4687
5588
msgid "bzr version-info --revision takes exactly one revision specifier"
4688
msgstr ""
5589
msgstr "bzr version-info --revision takes exactly one revision specifier"
4689
5590
4690
5591
#: bzrlib/commands.py:229
4691
5592
#, python-format
4692
5593
msgid "unknown command \"%s\""
4693
msgstr ""
5594
msgstr "unknown command \"%s\""
4694
5595
4695
5596
#: bzrlib/commands.py:476
4696
5597
msgid "No help for this command."
4697
msgstr ""
5598
msgstr "No help for this command."
4698
5599
4699
5600
#: bzrlib/commands.py:489
4700
5601
#, python-format
4701
5602
msgid ":Purpose: %s\n"
4702
msgstr ""
5603
msgstr ":Purpose: %s\n"
4703
5604
4704
5605
#: bzrlib/commands.py:491
4705
5606
#, python-format
4707
5608
":Usage:\n"
4708
5609
"%s\n"
4709
5610
msgstr ""
5611
":Usage:\n"
5612
"%s\n"
4710
5613
4711
5614
#: bzrlib/commands.py:493
4712
5615
#, python-format
4713
5616
msgid ":Usage: %s\n"
4714
msgstr ""
5617
msgstr ":Usage: %s\n"
4715
5618
4716
5619
#: bzrlib/commands.py:512
4717
5620
#, python-format
4718
5621
msgid ":Options:%s"
4719
msgstr ""
5622
msgstr ":Options:%s"
4720
5623
4721
5624
#: bzrlib/commands.py:523
4722
5625
#, python-format
4725
5628
" %s\n"
4726
5629
"\n"
4727
5630
msgstr ""
5631
":Description:\n"
5632
" %s\n"
5633
"\n"
4728
5634
4729
5635
#: bzrlib/commands.py:533
4730
5636
#, python-format
4732
5638
"See bzr help %s for more details and examples.\n"
4733
5639
"\n"
4734
5640
msgstr ""
5641
"See bzr help %s for more details and examples.\n"
5642
"\n"
4735
5643
4736
5644
#: bzrlib/commands.py:538
4737
5645
msgid ":Aliases: "
4738
msgstr ""
5646
msgstr ":Aliases: "
4739
5647
4740
5648
#: bzrlib/commands.py:542
4741
5649
#, python-format
4742
5650
msgid ":From: plugin \"%s\"\n"
4743
msgstr ""
5651
msgstr ":From: plugin \"%s\"\n"
4744
5652
4745
5653
#: bzrlib/commands.py:554
4746
5654
msgid ":doc:`{0} <{1}-help>`"
4747
msgstr ""
5655
msgstr ":doc:`{0} <{1}-help>`"
4748
5656
4749
5657
#: bzrlib/commands.py:558
4750
5658
#, python-format
4751
5659
msgid ":See also: %s"
4752
msgstr ""
5660
msgstr ":See also: %s"
4753
5661
4754
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5662
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4755
5663
msgid "Only ASCII permitted in option names"
4756
msgstr ""
5664
msgstr "Only ASCII permitted in option names"
4757
5665
4758
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5666
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4759
5667
msgid "command {0!r} needs one or more {1}"
4760
msgstr ""
5668
msgstr "command {0!r} needs one or more {1}"
4761
5669
4762
#: bzrlib/commands.py:858
5670
#: bzrlib/commands.py:868
4763
5671
msgid "command {0!r} requires argument {1}"
4764
msgstr ""
5672
msgstr "command {0!r} requires argument {1}"
4765
5673
4766
#: bzrlib/commands.py:865
5674
#: bzrlib/commands.py:875
4767
5675
msgid "extra argument to command {0}: {1}"
4768
msgstr ""
5676
msgstr "extra argument to command {0}: {1}"
4769
5677
4770
#: bzrlib/commands.py:962
5678
#: bzrlib/commands.py:972
4771
5679
#, python-format
4772
5680
msgid "Profile data written to \"%s\"."
4773
msgstr ""
5681
msgstr "Profile data written to \"%s\"."
4774
5682
4775
5683
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4776
5684
msgid "added"
4777
msgstr ""
5685
msgstr "added"
4778
5686
4779
5687
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4780
5688
msgid "modified"
4781
msgstr ""
5689
msgstr "modified"
4782
5690
4783
5691
#: bzrlib/commit.py:131
4784
5692
#, python-format
4785
5693
msgid "Committing%s"
4786
msgstr ""
5694
msgstr "Committing%s"
4787
5695
4788
5696
#: bzrlib/commit.py:134
4789
5697
#, python-format
4790
5698
msgid "Committed revision %d."
4791
msgstr ""
5699
msgstr "Committed revision %d."
4792
5700
4793
5701
#: bzrlib/commit.py:143
4794
5702
#, python-format
4795
5703
msgid "deleted %s"
4796
msgstr ""
5704
msgstr "deleted %s"
4797
5705
4798
5706
#: bzrlib/commit.py:146
4799
5707
#, python-format
4800
5708
msgid "missing %s"
4801
msgstr ""
5709
msgstr "missing %s"
4802
5710
4803
5711
#: bzrlib/commit.py:511
4804
5712
msgid ""
4805
5713
"Conflicting tags in bound branch:\n"
4806
5714
"{0}"
4807
5715
msgstr ""
5716
"Conflicting tags in bound branch:\n"
5717
"{0}"
4808
5718
4809
5719
#: bzrlib/commit.py:742
4810
5720
msgid "renamed"
4811
msgstr ""
5721
msgstr "renamed"
4812
5722
4813
#: bzrlib/commit.py:977
5723
#: bzrlib/commit.py:976
4814
5724
msgid "unchanged"
4815
msgstr ""
5725
msgstr "unchanged"
4816
5726
4817
#: bzrlib/commit.py:999
5727
#: bzrlib/commit.py:998
4818
5728
msgid "{0} [{1}] - Stage"
4819
msgstr ""
5729
msgstr "{0} [{1}] - Stage"
4820
5730
4821
#: bzrlib/commit.py:1002
5731
#: bzrlib/commit.py:1001
4822
5732
#, python-format
4823
5733
msgid "%s - Stage"
4824
msgstr ""
5734
msgstr "%s - Stage"
5735
5736
#: bzrlib/commit_signature_commands.py:34
5737
msgid "Sign all commits by a given committer."
5738
msgstr "Sign all commits by a given committer."
4825
5739
4826
5740
#: bzrlib/commit_signature_commands.py:36
4827
msgid "Sign all commits by a given committer."
4828
msgstr ""
4829
4830
#: bzrlib/commit_signature_commands.py:38
4831
5741
msgid ""
4832
5742
"If location is not specified the local tree is used.\n"
4833
5743
"If committer is not specified the default committer is used."
4834
5744
msgstr ""
5745
"If location is not specified the local tree is used.\n"
5746
"If committer is not specified the default committer is used."
4835
5747
4836
#: bzrlib/commit_signature_commands.py:41
5748
#: bzrlib/commit_signature_commands.py:39
4837
5749
msgid "This does not sign commits that already have signatures."
4838
msgstr ""
5750
msgstr "This does not sign commits that already have signatures."
4839
5751
4840
#: bzrlib/commit_signature_commands.py:49
5752
#: bzrlib/commit_signature_commands.py:47
4841
5753
msgid ""
4842
5754
"Don't actually sign anything, just print the revisions that would be signed."
4843
5755
msgstr ""
5756
"Don't actually sign anything, just print the revisions that would be signed."
5757
5758
#: bzrlib/commit_signature_commands.py:98
5759
#, python-format
5760
msgid "Signed %d revision.\n"
5761
msgid_plural "Signed %d revisions.\n"
5762
msgstr[0] "Signed %d revision.\n"
5763
msgstr[1] "Signed %d revisions.\n"
4844
5764
4845
5765
#: bzrlib/commit_signature_commands.py:103
4846
5766
msgid "Verify all commit signatures."
4847
msgstr ""
5767
msgstr "Verify all commit signatures."
4848
5768
4849
5769
#: bzrlib/commit_signature_commands.py:105
4850
5770
msgid ""
4851
5771
"Verifies that all commits in the branch are signed by known GnuPG keys."
4852
5772
msgstr ""
5773
"Verifies that all commits in the branch are signed by known GnuPG keys."
4853
5774
4854
5775
#: bzrlib/commit_signature_commands.py:110
4855
5776
msgid ""
4856
5777
"Comma separated list of GPG key patterns which are acceptable for "
4857
5778
"verification."
4858
5779
msgstr ""
5780
"Comma separated list of GPG key patterns which are acceptable for "
5781
"verification."
4859
5782
4860
#: bzrlib/commit_signature_commands.py:147
5783
#: bzrlib/commit_signature_commands.py:148
4861
5784
msgid "Cannot verify a range of non-revision-history revisions"
4862
msgstr ""
5785
msgstr "Cannot verify a range of non-revision-history revisions"
4863
5786
4864
#: bzrlib/commit_signature_commands.py:168
5787
#: bzrlib/commit_signature_commands.py:166
4865
5788
msgid "All commits signed with verifiable keys"
4866
msgstr ""
5789
msgstr "All commits signed with verifiable keys"
4867
5790
4868
#: bzrlib/config.py:475
5791
#: bzrlib/config.py:436
4869
5792
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4870
msgstr ""
5793
msgstr "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4871
5794
4872
#: bzrlib/config.py:2485
5795
#: bzrlib/config.py:2452
4873
5796
msgid "{0} is not an SI unit."
4874
5797
msgstr "{0} is not an SI unit."
4875
5798
4876
#: bzrlib/config.py:2949
5799
#: bzrlib/config.py:2971
4877
5800
msgid ""
4878
5801
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4879
5802
"will be saved."
4881
5804
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4882
5805
"will be saved."
4883
5806
4884
#: bzrlib/config.py:3093
5807
#: bzrlib/config.py:3116
4885
5808
#, python-format
4886
5809
msgid "Invalid '%s', should be of the form 'name=value'"
4887
msgstr ""
5810
msgstr "Invalid '%s', should be of the form 'name=value'"
4888
5811
4889
#: bzrlib/config.py:3962
5812
#: bzrlib/config.py:4018
4890
5813
msgid "Display, set or remove a configuration option."
4891
msgstr ""
5814
msgstr "Display, set or remove a configuration option."
4892
5815
4893
#: bzrlib/config.py:3964
5816
#: bzrlib/config.py:4020
4894
5817
msgid "Display the active value for a given option."
4895
msgstr ""
5818
msgstr "Display the active value for a given option."
4896
5819
4897
#: bzrlib/config.py:3966
5820
#: bzrlib/config.py:4022
4898
5821
msgid ""
4899
5822
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4900
5823
"matching options are displayed mentioning their scope. The active value\n"
4901
5824
"that bzr will take into account is the first one displayed for each option."
4902
5825
msgstr ""
5826
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5827
"matching options are displayed mentioning their scope. The active value\n"
5828
"that bzr will take into account is the first one displayed for each option."
4903
5829
4904
#: bzrlib/config.py:3970
5830
#: bzrlib/config.py:4026
4905
5831
msgid "If no NAME is given, --all .* is implied."
4906
msgstr ""
5832
msgstr "If no NAME is given, --all .* is implied."
4907
5833
4908
#: bzrlib/config.py:3972
5834
#: bzrlib/config.py:4028
4909
5835
msgid ""
4910
5836
"Setting a value is achieved by using name=value without spaces. The value\n"
4911
5837
"is set in the most relevant scope and can be checked by displaying the\n"
4912
5838
"option again."
4913
5839
msgstr ""
5840
"Setting a value is achieved by using name=value without spaces. The value\n"
5841
"is set in the most relevant scope and can be checked by displaying the\n"
5842
"option again."
4914
5843
4915
#: bzrlib/config.py:3984
5844
#: bzrlib/config.py:4040
4916
5845
msgid "Reduce the scope to the specified configuration file."
4917
msgstr ""
5846
msgstr "Reduce the scope to the specified configuration file."
4918
5847
4919
#: bzrlib/config.py:3988
5848
#: bzrlib/config.py:4044
4920
5849
msgid "Display all the defined values for the matching options."
4921
msgstr ""
5850
msgstr "Display all the defined values for the matching options."
4922
5851
4923
#: bzrlib/config.py:3990
5852
#: bzrlib/config.py:4046
4924
5853
msgid "Remove the option from the configuration file."
4925
msgstr ""
5854
msgstr "Remove the option from the configuration file."
4926
5855
4927
5856
#: bzrlib/conflicts.py:50
4928
5857
msgid "List files with conflicts."
4929
msgstr ""
5858
msgstr "List files with conflicts."
4930
5859
4931
5860
#: bzrlib/conflicts.py:57
4932
5861
msgid ""
4934
5863
"is supplied, the pathnames of files with text conflicts are listed,\n"
4935
5864
"instead. (This is useful for editing all files with text conflicts.)"
4936
5865
msgstr ""
5866
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5867
"is supplied, the pathnames of files with text conflicts are listed,\n"
5868
"instead. (This is useful for editing all files with text conflicts.)"
4937
5869
4938
5870
#: bzrlib/conflicts.py:61
4939
5871
msgid "Use bzr resolve when you have fixed a problem."
4940
msgstr ""
5872
msgstr "Use bzr resolve when you have fixed a problem."
4941
5873
4942
5874
#: bzrlib/conflicts.py:66
4943
5875
msgid "List paths of files with text conflicts."
4944
msgstr ""
5876
msgstr "List paths of files with text conflicts."
4945
5877
4946
5878
#: bzrlib/conflicts.py:85
4947
5879
msgid "Marks the conflict as resolved."
4948
msgstr ""
5880
msgstr "Marks the conflict as resolved."
4949
5881
4950
5882
#: bzrlib/conflicts.py:88
4951
5883
msgid "Resolve the conflict preserving the version in the working tree."
4952
msgstr ""
5884
msgstr "Resolve the conflict preserving the version in the working tree."
4953
5885
4954
5886
#: bzrlib/conflicts.py:91
4955
5887
msgid "Resolve the conflict taking the merged version into account."
4956
msgstr ""
5888
msgstr "Resolve the conflict taking the merged version into account."
4957
5889
4958
5890
#: bzrlib/conflicts.py:98
4959
5891
msgid "How to resolve the conflict."
4960
msgstr ""
5892
msgstr "How to resolve the conflict."
4961
5893
4962
5894
#: bzrlib/conflicts.py:104
4963
5895
msgid "Mark a conflict as resolved."
4964
msgstr ""
5896
msgstr "Mark a conflict as resolved."
4965
5897
4966
5898
#: bzrlib/conflicts.py:111
4967
5899
msgid ""
4970
5902
"as\n"
4971
5903
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4972
5904
msgstr ""
5905
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5906
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5907
"as\n"
5908
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4973
5909
4974
5910
#: bzrlib/conflicts.py:119
4975
5911
msgid "Resolve all conflicts in this tree."
4976
msgstr ""
5912
msgstr "Resolve all conflicts in this tree."
4977
5913
4978
5914
#: bzrlib/conflicts.py:126
4979
5915
msgid "If --all is specified, no FILE may be provided"
4980
msgstr ""
5916
msgstr "If --all is specified, no FILE may be provided"
4981
5917
4982
5918
#: bzrlib/conflicts.py:151
4983
5919
#, python-format
4984
5920
msgid "%d conflict auto-resolved."
4985
5921
msgid_plural "%d conflicts auto-resolved."
4986
msgstr[0] ""
4987
msgstr[1] ""
5922
msgstr[0] "%d conflict auto-resolved."
5923
msgstr[1] "%d conflicts auto-resolved."
4988
5924
4989
5925
#: bzrlib/conflicts.py:154
4990
5926
msgid "Remaining conflicts:"
4991
msgstr ""
5927
msgstr "Remaining conflicts:"
4992
5928
4993
5929
#: bzrlib/conflicts.py:159
4994
5930
msgid "All conflicts resolved."
4995
msgstr ""
5931
msgstr "All conflicts resolved."
4996
5932
4997
5933
#: bzrlib/conflicts.py:168
4998
5934
msgid "{0} conflict resolved, {1} remaining"
4999
5935
msgid_plural "{0} conflicts resolved, {1} remaining"
5000
msgstr[0] ""
5001
msgstr[1] ""
5936
msgstr[0] "{0} conflict resolved, {1} remaining"
5937
msgstr[1] "{0} conflicts resolved, {1} remaining"
5002
5938
5003
#: bzrlib/controldir.py:710
5939
#: bzrlib/controldir.py:712
5004
5940
msgid "{0} is{1} redirected to {2}"
5005
msgstr ""
5941
msgstr "{0} is{1} redirected to {2}"
5006
5942
5007
5943
#: bzrlib/diff.py:399
5008
5944
#, python-format
5009
5945
msgid "*** Ignoring files outside view. View is %s"
5010
msgstr ""
5946
msgstr "*** Ignoring files outside view. View is %s"
5011
5947
5012
5948
#: bzrlib/errors.py:157
5013
5949
msgid "The tree builder is already building a tree."
5014
msgstr ""
5950
msgstr "The tree builder is already building a tree."
5015
5951
5016
5952
#: bzrlib/errors.py:178
5017
5953
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5018
msgstr ""
5954
msgstr "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5019
5955
5020
5956
#: bzrlib/errors.py:197
5021
5957
msgid ""
5022
5958
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5023
5959
"versions \"%(minimum)s\" to \"%(current)s\"."
5024
5960
msgstr ""
5961
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5962
"versions \"%(minimum)s\" to \"%(current)s\"."
5025
5963
5026
5964
#: bzrlib/errors.py:209
5027
5965
msgid "The transport '%(transport)s' is only accessible within this process."
5028
5966
msgstr ""
5967
"The transport '%(transport)s' is only accessible within this process."
5029
5968
5030
5969
#: bzrlib/errors.py:227
5031
5970
msgid "Invalid revision number %(revno)s"
5032
msgstr ""
5971
msgstr "Invalid revision number %(revno)s"
5033
5972
5034
5973
#: bzrlib/errors.py:236
5035
5974
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5036
msgstr ""
5975
msgstr "Invalid revision-id {%(revision_id)s} in %(branch)s"
5037
5976
5038
5977
#: bzrlib/errors.py:247
5039
5978
msgid "Reserved revision-id {%(revision_id)s}"
5040
msgstr ""
5979
msgstr "Reserved revision-id {%(revision_id)s}"
5041
5980
5042
5981
#: bzrlib/errors.py:261
5043
5982
msgid "There is no public branch set for \"%(branch_url)s\"."
5044
msgstr ""
5983
msgstr "There is no public branch set for \"%(branch_url)s\"."
5045
5984
5046
5985
#: bzrlib/errors.py:271
5047
5986
msgid ""
5048
5987
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5049
5988
"obtain a list of topics."
5050
5989
msgstr ""
5990
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5991
"obtain a list of topics."
5051
5992
5052
5993
#: bzrlib/errors.py:280
5053
5994
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5054
msgstr ""
5995
msgstr "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5055
5996
5056
5997
#: bzrlib/errors.py:290
5057
5998
msgid ""
5058
5999
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5059
6000
msgstr ""
6001
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5060
6002
5061
6003
#: bzrlib/errors.py:299
5062
6004
msgid "The branch '%(branch)s' is not stacked."
5063
msgstr ""
6005
msgstr "The branch '%(branch)s' is not stacked."
5064
6006
5065
6007
#: bzrlib/errors.py:313
5066
6008
msgid "No WorkingTree exists for \"%(base)s\"."
5067
msgstr ""
6009
msgstr "No WorkingTree exists for \"%(base)s\"."
5068
6010
5069
6011
#: bzrlib/errors.py:322
5070
6012
msgid "Not currently building a tree."
5071
msgstr ""
6013
msgstr "Not currently building a tree."
5072
6014
5073
6015
#: bzrlib/errors.py:327
5074
6016
msgid "%(url)s is not a local path."
5075
msgstr ""
6017
msgstr "%(url)s is not a local path."
5076
6018
5077
6019
#: bzrlib/errors.py:355
5078
6020
msgid "%(not_locked)r is not write locked but needs to be."
5079
msgstr ""
6021
msgstr "%(not_locked)r is not write locked but needs to be."
5080
6022
5081
6023
#: bzrlib/errors.py:363
5082
6024
msgid "Error in command line options"
5083
msgstr ""
6025
msgstr "Error in command line options"
5084
6026
5085
6027
#: bzrlib/errors.py:368
5086
6028
msgid "%(value)s is not an index of type %(_type)s."
5087
msgstr ""
6029
msgstr "%(value)s is not an index of type %(_type)s."
5088
6030
5089
6031
#: bzrlib/errors.py:378
5090
6032
msgid "Error in data for index %(value)s."
5091
msgstr ""
6033
msgstr "Error in data for index %(value)s."
5092
6034
5093
6035
#: bzrlib/errors.py:387
5094
6036
msgid "The key '%(key)s' is already in index '%(index)s'."
5095
msgstr ""
6037
msgstr "The key '%(key)s' is already in index '%(index)s'."
5096
6038
5097
6039
#: bzrlib/errors.py:397
5098
6040
msgid "The key '%(key)s' is not a valid key."
5099
msgstr ""
6041
msgstr "The key '%(key)s' is not a valid key."
5100
6042
5101
6043
#: bzrlib/errors.py:406
5102
6044
msgid "Could not parse options for index %(value)s."
5103
msgstr ""
6045
msgstr "Could not parse options for index %(value)s."
5104
6046
5105
6047
#: bzrlib/errors.py:415
5106
6048
msgid "The value '%(value)s' is not a valid value."
5107
msgstr ""
6049
msgstr "The value '%(value)s' is not a valid value."
5108
6050
5109
6051
#: bzrlib/errors.py:424
5110
6052
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5111
msgstr ""
6053
msgstr "Bad value \"%(value)s\" for option \"%(name)s\"."
5112
6054
5113
6055
#: bzrlib/errors.py:443
5114
6056
msgid "Generic path error: %(path)r%(extra)s)"
5115
msgstr ""
6057
msgstr "Generic path error: %(path)r%(extra)s)"
5116
6058
5117
6059
#: bzrlib/errors.py:456
5118
6060
msgid "No such file: %(path)r%(extra)s"
5119
msgstr ""
6061
msgstr "No such file: %(path)r%(extra)s"
5120
6062
5121
6063
#: bzrlib/errors.py:461
5122
6064
msgid "File exists: %(path)r%(extra)s"
5123
msgstr ""
6065
msgstr "File exists: %(path)r%(extra)s"
5124
6066
5125
6067
#: bzrlib/errors.py:467
5126
6068
msgid ""
5127
6069
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5128
6070
"after to tell bzr about a rename that has already happened)%(extra)s"
5129
6071
msgstr ""
6072
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
6073
"after to tell bzr about a rename that has already happened)%(extra)s"
5130
6074
5131
6075
#: bzrlib/errors.py:483
5132
6076
msgid "\"%(path)s\" is not a directory %(extra)s"
5133
msgstr ""
6077
msgstr "\"%(path)s\" is not a directory %(extra)s"
5134
6078
5135
6079
#: bzrlib/errors.py:488
5136
6080
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5137
msgstr ""
6081
msgstr "\"%(path)s\" is not in the working directory %(extra)s"
5138
6082
5139
6083
#: bzrlib/errors.py:493
5140
6084
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5141
msgstr ""
6085
msgstr "Directory not empty: \"%(path)s\"%(extra)s"
5142
6086
5143
6087
#: bzrlib/errors.py:498
5144
6088
msgid "Hard-linking \"%(path)s\" is not supported"
5145
msgstr ""
6089
msgstr "Hard-linking \"%(path)s\" is not supported"
5146
6090
5147
6091
#: bzrlib/errors.py:513
5148
6092
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5149
msgstr ""
6093
msgstr "Device or resource busy: \"%(path)s\"%(extra)s"
5150
6094
5151
6095
#: bzrlib/errors.py:518
5152
6096
msgid "Permission denied: \"%(path)s\"%(extra)s"
5153
msgstr ""
6097
msgstr "Permission denied: \"%(path)s\"%(extra)s"
5154
6098
5155
6099
#: bzrlib/errors.py:523
5156
6100
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5157
msgstr ""
6101
msgstr "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5158
6102
5159
6103
#: bzrlib/errors.py:528
5160
6104
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5161
msgstr ""
6105
msgstr "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5162
6106
5163
6107
#: bzrlib/errors.py:539
5164
6108
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5165
msgstr ""
6109
msgstr "URLs differ by more than path: %(from_)r and %(to)r"
5166
6110
5167
6111
#: bzrlib/errors.py:561
5168
6112
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5169
msgstr ""
6113
msgstr "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5170
6114
5171
6115
#: bzrlib/errors.py:571
5172
6116
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5173
msgstr ""
6117
msgstr "Unsupported protocol for url \"%(path)s\"%(extra)s"
5174
6118
5175
6119
#: bzrlib/errors.py:579
5176
6120
msgid ""
5177
6121
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5178
6122
"upgrade the branch to permit branch stacking."
5179
6123
msgstr ""
6124
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
6125
"upgrade the branch to permit branch stacking."
5180
6126
5181
6127
#: bzrlib/errors.py:590
5182
6128
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5183
msgstr ""
6129
msgstr "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5184
6130
5185
6131
#: bzrlib/errors.py:600
5186
6132
msgid ""
5187
6133
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5188
6134
"need to upgrade the repository to permit branch stacking."
5189
6135
msgstr ""
6136
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
6137
"need to upgrade the repository to permit branch stacking."
5190
6138
5191
6139
#: bzrlib/errors.py:611
5192
6140
msgid "Error reading from %(path)r."
5193
msgstr ""
6141
msgstr "Error reading from %(path)r."
5194
6142
5195
6143
#: bzrlib/errors.py:630
5196
6144
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5197
msgstr ""
6145
msgstr "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5198
6146
5199
6147
#: bzrlib/errors.py:646
5200
6148
msgid "Path \"%(path)s\" is not unicode normalized"
5201
msgstr ""
6149
msgstr "Path \"%(path)s\" is not unicode normalised"
5202
6150
5203
6151
#: bzrlib/errors.py:654
5204
6152
msgid "Not a branch: \"%(path)s\"%(detail)s."
5205
msgstr ""
6153
msgstr "Not a branch: \"%(path)s\"%(detail)s."
5206
6154
5207
6155
#: bzrlib/errors.py:696
5208
6156
msgid "No submit branch available for branch \"%(path)s\""
5209
msgstr ""
6157
msgstr "No submit branch available for branch \"%(path)s\""
5210
6158
5211
6159
#: bzrlib/errors.py:705
5212
6160
msgid "A control directory already exists: \"%(path)s\"."
5213
msgstr ""
6161
msgstr "A control directory already exists: \"%(path)s\"."
5214
6162
5215
6163
#: bzrlib/errors.py:710
5216
6164
msgid "Already a branch: \"%(path)s\"."
5217
msgstr ""
6165
msgstr "Already a branch: \"%(path)s\"."
5218
6166
5219
6167
#: bzrlib/errors.py:715
6168
msgid "Invalid branch name: %(name)s"
6169
msgstr "Invalid branch name: %(name)s"
6170
6171
#: bzrlib/errors.py:724
5220
6172
msgid "Parent branch already exists: \"%(path)s\"."
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:721
5224
msgid ""
5225
"Directory contains a branch, but no working tree (use bzr checkout if you "
5226
"wish to build a working tree): \"%(path)s\""
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:726
5230
msgid ""
5231
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:736
5235
msgid ""
5236
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:746
6173
msgstr "Parent branch already exists: \"%(path)s\"."
6174
6175
#: bzrlib/errors.py:730
6176
msgid ""
6177
"Directory contains a branch, but no working tree (use bzr checkout if you "
6178
"wish to build a working tree): \"%(path)s\""
6179
msgstr ""
6180
"Directory contains a branch, but no working tree (use bzr checkout if you "
6181
"wish to build a working tree): \"%(path)s\""
6182
6183
#: bzrlib/errors.py:735
6184
msgid ""
6185
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
6186
msgstr ""
6187
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
6188
6189
#: bzrlib/errors.py:745
6190
msgid ""
6191
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
6192
msgstr ""
6193
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
6194
6195
#: bzrlib/errors.py:755
5240
6196
msgid "No repository present: \"%(path)s\""
5241
msgstr ""
6197
msgstr "No repository present: \"%(path)s\""
5242
6198
5243
#: bzrlib/errors.py:753
6199
#: bzrlib/errors.py:762
5244
6200
msgid ""
5245
6201
"Unsupported branch format: %(format)s\n"
5246
6202
"Please run 'bzr upgrade'"
5247
6203
msgstr ""
6204
"Unsupported branch format: %(format)s\n"
6205
"Please run 'bzr upgrade'"
5248
6206
5249
#: bzrlib/errors.py:759
6207
#: bzrlib/errors.py:768
5250
6208
msgid "Unknown %(kind)s format: %(format)r"
5251
msgstr ""
6209
msgstr "Unknown %(kind)s format: %(format)r"
5252
6210
5253
#: bzrlib/errors.py:768
6211
#: bzrlib/errors.py:777
5254
6212
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5255
msgstr ""
6213
msgstr "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5256
6214
5257
#: bzrlib/errors.py:778
6215
#: bzrlib/errors.py:787
5258
6216
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5259
6217
msgstr "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5260
6218
5261
#: bzrlib/errors.py:793
6219
#: bzrlib/errors.py:802
5262
6220
msgid ""
5263
6221
"%(target)s\n"
5264
6222
"is not compatible with\n"
5265
6223
"%(source)s\n"
5266
6224
"%(details)s"
5267
6225
msgstr ""
6226
"%(target)s\n"
6227
"is not compatible with\n"
6228
"%(source)s\n"
6229
"%(details)s"
5268
6230
5269
#: bzrlib/errors.py:809
6231
#: bzrlib/errors.py:818
5270
6232
msgid "Revision is not compatible with %(repo_format)s"
5271
msgstr ""
6233
msgstr "Revision is not compatible with %(repo_format)s"
5272
6234
5273
#: bzrlib/errors.py:819
6235
#: bzrlib/errors.py:828
5274
6236
msgid "%(context_info)s%(path)s is already versioned."
5275
msgstr ""
6237
msgstr "%(context_info)s%(path)s is already versioned."
5276
6238
5277
#: bzrlib/errors.py:840
6239
#: bzrlib/errors.py:849
5278
6240
msgid "%(context_info)s%(path)s is not versioned."
5279
msgstr ""
6241
msgstr "%(context_info)s%(path)s is not versioned."
5280
6242
5281
#: bzrlib/errors.py:861
6243
#: bzrlib/errors.py:870
5282
6244
msgid "Path(s) are not versioned: %(paths_as_string)s"
5283
msgstr ""
6245
msgstr "Path(s) are not versioned: %(paths_as_string)s"
5284
6246
5285
#: bzrlib/errors.py:872
6247
#: bzrlib/errors.py:881
5286
6248
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5287
msgstr ""
6249
msgstr "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5288
6250
5289
#: bzrlib/errors.py:891
6251
#: bzrlib/errors.py:900
5290
6252
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5291
msgstr ""
6253
msgstr "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5292
6254
5293
#: bzrlib/errors.py:899
6255
#: bzrlib/errors.py:908
5294
6256
msgid ""
5295
6257
"Filename %(filename)r is not valid in your current filesystem encoding "
5296
6258
"%(fs_encoding)s"
5297
6259
msgstr ""
6260
"Filename %(filename)r is not valid in your current filesystem encoding "
6261
"%(fs_encoding)s"
5298
6262
5299
#: bzrlib/errors.py:910
6263
#: bzrlib/errors.py:919
5300
6264
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5301
msgstr ""
6265
msgstr "Cannot operate on \"%(filename)s\" because it is a control file"
5302
6266
5303
#: bzrlib/errors.py:928
6267
#: bzrlib/errors.py:937
5304
6268
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5305
msgstr ""
6269
msgstr "The lock for '%(lock_description)s' is in use and cannot be broken."
5306
6270
5307
#: bzrlib/errors.py:967
6271
#: bzrlib/errors.py:976
5308
6272
msgid "Cannot lock %(lock)s: %(why)s"
5309
msgstr ""
6273
msgstr "Cannot lock %(lock)s: %(why)s"
5310
6274
5311
#: bzrlib/errors.py:977
6275
#: bzrlib/errors.py:986
5312
6276
msgid ""
5313
6277
"A transaction related operation was attempted after the transaction finished."
5314
6278
msgstr ""
6279
"A transaction related operation was attempted after the transaction finished."
5315
6280
5316
#: bzrlib/errors.py:1004
6281
#: bzrlib/errors.py:1013
5317
6282
msgid "Cannot lock: transport is read only: %(transport)s"
5318
msgstr ""
6283
msgstr "Cannot lock: transport is read only: %(transport)s"
5319
6284
5320
#: bzrlib/errors.py:1012
6285
#: bzrlib/errors.py:1021
5321
6286
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1023
5325
msgid ""
5326
"Lock was broken while still open: %(lock)s - check storage consistency!"
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1034
5330
msgid ""
5331
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5332
"%(holder)r, wanted to break %(target)r"
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:1046
5336
msgid ""
5337
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5338
"Use 'bzr break-lock' to clear it"
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:1059
6287
msgstr "Could not acquire lock \"%(lock)s\": %(msg)s"
6288
6289
#: bzrlib/errors.py:1032
6290
msgid ""
6291
"Lock was broken while still open: %(lock)s - check storage consistency!"
6292
msgstr ""
6293
"Lock was broken while still open: %(lock)s - check storage consistency!"
6294
6295
#: bzrlib/errors.py:1043
6296
msgid ""
6297
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6298
"%(holder)r, wanted to break %(target)r"
6299
msgstr ""
6300
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6301
"%(holder)r, wanted to break %(target)r"
6302
6303
#: bzrlib/errors.py:1055
6304
msgid ""
6305
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6306
"Use 'bzr break-lock' to clear it"
6307
msgstr ""
6308
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6309
"Use 'bzr break-lock' to clear it"
6310
6311
#: bzrlib/errors.py:1068
5342
6312
msgid "Lock not held: %(lock)s"
5343
msgstr ""
6313
msgstr "Lock not held: %(lock)s"
5344
6314
5345
#: bzrlib/errors.py:1088
6315
#: bzrlib/errors.py:1097
5346
6316
msgid "No changes to commit"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1093
5350
msgid ""
5351
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1103
5355
msgid ""
5356
"Excluding paths during commit is not supported by repository at "
5357
"%(repository)r."
5358
msgstr ""
6317
msgstr "No changes to commit"
6318
6319
#: bzrlib/errors.py:1102
6320
msgid ""
6321
"Selected-file commit of merges is not supported yet: files %(files_str)s"
6322
msgstr ""
6323
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5359
6324
5360
6325
#: bzrlib/errors.py:1112
5361
6326
msgid ""
5362
"The specified commit message contains characters unsupported by the current "
5363
"encoding."
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1118
6327
"Excluding paths during commit is not supported by repository at "
6328
"%(repository)r."
6329
msgstr ""
6330
"Excluding paths during commit is not supported by repository at "
6331
"%(repository)r."
6332
6333
#: bzrlib/errors.py:1121
6334
msgid ""
6335
"The specified commit message contains characters unsupported by the current "
6336
"encoding."
6337
msgstr ""
6338
"The specified commit message contains characters unsupported by the current "
6339
"encoding."
6340
6341
#: bzrlib/errors.py:1127
5367
6342
msgid "Upgrade URL cannot work with readonly URLs."
5368
msgstr ""
6343
msgstr "Upgrade URL cannot work with readonly URLs."
5369
6344
5370
#: bzrlib/errors.py:1123
6345
#: bzrlib/errors.py:1132
5371
6346
msgid "The branch format %(format)s is already at the most recent format."
5372
msgstr ""
6347
msgstr "The branch format %(format)s is already at the most recent format."
5373
6348
5374
#: bzrlib/errors.py:1146
6349
#: bzrlib/errors.py:1155
5375
6350
msgid "Option --change does not accept revision ranges"
5376
msgstr ""
6351
msgstr "Option --change does not accept revision ranges"
5377
6352
5378
#: bzrlib/errors.py:1151
6353
#: bzrlib/errors.py:1160
5379
6354
msgid "No namespace registered for string: %(spec)r"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1170
5383
msgid ""
5384
"Requested revision: '%(spec)s' does not exist in branch: "
5385
"%(branch_url)s%(extra)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1184
5389
msgid ""
5390
"Operation denied because it would change the main history, which is not "
5391
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1195
5395
msgid ""
5396
"These branches have diverged. Use the missing command to see how.\n"
5397
"Use the merge command to reconcile them."
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1215
5401
msgid ""
5402
"Branches have no common ancestor, and no merge base revision was specified."
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1221
5406
msgid ""
5407
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:1227
6355
msgstr "No namespace registered for string: %(spec)r"
6356
6357
#: bzrlib/errors.py:1179
6358
msgid ""
6359
"Requested revision: '%(spec)s' does not exist in branch: "
6360
"%(branch_url)s%(extra)s"
6361
msgstr ""
6362
"Requested revision: '%(spec)s' does not exist in branch: "
6363
"%(branch_url)s%(extra)s"
6364
6365
#: bzrlib/errors.py:1193
6366
msgid ""
6367
"Operation denied because it would change the main history, which is not "
6368
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
6369
msgstr ""
6370
"Operation denied because it would change the main history, which is not "
6371
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
6372
6373
#: bzrlib/errors.py:1204
6374
msgid ""
6375
"These branches have diverged. Use the missing command to see how.\n"
6376
"Use the merge command to reconcile them."
6377
msgstr ""
6378
"These branches have diverged. Use the missing command to see how.\n"
6379
"Use the merge command to reconcile them."
6380
6381
#: bzrlib/errors.py:1224
6382
msgid ""
6383
"Branches have no common ancestor, and no merge base revision was specified."
6384
msgstr ""
6385
"Branches have no common ancestor, and no merge base revision was specified."
6386
6387
#: bzrlib/errors.py:1230
6388
msgid ""
6389
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
6390
msgstr ""
6391
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
6392
6393
#: bzrlib/errors.py:1236
5411
6394
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5412
msgstr ""
5413
5414
#: bzrlib/errors.py:1236
5415
msgid ""
5416
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5417
msgstr ""
6395
msgstr "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5418
6396
5419
6397
#: bzrlib/errors.py:1245
6398
msgid ""
6399
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
6400
msgstr ""
6401
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
6402
6403
#: bzrlib/errors.py:1254
5420
6404
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5421
msgstr ""
6405
msgstr "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5422
6406
5423
#: bzrlib/errors.py:1254
6407
#: bzrlib/errors.py:1263
5424
6408
msgid "Branch %(branch)s has no commits."
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:1272
5428
msgid ""
5429
"Bound branch %(branch)s is out of date with master branch "
5430
"%(master)s.%(extra_help)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1284
5434
msgid ""
5435
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5436
"bound to %(remote)s."
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:1296
6409
msgstr "Branch %(branch)s has no commits."
6410
6411
#: bzrlib/errors.py:1281
6412
msgid ""
6413
"Bound branch %(branch)s is out of date with master branch "
6414
"%(master)s.%(extra_help)s"
6415
msgstr ""
6416
"Bound branch %(branch)s is out of date with master branch "
6417
"%(master)s.%(extra_help)s"
6418
6419
#: bzrlib/errors.py:1293
6420
msgid ""
6421
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6422
"bound to %(remote)s."
6423
msgstr ""
6424
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6425
"bound to %(remote)s."
6426
6427
#: bzrlib/errors.py:1305
5440
6428
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5441
msgstr ""
6429
msgstr "Cannot pull --overwrite to a branch which is bound %(branch)s"
5442
6430
5443
#: bzrlib/errors.py:1305
6431
#: bzrlib/errors.py:1314
5444
6432
msgid ""
5445
6433
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5446
6434
"%(error)s"
5447
6435
msgstr ""
6436
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6437
"%(error)s"
5448
6438
5449
#: bzrlib/errors.py:1317
6439
#: bzrlib/errors.py:1326
5450
6440
msgid "Error in processing weave: %(msg)s"
5451
msgstr ""
6441
msgstr "Error in processing weave: %(msg)s"
5452
6442
5453
#: bzrlib/errors.py:1326
6443
#: bzrlib/errors.py:1335
5454
6444
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5455
msgstr ""
6445
msgstr "Revision {%(revision_id)s} already present in %(weave)s"
5456
6446
5457
#: bzrlib/errors.py:1337
6447
#: bzrlib/errors.py:1346
5458
6448
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5459
msgstr ""
6449
msgstr "Revision {%(revision_id)s} not present in %(weave)s"
5460
6450
5461
#: bzrlib/errors.py:1347
6451
#: bzrlib/errors.py:1356
5462
6452
msgid "Weave invariant violated: %(what)s"
5463
msgstr ""
6453
msgstr "Weave invariant violated: %(what)s"
5464
6454
5465
#: bzrlib/errors.py:1356
6455
#: bzrlib/errors.py:1365
5466
6456
msgid "Parents are mismatched between two revisions. %(msg)s"
5467
msgstr ""
6457
msgstr "Parents are mismatched between two revisions. %(msg)s"
5468
6458
5469
#: bzrlib/errors.py:1378
6459
#: bzrlib/errors.py:1387
5470
6460
msgid ""
5471
6461
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5472
6462
"%(weave_b)s"
5473
6463
msgstr ""
6464
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
6465
"%(weave_b)s"
5474
6466
5475
#: bzrlib/errors.py:1390
6467
#: bzrlib/errors.py:1399
5476
6468
msgid "Versioned file error"
5477
msgstr ""
6469
msgstr "Versioned file error"
5478
6470
5479
#: bzrlib/errors.py:1395
6471
#: bzrlib/errors.py:1404
5480
6472
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5481
msgstr ""
6473
msgstr "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5482
6474
5483
#: bzrlib/errors.py:1405
6475
#: bzrlib/errors.py:1414
5484
6476
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5485
msgstr ""
6477
msgstr "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5486
6478
5487
#: bzrlib/errors.py:1415
6479
#: bzrlib/errors.py:1424
5488
6480
msgid "Text did not match its checksum: %(msg)s"
5489
msgstr ""
6481
msgstr "Text did not match its checksum: %(msg)s"
5490
6482
5491
#: bzrlib/errors.py:1541
6483
#: bzrlib/errors.py:1550
5492
6484
msgid "Export format %(format)r not supported"
5493
msgstr ""
6485
msgstr "Export format %(format)r not supported"
5494
6486
5495
#: bzrlib/errors.py:1550
6487
#: bzrlib/errors.py:1559
5496
6488
msgid "Transport error: %(msg)s %(orig_error)s"
5497
msgstr ""
6489
msgstr "Transport error: %(msg)s %(orig_error)s"
5498
6490
5499
#: bzrlib/errors.py:1576
6491
#: bzrlib/errors.py:1585
5500
6492
msgid "Generic bzr smart protocol error: %(details)s"
5501
msgstr ""
6493
msgstr "Generic bzr smart protocol error: %(details)s"
5502
6494
5503
#: bzrlib/errors.py:1584
6495
#: bzrlib/errors.py:1593
5504
6496
msgid "Received bad protocol version marker: %(marker)r"
5505
msgstr ""
6497
msgstr "Received bad protocol version marker: %(marker)r"
5506
6498
5507
#: bzrlib/errors.py:1616
6499
#: bzrlib/errors.py:1625
5508
6500
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5509
msgstr ""
6501
msgstr "Transport operation not possible: %(msg)s %(orig_error)s"
5510
6502
5511
#: bzrlib/errors.py:1621
6503
#: bzrlib/errors.py:1630
5512
6504
msgid "Connection error: %(msg)s %(orig_error)s"
5513
msgstr ""
6505
msgstr "Connection error: %(msg)s %(orig_error)s"
5514
6506
5515
#: bzrlib/errors.py:1626
6507
#: bzrlib/errors.py:1635
5516
6508
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5517
msgstr ""
6509
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5518
6510
5519
#: bzrlib/errors.py:1647
6511
#: bzrlib/errors.py:1656
5520
6512
msgid "Connection closed: %(msg)s %(orig_error)s"
5521
msgstr ""
6513
msgstr "Connection closed: %(msg)s %(orig_error)s"
5522
6514
5523
#: bzrlib/errors.py:1652
6515
#: bzrlib/errors.py:1661
5524
6516
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5525
msgstr ""
6517
msgstr "Connection Timeout: %(msg)s%(orig_error)s"
5526
6518
5527
#: bzrlib/errors.py:1657
6519
#: bzrlib/errors.py:1666
5528
6520
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5529
msgstr ""
6521
msgstr "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5530
6522
5531
#: bzrlib/errors.py:1667
6523
#: bzrlib/errors.py:1676
5532
6524
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5533
msgstr ""
6525
msgstr "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5534
6526
5535
#: bzrlib/errors.py:1682
6527
#: bzrlib/errors.py:1691
5536
6528
msgid "Certificate error: %(error)s"
5537
msgstr ""
6529
msgstr "Certificate error: %(error)s"
5538
6530
5539
#: bzrlib/errors.py:1690
6531
#: bzrlib/errors.py:1699
5540
6532
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5541
msgstr ""
6533
msgstr "Invalid http range %(range)r for %(path)s: %(msg)s"
5542
6534
5543
#: bzrlib/errors.py:1704
6535
#: bzrlib/errors.py:1713
5544
6536
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5545
msgstr ""
6537
msgstr "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5546
6538
5547
#: bzrlib/errors.py:1712
6539
#: bzrlib/errors.py:1721
5548
6540
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5549
msgstr ""
6541
msgstr "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5550
6542
5551
#: bzrlib/errors.py:1721
6543
#: bzrlib/errors.py:1730
5552
6544
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5553
msgstr ""
6545
msgstr "%(source)s is%(permanently)s redirected to %(target)s"
5554
6546
5555
#: bzrlib/errors.py:1735
6547
#: bzrlib/errors.py:1744
5556
6548
msgid "Too many redirections"
5557
msgstr ""
6549
msgstr "Too many redirections"
5558
6550
5559
#: bzrlib/errors.py:1740
6551
#: bzrlib/errors.py:1749
5560
6552
msgid "Working tree has conflicts."
5561
msgstr ""
6553
msgstr "Working tree has conflicts."
5562
6554
5563
#: bzrlib/errors.py:1744
6555
#: bzrlib/errors.py:1753
5564
6556
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:1753
5568
msgid ""
5569
"Error(s) parsing config file %(filename)s:\n"
5570
"%(errors)s"
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:1763
5574
msgid ""
5575
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5576
"See ``bzr help %(name)s``"
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:1773
6557
msgstr "Config file %(filename)s is not UTF-8 encoded\n"
6558
6559
#: bzrlib/errors.py:1762
6560
msgid ""
6561
"Error(s) parsing config file %(filename)s:\n"
6562
"%(errors)s"
6563
msgstr ""
6564
"Error(s) parsing config file %(filename)s:\n"
6565
"%(errors)s"
6566
6567
#: bzrlib/errors.py:1772
6568
msgid ""
6569
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6570
"See ``bzr help %(name)s``"
6571
msgstr ""
6572
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6573
"See ``bzr help %(name)s``"
6574
6575
#: bzrlib/errors.py:1782
5580
6576
msgid "%(username)r does not seem to contain a reasonable email address"
5581
msgstr ""
6577
msgstr "%(username)r does not seem to contain a reasonable email address"
5582
6578
5583
#: bzrlib/errors.py:1782
6579
#: bzrlib/errors.py:1791
5584
6580
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5585
msgstr ""
6581
msgstr "Failed to GPG sign data with command \"%(command_line)s\""
5586
6582
5587
#: bzrlib/errors.py:1790
6583
#: bzrlib/errors.py:1799
5588
6584
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5589
msgstr ""
6585
msgstr "Failed to verify GPG signature data with error \"%(error)s\""
5590
6586
5591
#: bzrlib/errors.py:1798
6587
#: bzrlib/errors.py:1807
5592
6588
msgid "Unable to import library \"%(library)s\": %(error)s"
5593
msgstr ""
6589
msgstr "Unable to import library \"%(library)s\": %(error)s"
5594
6590
5595
#: bzrlib/errors.py:1806
6591
#: bzrlib/errors.py:1815
5596
6592
msgid "python-gpgme is not installed, it is needed to verify signatures"
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:1814
5600
msgid ""
5601
"The working tree for %(basedir)s has changed since the last commit, but "
5602
"weave merge requires that it be unchanged"
5603
msgstr ""
5604
5605
#: bzrlib/errors.py:1824
5606
msgid ""
5607
"Can't reprocess and show base, because reprocessing obscures the "
5608
"relationship of conflicting lines to the base"
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:1830
6593
msgstr "python-gpgme is not installed, it is needed to verify signatures"
6594
6595
#: bzrlib/errors.py:1823
6596
msgid ""
6597
"The working tree for %(basedir)s has changed since the last commit, but "
6598
"weave merge requires that it be unchanged"
6599
msgstr ""
6600
"The working tree for %(basedir)s has changed since the last commit, but "
6601
"weave merge requires that it be unchanged"
6602
6603
#: bzrlib/errors.py:1833
6604
msgid ""
6605
"Can't reprocess and show base, because reprocessing obscures the "
6606
"relationship of conflicting lines to the base"
6607
msgstr ""
6608
"Can't reprocess and show base, because reprocessing obscures the "
6609
"relationship of conflicting lines to the base"
6610
6611
#: bzrlib/errors.py:1839
5612
6612
msgid "Cycle in graph %(graph)r"
5613
msgstr ""
6613
msgstr "Cycle in graph %(graph)r"
5614
6614
5615
#: bzrlib/errors.py:1858
6615
#: bzrlib/errors.py:1867
5616
6616
msgid "File %(filename)s is not conflicted."
5617
msgstr ""
6617
msgstr "File %(filename)s is not conflicted."
5618
6618
5619
#: bzrlib/errors.py:1880
6619
#: bzrlib/errors.py:1889
5620
6620
msgid "No bundle was found in \"%(filename)s\"."
5621
msgstr ""
6621
msgstr "No bundle was found in \"%(filename)s\"."
5622
6622
5623
#: bzrlib/errors.py:1889
6623
#: bzrlib/errors.py:1898
5624
6624
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5625
msgstr ""
6625
msgstr "Unable to handle bundle version %(version)s: %(msg)s"
5626
6626
5627
#: bzrlib/errors.py:1899
6627
#: bzrlib/errors.py:1908
5628
6628
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5629
msgstr ""
6629
msgstr "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5630
6630
5631
#: bzrlib/errors.py:1912
6631
#: bzrlib/errors.py:1921
5632
6632
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5633
msgstr ""
6633
msgstr "File id {%(file_id)s} already exists in inventory as %(entry)s"
5634
6634
5635
#: bzrlib/errors.py:1922
6635
#: bzrlib/errors.py:1931
5636
6636
msgid "Key %(key)s is already present in map"
5637
msgstr ""
6637
msgstr "Key %(key)s is already present in map"
5638
6638
5639
#: bzrlib/errors.py:1927
6639
#: bzrlib/errors.py:1936
5640
6640
msgid "The prefix %(prefix)s is in the help search path twice."
5641
msgstr ""
6641
msgstr "The prefix %(prefix)s is in the help search path twice."
5642
6642
5643
#: bzrlib/errors.py:1937
6643
#: bzrlib/errors.py:1946
5644
6644
msgid ""
5645
6645
"No final name for trans_id %(trans_id)r\n"
5646
6646
"file-id: %(file_id)r\n"
5647
6647
"root trans-id: %(root_trans_id)r\n"
5648
6648
msgstr ""
6649
"No final name for trans_id %(trans_id)r\n"
6650
"file-id: %(file_id)r\n"
6651
"root trans-id: %(root_trans_id)r\n"
5649
6652
5650
#: bzrlib/errors.py:1969
6653
#: bzrlib/errors.py:1978
5651
6654
msgid "Attempt to reuse a transform that has already been applied."
5652
msgstr ""
6655
msgstr "Attempt to reuse a transform that has already been applied."
5653
6656
5654
#: bzrlib/errors.py:1974
6657
#: bzrlib/errors.py:1983
5655
6658
msgid "Moving the root directory is not supported at this time"
5656
msgstr ""
6659
msgstr "Moving the root directory is not supported at this time"
5657
6660
5658
#: bzrlib/errors.py:1979
6661
#: bzrlib/errors.py:1988
5659
6662
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:1990
5663
msgid ""
5664
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2026
5668
msgid ""
5669
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:2056
6663
msgstr "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6664
6665
#: bzrlib/errors.py:1999
6666
msgid ""
6667
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6668
msgstr ""
6669
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6670
6671
#: bzrlib/errors.py:2035
6672
msgid ""
6673
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6674
msgstr ""
6675
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6676
6677
#: bzrlib/errors.py:2065
5673
6678
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5674
msgstr ""
6679
msgstr "Unable to import paramiko (required for sftp support): %(error)s"
5675
6680
5676
#: bzrlib/errors.py:2064
6681
#: bzrlib/errors.py:2073
5677
6682
msgid "Nothing to merge."
5678
msgstr ""
6683
msgstr "Nothing to merge."
5679
6684
5680
#: bzrlib/errors.py:2069
6685
#: bzrlib/errors.py:2078
5681
6686
msgid "Format %(format)s cannot be initialised by this version of bzr."
5682
msgstr ""
6687
msgstr "Format %(format)s cannot be initialised by this version of bzr."
5683
6688
5684
#: bzrlib/errors.py:2078
6689
#: bzrlib/errors.py:2087
5685
6690
msgid ""
5686
6691
"Cannot convert from format %(from_format)s to format %(format)s. "
5687
6692
"%(problem)s"
5688
6693
msgstr ""
6694
"Cannot convert from format %(from_format)s to format %(format)s. "
6695
"%(problem)s"
5689
6696
5690
#: bzrlib/errors.py:2090
6697
#: bzrlib/errors.py:2099
5691
6698
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5692
msgstr ""
6699
msgstr "Could not find an appropriate Differ for file \"%(path)s\""
5693
6700
5694
#: bzrlib/errors.py:2098
6701
#: bzrlib/errors.py:2107
5695
6702
msgid "%(exe_name)s could not be found on this machine"
5696
msgstr ""
6703
msgstr "%(exe_name)s could not be found on this machine"
5697
6704
5698
#: bzrlib/errors.py:2106
6705
#: bzrlib/errors.py:2115
5699
6706
msgid "Diff is not installed on this machine: %(msg)s"
5700
msgstr ""
6707
msgstr "Diff is not installed on this machine: %(msg)s"
5701
6708
5702
#: bzrlib/errors.py:2114
6709
#: bzrlib/errors.py:2123
5703
6710
msgid "Diff3 is not installed on this machine."
5704
msgstr ""
6711
msgstr "Diff3 is not installed on this machine."
5705
6712
5706
#: bzrlib/errors.py:2120
6713
#: bzrlib/errors.py:2129
5707
6714
msgid "The content being inserted is already present."
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:2125
5711
msgid ""
5712
"This tree contains left-over files from a failed operation.\n"
5713
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5714
"to\n"
5715
" keep, and delete it when you are done."
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:2136
5719
msgid ""
5720
"This tree contains left-over files from a failed operation.\n"
5721
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5722
" wish to keep, and delete it when you are done."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2146
5726
msgid ""
5727
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5728
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5729
"to\n"
5730
" keep, and delete it when you are done."
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2157
5734
msgid ""
5735
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5736
"examine %(pending_deletion)s to see if it contains any files you wish to "
5737
"keep, and delete it when you are done."
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2167
6715
msgstr "The content being inserted is already present."
6716
6717
#: bzrlib/errors.py:2134
6718
msgid ""
6719
"This tree contains left-over files from a failed operation.\n"
6720
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6721
"to\n"
6722
" keep, and delete it when you are done."
6723
msgstr ""
6724
"This tree contains left-over files from a failed operation.\n"
6725
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6726
"to\n"
6727
" keep, and delete it when you are done."
6728
6729
#: bzrlib/errors.py:2145
6730
msgid ""
6731
"This tree contains left-over files from a failed operation.\n"
6732
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6733
" wish to keep, and delete it when you are done."
6734
msgstr ""
6735
"This tree contains left-over files from a failed operation.\n"
6736
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6737
" wish to keep, and delete it when you are done."
6738
6739
#: bzrlib/errors.py:2155
6740
msgid ""
6741
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6742
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6743
"to\n"
6744
" keep, and delete it when you are done."
6745
msgstr ""
6746
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6747
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6748
"to\n"
6749
" keep, and delete it when you are done."
6750
6751
#: bzrlib/errors.py:2166
6752
msgid ""
6753
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6754
"examine %(pending_deletion)s to see if it contains any files you wish to "
6755
"keep, and delete it when you are done."
6756
msgstr ""
6757
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6758
"examine %(pending_deletion)s to see if it contains any files you wish to "
6759
"keep, and delete it when you are done."
6760
6761
#: bzrlib/errors.py:2176
5741
6762
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5742
msgstr ""
6763
msgstr "Working tree is out of date, please run 'bzr update'.%(more)s"
5743
6764
5744
#: bzrlib/errors.py:2181
6765
#: bzrlib/errors.py:2190
5745
6766
msgid ""
5746
6767
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5747
6768
msgstr ""
6769
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5748
6770
5749
#: bzrlib/errors.py:2194
6771
#: bzrlib/errors.py:2203
5750
6772
msgid "Error in merge modified format"
5751
msgstr ""
6773
msgstr "Error in merge modified format"
5752
6774
5753
#: bzrlib/errors.py:2199
6775
#: bzrlib/errors.py:2208
5754
6776
msgid "Format error in conflict listings"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2203
5758
msgid ""
5759
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5760
"Error: %(description)s"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2214
5764
msgid ""
5765
"An error has been detected in the repository %(repo_path)s.\n"
5766
"Please run bzr reconcile on this repository."
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2225
5770
msgid ""
5771
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5772
"reason: %(reason)s"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2238
5776
msgid ""
5777
"An inconsistent delta was supplied: %(delta)r\n"
5778
"reason: %(reason)s"
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2250
6777
msgstr "Format error in conflict listings"
6778
6779
#: bzrlib/errors.py:2212
6780
msgid ""
6781
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6782
"Error: %(description)s"
6783
msgstr ""
6784
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6785
"Error: %(description)s"
6786
6787
#: bzrlib/errors.py:2223
6788
msgid ""
6789
"An error has been detected in the repository %(repo_path)s.\n"
6790
"Please run bzr reconcile on this repository."
6791
msgstr ""
6792
"An error has been detected in the repository %(repo_path)s.\n"
6793
"Please run bzr reconcile on this repository."
6794
6795
#: bzrlib/errors.py:2234
6796
msgid ""
6797
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6798
"reason: %(reason)s"
6799
msgstr ""
6800
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6801
"reason: %(reason)s"
6802
6803
#: bzrlib/errors.py:2247
6804
msgid ""
6805
"An inconsistent delta was supplied: %(delta)r\n"
6806
"reason: %(reason)s"
6807
msgstr ""
6808
"An inconsistent delta was supplied: %(delta)r\n"
6809
"reason: %(reason)s"
6810
6811
#: bzrlib/errors.py:2259
5782
6812
msgid "To use this feature you must upgrade your branch at %(path)s."
5783
msgstr ""
6813
msgstr "To use this feature you must upgrade your branch at %(path)s."
5784
6814
5785
#: bzrlib/errors.py:2259
6815
#: bzrlib/errors.py:2268
5786
6816
msgid "To use this feature you must upgrade your repository at %(path)s."
5787
msgstr ""
6817
msgstr "To use this feature you must upgrade your repository at %(path)s."
5788
6818
5789
#: bzrlib/errors.py:2264
6819
#: bzrlib/errors.py:2273
5790
6820
msgid ""
5791
6821
"To use this feature you must upgrade your branch at %(path)s to a format "
5792
6822
"which supports rich roots."
5793
6823
msgstr ""
6824
"To use this feature you must upgrade your branch at %(path)s to a format "
6825
"which supports rich roots."
5794
6826
5795
#: bzrlib/errors.py:2270
6827
#: bzrlib/errors.py:2279
5796
6828
msgid "Cannot perform local-only commits on unbound branches."
5797
msgstr ""
6829
msgstr "Cannot perform local-only commits on unbound branches."
5798
6830
5799
#: bzrlib/errors.py:2275
6831
#: bzrlib/errors.py:2284
5800
6832
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5801
msgstr ""
6833
msgstr "The method %(mname)s is not supported on objects of type %(tname)s."
5802
6834
5803
#: bzrlib/errors.py:2296
6835
#: bzrlib/errors.py:2305
5804
6836
msgid "Ghost tags not supported by format %(format)r."
5805
msgstr ""
6837
msgstr "Ghost tags not supported by format %(format)r."
5806
6838
5807
#: bzrlib/errors.py:2304
6839
#: bzrlib/errors.py:2313
5808
6840
msgid "File is binary but should be text."
5809
msgstr ""
6841
msgstr "File is binary but should be text."
5810
6842
5811
#: bzrlib/errors.py:2309
6843
#: bzrlib/errors.py:2318
5812
6844
msgid "The path %(path)s is not permitted on this platform"
5813
msgstr ""
6845
msgstr "The path %(path)s is not permitted on this platform"
5814
6846
5815
#: bzrlib/errors.py:2318
6847
#: bzrlib/errors.py:2327
5816
6848
msgid ""
5817
6849
"Testament did not match expected value.\n"
5818
6850
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5819
6851
" {%(measured)s}"
5820
6852
msgstr ""
6853
"Testament did not match expected value.\n"
6854
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6855
" {%(measured)s}"
5821
6856
5822
#: bzrlib/errors.py:2330
6857
#: bzrlib/errors.py:2339
5823
6858
msgid "Not a bzr revision-bundle: %(text)r"
5824
msgstr ""
6859
msgstr "Not a bzr revision-bundle: %(text)r"
5825
6860
5826
#: bzrlib/errors.py:2339
6861
#: bzrlib/errors.py:2348
5827
6862
msgid "Bad bzr revision-bundle: %(text)r"
5828
msgstr ""
6863
msgstr "Bad bzr revision-bundle: %(text)r"
5829
6864
5830
#: bzrlib/errors.py:2348
6865
#: bzrlib/errors.py:2357
5831
6866
msgid "Malformed bzr revision-bundle header: %(text)r"
5832
msgstr ""
6867
msgstr "Malformed bzr revision-bundle header: %(text)r"
5833
6868
5834
#: bzrlib/errors.py:2353
6869
#: bzrlib/errors.py:2362
5835
6870
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5836
msgstr ""
6871
msgstr "Malformed patches in bzr revision-bundle: %(text)r"
5837
6872
5838
#: bzrlib/errors.py:2358
6873
#: bzrlib/errors.py:2367
5839
6874
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5840
msgstr ""
6875
msgstr "Malformed footer in bzr revision-bundle: %(text)r"
5841
6876
5842
#: bzrlib/errors.py:2363
6877
#: bzrlib/errors.py:2372
5843
6878
msgid "End of line marker was not \\n in bzr revision-bundle"
5844
msgstr ""
6879
msgstr "End of line marker was not \\n in bzr revision-bundle"
5845
6880
5846
#: bzrlib/errors.py:2373
6881
#: bzrlib/errors.py:2382
5847
6882
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5848
msgstr ""
6883
msgstr "Bundle format %(bundle_format)s is incompatible with %(other)s"
5849
6884
5850
#: bzrlib/errors.py:2383
6885
#: bzrlib/errors.py:2392
5851
6886
msgid "Root class for inventory serialization errors"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2387
5855
msgid ""
5856
"The inventory was not in the expected format:\n"
5857
" %(msg)s"
5858
msgstr ""
6887
msgstr "Root class for inventory serialisation errors"
5859
6888
5860
6889
#: bzrlib/errors.py:2396
6890
msgid ""
6891
"The inventory was not in the expected format:\n"
6892
" %(msg)s"
6893
msgstr ""
6894
"The inventory was not in the expected format:\n"
6895
" %(msg)s"
6896
6897
#: bzrlib/errors.py:2405
5861
6898
msgid "This operation requires rich root data storage"
5862
msgstr ""
6899
msgstr "This operation requires rich root data storage"
5863
6900
5864
#: bzrlib/errors.py:2409
6901
#: bzrlib/errors.py:2418
5865
6902
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2418
5869
msgid ""
5870
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5871
"variable."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2425
5875
msgid ""
5876
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5877
"ghost at {%(ghost_revision_id)s}"
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2435
6903
msgstr "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6904
6905
#: bzrlib/errors.py:2427
6906
msgid ""
6907
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6908
"variable."
6909
msgstr ""
6910
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6911
"variable."
6912
6913
#: bzrlib/errors.py:2434
6914
msgid ""
6915
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6916
"ghost at {%(ghost_revision_id)s}"
6917
msgstr ""
6918
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6919
"ghost at {%(ghost_revision_id)s}"
6920
6921
#: bzrlib/errors.py:2444
5881
6922
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5882
msgstr ""
6923
msgstr "Ghost revision {%(revision_id)s} cannot be used here."
5883
6924
5884
#: bzrlib/errors.py:2486
6925
#: bzrlib/errors.py:2495
5885
6926
msgid ""
5886
6927
"A merge directive must provide either a bundle or a public branch location."
5887
6928
msgstr ""
6929
"A merge directive must provide either a bundle or a public branch location."
5888
6930
5889
#: bzrlib/errors.py:2493
6931
#: bzrlib/errors.py:2502
5890
6932
msgid "Bad merge directive payload %(start)r"
5891
msgstr ""
6933
msgstr "Bad merge directive payload %(start)r"
5892
6934
5893
#: bzrlib/errors.py:2503
6935
#: bzrlib/errors.py:2512
5894
6936
msgid "Preview patch does not match requested changes."
5895
msgstr ""
6937
msgstr "Preview patch does not match requested changes."
5896
6938
5897
#: bzrlib/errors.py:2509
6939
#: bzrlib/errors.py:2518
5898
6940
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5899
msgstr ""
6941
msgstr "Patch_type was %(patch_type)s, but no patch was supplied."
5900
6942
5901
#: bzrlib/errors.py:2519
6943
#: bzrlib/errors.py:2528
5902
6944
msgid ""
5903
6945
"Your branch does not have all of the revisions required in order to merge "
5904
6946
"this merge directive and the target location specified in the merge "
5905
6947
"directive is not a branch: %(location)s."
5906
6948
msgstr ""
6949
"Your branch does not have all of the revisions required in order to merge "
6950
"this merge directive and the target location specified in the merge "
6951
"directive is not a branch: %(location)s."
5907
6952
5908
#: bzrlib/errors.py:2531
6953
#: bzrlib/errors.py:2540
5909
6954
msgid "Unsupported entry kind %(kind)s"
5910
msgstr ""
6955
msgstr "Unsupported entry kind %(kind)s"
5911
6956
5912
#: bzrlib/errors.py:2539
6957
#: bzrlib/errors.py:2548
5913
6958
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5914
msgstr ""
6959
msgstr "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5915
6960
5916
#: bzrlib/errors.py:2549
6961
#: bzrlib/errors.py:2558
5917
6962
msgid "Subsume target %(other_tree)s needs to be upgraded."
5918
msgstr ""
6963
msgstr "Subsume target %(other_tree)s needs to be upgraded."
5919
6964
5920
#: bzrlib/errors.py:2568
6965
#: bzrlib/errors.py:2577
5921
6966
msgid "No such tag: %(tag_name)s"
5922
msgstr ""
6967
msgstr "No such tag: %(tag_name)s"
5923
6968
5924
#: bzrlib/errors.py:2576
6969
#: bzrlib/errors.py:2585
5925
6970
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5926
6971
msgstr ""
6972
"Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5927
6973
5928
#: bzrlib/errors.py:2585
6974
#: bzrlib/errors.py:2594
5929
6975
msgid "Tag %(tag_name)s already exists."
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2593
5933
msgid ""
5934
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5935
"bugs\" for more information on this feature."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2603
5939
msgid ""
5940
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2613
5944
msgid ""
5945
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2623
6976
msgstr "Tag %(tag_name)s already exists."
6977
6978
#: bzrlib/errors.py:2602
6979
msgid ""
6980
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6981
"bugs\" for more information on this feature."
6982
msgstr ""
6983
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6984
"bugs\" for more information on this feature."
6985
6986
#: bzrlib/errors.py:2612
6987
msgid ""
6988
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6989
msgstr ""
6990
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6991
6992
#: bzrlib/errors.py:2622
6993
msgid ""
6994
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6995
msgstr ""
6996
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6997
6998
#: bzrlib/errors.py:2632
5949
6999
msgid "Invalid line in bugs property: '%(line)s'"
5950
msgstr ""
7000
msgstr "Invalid line in bugs property: '%(line)s'"
5951
7001
5952
#: bzrlib/errors.py:2631
7002
#: bzrlib/errors.py:2640
5953
7003
msgid "Invalid bug status: '%(status)s'"
5954
msgstr ""
7004
msgstr "Invalid bug status: '%(status)s'"
5955
7005
5956
#: bzrlib/errors.py:2639
7006
#: bzrlib/errors.py:2648
5957
7007
msgid "Could not understand response from smart server: %(response_tuple)r"
5958
msgstr ""
7008
msgstr "Could not understand response from smart server: %(response_tuple)r"
5959
7009
5960
#: bzrlib/errors.py:2678
7010
#: bzrlib/errors.py:2687
5961
7011
msgid "Server sent an unexpected error: %(error_tuple)r"
5962
msgstr ""
7012
msgstr "Server sent an unexpected error: %(error_tuple)r"
5963
7013
5964
#: bzrlib/errors.py:2697
7014
#: bzrlib/errors.py:2706
5965
7015
msgid "Unrecognised container format: %(container_format)r"
5966
msgstr ""
7016
msgstr "Unrecognised container format: %(container_format)r"
5967
7017
5968
#: bzrlib/errors.py:2705
7018
#: bzrlib/errors.py:2714
5969
7019
msgid "Unexpected end of container stream"
5970
msgstr ""
7020
msgstr "Unexpected end of container stream"
5971
7021
5972
#: bzrlib/errors.py:2710
7022
#: bzrlib/errors.py:2719
5973
7023
msgid "Unknown record type: %(record_type)r"
5974
msgstr ""
7024
msgstr "Unknown record type: %(record_type)r"
5975
7025
5976
#: bzrlib/errors.py:2718
7026
#: bzrlib/errors.py:2727
5977
7027
msgid "Invalid record: %(reason)s"
5978
msgstr ""
7028
msgstr "Invalid record: %(reason)s"
5979
7029
5980
#: bzrlib/errors.py:2726
7030
#: bzrlib/errors.py:2735
5981
7031
msgid "Container has data after end marker: %(excess)r"
5982
msgstr ""
7032
msgstr "Container has data after end marker: %(excess)r"
5983
7033
5984
#: bzrlib/errors.py:2734
7034
#: bzrlib/errors.py:2743
5985
7035
msgid "Container has multiple records with the same name: %(name)s"
5986
msgstr ""
7036
msgstr "Container has multiple records with the same name: %(name)s"
5987
7037
5988
#: bzrlib/errors.py:2747
7038
#: bzrlib/errors.py:2756
5989
7039
msgid "Corrupt or incompatible data stream: %(reason)s"
5990
msgstr ""
7040
msgstr "Corrupt or incompatible data stream: %(reason)s"
5991
7041
5992
#: bzrlib/errors.py:2755
7042
#: bzrlib/errors.py:2764
5993
7043
msgid "SMTP error: %(error)s"
5994
msgstr ""
7044
msgstr "SMTP error: %(error)s"
5995
7045
5996
#: bzrlib/errors.py:2763
7046
#: bzrlib/errors.py:2772
5997
7047
msgid "No message supplied."
5998
msgstr ""
7048
msgstr "No message supplied."
5999
7049
6000
#: bzrlib/errors.py:2768
7050
#: bzrlib/errors.py:2777
6001
7051
msgid "No mail-to address (--mail-to) or output (-o) specified."
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2773
6005
msgid "Unknown mail client: %(mail_client)s"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2781
7052
msgstr "No mail-to address (--mail-to) or output (-o) specified."
7053
7054
#: bzrlib/errors.py:2782
6009
7055
msgid ""
6010
7056
"Unable to find mail client with the following names: "
6011
7057
"%(mail_command_list_string)s"
6012
7058
msgstr ""
7059
"Unable to find mail client with the following names: "
7060
"%(mail_command_list_string)s"
6013
7061
6014
#: bzrlib/errors.py:2791
7062
#: bzrlib/errors.py:2792
6015
7063
msgid "SMTP connection to %(host)s refused"
6016
msgstr ""
7064
msgstr "SMTP connection to %(host)s refused"
6017
7065
6018
#: bzrlib/errors.py:2800
7066
#: bzrlib/errors.py:2801
6019
7067
msgid "Please specify smtp_server. No server at default %(host)s."
6020
msgstr ""
7068
msgstr "Please specify smtp_server. No server at default %(host)s."
6021
7069
6022
#: bzrlib/errors.py:2814
7070
#: bzrlib/errors.py:2815
6023
7071
msgid ""
6024
7072
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6025
7073
"reconfigure."
6026
7074
msgstr ""
7075
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
7076
"reconfigure."
6027
7077
6028
#: bzrlib/errors.py:2826
7078
#: bzrlib/errors.py:2827
6029
7079
msgid "'%(display_url)s' is already a branch."
6030
msgstr ""
7080
msgstr "'%(display_url)s' is already a branch."
6031
7081
6032
#: bzrlib/errors.py:2831
7082
#: bzrlib/errors.py:2832
6033
7083
msgid "'%(display_url)s' is already a tree."
6034
msgstr ""
7084
msgstr "'%(display_url)s' is already a tree."
6035
7085
6036
#: bzrlib/errors.py:2836
7086
#: bzrlib/errors.py:2837
6037
7087
msgid "'%(display_url)s' is already a checkout."
6038
msgstr ""
7088
msgstr "'%(display_url)s' is already a checkout."
6039
7089
6040
#: bzrlib/errors.py:2841
7090
#: bzrlib/errors.py:2842
6041
7091
msgid "'%(display_url)s' is already a lightweight checkout."
6042
msgstr ""
7092
msgstr "'%(display_url)s' is already a lightweight checkout."
6043
7093
6044
#: bzrlib/errors.py:2846
7094
#: bzrlib/errors.py:2847
6045
7095
msgid "'%(display_url)s' is already using a shared repository."
6046
msgstr ""
7096
msgstr "'%(display_url)s' is already using a shared repository."
6047
7097
6048
#: bzrlib/errors.py:2851
7098
#: bzrlib/errors.py:2852
6049
7099
msgid "'%(display_url)s' is already standalone."
6050
msgstr ""
7100
msgstr "'%(display_url)s' is already standalone."
6051
7101
6052
#: bzrlib/errors.py:2856
7102
#: bzrlib/errors.py:2857
6053
7103
msgid "Shared repository '%(display_url)s' already creates working trees."
6054
msgstr ""
7104
msgstr "Shared repository '%(display_url)s' already creates working trees."
6055
7105
6056
#: bzrlib/errors.py:2862
7106
#: bzrlib/errors.py:2863
6057
7107
msgid ""
6058
7108
"Shared repository '%(display_url)s' already doesn't create working trees."
6059
7109
msgstr ""
7110
"Shared repository '%(display_url)s' already doesn't create working trees."
6060
7111
6061
#: bzrlib/errors.py:2868
7112
#: bzrlib/errors.py:2869
6062
7113
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6063
msgstr ""
7114
msgstr "Requested reconfiguration of '%(display_url)s' is not supported."
6064
7115
6065
#: bzrlib/errors.py:2873
7116
#: bzrlib/errors.py:2874
6066
7117
msgid "No location could be found to bind to at %(display_url)s."
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:2878
6070
msgid ""
6071
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6072
"status).%(more)s"
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:2897
6076
msgid ""
6077
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6078
"list).%(more)s"
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:2903
7118
msgstr "No location could be found to bind to at %(display_url)s."
7119
7120
#: bzrlib/errors.py:2879
7121
msgid ""
7122
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7123
"status).%(more)s"
7124
msgstr ""
7125
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7126
"status).%(more)s"
7127
7128
#: bzrlib/errors.py:2898
7129
msgid ""
7130
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7131
"list).%(more)s"
7132
msgstr ""
7133
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7134
"list).%(more)s"
7135
7136
#: bzrlib/errors.py:2904
6082
7137
msgid "Variable {%(name)s} is not available."
6083
msgstr ""
7138
msgstr "Variable {%(name)s} is not available."
6084
7139
6085
#: bzrlib/errors.py:2911
7140
#: bzrlib/errors.py:2912
6086
7141
msgid "No template specified."
6087
msgstr ""
7142
msgstr "No template specified."
6088
7143
6089
#: bzrlib/errors.py:2916
7144
#: bzrlib/errors.py:2917
6090
7145
msgid "Unable to create symlink %(path_str)son this platform"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2931
6094
msgid ""
6095
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6096
"\"original\", \"local\"."
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:2965
6100
msgid ""
6101
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:2977
7146
msgstr "Unable to create symlink %(path_str)son this platform"
7147
7148
#: bzrlib/errors.py:2932
7149
msgid ""
7150
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7151
"\"original\", \"local\"."
7152
msgstr ""
7153
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7154
"\"original\", \"local\"."
7155
7156
#: bzrlib/errors.py:2966
7157
msgid ""
7158
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
7159
msgstr ""
7160
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
7161
7162
#: bzrlib/errors.py:2978
6105
7163
msgid "The \"%(config_id)s\" configuration does not exist."
6106
msgstr ""
7164
msgstr "The \"%(config_id)s\" configuration does not exist."
6107
7165
6108
#: bzrlib/errors.py:2985
7166
#: bzrlib/errors.py:2986
6109
7167
msgid "The \"%(option_name)s\" configuration option does not exist."
6110
msgstr ""
7168
msgstr "The \"%(option_name)s\" configuration option does not exist."
6111
7169
6112
#: bzrlib/errors.py:2993
7170
#: bzrlib/errors.py:2994
6113
7171
msgid "The alias \"%(alias_name)s\" does not exist."
6114
msgstr ""
7172
msgstr "The alias \"%(alias_name)s\" does not exist."
6115
7173
6116
#: bzrlib/errors.py:3007
7174
#: bzrlib/errors.py:3008
6117
7175
msgid "\"%(alias_name)s\" is not a valid location alias."
6118
msgstr ""
7176
msgstr "\"%(alias_name)s\" is not a valid location alias."
6119
7177
6120
#: bzrlib/errors.py:3015
7178
#: bzrlib/errors.py:3016
6121
7179
msgid "No %(alias_name)s location assigned."
6122
msgstr ""
7180
msgstr "No %(alias_name)s location assigned."
6123
7181
6124
#: bzrlib/errors.py:3023
7182
#: bzrlib/errors.py:3024
6125
7183
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6126
msgstr ""
7184
msgstr "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6127
7185
6128
#: bzrlib/errors.py:3033
7186
#: bzrlib/errors.py:3034
6129
7187
msgid "Unknown rules detected: %(unknowns_str)s."
6130
msgstr ""
7188
msgstr "Unknown rules detected: %(unknowns_str)s."
6131
7189
6132
#: bzrlib/errors.py:3044
7190
#: bzrlib/errors.py:3045
6133
7191
msgid "Tip change rejected: %(msg)s"
6134
msgstr ""
7192
msgstr "Tip change rejected: %(msg)s"
6135
7193
6136
#: bzrlib/errors.py:3052
7194
#: bzrlib/errors.py:3053
6137
7195
msgid "Shelf corrupt."
6138
msgstr ""
7196
msgstr "Shelf corrupt."
6139
7197
6140
#: bzrlib/errors.py:3057
7198
#: bzrlib/errors.py:3058
6141
7199
msgid "Corruption while decompressing repository file%(orig_error)s"
6142
msgstr ""
7200
msgstr "Corruption while decompressing repository file%(orig_error)s"
6143
7201
6144
#: bzrlib/errors.py:3069
7202
#: bzrlib/errors.py:3070
6145
7203
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6146
msgstr ""
7204
msgstr "No changes are shelved with id \"%(shelf_id)d\"."
6147
7205
6148
#: bzrlib/errors.py:3077
7206
#: bzrlib/errors.py:3078
6149
7207
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6150
msgstr ""
7208
msgstr "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6151
7209
6152
#: bzrlib/errors.py:3085
7210
#: bzrlib/errors.py:3086
6153
7211
msgid ""
6154
7212
"An attempt to access a url outside the server jail was made: '%(url)s'."
6155
7213
msgstr ""
7214
"An attempt to access a url outside the server jail was made: '%(url)s'."
6156
7215
6157
#: bzrlib/errors.py:3093
7216
#: bzrlib/errors.py:3094
6158
7217
msgid "The user aborted the operation."
6159
msgstr ""
7218
msgstr "The user aborted the operation."
6160
7219
6161
#: bzrlib/errors.py:3098
7220
#: bzrlib/errors.py:3099
6162
7221
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6163
msgstr ""
7222
msgstr "Branching '%(url)s'(%(format)s) must create a working tree."
6164
7223
6165
#: bzrlib/errors.py:3108
7224
#: bzrlib/errors.py:3109
6166
7225
msgid "No such view: %(view_name)s."
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:3118
6170
msgid ""
6171
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6172
"to a later format."
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:3127
6176
msgid ""
6177
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:3194
7226
msgstr "No such view: %(view_name)s."
7227
7228
#: bzrlib/errors.py:3119
7229
msgid ""
7230
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7231
"to a later format."
7232
msgstr ""
7233
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7234
"to a later format."
7235
7236
#: bzrlib/errors.py:3128
7237
msgid ""
7238
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
7239
msgstr ""
7240
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
7241
7242
#: bzrlib/errors.py:3195
6181
7243
msgid "%(bzrdir)r does not support co-located branches."
6182
msgstr ""
7244
msgstr "%(bzrdir)r does not support co-located branches."
6183
7245
6184
#: bzrlib/errors.py:3200
7246
#: bzrlib/errors.py:3201
6185
7247
msgid ""
6186
7248
"Unable to determine your name.\n"
6187
7249
"Please, set your name with the 'whoami' command.\n"
6188
7250
"E.g. bzr whoami \"Your Name <name@example.com>\""
6189
7251
msgstr ""
7252
"Unable to determine your name.\n"
7253
"Please, set your name with the 'whoami' command.\n"
7254
"E.g. bzr whoami \"Your Name <name@example.com>\""
6190
7255
6191
#: bzrlib/errors.py:3209
7256
#: bzrlib/errors.py:3210
6192
7257
msgid "Invalid pattern(s) found. %(msg)s"
6193
msgstr ""
7258
msgstr "Invalid pattern(s) found. %(msg)s"
6194
7259
6195
#: bzrlib/errors.py:3217
7260
#: bzrlib/errors.py:3218
6196
7261
msgid ""
6197
7262
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6198
7263
"unbind` to fix."
6199
7264
msgstr ""
7265
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
7266
"unbind` to fix."
6200
7267
6201
#: bzrlib/errors.py:3228
7268
#: bzrlib/errors.py:3229
6202
7269
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6203
msgstr ""
7270
msgstr "Loop involving %(refs)r while expanding \"%(string)s\"."
6204
7271
6205
#: bzrlib/errors.py:3237
7272
#: bzrlib/errors.py:3238
6206
7273
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6207
msgstr ""
6208
6209
#: bzrlib/errors.py:3246
6210
msgid ""
6211
"No compatible object available for operations from %(source)r to %(target)r."
6212
msgstr ""
6213
6214
#: bzrlib/errors.py:3256
6215
msgid ""
6216
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6217
"%(arguments)s."
6218
msgstr ""
6219
6220
#: bzrlib/errors.py:3266
6221
msgid ""
6222
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6223
"format %(format)r"
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:3278
6227
msgid ""
6228
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6229
"plugin."
6230
msgstr ""
6231
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6232
"plugin."
6233
6234
#: bzrlib/errors.py:3291
7274
msgstr "Option %(name)s is not defined while expanding \"%(string)s\"."
7275
7276
#: bzrlib/errors.py:3247
7277
msgid ""
7278
"No compatible object available for operations from %(source)r to %(target)r."
7279
msgstr ""
7280
"No compatible object available for operations from %(source)r to %(target)r."
7281
7282
#: bzrlib/errors.py:3257
7283
msgid ""
7284
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7285
"%(arguments)s."
7286
msgstr ""
7287
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7288
"%(arguments)s."
7289
7290
#: bzrlib/errors.py:3267
7291
msgid ""
7292
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
7293
"format %(format)r"
7294
msgstr ""
7295
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
7296
"format %(format)r"
7297
7298
#: bzrlib/errors.py:3279
7299
msgid ""
7300
"Missing feature %(feature)s not provided by this version of Bazaar or any "
7301
"plugin."
7302
msgstr ""
7303
"Missing feature %(feature)s not provided by this version of Bazaar or any "
7304
"plugin."
7305
7306
#: bzrlib/errors.py:3292
6235
7307
msgid "Binary files section encountered."
6236
msgstr ""
6237
6238
#: bzrlib/errors.py:3299
6239
msgid ""
6240
"Malformed patch header. %(desc)s\n"
6241
"%(line)r"
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:3308
6245
msgid ""
6246
"Malformed hunk header. %(desc)s\n"
6247
"%(line)r"
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:3317
6251
msgid ""
6252
"Malformed line. %(desc)s\n"
6253
"%(line)r"
6254
msgstr ""
6255
6256
#: bzrlib/errors.py:3327
6257
msgid ""
6258
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6259
"but patch says it should be \"%(patch_line)s\""
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:3338
7308
msgstr "Binary files section encountered."
7309
7310
#: bzrlib/errors.py:3300
7311
msgid ""
7312
"Malformed patch header. %(desc)s\n"
7313
"%(line)r"
7314
msgstr ""
7315
"Malformed patch header. %(desc)s\n"
7316
"%(line)r"
7317
7318
#: bzrlib/errors.py:3309
7319
msgid ""
7320
"Malformed hunk header. %(desc)s\n"
7321
"%(line)r"
7322
msgstr ""
7323
"Malformed hunk header. %(desc)s\n"
7324
"%(line)r"
7325
7326
#: bzrlib/errors.py:3318
7327
msgid ""
7328
"Malformed line. %(desc)s\n"
7329
"%(line)r"
7330
msgstr ""
7331
"Malformed line. %(desc)s\n"
7332
"%(line)r"
7333
7334
#: bzrlib/errors.py:3328
7335
msgid ""
7336
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
7337
"but patch says it should be \"%(patch_line)s\""
7338
msgstr ""
7339
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
7340
"but patch says it should be \"%(patch_line)s\""
7341
7342
#: bzrlib/errors.py:3339
6263
7343
msgid "The feature %(feature)s has already been registered."
6264
7344
msgstr "The feature %(feature)s has already been registered."
6265
7345
6266
7346
#: bzrlib/export_pot.py:252
6267
7347
#, python-format
6268
7348
msgid "Exporting messages from builtin command: %s"
6269
msgstr ""
7349
msgstr "Exporting messages from builtin command: %s"
6270
7350
6271
7351
#: bzrlib/export_pot.py:271
6272
7352
msgid "Exporting messages from plugin command: {0} in {1}"
6273
msgstr ""
7353
msgstr "Exporting messages from plugin command: {0} in {1}"
6274
7354
6275
7355
#: bzrlib/export_pot.py:292
6276
7356
#, python-format
6277
7357
msgid "Exporting message from error: %s"
6278
msgstr ""
7358
msgstr "Exporting message from error: %s"
6279
7359
6280
7360
#: bzrlib/fetch.py:98
6281
7361
msgid "Finding revisions"
6282
msgstr ""
7362
msgstr "Finding revisions"
6283
7363
6284
7364
#: bzrlib/fetch.py:103
6285
7365
msgid "Fetching revisions"
6286
msgstr ""
7366
msgstr "Fetching revisions"
6287
7367
6288
7368
#: bzrlib/foreign.py:262
6289
7369
msgid "Push into a different VCS without any custom bzr metadata."
6290
msgstr ""
7370
msgstr "Push into a different VCS without any custom bzr metadata."
6291
7371
6292
7372
#: bzrlib/foreign.py:264
6293
7373
msgid ""
6295
7375
"branch unless the --no-rebase option is used, in which case \n"
6296
7376
"the two branches will be out of sync after the push. "
6297
7377
msgstr ""
7378
"This will afterwards rebase the local branch on the remote\n"
7379
"branch unless the --no-rebase option is used, in which case \n"
7380
"the two branches will be out of sync after the push. "
6298
7381
6299
7382
#: bzrlib/foreign.py:277
6300
7383
msgid "Do not rebase after push."
6301
msgstr ""
7384
msgstr "Do not rebase after push."
6302
7385
6303
7386
#: bzrlib/foreign.py:311
6304
7387
#, python-format
6305
7388
msgid "Using saved location: %s\n"
6306
msgstr ""
7389
msgstr "Using saved location: %s\n"
6307
7390
6308
7391
#: bzrlib/foreign.py:321
6309
7392
msgid ""
6310
7393
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6311
7394
"regular push."
6312
7395
msgstr ""
6313
6314
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
7396
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
7397
"regular push."
7398
7399
#: bzrlib/gpg.py:366
7400
msgid "No GnuPG key results for pattern: {0}"
7401
msgstr "No GnuPG key results for pattern: {0}"
7402
7403
#: bzrlib/gpg.py:439
6315
7404
msgid "{0} commits with valid signatures"
6316
msgstr ""
7405
msgstr "{0} commits with valid signatures"
6317
7406
6318
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
7407
#: bzrlib/gpg.py:445
6319
7408
msgid "{0} commit with unknown key"
6320
7409
msgid_plural "{0} commits with unknown keys"
6321
msgstr[0] ""
6322
msgstr[1] ""
7410
msgstr[0] "{0} commit with unknown key"
7411
msgstr[1] "{0} commits with unknown keys"
6323
7412
6324
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
7413
#: bzrlib/gpg.py:453
6325
7414
msgid "{0} commit not valid"
6326
7415
msgid_plural "{0} commits not valid"
6327
msgstr[0] ""
6328
msgstr[1] ""
7416
msgstr[0] "{0} commit not valid"
7417
msgstr[1] "{0} commits not valid"
6329
7418
6330
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
7419
#: bzrlib/gpg.py:461
6331
7420
msgid "{0} commit not signed"
6332
7421
msgid_plural "{0} commits not signed"
6333
msgstr[0] ""
6334
msgstr[1] ""
7422
msgstr[0] "{0} commit not signed"
7423
msgstr[1] "{0} commits not signed"
6335
7424
6336
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
7425
#: bzrlib/gpg.py:469
6337
7426
msgid "{0} commit with key now expired"
6338
7427
msgid_plural "{0} commits with key now expired"
6339
msgstr[0] ""
6340
msgstr[1] ""
6341
6342
#: bzrlib/gpg.py:343
6343
msgid "No GnuPG key results for pattern: {0}"
6344
msgstr ""
6345
6346
#: bzrlib/gpg.py:386
7428
msgstr[0] "{0} commit with key now expired"
7429
msgstr[1] "{0} commits with key now expired"
7430
7431
#: bzrlib/gpg.py:489
7432
msgid "{0} commit by author {1} with key {2} now expired"
7433
msgid_plural "{0} commits by author {1} with key {2} now expired"
7434
msgstr[0] "{0} commit by author {1} with key {2} now expired"
7435
msgstr[1] "{0} commits by author {1} with key {2} now expired"
7436
7437
#: bzrlib/gpg.py:505
6347
7438
msgid "{0} signed {1} commit"
6348
7439
msgid_plural "{0} signed {1} commits"
6349
msgstr[0] ""
6350
msgstr[1] ""
7440
msgstr[0] "{0} signed {1} commit"
7441
msgstr[1] "{0} signed {1} commits"
6351
7442
6352
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
7443
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6353
7444
msgid "{0} commit by author {1}"
6354
7445
msgid_plural "{0} commits by author {1}"
6355
msgstr[0] ""
6356
msgstr[1] ""
7446
msgstr[0] "{0} commit by author {1}"
7447
msgstr[1] "{0} commits by author {1}"
6357
7448
6358
#: bzrlib/gpg.py:433
7449
#: bzrlib/gpg.py:554
6359
7450
msgid "Unknown key {0} signed {1} commit"
6360
7451
msgid_plural "Unknown key {0} signed {1} commits"
6361
msgstr[0] ""
6362
msgstr[1] ""
6363
6364
#: bzrlib/gpg.py:452
6365
msgid "{0} commit by author {1} with key {2} now expired"
6366
msgid_plural "{0} commits by author {1} with key {2} now expired"
6367
msgstr[0] ""
6368
msgstr[1] ""
7452
msgstr[0] "Unknown key {0} signed {1} commit"
7453
msgstr[1] "Unknown key {0} signed {1} commits"
6369
7454
6370
7455
#: bzrlib/groupcompress.py:1739
6371
7456
#, python-format
6372
7457
msgid "Insert claimed random_id=True, but then inserted %r two times"
6373
msgstr ""
7458
msgstr "Insert claimed random_id=True, but then inserted %r two times"
6374
7459
6375
#: bzrlib/hooks.py:331
7460
#: bzrlib/hooks.py:313
6376
7461
#, python-format
6377
7462
msgid "Introduced in: %s"
6378
msgstr ""
7463
msgstr "Introduced in: %s"
6379
7464
6380
#: bzrlib/hooks.py:334
7465
#: bzrlib/hooks.py:316
6381
7466
#, python-format
6382
7467
msgid "Deprecated in: %s"
6383
msgstr ""
7468
msgstr "Deprecated in: %s"
6384
7469
6385
7470
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6386
7471
msgid "Walking content"
6387
msgstr ""
7472
msgstr "Walking content"
6388
7473
6389
7474
#: bzrlib/knit.py:3330
6390
7475
msgid "annotating"
6391
msgstr ""
7476
msgstr "annotating"
6392
7477
6393
7478
#: bzrlib/lock.py:548
6394
7479
msgid "{0!r} was {1} locked again"
6395
msgstr ""
7480
msgstr "{0!r} was {1} locked again"
6396
7481
6397
7482
#: bzrlib/lockdir.py:321
6398
7483
#, python-format
6399
7484
msgid "error removing pending lock: %s"
6400
msgstr ""
7485
msgstr "error removing pending lock: %s"
6401
7486
6402
7487
#: bzrlib/lockdir.py:616
6403
7488
msgid "Unable to obtain"
6404
msgstr ""
7489
msgstr "Unable to obtain"
6405
7490
6406
7491
#: bzrlib/lockdir.py:618
6407
7492
msgid "Lock owner changed for"
6408
msgstr ""
7493
msgstr "Lock owner changed for"
6409
7494
6410
7495
#: bzrlib/lockdir.py:620
6411
7496
msgid "{0} lock {1} {2}."
6412
msgstr ""
7497
msgstr "{0} lock {1} {2}."
6413
7498
6414
7499
#: bzrlib/lockdir.py:627
6415
7500
#, python-format
6416
7501
msgid "Will continue to try until %s, unless you press Ctrl-C."
6417
msgstr ""
7502
msgstr "Will continue to try until %s, unless you press Ctrl-C."
6418
7503
6419
7504
#: bzrlib/lockdir.py:629
6420
7505
msgid "See \"bzr help break-lock\" for more."
6421
msgstr ""
7506
msgstr "See \"bzr help break-lock\" for more."
6422
7507
6423
7508
#: bzrlib/lockdir.py:739
6424
7509
#, python-format
6425
7510
msgid ""
6426
7511
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6427
7512
msgstr ""
7513
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6428
7514
6429
#: bzrlib/log.py:572
7515
#: bzrlib/log.py:563
6430
7516
msgid "--exclude-common-ancestry requires two different revisions"
6431
msgstr ""
7517
msgstr "--exclude-common-ancestry requires two different revisions"
6432
7518
6433
#: bzrlib/log.py:574
7519
#: bzrlib/log.py:565
6434
7520
#, python-format
6435
7521
msgid "invalid direction %r"
6436
msgstr ""
7522
msgstr "invalid direction %r"
6437
7523
6438
#: bzrlib/log.py:662
7524
#: bzrlib/log.py:653
6439
7525
msgid "Start revision not found in history of end revision."
6440
msgstr ""
7526
msgstr "Start revision not found in history of end revision."
6441
7527
6442
#: bzrlib/log.py:1080 bzrlib/log.py:1138
7528
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6443
7529
msgid "Logging revision 0 is invalid."
6444
msgstr ""
7530
msgstr "Logging revision 0 is invalid."
6445
7531
6446
#: bzrlib/log.py:1082 bzrlib/log.py:1140
7532
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6447
7533
msgid "Start revision must be older than the end revision."
6448
msgstr ""
7534
msgstr "Start revision must be older than the end revision."
6449
7535
6450
#: bzrlib/log.py:1827
7536
#: bzrlib/log.py:1818
6451
7537
#, python-format
6452
7538
msgid "unknown log formatter: %r"
6453
msgstr ""
7539
msgstr "unknown log formatter: %r"
6454
7540
6455
#: bzrlib/log.py:2123
7541
#: bzrlib/log.py:2114
6456
7542
msgid "fixes bug"
6457
7543
msgid_plural "fixes bugs"
6458
msgstr[0] ""
6459
msgstr[1] ""
7544
msgstr[0] "fixes bug"
7545
msgstr[1] "fixes bugs"
6460
7546
6461
7547
#: bzrlib/merge.py:689
6462
7548
msgid "All changes applied successfully."
6463
msgstr ""
7549
msgstr "All changes applied successfully."
6464
7550
6465
7551
#: bzrlib/merge.py:691
6466
7552
#, python-format
6467
7553
msgid "%d conflicts encountered."
6468
msgstr ""
7554
msgstr "%d conflicts encountered."
6469
7555
6470
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
7556
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6471
7557
msgid "Preparing file merge"
6472
msgstr ""
7558
msgstr "Preparing file merge"
6473
7559
6474
7560
#: bzrlib/multiparent.py:426
6475
7561
msgid "Importing revisions"
6476
msgstr ""
7562
msgstr "Importing revisions"
6477
7563
6478
7564
#: bzrlib/option.py:526
6479
7565
msgid "Show help message."
6480
msgstr ""
7566
msgstr "Show help message."
6481
7567
6482
7568
#: bzrlib/option.py:528
6483
7569
msgid "Only display errors and warnings."
6484
msgstr ""
7570
msgstr "Only display errors and warnings."
6485
7571
6486
7572
#: bzrlib/option.py:531
6487
7573
msgid "Show usage message and options."
6488
msgstr ""
7574
msgstr "Show usage message and options."
6489
7575
6490
7576
#: bzrlib/option.py:533
6491
7577
msgid "Display more information."
6492
msgstr ""
7578
msgstr "Display more information."
6493
7579
6494
7580
#: bzrlib/option.py:541
6495
7581
msgid ""
6496
7582
"Select changes introduced by the specified revision. See also \"help "
6497
7583
"revisionspec\"."
6498
7584
msgstr ""
7585
"Select changes introduced by the specified revision. See also \"help "
7586
"revisionspec\"."
6499
7587
6500
7588
#: bzrlib/option.py:543
6501
7589
msgid "Branch to operate on, instead of working directory."
6502
msgstr ""
7590
msgstr "Branch to operate on, instead of working directory."
6503
7591
6504
7592
#: bzrlib/option.py:545
6505
7593
msgid "Detailed log format."
6506
msgstr ""
7594
msgstr "Detailed log format."
6507
7595
6508
7596
#: bzrlib/option.py:545
6509
7597
msgid "Format used by GNU ChangeLog files."
6510
msgstr ""
7598
msgstr "Format used by GNU ChangeLog files."
6511
7599
6512
7600
#: bzrlib/option.py:545
6513
7601
msgid "Log format with one line per revision."
6514
msgstr ""
7602
msgstr "Log format with one line per revision."
6515
7603
6516
7604
#: bzrlib/option.py:545
6517
7605
msgid "Moderately short log format."
6518
msgstr ""
7606
msgstr "Moderately short log format."
6519
7607
6520
7608
#: bzrlib/option.py:545
6521
7609
msgid "Use specified log format."
6522
msgstr ""
7610
msgstr "Use specified log format."
6523
7611
6524
7612
#: bzrlib/option.py:547
6525
7613
msgid "Log format"
6526
msgstr ""
7614
msgstr "Log format"
6527
7615
6528
7616
#: bzrlib/option.py:549
6529
7617
msgid "LCA-newness merge."
6530
msgstr ""
7618
msgstr "LCA-newness merge."
6531
7619
6532
7620
#: bzrlib/option.py:549
6533
7621
msgid "Merge using external diff3."
6534
msgstr ""
7622
msgstr "Merge using external diff3."
6535
7623
6536
7624
#: bzrlib/option.py:549
6537
7625
msgid "Native diff3-style merge."
6538
msgstr ""
7626
msgstr "Native diff3-style merge."
6539
7627
6540
7628
#: bzrlib/option.py:549
6541
7629
msgid "Select a particular merge algorithm."
6542
msgstr ""
7630
msgstr "Select a particular merge algorithm."
6543
7631
6544
7632
#: bzrlib/option.py:549
6545
7633
msgid "Weave-based merge."
6546
msgstr ""
7634
msgstr "Weave-based merge."
6547
7635
6548
7636
#: bzrlib/option.py:551
6549
7637
msgid "Merge algorithm"
6550
msgstr ""
7638
msgstr "Merge algorithm"
6551
7639
6552
7640
#: bzrlib/option.py:554
6553
7641
msgid "Message string."
6554
msgstr ""
7642
msgstr "Message string."
6555
7643
6556
7644
#: bzrlib/option.py:556
6557
7645
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6558
msgstr ""
7646
msgstr "Use an ASCII NUL (\\0) separator rather than a newline."
6559
7647
6560
7648
#: bzrlib/option.py:558
6561
7649
msgid "Ignore differences between branches and overwrite unconditionally."
6562
msgstr ""
7650
msgstr "Ignore differences between branches and overwrite unconditionally."
6563
7651
6564
7652
#: bzrlib/option.py:560
6565
7653
msgid "Remember the specified location as a default."
6566
msgstr ""
7654
msgstr "Remember the specified location as a default."
6567
7655
6568
7656
#: bzrlib/option.py:562
6569
7657
msgid "Reprocess to reduce spurious conflicts."
6570
msgstr ""
7658
msgstr "Reprocess to reduce spurious conflicts."
6571
7659
6572
7660
#: bzrlib/option.py:566
6573
7661
msgid "See \"help revisionspec\" for details."
6574
msgstr ""
7662
msgstr "See \"help revisionspec\" for details."
6575
7663
6576
7664
#: bzrlib/option.py:568
6577
7665
msgid "Show internal object ids."
6578
msgstr ""
7666
msgstr "Show internal object ids."
6579
7667
6580
7668
#: bzrlib/option.py:571
6581
7669
msgid "Display timezone as local, original, or utc."
6582
msgstr ""
7670
msgstr "Display timezone as local, original, or utc."
6583
7671
6584
7672
#: bzrlib/osutils.py:100
6585
7673
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6586
msgstr ""
7674
msgstr "Parameter {0!r} encoding is unsupported by {1} application locale."
6587
7675
6588
7676
#: bzrlib/osutils.py:220
6589
7677
msgid "lstat/stat of ({0!r}): {1!r}"
6590
msgstr ""
7678
msgstr "lstat/stat of ({0!r}): {1!r}"
6591
7679
6592
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7680
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6593
7681
#, python-format
6594
7682
msgid "sorry, %r not allowed in path"
6595
msgstr ""
7683
msgstr "sorry, %r not allowed in path"
6596
7684
6597
#: bzrlib/osutils.py:1237
7685
#: bzrlib/osutils.py:1259
6598
7686
#, python-format
6599
7687
msgid "%r is too short to calculate a relative path"
6600
msgstr ""
7688
msgstr "%r is too short to calculate a relative path"
6601
7689
6602
7690
#: bzrlib/plugin.py:143
6603
7691
#, python-format
6604
7692
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6605
msgstr ""
7693
msgstr "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6606
7694
6607
7695
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6608
7696
msgid "Enable completions for the selected plugin (default: all plugins)"
6609
msgstr ""
7697
msgstr "Enable completions for the selected plugin (default: all plugins)"
6610
7698
6611
7699
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6612
7700
msgid "Generate a shell function for bash command line completion."
6613
msgstr ""
7701
msgstr "Generate a shell function for bash command line completion."
6614
7702
6615
7703
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6616
7704
msgid ""
6618
7706
"automatically complete the currently typed command when the user presses\n"
6619
7707
"the completion key (usually tab)."
6620
7708
msgstr ""
7709
"This command generates a shell function which can be used by bash to\n"
7710
"automatically complete the currently typed command when the user presses\n"
7711
"the completion key (usually tab)."
6621
7712
6622
7713
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6623
7714
msgid ""
6624
7715
"Commonly used like this:\n"
6625
7716
" eval \"`bzr bash-completion`\""
6626
7717
msgstr ""
7718
"Commonly used like this:\n"
7719
" eval \"`bzr bash-completion`\""
6627
7720
6628
7721
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6629
7722
msgid "Name of the generated function (default: _bzr)"
6630
msgstr ""
7723
msgstr "Name of the generated function (default: _bzr)"
6631
7724
6632
7725
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6633
7726
msgid "Generate only the shell function, don't enable it"
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/__init__.py:81
7727
msgstr "Generate only the shell function, don't enable it"
7728
7729
#: bzrlib/plugins/launchpad/account.py:66
7730
msgid "Setting ssh/sftp usernames for launchpad.net."
7731
msgstr "Setting ssh/sftp usernames for launchpad.net."
7732
7733
#: bzrlib/plugins/launchpad/cmds.py:44
6637
7734
msgid "Register a branch with launchpad.net."
6638
msgstr ""
6639
6640
#: bzrlib/plugins/launchpad/__init__.py:83
6641
msgid ""
6642
"This command lists a bzr branch in the directory of branches on\n"
6643
"launchpad.net. Registration allows the branch to be associated with\n"
6644
"bugs or specifications."
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/__init__.py:87
6648
msgid ""
6649
"Before using this command you must register the project to which the\n"
6650
"branch belongs, and create an account for yourself on launchpad.net."
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:90
6654
msgid ""
6655
"arguments:\n"
6656
" public_url: The publicly visible url for the branch to register.\n"
6657
" This must be an http or https url (which Launchpad can read\n"
6658
" from to access the branch). Local file urls, SFTP urls, and\n"
6659
" bzr+ssh urls will not work.\n"
6660
" If no public_url is provided, bzr will use the configured\n"
6661
" public_url if there is one for the current branch, and\n"
6662
" otherwise error."
6663
msgstr ""
6664
6665
#: bzrlib/plugins/launchpad/__init__.py:99
6666
msgid ""
6667
"example:\n"
6668
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6669
" --project fooproject"
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/__init__.py:106
7735
msgstr "Register a branch with launchpad.net."
7736
7737
#: bzrlib/plugins/launchpad/cmds.py:46
7738
msgid ""
7739
"This command lists a bzr branch in the directory of branches on\n"
7740
"launchpad.net. Registration allows the branch to be associated with\n"
7741
"bugs or specifications."
7742
msgstr ""
7743
"This command lists a bzr branch in the directory of branches on\n"
7744
"launchpad.net. Registration allows the branch to be associated with\n"
7745
"bugs or specifications."
7746
7747
#: bzrlib/plugins/launchpad/cmds.py:50
7748
msgid ""
7749
"Before using this command you must register the project to which the\n"
7750
"branch belongs, and create an account for yourself on launchpad.net."
7751
msgstr ""
7752
"Before using this command you must register the project to which the\n"
7753
"branch belongs, and create an account for yourself on launchpad.net."
7754
7755
#: bzrlib/plugins/launchpad/cmds.py:53
7756
msgid ""
7757
"arguments:\n"
7758
" public_url: The publicly visible url for the branch to register.\n"
7759
" This must be an http or https url (which Launchpad can read\n"
7760
" from to access the branch). Local file urls, SFTP urls, and\n"
7761
" bzr+ssh urls will not work.\n"
7762
" If no public_url is provided, bzr will use the configured\n"
7763
" public_url if there is one for the current branch, and\n"
7764
" otherwise error."
7765
msgstr ""
7766
"arguments:\n"
7767
" public_url: The publicly visible url for the branch to register.\n"
7768
" This must be an http or https url (which Launchpad can read\n"
7769
" from to access the branch). Local file urls, SFTP urls, and\n"
7770
" bzr+ssh urls will not work.\n"
7771
" If no public_url is provided, bzr will use the configured\n"
7772
" public_url if there is one for the current branch, and\n"
7773
" otherwise error."
7774
7775
#: bzrlib/plugins/launchpad/cmds.py:62
7776
msgid ""
7777
"example:\n"
7778
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7779
" --project fooproject"
7780
msgstr ""
7781
"example:\n"
7782
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7783
" --project fooproject"
7784
7785
#: bzrlib/plugins/launchpad/cmds.py:69
6673
7786
msgid "Launchpad project short name to associate with the branch."
6674
msgstr ""
7787
msgstr "Launchpad project short name to associate with the branch."
6675
7788
6676
#: bzrlib/plugins/launchpad/__init__.py:113
7789
#: bzrlib/plugins/launchpad/cmds.py:76
6677
7790
msgid ""
6678
7791
"Short name for the branch; by default taken from the last component of the "
6679
7792
"url."
6680
7793
msgstr ""
7794
"Short name for the branch; by default taken from the last component of the "
7795
"url."
6681
7796
6682
#: bzrlib/plugins/launchpad/__init__.py:117
7797
#: bzrlib/plugins/launchpad/cmds.py:80
6683
7798
msgid "One-sentence description of the branch."
6684
msgstr ""
7799
msgstr "One-sentence description of the branch."
6685
7800
6686
#: bzrlib/plugins/launchpad/__init__.py:120
7801
#: bzrlib/plugins/launchpad/cmds.py:83
6687
7802
msgid "Longer description of the purpose or contents of the branch."
6688
msgstr ""
7803
msgstr "Longer description of the purpose or contents of the branch."
6689
7804
6690
#: bzrlib/plugins/launchpad/__init__.py:123
7805
#: bzrlib/plugins/launchpad/cmds.py:86
6691
7806
msgid "Branch author's email address, if not yourself."
6692
msgstr ""
7807
msgstr "Branch author's email address, if not yourself."
6693
7808
6694
#: bzrlib/plugins/launchpad/__init__.py:126
7809
#: bzrlib/plugins/launchpad/cmds.py:89
6695
7810
msgid "The bug this branch fixes."
6696
msgstr ""
7811
msgstr "The bug this branch fixes."
6697
7812
6698
#: bzrlib/plugins/launchpad/__init__.py:129
7813
#: bzrlib/plugins/launchpad/cmds.py:92
6699
7814
msgid "Prepare the request but don't actually send it."
6700
msgstr ""
7815
msgstr "Prepare the request but don't actually send it."
6701
7816
6702
#: bzrlib/plugins/launchpad/__init__.py:151
7817
#: bzrlib/plugins/launchpad/cmds.py:114
6703
7818
msgid ""
6704
7819
"register-branch requires a public branch url - see bzr help register-branch."
6705
7820
msgstr ""
7821
"register-branch requires a public branch url - see bzr help register-branch."
6706
7822
6707
#: bzrlib/plugins/launchpad/__init__.py:159
7823
#: bzrlib/plugins/launchpad/cmds.py:122
6708
7824
msgid "--product is deprecated; please use --project."
6709
msgstr ""
7825
msgstr "--product is deprecated; please use --project."
6710
7826
6711
#: bzrlib/plugins/launchpad/__init__.py:191
7827
#: bzrlib/plugins/launchpad/cmds.py:152
6712
7828
msgid "Open a Launchpad branch page in your web browser."
6713
msgstr ""
7829
msgstr "Open a Launchpad branch page in your web browser."
6714
7830
6715
#: bzrlib/plugins/launchpad/__init__.py:196
7831
#: bzrlib/plugins/launchpad/cmds.py:157
6716
7832
msgid "Do not actually open the browser. Just say the URL we would use."
6717
msgstr ""
7833
msgstr "Do not actually open the browser. Just say the URL we would use."
6718
7834
6719
#: bzrlib/plugins/launchpad/__init__.py:231
7835
#: bzrlib/plugins/launchpad/cmds.py:192
6720
7836
#, python-format
6721
7837
msgid "Opening %s in web browser"
6722
msgstr ""
7838
msgstr "Opening %s in web browser"
6723
7839
6724
#: bzrlib/plugins/launchpad/__init__.py:241
7840
#: bzrlib/plugins/launchpad/cmds.py:200
6725
7841
msgid "Show or set the Launchpad user ID."
6726
msgstr ""
6727
6728
#: bzrlib/plugins/launchpad/__init__.py:243
6729
msgid ""
6730
"When communicating with Launchpad, some commands need to know your\n"
6731
"Launchpad user ID. This command can be used to set or show the\n"
6732
"user ID that Bazaar will use for such communication."
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/__init__.py:247
6736
msgid ""
6737
":Examples:\n"
6738
" Show the Launchpad ID of the current user::"
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/__init__.py:250
7842
msgstr "Show or set the Launchpad user ID."
7843
7844
#: bzrlib/plugins/launchpad/cmds.py:202
7845
msgid ""
7846
"When communicating with Launchpad, some commands need to know your\n"
7847
"Launchpad user ID. This command can be used to set or show the\n"
7848
"user ID that Bazaar will use for such communication."
7849
msgstr ""
7850
"When communicating with Launchpad, some commands need to know your\n"
7851
"Launchpad user ID. This command can be used to set or show the\n"
7852
"user ID that Bazaar will use for such communication."
7853
7854
#: bzrlib/plugins/launchpad/cmds.py:206
7855
msgid ""
7856
":Examples:\n"
7857
" Show the Launchpad ID of the current user::"
7858
msgstr ""
7859
":Examples:\n"
7860
" Show the Launchpad ID of the current user::"
7861
7862
#: bzrlib/plugins/launchpad/cmds.py:209
6742
7863
msgid " bzr launchpad-login"
6743
msgstr ""
7864
msgstr " bzr launchpad-login"
6744
7865
6745
#: bzrlib/plugins/launchpad/__init__.py:252
7866
#: bzrlib/plugins/launchpad/cmds.py:211
6746
7867
msgid " Set the Launchpad ID of the current user to 'bob'::"
6747
msgstr ""
7868
msgstr " Set the Launchpad ID of the current user to 'bob'::"
6748
7869
6749
#: bzrlib/plugins/launchpad/__init__.py:254
7870
#: bzrlib/plugins/launchpad/cmds.py:213
6750
7871
msgid " bzr launchpad-login bob"
6751
msgstr ""
7872
msgstr " bzr launchpad-login bob"
6752
7873
6753
#: bzrlib/plugins/launchpad/__init__.py:261
7874
#: bzrlib/plugins/launchpad/cmds.py:220
6754
7875
msgid "Don't check that the user name is valid."
6755
msgstr ""
7876
msgstr "Don't check that the user name is valid."
6756
7877
6757
#: bzrlib/plugins/launchpad/__init__.py:276
6758
#: bzrlib/plugins/launchpad/__init__.py:287
7878
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6759
7879
msgid "Launchpad user ID exists and has SSH keys.\n"
6760
msgstr ""
7880
msgstr "Launchpad user ID exists and has SSH keys.\n"
6761
7881
6762
#: bzrlib/plugins/launchpad/__init__.py:279
7882
#: bzrlib/plugins/launchpad/cmds.py:238
6763
7883
msgid "No Launchpad user ID configured.\n"
6764
msgstr ""
7884
msgstr "No Launchpad user ID configured.\n"
6765
7885
6766
#: bzrlib/plugins/launchpad/__init__.py:290
7886
#: bzrlib/plugins/launchpad/cmds.py:249
6767
7887
#, python-format
6768
7888
msgid "Launchpad user ID set to '%s'.\n"
6769
msgstr ""
7889
msgstr "Launchpad user ID set to '%s'.\n"
6770
7890
6771
#: bzrlib/plugins/launchpad/__init__.py:298
7891
#: bzrlib/plugins/launchpad/cmds.py:255
6772
7892
msgid "Ask Launchpad to mirror a branch now."
6773
msgstr ""
7893
msgstr "Ask Launchpad to mirror a branch now."
6774
7894
6775
#: bzrlib/plugins/launchpad/__init__.py:318
7895
#: bzrlib/plugins/launchpad/cmds.py:272
6776
7896
msgid "Propose merging a branch on Launchpad."
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/__init__.py:320
6780
msgid ""
6781
"This will open your usual editor to provide the initial comment. When it\n"
6782
"has created the proposal, it will open it in your default web browser."
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/__init__.py:323
6786
msgid ""
6787
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6788
"is not supplied, the remembered submit branch will be used. If no submit\n"
6789
"branch is remembered, the development focus will be used."
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/__init__.py:327
7897
msgstr "Propose merging a branch on Launchpad."
7898
7899
#: bzrlib/plugins/launchpad/cmds.py:274
7900
msgid ""
7901
"This will open your usual editor to provide the initial comment. When it\n"
7902
"has created the proposal, it will open it in your default web browser."
7903
msgstr ""
7904
"This will open your usual editor to provide the initial comment. When it\n"
7905
"has created the proposal, it will open it in your default web browser."
7906
7907
#: bzrlib/plugins/launchpad/cmds.py:277
7908
msgid ""
7909
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7910
"is not supplied, the remembered submit branch will be used. If no submit\n"
7911
"branch is remembered, the development focus will be used."
7912
msgstr ""
7913
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7914
"is not supplied, the remembered submit branch will be used. If no submit\n"
7915
"branch is remembered, the development focus will be used."
7916
7917
#: bzrlib/plugins/launchpad/cmds.py:281
6793
7918
msgid ""
6794
7919
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6795
7920
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6796
7921
"The parameter the launchpad account name of the desired reviewer. This\n"
6797
7922
"may optionally be followed by '=' and the review type. For example:"
6798
7923
msgstr ""
7924
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7925
"the merge proposal. This can be overridden by specifying --review (-R).\n"
7926
"The parameter the launchpad account name of the desired reviewer. This\n"
7927
"may optionally be followed by '=' and the review type. For example:"
6799
7928
6800
#: bzrlib/plugins/launchpad/__init__.py:332
7929
#: bzrlib/plugins/launchpad/cmds.py:286
6801
7930
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6802
msgstr ""
7931
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
6803
7932
6804
#: bzrlib/plugins/launchpad/__init__.py:334
7933
#: bzrlib/plugins/launchpad/cmds.py:288
6805
7934
msgid ""
6806
7935
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6807
7936
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6808
7937
msgstr ""
7938
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7939
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6809
7940
6810
#: bzrlib/plugins/launchpad/__init__.py:339
7941
#: bzrlib/plugins/launchpad/cmds.py:293
6811
7942
msgid "Propose the merge on staging."
6812
msgstr ""
7943
msgstr "Propose the merge on staging."
6813
7944
6814
#: bzrlib/plugins/launchpad/__init__.py:341
7945
#: bzrlib/plugins/launchpad/cmds.py:295
6815
7946
msgid "Commit message."
6816
msgstr ""
7947
msgstr "Commit message."
6817
7948
6818
#: bzrlib/plugins/launchpad/__init__.py:343
7949
#: bzrlib/plugins/launchpad/cmds.py:297
6819
7950
msgid "Mark the proposal as approved immediately."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/launchpad/__init__.py:345
7951
msgstr "Mark the proposal as approved immediately."
7952
7953
#: bzrlib/plugins/launchpad/cmds.py:298
7954
msgid "The bug this proposal fixes."
7955
msgstr "The bug this proposal fixes."
7956
7957
#: bzrlib/plugins/launchpad/cmds.py:300
6823
7958
msgid "Requested reviewer and optional type."
6824
msgstr ""
7959
msgstr "Requested reviewer and optional type."
6825
7960
6826
#: bzrlib/plugins/launchpad/__init__.py:382
7961
#: bzrlib/plugins/launchpad/cmds.py:335
6827
7962
msgid "Find the proposal to merge this revision."
6828
msgstr ""
6829
6830
#: bzrlib/plugins/launchpad/__init__.py:384
6831
msgid ""
6832
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6833
"This works only if the selected branch was the merge proposal target, and\n"
6834
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6835
"are opened in a web browser."
6836
msgstr ""
6837
6838
#: bzrlib/plugins/launchpad/__init__.py:389
6839
msgid ""
6840
"Any revision involved in the merge may be specified-- the revision in\n"
6841
"which the merge was performed, or one of the revisions that was merged."
6842
msgstr ""
6843
6844
#: bzrlib/plugins/launchpad/__init__.py:392
7963
msgstr "Find the proposal to merge this revision."
7964
7965
#: bzrlib/plugins/launchpad/cmds.py:337
7966
msgid ""
7967
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7968
"This works only if the selected branch was the merge proposal target, and\n"
7969
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7970
"are opened in a web browser."
7971
msgstr ""
7972
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7973
"This works only if the selected branch was the merge proposal target, and\n"
7974
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7975
"are opened in a web browser."
7976
7977
#: bzrlib/plugins/launchpad/cmds.py:342
7978
msgid ""
7979
"Any revision involved in the merge may be specified-- the revision in\n"
7980
"which the merge was performed, or one of the revisions that was merged."
7981
msgstr ""
7982
"Any revision involved in the merge may be specified-- the revision in\n"
7983
"which the merge was performed, or one of the revisions that was merged."
7984
7985
#: bzrlib/plugins/launchpad/cmds.py:345
6845
7986
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6846
msgstr ""
7987
msgstr "So, to find the merge proposal that reviewed line 1 of README::"
6847
7988
6848
#: bzrlib/plugins/launchpad/__init__.py:394
7989
#: bzrlib/plugins/launchpad/cmds.py:347
6849
7990
msgid " bzr lp-find-proposal -r annotate:README:1"
6850
msgstr ""
7991
msgstr " bzr lp-find-proposal -r annotate:README:1"
6851
7992
6852
#: bzrlib/plugins/launchpad/__init__.py:409
7993
#: bzrlib/plugins/launchpad/cmds.py:363
6853
7994
msgid "No review found."
6854
msgstr ""
7995
msgstr "No review found."
6855
7996
6856
#: bzrlib/plugins/launchpad/__init__.py:410
7997
#: bzrlib/plugins/launchpad/cmds.py:364
6857
7998
#, python-format
6858
7999
msgid "%d proposals(s) found."
6859
msgstr ""
8000
msgstr "%d proposals(s) found."
6860
8001
6861
#: bzrlib/plugins/launchpad/__init__.py:420
8002
#: bzrlib/plugins/launchpad/cmds.py:374
6862
8003
msgid "Finding revision-id"
6863
msgstr ""
8004
msgstr "Finding revision-id"
6864
8005
6865
#: bzrlib/plugins/launchpad/__init__.py:427
8006
#: bzrlib/plugins/launchpad/cmds.py:381
6866
8007
msgid "Finding merge"
6867
msgstr ""
8008
msgstr "Finding merge"
6868
8009
6869
#: bzrlib/plugins/launchpad/__init__.py:432
8010
#: bzrlib/plugins/launchpad/cmds.py:386
6870
8011
msgid "Finding revno"
6871
msgstr ""
8012
msgstr "Finding revno"
6872
8013
6873
#: bzrlib/plugins/launchpad/__init__.py:437
8014
#: bzrlib/plugins/launchpad/cmds.py:392
6874
8015
msgid "Finding Launchpad branch"
6875
msgstr ""
8016
msgstr "Finding Launchpad branch"
6876
8017
6877
#: bzrlib/plugins/launchpad/__init__.py:440
8018
#: bzrlib/plugins/launchpad/cmds.py:395
6878
8019
msgid "Finding proposals"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/launchpad/account.py:66
6882
msgid "Setting ssh/sftp usernames for launchpad.net."
6883
msgstr ""
8020
msgstr "Finding proposals"
6884
8021
6885
8022
#: bzrlib/plugins/launchpad/lp_api.py:241
6886
8023
#: bzrlib/plugins/launchpad/lp_api.py:246
6887
8024
#, python-format
6888
8025
msgid "%s is not registered on Launchpad"
6889
msgstr ""
8026
msgstr "%s is not registered on Launchpad"
6890
8027
6891
8028
#: bzrlib/plugins/launchpad/lp_api.py:256
6892
8029
#, python-format
6893
8030
msgid "%s has no development focus."
6894
msgstr ""
8031
msgstr "%s has no development focus."
6895
8032
6896
8033
#: bzrlib/plugins/launchpad/lp_api.py:261
6897
8034
#, python-format
6898
8035
msgid "development focus %s has no branch."
6899
msgstr ""
8036
msgstr "development focus %s has no branch."
6900
8037
6901
8038
#: bzrlib/plugins/launchpad/lp_api.py:266
6902
8039
#, python-format
6903
8040
msgid "source package %s has no branch."
6904
msgstr ""
8041
msgstr "source package %s has no branch."
6905
8042
6906
8043
#: bzrlib/plugins/launchpad/lp_api.py:270
6907
8044
#, python-format
6908
8045
msgid "%s has no associated product or source package."
6909
msgstr ""
8046
msgstr "%s has no associated product or source package."
6910
8047
6911
8048
#: bzrlib/plugins/launchpad/lp_api.py:282
6912
8049
#, python-format
6913
8050
msgid "%s is already up-to-date."
6914
msgstr ""
8051
msgstr "%s is already up-to-date."
6915
8052
6916
8053
#: bzrlib/plugins/launchpad/lp_api.py:289
6917
8054
#, python-format
6918
8055
msgid "Pushing to %s"
6919
msgstr ""
8056
msgstr "Pushing to %s"
6920
8057
6921
8058
#: bzrlib/plugins/launchpad/lp_directory.py:170
6922
8059
msgid ""
6924
8061
" local: {1}\n"
6925
8062
" remote: {2}"
6926
8063
msgstr ""
8064
"resolution for {0}\n"
8065
" local: {1}\n"
8066
" remote: {2}"
6927
8067
6928
#: bzrlib/plugins/launchpad/lp_propose.py:149
8068
#: bzrlib/plugins/launchpad/lp_propose.py:150
6929
8069
#, python-format
6930
8070
msgid "There is already a branch merge proposal: %s"
6931
msgstr ""
8071
msgstr "There is already a branch merge proposal: %s"
6932
8072
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
8073
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6934
8074
msgid "pb parameter to convert() is deprecated"
6935
msgstr ""
8075
msgstr "pb parameter to convert() is deprecated"
6936
8076
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
8077
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6938
8078
msgid "starting upgrade from format 4 to 5"
6939
msgstr ""
8079
msgstr "starting upgrade from format 4 to 5"
6940
8080
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
8081
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6942
8082
msgid "note: upgrade may be faster if all store files are ungzipped first"
6943
msgstr ""
8083
msgstr "note: upgrade may be faster if all store files are ungzipped first"
6944
8084
6945
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
8085
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6946
8086
msgid "converting revision"
6947
msgstr ""
8087
msgstr "converting revision"
6948
8088
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
8089
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6950
8090
msgid "upgraded to weaves:"
6951
msgstr ""
8091
msgstr "upgraded to weaves:"
6952
8092
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
8093
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6954
8094
#, python-format
6955
8095
msgid "%6d revisions and inventories"
6956
msgstr ""
8096
msgstr "%6d revisions and inventories"
6957
8097
6958
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
8098
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6959
8099
#, python-format
6960
8100
msgid "%6d revisions not present"
6961
msgstr ""
8101
msgstr "%6d revisions not present"
6962
8102
6963
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
8103
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6964
8104
#, python-format
6965
8105
msgid "%6d texts"
6966
msgstr ""
8106
msgstr "%6d texts"
6967
8107
6968
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
8108
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6969
8109
msgid "writing weave"
6970
msgstr ""
8110
msgstr "writing weave"
6971
8111
6972
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6973
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
8112
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
8113
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6974
8114
msgid "inventory"
6975
msgstr ""
8115
msgstr "inventory"
6976
8116
6977
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
8117
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6978
8118
msgid "write revision"
6979
msgstr ""
8119
msgstr "write revision"
6980
8120
6981
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
8121
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6982
8122
msgid "loading revision"
6983
msgstr ""
8123
msgstr "loading revision"
6984
8124
6985
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
8125
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6986
8126
#, python-format
6987
8127
msgid "revision {%s} not present in branch; will be converted as a ghost"
6988
msgstr ""
8128
msgstr "revision {%s} not present in branch; will be converted as a ghost"
6989
8129
6990
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
8130
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6991
8131
msgid "starting upgrade from format 5 to 6"
6992
msgstr ""
8132
msgstr "starting upgrade from format 5 to 6"
6993
8133
6994
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
8134
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6995
8135
#, python-format
6996
8136
msgid "adding prefixes to %s"
6997
msgstr ""
8137
msgstr "adding prefixes to %s"
6998
8138
6999
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
8139
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7000
8140
msgid "starting upgrade from format 6 to metadir"
7001
msgstr ""
8141
msgstr "starting upgrade from format 6 to metadir"
7002
8142
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
8143
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7004
8144
msgid "Removing ancestry.weave"
7005
msgstr ""
8145
msgstr "Removing ancestry.weave"
7006
8146
7007
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
8147
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7008
8148
msgid "Finding branch files"
7009
msgstr ""
8149
msgstr "Finding branch files"
7010
8150
7011
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
8151
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7012
8152
msgid "Upgrading repository"
7013
msgstr ""
8153
msgstr "Upgrading repository"
7014
8154
7015
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
8155
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7016
8156
msgid "Upgrading branch"
7017
msgstr ""
8157
msgstr "Upgrading branch"
7018
8158
7019
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
8159
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7020
8160
msgid "No working tree."
7021
msgstr ""
8161
msgstr "No working tree."
7022
8162
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
8163
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7024
8164
msgid "Upgrading working tree"
7025
msgstr ""
8165
msgstr "Upgrading working tree"
7026
8166
7027
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
8167
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7028
8168
#, python-format
7029
8169
msgid "Make %s lock"
7030
msgstr ""
8170
msgstr "Make %s lock"
7031
8171
7032
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
8172
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7033
8173
#, python-format
7034
8174
msgid "Moving %s"
7035
msgstr ""
8175
msgstr "Moving %s"
7036
8176
7037
8177
#: bzrlib/push.py:56
7038
8178
msgid "Created new branch."
7039
msgstr ""
8179
msgstr "Created new branch."
7040
8180
7041
8181
#: bzrlib/push.py:97
7042
8182
#, python-format
7043
8183
msgid ""
7044
8184
"Target directory %s already contains a .bzr directory, but it is not valid."
7045
8185
msgstr ""
8186
"Target directory %s already contains a .bzr directory, but it is not valid."
7046
8187
7047
8188
#: bzrlib/push.py:101
7048
8189
#, python-format
7050
8191
"Target directory %s already exists, but does not have a .bzr directory. "
7051
8192
"Supply --use-existing-dir to push there anyway."
7052
8193
msgstr ""
8194
"Target directory %s already exists, but does not have a .bzr directory. "
8195
"Supply --use-existing-dir to push there anyway."
7053
8196
7054
8197
#: bzrlib/push.py:122
7055
8198
#, python-format
7056
8199
msgid "Too many redirections trying to make %s."
7057
msgstr ""
7058
7059
#: bzrlib/push.py:147
7060
msgid ""
7061
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7062
"information."
7063
msgstr ""
7064
7065
#: bzrlib/push.py:151
7066
#, python-format
7067
msgid ""
7068
"It is not possible to losslessly push to %s. You may want to use dpush "
7069
"instead."
7070
msgstr ""
7071
7072
#: bzrlib/push.py:157
7073
#, python-format
7074
msgid ""
7075
"At %s you have a valid .bzr control directory, but not a branch or "
7076
"repository. This is an unsupported configuration. Please move the target "
7077
"directory out of the way and try again."
7078
msgstr ""
8200
msgstr "Too many redirections trying to make %s."
8201
8202
#: bzrlib/push.py:148
8203
msgid ""
8204
"These branches have diverged. See \"bzr help diverged-branches\" for more "
8205
"information."
8206
msgstr ""
8207
"These branches have diverged. See \"bzr help diverged-branches\" for more "
8208
"information."
8209
8210
#: bzrlib/push.py:152
8211
#, python-format
8212
msgid ""
8213
"It is not possible to losslessly push to %s. You may want to use dpush "
8214
"instead."
8215
msgstr ""
8216
"It is not possible to losslessly push to %s. You may want to use dpush "
8217
"instead."
8218
8219
#: bzrlib/push.py:158
8220
#, python-format
8221
msgid ""
8222
"At %s you have a valid .bzr control directory, but not a branch or "
8223
"repository. This is an unsupported configuration. Please move the target "
8224
"directory out of the way and try again."
8225
msgstr ""
8226
"At %s you have a valid .bzr control directory, but not a branch or "
8227
"repository. This is an unsupported configuration. Please move the target "
8228
"directory out of the way and try again."
7079
8229
7080
8230
#: bzrlib/reconcile.py:97
7081
8231
#, python-format
7082
8232
msgid "Reconciling branch %s"
7083
msgstr ""
8233
msgstr "Reconciling branch %s"
7084
8234
7085
8235
#: bzrlib/reconcile.py:103
7086
8236
#, python-format
7087
8237
msgid "Reconciling repository %s"
7088
msgstr ""
8238
msgstr "Reconciling repository %s"
7089
8239
7090
8240
#: bzrlib/reconcile.py:105
7091
8241
msgid "Reconciling repository"
7092
msgstr ""
8242
msgstr "Reconciling repository"
7093
8243
7094
8244
#: bzrlib/reconcile.py:111
7095
8245
#, python-format
7096
8246
msgid "%s cannot canonicalize CHKs."
7097
msgstr ""
8247
msgstr "%s cannot canonicalise CHKs."
7098
8248
7099
8249
#: bzrlib/reconcile.py:119
7100
8250
msgid "Reconcile aborted: revision index has inconsistent parents."
7101
msgstr ""
8251
msgstr "Reconcile aborted: revision index has inconsistent parents."
7102
8252
7103
8253
#: bzrlib/reconcile.py:121
7104
8254
msgid "Run \"bzr check\" for more details."
7105
msgstr ""
8255
msgstr "Run \"bzr check\" for more details."
7106
8256
7107
8257
#: bzrlib/reconcile.py:123
7108
8258
msgid "Reconciliation complete."
7109
msgstr ""
8259
msgstr "Reconciliation complete."
7110
8260
7111
8261
#: bzrlib/reconcile.py:166
7112
8262
msgid "Fixing last revision info {0} => {1}"
7113
msgstr ""
8263
msgstr "Fixing last revision info {0} => {1}"
7114
8264
7115
8265
#: bzrlib/reconcile.py:173
7116
8266
msgid "revision_history ok."
7117
msgstr ""
8267
msgstr "revision_history ok."
7118
8268
7119
8269
#: bzrlib/reconcile.py:234
7120
8270
msgid "Reading inventory data"
7121
msgstr ""
8271
msgstr "Reading inventory data"
7122
8272
7123
8273
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7124
8274
msgid "Inventory ok."
7125
msgstr ""
8275
msgstr "Inventory ok."
7126
8276
7127
8277
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7128
8278
msgid "Backing up inventory"
7129
msgstr ""
8279
msgstr "Backing up inventory"
7130
8280
7131
8281
#: bzrlib/reconcile.py:258
7132
8282
msgid "Backup inventory created."
7133
msgstr ""
8283
msgstr "Backup inventory created."
7134
8284
7135
8285
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7136
8286
msgid "Writing weave"
7137
msgstr ""
8287
msgstr "Writing weave"
7138
8288
7139
8289
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7140
8290
msgid "Inventory regenerated."
7141
msgstr ""
8291
msgstr "Inventory regenerated."
7142
8292
7143
8293
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7144
8294
msgid "Reading indexes"
7145
msgstr ""
8295
msgstr "Reading indexes"
7146
8296
7147
8297
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7148
8298
msgid "Checking unused inventories"
7149
msgstr ""
8299
msgstr "Checking unused inventories"
7150
8300
7151
8301
#: bzrlib/reconcile.py:388
7152
8302
msgid "Backup Inventory created"
7153
msgstr ""
8303
msgstr "Backup Inventory created"
7154
8304
7155
8305
#: bzrlib/reconcile.py:446
7156
8306
msgid "Fixing text parents"
7157
msgstr ""
8307
msgstr "Fixing text parents"
7158
8308
7159
8309
#: bzrlib/reconfigure.py:54
7160
8310
msgid "{0} is now stacked on {1}\n"
7161
msgstr ""
8311
msgstr "{0} is now stacked on {1}\n"
7162
8312
7163
8313
#: bzrlib/reconfigure.py:69
7164
8314
#, python-format
7165
8315
msgid "%s is now not stacked\n"
7166
msgstr ""
8316
msgstr "%s is now not stacked\n"
7167
8317
7168
8318
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7169
8319
#, python-format
7170
8320
msgid "bzr: ERROR (ignored): %s"
7171
msgstr ""
8321
msgstr "bzr: ERROR (ignored): %s"
7172
8322
7173
#: bzrlib/remote.py:2541
8323
#: bzrlib/remote.py:2534
7174
8324
msgid "Copying repository content as tarball..."
7175
msgstr ""
8325
msgstr "Copying repository content as tarball..."
7176
8326
7177
8327
#: bzrlib/rename_map.py:69
7178
8328
msgid "Calculating hashes"
7179
msgstr ""
8329
msgstr "Calculating hashes"
7180
8330
7181
8331
#: bzrlib/rename_map.py:107
7182
8332
msgid "Determining hash hits"
7183
msgstr ""
8333
msgstr "Determining hash hits"
7184
8334
7185
8335
#: bzrlib/rename_map.py:242
7186
8336
msgid "{0} => {1}"
7187
msgstr ""
8337
msgstr "{0} => {1}"
7188
8338
7189
#: bzrlib/repository.py:1787
8339
#: bzrlib/repository.py:1738
7190
8340
msgid "Moving repository to repository.backup"
7191
msgstr ""
8341
msgstr "Moving repository to repository.backup"
7192
8342
7193
#: bzrlib/repository.py:1794
8343
#: bzrlib/repository.py:1745
7194
8344
msgid "Creating new repository"
7195
msgstr ""
8345
msgstr "Creating new repository"
7196
8346
7197
#: bzrlib/repository.py:1799
8347
#: bzrlib/repository.py:1750
7198
8348
msgid "Copying content"
7199
msgstr ""
8349
msgstr "Copying content"
7200
8350
7201
#: bzrlib/repository.py:1803
8351
#: bzrlib/repository.py:1754
7202
8352
msgid "Deleting old repository content"
7203
msgstr ""
8353
msgstr "Deleting old repository content"
7204
8354
7205
#: bzrlib/repository.py:1805
8355
#: bzrlib/repository.py:1756
7206
8356
msgid "repository converted"
7207
msgstr ""
8357
msgstr "repository converted"
7208
8358
7209
8359
#: bzrlib/revisionspec.py:903
7210
8360
msgid "Using {0} {1}"
7211
msgstr ""
8361
msgstr "Using {0} {1}"
7212
8362
7213
#: bzrlib/send.py:58
8363
#: bzrlib/send.py:59
7214
8364
#, python-format
7215
8365
msgid "Mail client \"%s\" does not support specifying body"
7216
msgstr ""
8366
msgstr "Mail client \"%s\" does not support specifying body"
7217
8367
7218
#: bzrlib/send.py:62
8368
#: bzrlib/send.py:63
7219
8369
msgid "--remember requires a branch to be specified."
7220
msgstr ""
8370
msgstr "--remember requires a branch to be specified."
7221
8371
7222
#: bzrlib/send.py:77
8372
#: bzrlib/send.py:78
7223
8373
msgid "No submit branch known or specified"
7224
msgstr ""
8374
msgstr "No submit branch known or specified"
7225
8375
7226
#: bzrlib/send.py:80
8376
#: bzrlib/send.py:81
7227
8377
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7228
8378
msgstr ""
8379
"Using saved {0} location \"{1}\" to determine what changes to submit."
7229
8380
7230
#: bzrlib/send.py:98
8381
#: bzrlib/send.py:99
7231
8382
#, python-format
7232
8383
msgid "No such send format '%s'."
7233
msgstr ""
8384
msgstr "No such send format '%s'."
7234
8385
7235
#: bzrlib/send.py:114
8386
#: bzrlib/send.py:115
7236
8387
msgid "bzr send takes at most two one revision identifiers"
7237
msgstr ""
8388
msgstr "bzr send takes at most two one revision identifiers"
7238
8389
7239
#: bzrlib/send.py:127
8390
#: bzrlib/send.py:128
7240
8391
msgid "No revisions to submit."
7241
msgstr ""
8392
msgstr "No revisions to submit."
7242
8393
7243
#: bzrlib/send.py:139
8394
#: bzrlib/send.py:140
7244
8395
msgid ""
7245
8396
"- not supported for merge directives that use more than one output file."
7246
8397
msgstr ""
8398
"- not supported for merge directives that use more than one output file."
7247
8399
7248
#: bzrlib/send.py:185
8400
#: bzrlib/send.py:186
7249
8401
msgid "Format 0.9 does not permit bundle with no patch"
7250
msgstr ""
8402
msgstr "Format 0.9 does not permit bundle with no patch"
7251
8403
7252
8404
#: bzrlib/shelf_ui.py:46
7253
8405
#, python-format
7254
8406
msgid "Shelve adding file \"%(path)s\"?"
7255
msgstr ""
8407
msgstr "Shelve adding file \"%(path)s\"?"
7256
8408
7257
8409
#: bzrlib/shelf_ui.py:47
7258
8410
msgid "Shelve binary changes?"
7259
msgstr ""
8411
msgstr "Shelve binary changes?"
7260
8412
7261
8413
#: bzrlib/shelf_ui.py:48
7262
8414
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7263
msgstr ""
8415
msgstr "Shelve changing \"%s\" from %(other)s to %(this)s?"
7264
8416
7265
8417
#: bzrlib/shelf_ui.py:50
7266
8418
#, python-format
7267
8419
msgid "Shelve removing file \"%(path)s\"?"
7268
msgstr ""
8420
msgstr "Shelve removing file \"%(path)s\"?"
7269
8421
7270
8422
#: bzrlib/shelf_ui.py:51
7271
8423
#, python-format
7272
8424
msgid "Shelve %d change(s)?"
7273
msgstr ""
8425
msgstr "Shelve %d change(s)?"
7274
8426
7275
8427
#: bzrlib/shelf_ui.py:52
7276
8428
msgid "Shelve?"
7277
msgstr ""
8429
msgstr "Shelve?"
7278
8430
7279
8431
#: bzrlib/shelf_ui.py:53
7280
8432
#, python-format
7281
8433
msgid ""
7282
8434
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7283
8435
msgstr ""
8436
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7284
8437
7285
8438
#: bzrlib/shelf_ui.py:55
7286
8439
#, python-format
7287
8440
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7288
msgstr ""
8441
msgstr "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7289
8442
7290
8443
#: bzrlib/shelf_ui.py:70
7291
8444
#, python-format
7292
8445
msgid "Changes shelved with id \"%d\"."
7293
msgstr ""
8446
msgstr "Changes shelved with id \"%d\"."
7294
8447
7295
8448
#: bzrlib/shelf_ui.py:74
7296
8449
msgid "Selected changes destroyed."
7297
msgstr ""
8450
msgstr "Selected changes destroyed."
7298
8451
7299
8452
#: bzrlib/shelf_ui.py:78
7300
8453
msgid "Selected changes:"
7301
msgstr ""
8454
msgstr "Selected changes:"
7302
8455
7303
8456
#: bzrlib/shelf_ui.py:98
7304
8457
#, python-format
7305
8458
msgid "Delete file \"%(path)s\"?"
7306
msgstr ""
8459
msgstr "Delete file \"%(path)s\"?"
7307
8460
7308
8461
#: bzrlib/shelf_ui.py:99
7309
8462
msgid "Apply binary changes?"
7310
msgstr ""
8463
msgstr "Apply binary changes?"
7311
8464
7312
8465
#: bzrlib/shelf_ui.py:100
7313
8466
#, python-format
7314
8467
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7315
msgstr ""
8468
msgstr "Change \"%(path)s\" from %(this)s to %(other)s?"
7316
8469
7317
8470
#: bzrlib/shelf_ui.py:102
7318
8471
#, python-format
7319
8472
msgid "Add file \"%(path)s\"?"
7320
msgstr ""
8473
msgstr "Add file \"%(path)s\"?"
7321
8474
7322
8475
#: bzrlib/shelf_ui.py:103
7323
8476
#, python-format
7324
8477
msgid "Apply %d change(s)?"
7325
msgstr ""
8478
msgstr "Apply %d change(s)?"
7326
8479
7327
8480
#: bzrlib/shelf_ui.py:104
7328
8481
msgid "Apply change?"
7329
msgstr ""
8482
msgstr "Apply change?"
7330
8483
7331
8484
#: bzrlib/shelf_ui.py:105
7332
8485
#, python-format
7333
8486
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7334
msgstr ""
8487
msgstr "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7335
8488
7336
8489
#: bzrlib/shelf_ui.py:107
7337
8490
#, python-format
7338
8491
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7339
msgstr ""
8492
msgstr "Rename \"%(this)s\" => \"%(other)s\"?"
7340
8493
7341
8494
#: bzrlib/shelf_ui.py:402
7342
8495
msgid "No changes are shelved."
7343
msgstr ""
8496
msgstr "No changes are shelved."
7344
8497
7345
8498
#: bzrlib/shelf_ui.py:460
7346
8499
#, python-format
7347
8500
msgid "Using changes with id \"%d\"."
7348
msgstr ""
8501
msgstr "Using changes with id \"%d\"."
7349
8502
7350
8503
#: bzrlib/shelf_ui.py:464
7351
8504
#, python-format
7352
8505
msgid "Message: %s"
7353
msgstr ""
8506
msgstr "Message: %s"
7354
8507
7355
8508
#: bzrlib/shelf_ui.py:476
7356
8509
#, python-format
7357
8510
msgid "Deleted changes with id \"%d\"."
7358
msgstr ""
8511
msgstr "Deleted changes with id \"%d\"."
7359
8512
7360
8513
#: bzrlib/smart/medium.py:714
7361
8514
msgid "HPSS calls: {0} ({1} vfs) {2}"
7362
msgstr ""
8515
msgstr "HPSS calls: {0} ({1} vfs) {2}"
7363
8516
7364
8517
#: bzrlib/smart/server.py:169
7365
8518
msgid "Requested to stop gracefully"
7366
msgstr ""
8519
msgstr "Requested to stop gracefully"
7367
8520
7368
8521
#: bzrlib/smart/server.py:179
7369
8522
#, python-format
7370
8523
msgid "Waiting for %d client(s) to finish"
7371
msgstr ""
8524
msgstr "Waiting for %d client(s) to finish"
7372
8525
7373
8526
#: bzrlib/smart/server.py:185
7374
8527
#, python-format
7375
8528
msgid "Still waiting for %d client(s) to finish"
7376
msgstr ""
8529
msgstr "Still waiting for %d client(s) to finish"
7377
8530
7378
8531
#: bzrlib/smart/server.py:219
7379
8532
#, python-format
7380
8533
msgid "listening socket error: %s"
7381
msgstr ""
8534
msgstr "listening socket error: %s"
7382
8535
7383
8536
#: bzrlib/smart/server.py:452
7384
8537
#, python-format
7385
8538
msgid "listening on port: %s"
7386
msgstr ""
8539
msgstr "listening on port: %s"
7387
8540
7388
8541
#: bzrlib/switch.py:73
7389
8542
msgid "Pending merges must be committed or reverted before using switch."
7390
msgstr ""
8543
msgstr "Pending merges must be committed or reverted before using switch."
7391
8544
7392
8545
#: bzrlib/switch.py:100
7393
8546
msgid ""
7394
8547
"Cannot switch as local commits found in the checkout. Commit these to the "
7395
8548
"bound branch or use --force to throw them away."
7396
8549
msgstr ""
8550
"Cannot switch as local commits found in the checkout. Commit these to the "
8551
"bound branch or use --force to throw them away."
7397
8552
7398
8553
#: bzrlib/switch.py:105
7399
8554
#, python-format
7401
8556
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7402
8557
"anyway, use --force."
7403
8558
msgstr ""
8559
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8560
"anyway, use --force."
7404
8561
7405
#: bzrlib/switch.py:125
8562
#: bzrlib/switch.py:129
7406
8563
msgid "Cannot switch a branch, only a checkout."
7407
msgstr ""
8564
msgstr "Cannot switch a branch, only a checkout."
7408
8565
7409
#: bzrlib/switch.py:163
8566
#: bzrlib/switch.py:167
7410
8567
#, python-format
7411
8568
msgid "Tree is up to date at revision %d."
7412
msgstr ""
8569
msgstr "Tree is up to date at revision %d."
7413
8570
7414
#: bzrlib/switch.py:169
8571
#: bzrlib/switch.py:173
7415
8572
#, python-format
7416
8573
msgid "Updated to revision %d."
7417
msgstr ""
8574
msgstr "Updated to revision %d."
7418
8575
7419
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
8576
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7420
8577
msgid "Apply phase"
7421
msgstr ""
8578
msgstr "Apply phase"
7422
8579
7423
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
8580
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7424
8581
msgid "removing file"
7425
msgstr ""
8582
msgstr "removing file"
7426
8583
7427
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
8584
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7428
8585
msgid "adding file"
7429
msgstr ""
8586
msgstr "adding file"
7430
8587
7431
#: bzrlib/transform.py:2591
8588
#: bzrlib/transform.py:2598
7432
8589
msgid "Building tree"
7433
msgstr ""
8590
msgstr "Building tree"
7434
8591
7435
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
8592
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7436
8593
msgid "Adding file contents"
7437
msgstr ""
8594
msgstr "Adding file contents"
7438
8595
7439
#: bzrlib/transform.py:3028
8596
#: bzrlib/transform.py:3017
7440
8597
msgid "Resolution pass"
7441
msgstr ""
8598
msgstr "Resolution pass"
7442
8599
7443
8600
#: bzrlib/transport/ftp/_gssapi.py:88
7444
8601
#, python-format
7445
8602
msgid "Authenticated as %s"
7446
msgstr ""
8603
msgstr "Authenticated as %s"
7447
8604
7448
#: bzrlib/tree.py:634
8605
#: bzrlib/tree.py:647
7449
8606
msgid "*** {0} content-filter: {1} => {2!r}"
7450
msgstr ""
8607
msgstr "*** {0} content-filter: {1} => {2!r}"
7451
8608
7452
8609
#: bzrlib/upgrade.py:77
7453
8610
#, python-format
7454
8611
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7455
msgstr ""
8612
msgstr "This is a checkout. The branch (%s) needs to be upgraded separately."
7456
8613
7457
8614
#: bzrlib/upgrade.py:100
7458
8615
#, python-format
7459
8616
msgid "cannot upgrade from bzrdir format %s"
7460
msgstr ""
8617
msgstr "cannot upgrade from bzrdir format %s"
7461
8618
7462
8619
#: bzrlib/upgrade.py:103
7463
8620
#, python-format
7464
8621
msgid "starting upgrade of %s"
7465
msgstr ""
8622
msgstr "starting upgrade of %s"
7466
8623
7467
8624
#: bzrlib/upgrade.py:110
7468
8625
msgid "finished"
7469
msgstr ""
8626
msgstr "finished"
7470
8627
7471
8628
#: bzrlib/upgrade.py:120
7472
8629
msgid "Deleting backup.bzr"
7473
msgstr ""
8630
msgstr "Deleting backup.bzr"
7474
8631
7475
8632
#: bzrlib/upgrade.py:151
7476
8633
msgid ""
7477
8634
"\n"
7478
8635
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7479
8636
msgstr ""
8637
"\n"
8638
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7480
8639
7481
8640
#: bzrlib/upgrade.py:208
7482
8641
#, python-format
7483
8642
msgid "Found %d dependent branches - upgrading ..."
7484
msgstr ""
8643
msgstr "Found %d dependent branches - upgrading ..."
7485
8644
7486
8645
#: bzrlib/upgrade.py:276
7487
8646
msgid "Upgrading bzrdirs"
7488
msgstr ""
8647
msgstr "Upgrading bzrdirs"
7489
8648
7490
8649
#: bzrlib/upgrade.py:282
7491
8650
#, python-format
7492
8651
msgid "Upgrading %s"
7493
msgstr ""
8652
msgstr "Upgrading %s"
7494
8653
7495
8654
#: bzrlib/upgrade.py:283
7496
8655
msgid "Upgrading {0} {1} ..."
7497
msgstr ""
8656
msgstr "Upgrading {0} {1} ..."
7498
8657
7499
8658
#: bzrlib/upgrade.py:301
7500
8659
msgid "Removing backup ..."
7501
msgstr ""
8660
msgstr "Removing backup ..."
7502
8661
7503
8662
#: bzrlib/upgrade.py:305
7504
8663
msgid "failed to clean-up {0}: {1}"
7505
msgstr ""
8664
msgstr "failed to clean-up {0}: {1}"
7506
8665
7507
#: bzrlib/vf_repository.py:1090
8666
#: bzrlib/vf_repository.py:1091
7508
8667
msgid "inventories"
7509
msgstr ""
8668
msgstr "inventories"
7510
8669
7511
#: bzrlib/vf_repository.py:1116
8670
#: bzrlib/vf_repository.py:1117
7512
8671
msgid "texts"
7513
msgstr ""
8672
msgstr "texts"
7514
8673
7515
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
8674
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7516
8675
msgid "Calculating text parents"
7517
msgstr ""
8676
msgstr "Calculating text parents"
7518
8677
7519
#: bzrlib/vf_repository.py:1706
8678
#: bzrlib/vf_repository.py:1707
7520
8679
msgid "Fetch texts"
7521
msgstr ""
8680
msgstr "Fetch texts"
7522
8681
7523
#: bzrlib/vf_repository.py:2535
8682
#: bzrlib/vf_repository.py:2536
7524
8683
msgid "loading text store"
7525
msgstr ""
8684
msgstr "loading text store"
7526
8685
7527
#: bzrlib/vf_repository.py:2541
8686
#: bzrlib/vf_repository.py:2542
7528
8687
msgid "checking text graph"
7529
msgstr ""
8688
msgstr "checking text graph"
7530
8689
7531
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7532
#: bzrlib/vf_repository.py:3124
8690
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8691
#: bzrlib/vf_repository.py:3127
7533
8692
msgid "Transferring revisions"
7534
msgstr ""
8693
msgstr "Transferring revisions"
7535
8694
7536
8695
#: bzrlib/win32utils.py:146
7537
8696
msgid "Failed to GetProcessMemoryInfo()"
7538
msgstr ""
8697
msgstr "Failed to GetProcessMemoryInfo()"
7539
8698
7540
8699
#: bzrlib/win32utils.py:167
7541
8700
msgid "Cannot debug memory on win32 without ctypes or win32process"
7542
msgstr ""
8701
msgstr "Cannot debug memory on win32 without ctypes or win32process"
7543
8702
7544
8703
#: bzrlib/win32utils.py:172
7545
8704
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7546
msgstr ""
8705
msgstr "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7547
8706
7548
8707
#: bzrlib/win32utils.py:180
7549
8708
#, python-format
7550
8709
msgid "WorkingSize %8d KiB"
7551
msgstr ""
8710
msgstr "WorkingSize %8d KiB"
7552
8711
7553
8712
#: bzrlib/win32utils.py:181
7554
8713
#, python-format
7555
8714
msgid "PeakWorking %8d KiB"
7556
msgstr ""
8715
msgstr "PeakWorking %8d KiB"
7557
8716
7558
8717
#: bzrlib/win32utils.py:182
7559
8718
#, python-format
7560
8719
msgid "PagefileUsage %8d KiB"
7561
msgstr ""
8720
msgstr "PagefileUsage %8d KiB"
7562
8721
7563
8722
#: bzrlib/win32utils.py:183
7564
8723
#, python-format
7565
8724
msgid "PeakPagefileUsage %8d KiB"
7566
msgstr ""
8725
msgstr "PeakPagefileUsage %8d KiB"
7567
8726
7568
8727
#: bzrlib/win32utils.py:185
7569
8728
#, python-format
7570
8729
msgid "PrivateUsage %8d KiB"
7571
msgstr ""
8730
msgstr "PrivateUsage %8d KiB"
7572
8731
7573
8732
#: bzrlib/win32utils.py:186
7574
8733
#, python-format
7575
8734
msgid "PageFaultCount %8d"
7576
msgstr ""
8735
msgstr "PageFaultCount %8d"
7577
8736
7578
#: bzrlib/workingtree.py:1478
8737
#: bzrlib/workingtree.py:1482
7579
8738
msgid "Rerun update after fixing the conflicts."
7580
msgstr ""
8739
msgstr "Rerun update after fixing the conflicts."
7581
8740
7582
8741
#: dummy/help_topics/authentication/summary.txt:1
7583
8742
msgid "Information on configuring authentication"
7584
msgstr ""
8743
msgstr "Information on configuring authentication"
7585
8744
7586
8745
#: dummy/help_topics/basic/detail.txt:1
7587
8746
msgid ""
7588
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8747
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7589
8748
"http://bazaar.canonical.com/"
7590
8749
msgstr ""
8750
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8751
"http://bazaar.canonical.com/"
7591
8752
7592
8753
#: dummy/help_topics/basic/detail.txt:4
7593
8754
msgid ""
7595
8756
" bzr init makes this directory a versioned branch\n"
7596
8757
" bzr branch make a copy of another branch"
7597
8758
msgstr ""
8759
"Basic commands:\n"
8760
" bzr init makes this directory a versioned branch\n"
8761
" bzr branch make a copy of another branch"
7598
8762
7599
8763
#: dummy/help_topics/basic/detail.txt:8
7600
8764
msgid ""
7602
8766
" bzr ignore ignore a file or pattern\n"
7603
8767
" bzr mv move or rename a versioned file"
7604
8768
msgstr ""
8769
" bzr add make files or directories versioned\n"
8770
" bzr ignore ignore a file or pattern\n"
8771
" bzr mv move or rename a versioned file"
7605
8772
7606
8773
#: dummy/help_topics/basic/detail.txt:12
7607
8774
msgid ""
7608
8775
" bzr status summarize changes in working copy\n"
7609
8776
" bzr diff show detailed diffs"
7610
8777
msgstr ""
8778
" bzr status summarise changes in working copy\n"
8779
" bzr diff show detailed diffs"
7611
8780
7612
8781
#: dummy/help_topics/basic/detail.txt:15
7613
8782
msgid ""
7615
8784
" bzr commit save some or all changes\n"
7616
8785
" bzr send send changes via email"
7617
8786
msgstr ""
8787
" bzr merge pull in changes from another branch\n"
8788
" bzr commit save some or all changes\n"
8789
" bzr send send changes via email"
7618
8790
7619
8791
#: dummy/help_topics/basic/detail.txt:19
7620
8792
msgid ""
7621
8793
" bzr log show history of changes\n"
7622
8794
" bzr check validate storage"
7623
8795
msgstr ""
8796
" bzr log show history of changes\n"
8797
" bzr check validate storage"
7624
8798
7625
8799
#: dummy/help_topics/basic/detail.txt:22
7626
8800
msgid ""
7628
8802
" bzr help commands list all commands\n"
7629
8803
" bzr help topics list all help topics\n"
7630
8804
msgstr ""
8805
" bzr help init more help on e.g. init command\n"
8806
" bzr help commands list all commands\n"
8807
" bzr help topics list all help topics\n"
7631
8808
7632
8809
#: dummy/help_topics/basic/summary.txt:1
7633
8810
msgid "Basic commands"
7634
msgstr ""
8811
msgstr "Basic commands"
7635
8812
7636
8813
#: dummy/help_topics/branches/detail.txt:1
7637
8814
msgid "Branches"
7638
msgstr ""
8815
msgstr "Branches"
7639
8816
7640
8817
#: dummy/help_topics/branches/detail.txt:3
7641
8818
msgid ""
7644
8821
"branch history is stored), but multiple branches may share the same\n"
7645
8822
"repository (a shared repository). Branches can be copied and merged."
7646
8823
msgstr ""
8824
"A branch consists of the state of a project, including all of its\n"
8825
"history. All branches have a repository associated (which is where the\n"
8826
"branch history is stored), but multiple branches may share the same\n"
8827
"repository (a shared repository). Branches can be copied and merged."
7647
8828
7648
8829
#: dummy/help_topics/branches/detail.txt:8
7649
8830
msgid ""
7654
8835
"to succeed, it may be necessary to update the current branch using \n"
7655
8836
"``bzr update``."
7656
8837
msgstr ""
8838
"In addition, one branch may be bound to another one. Binding to another\n"
8839
"branch indicates that commits which happen in this branch must also \n"
8840
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8841
"commits when the two branches are out of date. In order for a commit \n"
8842
"to succeed, it may be necessary to update the current branch using \n"
8843
"``bzr update``."
7657
8844
7658
8845
#: dummy/help_topics/branches/detail.txt:15
7659
8846
#: dummy/help_topics/checkouts/detail.txt:66
7660
8847
#: dummy/help_topics/repositories/detail.txt:36
7661
8848
msgid "Related commands::"
7662
msgstr ""
8849
msgstr "Related commands::"
7663
8850
7664
8851
#: dummy/help_topics/branches/detail.txt:17
7665
8852
msgid ""
7668
8855
" merge Perform a three-way merge.\n"
7669
8856
" bind Bind a branch to another one.\n"
7670
8857
msgstr ""
8858
" init Change a directory into a versioned branch.\n"
8859
" branch Create a new branch that is a copy of an existing branch.\n"
8860
" merge Perform a three-way merge.\n"
8861
" bind Bind a branch to another one.\n"
7671
8862
7672
8863
#: dummy/help_topics/branches/summary.txt:1
7673
8864
msgid "Information on what a branch is"
7674
msgstr ""
8865
msgstr "Information on what a branch is"
7675
8866
7676
8867
#: dummy/help_topics/bugs/summary.txt:1
7677
8868
msgid "Bug tracker settings"
7678
msgstr ""
8869
msgstr "Bug tracker settings"
7679
8870
7680
8871
#: dummy/help_topics/checkouts/detail.txt:1
7681
8872
msgid "Checkouts"
7682
msgstr ""
8873
msgstr "Checkouts"
7683
8874
7684
8875
#: dummy/help_topics/checkouts/detail.txt:3
7685
8876
msgid ""
7691
8882
"doesn't have the same restrictions. And using checkouts still allows\n"
7692
8883
"others working on the project to use whatever workflow they like."
7693
8884
msgstr ""
8885
"Checkouts are source trees that are connected to a branch, so that when\n"
8886
"you commit in the source tree, the commit goes into that branch. They\n"
8887
"allow you to use a simpler, more centralised workflow, ignoring some of\n"
8888
"Bazaar's decentralised features until you want them. Using checkouts\n"
8889
"with shared repositories is very similar to working with SVN or CVS, but\n"
8890
"doesn't have the same restrictions. And using checkouts still allows\n"
8891
"others working on the project to use whatever workflow they like."
7694
8892
7695
8893
#: dummy/help_topics/checkouts/detail.txt:11
7696
8894
msgid ""
7705
8903
"facilitates lockstep development, where each developer is working together,\n"
7706
8904
"continuously integrating the changes of others."
7707
8905
msgstr ""
8906
"A checkout is created with the bzr checkout command (see \"help "
8907
"checkout\").\n"
8908
"You pass it a reference to another branch, and it will create a local copy\n"
8909
"for you that still contains a reference to the branch you created the\n"
8910
"checkout from (the master branch). Then if you make any commits they will "
8911
"be\n"
8912
"made on the other branch first. This creates an instant mirror of your work, "
8913
"or\n"
8914
"facilitates lockstep development, where each developer is working together,\n"
8915
"continuously integrating the changes of others."
7708
8916
7709
8917
#: dummy/help_topics/checkouts/detail.txt:19
7710
8918
msgid ""
7719
8927
"local\n"
7720
8928
"commit."
7721
8929
msgstr ""
8930
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8931
"you have the full history locally. As you have a first class branch you "
8932
"can\n"
8933
"also commit locally if you want, for instance due to the temporary loss af "
8934
"a\n"
8935
"network connection. Use the --local option to commit to do this. All the "
8936
"local\n"
8937
"commits will then be made on the master branch the next time you do a non-"
8938
"local\n"
8939
"commit."
7722
8940
7723
8941
#: dummy/help_topics/checkouts/detail.txt:26
7724
8942
msgid ""
7729
8947
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7730
8948
"command when needed."
7731
8949
msgstr ""
8950
"If you are using a checkout from a shared branch you will periodically want "
8951
"to\n"
8952
"pull in all the changes made by others. This is done using the \"update\"\n"
8953
"command. The changes need to be applied before any non-local commit, but\n"
8954
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8955
"command when needed."
7732
8956
7733
8957
#: dummy/help_topics/checkouts/detail.txt:32
7734
8958
msgid ""
7741
8965
"you\n"
7742
8966
"don't have a local branch, then you cannot commit locally."
7743
8967
msgstr ""
8968
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8969
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8970
"SVN checkout in that it is not a first class branch, it mainly consists of "
8971
"the\n"
8972
"working tree. This means that any history operations must query the master\n"
8973
"branch, which could be slow if a network connection is involved. Also, as "
8974
"you\n"
8975
"don't have a local branch, then you cannot commit locally."
7744
8976
7745
8977
#: dummy/help_topics/checkouts/detail.txt:39
7746
8978
msgid ""
7755
8987
"on\n"
7756
8988
"the same disk then there won't be a noticeable difference."
7757
8989
msgstr ""
8990
"Lightweight checkouts work best when you have fast reliable access to the\n"
8991
"master branch. This means that if the master branch is on the same disk or "
8992
"LAN\n"
8993
"a lightweight checkout will be faster than a heavyweight one for any "
8994
"commands\n"
8995
"that modify the revision history (as only one copy of the branch needs to\n"
8996
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8997
"that uses the history but does not change it, but if the master branch is "
8998
"on\n"
8999
"the same disk then there won't be a noticeable difference."
7758
9000
7759
9001
#: dummy/help_topics/checkouts/detail.txt:47
7760
9002
msgid ""
7763
9005
"switching the master branch that the checkout points to when you want to\n"
7764
9006
"work on a different branch."
7765
9007
msgstr ""
9008
"Another possible use for a checkout is to use it with a treeless repository\n"
9009
"containing your branches, where you maintain only one working tree by\n"
9010
"switching the master branch that the checkout points to when you want to\n"
9011
"work on a different branch."
7766
9012
7767
9013
#: dummy/help_topics/checkouts/detail.txt:52
7768
9014
msgid ""
7776
9022
"is\n"
7777
9023
"file permissions."
7778
9024
msgstr ""
9025
"Obviously to commit on a checkout you need to be able to write to the "
9026
"master\n"
9027
"branch. This means that the master branch must be accessible over a "
9028
"writeable\n"
9029
"protocol , such as sftp://, and that you have write permissions at the "
9030
"other\n"
9031
"end. Checkouts also work on the local file system, so that all that matters "
9032
"is\n"
9033
"file permissions."
7779
9034
7780
9035
#: dummy/help_topics/checkouts/detail.txt:58
7781
9036
msgid ""
7791
9046
"the\n"
7792
9047
"branch is bound it will tell you the location of the bound branch."
7793
9048
msgstr ""
9049
"You can change the master of a checkout by using the \"switch\" command "
9050
"(see\n"
9051
"\"help switch\"). This will change the location that the commits are sent "
9052
"to.\n"
9053
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
9054
"checkout. If you would like to convert your heavy checkout into a normal\n"
9055
"branch so that every commit is local, you can use the \"unbind\" command. To "
9056
"see\n"
9057
"whether or not a branch is bound or not you can use the \"info\" command. If "
9058
"the\n"
9059
"branch is bound it will tell you the location of the bound branch."
7794
9060
7795
9061
#: dummy/help_topics/checkouts/detail.txt:68
7796
9062
msgid ""
7812
9078
" bound, then it will also display the location of the bound "
7813
9079
"branch\n"
7814
9080
msgstr ""
9081
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
9082
" checkout\n"
9083
" update Pull any changes in the master branch in to your checkout\n"
9084
" commit Make a commit that is sent to the master branch. If you have\n"
9085
" a heavy checkout then the --local option will commit to the\n"
9086
" checkout without sending the commit to the master\n"
9087
" switch Change the master branch that the commits in the checkout "
9088
"will\n"
9089
" be sent to\n"
9090
" bind Turn a standalone branch into a heavy checkout so that any\n"
9091
" commits will be sent to the master branch\n"
9092
" unbind Turn a heavy checkout into a standalone branch so that any\n"
9093
" commits are only made locally\n"
9094
" info Displays whether a branch is bound or unbound. If the branch "
9095
"is\n"
9096
" bound, then it will also display the location of the bound "
9097
"branch\n"
7815
9098
7816
9099
#: dummy/help_topics/checkouts/summary.txt:1
7817
9100
msgid "Information on what a checkout is"
7818
msgstr ""
9101
msgstr "Information on what a checkout is"
7819
9102
7820
9103
#: dummy/help_topics/commands/summary.txt:1
7821
9104
msgid "Basic help for all commands"
7822
msgstr ""
9105
msgstr "Basic help for all commands"
7823
9106
7824
9107
#: dummy/help_topics/configuration/summary.txt:1
7825
9108
msgid "Details on the configuration settings available"
7826
msgstr ""
9109
msgstr "Details on the configuration settings available"
7827
9110
7828
9111
#: dummy/help_topics/conflict-types/summary.txt:1
7829
9112
msgid "Types of conflicts and what to do about them"
7830
msgstr ""
9113
msgstr "Types of conflicts and what to do about them"
7831
9114
7832
9115
#: dummy/help_topics/content-filters/summary.txt:1
7833
9116
msgid "Conversion of content into/from working trees"
7834
msgstr ""
9117
msgstr "Conversion of content into/from working trees"
7835
9118
7836
9119
#: dummy/help_topics/criss-cross/detail.txt:1
7837
9120
msgid "Criss-Cross"
7838
msgstr ""
9121
msgstr "Criss-Cross"
7839
9122
7840
9123
#: dummy/help_topics/criss-cross/detail.txt:3
7841
9124
msgid ""
7842
9125
"A criss-cross in the branch history can cause the default merge technique\n"
7843
9126
"to emit more conflicts than would normally be expected."
7844
9127
msgstr ""
9128
"A criss-cross in the branch history can cause the default merge technique\n"
9129
"to emit more conflicts than would normally be expected."
7845
9130
7846
9131
#: dummy/help_topics/criss-cross/detail.txt:6
7847
9132
msgid ""
7850
9135
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7851
9136
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7852
9137
msgstr ""
9138
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
9139
"give\n"
9140
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
9141
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7853
9142
7854
9143
#: dummy/help_topics/criss-cross/detail.txt:10
7855
9144
msgid ""
7860
9149
"time. They can be avoided by having each branch only merge from or into a\n"
7861
9150
"designated central branch (a \"star topology\")."
7862
9151
msgstr ""
9152
"Criss-crosses occur in a branch's history if two branches merge the same "
9153
"thing\n"
9154
"and then merge one another, or if two branches merge one another at the "
9155
"same\n"
9156
"time. They can be avoided by having each branch only merge from or into a\n"
9157
"designated central branch (a \"star topology\")."
7863
9158
7864
9159
#: dummy/help_topics/criss-cross/detail.txt:15
7865
9160
msgid ""
7870
9165
"differences between THIS and OTHER are due to one side adding lines, or\n"
7871
9166
"from another side removing lines."
7872
9167
msgstr ""
9168
"Criss-crosses cause problems because of the way merge works. Bazaar's "
9169
"default\n"
9170
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
9171
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
9172
"differences between THIS and OTHER are due to one side adding lines, or\n"
9173
"from another side removing lines."
7873
9174
7874
9175
#: dummy/help_topics/criss-cross/detail.txt:21
7875
9176
msgid ""
7879
9180
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7880
9181
"are emitted."
7881
9182
msgstr ""
9183
"Criss-crosses mean there is no good choice for a base. Selecting the "
9184
"recent\n"
9185
"merge points could cause one side's changes to be silently discarded.\n"
9186
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
9187
"are emitted."
7882
9188
7883
9189
#: dummy/help_topics/criss-cross/detail.txt:26
7884
9190
msgid ""
7886
9192
"line-origin detection instead of a basis revision to determine the cause of\n"
7887
9193
"differences.\n"
7888
9194
msgstr ""
9195
"The ``weave`` merge type is not affected by this problem because it uses\n"
9196
"line-origin detection instead of a basis revision to determine the cause of\n"
9197
"differences.\n"
7889
9198
7890
9199
#: dummy/help_topics/criss-cross/summary.txt:1
7891
9200
msgid "Information on criss-cross merging"
7892
msgstr ""
9201
msgstr "Information on criss-cross merging"
7893
9202
7894
9203
#: dummy/help_topics/current-formats/summary.txt:1
7895
9204
msgid "Current storage formats"
7896
msgstr ""
9205
msgstr "Current storage formats"
7897
9206
7898
9207
#: dummy/help_topics/debug-flags/summary.txt:1
7899
9208
msgid "Options to show or record debug information"
7900
msgstr ""
9209
msgstr "Options to show or record debug information"
7901
9210
7902
9211
#: dummy/help_topics/diverged-branches/summary.txt:1
7903
9212
msgid "How to fix diverged branches"
7904
msgstr ""
7905
7906
#: dummy/help_topics/env-variables/detail.txt:1
7907
msgid "Environment Variables"
7908
msgstr ""
7909
7910
#: dummy/help_topics/env-variables/detail.txt:3
7911
msgid ""
7912
"=================== "
7913
"===========================================================\n"
7914
"BZRPATH Path where bzr is to look for shell plugin external\n"
7915
" commands.\n"
7916
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7917
"EMAIL E-Mail address of the user.\n"
7918
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7919
"EDITOR Editor for editing commit messages.\n"
7920
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7921
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7922
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7923
"BZR_PLUGIN_PATH.\n"
7924
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7925
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7926
"and\n"
7927
" HOME.\n"
7928
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7929
"URLs).\n"
7930
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7931
"sshcorp,\n"
7932
" plink or lsh.\n"
7933
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7934
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7935
"BZR_COLUMNS Override implicit terminal width.\n"
7936
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7937
"(selftest)\n"
7938
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7939
"'text'.\n"
7940
"BZR_PDB Control whether to launch a debugger on error.\n"
7941
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7942
" breakin debugger.\n"
7943
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7944
"(instead\n"
7945
" of char-based).\n"
7946
"=================== "
7947
"===========================================================\n"
7948
msgstr ""
9213
msgstr "How to fix diverged branches"
7949
9214
7950
9215
#: dummy/help_topics/env-variables/summary.txt:1
7951
9216
msgid "Environment variable names and values"
7952
msgstr ""
9217
msgstr "Environment variable names and values"
7953
9218
7954
9219
#: dummy/help_topics/eol/summary.txt:1
7955
9220
msgid "Information on end-of-line handling"
7956
msgstr ""
9221
msgstr "Information on end-of-line handling"
7957
9222
7958
9223
#: dummy/help_topics/files/detail.txt:1
7959
9224
msgid "Files"
7960
msgstr ""
9225
msgstr "Files"
7961
9226
7962
9227
#: dummy/help_topics/files/detail.txt:3
7963
9228
msgid ""
7965
9230
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7966
9231
"bazaar\\\\2.0\\\\bazaar.conf"
7967
9232
msgstr ""
9233
":On Unix: ~/.bazaar/bazaar.conf\n"
9234
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
9235
"bazaar\\\\2.0\\\\bazaar.conf"
7968
9236
7969
9237
#: dummy/help_topics/files/detail.txt:6
7970
9238
msgid ""
7973
9241
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7974
9242
"commonly used options."
7975
9243
msgstr ""
9244
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
9245
"used to define general configuration that will be applied everywhere.\n"
9246
"The section ``[ALIASES]`` can be used to create command aliases for\n"
9247
"commonly used options."
7976
9248
7977
9249
#: dummy/help_topics/files/detail.txt:11
7978
9250
msgid "A typical config file might look something like::"
7979
msgstr ""
9251
msgstr "A typical config file might look something like::"
7980
9252
7981
9253
#: dummy/help_topics/files/detail.txt:13
7982
9254
msgid ""
7983
9255
" [DEFAULT]\n"
7984
9256
" email=John Doe <jdoe@isp.com>"
7985
9257
msgstr ""
9258
" [DEFAULT]\n"
9259
" email=John Doe <jdoe@isp.com>"
7986
9260
7987
9261
#: dummy/help_topics/files/detail.txt:16
7988
9262
msgid ""
7990
9264
" commit = commit --strict\n"
7991
9265
" log10 = log --short -r -10..-1\n"
7992
9266
msgstr ""
9267
" [ALIASES]\n"
9268
" commit = commit --strict\n"
9269
" log10 = log --short -r -10..-1\n"
7993
9270
7994
9271
#: dummy/help_topics/files/summary.txt:1
7995
9272
msgid "Information on configuration and log files"
7996
msgstr ""
9273
msgstr "Information on configuration and log files"
7997
9274
7998
9275
#: dummy/help_topics/formats/detail.txt:1
7999
9276
msgid "Storage Formats"
8000
msgstr ""
9277
msgstr "Storage Formats"
8001
9278
8002
9279
#: dummy/help_topics/formats/detail.txt:3
8003
9280
msgid ""
8007
9284
"formats may also be introduced to improve performance and\n"
8008
9285
"scalability."
8009
9286
msgstr ""
9287
"To ensure that older clients do not access data incorrectly,\n"
9288
"Bazaar's policy is to introduce a new storage format whenever\n"
9289
"new features requiring new metadata are added. New storage\n"
9290
"formats may also be introduced to improve performance and\n"
9291
"scalability."
8010
9292
8011
9293
#: dummy/help_topics/formats/detail.txt:9
8012
9294
msgid ""
8014
9296
"project is not using 2a, then you should suggest to the\n"
8015
9297
"project owner to upgrade."
8016
9298
msgstr ""
9299
"The newest format, 2a, is highly recommended. If your\n"
9300
"project is not using 2a, then you should suggest to the\n"
9301
"project owner to upgrade."
8017
9302
8018
9303
#: dummy/help_topics/formats/detail.txt:13
8019
9304
msgid ""
8020
9305
"\n"
8021
9306
".. note::"
8022
9307
msgstr ""
9308
"\n"
9309
".. note::"
8023
9310
8024
9311
#: dummy/help_topics/formats/detail.txt:16
8025
9312
msgid ""
8033
9320
" around the same time. 2a and all future formats will be\n"
8034
9321
" implicitly rich-root."
8035
9322
msgstr ""
9323
" Some of the older formats have two variants:\n"
9324
" a plain one and a rich-root one. The latter include an additional\n"
9325
" field about the root of the tree. There is no performance cost\n"
9326
" for using a rich-root format but you cannot easily merge changes\n"
9327
" from a rich-root format into a plain format. As a consequence,\n"
9328
" moving a project to a rich-root format takes some co-ordination\n"
9329
" in that all contributors need to upgrade their repositories\n"
9330
" around the same time. 2a and all future formats will be\n"
9331
" implicitly rich-root."
8036
9332
8037
9333
#: dummy/help_topics/formats/detail.txt:26
8038
9334
msgid ""
8040
9336
"currently supported formats. See :doc:`other-formats-help` for\n"
8041
9337
"descriptions of any available experimental and deprecated formats.\n"
8042
9338
msgstr ""
9339
"See :doc:`current-formats-help` for the complete list of\n"
9340
"currently supported formats. See :doc:`other-formats-help` for\n"
9341
"descriptions of any available experimental and deprecated formats.\n"
8043
9342
8044
9343
#: dummy/help_topics/formats/summary.txt:1
8045
9344
msgid "Information on choosing a storage format"
8046
msgstr ""
9345
msgstr "Information on choosing a storage format"
8047
9346
8048
9347
#: dummy/help_topics/global-options/detail.txt:1
8049
9348
msgid "Global Options"
8050
msgstr ""
9349
msgstr "Global Options"
8051
9350
8052
9351
#: dummy/help_topics/global-options/detail.txt:3
8053
9352
msgid ""
8054
9353
"These options may be used with any command, and may appear in front of any\n"
8055
9354
"command. (e.g. ``bzr --profile help``)."
8056
9355
msgstr ""
9356
"These options may be used with any command, and may appear in front of any\n"
9357
"command. (e.g. ``bzr --profile help``)."
8057
9358
8058
9359
#: dummy/help_topics/global-options/detail.txt:6
8059
9360
msgid ""
8067
9368
"--no-l10n Do not translate messages.\n"
8068
9369
"--concurrency Number of processes that can be run concurrently (selftest)."
8069
9370
msgstr ""
9371
"--version Print the version number. Must be supplied before the "
9372
"command.\n"
9373
"--no-aliases Do not process command aliases when running this command.\n"
9374
"--builtin Use the built-in version of a command, not the plugin "
9375
"version.\n"
9376
" This does not suppress other plugin effects.\n"
9377
"--no-plugins Do not process any plugins.\n"
9378
"--no-l10n Do not translate messages.\n"
9379
"--concurrency Number of processes that can be run concurrently (selftest)."
8070
9380
8071
9381
#: dummy/help_topics/global-options/detail.txt:14
8072
9382
msgid ""
8083
9393
" will be a pickle.\n"
8084
9394
"--coverage Generate line coverage report in the specified directory."
8085
9395
msgstr ""
9396
"--profile Profile execution using the hotshot profiler.\n"
9397
"--lsprof Profile execution using the lsprof profiler.\n"
9398
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
9399
" results to a specified file. If the filename ends with "
9400
"\".txt\",\n"
9401
" text format will be used. If the filename either starts "
9402
"with\n"
9403
" \"callgrind.out\" or end with \".callgrind\", the output will "
9404
"be\n"
9405
" formatted for use with KCacheGrind. Otherwise, the output\n"
9406
" will be a pickle.\n"
9407
"--coverage Generate line coverage report in the specified directory."
8086
9408
8087
9409
#: dummy/help_topics/global-options/detail.txt:24
8088
9410
msgid ""
8092
9414
"if\n"
8093
9415
" several options need to be overridden."
8094
9416
msgstr ""
9417
"-Oname=value Override the ``name`` config option setting it to ``value`` "
9418
"for\n"
9419
" the duration of the command. This can be used multiple times "
9420
"if\n"
9421
" several options need to be overridden."
8095
9422
8096
9423
#: dummy/help_topics/global-options/detail.txt:28
8097
9424
msgid ""
8098
9425
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8099
9426
"information on profiling."
8100
9427
msgstr ""
9428
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
9429
"information on profiling."
8101
9430
8102
9431
#: dummy/help_topics/global-options/detail.txt:31
8103
9432
msgid ""
8104
9433
"A number of debug flags are also available to assist troubleshooting and\n"
8105
9434
"development. See :doc:`debug-flags-help`.\n"
8106
9435
msgstr ""
9436
"A number of debug flags are also available to assist troubleshooting and\n"
9437
"development. See :doc:`debug-flags-help`.\n"
8107
9438
8108
9439
#: dummy/help_topics/global-options/summary.txt:1
8109
9440
msgid "Options that control how Bazaar runs"
8110
msgstr ""
9441
msgstr "Options that control how Bazaar runs"
8111
9442
8112
9443
#: dummy/help_topics/hidden-commands/summary.txt:1
8113
9444
msgid "All hidden commands"
8114
msgstr ""
9445
msgstr "All hidden commands"
8115
9446
8116
9447
#: dummy/help_topics/hooks/summary.txt:1
8117
9448
msgid "Points at which custom processing can be added"
8118
msgstr ""
9449
msgstr "Points at which custom processing can be added"
8119
9450
8120
9451
#: dummy/help_topics/launchpad/detail.txt:1
8121
9452
msgid "Integration with Launchpad.net"
8122
msgstr ""
9453
msgstr "Integration with Launchpad.net"
8123
9454
8124
9455
#: dummy/help_topics/launchpad/detail.txt:3
8125
9456
msgid ""
8126
9457
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8127
9458
"specification tracking."
8128
9459
msgstr ""
9460
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9461
"specification tracking."
8129
9462
8130
9463
#: dummy/help_topics/launchpad/detail.txt:6
8131
9464
msgid ""
8132
9465
"The bzr client (through the plugin called 'launchpad') has special\n"
8133
9466
"features to communicate with Launchpad:"
8134
9467
msgstr ""
9468
"The bzr client (through the plugin called 'launchpad') has special\n"
9469
"features to communicate with Launchpad:"
8135
9470
8136
9471
#: dummy/help_topics/launchpad/detail.txt:9
8137
9472
msgid ""
8140
9475
" is then used by the 'lp:' transport to download your branches using\n"
8141
9476
" bzr+ssh://."
8142
9477
msgstr ""
9478
" * The launchpad-login command tells Bazaar your Launchpad user name. "
9479
"This\n"
9480
" is then used by the 'lp:' transport to download your branches using\n"
9481
" bzr+ssh://."
8143
9482
8144
9483
#: dummy/help_topics/launchpad/detail.txt:13
8145
9484
msgid ""
8149
9488
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8150
9489
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8151
9490
msgstr ""
9491
" * The 'lp:' transport uses Launchpad as a directory service: for "
9492
"example\n"
9493
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
9494
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
9495
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8152
9496
8153
9497
#: dummy/help_topics/launchpad/detail.txt:18
8154
9498
msgid ""
8159
9503
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8160
9504
" automatically be linked to the bug report."
8161
9505
msgstr ""
9506
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
9507
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
9508
"lp:12345'\n"
9509
" will record a revision property that marks that revision as fixing\n"
9510
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
9511
" automatically be linked to the bug report."
8162
9512
8163
9513
#: dummy/help_topics/launchpad/detail.txt:24
8164
9514
msgid ""
8167
9517
" its contents and allow it to be attached to bugs and other\n"
8168
9518
" objects."
8169
9519
msgstr ""
9520
" * The register-branch command tells Launchpad about the url of a\n"
9521
" public branch. Launchpad will then mirror the branch, display\n"
9522
" its contents and allow it to be attached to bugs and other\n"
9523
" objects."
8170
9524
8171
9525
#: dummy/help_topics/launchpad/detail.txt:29
8172
9526
msgid "For more information see http://help.launchpad.net/\n"
8173
msgstr ""
9527
msgstr "For more information see http://help.launchpad.net/\n"
8174
9528
8175
9529
#: dummy/help_topics/launchpad/summary.txt:1
8176
9530
msgid "Using Bazaar with Launchpad.net"
8177
msgstr ""
9531
msgstr "Using Bazaar with Launchpad.net"
8178
9532
8179
9533
#: dummy/help_topics/location-alias/summary.txt:1
8180
9534
msgid "Aliases for remembered locations"
8181
msgstr ""
9535
msgstr "Aliases for remembered locations"
8182
9536
8183
9537
#: dummy/help_topics/log-formats/summary.txt:1
8184
9538
msgid "Details on the logging formats available"
8185
msgstr ""
9539
msgstr "Details on the logging formats available"
8186
9540
8187
9541
#: dummy/help_topics/other-formats/summary.txt:1
8188
9542
msgid "Experimental and deprecated storage formats"
8189
msgstr ""
9543
msgstr "Experimental and deprecated storage formats"
8190
9544
8191
9545
#: dummy/help_topics/patterns/summary.txt:1
8192
9546
msgid "Information on the pattern syntax"
8193
msgstr ""
9547
msgstr "Information on the pattern syntax"
8194
9548
8195
9549
#: dummy/help_topics/repositories/detail.txt:1
8196
9550
msgid "Repositories"
8197
msgstr ""
9551
msgstr "Repositories"
8198
9552
8199
9553
#: dummy/help_topics/repositories/detail.txt:3
8200
9554
msgid ""
8201
9555
"Repositories in Bazaar are where committed information is stored. There is\n"
8202
9556
"a repository associated with every branch."
8203
9557
msgstr ""
9558
"Repositories in Bazaar are where committed information is stored. There is\n"
9559
"a repository associated with every branch."
8204
9560
8205
9561
#: dummy/help_topics/repositories/detail.txt:6
8206
9562
msgid ""
8209
9565
"very many commits in a short time period) you may want to ask bzr to\n"
8210
9566
"optimise the database indices. This can be done by the 'bzr pack' command."
8211
9567
msgstr ""
9568
"Repositories are a form of database. Bzr will usually maintain this for\n"
9569
"good performance automatically, but in some situations (e.g. when doing\n"
9570
"very many commits in a short time period) you may want to ask bzr to\n"
9571
"optimise the database indices. This can be done by the 'bzr pack' command."
8212
9572
8213
9573
#: dummy/help_topics/repositories/detail.txt:11
8214
9574
msgid ""
8221
9581
"it\n"
8222
9582
"can use."
8223
9583
msgstr ""
9584
"By default just running 'bzr init' will create a repository within the new\n"
9585
"branch but it is possible to create a shared repository which allows "
9586
"multiple\n"
9587
"branches to share their information in the same location. When a new branch "
9588
"is\n"
9589
"created it will first look to see if there is a containing shared repository "
9590
"it\n"
9591
"can use."
8224
9592
8225
9593
#: dummy/help_topics/repositories/detail.txt:17
8226
9594
msgid ""
8228
9596
"generally a large space saving. For some operations (e.g. branching\n"
8229
9597
"within the repository) this translates in to a large time saving."
8230
9598
msgstr ""
9599
"When two branches of the same project share a repository, there is\n"
9600
"generally a large space saving. For some operations (e.g. branching\n"
9601
"within the repository) this translates in to a large time saving."
8231
9602
8232
9603
#: dummy/help_topics/repositories/detail.txt:21
8233
9604
msgid ""
8239
9610
"this\n"
8240
9611
"directory will then use it for storage."
8241
9612
msgstr ""
9613
"To create a shared repository use the init-repository command (or the alias\n"
9614
"init-repo). This command takes the location of the repository to create. "
9615
"This\n"
9616
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
9617
"which contains a shared repository. Any new branches that are created in "
9618
"this\n"
9619
"directory will then use it for storage."
8242
9620
8243
9621
#: dummy/help_topics/repositories/detail.txt:27
8244
9622
msgid ""
8253
9631
"the branches will not have working trees pass the '--no-trees' option to\n"
8254
9632
"'init-repository'."
8255
9633
msgstr ""
9634
"It is a good idea to create a repository whenever you might create more\n"
9635
"than one branch of a project. This is true for both working areas where you\n"
9636
"are doing the development, and any server areas that you use for hosting\n"
9637
"projects. In the latter case, it is common to want branches without working\n"
9638
"trees. Since the files in the branch will not be edited directly there is "
9639
"no\n"
9640
"need to use up disk space for a working tree. To create a repository in "
9641
"which\n"
9642
"the branches will not have working trees pass the '--no-trees' option to\n"
9643
"'init-repository'."
8256
9644
8257
9645
#: dummy/help_topics/repositories/detail.txt:38
8258
9646
msgid ""
8260
9648
"one\n"
8261
9649
" in which new branches won't get a working tree.\n"
8262
9650
msgstr ""
9651
" init-repository Create a shared repository. Use --no-trees to create "
9652
"one\n"
9653
" in which new branches won't get a working tree.\n"
8263
9654
8264
9655
#: dummy/help_topics/repositories/summary.txt:1
8265
9656
msgid "Basic information on shared repositories."
8266
msgstr ""
9657
msgstr "Basic information on shared repositories."
8267
9658
8268
9659
#: dummy/help_topics/revisionspec/summary.txt:1
8269
9660
msgid "Explain how to use --revision"
8270
msgstr ""
9661
msgstr "Explain how to use --revision"
8271
9662
8272
9663
#: dummy/help_topics/rules/summary.txt:1
8273
9664
msgid "Information on defining rule-based preferences"
8274
msgstr ""
9665
msgstr "Information on defining rule-based preferences"
8275
9666
8276
9667
#: dummy/help_topics/standalone-trees/detail.txt:1
8277
9668
msgid "Standalone Trees"
8278
msgstr ""
9669
msgstr "Standalone Trees"
8279
9670
8280
9671
#: dummy/help_topics/standalone-trees/detail.txt:3
8281
9672
msgid ""
8284
9675
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8285
9676
"an existing project under version control."
8286
9677
msgstr ""
9678
"A standalone tree is a working tree with an associated repository. It\n"
9679
"is an independently usable branch, with no dependencies on any other.\n"
9680
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
9681
"an existing project under version control."
8287
9682
8288
9683
#: dummy/help_topics/standalone-trees/detail.txt:8
8289
9684
msgid "Related Commands::"
8290
msgstr ""
9685
msgstr "Related Commands::"
8291
9686
8292
9687
#: dummy/help_topics/standalone-trees/detail.txt:10
8293
9688
msgid " init Make a directory into a versioned branch.\n"
8294
msgstr ""
9689
msgstr " init Make a directory into a versioned branch.\n"
8295
9690
8296
9691
#: dummy/help_topics/standalone-trees/summary.txt:1
8297
9692
msgid "Information on what a standalone tree is"
8298
msgstr ""
9693
msgstr "Information on what a standalone tree is"
8299
9694
8300
9695
#: dummy/help_topics/standard-options/detail.txt:1
8301
9696
msgid "Standard Options"
8302
msgstr ""
9697
msgstr "Standard Options"
8303
9698
8304
9699
#: dummy/help_topics/standard-options/detail.txt:3
8305
9700
msgid "Standard options are legal for all commands."
8306
msgstr ""
9701
msgstr "Standard options are legal for all commands."
8307
9702
8308
9703
#: dummy/help_topics/standard-options/detail.txt:5
8309
9704
msgid ""
8311
9706
"--verbose, -v Display more information.\n"
8312
9707
"--quiet, -q Only display errors and warnings."
8313
9708
msgstr ""
9709
"--help, -h Show help message.\n"
9710
"--verbose, -v Display more information.\n"
9711
"--quiet, -q Only display errors and warnings."
8314
9712
8315
9713
#: dummy/help_topics/standard-options/detail.txt:9
8316
9714
msgid "Unlike global options, standard options can be used in aliases.\n"
8317
msgstr ""
9715
msgstr "Unlike global options, standard options can be used in aliases.\n"
8318
9716
8319
9717
#: dummy/help_topics/standard-options/summary.txt:1
8320
9718
msgid "Options that can be used with any command"
8321
msgstr ""
9719
msgstr "Options that can be used with any command"
8322
9720
8323
9721
#: dummy/help_topics/status-flags/detail.txt:1
8324
9722
msgid "Status Flags"
8325
msgstr ""
9723
msgstr "Status Flags"
8326
9724
8327
9725
#: dummy/help_topics/status-flags/detail.txt:3
8328
9726
msgid ""
8329
9727
"Status flags are used to summarise changes to the working tree in a concise\n"
8330
9728
"manner. They are in the form::"
8331
9729
msgstr ""
9730
"Status flags are used to summarise changes to the working tree in a concise\n"
9731
"manner. They are in the form::"
8332
9732
8333
9733
#: dummy/help_topics/status-flags/detail.txt:6
8334
9734
msgid " xxx <filename>"
8335
msgstr ""
9735
msgstr " xxx <filename>"
8336
9736
8337
9737
#: dummy/help_topics/status-flags/detail.txt:8
8338
9738
msgid "where the columns' meanings are as follows."
8339
msgstr ""
9739
msgstr "where the columns' meanings are as follows."
8340
9740
8341
9741
#: dummy/help_topics/status-flags/detail.txt:10
8342
9742
msgid "Column 1 - versioning/renames::"
8343
msgstr ""
9743
msgstr "Column 1 - versioning/renames::"
8344
9744
8345
9745
#: dummy/help_topics/status-flags/detail.txt:12
8346
9746
msgid ""
8352
9752
" C File has conflicts\n"
8353
9753
" P Entry for a pending merge (not a file)"
8354
9754
msgstr ""
9755
" + File versioned\n"
9756
" - File unversioned\n"
9757
" R File renamed\n"
9758
" ? File unknown\n"
9759
" X File non-existent (and unknown to bzr)\n"
9760
" C File has conflicts\n"
9761
" P Entry for a pending merge (not a file)"
8355
9762
8356
9763
#: dummy/help_topics/status-flags/detail.txt:20
8357
9764
msgid "Column 2 - contents::"
8358
msgstr ""
9765
msgstr "Column 2 - contents::"
8359
9766
8360
9767
#: dummy/help_topics/status-flags/detail.txt:22
8361
9768
msgid ""
8364
9771
" K File kind changed\n"
8365
9772
" M File modified"
8366
9773
msgstr ""
9774
" N File created\n"
9775
" D File deleted\n"
9776
" K File kind changed\n"
9777
" M File modified"
8367
9778
8368
9779
#: dummy/help_topics/status-flags/detail.txt:27
8369
9780
msgid "Column 3 - execute::"
8370
msgstr ""
9781
msgstr "Column 3 - execute::"
8371
9782
8372
9783
#: dummy/help_topics/status-flags/detail.txt:29
8373
9784
msgid " * The execute bit was changed\n"
8374
msgstr ""
9785
msgstr " * The execute bit was changed\n"
8375
9786
8376
9787
#: dummy/help_topics/status-flags/summary.txt:1
8377
9788
msgid "Help on status flags"
8378
msgstr ""
9789
msgstr "Help on status flags"
8379
9790
8380
9791
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8381
9792
msgid "Branches Out of Sync"
8382
msgstr ""
9793
msgstr "Branches Out of Sync"
8383
9794
8384
9795
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8385
9796
msgid ""
8389
9800
"have the same last revision as the new reference branch for the lightweight\n"
8390
9801
"checkout, data could be lost, so Bazaar refuses."
8391
9802
msgstr ""
9803
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
9804
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
9805
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
9806
"have the same last revision as the new reference branch for the lightweight\n"
9807
"checkout, data could be lost, so Bazaar refuses."
8392
9808
8393
9809
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8394
9810
msgid "How you deal with this depends on *why* the branches are out of sync."
8395
9811
msgstr ""
9812
"How you deal with this depends on *why* the branches are out of sync."
8396
9813
8397
9814
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8398
9815
msgid ""
8400
9817
"sync\n"
8401
9818
"by running \"bzr update\" (and possibly \"bzr commit\")."
8402
9819
msgstr ""
9820
"If you have a checkout and have done local commits, you can get back in "
9821
"sync\n"
9822
"by running \"bzr update\" (and possibly \"bzr commit\")."
8403
9823
8404
9824
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8405
9825
msgid ""
8411
9831
"and then push your changes. If you decide that some of the changes aren't\n"
8412
9832
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8413
9833
msgstr ""
9834
"If you have a branch and the remote branch is out-of-date, you can push\n"
9835
"the local changes using \"bzr push\". If the local branch is out of date, "
9836
"you\n"
9837
"can do \"bzr pull\". If both branches have had changes, you can merge, "
9838
"commit\n"
9839
"and then push your changes. If you decide that some of the changes aren't\n"
9840
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8414
9841
8415
9842
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8416
9843
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8417
msgstr ""
9844
msgstr "Steps to resolve \"out-of-sync\" when reconfiguring"
8418
9845
8419
9846
#: dummy/help_topics/topics/summary.txt:1
8420
9847
msgid "Topics list"
8421
msgstr ""
9848
msgstr "Topics list"
8422
9849
8423
9850
#: dummy/help_topics/url-special-chars/summary.txt:1
8424
9851
msgid "Special character handling in URLs"
8425
msgstr ""
9852
msgstr "Special character handling in URLs"
8426
9853
8427
9854
#: dummy/help_topics/urlspec/summary.txt:1
8428
9855
msgid "Supported transport protocols"
8429
msgstr ""
9856
msgstr "Supported transport protocols"
8430
9857
8431
9858
#: dummy/help_topics/working-trees/detail.txt:1
8432
9859
msgid "Working Trees"
8433
msgstr ""
9860
msgstr "Working Trees"
8434
9861
8435
9862
#: dummy/help_topics/working-trees/detail.txt:3
8436
9863
msgid ""
8440
9867
"branch, and when you commit the current state of the working tree is the\n"
8441
9868
"snapshot that is recorded in the commit."
8442
9869
msgstr ""
9870
"A working tree is the contents of a branch placed on disk so that you can\n"
9871
"see the files and edit them. The working tree is where you make changes to "
9872
"a\n"
9873
"branch, and when you commit the current state of the working tree is the\n"
9874
"snapshot that is recorded in the commit."
8443
9875
8444
9876
#: dummy/help_topics/working-trees/detail.txt:8
8445
9877
msgid ""
8451
9883
"are\n"
8452
9884
"difficult to deal with remotely."
8453
9885
msgstr ""
9886
"When you push a branch to a remote system, a working tree will not be\n"
9887
"created. If one is already present the files will not be updated. The\n"
9888
"branch information will be updated and the working tree will be marked\n"
9889
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
9890
"may be uncommitted changes or the update may cause content conflicts that "
9891
"are\n"
9892
"difficult to deal with remotely."
8454
9893
8455
9894
#: dummy/help_topics/working-trees/detail.txt:15
8456
9895
msgid ""
8462
9901
"the\n"
8463
9902
"working tree by running 'bzr update' in that directory."
8464
9903
msgstr ""
9904
"If you have a branch with no working tree you can use the 'checkout' "
9905
"command\n"
9906
"to create a working tree. If you run 'bzr checkout .' from the branch it "
9907
"will\n"
9908
"create the working tree. If the branch is updated remotely, you can update "
9909
"the\n"
9910
"working tree by running 'bzr update' in that directory."
8465
9911
8466
9912
#: dummy/help_topics/working-trees/detail.txt:20
8467
9913
msgid ""
8472
9918
"branch. It can also be useful when working with a '--no-trees' repository\n"
8473
9919
"(see 'bzr help repositories')."
8474
9920
msgstr ""
9921
"If you have a branch with a working tree that you do not want the 'remove-"
9922
"tree'\n"
9923
"command will remove the tree if it is safe. This can be done to avoid the\n"
9924
"warning about the remote working tree not being updated when pushing to the\n"
9925
"branch. It can also be useful when working with a '--no-trees' repository\n"
9926
"(see 'bzr help repositories')."
8475
9927
8476
9928
#: dummy/help_topics/working-trees/detail.txt:26
8477
9929
msgid ""
8486
9938
"SSH\n"
8487
9939
"after each push."
8488
9940
msgstr ""
9941
"If you want to have a working tree on a remote machine that you push to you\n"
9942
"can either run 'bzr update' in the remote branch after each push, or use "
9943
"some\n"
9944
"other method to update the tree during the push. There is an 'rspush' "
9945
"plugin\n"
9946
"that will update the working tree using rsync as well as doing a push. "
9947
"There\n"
9948
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
9949
"SSH\n"
9950
"after each push."
8489
9951
8490
9952
#: dummy/help_topics/working-trees/detail.txt:33
8491
9953
msgid "Useful commands::"
8492
msgstr ""
9954
msgstr "Useful commands::"
8493
9955
8494
9956
#: dummy/help_topics/working-trees/detail.txt:35
8495
9957
msgid ""
8500
9962
"branch\n"
8501
9963
" this will update the tree to match the branch.\n"
8502
9964
msgstr ""
9965
" checkout Create a working tree when a branch does not have one.\n"
9966
" remove-tree Removes the working tree from a branch when it is safe to do "
9967
"so.\n"
9968
" update When a working tree is out of sync with its associated "
9969
"branch\n"
9970
" this will update the tree to match the branch.\n"
8503
9971
8504
9972
#: dummy/help_topics/working-trees/summary.txt:1
8505
9973
msgid "Information on working trees"
8506
msgstr ""
9974
msgstr "Information on working trees"
8507
9975
8508
9976
#: en/help_topics/authentication.txt:1
8509
9977
msgid ""
8510
9978
"Authentication Settings\n"
8511
9979
"======================="
8512
9980
msgstr ""
9981
"Authentication Settings\n"
9982
"======================="
8513
9983
8514
9984
#: en/help_topics/authentication.txt:4
8515
9985
msgid ""
8517
9987
"Intent\n"
8518
9988
"------"
8519
9989
msgstr ""
9990
"\n"
9991
"Intent\n"
9992
"------"
8520
9993
8521
9994
#: en/help_topics/authentication.txt:8
8522
9995
msgid ""
8526
9999
"password\n"
8527
10000
"for every branch he uses."
8528
10001
msgstr ""
10002
"Many different authentication policies can be described in the\n"
10003
"``authentication.conf`` file but a particular user should need only a few\n"
10004
"definitions to cover his needs without having to specify a user and a "
10005
"password\n"
10006
"for every branch he uses."
8529
10007
8530
10008
#: en/help_topics/authentication.txt:13
8531
10009
msgid ""
8538
10016
"different\n"
8539
10017
"servers."
8540
10018
msgstr ""
10019
"The definitions found in this file are used to find the credentials to use "
10020
"for\n"
10021
"a given url. The same credentials can generally be used for as many branches "
10022
"as\n"
10023
"possible by grouping their declaration around the remote servers that need\n"
10024
"them. It's even possible to declare credentials that will be used by "
10025
"different\n"
10026
"servers."
8541
10027
8542
10028
#: en/help_topics/authentication.txt:19
8543
10029
msgid ""
8544
10030
"The intent is to make this file as small as possible to minimize maintenance."
8545
10031
msgstr ""
10032
"The intent is to make this file as small as possible to minimise maintenance."
8546
10033
8547
10034
#: en/help_topics/authentication.txt:21
8548
10035
msgid ""
8552
10039
"sharing\n"
8553
10040
"of your urls with others)."
8554
10041
msgstr ""
10042
"Once the relevant credentials are declared in this file you may use branch "
10043
"urls\n"
10044
"without embedding passwords (security hazard) or even users (enabling "
10045
"sharing\n"
10046
"of your urls with others)."
8555
10047
8556
10048
#: en/help_topics/authentication.txt:25
8557
10049
msgid "Instead of using::"
8558
msgstr ""
10050
msgstr "Instead of using::"
8559
10051
8560
10052
#: en/help_topics/authentication.txt:27
8561
10053
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8562
msgstr ""
10054
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8563
10055
8564
10056
#: en/help_topics/authentication.txt:29
8565
10057
msgid "you simply use::"
8566
msgstr ""
10058
msgstr "you simply use::"
8567
10059
8568
10060
#: en/help_topics/authentication.txt:31
8569
10061
msgid " bzr branch ftp://host.com/path/to/my/branch"
8570
msgstr ""
10062
msgstr " bzr branch ftp://host.com/path/to/my/branch"
8571
10063
8572
10064
#: en/help_topics/authentication.txt:33
8573
10065
msgid ""
8574
10066
"provided you have created the following ``authentication.conf`` file::"
8575
10067
msgstr ""
10068
"provided you have created the following ``authentication.conf`` file::"
8576
10069
8577
10070
#: en/help_topics/authentication.txt:35
8578
10071
msgid ""
8583
10076
" password=secret\n"
8584
10077
" "
8585
10078
msgstr ""
10079
" [myprojects]\n"
10080
" scheme=ftp\n"
10081
" host=host.com\n"
10082
" user=joe\n"
10083
" password=secret\n"
10084
" "
8586
10085
8587
10086
#: en/help_topics/authentication.txt:42
8588
10087
msgid ""
8589
10088
"Authentication definitions\n"
8590
10089
"--------------------------"
8591
10090
msgstr ""
10091
"Authentication definitions\n"
10092
"--------------------------"
8592
10093
8593
10094
#: en/help_topics/authentication.txt:45
8594
10095
msgid ""
8596
10097
"by\n"
8597
10098
"bzr:"
8598
10099
msgstr ""
10100
"There are two kinds of authentication used by the various schemes supported "
10101
"by\n"
10102
"bzr:"
8599
10103
8600
10104
#: en/help_topics/authentication.txt:48
8601
10105
msgid "1. user and password"
8602
msgstr ""
10106
msgstr "1. user and password"
8603
10107
8604
10108
#: en/help_topics/authentication.txt:50
8605
10109
msgid ""
8609
10113
"provide\n"
8610
10114
"our own less secure method."
8611
10115
msgstr ""
10116
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
10117
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
10118
"ssh agents are a better, more secure solution. So we have chosen to not "
10119
"provide\n"
10120
"our own less secure method."
8612
10121
8613
10122
#: en/help_topics/authentication.txt:55
8614
10123
msgid "2. user, realm and password"
8615
msgstr ""
10124
msgstr "2. user, realm and password"
8616
10125
8617
10126
#: en/help_topics/authentication.txt:57
8618
10127
msgid ""
8627
10136
"prompts\n"
8628
10137
"you for a password."
8629
10138
msgstr ""
10139
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
10140
"against a host. But, by using ``.htaccess`` files, for example, it is "
10141
"possible\n"
10142
"to define several (``user, realm, password``) for a given ``host``. So what "
10143
"is\n"
10144
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
10145
"is\n"
10146
"not taken into account in the definitions, but will displayed if bzr "
10147
"prompts\n"
10148
"you for a password."
8630
10149
8631
10150
#: en/help_topics/authentication.txt:64
8632
10151
msgid ""
8633
10152
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8634
10153
"specifying the appropriate port."
8635
10154
msgstr ""
10155
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
10156
"specifying the appropriate port."
8636
10157
8637
10158
#: en/help_topics/authentication.txt:67
8638
10159
msgid ""
8642
10163
"``user``,\n"
8643
10164
"``password``)."
8644
10165
msgstr ""
10166
"To take all schemes into account, the password will be deduced from a set "
10167
"of\n"
10168
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
10169
"``user``,\n"
10170
"``password``)."
8645
10171
8646
10172
#: en/help_topics/authentication.txt:71
8647
10173
msgid ""
8652
10178
" should be used instead since this is the real scheme regarding\n"
8653
10179
" authentication,"
8654
10180
msgstr ""
10181
" * ``scheme``: can be empty (meaning the rest of the definition can be "
10182
"used\n"
10183
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
10184
"``ssh``\n"
10185
" should be used instead since this is the real scheme regarding\n"
10186
" authentication,"
8655
10187
8656
10188
#: en/help_topics/authentication.txt:76
8657
10189
msgid " * ``host``: can be empty (to act as a default for any host),"
8658
msgstr ""
10190
msgstr " * ``host``: can be empty (to act as a default for any host),"
8659
10191
8660
10192
#: en/help_topics/authentication.txt:78
8661
10193
msgid ""
8665
10197
"only\n"
8666
10198
" when the server uses a port different than the scheme standard port,"
8667
10199
msgstr ""
10200
" * ``port`` can be empty (useful when an host provides several servers for "
10201
"the\n"
10202
" same scheme), only numerical values are allowed, this should be used "
10203
"only\n"
10204
" when the server uses a port different than the scheme standard port,"
8668
10205
8669
10206
#: en/help_topics/authentication.txt:82
8670
10207
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8671
msgstr ""
10208
msgstr " * ``path``: can be empty (FTP or SFTP will never user it),"
8672
10209
8673
10210
#: en/help_topics/authentication.txt:84
8674
10211
msgid ""
8675
10212
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8676
10213
" ``getpass.get_user()``),"
8677
10214
msgstr ""
10215
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
10216
" ``getpass.get_user()``),"
8678
10217
8679
10218
#: en/help_topics/authentication.txt:87
8680
10219
msgid ""
8681
10220
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8682
10221
" password."
8683
10222
msgstr ""
10223
" * ``password``: can be empty if you prefer to always be prompted for your\n"
10224
" password."
8684
10225
8685
10226
#: en/help_topics/authentication.txt:90
8686
10227
msgid ""
8688
10229
"a\n"
8689
10230
"(``user`` [, ``password``]) based on the following rules :"
8690
10231
msgstr ""
10232
"Multiple definitions can be provided and, for a given URL, bzr will select "
10233
"a\n"
10234
"(``user`` [, ``password``]) based on the following rules :"
8691
10235
8692
10236
#: en/help_topics/authentication.txt:93
8693
10237
msgid " 1. the first match wins,"
8694
msgstr ""
10238
msgstr " 1. the first match wins,"
8695
10239
8696
10240
#: en/help_topics/authentication.txt:95
8697
10241
msgid " 2. empty fields match everything,"
8698
msgstr ""
10242
msgstr " 2. empty fields match everything,"
8699
10243
8700
10244
#: en/help_topics/authentication.txt:97
8701
10245
msgid ""
8702
10246
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8703
10247
msgstr ""
10248
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8704
10249
8705
10250
#: en/help_topics/authentication.txt:99
8706
10251
msgid ""
8709
10254
"``projectbzr.sf.net``\n"
8710
10255
" will not match ``bzr.sf.net``)."
8711
10256
msgstr ""
10257
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
10258
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
10259
"``projectbzr.sf.net``\n"
10260
" will not match ``bzr.sf.net``)."
8712
10261
8713
10262
#: en/help_topics/authentication.txt:103
8714
10263
msgid ""
8715
10264
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8716
10265
msgstr ""
10266
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8717
10267
8718
10268
#: en/help_topics/authentication.txt:105
8719
10269
msgid ""
8721
10271
"above,\n"
8722
10272
" empty paths will match any provided path)."
8723
10273
msgstr ""
10274
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
10275
"above,\n"
10276
" empty paths will match any provided path)."
8724
10277
8725
10278
#: en/help_topics/authentication.txt:110
8726
10279
msgid ""
8727
10280
"File format\n"
8728
10281
"-----------"
8729
10282
msgstr ""
10283
"File format\n"
10284
"-----------"
8730
10285
8731
10286
#: en/help_topics/authentication.txt:113
8732
10287
msgid ""
8733
10288
"The general rules for :doc:`configuration files <configuration-help>`\n"
8734
10289
"apply except for the variable policies."
8735
10290
msgstr ""
10291
"The general rules for :doc:`configuration files <configuration-help>`\n"
10292
"apply except for the variable policies."
8736
10293
8737
10294
#: en/help_topics/authentication.txt:116
8738
10295
msgid "Each section describes an authentication definition."
8739
msgstr ""
10296
msgstr "Each section describes an authentication definition."
8740
10297
8741
10298
#: en/help_topics/authentication.txt:118
8742
10299
msgid ""
8744
10301
"reserved\n"
8745
10302
"and should appear as the *last* section."
8746
10303
msgstr ""
10304
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
10305
"reserved\n"
10306
"and should appear as the *last* section."
8747
10307
8748
10308
#: en/help_topics/authentication.txt:121
8749
10309
msgid "Each section should define:"
8750
msgstr ""
10310
msgstr "Each section should define:"
8751
10311
8752
10312
#: en/help_topics/authentication.txt:123
8753
10313
msgid "* ``user``: the login to be used,"
8754
msgstr ""
10314
msgstr "* ``user``: the login to be used,"
8755
10315
8756
10316
#: en/help_topics/authentication.txt:125
8757
10317
msgid "Each section could define:"
8758
msgstr ""
10318
msgstr "Each section could define:"
8759
10319
8760
10320
#: en/help_topics/authentication.txt:127
8761
10321
msgid "* ``host``: the remote server,"
8762
msgstr ""
10322
msgstr "* ``host``: the remote server,"
8763
10323
8764
10324
#: en/help_topics/authentication.txt:129
8765
10325
msgid "* ``port``: the port the server is listening,"
8766
msgstr ""
10326
msgstr "* ``port``: the port the server is listening,"
8767
10327
8768
10328
#: en/help_topics/authentication.txt:131
8769
10329
msgid "* ``path``: the branch location,"
8770
msgstr ""
10330
msgstr "* ``path``: the branch location,"
8771
10331
8772
10332
#: en/help_topics/authentication.txt:133
8773
10333
msgid "* ``password``: the password."
8774
msgstr ""
10334
msgstr "* ``password``: the password."
8775
10335
8776
10336
#: en/help_topics/authentication.txt:135
8777
10337
msgid ""
8779
10339
"Examples\n"
8780
10340
"--------"
8781
10341
msgstr ""
10342
"\n"
10343
"Examples\n"
10344
"--------"
8782
10345
8783
10346
#: en/help_topics/authentication.txt:139
8784
10347
msgid ""
8786
10349
"Personal projects hosted outside\n"
8787
10350
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8788
10351
msgstr ""
10352
"\n"
10353
"Personal projects hosted outside\n"
10354
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8789
10355
8790
10356
#: en/help_topics/authentication.txt:143
8791
10357
msgid ""
8795
10361
"with\n"
8796
10362
"some exceptions::"
8797
10363
msgstr ""
10364
"All connections are done with the same ``user`` (the remote one for which "
10365
"the\n"
10366
"default bzr one is not appropriate) and the password is always prompted "
10367
"with\n"
10368
"some exceptions::"
8798
10369
8799
10370
#: en/help_topics/authentication.txt:147
8800
10371
msgid ""
8816
10387
"foobar\n"
8817
10388
" user=foobar"
8818
10389
msgstr ""
10390
" # Pet projects on hobby.net\n"
10391
" [hobby]\n"
10392
" host=r.hobby.net\n"
10393
" user=jim\n"
10394
" password=obvious1234\n"
10395
" \n"
10396
" # Home server\n"
10397
" [home]\n"
10398
" scheme=https\n"
10399
" host=home.net\n"
10400
" user=joe\n"
10401
" password=1essobV10us\n"
10402
" \n"
10403
" [DEFAULT]\n"
10404
" # Our local user is barbaz, on all remote sites we're known as "
10405
"foobar\n"
10406
" user=foobar"
8819
10407
8820
10408
#: en/help_topics/authentication.txt:164
8821
10409
msgid ""
8823
10411
"Source hosting provider\n"
8824
10412
"~~~~~~~~~~~~~~~~~~~~~~~"
8825
10413
msgstr ""
10414
"\n"
10415
"Source hosting provider\n"
10416
"~~~~~~~~~~~~~~~~~~~~~~~"
8826
10417
8827
10418
#: en/help_topics/authentication.txt:168
8828
10419
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8829
msgstr ""
10420
msgstr "In the shp.net (fictitious) domain, each project has its own site::"
8830
10421
8831
10422
#: en/help_topics/authentication.txt:170
8832
10423
msgid ""
8840
10431
" # consider using an ssh agent if you don't want to supply\n"
8841
10432
" # a password interactively. (pageant, ssh-agent, etc)"
8842
10433
msgstr ""
10434
" [shpnet domain]\n"
10435
" # we use sftp, but ssh is the scheme used for authentication\n"
10436
" scheme=ssh\n"
10437
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
10438
" host=.shp.net\n"
10439
" user=joe\n"
10440
" # bzr don't support supplying a password for sftp,\n"
10441
" # consider using an ssh agent if you don't want to supply\n"
10442
" # a password interactively. (pageant, ssh-agent, etc)"
8843
10443
8844
10444
#: en/help_topics/authentication.txt:180
8845
10445
msgid ""
8846
10446
"HTTPS, SFTP servers and their proxy\n"
8847
10447
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8848
10448
msgstr ""
10449
"HTTPS, SFTP servers and their proxy\n"
10450
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8849
10451
8850
10452
#: en/help_topics/authentication.txt:183
8851
10453
msgid ""
8853
10455
"behind a\n"
8854
10456
"proxy, and the two branches use different authentication policies::"
8855
10457
msgstr ""
10458
"At company.com, the server hosting release and integration branches is "
10459
"behind a\n"
10460
"proxy, and the two branches use different authentication policies::"
8856
10461
8857
10462
#: en/help_topics/authentication.txt:186
8858
10463
msgid ""
8863
10468
" user=user1\n"
8864
10469
" password=pass1"
8865
10470
msgstr ""
10471
" [reference code]\n"
10472
" scheme=https\n"
10473
" host=dev.company.com\n"
10474
" path=/dev\n"
10475
" user=user1\n"
10476
" password=pass1"
8866
10477
8867
10478
#: en/help_topics/authentication.txt:193
8868
10479
msgid ""
8881
10492
" user=proxyuser1\n"
8882
10493
" password=proxypass1"
8883
10494
msgstr ""
10495
" # development branches on dev server\n"
10496
" [dev]\n"
10497
" scheme=ssh # bzr+ssh and sftp are available here\n"
10498
" host=dev.company.com\n"
10499
" path=/dev/integration\n"
10500
" user=user2\n"
10501
" \n"
10502
" # proxy\n"
10503
" [proxy]\n"
10504
" scheme=http\n"
10505
" host=proxy.company.com\n"
10506
" port=3128\n"
10507
" user=proxyuser1\n"
10508
" password=proxypass1"
8884
10509
8885
10510
#: en/help_topics/authentication.txt:208
8886
10511
msgid ""
8888
10513
"Planned enhancements\n"
8889
10514
"--------------------"
8890
10515
msgstr ""
10516
"\n"
10517
"Planned enhancements\n"
10518
"--------------------"
8891
10519
8892
10520
#: en/help_topics/authentication.txt:212
8893
10521
msgid ""
8894
10522
"The following are not yet implemented but planned as parts of a work in\n"
8895
10523
"progress:"
8896
10524
msgstr ""
10525
"The following are not yet implemented but planned as parts of a work in\n"
10526
"progress:"
8897
10527
8898
10528
#: en/help_topics/authentication.txt:215
8899
10529
msgid "* add a ``password_encoding`` field allowing:"
8900
msgstr ""
10530
msgstr "* add a ``password_encoding`` field allowing:"
8901
10531
8902
10532
#: en/help_topics/authentication.txt:217
8903
10533
msgid ""
8904
10534
" - storing the passwords in various obfuscating encodings (base64 for one),"
8905
10535
msgstr ""
10536
" - storing the passwords in various obfuscating encodings (base64 for one),"
8906
10537
8907
10538
#: en/help_topics/authentication.txt:219
8908
10539
msgid " - delegate password storage to plugins (.netrc for example)."
8909
msgstr ""
10540
msgstr " - delegate password storage to plugins (.netrc for example)."
8910
10541
8911
10542
#: en/help_topics/authentication.txt:221
8912
10543
msgid ""
8913
10544
"* update the credentials when the user is prompted for user or password,"
8914
10545
msgstr ""
10546
"* update the credentials when the user is prompted for user or password,"
8915
10547
8916
10548
#: en/help_topics/authentication.txt:223
8917
10549
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8918
msgstr ""
10550
msgstr "* add a ``verify_certificates`` field for ``HTTPS``."
8919
10551
8920
10552
#: en/help_topics/authentication.txt:225
8921
10553
msgid ""
8923
10555
"but\n"
8924
10556
"ignored in the actual implementation.\n"
8925
10557
msgstr ""
10558
"The ``password_encoding`` and ``verify_certificates`` fields are recognised "
10559
"but\n"
10560
"ignored in the actual implementation.\n"
8926
10561
8927
10562
#: en/help_topics/bugs.txt:1
8928
10563
msgid "Bug Tracker Settings"
8929
msgstr ""
10564
msgstr "Bug Tracker Settings"
8930
10565
8931
10566
#: en/help_topics/bugs.txt:3
8932
10567
msgid ""
8935
10570
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8936
10571
"(The only ``status`` value currently supported is ``fixed.``)"
8937
10572
msgstr ""
10573
"When making a commit, metadata about bugs fixed by that change can be\n"
10574
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
10575
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
10576
"(The only ``status`` value currently supported is ``fixed.``)"
8938
10577
8939
10578
#: en/help_topics/bugs.txt:8
8940
10579
msgid ""
8942
10581
"identifier\n"
8943
10582
"rather than a full URL. This looks like::"
8944
10583
msgstr ""
10584
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
10585
"identifier\n"
10586
"rather than a full URL. This looks like::"
8945
10587
8946
10588
#: en/help_topics/bugs.txt:11
8947
10589
msgid " bzr commit --fixes <tracker>:<id>"
8948
msgstr ""
10590
msgstr " bzr commit --fixes <tracker>:<id>"
8949
10591
8950
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
10592
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8951
10593
msgid "or::"
8952
msgstr ""
10594
msgstr "or::"
8953
10595
8954
10596
#: en/help_topics/bugs.txt:15
8955
10597
msgid " bzr commit --fixes <id>"
8956
msgstr ""
10598
msgstr " bzr commit --fixes <id>"
8957
10599
8958
10600
#: en/help_topics/bugs.txt:17
8959
10601
msgid ""
8963
10605
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8964
10606
"or global configuration is used."
8965
10607
msgstr ""
10608
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
10609
"the\n"
10610
"identifier for that bug within the bugtracker, usually the bug number.\n"
10611
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
10612
"or global configuration is used."
8966
10613
8967
10614
#: en/help_topics/bugs.txt:22
8968
10615
msgid ""
8971
10618
"use this feature, you just need to know the tracker identifier to use.\n"
8972
10619
"These are the bugtrackers that are built in:"
8973
10620
msgstr ""
10621
"Bazaar knows about a few bug trackers that have many users. If\n"
10622
"you use one of these bug trackers then there is no setup required to\n"
10623
"use this feature, you just need to know the tracker identifier to use.\n"
10624
"These are the bugtrackers that are built in:"
8974
10625
8975
10626
#: en/help_topics/bugs.txt:27
8976
10627
msgid ""
8982
10633
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8983
10634
" ============================ ============ ============"
8984
10635
msgstr ""
10636
" ============================ ============ ============\n"
10637
" URL Abbreviation Example\n"
10638
" ============================ ============ ============\n"
10639
" https://bugs.launchpad.net/ lp lp:12345\n"
10640
" http://bugs.debian.org/ deb deb:12345\n"
10641
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
10642
" ============================ ============ ============"
8985
10643
8986
10644
#: en/help_topics/bugs.txt:35
8987
10645
msgid ""
8992
10650
"of the schemes described below then you can write a plugin to support\n"
8993
10651
"it."
8994
10652
msgstr ""
10653
"For the bug trackers not listed above configuration is required.\n"
10654
"Support for generating the URLs for any project using Bugzilla or Trac\n"
10655
"is built in, along with a template mechanism for other bugtrackers with\n"
10656
"simple URL schemes. If your bug tracker can't be described by one\n"
10657
"of the schemes described below then you can write a plugin to support\n"
10658
"it."
8995
10659
8996
10660
#: en/help_topics/bugs.txt:42
8997
10661
msgid ""
9001
10665
"configuration section in ``locations.conf``. You can set up these values\n"
9002
10666
"for each of the projects you work on."
9003
10667
msgstr ""
10668
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
10669
"variable which contains the base URL of the bug tracker. These options\n"
10670
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
10671
"configuration section in ``locations.conf``. You can set up these values\n"
10672
"for each of the projects you work on."
9004
10673
9005
10674
#: en/help_topics/bugs.txt:48
9006
10675
msgid ""
9007
10676
"Note: As you provide a short name for each tracker, you can specify one or\n"
9008
10677
"more bugs in one or more trackers at commit time if you wish."
9009
10678
msgstr ""
10679
"Note: As you provide a short name for each tracker, you can specify one or\n"
10680
"more bugs in one or more trackers at commit time if you wish."
9010
10681
9011
10682
#: en/help_topics/bugs.txt:51
9012
10683
msgid ""
9013
10684
"Launchpad\n"
9014
10685
"---------"
9015
10686
msgstr ""
10687
"Launchpad\n"
10688
"---------"
9016
10689
9017
10690
#: en/help_topics/bugs.txt:54
9018
10691
msgid ""
9019
10692
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9020
10693
msgstr ""
10694
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9021
10695
9022
10696
#: en/help_topics/bugs.txt:56
9023
10697
msgid ""
9024
10698
"bugzilla_<tracker>_url\n"
9025
10699
"----------------------"
9026
10700
msgstr ""
10701
"bugzilla_<tracker>_url\n"
10702
"----------------------"
9027
10703
9028
10704
#: en/help_topics/bugs.txt:59
9029
10705
msgid ""
9032
10708
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9033
10709
"example::"
9034
10710
msgstr ""
10711
"If present, the location of the Bugzilla bug tracker referred to by\n"
10712
"<tracker>. This option can then be used together with ``bzr commit\n"
10713
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10714
"example::"
9035
10715
9036
10716
#: en/help_topics/bugs.txt:64
9037
10717
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9038
msgstr ""
10718
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9039
10719
9040
10720
#: en/help_topics/bugs.txt:66
9041
10721
msgid ""
9042
10722
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9043
10723
"fixed."
9044
10724
msgstr ""
10725
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10726
"fixed."
9045
10727
9046
10728
#: en/help_topics/bugs.txt:69
9047
10729
msgid ""
9048
10730
"trac_<tracker>_url\n"
9049
10731
"------------------"
9050
10732
msgstr ""
10733
"trac_<tracker>_url\n"
10734
"------------------"
9051
10735
9052
10736
#: en/help_topics/bugs.txt:72
9053
10737
msgid ""
9056
10740
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9057
10741
"example::"
9058
10742
msgstr ""
10743
"If present, the location of the Trac instance referred to by\n"
10744
"<tracker>. This option can then be used together with ``bzr commit\n"
10745
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10746
"example::"
9059
10747
9060
10748
#: en/help_topics/bugs.txt:77
9061
10749
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9062
msgstr ""
10750
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9063
10751
9064
10752
#: en/help_topics/bugs.txt:79
9065
10753
msgid ""
9067
10755
"as\n"
9068
10756
"fixed."
9069
10757
msgstr ""
10758
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
10759
"as\n"
10760
"fixed."
9070
10761
9071
10762
#: en/help_topics/bugs.txt:82
9072
10763
msgid ""
9073
10764
"bugtracker_<tracker>_url\n"
9074
10765
"------------------------"
9075
10766
msgstr ""
10767
"bugtracker_<tracker>_url\n"
10768
"------------------------"
9076
10769
9077
10770
#: en/help_topics/bugs.txt:85
9078
10771
msgid ""
9082
10775
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9083
10776
"fixed by that commit. For example::"
9084
10777
msgstr ""
10778
"If present, the location of a generic bug tracker instance referred to by\n"
10779
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
10780
"which will be replaced by a specific bug ID. This option can then be used\n"
10781
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
10782
"fixed by that commit. For example::"
9085
10783
9086
10784
#: en/help_topics/bugs.txt:91
9087
10785
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9088
msgstr ""
10786
msgstr " bugtracker_python_url = http://bugs.python.org/issue{id}"
9089
10787
9090
10788
#: en/help_topics/bugs.txt:93
9091
10789
msgid ""
9092
10790
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9093
10791
"Roundup bug tracker as fixed, or::"
9094
10792
msgstr ""
10793
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10794
"Roundup bug tracker as fixed, or::"
9095
10795
9096
10796
#: en/help_topics/bugs.txt:96
9097
10797
msgid ""
9098
10798
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9099
10799
msgstr ""
10800
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9100
10801
9101
10802
#: en/help_topics/bugs.txt:98
9102
10803
msgid ""
9103
10804
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9104
10805
"RT bug tracker as fixed, or::"
9105
10806
msgstr ""
10807
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10808
"RT bug tracker as fixed, or::"
9106
10809
9107
10810
#: en/help_topics/bugs.txt:101
9108
10811
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9109
msgstr ""
10812
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9110
10813
9111
10814
#: en/help_topics/bugs.txt:103
9112
10815
msgid ""
9114
10817
"1234\n"
9115
10818
"in Hudson's JIRA bug tracker as fixed.\n"
9116
10819
msgstr ""
10820
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
10821
"1234\n"
10822
"in Hudson's JIRA bug tracker as fixed.\n"
9117
10823
9118
10824
#: en/help_topics/commands.txt:1
9119
10825
msgid ""
9182
10888
"remove-tree Remove the working tree from a given branch/checkout.\n"
9183
10889
"renames Show list of renamed files.\n"
9184
10890
"resolve Mark a conflict as resolved.\n"
9185
"revert Revert files to a previous revision.\n"
10891
"revert Set files in the working tree back to the contents of a\n"
10892
" previous revision.\n"
9186
10893
"revno Show current revision number.\n"
9187
10894
"root Show the tree root directory.\n"
9188
10895
"send Mail or create a merge-directive for submitting changes.\n"
9207
10914
"view Manage filtered views.\n"
9208
10915
"whoami Show or set bzr user id.\n"
9209
10916
msgstr ""
10917
"add Add specified files or directories.\n"
10918
"alias Set/unset and display aliases.\n"
10919
"annotate Show the origin of each line in a file.\n"
10920
"bash-completion Generate a shell function for bash command line "
10921
"completion.\n"
10922
" [bash_completion]\n"
10923
"bind Convert the current branch into a checkout of the "
10924
"supplied\n"
10925
" branch.\n"
10926
"branch Create a new branch that is a copy of an existing branch.\n"
10927
"branches List the branches available at the current location.\n"
10928
"break-lock Break a dead lock.\n"
10929
"cat Write the contents of a file as of a given revision to\n"
10930
" standard output.\n"
10931
"check Validate working tree structure, branch consistency and\n"
10932
" repository history.\n"
10933
"checkout Create a new checkout of an existing branch.\n"
10934
"clean-tree Remove unwanted files from working tree.\n"
10935
"commit Commit changes into a new revision.\n"
10936
"config Display, set or remove a configuration option.\n"
10937
"conflicts List files with conflicts.\n"
10938
"deleted List files deleted in the working tree.\n"
10939
"diff Show differences in the working tree, between revisions "
10940
"or\n"
10941
" branches.\n"
10942
"dpush Push into a different VCS without any custom bzr "
10943
"metadata.\n"
10944
"export Export current or past revision to a destination directory "
10945
"or\n"
10946
" archive.\n"
10947
"help Show help on a command or other topic.\n"
10948
"ignore Ignore specified files or patterns.\n"
10949
"ignored List ignored files and the patterns that matched them.\n"
10950
"info Show information about a working tree, branch or "
10951
"repository.\n"
10952
"init Make a directory into a versioned branch.\n"
10953
"init-repository Create a shared repository for branches to share storage\n"
10954
" space.\n"
10955
"join Combine a tree into its containing tree.\n"
10956
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
10957
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
10958
"launchpad-open Open a Launchpad branch page in your web browser. "
10959
"[launchpad]\n"
10960
"log Show historical log for a branch or subset of a branch.\n"
10961
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
10962
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
10963
"ls List files in a tree.\n"
10964
"merge Perform a three-way merge.\n"
10965
"missing Show unmerged/unpulled revisions between two branches.\n"
10966
"mkdir Create a new versioned directory.\n"
10967
"mv Move or rename a file.\n"
10968
"nick Print or set the branch nickname.\n"
10969
"pack Compress the data within a repository.\n"
10970
"plugins List the installed plugins.\n"
10971
"pull Turn this branch into a mirror of another branch.\n"
10972
"push Update a mirror of this branch.\n"
10973
"reconcile Reconcile bzr metadata in a branch.\n"
10974
"reconfigure Reconfigure the type of a bzr directory.\n"
10975
"register-branch Register a branch with launchpad.net. [launchpad]\n"
10976
"remerge Redo a merge.\n"
10977
"remove Remove files or directories.\n"
10978
"remove-branch Remove a branch.\n"
10979
"remove-tree Remove the working tree from a given branch/checkout.\n"
10980
"renames Show list of renamed files.\n"
10981
"resolve Mark a conflict as resolved.\n"
10982
"revert Set files in the working tree back to the contents of a\n"
10983
" previous revision.\n"
10984
"revno Show current revision number.\n"
10985
"root Show the tree root directory.\n"
10986
"send Mail or create a merge-directive for submitting changes.\n"
10987
"serve Run the bzr server.\n"
10988
"shelve Temporarily set aside some changes from the current tree.\n"
10989
"sign-my-commits Sign all commits by a given committer.\n"
10990
"split Split a subdirectory of a tree into a separate tree.\n"
10991
"status Display status summary.\n"
10992
"switch Set the branch of a checkout and update.\n"
10993
"tag Create, remove or modify a tag naming a revision.\n"
10994
"tags List tags.\n"
10995
"testament Show testament (signing-form) of a revision.\n"
10996
"unbind Convert the current checkout into a regular branch.\n"
10997
"uncommit Remove the last committed revision.\n"
10998
"unshelve Restore shelved changes.\n"
10999
"update Update a working tree to a new revision.\n"
11000
"upgrade Upgrade a repository, branch or working tree to a newer\n"
11001
" format.\n"
11002
"verify-signatures Verify all commit signatures.\n"
11003
"version Show version of bzr.\n"
11004
"version-info Show version information about this tree.\n"
11005
"view Manage filtered views.\n"
11006
"whoami Show or set bzr user id.\n"
9210
11007
9211
11008
#: en/help_topics/configuration.txt:1
9212
11009
msgid ""
9213
11010
"Configuration Settings\n"
9214
11011
"======================="
9215
11012
msgstr ""
11013
"Configuration Settings\n"
11014
"======================="
9216
11015
9217
11016
#: en/help_topics/configuration.txt:4
9218
11017
msgid ""
9219
11018
"Environment settings\n"
9220
11019
"---------------------"
9221
11020
msgstr ""
11021
"Environment settings\n"
11022
"---------------------"
9222
11023
9223
11024
#: en/help_topics/configuration.txt:7
9224
11025
msgid ""
9225
11026
"While most configuration is handled by configuration files, some options\n"
9226
11027
"which may be semi-permanent can also be controlled through the environment."
9227
11028
msgstr ""
11029
"While most configuration is handled by configuration files, some options\n"
11030
"which may be semi-permanent can also be controlled through the environment."
9228
11031
9229
11032
#: en/help_topics/configuration.txt:10
9230
11033
msgid ""
9231
11034
"BZR_EMAIL\n"
9232
11035
"~~~~~~~~~"
9233
11036
msgstr ""
11037
"BZR_EMAIL\n"
11038
"~~~~~~~~~"
9234
11039
9235
11040
#: en/help_topics/configuration.txt:13
9236
11041
msgid "Override the email id used by Bazaar. Typical format::"
9237
msgstr ""
11042
msgstr "Override the email id used by Bazaar. Typical format::"
9238
11043
9239
11044
#: en/help_topics/configuration.txt:15
9240
11045
msgid " \"John Doe <jdoe@example.com>\""
9241
msgstr ""
11046
msgstr " \"John Doe <jdoe@example.com>\""
9242
11047
9243
11048
#: en/help_topics/configuration.txt:17
9244
11049
msgid "See also the ``email`` configuration option."
9245
msgstr ""
11050
msgstr "See also the ``email`` configuration option."
9246
11051
9247
11052
#: en/help_topics/configuration.txt:19
9248
11053
msgid ""
9249
11054
"BZR_PROGRESS_BAR\n"
9250
11055
"~~~~~~~~~~~~~~~~"
9251
11056
msgstr ""
11057
"BZR_PROGRESS_BAR\n"
11058
"~~~~~~~~~~~~~~~~"
9252
11059
9253
11060
#: en/help_topics/configuration.txt:22
9254
11061
msgid ""
9258
11065
"draws\n"
9259
11066
"the ordinary command line progress bar."
9260
11067
msgstr ""
11068
"Override the progress display. Possible values are \"none\" or \"text\". "
11069
"If\n"
11070
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
11071
"draws\n"
11072
"the ordinary command line progress bar."
9261
11073
9262
11074
#: en/help_topics/configuration.txt:26
9263
11075
msgid ""
9264
11076
"BZR_SIGQUIT_PDB\n"
9265
11077
"~~~~~~~~~~~~~~~"
9266
11078
msgstr ""
11079
"BZR_SIGQUIT_PDB\n"
11080
"~~~~~~~~~~~~~~~"
9267
11081
9268
11082
#: en/help_topics/configuration.txt:29
9269
11083
msgid ""
9270
11084
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9271
11085
msgstr ""
11086
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9272
11087
9273
11088
#: en/help_topics/configuration.txt:31
9274
11089
msgid ""
9275
11090
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9276
11091
"* 1 = Invoke breakin debugger (default)"
9277
11092
msgstr ""
11093
"* 0 = Standard SIGQUIT behaviour (normally, exit with a core dump)\n"
11094
"* 1 = Invoke breakin debugger (default)"
9278
11095
9279
11096
#: en/help_topics/configuration.txt:34
9280
11097
msgid ""
9281
11098
"BZR_HOME\n"
9282
11099
"~~~~~~~~"
9283
11100
msgstr ""
11101
"BZR_HOME\n"
11102
"~~~~~~~~"
9284
11103
9285
11104
#: en/help_topics/configuration.txt:37
9286
11105
msgid "Override the home directory used by Bazaar."
9287
msgstr ""
11106
msgstr "Override the home directory used by Bazaar."
9288
11107
9289
11108
#: en/help_topics/configuration.txt:39
9290
11109
msgid ""
9291
11110
"BZR_SSH\n"
9292
11111
"~~~~~~~"
9293
11112
msgstr ""
11113
"BZR_SSH\n"
11114
"~~~~~~~"
9294
11115
9295
11116
#: en/help_topics/configuration.txt:42
9296
11117
msgid "Select a different SSH implementation."
9297
msgstr ""
11118
msgstr "Select a different SSH implementation."
9298
11119
9299
11120
#: en/help_topics/configuration.txt:44
9300
11121
msgid ""
9301
11122
"BZR_PDB\n"
9302
11123
"~~~~~~~"
9303
11124
msgstr ""
11125
"BZR_PDB\n"
11126
"~~~~~~~"
9304
11127
9305
11128
#: en/help_topics/configuration.txt:47
9306
11129
msgid "Control whether to launch a debugger on error."
9307
msgstr ""
11130
msgstr "Control whether to launch a debugger on error."
9308
11131
9309
11132
#: en/help_topics/configuration.txt:49
9310
11133
msgid ""
9311
11134
"* 0 = Standard behavior\n"
9312
11135
"* 1 = Launch debugger"
9313
11136
msgstr ""
11137
"* 0 = Standard behaviour\n"
11138
"* 1 = Launch debugger"
9314
11139
9315
11140
#: en/help_topics/configuration.txt:52
9316
11141
msgid ""
9317
11142
"BZR_REMOTE_PATH\n"
9318
11143
"~~~~~~~~~~~~~~~"
9319
11144
msgstr ""
11145
"BZR_REMOTE_PATH\n"
11146
"~~~~~~~~~~~~~~~"
9320
11147
9321
11148
#: en/help_topics/configuration.txt:55
9322
11149
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9323
11150
msgstr ""
11151
"Path to the Bazaar executable to use when using the bzr+ssh protocol."
9324
11152
9325
11153
#: en/help_topics/configuration.txt:57
9326
11154
msgid "See also the ``bzr_remote_path`` configuration option."
9327
msgstr ""
11155
msgstr "See also the ``bzr_remote_path`` configuration option."
9328
11156
9329
11157
#: en/help_topics/configuration.txt:59
9330
11158
msgid ""
9331
11159
"BZR_EDITOR\n"
9332
11160
"~~~~~~~~~~"
9333
11161
msgstr ""
11162
"BZR_EDITOR\n"
11163
"~~~~~~~~~~"
9334
11164
9335
11165
#: en/help_topics/configuration.txt:62
9336
11166
msgid "Path to the editor Bazaar should use for commit messages, etc."
9337
msgstr ""
11167
msgstr "Path to the editor Bazaar should use for commit messages, etc."
9338
11168
9339
11169
#: en/help_topics/configuration.txt:64
9340
11170
msgid ""
9341
11171
"BZR_LOG\n"
9342
11172
"~~~~~~~"
9343
11173
msgstr ""
11174
"BZR_LOG\n"
11175
"~~~~~~~"
9344
11176
9345
11177
#: en/help_topics/configuration.txt:67
9346
11178
msgid ""
9347
11179
"Location of the Bazaar log file. You can check the current location by\n"
9348
11180
"running ``bzr version``."
9349
11181
msgstr ""
11182
"Location of the Bazaar log file. You can check the current location by\n"
11183
"running ``bzr version``."
9350
11184
9351
11185
#: en/help_topics/configuration.txt:70
9352
11186
msgid ""
9353
11187
"The log file contains debug information that is useful for diagnosing or\n"
9354
11188
"reporting problems with Bazaar."
9355
11189
msgstr ""
11190
"The log file contains debug information that is useful for diagnosing or\n"
11191
"reporting problems with Bazaar."
9356
11192
9357
11193
#: en/help_topics/configuration.txt:73
9358
11194
msgid ""
9359
11195
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9360
11196
"will disable logging."
9361
11197
msgstr ""
11198
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
11199
"will disable logging."
9362
11200
9363
11201
#: en/help_topics/configuration.txt:76
9364
11202
msgid ""
9366
11204
"BZR_PLUGIN_PATH\n"
9367
11205
"~~~~~~~~~~~~~~~"
9368
11206
msgstr ""
11207
"\n"
11208
"BZR_PLUGIN_PATH\n"
11209
"~~~~~~~~~~~~~~~"
9369
11210
9370
11211
#: en/help_topics/configuration.txt:80
9371
11212
msgid ""
9372
11213
"The path to the plugins directory that Bazaar should use.\n"
9373
11214
"If not set, Bazaar will search for plugins in:"
9374
11215
msgstr ""
11216
"The path to the plugins directory that Bazaar should use.\n"
11217
"If not set, Bazaar will search for plugins in:"
9375
11218
9376
11219
#: en/help_topics/configuration.txt:83
9377
11220
msgid ""
9378
11221
"* the user specific plugin directory (containing the ``user`` plugins),"
9379
11222
msgstr ""
11223
"* the user specific plugin directory (containing the ``user`` plugins),"
9380
11224
9381
11225
#: en/help_topics/configuration.txt:85
9382
11226
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9383
msgstr ""
11227
msgstr "* the bzrlib directory (containing the ``core`` plugins),"
9384
11228
9385
11229
#: en/help_topics/configuration.txt:87
9386
11230
msgid ""
9387
11231
"* the site specific plugin directory if applicable (containing\n"
9388
11232
" the ``site`` plugins)."
9389
11233
msgstr ""
11234
"* the site specific plugin directory if applicable (containing\n"
11235
" the ``site`` plugins)."
9390
11236
9391
11237
#: en/help_topics/configuration.txt:90
9392
11238
msgid ""
9393
11239
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9394
11240
"the way the plugin are searched. "
9395
11241
msgstr ""
11242
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
11243
"the way the plugin are searched. "
9396
11244
9397
11245
#: en/help_topics/configuration.txt:93
9398
11246
msgid ""
9401
11249
"platform specific appropriate character (':' on Unix,\n"
9402
11250
"';' on windows)"
9403
11251
msgstr ""
11252
"As for the ``PATH`` variables, if multiple directories are\n"
11253
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
11254
"platform specific appropriate character (':' on Unix,\n"
11255
"';' on windows)"
9404
11256
9405
11257
#: en/help_topics/configuration.txt:98
9406
11258
msgid ""
9408
11260
"in ``user``. However it will continue to search in ``core`` and\n"
9409
11261
"``site`` unless they are explicitly removed."
9410
11262
msgstr ""
11263
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
11264
"in ``user``. However it will continue to search in ``core`` and\n"
11265
"``site`` unless they are explicitly removed."
9411
11266
9412
11267
#: en/help_topics/configuration.txt:102
9413
11268
msgid ""
9414
11269
"If you need to change the order or remove one of these\n"
9415
11270
"directories, you should use special values:"
9416
11271
msgstr ""
11272
"If you need to change the order or remove one of these\n"
11273
"directories, you should use special values:"
9417
11274
9418
11275
#: en/help_topics/configuration.txt:105
9419
11276
msgid ""
9420
11277
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9421
11278
" path from the default values,"
9422
11279
msgstr ""
11280
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
11281
" path from the default values,"
9423
11282
9424
11283
#: en/help_topics/configuration.txt:108
9425
11284
msgid ""
9427
11286
" before the remaining default values (and also remove it from\n"
9428
11287
" the default values)."
9429
11288
msgstr ""
11289
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
11290
" before the remaining default values (and also remove it from\n"
11291
" the default values)."
9430
11292
9431
11293
#: en/help_topics/configuration.txt:112
9432
11294
msgid ""
9434
11296
"used literally, they will be substituted by the corresponding,\n"
9435
11297
"platform specific, values."
9436
11298
msgstr ""
11299
"Note that the special values 'user', 'core' and 'site' should be\n"
11300
"used literally, they will be substituted by the corresponding,\n"
11301
"platform specific, values."
9437
11302
9438
11303
#: en/help_topics/configuration.txt:116
9439
11304
msgid ""
9440
11305
"The examples below use ':' as the separator, windows users\n"
9441
11306
"should use ';'."
9442
11307
msgstr ""
11308
"The examples below use ':' as the separator, windows users\n"
11309
"should use ';'."
9443
11310
9444
11311
#: en/help_topics/configuration.txt:119
9445
11312
msgid "Overriding the default user plugin directory::"
9446
msgstr ""
11313
msgstr "Overriding the default user plugin directory::"
9447
11314
9448
11315
#: en/help_topics/configuration.txt:121
9449
11316
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9450
msgstr ""
11317
msgstr " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9451
11318
9452
11319
#: en/help_topics/configuration.txt:123
9453
11320
msgid "Disabling the site directory while retaining the user directory::"
9454
msgstr ""
11321
msgstr "Disabling the site directory while retaining the user directory::"
9455
11322
9456
11323
#: en/help_topics/configuration.txt:125
9457
11324
msgid " BZR_PLUGIN_PATH='-site:+user'"
9458
msgstr ""
11325
msgstr " BZR_PLUGIN_PATH='-site:+user'"
9459
11326
9460
11327
#: en/help_topics/configuration.txt:127
9461
11328
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9462
msgstr ""
11329
msgstr "Disabling all plugins (better achieved with --no-plugins)::"
9463
11330
9464
11331
#: en/help_topics/configuration.txt:129
9465
11332
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9466
msgstr ""
11333
msgstr " BZR_PLUGIN_PATH='-user:-core:-site'"
9467
11334
9468
11335
#: en/help_topics/configuration.txt:131
9469
11336
msgid "Overriding the default site plugin directory::"
9470
msgstr ""
11337
msgstr "Overriding the default site plugin directory::"
9471
11338
9472
11339
#: en/help_topics/configuration.txt:133
9473
11340
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9474
msgstr ""
11341
msgstr " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9475
11342
9476
11343
#: en/help_topics/configuration.txt:135
9477
11344
msgid ""
9478
11345
"BZR_DISABLE_PLUGINS\n"
9479
11346
"~~~~~~~~~~~~~~~~~~~"
9480
11347
msgstr ""
11348
"BZR_DISABLE_PLUGINS\n"
11349
"~~~~~~~~~~~~~~~~~~~"
9481
11350
9482
11351
#: en/help_topics/configuration.txt:138
9483
11352
msgid ""
9486
11355
"uninstalling them completely. Such plugins can be specified in\n"
9487
11356
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9488
11357
msgstr ""
11358
"Under special circumstances (mostly when trying to diagnose a\n"
11359
"bug), it's better to disable a plugin (or several) rather than\n"
11360
"uninstalling them completely. Such plugins can be specified in\n"
11361
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9489
11362
9490
11363
#: en/help_topics/configuration.txt:143
9491
11364
msgid ""
9493
11366
"will raise an import error if they are explicitly imported (by\n"
9494
11367
"another plugin that depends on them for example)."
9495
11368
msgstr ""
11369
"In that case, ``bzr`` will stop loading the specified plugins and\n"
11370
"will raise an import error if they are explicitly imported (by\n"
11371
"another plugin that depends on them for example)."
9496
11372
9497
11373
#: en/help_topics/configuration.txt:147
9498
11374
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9499
msgstr ""
11375
msgstr "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9500
11376
9501
11377
#: en/help_topics/configuration.txt:149
9502
11378
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9503
msgstr ""
11379
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9504
11380
9505
11381
#: en/help_topics/configuration.txt:151
9506
11382
msgid ""
9507
11383
"BZR_PLUGINS_AT\n"
9508
11384
"~~~~~~~~~~~~~~"
9509
11385
msgstr ""
11386
"BZR_PLUGINS_AT\n"
11387
"~~~~~~~~~~~~~~"
9510
11388
9511
11389
#: en/help_topics/configuration.txt:154
9512
11390
msgid ""
9518
11396
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9519
11397
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9520
11398
msgstr ""
11399
"When adding a new feature or working on a bug in a plugin,\n"
11400
"developers often need to use a specific version of a given\n"
11401
"plugin. Since python requires that the directory containing the\n"
11402
"code is named like the plugin itself this make it impossible to\n"
11403
"use arbitrary directory names (using a two-level directory scheme\n"
11404
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
11405
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9521
11406
9522
11407
#: en/help_topics/configuration.txt:162
9523
11408
msgid ""
9524
11409
"Plugins specified in this environment variable takes precedence\n"
9525
11410
"over the ones in ``BZR_PLUGIN_PATH``."
9526
11411
msgstr ""
11412
"Plugins specified in this environment variable takes precedence\n"
11413
"over the ones in ``BZR_PLUGIN_PATH``."
9527
11414
9528
11415
#: en/help_topics/configuration.txt:165
9529
11416
msgid ""
9534
11421
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9535
11422
"separator, use ';' on windows."
9536
11423
msgstr ""
11424
"The variable specified a list of ``plugin_name@plugin path``,\n"
11425
"``plugin_name`` being the name of the plugin as it appears in\n"
11426
"python module paths, ``plugin_path`` being the path to the\n"
11427
"directory containing the plugin code itself\n"
11428
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
11429
"separator, use ';' on windows."
9537
11430
9538
11431
#: en/help_topics/configuration.txt:172
9539
11432
msgid ""
9540
11433
"Example:\n"
9541
11434
"~~~~~~~~"
9542
11435
msgstr ""
11436
"Example:\n"
11437
"~~~~~~~~"
9543
11438
9544
11439
#: en/help_topics/configuration.txt:175
9545
11440
msgid ""
9546
11441
"Using a specific version of ``myplugin``:\n"
9547
11442
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9548
11443
msgstr ""
11444
"Using a specific version of ``myplugin``:\n"
11445
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9549
11446
9550
11447
#: en/help_topics/configuration.txt:178
9551
11448
msgid ""
9552
11449
"BZRPATH\n"
9553
11450
"~~~~~~~"
9554
11451
msgstr ""
11452
"BZRPATH\n"
11453
"~~~~~~~"
9555
11454
9556
11455
#: en/help_topics/configuration.txt:181
9557
11456
msgid "The path where Bazaar should look for shell plugin external commands."
9558
11457
msgstr ""
11458
"The path where Bazaar should look for shell plugin external commands."
9559
11459
9560
11460
#: en/help_topics/configuration.txt:183
9561
11461
msgid ""
9563
11463
"http_proxy, https_proxy\n"
9564
11464
"~~~~~~~~~~~~~~~~~~~~~~~"
9565
11465
msgstr ""
11466
"\n"
11467
"http_proxy, https_proxy\n"
11468
"~~~~~~~~~~~~~~~~~~~~~~~"
9566
11469
9567
11470
#: en/help_topics/configuration.txt:187
9568
11471
msgid "Specifies the network proxy for outgoing connections, for example::"
9569
msgstr ""
11472
msgstr "Specifies the network proxy for outgoing connections, for example::"
9570
11473
9571
11474
#: en/help_topics/configuration.txt:189
9572
11475
msgid ""
9573
11476
" http_proxy=http://proxy.example.com:3128/ \n"
9574
11477
" https_proxy=http://proxy.example.com:3128/"
9575
11478
msgstr ""
11479
" http_proxy=http://proxy.example.com:3128/ \n"
11480
" https_proxy=http://proxy.example.com:3128/"
9576
11481
9577
11482
#: en/help_topics/configuration.txt:192
9578
11483
msgid ""
9580
11485
"Configuration files\n"
9581
11486
"-------------------"
9582
11487
msgstr ""
11488
"\n"
11489
"Configuration files\n"
11490
"-------------------"
9583
11491
9584
11492
#: en/help_topics/configuration.txt:196
9585
11493
msgid ""
9586
11494
"Location\n"
9587
11495
"~~~~~~~~"
9588
11496
msgstr ""
11497
"Location\n"
11498
"~~~~~~~~"
9589
11499
9590
11500
#: en/help_topics/configuration.txt:199
9591
11501
msgid ""
9595
11505
"Windows. (You can check the location for your system by using\n"
9596
11506
"``bzr version``.)"
9597
11507
msgstr ""
11508
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
11509
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
11510
"on\n"
11511
"Windows. (You can check the location for your system by using\n"
11512
"``bzr version``.)"
9598
11513
9599
11514
#: en/help_topics/configuration.txt:204
9600
11515
msgid "There are three primary configuration files in this location:"
9601
msgstr ""
11516
msgstr "There are three primary configuration files in this location:"
9602
11517
9603
11518
#: en/help_topics/configuration.txt:206
9604
11519
msgid "* ``bazaar.conf`` describes default configuration options,"
9605
msgstr ""
11520
msgstr "* ``bazaar.conf`` describes default configuration options,"
9606
11521
9607
11522
#: en/help_topics/configuration.txt:208
9608
11523
msgid ""
9609
11524
"* ``locations.conf`` describes configuration information for\n"
9610
11525
" specific branch locations,"
9611
11526
msgstr ""
11527
"* ``locations.conf`` describes configuration information for\n"
11528
" specific branch locations,"
9612
11529
9613
11530
#: en/help_topics/configuration.txt:211
9614
11531
msgid ""
9615
11532
"* ``authentication.conf`` describes credential information for\n"
9616
11533
" remote servers."
9617
11534
msgstr ""
11535
"* ``authentication.conf`` describes credential information for\n"
11536
" remote servers."
9618
11537
9619
11538
#: en/help_topics/configuration.txt:214
9620
11539
msgid ""
9627
11546
"you\n"
9628
11547
"can do so in ``locations.conf``."
9629
11548
msgstr ""
11549
"Each branch can also contain a configuration file that sets values specific\n"
11550
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
11551
"the\n"
11552
"branch. This file is visible to all users of a branch, if you wish to "
11553
"override\n"
11554
"one of the values for a branch with a setting that is specific to you then "
11555
"you\n"
11556
"can do so in ``locations.conf``."
9630
11557
9631
11558
#: en/help_topics/configuration.txt:220
9632
11559
msgid ""
9633
11560
"General format\n"
9634
11561
"~~~~~~~~~~~~~~"
9635
11562
msgstr ""
11563
"General format\n"
11564
"~~~~~~~~~~~~~~"
9636
11565
9637
11566
#: en/help_topics/configuration.txt:223
9638
11567
msgid ""
9639
11568
"An ini file has three types of contructs: section headers, section\n"
9640
11569
"options and comments."
9641
11570
msgstr ""
11571
"An ini file has three types of contructs: section headers, section\n"
11572
"options and comments."
9642
11573
9643
11574
#: en/help_topics/configuration.txt:226
9644
11575
msgid ""
9645
11576
"Comments\n"
9646
11577
"^^^^^^^^"
9647
11578
msgstr ""
11579
"Comments\n"
11580
"^^^^^^^^"
9648
11581
9649
11582
#: en/help_topics/configuration.txt:229
9650
11583
msgid ""
9652
11585
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9653
11586
"Bazaar when parsing ini files."
9654
11587
msgstr ""
11588
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
11589
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
11590
"Bazaar when parsing ini files."
9655
11591
9656
11592
#: en/help_topics/configuration.txt:233
9657
11593
msgid ""
9658
11594
"Section headers\n"
9659
11595
"^^^^^^^^^^^^^^^"
9660
11596
msgstr ""
11597
"Section headers\n"
11598
"^^^^^^^^^^^^^^^"
9661
11599
9662
11600
#: en/help_topics/configuration.txt:236
9663
11601
msgid ""
9664
11602
"A section header is a word enclosed in brackets that starts at the begining\n"
9665
11603
"of a line. A typical section header looks like this::"
9666
11604
msgstr ""
11605
"A section header is a word enclosed in brackets that starts at the "
11606
"beginning\n"
11607
"of a line. A typical section header looks like this::"
9667
11608
9668
11609
#: en/help_topics/configuration.txt:239
9669
11610
msgid " [DEFAULT]"
9670
msgstr ""
11611
msgstr " [DEFAULT]"
9671
11612
9672
11613
#: en/help_topics/configuration.txt:241
9673
11614
msgid ""
9676
11617
"for\n"
9677
11618
"setting options which can be overridden with the branch config file."
9678
11619
msgstr ""
11620
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
11621
"[ALIASES]. Section headers are case sensitive. The default section provides "
11622
"for\n"
11623
"setting options which can be overridden with the branch config file."
9679
11624
9680
11625
#: en/help_topics/configuration.txt:245
9681
11626
msgid ""
9684
11629
"potentially valid section headers. A section header uses the path for\n"
9685
11630
"the branch as the section header. Some examples include::"
9686
11631
msgstr ""
11632
"For ``locations.conf``, the options from the section with the\n"
11633
"longest matching section header are used to the exclusion of other\n"
11634
"potentially valid section headers. A section header uses the path for\n"
11635
"the branch as the section header. Some examples include::"
9687
11636
9688
11637
#: en/help_topics/configuration.txt:250
9689
11638
msgid ""
9690
11639
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9691
11640
" [/home/jdoe/branches/]"
9692
11641
msgstr ""
11642
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
11643
" [/home/jdoe/branches/]"
9693
11644
9694
11645
#: en/help_topics/configuration.txt:253
9695
11646
msgid ""
9697
11648
"Section options\n"
9698
11649
"^^^^^^^^^^^^^^^"
9699
11650
msgstr ""
11651
"\n"
11652
"Section options\n"
11653
"^^^^^^^^^^^^^^^"
9700
11654
9701
11655
#: en/help_topics/configuration.txt:257
9702
11656
msgid ""
9703
11657
"A section option resides within a section. A section option contains an\n"
9704
11658
"option name, an equals sign and a value. For example::"
9705
11659
msgstr ""
11660
"A section option resides within a section. A section option contains an\n"
11661
"option name, an equals sign and a value. For example::"
9706
11662
9707
11663
#: en/help_topics/configuration.txt:260
9708
11664
msgid ""
9709
11665
" email = John Doe <jdoe@isp.com>\n"
9710
11666
" gpg_signing_key = Amy Pond <amy@example.com>"
9711
11667
msgstr ""
11668
" email = John Doe <jdoe@isp.com>\n"
11669
" gpg_signing_key = Amy Pond <amy@example.com>"
9712
11670
9713
11671
#: en/help_topics/configuration.txt:263
9714
11672
msgid ""
9715
11673
"A option can reference other options by enclosing them in curly brackets::"
9716
11674
msgstr ""
11675
"A option can reference other options by enclosing them in curly brackets::"
9717
11676
9718
11677
#: en/help_topics/configuration.txt:265
9719
11678
msgid ""
9721
11680
" my_server = bzr+ssh://example.com\n"
9722
11681
" push_location = {my_server}/project/{my_branch_name}"
9723
11682
msgstr ""
11683
" my_branch_name = feature_x\n"
11684
" my_server = bzr+ssh://example.com\n"
11685
" push_location = {my_server}/project/{my_branch_name}"
9724
11686
9725
11687
#: en/help_topics/configuration.txt:269
9726
11688
msgid ""
9727
11689
"Option policies\n"
9728
11690
"^^^^^^^^^^^^^^^"
9729
11691
msgstr ""
11692
"Option policies\n"
11693
"^^^^^^^^^^^^^^^"
9730
11694
9731
11695
#: en/help_topics/configuration.txt:272
9732
11696
msgid ""
9735
11699
"option value is interpreted for contained locations. Currently\n"
9736
11700
"there are three policies available:"
9737
11701
msgstr ""
11702
"Options defined in a section affect the named directory or URL plus\n"
11703
"any locations they contain. Policies can be used to change how an\n"
11704
"option value is interpreted for contained locations. Currently\n"
11705
"there are three policies available:"
9738
11706
9739
11707
#: en/help_topics/configuration.txt:277
9740
11708
msgid ""
9748
11716
" for contained locations, any additional path components are\n"
9749
11717
" appended to the value."
9750
11718
msgstr ""
11719
" none:\n"
11720
" the value is interpreted the same for contained locations. This is\n"
11721
" the default behaviour.\n"
11722
" norecurse:\n"
11723
" the value is only used for the exact location specified by the\n"
11724
" section name.\n"
11725
" appendpath:\n"
11726
" for contained locations, any additional path components are\n"
11727
" appended to the value."
9751
11728
9752
11729
#: en/help_topics/configuration.txt:287
9753
11730
msgid ""
9756
11733
"For example, to define the push location for a tree of branches, the\n"
9757
11734
"following could be used::"
9758
11735
msgstr ""
11736
"Policies are specified by keys with names of the form "
11737
"\"<option_name>:policy\".\n"
11738
"For example, to define the push location for a tree of branches, the\n"
11739
"following could be used::"
9759
11740
9760
11741
#: en/help_topics/configuration.txt:291
9761
11742
msgid ""
9763
11744
" push_location = sftp://example.com/location\n"
9764
11745
" push_location:policy = appendpath"
9765
11746
msgstr ""
11747
" [/top/location]\n"
11748
" push_location = sftp://example.com/location\n"
11749
" push_location:policy = appendpath"
9766
11750
9767
11751
#: en/help_topics/configuration.txt:295
9768
11752
msgid ""
9769
11753
"With this configuration, the push location for ``/top/location/branch1``\n"
9770
11754
"would be ``sftp://example.com/location/branch1``."
9771
11755
msgstr ""
11756
"With this configuration, the push location for ``/top/location/branch1``\n"
11757
"would be ``sftp://example.com/location/branch1``."
9772
11758
9773
11759
#: en/help_topics/configuration.txt:298
9774
11760
msgid ""
9775
11761
"Section local options\n"
9776
11762
"^^^^^^^^^^^^^^^^^^^^^"
9777
11763
msgstr ""
11764
"Section local options\n"
11765
"^^^^^^^^^^^^^^^^^^^^^"
9778
11766
9779
11767
#: en/help_topics/configuration.txt:301
9780
11768
msgid ""
9781
11769
"Some options are defined automatically inside a given section and can be\n"
9782
11770
"refered to in this section only. "
9783
11771
msgstr ""
11772
"Some options are defined automatically inside a given section and can be\n"
11773
"referred to in this section only. "
9784
11774
9785
11775
#: en/help_topics/configuration.txt:304
9786
11776
msgid "For example, the ``appendpath`` policy can be used like this::"
9787
msgstr ""
11777
msgstr "For example, the ``appendpath`` policy can be used like this::"
9788
11778
9789
11779
#: en/help_topics/configuration.txt:306
9790
11780
msgid ""
9792
11782
" mypush = lp:~vila/bzr\n"
9793
11783
" mypush:policy=appendpath"
9794
11784
msgstr ""
11785
" [/home/vila/src/bzr/bugs]\n"
11786
" mypush = lp:~vila/bzr\n"
11787
" mypush:policy=appendpath"
9795
11788
9796
11789
#: en/help_topics/configuration.txt:310
9797
11790
msgid "Using ``relpath`` to achieve the same result is done like this::"
9798
msgstr ""
11791
msgstr "Using ``relpath`` to achieve the same result is done like this::"
9799
11792
9800
11793
#: en/help_topics/configuration.txt:312
9801
11794
msgid ""
9802
11795
" [/home/vila/src/bzr/bugs]\n"
9803
11796
" mypush = lp:~vila/bzr/{relpath}"
9804
11797
msgstr ""
11798
" [/home/vila/src/bzr/bugs]\n"
11799
" mypush = lp:~vila/bzr/{relpath}"
9805
11800
9806
11801
#: en/help_topics/configuration.txt:315
9807
11802
msgid ""
9808
11803
"In both cases, when used in a directory like\n"
9809
11804
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9810
11805
msgstr ""
11806
"In both cases, when used in a directory like\n"
11807
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9811
11808
9812
11809
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9813
11810
msgid ""
9814
11811
" $ bzr config mypush\n"
9815
11812
" lp:~vila/bzr/832013-expand-in-stack"
9816
11813
msgstr ""
11814
" $ bzr config mypush\n"
11815
" lp:~vila/bzr/832013-expand-in-stack"
9817
11816
9818
11817
#: en/help_topics/configuration.txt:321
9819
11818
msgid "Another such option is ``basename`` which can be used like this::"
9820
msgstr ""
11819
msgstr "Another such option is ``basename`` which can be used like this::"
9821
11820
9822
11821
#: en/help_topics/configuration.txt:323
9823
11822
msgid ""
9824
11823
" [/home/vila/src/bzr]\n"
9825
11824
" mypush = lp:~vila/bzr/{basename}"
9826
11825
msgstr ""
11826
" [/home/vila/src/bzr]\n"
11827
" mypush = lp:~vila/bzr/{basename}"
9827
11828
9828
11829
#: en/help_topics/configuration.txt:326
9829
11830
msgid ""
9830
11831
"When used in a directory like\n"
9831
11832
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9832
11833
msgstr ""
11834
"When used in a directory like\n"
11835
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9833
11836
9834
11837
#: en/help_topics/configuration.txt:332
9835
11838
msgid ""
9837
11840
"itself is defined as the relative path between the section name and the\n"
9838
11841
"location it matches."
9839
11842
msgstr ""
11843
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
11844
"itself is defined as the relative path between the section name and the\n"
11845
"location it matches."
9840
11846
9841
11847
#: en/help_topics/configuration.txt:336
9842
11848
msgid ""
9843
"When an option is local to a Section, it cannot be referred to from option\n"
9844
"values in any other section from the same ``Store`` nor from any other\n"
9845
"``Store``."
11849
"Another such option is ``branchname``, which refers to the name of a "
11850
"colocated\n"
11851
"branch. For non-colocated branches, it behaves like basename. It can be "
11852
"used\n"
11853
"like this::"
9846
11854
msgstr ""
11855
"Another such option is ``branchname``, which refers to the name of a "
11856
"colocated\n"
11857
"branch. For non-colocated branches, it behaves like basename. It can be "
11858
"used\n"
11859
"like this::"
9847
11860
9848
11861
#: en/help_topics/configuration.txt:340
9849
11862
msgid ""
9850
"\n"
9851
"The main configuration file, bazaar.conf\n"
9852
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:344
11863
" [/home/vila/src/bzr/bugs]\n"
11864
" mypush = lp:~vila/bzr/{branchname}"
11865
msgstr ""
11866
" [/home/vila/src/bzr/bugs]\n"
11867
" mypush = lp:~vila/bzr/{branchname}"
11868
11869
#: en/help_topics/configuration.txt:343
11870
msgid ""
11871
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
11872
"get::"
11873
msgstr ""
11874
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
11875
"get::"
11876
11877
#: en/help_topics/configuration.txt:345
11878
msgid ""
11879
" bzr config mypush\n"
11880
" lp:~vila/bzr/832013-expand-in-stack"
11881
msgstr ""
11882
" bzr config mypush\n"
11883
" lp:~vila/bzr/832013-expand-in-stack"
11884
11885
#: en/help_topics/configuration.txt:348
11886
msgid ""
11887
"When an option is local to a Section, it cannot be referred to from option\n"
11888
"values in any other section from the same ``Store`` nor from any other\n"
11889
"``Store``."
11890
msgstr ""
11891
"When an option is local to a Section, it cannot be referred to from option\n"
11892
"values in any other section from the same ``Store`` nor from any other\n"
11893
"``Store``."
11894
11895
#: en/help_topics/configuration.txt:352
11896
msgid ""
11897
"\n"
11898
"The main configuration file, bazaar.conf\n"
11899
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11900
msgstr ""
11901
"\n"
11902
"The main configuration file, bazaar.conf\n"
11903
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11904
11905
#: en/help_topics/configuration.txt:356
9856
11906
msgid ""
9857
11907
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9858
11908
"The default section contains the default\n"
9859
11909
"configuration options for all branches. The default section can be\n"
9860
11910
"overriden by providing a branch-specific section in ``locations.conf``."
9861
11911
msgstr ""
11912
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
11913
"The default section contains the default\n"
11914
"configuration options for all branches. The default section can be\n"
11915
"overridden by providing a branch-specific section in ``locations.conf``."
9862
11916
9863
#: en/help_topics/configuration.txt:349
11917
#: en/help_topics/configuration.txt:361
9864
11918
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:351
9868
msgid ""
9869
" [DEFAULT]\n"
9870
" email = John Doe <jdoe@isp.com>\n"
9871
" editor = /usr/bin/vim\n"
9872
" create_signatures = when-required"
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:356
9876
msgid ""
9877
"\n"
9878
"The branch location configuration file, locations.conf\n"
9879
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:360
9883
msgid ""
9884
"``locations.conf`` allows one to specify overriding settings for\n"
9885
"a specific branch. The format is almost identical to the default section in\n"
9886
"bazaar.conf with one significant change: The section header, instead of "
9887
"saying\n"
9888
"default, will be the path to a branch that you wish to override a value\n"
9889
"for. The '?' and '*' wildcards are supported::"
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:366
9893
msgid ""
9894
" [/home/jdoe/branches/nethack]\n"
9895
" email = Nethack Admin <nethack@nethack.com>"
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:369
9899
msgid ""
9900
" [http://hypothetical.site.com/branches/devel-branch]\n"
9901
" create_signatures = always"
9902
msgstr ""
11919
msgstr "A typical ``bazaar.conf`` section often looks like the following::"
11920
11921
#: en/help_topics/configuration.txt:363
11922
msgid ""
11923
" [DEFAULT]\n"
11924
" email = John Doe <jdoe@isp.com>\n"
11925
" editor = /usr/bin/vim\n"
11926
" create_signatures = when-required"
11927
msgstr ""
11928
" [DEFAULT]\n"
11929
" email = John Doe <jdoe@isp.com>\n"
11930
" editor = /usr/bin/vim\n"
11931
" create_signatures = when-required"
11932
11933
#: en/help_topics/configuration.txt:368
11934
msgid ""
11935
"\n"
11936
"The branch location configuration file, locations.conf\n"
11937
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11938
msgstr ""
11939
"\n"
11940
"The branch location configuration file, locations.conf\n"
11941
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9903
11942
9904
11943
#: en/help_topics/configuration.txt:372
9905
11944
msgid ""
9906
"The authentication configuration file, authentication.conf\n"
9907
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:375
9911
msgid ""
9912
"``authentication.conf`` allows one to specify credentials for\n"
9913
"remote servers. This can be used for all the supported transports and any "
9914
"part\n"
9915
"of bzr that requires authentication (smtp for example)."
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:379
9919
msgid ""
9920
"The syntax of the file obeys the same rules as the others except for the\n"
9921
"option policies which don't apply."
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:382
9925
msgid ""
9926
"For more information on the possible uses of the authentication "
9927
"configuration\n"
9928
"file see :doc:`authentication-help`."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:385
9932
msgid ""
9933
"\n"
9934
"Common options\n"
9935
"--------------"
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:389
9939
msgid ""
9940
"debug_flags\n"
9941
"~~~~~~~~~~~"
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:392
9945
msgid ""
9946
"A comma-separated list of debugging options to turn on. The same values\n"
9947
"can be used as with the -D command-line option (see `help global-options`).\n"
9948
"For example::"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:396
11945
"``locations.conf`` allows one to specify overriding settings for\n"
11946
"a specific branch. The format is almost identical to the default section in\n"
11947
"bazaar.conf with one significant change: The section header, instead of "
11948
"saying\n"
11949
"default, will be the path to a branch that you wish to override a value\n"
11950
"for. The '?' and '*' wildcards are supported::"
11951
msgstr ""
11952
"``locations.conf`` allows one to specify overriding settings for\n"
11953
"a specific branch. The format is almost identical to the default section in\n"
11954
"bazaar.conf with one significant change: The section header, instead of "
11955
"saying\n"
11956
"default, will be the path to a branch that you wish to override a value\n"
11957
"for. The '?' and '*' wildcards are supported::"
11958
11959
#: en/help_topics/configuration.txt:378
11960
msgid ""
11961
" [/home/jdoe/branches/nethack]\n"
11962
" email = Nethack Admin <nethack@nethack.com>"
11963
msgstr ""
11964
" [/home/jdoe/branches/nethack]\n"
11965
" email = Nethack Admin <nethack@nethack.com>"
11966
11967
#: en/help_topics/configuration.txt:381
11968
msgid ""
11969
" [http://hypothetical.site.com/branches/devel-branch]\n"
11970
" create_signatures = always"
11971
msgstr ""
11972
" [http://hypothetical.site.com/branches/devel-branch]\n"
11973
" create_signatures = always"
11974
11975
#: en/help_topics/configuration.txt:384
11976
msgid ""
11977
"The authentication configuration file, authentication.conf\n"
11978
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11979
msgstr ""
11980
"The authentication configuration file, authentication.conf\n"
11981
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11982
11983
#: en/help_topics/configuration.txt:387
11984
msgid ""
11985
"``authentication.conf`` allows one to specify credentials for\n"
11986
"remote servers. This can be used for all the supported transports and any "
11987
"part\n"
11988
"of bzr that requires authentication (smtp for example)."
11989
msgstr ""
11990
"``authentication.conf`` allows one to specify credentials for\n"
11991
"remote servers. This can be used for all the supported transports and any "
11992
"part\n"
11993
"of bzr that requires authentication (smtp for example)."
11994
11995
#: en/help_topics/configuration.txt:391
11996
msgid ""
11997
"The syntax of the file obeys the same rules as the others except for the\n"
11998
"option policies which don't apply."
11999
msgstr ""
12000
"The syntax of the file obeys the same rules as the others except for the\n"
12001
"option policies which don't apply."
12002
12003
#: en/help_topics/configuration.txt:394
12004
msgid ""
12005
"For more information on the possible uses of the authentication "
12006
"configuration\n"
12007
"file see :doc:`authentication-help`."
12008
msgstr ""
12009
"For more information on the possible uses of the authentication "
12010
"configuration\n"
12011
"file see :doc:`authentication-help`."
12012
12013
#: en/help_topics/configuration.txt:397
12014
msgid ""
12015
"\n"
12016
"Common options\n"
12017
"--------------"
12018
msgstr ""
12019
"\n"
12020
"Common options\n"
12021
"--------------"
12022
12023
#: en/help_topics/configuration.txt:401
12024
msgid ""
12025
"debug_flags\n"
12026
"~~~~~~~~~~~"
12027
msgstr ""
12028
"debug_flags\n"
12029
"~~~~~~~~~~~"
12030
12031
#: en/help_topics/configuration.txt:404
12032
msgid ""
12033
"A comma-separated list of debugging options to turn on. The same values\n"
12034
"can be used as with the -D command-line option (see `help global-options`).\n"
12035
"For example::"
12036
msgstr ""
12037
"A comma-separated list of debugging options to turn on. The same values\n"
12038
"can be used as with the -D command-line option (see `help global-options`).\n"
12039
"For example::"
12040
12041
#: en/help_topics/configuration.txt:408
9952
12042
msgid " debug_flags = hpss"
9953
msgstr ""
12043
msgstr " debug_flags = hpss"
9954
12044
9955
#: en/help_topics/configuration.txt:400
12045
#: en/help_topics/configuration.txt:412
9956
12046
msgid " debug_flags = hpss,evil"
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:402
9960
msgid ""
9961
"email\n"
9962
"~~~~~"
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:405
9966
msgid ""
9967
"The email address to use when committing a branch. Typically takes the form\n"
9968
"of::"
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:408
12047
msgstr " debug_flags = hpss,evil"
12048
12049
#: en/help_topics/configuration.txt:414
12050
msgid ""
12051
"email\n"
12052
"~~~~~"
12053
msgstr ""
12054
"email\n"
12055
"~~~~~"
12056
12057
#: en/help_topics/configuration.txt:417
12058
msgid ""
12059
"The email address to use when committing a branch. Typically takes the form\n"
12060
"of::"
12061
msgstr ""
12062
"The email address to use when committing a branch. Typically takes the form\n"
12063
"of::"
12064
12065
#: en/help_topics/configuration.txt:420
9972
12066
msgid " email = Full Name <account@hostname.tld>"
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:410
9976
msgid ""
9977
"editor\n"
9978
"~~~~~~"
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:413
9982
msgid ""
9983
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9984
"a commit message. This setting is trumped by the environment variable\n"
9985
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9986
"variables."
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:418
9990
msgid ""
9991
"log_format\n"
9992
"~~~~~~~~~~"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:421
9996
msgid ""
9997
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9998
"and ``line``. Additional formats may be provided by plugins. The default\n"
9999
"value is ``long``."
10000
msgstr ""
12067
msgstr " email = Full Name <account@hostname.tld>"
12068
12069
#: en/help_topics/configuration.txt:422
12070
msgid ""
12071
"editor\n"
12072
"~~~~~~"
12073
msgstr ""
12074
"editor\n"
12075
"~~~~~~"
10001
12076
10002
12077
#: en/help_topics/configuration.txt:425
10003
12078
msgid ""
10004
"check_signatures\n"
10005
"~~~~~~~~~~~~~~~~"
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:428
10009
msgid ""
10010
"Reserved for future use. These options will allow a policy for branches to\n"
10011
"require signatures."
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:431
10015
msgid ""
10016
"require\n"
10017
" The gnupg signature for revisions must be present and must be valid."
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:434
10021
msgid ""
10022
"ignore\n"
10023
" Do not check gnupg signatures of revisions."
10024
msgstr ""
12079
"The path of the editor that you wish to use if *bzr commit* is run without\n"
12080
"a commit message. This setting is trumped by the environment variable\n"
12081
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
12082
"variables."
12083
msgstr ""
12084
"The path of the editor that you wish to use if *bzr commit* is run without\n"
12085
"a commit message. This setting is trumped by the environment variable\n"
12086
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
12087
"variables."
12088
12089
#: en/help_topics/configuration.txt:430
12090
msgid ""
12091
"log_format\n"
12092
"~~~~~~~~~~"
12093
msgstr ""
12094
"log_format\n"
12095
"~~~~~~~~~~"
12096
12097
#: en/help_topics/configuration.txt:433
12098
msgid ""
12099
"The default log format to use. Standard log formats are ``long``, ``short``\n"
12100
"and ``line``. Additional formats may be provided by plugins. The default\n"
12101
"value is ``long``."
12102
msgstr ""
12103
"The default log format to use. Standard log formats are ``long``, ``short``\n"
12104
"and ``line``. Additional formats may be provided by plugins. The default\n"
12105
"value is ``long``."
10025
12106
10026
12107
#: en/help_topics/configuration.txt:437
10027
12108
msgid ""
10028
"check-available\n"
10029
" (default) If gnupg signatures for revisions are present, check them.\n"
10030
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10031
" no signature is present."
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:442
10035
msgid ""
10036
"create_signatures\n"
10037
"~~~~~~~~~~~~~~~~~"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:445
10041
msgid ""
10042
"Defines the behaviour of signing revisions on commits. By default bzr will "
10043
"not\n"
10044
"sign new commits."
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:448
10048
msgid ""
10049
"always\n"
10050
" Sign every new revision that is committed. If the signing fails then "
10051
"the\n"
10052
" commit will not be made."
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:452
10056
msgid ""
10057
"when-required\n"
10058
" Reserved for future use."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:455
10062
msgid ""
10063
"never\n"
10064
" Reserved for future use."
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:458
10068
msgid ""
10069
"In future it is planned that ``when-required`` will sign newly\n"
10070
"committed revisions only when the branch requires them. ``never`` will "
10071
"refuse\n"
10072
"to sign newly committed revisions, even if the branch requires signatures."
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:462
10076
msgid ""
10077
"dirstate.fdatasync\n"
10078
"~~~~~~~~~~~~~~~~~~"
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:465
10082
msgid ""
10083
"If true (default), working tree metadata changes are flushed through the\n"
10084
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10085
"should not be lost if the machine crashes. See also repository.fdatasync."
10086
msgstr ""
10087
10088
#: en/help_topics/configuration.txt:469
10089
msgid ""
10090
"gpg_signing_key\n"
10091
"~~~~~~~~~~~~~~~"
10092
msgstr ""
10093
10094
#: en/help_topics/configuration.txt:472
10095
msgid ""
10096
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10097
"address, key fingerprint or full key ID. When unset or when set to\n"
10098
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:476
10102
msgid ""
10103
"recurse\n"
10104
"~~~~~~~"
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:479
10108
msgid ""
10109
"Only useful in ``locations.conf``. Defines whether or not the\n"
10110
"configuration for this section applies to subdirectories:"
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:482
10114
msgid ""
10115
"true\n"
10116
" (default) This section applies to subdirectories as well."
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:485
10120
msgid ""
10121
"false\n"
10122
" This section only applies to the branch at this directory and not\n"
10123
" branches below it."
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:489
10127
msgid ""
10128
"gpg_signing_command\n"
10129
"~~~~~~~~~~~~~~~~~~~"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:492
10133
msgid ""
10134
"(Default: \"gpg\"). Which program should be used to sign and check "
10135
"revisions.\n"
10136
"For example::"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:495
12109
"check_signatures\n"
12110
"~~~~~~~~~~~~~~~~"
12111
msgstr ""
12112
"check_signatures\n"
12113
"~~~~~~~~~~~~~~~~"
12114
12115
#: en/help_topics/configuration.txt:440
12116
msgid ""
12117
"Reserved for future use. These options will allow a policy for branches to\n"
12118
"require signatures."
12119
msgstr ""
12120
"Reserved for future use. These options will allow a policy for branches to\n"
12121
"require signatures."
12122
12123
#: en/help_topics/configuration.txt:443
12124
msgid ""
12125
"require\n"
12126
" The gnupg signature for revisions must be present and must be valid."
12127
msgstr ""
12128
"require\n"
12129
" The gnupg signature for revisions must be present and must be valid."
12130
12131
#: en/help_topics/configuration.txt:446
12132
msgid ""
12133
"ignore\n"
12134
" Do not check gnupg signatures of revisions."
12135
msgstr ""
12136
"ignore\n"
12137
" Do not check gnupg signatures of revisions."
12138
12139
#: en/help_topics/configuration.txt:449
12140
msgid ""
12141
"check-available\n"
12142
" (default) If gnupg signatures for revisions are present, check them.\n"
12143
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
12144
" no signature is present."
12145
msgstr ""
12146
"check-available\n"
12147
" (default) If gnupg signatures for revisions are present, check them.\n"
12148
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
12149
" no signature is present."
12150
12151
#: en/help_topics/configuration.txt:454
12152
msgid ""
12153
"create_signatures\n"
12154
"~~~~~~~~~~~~~~~~~"
12155
msgstr ""
12156
"create_signatures\n"
12157
"~~~~~~~~~~~~~~~~~"
12158
12159
#: en/help_topics/configuration.txt:457
12160
msgid ""
12161
"Defines the behaviour of signing revisions on commits. By default bzr will "
12162
"not\n"
12163
"sign new commits."
12164
msgstr ""
12165
"Defines the behaviour of signing revisions on commits. By default bzr will "
12166
"not\n"
12167
"sign new commits."
12168
12169
#: en/help_topics/configuration.txt:460
12170
msgid ""
12171
"always\n"
12172
" Sign every new revision that is committed. If the signing fails then "
12173
"the\n"
12174
" commit will not be made."
12175
msgstr ""
12176
"always\n"
12177
" Sign every new revision that is committed. If the signing fails then "
12178
"the\n"
12179
" commit will not be made."
12180
12181
#: en/help_topics/configuration.txt:464
12182
msgid ""
12183
"when-required\n"
12184
" Reserved for future use."
12185
msgstr ""
12186
"when-required\n"
12187
" Reserved for future use."
12188
12189
#: en/help_topics/configuration.txt:467
12190
msgid ""
12191
"never\n"
12192
" Reserved for future use."
12193
msgstr ""
12194
"never\n"
12195
" Reserved for future use."
12196
12197
#: en/help_topics/configuration.txt:470
12198
msgid ""
12199
"In future it is planned that ``when-required`` will sign newly\n"
12200
"committed revisions only when the branch requires them. ``never`` will "
12201
"refuse\n"
12202
"to sign newly committed revisions, even if the branch requires signatures."
12203
msgstr ""
12204
"In future it is planned that ``when-required`` will sign newly\n"
12205
"committed revisions only when the branch requires them. ``never`` will "
12206
"refuse\n"
12207
"to sign newly committed revisions, even if the branch requires signatures."
12208
12209
#: en/help_topics/configuration.txt:474
12210
msgid ""
12211
"dirstate.fdatasync\n"
12212
"~~~~~~~~~~~~~~~~~~"
12213
msgstr ""
12214
"dirstate.fdatasync\n"
12215
"~~~~~~~~~~~~~~~~~~"
12216
12217
#: en/help_topics/configuration.txt:477
12218
msgid ""
12219
"If true (default), working tree metadata changes are flushed through the\n"
12220
"OS buffers to physical disk. This is somewhat slower, but means data\n"
12221
"should not be lost if the machine crashes. See also repository.fdatasync."
12222
msgstr ""
12223
"If true (default), working tree metadata changes are flushed through the\n"
12224
"OS buffers to physical disk. This is somewhat slower, but means data\n"
12225
"should not be lost if the machine crashes. See also repository.fdatasync."
12226
12227
#: en/help_topics/configuration.txt:481
12228
msgid ""
12229
"gpg_signing_key\n"
12230
"~~~~~~~~~~~~~~~"
12231
msgstr ""
12232
"gpg_signing_key\n"
12233
"~~~~~~~~~~~~~~~"
12234
12235
#: en/help_topics/configuration.txt:484
12236
msgid ""
12237
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
12238
"address, key fingerprint or full key ID. When unset or when set to\n"
12239
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
12240
msgstr ""
12241
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
12242
"address, key fingerprint or full key ID. When unset or when set to\n"
12243
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
12244
12245
#: en/help_topics/configuration.txt:488
12246
msgid ""
12247
"recurse\n"
12248
"~~~~~~~"
12249
msgstr ""
12250
"recurse\n"
12251
"~~~~~~~"
12252
12253
#: en/help_topics/configuration.txt:491
12254
msgid ""
12255
"Only useful in ``locations.conf``. Defines whether or not the\n"
12256
"configuration for this section applies to subdirectories:"
12257
msgstr ""
12258
"Only useful in ``locations.conf``. Defines whether or not the\n"
12259
"configuration for this section applies to subdirectories:"
12260
12261
#: en/help_topics/configuration.txt:494
12262
msgid ""
12263
"true\n"
12264
" (default) This section applies to subdirectories as well."
12265
msgstr ""
12266
"true\n"
12267
" (default) This section applies to subdirectories as well."
12268
12269
#: en/help_topics/configuration.txt:497
12270
msgid ""
12271
"false\n"
12272
" This section only applies to the branch at this directory and not\n"
12273
" branches below it."
12274
msgstr ""
12275
"false\n"
12276
" This section only applies to the branch at this directory and not\n"
12277
" branches below it."
12278
12279
#: en/help_topics/configuration.txt:501
12280
msgid ""
12281
"gpg_signing_command\n"
12282
"~~~~~~~~~~~~~~~~~~~"
12283
msgstr ""
12284
"gpg_signing_command\n"
12285
"~~~~~~~~~~~~~~~~~~~"
12286
12287
#: en/help_topics/configuration.txt:504
12288
msgid ""
12289
"(Default: \"gpg\"). Which program should be used to sign and check "
12290
"revisions.\n"
12291
"For example::"
12292
msgstr ""
12293
"(Default: \"gpg\"). Which program should be used to sign and check "
12294
"revisions.\n"
12295
"For example::"
12296
12297
#: en/help_topics/configuration.txt:507
10140
12298
msgid " gpg_signing_command = /usr/bin/gnpg"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:497
10144
msgid ""
10145
"The specified command must accept the options \"--clearsign\" and \"-u "
10146
"<email>\"."
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:499
10150
msgid ""
10151
"bzr_remote_path\n"
10152
"~~~~~~~~~~~~~~~"
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:502
10156
msgid ""
10157
"(Default: \"bzr\"). The path to the command that should be used to run the "
10158
"smart\n"
10159
"server for bzr. This value may only be specified in locations.conf, because:"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:505
10163
msgid ""
10164
"- it's needed before branch.conf is accessible\n"
10165
"- allowing remote branch.conf files to specify commands would be a security\n"
10166
" risk"
10167
msgstr ""
12299
msgstr " gpg_signing_command = /usr/bin/gnpg"
10168
12300
10169
12301
#: en/help_topics/configuration.txt:509
10170
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
12302
msgid ""
12303
"The specified command must accept the options \"--clearsign\" and \"-u "
12304
"<email>\"."
10171
12305
msgstr ""
12306
"The specified command must accept the options \"--clearsign\" and \"-u "
12307
"<email>\"."
10172
12308
10173
12309
#: en/help_topics/configuration.txt:511
10174
12310
msgid ""
10175
"smtp_server\n"
10176
"~~~~~~~~~~~"
12311
"bzr_remote_path\n"
12312
"~~~~~~~~~~~~~~~"
10177
12313
msgstr ""
12314
"bzr_remote_path\n"
12315
"~~~~~~~~~~~~~~~"
10178
12316
10179
12317
#: en/help_topics/configuration.txt:514
10180
12318
msgid ""
10181
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10182
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
12319
"(Default: \"bzr\"). The path to the command that should be used to run the "
12320
"smart\n"
12321
"server for bzr. This value may only be specified in locations.conf, because:"
10183
12322
msgstr ""
12323
"(Default: \"bzr\"). The path to the command that should be used to run the "
12324
"smart\n"
12325
"server for bzr. This value may only be specified in locations.conf, because:"
10184
12326
10185
12327
#: en/help_topics/configuration.txt:517
10186
12328
msgid ""
10187
"smtp_username, smtp_password\n"
10188
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:520
10192
msgid ""
10193
"User and password to authenticate to the SMTP server. If smtp_username\n"
10194
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10195
"These settings are only needed if the SMTP server requires authentication\n"
10196
"to send mail."
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:525
10200
msgid ""
10201
"locks.steal_dead\n"
10202
"~~~~~~~~~~~~~~~~"
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:528
10206
msgid ""
10207
"If set to true, bzr will automatically break locks held by processes from\n"
10208
"the same machine and user that are no longer alive. Otherwise, it will\n"
10209
"print a message and you can break the lock manually, if you are satisfied\n"
10210
"the object is no longer in use."
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:533
10214
msgid ""
10215
"mail_client\n"
10216
"~~~~~~~~~~~"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:536
10220
msgid ""
10221
"A mail client to use for sending merge requests.\n"
10222
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10223
"it\n"
10224
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10225
"``editor``."
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:541
12329
"- it's needed before branch.conf is accessible\n"
12330
"- allowing remote branch.conf files to specify commands would be a security\n"
12331
" risk"
12332
msgstr ""
12333
"- it's needed before branch.conf is accessible\n"
12334
"- allowing remote branch.conf files to specify commands would be a security\n"
12335
" risk"
12336
12337
#: en/help_topics/configuration.txt:521
12338
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
12339
msgstr "It is overridden by the BZR_REMOTE_PATH environment variable."
12340
12341
#: en/help_topics/configuration.txt:523
12342
msgid ""
12343
"smtp_server\n"
12344
"~~~~~~~~~~~"
12345
msgstr ""
12346
"smtp_server\n"
12347
"~~~~~~~~~~~"
12348
12349
#: en/help_topics/configuration.txt:526
12350
msgid ""
12351
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
12352
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
12353
msgstr ""
12354
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
12355
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
12356
12357
#: en/help_topics/configuration.txt:529
12358
msgid ""
12359
"smtp_username, smtp_password\n"
12360
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12361
msgstr ""
12362
"smtp_username, smtp_password\n"
12363
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12364
12365
#: en/help_topics/configuration.txt:532
12366
msgid ""
12367
"User and password to authenticate to the SMTP server. If smtp_username\n"
12368
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
12369
"These settings are only needed if the SMTP server requires authentication\n"
12370
"to send mail."
12371
msgstr ""
12372
"User and password to authenticate to the SMTP server. If smtp_username\n"
12373
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
12374
"These settings are only needed if the SMTP server requires authentication\n"
12375
"to send mail."
12376
12377
#: en/help_topics/configuration.txt:537
12378
msgid ""
12379
"locks.steal_dead\n"
12380
"~~~~~~~~~~~~~~~~"
12381
msgstr ""
12382
"locks.steal_dead\n"
12383
"~~~~~~~~~~~~~~~~"
12384
12385
#: en/help_topics/configuration.txt:540
12386
msgid ""
12387
"If set to true, bzr will automatically break locks held by processes from\n"
12388
"the same machine and user that are no longer alive. Otherwise, it will\n"
12389
"print a message and you can break the lock manually, if you are satisfied\n"
12390
"the object is no longer in use."
12391
msgstr ""
12392
"If set to true, bzr will automatically break locks held by processes from\n"
12393
"the same machine and user that are no longer alive. Otherwise, it will\n"
12394
"print a message and you can break the lock manually, if you are satisfied\n"
12395
"the object is no longer in use."
12396
12397
#: en/help_topics/configuration.txt:545
12398
msgid ""
12399
"mail_client\n"
12400
"~~~~~~~~~~~"
12401
msgstr ""
12402
"mail_client\n"
12403
"~~~~~~~~~~~"
12404
12405
#: en/help_topics/configuration.txt:548
12406
msgid ""
12407
"A mail client to use for sending merge requests.\n"
12408
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
12409
"it\n"
12410
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
12411
"``editor``."
12412
msgstr ""
12413
"A mail client to use for sending merge requests.\n"
12414
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
12415
"it\n"
12416
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
12417
"``editor``."
12418
12419
#: en/help_topics/configuration.txt:553
10229
12420
msgid "Supported values for specific clients:"
10230
msgstr ""
12421
msgstr "Supported values for specific clients:"
10231
12422
10232
#: en/help_topics/configuration.txt:543
12423
#: en/help_topics/configuration.txt:555
10233
12424
msgid ""
10234
12425
":claws: Use Claws. This skips a dialog for attaching files.\n"
10235
12426
":evolution: Use Evolution.\n"
10239
12430
"1.5,\n"
10240
12431
" this works around some bugs that xdg-email doesn't handle."
10241
12432
msgstr ""
12433
":claws: Use Claws. This skips a dialogue for attaching files.\n"
12434
":evolution: Use Evolution.\n"
12435
":kmail: Use KMail.\n"
12436
":mutt: Use Mutt.\n"
12437
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
12438
"1.5,\n"
12439
" this works around some bugs that xdg-email doesn't handle."
10242
12440
10243
#: en/help_topics/configuration.txt:550
12441
#: en/help_topics/configuration.txt:562
10244
12442
msgid "Supported generic values are:"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:552
10248
msgid ""
10249
":default: See above.\n"
10250
":editor: Use your editor to compose the merge request. This also uses\n"
10251
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10252
" smtp_username and smtp_password.\n"
10253
":mapi: Use your preferred e-mail client on Windows.\n"
10254
":xdg-email: Use xdg-email to run your preferred mail program"
10255
msgstr ""
10256
10257
#: en/help_topics/configuration.txt:559
10258
msgid ""
10259
"repository.fdatasync\n"
10260
"~~~~~~~~~~~~~~~~~~~~"
10261
msgstr ""
10262
10263
#: en/help_topics/configuration.txt:562
10264
msgid ""
10265
"If true (default), repository changes are flushed through the OS buffers\n"
10266
"to physical disk. This is somewhat slower, but means data should not be\n"
10267
"lost if the machine crashes. See also dirstate.fdatasync."
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:566
10271
msgid ""
10272
"submit_branch\n"
10273
"~~~~~~~~~~~~~"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:569
10277
msgid ""
10278
"The branch you intend to submit your current work to. This is "
10279
"automatically\n"
10280
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10281
"This\n"
10282
"should usually be set on a per-branch or per-location basis."
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:573
10286
msgid ""
10287
"public_branch\n"
10288
"~~~~~~~~~~~~~"
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:576
12443
msgstr "Supported generic values are:"
12444
12445
#: en/help_topics/configuration.txt:564
12446
msgid ""
12447
":default: See above.\n"
12448
":editor: Use your editor to compose the merge request. This also uses\n"
12449
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
12450
" smtp_username and smtp_password.\n"
12451
":mapi: Use your preferred e-mail client on Windows.\n"
12452
":xdg-email: Use xdg-email to run your preferred mail program"
12453
msgstr ""
12454
":default: See above.\n"
12455
":editor: Use your editor to compose the merge request. This also uses\n"
12456
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
12457
" smtp_username and smtp_password.\n"
12458
":mapi: Use your preferred e-mail client on Windows.\n"
12459
":xdg-email: Use xdg-email to run your preferred mail program"
12460
12461
#: en/help_topics/configuration.txt:571
12462
msgid ""
12463
"repository.fdatasync\n"
12464
"~~~~~~~~~~~~~~~~~~~~"
12465
msgstr ""
12466
"repository.fdatasync\n"
12467
"~~~~~~~~~~~~~~~~~~~~"
12468
12469
#: en/help_topics/configuration.txt:574
12470
msgid ""
12471
"If true (default), repository changes are flushed through the OS buffers\n"
12472
"to physical disk. This is somewhat slower, but means data should not be\n"
12473
"lost if the machine crashes. See also dirstate.fdatasync."
12474
msgstr ""
12475
"If true (default), repository changes are flushed through the OS buffers\n"
12476
"to physical disk. This is somewhat slower, but means data should not be\n"
12477
"lost if the machine crashes. See also dirstate.fdatasync."
12478
12479
#: en/help_topics/configuration.txt:578
12480
msgid ""
12481
"submit_branch\n"
12482
"~~~~~~~~~~~~~"
12483
msgstr ""
12484
"submit_branch\n"
12485
"~~~~~~~~~~~~~"
12486
12487
#: en/help_topics/configuration.txt:581
12488
msgid ""
12489
"The branch you intend to submit your current work to. This is "
12490
"automatically\n"
12491
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
12492
"This\n"
12493
"should usually be set on a per-branch or per-location basis."
12494
msgstr ""
12495
"The branch you intend to submit your current work to. This is "
12496
"automatically\n"
12497
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
12498
"This\n"
12499
"should usually be set on a per-branch or per-location basis."
12500
12501
#: en/help_topics/configuration.txt:585
12502
msgid ""
12503
"public_branch\n"
12504
"~~~~~~~~~~~~~"
12505
msgstr ""
12506
"public_branch\n"
12507
"~~~~~~~~~~~~~"
12508
12509
#: en/help_topics/configuration.txt:588
10292
12510
msgid ""
10293
12511
"A publically-accessible version of this branch (implying that this version "
10294
12512
"is\n"
10295
12513
"not publically-accessible). Used (and set) by ``bzr send``."
10296
12514
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:579
10299
msgid ""
10300
"suppress_warnings\n"
10301
"~~~~~~~~~~~~~~~~~"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:582
10305
msgid ""
10306
"A list of strings, each string represent a warning that can be emitted by\n"
10307
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10308
msgstr ""
10309
10310
#: en/help_topics/configuration.txt:585
10311
msgid "Valid values:"
10312
msgstr ""
10313
10314
#: en/help_topics/configuration.txt:587
10315
msgid ""
10316
"* ``format_deprecation``:\n"
10317
" whether the format deprecation warning is shown on repositories that "
10318
"are\n"
10319
" using deprecated formats."
10320
msgstr ""
12515
"A publicly-accessible version of this branch (implying that this version is\n"
12516
"not publicly-accessible). Used (and set) by ``bzr send``."
10321
12517
10322
12518
#: en/help_topics/configuration.txt:591
10323
12519
msgid ""
10324
"default_format\n"
10325
"~~~~~~~~~~~~~~"
12520
"suppress_warnings\n"
12521
"~~~~~~~~~~~~~~~~~"
10326
12522
msgstr ""
12523
"suppress_warnings\n"
12524
"~~~~~~~~~~~~~~~~~"
10327
12525
10328
12526
#: en/help_topics/configuration.txt:594
10329
12527
msgid ""
10330
"A format name for the default format used when creating branches. See "
10331
"``bzr\n"
10332
"help formats`` for possible values."
12528
"A list of strings, each string represent a warning that can be emitted by\n"
12529
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10333
12530
msgstr ""
12531
"A list of strings, each string represent a warning that can be emitted by\n"
12532
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10334
12533
10335
12534
#: en/help_topics/configuration.txt:597
10336
msgid ""
10337
"\n"
10338
"Unicode options\n"
10339
"---------------"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:601
10343
msgid ""
10344
"output_encoding\n"
10345
"~~~~~~~~~~~~~~~"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:604
12535
msgid "Valid values:"
12536
msgstr "Valid values:"
12537
12538
#: en/help_topics/configuration.txt:599
12539
msgid ""
12540
"* ``format_deprecation``:\n"
12541
" whether the format deprecation warning is shown on repositories that "
12542
"are\n"
12543
" using deprecated formats."
12544
msgstr ""
12545
"* ``format_deprecation``:\n"
12546
" whether the format deprecation warning is shown on repositories that "
12547
"are\n"
12548
" using deprecated formats."
12549
12550
#: en/help_topics/configuration.txt:603
12551
msgid ""
12552
"default_format\n"
12553
"~~~~~~~~~~~~~~"
12554
msgstr ""
12555
"default_format\n"
12556
"~~~~~~~~~~~~~~"
12557
12558
#: en/help_topics/configuration.txt:606
12559
msgid ""
12560
"A format name for the default format used when creating branches. See "
12561
"``bzr\n"
12562
"help formats`` for possible values."
12563
msgstr ""
12564
"A format name for the default format used when creating branches. See "
12565
"``bzr\n"
12566
"help formats`` for possible values."
12567
12568
#: en/help_topics/configuration.txt:609
12569
msgid ""
12570
"\n"
12571
"Unicode options\n"
12572
"---------------"
12573
msgstr ""
12574
"\n"
12575
"Unicode options\n"
12576
"---------------"
12577
12578
#: en/help_topics/configuration.txt:613
12579
msgid ""
12580
"output_encoding\n"
12581
"~~~~~~~~~~~~~~~"
12582
msgstr ""
12583
"output_encoding\n"
12584
"~~~~~~~~~~~~~~~"
12585
12586
#: en/help_topics/configuration.txt:616
10349
12587
msgid ""
10350
12588
"A Python unicode encoding name for text output from bzr, such as log\n"
10351
12589
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10352
12590
"is the terminal encoding prefered by the operating system."
10353
12591
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:608
10356
msgid ""
10357
"\n"
10358
"Branch type specific options\n"
10359
"----------------------------"
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:612
10363
msgid ""
10364
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10365
"later format. They\n"
10366
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10367
"manually set in ``locations.conf`` or ``bazaar.conf``."
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:617
10371
msgid ""
10372
"append_revisions_only\n"
10373
"~~~~~~~~~~~~~~~~~~~~~"
10374
msgstr ""
12592
"A Python unicode encoding name for text output from bzr, such as log\n"
12593
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
12594
"is the terminal encoding preferred by the operating system."
10375
12595
10376
12596
#: en/help_topics/configuration.txt:620
10377
12597
msgid ""
10378
"If set to \"True\" then revisions can only be appended to the log, not\n"
10379
"removed. A branch with this setting enabled can only pull from another\n"
10380
"branch if the other branch's log is a longer version of its own. This is\n"
10381
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10382
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10383
"compatibility with previous bzr versions (older than 2.2)."
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:627
10387
msgid ""
10388
"parent_location\n"
10389
"~~~~~~~~~~~~~~~"
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:630
10393
msgid ""
10394
"If present, the location of the default branch for pull or merge. This "
10395
"option\n"
10396
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10397
"--remember``."
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:634
10401
msgid ""
10402
"push_location\n"
10403
"~~~~~~~~~~~~~"
10404
msgstr ""
10405
10406
#: en/help_topics/configuration.txt:637
10407
msgid ""
10408
"If present, the location of the default branch for push. This option\n"
10409
"is normally set by the first ``push`` or ``push --remember``."
10410
msgstr ""
10411
10412
#: en/help_topics/configuration.txt:640
10413
msgid ""
10414
"push_strict\n"
10415
"~~~~~~~~~~~"
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:643
10419
msgid ""
10420
"If present, defines the ``--strict`` option default value for checking\n"
10421
"uncommitted changes before pushing."
10422
msgstr ""
12598
"\n"
12599
"Branch type specific options\n"
12600
"----------------------------"
12601
msgstr ""
12602
"\n"
12603
"Branch type specific options\n"
12604
"----------------------------"
12605
12606
#: en/help_topics/configuration.txt:624
12607
msgid ""
12608
"These options apply only to branches that use the ``dirstate-tags`` or\n"
12609
"later format. They\n"
12610
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
12611
"manually set in ``locations.conf`` or ``bazaar.conf``."
12612
msgstr ""
12613
"These options apply only to branches that use the ``dirstate-tags`` or\n"
12614
"later format. They\n"
12615
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
12616
"manually set in ``locations.conf`` or ``bazaar.conf``."
12617
12618
#: en/help_topics/configuration.txt:629
12619
msgid ""
12620
"append_revisions_only\n"
12621
"~~~~~~~~~~~~~~~~~~~~~"
12622
msgstr ""
12623
"append_revisions_only\n"
12624
"~~~~~~~~~~~~~~~~~~~~~"
12625
12626
#: en/help_topics/configuration.txt:632
12627
msgid ""
12628
"If set to \"True\" then revisions can only be appended to the log, not\n"
12629
"removed. A branch with this setting enabled can only pull from another\n"
12630
"branch if the other branch's log is a longer version of its own. This is\n"
12631
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
12632
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
12633
"compatibility with previous bzr versions (older than 2.2)."
12634
msgstr ""
12635
"If set to \"True\" then revisions can only be appended to the log, not\n"
12636
"removed. A branch with this setting enabled can only pull from another\n"
12637
"branch if the other branch's log is a longer version of its own. This is\n"
12638
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
12639
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
12640
"compatibility with previous bzr versions (older than 2.2)."
12641
12642
#: en/help_topics/configuration.txt:639
12643
msgid ""
12644
"parent_location\n"
12645
"~~~~~~~~~~~~~~~"
12646
msgstr ""
12647
"parent_location\n"
12648
"~~~~~~~~~~~~~~~"
12649
12650
#: en/help_topics/configuration.txt:642
12651
msgid ""
12652
"If present, the location of the default branch for pull or merge. This "
12653
"option\n"
12654
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
12655
"--remember``."
12656
msgstr ""
12657
"If present, the location of the default branch for pull or merge. This "
12658
"option\n"
12659
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
12660
"--remember``."
10423
12661
10424
12662
#: en/help_topics/configuration.txt:646
10425
12663
msgid ""
10426
"dpush_strict\n"
10427
"~~~~~~~~~~~~"
12664
"push_location\n"
12665
"~~~~~~~~~~~~~"
10428
12666
msgstr ""
12667
"push_location\n"
12668
"~~~~~~~~~~~~~"
10429
12669
10430
12670
#: en/help_topics/configuration.txt:649
10431
12671
msgid ""
10432
"If present, defines the ``--strict`` option default value for checking\n"
10433
"uncommitted changes before pushing into a different VCS without any\n"
10434
"custom bzr metadata."
10435
msgstr ""
10436
10437
#: en/help_topics/configuration.txt:653
10438
msgid ""
10439
"bound_location\n"
10440
"~~~~~~~~~~~~~~"
10441
msgstr ""
10442
10443
#: en/help_topics/configuration.txt:656
10444
msgid ""
10445
"The location that commits should go to when acting as a checkout.\n"
10446
"This option is normally set by ``bind``."
10447
msgstr ""
10448
10449
#: en/help_topics/configuration.txt:659
10450
msgid ""
10451
"bound\n"
10452
"~~~~~"
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:662
10456
msgid ""
10457
"If set to \"True\", the branch should act as a checkout, and push each "
10458
"commit to\n"
10459
"the bound_location. This option is normally set by ``bind``/``unbind``."
10460
msgstr ""
12672
"If present, the location of the default branch for push. This option\n"
12673
"is normally set by the first ``push`` or ``push --remember``."
12674
msgstr ""
12675
"If present, the location of the default branch for push. This option\n"
12676
"is normally set by the first ``push`` or ``push --remember``."
12677
12678
#: en/help_topics/configuration.txt:652
12679
msgid ""
12680
"push_strict\n"
12681
"~~~~~~~~~~~"
12682
msgstr ""
12683
"push_strict\n"
12684
"~~~~~~~~~~~"
12685
12686
#: en/help_topics/configuration.txt:655
12687
msgid ""
12688
"If present, defines the ``--strict`` option default value for checking\n"
12689
"uncommitted changes before pushing."
12690
msgstr ""
12691
"If present, defines the ``--strict`` option default value for checking\n"
12692
"uncommitted changes before pushing."
12693
12694
#: en/help_topics/configuration.txt:658
12695
msgid ""
12696
"dpush_strict\n"
12697
"~~~~~~~~~~~~"
12698
msgstr ""
12699
"dpush_strict\n"
12700
"~~~~~~~~~~~~"
12701
12702
#: en/help_topics/configuration.txt:661
12703
msgid ""
12704
"If present, defines the ``--strict`` option default value for checking\n"
12705
"uncommitted changes before pushing into a different VCS without any\n"
12706
"custom bzr metadata."
12707
msgstr ""
12708
"If present, defines the ``--strict`` option default value for checking\n"
12709
"uncommitted changes before pushing into a different VCS without any\n"
12710
"custom bzr metadata."
10461
12711
10462
12712
#: en/help_topics/configuration.txt:665
10463
12713
msgid ""
10464
"send_strict\n"
10465
"~~~~~~~~~~~"
12714
"bound_location\n"
12715
"~~~~~~~~~~~~~~"
10466
12716
msgstr ""
12717
"bound_location\n"
12718
"~~~~~~~~~~~~~~"
10467
12719
10468
12720
#: en/help_topics/configuration.txt:668
10469
12721
msgid ""
10470
"If present, defines the ``--strict`` option default value for checking\n"
10471
"uncommitted changes before sending a merge directive."
12722
"The location that commits should go to when acting as a checkout.\n"
12723
"This option is normally set by ``bind``."
10472
12724
msgstr ""
12725
"The location that commits should go to when acting as a checkout.\n"
12726
"This option is normally set by ``bind``."
10473
12727
10474
12728
#: en/help_topics/configuration.txt:671
10475
12729
msgid ""
10476
"add.maximum_file_size\n"
10477
"~~~~~~~~~~~~~~~~~~~~~"
12730
"bound\n"
12731
"~~~~~"
10478
12732
msgstr ""
12733
"bound\n"
12734
"~~~~~"
10479
12735
10480
12736
#: en/help_topics/configuration.txt:674
10481
12737
msgid ""
10482
"Defines the maximum file size the command line \"add\" operation will allow\n"
10483
"in recursive mode, with files larger than this value being skipped. You may "
10484
"\n"
10485
"specify this value as an integer (in which case it is interpreted as bytes), "
10486
"\n"
10487
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10488
"0 \n"
10489
"will disable skipping."
10490
msgstr ""
12738
"If set to \"True\", the branch should act as a checkout, and push each "
12739
"commit to\n"
12740
"the bound_location. This option is normally set by ``bind``/``unbind``."
12741
msgstr ""
12742
"If set to \"True\", the branch should act as a checkout, and push each "
12743
"commit to\n"
12744
"the bound_location. This option is normally set by ``bind``/``unbind``."
12745
12746
#: en/help_topics/configuration.txt:677
12747
msgid ""
12748
"send_strict\n"
12749
"~~~~~~~~~~~"
12750
msgstr ""
12751
"send_strict\n"
12752
"~~~~~~~~~~~"
10491
12753
10492
12754
#: en/help_topics/configuration.txt:680
10493
12755
msgid ""
10494
"External Merge Tools\n"
10495
"--------------------"
12756
"If present, defines the ``--strict`` option default value for checking\n"
12757
"uncommitted changes before sending a merge directive."
10496
12758
msgstr ""
12759
"If present, defines the ``--strict`` option default value for checking\n"
12760
"uncommitted changes before sending a merge directive."
10497
12761
10498
12762
#: en/help_topics/configuration.txt:683
10499
12763
msgid ""
10500
"bzr.mergetool.<name>\n"
10501
"~~~~~~~~~~~~~~~~~~~~"
12764
"add.maximum_file_size\n"
12765
"~~~~~~~~~~~~~~~~~~~~~"
10502
12766
msgstr ""
12767
"add.maximum_file_size\n"
12768
"~~~~~~~~~~~~~~~~~~~~~"
10503
12769
10504
12770
#: en/help_topics/configuration.txt:686
10505
12771
msgid ""
10506
"Defines an external merge tool called <name> with the given command-line.\n"
10507
"Arguments containing spaces should be quoted using single or double quotes. "
10508
"The\n"
10509
"executable may omit its path if it can be found on the PATH."
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:690
10513
msgid ""
10514
"The following markers can be used in the command-line to substitute "
10515
"filenames\n"
10516
"involved in the merge conflict::"
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:693
10520
msgid ""
10521
" {base} file.BASE\n"
10522
" {this} file.THIS\n"
10523
" {other} file.OTHER\n"
10524
" {result} output file\n"
10525
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10526
"merge\n"
10527
" succeeds."
10528
msgstr ""
12772
"Defines the maximum file size the command line \"add\" operation will allow\n"
12773
"in recursive mode, with files larger than this value being skipped. You may "
12774
"\n"
12775
"specify this value as an integer (in which case it is interpreted as bytes), "
12776
"\n"
12777
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
12778
"0 \n"
12779
"will disable skipping."
12780
msgstr ""
12781
"Defines the maximum file size the command line \"add\" operation will allow\n"
12782
"in recursive mode, with files larger than this value being skipped. You may "
12783
"\n"
12784
"specify this value as an integer (in which case it is interpreted as bytes), "
12785
"\n"
12786
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
12787
"0 \n"
12788
"will disable skipping."
12789
12790
#: en/help_topics/configuration.txt:692
12791
msgid ""
12792
"External Merge Tools\n"
12793
"--------------------"
12794
msgstr ""
12795
"External Merge Tools\n"
12796
"--------------------"
12797
12798
#: en/help_topics/configuration.txt:695
12799
msgid ""
12800
"bzr.mergetool.<name>\n"
12801
"~~~~~~~~~~~~~~~~~~~~"
12802
msgstr ""
12803
"bzr.mergetool.<name>\n"
12804
"~~~~~~~~~~~~~~~~~~~~"
12805
12806
#: en/help_topics/configuration.txt:698
12807
msgid ""
12808
"Defines an external merge tool called <name> with the given command-line.\n"
12809
"Arguments containing spaces should be quoted using single or double quotes. "
12810
"The\n"
12811
"executable may omit its path if it can be found on the PATH."
12812
msgstr ""
12813
"Defines an external merge tool called <name> with the given command-line.\n"
12814
"Arguments containing spaces should be quoted using single or double quotes. "
12815
"The\n"
12816
"executable may omit its path if it can be found on the PATH."
10529
12817
10530
12818
#: en/help_topics/configuration.txt:702
12819
msgid ""
12820
"The following markers can be used in the command-line to substitute "
12821
"filenames\n"
12822
"involved in the merge conflict::"
12823
msgstr ""
12824
"The following markers can be used in the command-line to substitute "
12825
"filenames\n"
12826
"involved in the merge conflict::"
12827
12828
#: en/help_topics/configuration.txt:705
12829
msgid ""
12830
" {base} file.BASE\n"
12831
" {this} file.THIS\n"
12832
" {other} file.OTHER\n"
12833
" {result} output file\n"
12834
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
12835
"merge\n"
12836
" succeeds."
12837
msgstr ""
12838
" {base} file.BASE\n"
12839
" {this} file.THIS\n"
12840
" {other} file.OTHER\n"
12841
" {result} output file\n"
12842
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
12843
"merge\n"
12844
" succeeds."
12845
12846
#: en/help_topics/configuration.txt:714
10531
12847
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:704
10535
msgid ""
10536
"bzr.default_mergetool\n"
10537
"~~~~~~~~~~~~~~~~~~~~~"
10538
msgstr ""
10539
10540
#: en/help_topics/configuration.txt:707
10541
msgid ""
10542
"Specifies which external merge tool (as defined above) should be selected "
10543
"by\n"
10544
"default in tools such as ``bzr qconflicts``."
10545
msgstr ""
10546
10547
#: en/help_topics/configuration.txt:712
12848
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
12849
12850
#: en/help_topics/configuration.txt:716
12851
msgid ""
12852
"bzr.default_mergetool\n"
12853
"~~~~~~~~~~~~~~~~~~~~~"
12854
msgstr ""
12855
"bzr.default_mergetool\n"
12856
"~~~~~~~~~~~~~~~~~~~~~"
12857
12858
#: en/help_topics/configuration.txt:719
12859
msgid ""
12860
"Specifies which external merge tool (as defined above) should be selected "
12861
"by\n"
12862
"default in tools such as ``bzr qconflicts``."
12863
msgstr ""
12864
"Specifies which external merge tool (as defined above) should be selected "
12865
"by\n"
12866
"default in tools such as ``bzr qconflicts``."
12867
12868
#: en/help_topics/configuration.txt:724
10548
12869
msgid " bzr.default_mergetool = kdiff3\n"
10549
msgstr ""
12870
msgstr " bzr.default_mergetool = kdiff3\n"
10550
12871
10551
12872
#: en/help_topics/conflict-types.txt:1
10552
12873
msgid ""
10553
12874
"Conflict Types\n"
10554
12875
"=============="
10555
12876
msgstr ""
12877
"Conflict Types\n"
12878
"=============="
10556
12879
10557
12880
#: en/help_topics/conflict-types.txt:4
10558
12881
msgid ""
10561
12884
"they\n"
10562
12885
"may conflict with the current state of your working tree. "
10563
12886
msgstr ""
12887
"Some operations, like merge, revert and pull, modify the contents of your\n"
12888
"working tree. These modifications are programmatically generated, and so "
12889
"they\n"
12890
"may conflict with the current state of your working tree. "
10564
12891
10565
12892
#: en/help_topics/conflict-types.txt:8
10566
12893
msgid ""
10569
12896
"conflicts\n"
10570
12897
"have been resolved."
10571
12898
msgstr ""
12899
"When conflicts are present in your working tree (as shown by ``bzr\n"
12900
"conflicts``), you should resolve them and then inform bzr that the "
12901
"conflicts\n"
12902
"have been resolved."
10572
12903
10573
12904
#: en/help_topics/conflict-types.txt:12
10574
12905
msgid ""
10579
12910
"presented\n"
10580
12911
"in a way that is not easy to understand."
10581
12912
msgstr ""
12913
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
12914
"should resolve them is not the one responsible for their occurrence, as is "
12915
"the\n"
12916
"case when merging other people's work or because some conflicts are "
12917
"presented\n"
12918
"in a way that is not easy to understand."
10582
12919
10583
12920
#: en/help_topics/conflict-types.txt:17
10584
12921
msgid ""
10594
12931
"to\n"
10595
12932
"do."
10596
12933
msgstr ""
12934
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
12935
"conflict if and only if there's an actual conceptual conflict in the source\n"
12936
"tree. Because Bazaar doesn't understand the real meaning of the files "
12937
"being\n"
12938
"versioned, it can, when faced with ambiguities, fall short in either "
12939
"direction\n"
12940
"trying to resolve the conflict itself. Many kinds of changes can be "
12941
"combined\n"
12942
"programmatically, but sometimes only a human can determine the right thing "
12943
"to\n"
12944
"do."
10597
12945
10598
12946
#: en/help_topics/conflict-types.txt:25
10599
12947
msgid ""
10602
12950
"present the conflicting versions, and it's up to you to find the correct\n"
10603
12951
"resolution."
10604
12952
msgstr ""
12953
"When Bazaar generates a conflict, it adds information into the working tree "
12954
"to\n"
12955
"present the conflicting versions, and it's up to you to find the correct\n"
12956
"resolution."
10605
12957
10606
12958
#: en/help_topics/conflict-types.txt:29
10607
12959
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10608
msgstr ""
12960
msgstr "Whatever the conflict is, resolving it is roughly done in two steps:"
10609
12961
10610
12962
#: en/help_topics/conflict-types.txt:31
10611
12963
msgid ""
10613
12965
"the\n"
10614
12966
" state you want to keep, then"
10615
12967
msgstr ""
12968
"1. Modify the working tree content so that the conflicted item is now in "
12969
"the\n"
12970
" state you want to keep, then"
10616
12971
10617
12972
#: en/help_topics/conflict-types.txt:34
10618
12973
msgid ""
10619
12974
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10620
12975
" remaining generated information (``bzr resolve <item>``)."
10621
12976
msgstr ""
12977
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
12978
" remaining generated information (``bzr resolve <item>``)."
10622
12979
10623
12980
#: en/help_topics/conflict-types.txt:37
10624
12981
msgid ""
10626
12983
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10627
12984
"itself already made a choice, when possible."
10628
12985
msgstr ""
12986
"For most conflict types, there are some obvious ways to modify the working\n"
12987
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
12988
"itself already made a choice, when possible."
10629
12989
10630
12990
#: en/help_topics/conflict-types.txt:41
10631
12991
msgid ""
10632
12992
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10633
12993
"different ways to resolve the conflict."
10634
12994
msgstr ""
12995
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12996
"different ways to resolve the conflict."
10635
12997
10636
12998
#: en/help_topics/conflict-types.txt:44
10637
12999
msgid ""
10639
13001
"to\n"
10640
13002
"resolve the conflict is outlined."
10641
13003
msgstr ""
13004
"Each type of conflict is explained below, and the action which must be done "
13005
"to\n"
13006
"resolve the conflict is outlined."
10642
13007
10643
13008
#: en/help_topics/conflict-types.txt:47
10644
13009
msgid ""
10647
13012
"these actions, Bazaar can provide some help. In the end you should at least\n"
10648
13013
"inform Bazaar that you're done with the conflict with::"
10649
13014
msgstr ""
13015
"Various actions are available depending on the kind of conflict, for some "
13016
"of\n"
13017
"these actions, Bazaar can provide some help. In the end you should at least\n"
13018
"inform Bazaar that you're done with the conflict with::"
10650
13019
10651
13020
#: en/help_topics/conflict-types.txt:51
10652
13021
msgid " ``bzr resolve FILE --action=done'"
10653
msgstr ""
13022
msgstr " ``bzr resolve FILE --action=done'"
10654
13023
10655
13024
#: en/help_topics/conflict-types.txt:53
10656
13025
msgid ""
10658
13027
"can\n"
10659
13028
"simply use::"
10660
13029
msgstr ""
13030
"Note that this is the default action when a single file is involved so you "
13031
"can\n"
13032
"simply use::"
10661
13033
10662
13034
#: en/help_topics/conflict-types.txt:56
10663
13035
msgid " ``bzr resolve FILE``"
10664
msgstr ""
13036
msgstr " ``bzr resolve FILE``"
10665
13037
10666
13038
#: en/help_topics/conflict-types.txt:58
10667
13039
msgid "See ``bzr help resolve`` for more details."
10668
msgstr ""
13040
msgstr "See ``bzr help resolve`` for more details."
10669
13041
10670
13042
#: en/help_topics/conflict-types.txt:60
10671
13043
msgid ""
10672
13044
"Text conflicts\n"
10673
13045
"--------------"
10674
13046
msgstr ""
13047
"Text conflicts\n"
13048
"--------------"
10675
13049
10676
13050
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10677
13051
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10679
13053
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10680
13054
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10681
13055
msgid "Typical message::"
10682
msgstr ""
13056
msgstr "Typical message::"
10683
13057
10684
13058
#: en/help_topics/conflict-types.txt:65
10685
13059
msgid " Text conflict in FILE"
10686
msgstr ""
13060
msgstr " Text conflict in FILE"
10687
13061
10688
13062
#: en/help_topics/conflict-types.txt:67
10689
13063
msgid ""
10698
13072
"basis\n"
10699
13073
"for comparison."
10700
13074
msgstr ""
13075
"These are produced when a text merge cannot completely reconcile two sets "
13076
"of\n"
13077
"text changes. Bazaar will emit files for each version with the extensions\n"
13078
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
13079
"tree,\n"
13080
"i.e. the tree that you are merging changes into. OTHER is the version that "
13081
"you\n"
13082
"are merging into the target. BASE is an older version that is used as a "
13083
"basis\n"
13084
"for comparison."
10701
13085
10702
13086
#: en/help_topics/conflict-types.txt:74
10703
13087
msgid ""
10705
13089
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10706
13090
"\"herringbone\" markers like ``<<<<<<<``."
10707
13091
msgstr ""
13092
"In the main copy of the file, Bazaar will include all the changes that it\n"
13093
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
13094
"\"herringbone\" markers like ``<<<<<<<``."
10708
13095
10709
13096
#: en/help_topics/conflict-types.txt:78
10710
13097
msgid ""
10714
13101
"leader\n"
10715
13102
"released Bazaar.\" A conflict would look like this::"
10716
13103
msgstr ""
13104
"Say the initial text is \"The project leader released it.\", and THIS "
13105
"modifies it\n"
13106
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
13107
"leader\n"
13108
"released Bazaar.\" A conflict would look like this::"
10717
13109
10718
13110
#: en/help_topics/conflict-types.txt:82
10719
13111
msgid ""
10723
13115
" The project leader released Bazaar.\n"
10724
13116
" >>>>>>> MERGE-SOURCE"
10725
13117
msgstr ""
13118
" <<<<<<< TREE\n"
13119
" Martin Pool released it.\n"
13120
" =======\n"
13121
" The project leader released Bazaar.\n"
13122
" >>>>>>> MERGE-SOURCE"
10726
13123
10727
13124
#: en/help_topics/conflict-types.txt:88
10728
13125
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10729
msgstr ""
13126
msgstr "The correct resolution would be \"Martin Pool released Bazaar.\""
10730
13127
10731
13128
#: en/help_topics/conflict-types.txt:90
10732
13129
msgid ""
10736
13133
"set of changes over the other (but see below when you encounter these\n"
10737
13134
"cases). More often, the two sets of changes must be intelligently combined."
10738
13135
msgstr ""
13136
"You can handle text conflicts either by editing the main copy of the file,\n"
13137
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
13138
"worth mentioning that resolving text conflicts rarely involves picking one\n"
13139
"set of changes over the other (but see below when you encounter these\n"
13140
"cases). More often, the two sets of changes must be intelligently combined."
10739
13141
10740
13142
#: en/help_topics/conflict-types.txt:96
10741
13143
msgid ""
10744
13146
"be\n"
10745
13147
"ready to commit."
10746
13148
msgstr ""
13149
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
13150
"you are done editing, the file should look like it never had a conflict, and "
13151
"be\n"
13152
"ready to commit."
10747
13153
10748
13154
#: en/help_topics/conflict-types.txt:100
10749
13155
msgid ""
10750
13156
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10751
13157
"Bazaar will auto-detect which conflicts you have resolved."
10752
13158
msgstr ""
13159
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
13160
"Bazaar will auto-detect which conflicts you have resolved."
10753
13161
10754
13162
#: en/help_topics/conflict-types.txt:103
10755
13163
msgid ""
10757
13165
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10758
13166
"working tree."
10759
13167
msgstr ""
13168
"When the conflict is resolved, Bazaar deletes the previously generated\n"
13169
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
13170
"working tree."
10760
13171
10761
13172
#: en/help_topics/conflict-types.txt:107
10762
13173
msgid ""
10764
13175
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10765
13176
"resolve`` with one of the following actions:"
10766
13177
msgstr ""
13178
"\n"
13179
"When you want to pick one set of changes over the other, you can use ``bzr\n"
13180
"resolve`` with one of the following actions:"
10767
13181
10768
13182
#: en/help_topics/conflict-types.txt:111
10769
13183
msgid ""
10770
13184
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10771
13185
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10772
13186
msgstr ""
13187
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
13188
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10773
13189
10774
13190
#: en/help_topics/conflict-types.txt:114
10775
13191
msgid ""
10776
13192
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10777
13193
"modifications will be taken into account."
10778
13194
msgstr ""
13195
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
13196
"modifications will be taken into account."
10779
13197
10780
13198
#: en/help_topics/conflict-types.txt:117
10781
13199
msgid ""
10782
13200
"Content conflicts\n"
10783
13201
"-----------------"
10784
13202
msgstr ""
13203
"Content conflicts\n"
13204
"-----------------"
10785
13205
10786
13206
#: en/help_topics/conflict-types.txt:122
10787
13207
msgid " Contents conflict in FILE"
10788
msgstr ""
13208
msgstr " Contents conflict in FILE"
10789
13209
10790
13210
#: en/help_topics/conflict-types.txt:124
10791
13211
msgid ""
10797
13217
"files\n"
10798
13218
"that are deleted on one side, and modified on the other."
10799
13219
msgstr ""
13220
"This conflict happens when there are conflicting changes in the working "
13221
"tree\n"
13222
"and the merge source, but the conflicted items are not text files. They "
13223
"may\n"
13224
"be binary files, or symlinks, or directories. It can even happen with "
13225
"files\n"
13226
"that are deleted on one side, and modified on the other."
10800
13227
10801
13228
#: en/help_topics/conflict-types.txt:129
10802
13229
msgid ""
10808
13235
"\"main\n"
10809
13236
"copy\" has been renamed to THIS or OTHER."
10810
13237
msgstr ""
13238
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
13239
"be\n"
13240
"regular files, symlinks or directories). But it will not include a \"main "
13241
"copy\"\n"
13242
"of the file with herringbone conflict markers. It will appear that the "
13243
"\"main\n"
13244
"copy\" has been renamed to THIS or OTHER."
10811
13245
10812
13246
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10813
13247
msgid ""
10815
13249
"version\n"
10816
13250
"or a combination of both."
10817
13251
msgstr ""
13252
"To resolve that kind of conflict, you should rebuild FILE from either "
13253
"version\n"
13254
"or a combination of both."
10818
13255
10819
13256
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10820
13257
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10821
13258
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10822
13259
#: en/help_topics/conflict-types.txt:361
10823
13260
msgid "``bzr resolve`` recognizes the following actions:"
10824
msgstr ""
13261
msgstr "``bzr resolve`` recognises the following actions:"
10825
13262
10826
13263
#: en/help_topics/conflict-types.txt:139
10827
13264
msgid ""
10829
13266
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10830
13267
"* ``--action=done`` will just mark the conflict as resolved."
10831
13268
msgstr ""
13269
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
13270
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
13271
"* ``--action=done`` will just mark the conflict as resolved."
10832
13272
10833
13273
#: en/help_topics/conflict-types.txt:143
10834
13274
msgid ""
10836
13276
"and\n"
10837
13277
"``.OTHER`` files if they are still present in the working tree."
10838
13278
msgstr ""
13279
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
13280
"and\n"
13281
"``.OTHER`` files if they are still present in the working tree."
10839
13282
10840
13283
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10841
13284
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10844
13287
msgid ""
10845
13288
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10846
13289
msgstr ""
13290
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10847
13291
10848
13292
#: en/help_topics/conflict-types.txt:148
10849
13293
msgid ""
10850
13294
"Tag conflicts\n"
10851
13295
"-------------"
10852
13296
msgstr ""
13297
"Tag conflicts\n"
13298
"-------------"
10853
13299
10854
13300
#: en/help_topics/conflict-types.txt:153
10855
13301
msgid ""
10856
13302
" Conflicting tags:\n"
10857
13303
" version-0.1"
10858
13304
msgstr ""
13305
" Conflicting tags:\n"
13306
" version-0.1"
10859
13307
10860
13308
#: en/help_topics/conflict-types.txt:156
10861
13309
msgid ""
10865
13313
"different revisions. You need not resolve these conflicts, but subsequent\n"
10866
13314
"uses of pull or push will result in the same message."
10867
13315
msgstr ""
13316
"When pulling from or pushing to another branch, Bazaar informs you about "
13317
"tags\n"
13318
"that conflict between the two branches; that is the same tag points to two\n"
13319
"different revisions. You need not resolve these conflicts, but subsequent\n"
13320
"uses of pull or push will result in the same message."
10868
13321
10869
13322
#: en/help_topics/conflict-types.txt:161
10870
13323
msgid ""
10883
13336
"overwrite\n"
10884
13337
"all tags as well.)"
10885
13338
msgstr ""
13339
"To resolve the conflict, you must apply the correct tags to either the "
13340
"target\n"
13341
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
13342
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
13343
"target branch's tags match the source branch, then in the target branch do\n"
13344
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
13345
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
13346
"source\n"
13347
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
13348
"favor of the target branch, you need to similarly use ``tag --force`` in "
13349
"the\n"
13350
"source branch. (Note that pulling or pushing using --overwrite will "
13351
"overwrite\n"
13352
"all tags as well.)"
10886
13353
10887
13354
#: en/help_topics/conflict-types.txt:172
10888
13355
msgid ""
10889
13356
"Duplicate paths\n"
10890
13357
"---------------"
10891
13358
msgstr ""
13359
"Duplicate paths\n"
13360
"---------------"
10892
13361
10893
13362
#: en/help_topics/conflict-types.txt:177
10894
13363
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10895
msgstr ""
13364
msgstr " Conflict adding file FILE. Moved existing file to FILE.moved."
10896
13365
10897
13366
#: en/help_topics/conflict-types.txt:179
10898
13367
msgid ""
10899
13368
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10900
13369
"already been used. The existing file will be renamed to \"FILE.moved\". "
10901
13370
msgstr ""
13371
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
13372
"already been used. The existing file will be renamed to \"FILE.moved\". "
10902
13373
10903
13374
#: en/help_topics/conflict-types.txt:187
10904
13375
msgid ""
10907
13378
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10908
13379
"* ``--action=done`` will just mark the conflict as resolved."
10909
13380
msgstr ""
13381
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
13382
"FILE``,\n"
13383
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
13384
"* ``--action=done`` will just mark the conflict as resolved."
10910
13385
10911
13386
#: en/help_topics/conflict-types.txt:191
10912
13387
msgid ""
10913
13388
"Note that you must get rid of FILE.moved before using ``--action=done``."
10914
13389
msgstr ""
13390
"Note that you must get rid of FILE.moved before using ``--action=done``."
10915
13391
10916
13392
#: en/help_topics/conflict-types.txt:195
10917
13393
msgid ""
10918
13394
"Unversioned parent\n"
10919
13395
"------------------"
10920
13396
msgstr ""
13397
"Unversioned parent\n"
13398
"------------------"
10921
13399
10922
13400
#: en/help_topics/conflict-types.txt:200
10923
13401
msgid ""
10924
13402
" Conflict because FILE is not versioned, but has versioned children."
10925
13403
msgstr ""
13404
" Conflict because FILE is not versioned, but has versioned children."
10926
13405
10927
13406
#: en/help_topics/conflict-types.txt:202
10928
13407
msgid ""
10938
13417
"resolve\n"
10939
13418
"FILE\" to mark the conflict as resolved."
10940
13419
msgstr ""
13420
"Sometimes Bazaar will attempt to create a file whose parent directory is "
13421
"not\n"
13422
"versioned. This happens when the directory has been deleted in the target,\n"
13423
"but has a new child in the source, or vice versa. In this situation, "
13424
"Bazaar\n"
13425
"will version the parent directory as well. Resolving this issue depends\n"
13426
"very much on the particular scenario. You may wish to rename or delete "
13427
"either\n"
13428
"the file or the directory. When you are satisfied, you can run \"bzr "
13429
"resolve\n"
13430
"FILE\" to mark the conflict as resolved."
10941
13431
10942
13432
#: en/help_topics/conflict-types.txt:210
10943
13433
msgid ""
10944
13434
"Missing parent\n"
10945
13435
"--------------"
10946
13436
msgstr ""
13437
"Missing parent\n"
13438
"--------------"
10947
13439
10948
13440
#: en/help_topics/conflict-types.txt:215
10949
13441
msgid " Conflict adding files to FILE. Created directory."
10950
msgstr ""
13442
msgstr " Conflict adding files to FILE. Created directory."
10951
13443
10952
13444
#: en/help_topics/conflict-types.txt:217
10953
13445
msgid ""
10958
13450
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10959
13451
"Resolving this issue depends very much on the particular scenario."
10960
13452
msgstr ""
13453
"This happens when a directory has been deleted in the target, but has new\n"
13454
"children in the source. This is similar to the \"unversioned parent\" "
13455
"conflict,\n"
13456
"except that the parent directory does not *exist*, instead of just being\n"
13457
"unversioned. In this situation, Bazaar will create the missing parent.\n"
13458
"Resolving this issue depends very much on the particular scenario."
10961
13459
10962
13460
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10963
13461
msgid ""
10964
13462
"To resolve that kind of conflict, you should either remove or rename the\n"
10965
13463
"children or the directory or a combination of both."
10966
13464
msgstr ""
13465
"To resolve that kind of conflict, you should either remove or rename the\n"
13466
"children or the directory or a combination of both."
10967
13467
10968
13468
#: en/help_topics/conflict-types.txt:228
10969
13469
msgid ""
10974
13474
" and restoring the directory,\n"
10975
13475
"* ``--action=done`` will just mark the conflict as resolved."
10976
13476
msgstr ""
13477
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
13478
" children,\n"
13479
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
13480
"children\n"
13481
" and restoring the directory,\n"
13482
"* ``--action=done`` will just mark the conflict as resolved."
10977
13483
10978
13484
#: en/help_topics/conflict-types.txt:236
10979
13485
msgid ""
10980
13486
"Deleting parent\n"
10981
13487
"---------------"
10982
13488
msgstr ""
13489
"Deleting parent\n"
13490
"---------------"
10983
13491
10984
13492
#: en/help_topics/conflict-types.txt:241
10985
13493
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10986
msgstr ""
13494
msgstr " Conflict: can't delete DIR because it is not empty. Not deleting."
10987
13495
10988
13496
#: en/help_topics/conflict-types.txt:243
10989
13497
msgid ""
10993
13501
"will retain the directory. Resolving this issue depends very much on the\n"
10994
13502
"particular scenario."
10995
13503
msgstr ""
13504
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
13505
"source, but has new children in the target (either because a directory\n"
13506
"deletion is merged or because the merge introduce new children). Bazaar\n"
13507
"will retain the directory. Resolving this issue depends very much on the\n"
13508
"particular scenario."
10996
13509
10997
13510
#: en/help_topics/conflict-types.txt:254
10998
13511
msgid ""
10999
13512
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11000
13513
"directory,"
11001
13514
msgstr ""
13515
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
13516
"directory,"
11002
13517
11003
13518
#: en/help_topics/conflict-types.txt:256
11004
13519
msgid ""
11005
13520
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11006
13521
" children,"
11007
13522
msgstr ""
13523
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
13524
" children,"
11008
13525
11009
13526
#: en/help_topics/conflict-types.txt:259
11010
13527
msgid "* ``--action=done`` will just mark the conflict as resolved."
11011
msgstr ""
13528
msgstr "* ``--action=done`` will just mark the conflict as resolved."
11012
13529
11013
13530
#: en/help_topics/conflict-types.txt:261
11014
13531
msgid ""
11016
13533
"present, they become potential orphans has they don't have a directory\n"
11017
13534
"parent anymore."
11018
13535
msgstr ""
13536
"Note that when merging a directory deletion, if unversioned files are\n"
13537
"present, they become potential orphans has they don't have a directory\n"
13538
"parent any more."
11019
13539
11020
13540
#: en/help_topics/conflict-types.txt:265
11021
13541
msgid ""
11022
13542
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11023
13543
"setting the ``bzr.transform.orphan_policy`` configuration option."
11024
13544
msgstr ""
13545
"Handling such orphans, *before* the conflict is created, is controlled by\n"
13546
"setting the ``bzr.transform.orphan_policy`` configuration option."
11025
13547
11026
13548
#: en/help_topics/conflict-types.txt:268
11027
13549
msgid "There are two possible values for this option:"
11028
msgstr ""
13550
msgstr "There are two possible values for this option:"
11029
13551
11030
13552
#: en/help_topics/conflict-types.txt:270
11031
13553
msgid ""
11032
13554
"* ``conflict`` (the default): will leave the orphans in place and\n"
11033
13555
" generate a conflicts,"
11034
13556
msgstr ""
13557
"* ``conflict`` (the default): will leave the orphans in place and\n"
13558
" generate a conflicts,"
11035
13559
11036
13560
#: en/help_topics/conflict-types.txt:273
11037
13561
msgid ""
11039
13563
"root\n"
11040
13564
" of the working tree with names like ``<file>.~#~``."
11041
13565
msgstr ""
13566
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
13567
"root\n"
13568
" of the working tree with names like ``<file>.~#~``."
11042
13569
11043
13570
#: en/help_topics/conflict-types.txt:278
11044
13571
msgid ""
11045
13572
"Path conflict\n"
11046
13573
"-------------"
11047
13574
msgstr ""
13575
"Path conflict\n"
13576
"-------------"
11048
13577
11049
13578
#: en/help_topics/conflict-types.txt:283
11050
13579
msgid " Path conflict: PATH1 / PATH2"
11051
msgstr ""
13580
msgstr " Path conflict: PATH1 / PATH2"
11052
13581
11053
13582
#: en/help_topics/conflict-types.txt:285
11054
13583
msgid ""
11056
13585
"parent\n"
11057
13586
"directory of a file. Bazaar will use the path elements from the source."
11058
13587
msgstr ""
13588
"This happens when the source and target have each modified the name or "
13589
"parent\n"
13590
"directory of a file. Bazaar will use the path elements from the source."
11059
13591
11060
13592
#: en/help_topics/conflict-types.txt:288
11061
13593
msgid ""
11063
13595
"be\n"
11064
13596
"retained for the file involved."
11065
13597
msgstr ""
13598
"To resolve that kind of conflict, you just have to decide what name should "
13599
"be\n"
13600
"retained for the file involved."
11066
13601
11067
13602
#: en/help_topics/conflict-types.txt:293
11068
13603
msgid ""
11072
13607
"``PATH2``,\n"
11073
13608
"* ``--action=done`` will just mark the conflict as resolved."
11074
13609
msgstr ""
13610
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
13611
" issuing ``bzr mv PATH2 PATH1``,\n"
13612
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
13613
"``PATH2``,\n"
13614
"* ``--action=done`` will just mark the conflict as resolved."
11075
13615
11076
13616
#: en/help_topics/conflict-types.txt:300
11077
13617
msgid ""
11078
13618
"Parent loop\n"
11079
13619
"-----------"
11080
13620
msgstr ""
13621
"Parent loop\n"
13622
"-----------"
11081
13623
11082
13624
#: en/help_topics/conflict-types.txt:305
11083
13625
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11084
msgstr ""
13626
msgstr " Conflict moving FILE into DIRECTORY. Cancelled move."
11085
13627
11086
13628
#: en/help_topics/conflict-types.txt:307
11087
13629
msgid ""
11090
13632
"itself.\n"
11091
13633
"For example::"
11092
13634
msgstr ""
13635
"This happens when the source and the target have each moved directories, so\n"
13636
"that, if the change could be applied, a directory would be contained by "
13637
"itself.\n"
13638
"For example::"
11093
13639
11094
13640
#: en/help_topics/conflict-types.txt:311
11095
13641
msgid ""
11104
13650
" $ bzr commit ../other -m \"OTHER\"\n"
11105
13651
" $ bzr merge ../other"
11106
13652
msgstr ""
13653
" $ bzr init\n"
13654
" $ bzr mkdir white\n"
13655
" $ bzr mkdir black\n"
13656
" $ bzr commit -m \"BASE\"\n"
13657
" $ bzr branch . ../other\n"
13658
" $ bzr mv white black\n"
13659
" $ bzr commit -m \"THIS\"\n"
13660
" $ bzr mv ../other/black ../other/white\n"
13661
" $ bzr commit ../other -m \"OTHER\"\n"
13662
" $ bzr merge ../other"
11107
13663
11108
13664
#: en/help_topics/conflict-types.txt:322
11109
13665
msgid ""
11111
13667
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11112
13668
"name should be retained for the directories involved."
11113
13669
msgstr ""
13670
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
13671
"``black``. To resolve that kind of conflict, you just have to decide what\n"
13672
"name should be retained for the directories involved."
11114
13673
11115
13674
#: en/help_topics/conflict-types.txt:328
11116
13675
msgid ""
11121
13680
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11122
13681
"* ``--action=done`` will just mark the conflict as resolved."
11123
13682
msgstr ""
13683
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
13684
"\n"
13685
" in ``black``,\n"
13686
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
13687
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
13688
"* ``--action=done`` will just mark the conflict as resolved."
11124
13689
11125
13690
#: en/help_topics/conflict-types.txt:336
11126
13691
msgid ""
11127
13692
"Non-directory parent\n"
11128
13693
"--------------------"
11129
13694
msgstr ""
13695
"Non-directory parent\n"
13696
"--------------------"
11130
13697
11131
13698
#: en/help_topics/conflict-types.txt:341
11132
13699
msgid ""
11133
13700
" Conflict: foo.new is not a directory, but has files in it.\n"
11134
13701
" Created directory."
11135
13702
msgstr ""
13703
" Conflict: foo.new is not a directory, but has files in it.\n"
13704
" Created directory."
11136
13705
11137
13706
#: en/help_topics/conflict-types.txt:344
11138
13707
msgid ""
11140
13709
"side\n"
11141
13710
"has changed the directory into a file or symlink. For example::"
11142
13711
msgstr ""
13712
"This happens when one side has added files to a directory, and the other "
13713
"side\n"
13714
"has changed the directory into a file or symlink. For example::"
11143
13715
11144
13716
#: en/help_topics/conflict-types.txt:347
11145
13717
msgid ""
11154
13726
" $ bzr commit ../other -m \"OTHER\"\n"
11155
13727
" $ bzr merge ../other"
11156
13728
msgstr ""
13729
" $ bzr init\n"
13730
" $ bzr mkdir foo\n"
13731
" $ bzr commit -m \"BASE\"\n"
13732
" $ bzr branch . ../other\n"
13733
" $ rmdir foo\n"
13734
" $ touch foo\n"
13735
" $ bzr commit -m \"THIS\"\n"
13736
" $ bzr mkdir ../other/foo/bar\n"
13737
" $ bzr commit ../other -m \"OTHER\"\n"
13738
" $ bzr merge ../other"
11157
13739
11158
13740
#: en/help_topics/conflict-types.txt:358
11159
13741
msgid ""
11160
13742
"To resolve that kind of conflict, you have to decide what name should be\n"
11161
13743
"retained for the file, directory or symlink involved."
11162
13744
msgstr ""
13745
"To resolve that kind of conflict, you have to decide what name should be\n"
13746
"retained for the file, directory or symlink involved."
11163
13747
11164
13748
#: en/help_topics/conflict-types.txt:363
11165
13749
msgid ""
11169
13753
" ``bzr mv foo.new foo``,\n"
11170
13754
"* ``--action=done`` will just mark the conflict as resolved."
11171
13755
msgstr ""
13756
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
13757
" ``bzr add foo``,\n"
13758
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
13759
" ``bzr mv foo.new foo``,\n"
13760
"* ``--action=done`` will just mark the conflict as resolved."
11172
13761
11173
13762
#: en/help_topics/conflict-types.txt:371
11174
13763
msgid ""
11175
13764
"MalformedTransform\n"
11176
13765
"------------------"
11177
13766
msgstr ""
13767
"MalformedTransform\n"
13768
"------------------"
11178
13769
11179
13770
#: en/help_topics/conflict-types.txt:374
11180
13771
msgid ""
11185
13776
"you\n"
11186
13777
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11187
13778
msgstr ""
13779
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
13780
"exception. This means that Bazaar encountered a filesystem conflict that it "
13781
"was\n"
13782
"unable to resolve. This usually indicates a bug. Please let us know if "
13783
"you\n"
13784
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11188
13785
11189
13786
#: en/help_topics/content-filters.txt:1
11190
13787
msgid ""
11191
13788
"Content Filters\n"
11192
13789
"==============="
11193
13790
msgstr ""
13791
"Content Filters\n"
13792
"==============="
11194
13793
11195
13794
#: en/help_topics/content-filters.txt:4
11196
13795
msgid ""
11197
13796
"Content formats\n"
11198
13797
"---------------"
11199
13798
msgstr ""
13799
"Content formats\n"
13800
"---------------"
11200
13801
11201
13802
#: en/help_topics/content-filters.txt:7
11202
13803
msgid ""
11209
13810
"and trailing spaces on lines in text files to be implicitly stripped\n"
11210
13811
"when committed."
11211
13812
msgstr ""
13813
"Bazaar's content filtering allows you to store files in a different\n"
13814
"format from the copy in your working tree. This lets you, or your\n"
13815
"co-developers, use Windows development tools that expect CRLF files\n"
13816
"on projects that use other line-ending conventions. Among other things,\n"
13817
"content filters also let Unix developers more easily work on projects\n"
13818
"using Windows line-ending conventions, keyword expansion/compression,\n"
13819
"and trailing spaces on lines in text files to be implicitly stripped\n"
13820
"when committed."
11212
13821
11213
13822
#: en/help_topics/content-filters.txt:16
11214
13823
msgid "To generalize, there are two content formats supported by Bazaar:"
11215
msgstr ""
13824
msgstr "To generalise, there are two content formats supported by Bazaar:"
11216
13825
11217
13826
#: en/help_topics/content-filters.txt:18
11218
13827
msgid ""
11219
13828
"* a canonical format - how files are stored internally\n"
11220
13829
"* a convenience format - how files are created in a working tree."
11221
13830
msgstr ""
13831
"* a canonical format - how files are stored internally\n"
13832
"* a convenience format - how files are created in a working tree."
11222
13833
11223
13834
#: en/help_topics/content-filters.txt:21
11224
13835
msgid ""
11226
13837
"Format conversion\n"
11227
13838
"-----------------"
11228
13839
msgstr ""
13840
"\n"
13841
"Format conversion\n"
13842
"-----------------"
11229
13843
11230
13844
#: en/help_topics/content-filters.txt:25
11231
13845
msgid ""
11232
13846
"The conversion between these formats is done by content filters.\n"
11233
13847
"A content filter has two parts:"
11234
13848
msgstr ""
13849
"The conversion between these formats is done by content filters.\n"
13850
"A content filter has two parts:"
11235
13851
11236
13852
#: en/help_topics/content-filters.txt:28
11237
13853
msgid ""
11238
13854
"* a read converter - converts from convenience to canonical format\n"
11239
13855
"* a write converter - converts from canonical to convenience format."
11240
13856
msgstr ""
13857
"* a read converter - converts from convenience to canonical format\n"
13858
"* a write converter - converts from canonical to convenience format."
11241
13859
11242
13860
#: en/help_topics/content-filters.txt:31
11243
13861
msgid ""
11248
13866
"trailing whitespace off lines in source code while the matching\n"
11249
13867
"write converter might pass content through unchanged."
11250
13868
msgstr ""
13869
"Many of these converters will provide *round-trip* conversion,\n"
13870
"i.e. applying the read converter followed by the write converter\n"
13871
"gives back the original content. However, others may provide an\n"
13872
"asymmetric conversion. For example, a read converter might strip\n"
13873
"trailing whitespace off lines in source code while the matching\n"
13874
"write converter might pass content through unchanged."
11251
13875
11252
13876
#: en/help_topics/content-filters.txt:38
11253
13877
msgid ""
11255
13879
"Enabling content filters\n"
11256
13880
"------------------------"
11257
13881
msgstr ""
13882
"\n"
13883
"Enabling content filters\n"
13884
"------------------------"
11258
13885
11259
13886
#: en/help_topics/content-filters.txt:42
11260
13887
msgid ""
11267
13894
"using rule-based preferences. See ``bzr help rules`` for general\n"
11268
13895
"information about defining these."
11269
13896
msgstr ""
13897
"Content filters are typically provided by plugins, so the first step\n"
13898
"in using them is to install the relevant plugins and read their\n"
13899
"documentation. Some plugins may be very specific about which files\n"
13900
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
13901
"In other cases, the plugin may leave it in the user's hands to\n"
13902
"define which files are to be filtered. This is typically done\n"
13903
"using rule-based preferences. See ``bzr help rules`` for general\n"
13904
"information about defining these."
11270
13905
11271
13906
#: en/help_topics/content-filters.txt:51
11272
13907
msgid ""
11274
13909
"Impact on commands\n"
11275
13910
"------------------"
11276
13911
msgstr ""
13912
"\n"
13913
"Impact on commands\n"
13914
"------------------"
11277
13915
11278
13916
#: en/help_topics/content-filters.txt:55
11279
13917
msgid ""
11282
13920
"will apply read converters to files in the working tree, then compare\n"
11283
13921
"the results to the content last committed."
11284
13922
msgstr ""
13923
"Read converters are only applied to commands that read content from\n"
13924
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
13925
"will apply read converters to files in the working tree, then compare\n"
13926
"the results to the content last committed."
11285
13927
11286
13928
#: en/help_topics/content-filters.txt:60
11287
13929
msgid ""
11290
13932
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11291
13933
"respectively."
11292
13934
msgstr ""
13935
"Write converters are only applied by commands that **create files in a\n"
13936
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
13937
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
13938
"respectively."
11293
13939
11294
13940
#: en/help_topics/content-filters.txt:65
11295
13941
msgid ""
11299
13945
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11300
13946
"for more information on hooks."
11301
13947
msgstr ""
13948
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
13949
"committing files. If this makes sense for a given plugin providing\n"
13950
"a content filter, the plugin can usually achieve this effect by using a\n"
13951
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
13952
"for more information on hooks."
11302
13953
11303
13954
#: en/help_topics/content-filters.txt:71
11304
13955
msgid ""
11306
13957
"Refreshing your working tree\n"
11307
13958
"----------------------------"
11308
13959
msgstr ""
13960
"\n"
13961
"Refreshing your working tree\n"
13962
"----------------------------"
11309
13963
11310
13964
#: en/help_topics/content-filters.txt:75
11311
13965
msgid ""
11316
13970
"in one or both directions, e.g. after installing or reconfiguring\n"
11317
13971
"plugins providing it."
11318
13972
msgstr ""
13973
"For performance reasons, Bazaar caches the timestamps of files in\n"
13974
"a working tree, and assumes files are unchanged if their timestamps\n"
13975
"match the cached values. As a consequence, there are times when\n"
13976
"you may need to explicitly ask for content filtering to be reapplied\n"
13977
"in one or both directions, e.g. after installing or reconfiguring\n"
13978
"plugins providing it."
11319
13979
11320
13980
#: en/help_topics/content-filters.txt:82
11321
13981
msgid "Here are some general guidelines for doing this:"
11322
msgstr ""
13982
msgstr "Here are some general guidelines for doing this:"
11323
13983
11324
13984
#: en/help_topics/content-filters.txt:84
11325
13985
msgid ""
11328
13988
" relevant read converters and compare the end result with the\n"
11329
13989
" canonical format."
11330
13990
msgstr ""
13991
" * To reapply read converters, ``touch`` files, i.e. update their\n"
13992
" timestamp. Operations like ``bzr status`` should then reapply the\n"
13993
" relevant read converters and compare the end result with the\n"
13994
" canonical format."
11331
13995
11332
13996
#: en/help_topics/content-filters.txt:89
11333
13997
msgid ""
11334
13998
" * To reapply write converters, ensure there are no local changes,\n"
11335
13999
" delete the relevant files and run ``bzr revert`` on those files."
11336
14000
msgstr ""
14001
" * To reapply write converters, ensure there are no local changes,\n"
14002
" delete the relevant files and run ``bzr revert`` on those files."
11337
14003
11338
14004
#: en/help_topics/content-filters.txt:92
11339
14005
msgid ""
11340
14006
"Note: In the future, it is likely that additional options will be added\n"
11341
14007
"to commands to make this refreshing process faster and safer.\n"
11342
14008
msgstr ""
14009
"Note: In the future, it is likely that additional options will be added\n"
14010
"to commands to make this refreshing process faster and safer.\n"
11343
14011
11344
14012
#: en/help_topics/current-formats.txt:1
11345
14013
msgid "Current Storage Formats"
11346
msgstr ""
14014
msgstr "Current Storage Formats"
11347
14015
11348
14016
#: en/help_topics/current-formats.txt:3
11349
14017
msgid ""
11352
14020
" compress storage. Provides rich roots which are a one-way\n"
11353
14021
" transition."
11354
14022
msgstr ""
14023
":2a:\n"
14024
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
14025
" compress storage. Provides rich roots which are a one-way\n"
14026
" transition."
11355
14027
11356
14028
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11357
14029
msgid ""
11358
14030
"\n"
11359
14031
"See :doc:`formats-help` for more about storage formats."
11360
14032
msgstr ""
14033
"\n"
14034
"See :doc:`formats-help` for more about storage formats."
11361
14035
11362
14036
#: en/help_topics/debug-flags.txt:1
11363
14037
msgid ""
11364
14038
"Debug Flags\n"
11365
14039
"==========="
11366
14040
msgstr ""
14041
"Debug Flags\n"
14042
"==========="
11367
14043
11368
14044
#: en/help_topics/debug-flags.txt:4
11369
14045
msgid ""
11370
14046
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11371
14047
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11372
14048
msgstr ""
14049
"These flags can be passed on the bzr command line or (without the ``-D``\n"
14050
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11373
14051
11374
14052
#: en/help_topics/debug-flags.txt:7
11375
14053
msgid ""
11420
14098
"appropriate\n"
11421
14099
" for the format, even for non-local fetches.\n"
11422
14100
msgstr ""
14101
"-Dauth Trace authentication sections used.\n"
14102
"-Dbytes Print out how many bytes were transferred\n"
14103
"-Ddirstate Trace dirstate activity (verbose!)\n"
14104
"-Derror Instead of normal error handling, always print a "
14105
"traceback\n"
14106
" on error.\n"
14107
"-Devil Capture call sites that do expensive or badly-scaling\n"
14108
" operations.\n"
14109
"-Dfetch Trace history copying between repositories.\n"
14110
"-Dfilters Emit information for debugging content filtering.\n"
14111
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
14112
"fetch.\n"
14113
"-Dgraph Trace graph traversal.\n"
14114
"-Dhashcache Log every time a working file is read to determine its "
14115
"hash.\n"
14116
"-Dhooks Trace hook execution.\n"
14117
"-Dhpss Trace smart protocol requests and responses.\n"
14118
"-Dhpssdetail More hpss details.\n"
14119
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
14120
"-Dhttp Trace http connections, requests and responses.\n"
14121
"-Dindex Trace major index operations.\n"
14122
"-Dknit Trace knit operations.\n"
14123
"-Dlock Trace when lockdir locks are taken or released.\n"
14124
"-Dnoretry If a connection is reset, fail immediately rather than\n"
14125
" retrying the request.\n"
14126
"-Dprogress Trace progress bar operations.\n"
14127
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
14128
"-Dmerge Emit information for debugging merges.\n"
14129
"-Dno_apport Don't use apport to report crashes.\n"
14130
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
14131
"-Dpack Emit information about pack operations.\n"
14132
"-Drelock Emit a message every time a branch or repository object "
14133
"is\n"
14134
" unlocked then relocked the same way.\n"
14135
"-Dsftp Trace SFTP internals.\n"
14136
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
14137
"expected\n"
14138
"-Dstream Trace fetch streams.\n"
14139
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
14140
"portable\n"
14141
" manner.\n"
14142
"-Dunlock Some errors during unlock are treated as warnings.\n"
14143
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
14144
"-DIDS_always Always use InterDifferingSerializer to fetch if "
14145
"appropriate\n"
14146
" for the format, even for non-local fetches.\n"
11423
14147
11424
14148
#: en/help_topics/diverged-branches.txt:1
11425
14149
msgid ""
11426
14150
"Diverged Branches\n"
11427
14151
"================="
11428
14152
msgstr ""
14153
"Diverged Branches\n"
14154
"================="
11429
14155
11430
14156
#: en/help_topics/diverged-branches.txt:4
11431
14157
msgid ""
11441
14167
"source\n"
11442
14168
"branch."
11443
14169
msgstr ""
14170
"When Bazaar tries to push one branch onto another, it requires that the\n"
14171
"destination branch must be ready to receive the source branch. If this "
14172
"isn't\n"
14173
"the case, then we say that the branches have ``diverged``. Branches are\n"
14174
"considered diverged if the destination branch's most recent commit is one "
14175
"that\n"
14176
"has not been merged (directly or indirectly) by the source branch. To "
14177
"recover\n"
14178
"from diverged branches, one must merge the missing revisions into the "
14179
"source\n"
14180
"branch."
11444
14181
11445
14182
#: en/help_topics/diverged-branches.txt:12
11446
14183
msgid ""
11449
14186
"last pull and you have local commits that have not yet been pushed to the\n"
11450
14187
"mainline, then your local branch and the mainline have diverged."
11451
14188
msgstr ""
14189
"This situation commonly arises when using a centralised workflow with local\n"
14190
"commits. If someone else has committed new work to the mainline since your\n"
14191
"last pull and you have local commits that have not yet been pushed to the\n"
14192
"mainline, then your local branch and the mainline have diverged."
11452
14193
11453
14194
#: en/help_topics/diverged-branches.txt:17
11454
14195
msgid ""
11455
14196
"Discovering What Has Diverged\n"
11456
14197
"-----------------------------"
11457
14198
msgstr ""
14199
"Discovering What Has Diverged\n"
14200
"-----------------------------"
11458
14201
11459
14202
#: en/help_topics/diverged-branches.txt:20
11460
14203
msgid ""
11468
14211
"old=other_branch``\n"
11469
14212
"to show the differences between other_branch and your current branch."
11470
14213
msgstr ""
14214
"The ``bzr missing`` command is used to find out what revisions are in "
14215
"another\n"
14216
"branch that are not present in the current branch, and vice-versa. It shows "
14217
"a\n"
14218
"summary of which extra revisions exist in each branch. If you want to see "
14219
"the\n"
14220
"precise effects of those revisions, you can use ``bzr diff --"
14221
"old=other_branch``\n"
14222
"to show the differences between other_branch and your current branch."
11471
14223
11472
14224
#: en/help_topics/diverged-branches.txt:26
11473
14225
msgid ""
11474
14226
"A Solution\n"
11475
14227
"----------"
11476
14228
msgstr ""
14229
"A Solution\n"
14230
"----------"
11477
14231
11478
14232
#: en/help_topics/diverged-branches.txt:29
11479
14233
msgid ""
11494
14248
"local\n"
11495
14249
"branch can now be pushed to the mainline.\n"
11496
14250
msgstr ""
14251
"The solution is to merge the revisions from the mainline into your local\n"
14252
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
14253
"mainline. This merge may result in conflicts if the other developer's "
14254
"changes\n"
14255
"overlap with your changes. These conflicts should be resolved before\n"
14256
"continuing. After any conflicts have been resolved, or even if there were "
14257
"no\n"
14258
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
14259
"to your local branch. This requirement gives you an opportunity to test "
14260
"the\n"
14261
"resulting working tree for correctness, since the merged revisions could "
14262
"have\n"
14263
"made arbitrary changes. After testing, you should commit the merge using\n"
14264
"``bzr commit``. This clears up the diverged branches situation. Your "
14265
"local\n"
14266
"branch can now be pushed to the mainline.\n"
14267
14268
#: en/help_topics/env-variables.txt:1
14269
msgid "Environment Variables"
14270
msgstr "Environment Variables"
14271
14272
#: en/help_topics/env-variables.txt:3
14273
msgid ""
14274
"=================== "
14275
"===========================================================\n"
14276
"BZRPATH Path where bzr is to look for shell plugin external\n"
14277
" commands.\n"
14278
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
14279
"EMAIL E-Mail address of the user.\n"
14280
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
14281
"EDITOR Editor for editing commit messages.\n"
14282
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
14283
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
14284
"BZR_PLUGINS_AT Plugins to load from a directory not in "
14285
"BZR_PLUGIN_PATH.\n"
14286
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
14287
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
14288
"and\n"
14289
" HOME.\n"
14290
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
14291
"URLs).\n"
14292
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
14293
"sshcorp,\n"
14294
" plink or lsh.\n"
14295
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
14296
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
14297
"BZR_COLUMNS Override implicit terminal width.\n"
14298
"BZR_CONCURRENCY Number of processes that can be run concurrently "
14299
"(selftest)\n"
14300
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
14301
"'text'.\n"
14302
"BZR_PDB Control whether to launch a debugger on error.\n"
14303
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
14304
" breakin debugger.\n"
14305
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
14306
"(instead\n"
14307
" of char-based).\n"
14308
"=================== "
14309
"===========================================================\n"
14310
msgstr ""
14311
"=================== "
14312
"===========================================================\n"
14313
"BZRPATH Path where bzr is to look for shell plugin external\n"
14314
" commands.\n"
14315
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
14316
"EMAIL E-Mail address of the user.\n"
14317
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
14318
"EDITOR Editor for editing commit messages.\n"
14319
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
14320
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
14321
"BZR_PLUGINS_AT Plugins to load from a directory not in "
14322
"BZR_PLUGIN_PATH.\n"
14323
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
14324
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
14325
"and\n"
14326
" HOME.\n"
14327
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
14328
"URLs).\n"
14329
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
14330
"sshcorp,\n"
14331
" plink or lsh.\n"
14332
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
14333
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
14334
"BZR_COLUMNS Override implicit terminal width.\n"
14335
"BZR_CONCURRENCY Number of processes that can be run concurrently "
14336
"(selftest)\n"
14337
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
14338
"'text'.\n"
14339
"BZR_PDB Control whether to launch a debugger on error.\n"
14340
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
14341
" breakin debugger.\n"
14342
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
14343
"(instead\n"
14344
" of char-based).\n"
14345
"=================== "
14346
"===========================================================\n"
11497
14347
11498
14348
#: en/help_topics/eol.txt:1
11499
14349
msgid ""
11500
14350
"End of Line Conversion\n"
11501
14351
"======================"
11502
14352
msgstr ""
14353
"End of Line Conversion\n"
14354
"======================"
11503
14355
11504
14356
#: en/help_topics/eol.txt:4
11505
14357
msgid ""
11507
14359
"stores a canonical format but outputs a convenience format. See\n"
11508
14360
"``bzr help content-filters`` for general information about using these."
11509
14361
msgstr ""
14362
"EOL conversion is provided as a content filter where Bazaar internally\n"
14363
"stores a canonical format but outputs a convenience format. See\n"
14364
"``bzr help content-filters`` for general information about using these."
11510
14365
11511
14366
#: en/help_topics/eol.txt:8
11512
14367
msgid ""
11517
14372
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11518
14373
"or later."
11519
14374
msgstr ""
14375
"Note: Content filtering is only supported in recently added formats,\n"
14376
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
14377
"in a recent format. (Just setting the format on the repository\n"
14378
"is not enough.) If content filtering does not appear to be working, use\n"
14379
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
14380
"or later."
11520
14381
11521
14382
#: en/help_topics/eol.txt:15
11522
14383
msgid ""
11526
14387
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11527
14388
"supported in a future verison of Bazaar."
11528
14389
msgstr ""
14390
"EOL conversion needs to be enabled for selected file patterns using\n"
14391
"rules. See ``bzr help rules`` for general information on defining rules.\n"
14392
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
14393
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
14394
"supported in a future version of Bazaar."
11529
14395
11530
14396
#: en/help_topics/eol.txt:21
11531
14397
msgid ""
11532
14398
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11533
14399
"(If a value is not set, ``exact`` is the default.)"
11534
14400
msgstr ""
14401
"To configure which files to filter, set ``eol`` to one of the values below.\n"
14402
"(If a value is not set, ``exact`` is the default.)"
11535
14403
11536
14404
#: en/help_topics/eol.txt:24
11537
14405
msgid ""
11547
14415
" ``exact`` No conversion Exactly as in file\n"
11548
14416
" ========== ===================================== ======================"
11549
14417
msgstr ""
14418
" ========== ===================================== ======================\n"
14419
" Value Checkout end-of-lines as Commit end-of-lines as\n"
14420
" ========== ===================================== ======================\n"
14421
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
14422
" ---------- ------------------------------------- ----------------------\n"
14423
" ``lf`` ``lf`` ``lf``\n"
14424
" ---------- ------------------------------------- ----------------------\n"
14425
" ``crlf`` ``crlf`` ``lf``\n"
14426
" ---------- ------------------------------------- ----------------------\n"
14427
" ``exact`` No conversion Exactly as in file\n"
14428
" ========== ===================================== ======================"
11550
14429
11551
14430
#: en/help_topics/eol.txt:36
11552
14431
msgid ""
11553
14432
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11554
14433
"byte is detected in the file."
11555
14434
msgstr ""
14435
"Note: For safety reasons, no conversion is applied to any file where a null\n"
14436
"byte is detected in the file."
11556
14437
11557
14438
#: en/help_topics/eol.txt:39
11558
14439
msgid ""
11559
14440
"For users working on a cross-platform project, here is a suggested rule\n"
11560
14441
"to use as a starting point::"
11561
14442
msgstr ""
14443
"For users working on a cross-platform project, here is a suggested rule\n"
14444
"to use as a starting point::"
11562
14445
11563
14446
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11564
14447
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11566
14449
" [name *]\n"
11567
14450
" eol = native"
11568
14451
msgstr ""
14452
" [name *]\n"
14453
" eol = native"
11569
14454
11570
14455
#: en/help_topics/eol.txt:45
11571
14456
msgid ""
11573
14458
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11574
14459
"by giving more explicit patterns earlier in the rules file. For example::"
11575
14460
msgstr ""
14461
"If you have binary files that do not contain a null byte though, be\n"
14462
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
14463
"by giving more explicit patterns earlier in the rules file. For example::"
11576
14464
11577
14465
#: en/help_topics/eol.txt:49
11578
14466
msgid ""
11579
14467
" [name *.png]\n"
11580
14468
" eol = exact"
11581
14469
msgstr ""
14470
" [name *.png]\n"
14471
" eol = exact"
11582
14472
11583
14473
#: en/help_topics/eol.txt:55
11584
14474
msgid ""
11588
14478
"endings or line endings get mixed during editing, it gets committed\n"
11589
14479
"correctly and gets checked out correctly. For example::"
11590
14480
msgstr ""
14481
"If your working tree is on a network drive shared by users on different\n"
14482
"operating systems, you typically want to force certain conventions for\n"
14483
"certain files. In that way, if a file is created with the wrong line\n"
14484
"endings or line endings get mixed during editing, it gets committed\n"
14485
"correctly and gets checked out correctly. For example::"
11591
14486
11592
14487
#: en/help_topics/eol.txt:61
11593
14488
msgid ""
11594
14489
" [name *.bat]\n"
11595
14490
" eol = crlf"
11596
14491
msgstr ""
14492
" [name *.bat]\n"
14493
" eol = crlf"
11597
14494
11598
14495
#: en/help_topics/eol.txt:64
11599
14496
msgid ""
11600
14497
" [name *.sh]\n"
11601
14498
" eol = lf"
11602
14499
msgstr ""
14500
" [name *.sh]\n"
14501
" eol = lf"
11603
14502
11604
14503
#: en/help_topics/eol.txt:70
11605
14504
msgid ""
11609
14508
"introducing mixed line endings will be corrected during commit for files\n"
11610
14509
"with those settings."
11611
14510
msgstr ""
14511
"If you take the care to create files with their required endings, you can\n"
14512
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
14513
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
14514
"introducing mixed line endings will be corrected during commit for files\n"
14515
"with those settings."
11612
14516
11613
14517
#: en/help_topics/eol.txt:76
11614
14518
msgid ""
11615
14519
"If you have sample test data that deliberately has text files with mixed\n"
11616
14520
"newline conventions, you can ask for those to be left alone like this::"
11617
14521
msgstr ""
14522
"If you have sample test data that deliberately has text files with mixed\n"
14523
"newline conventions, you can ask for those to be left alone like this::"
11618
14524
11619
14525
#: en/help_topics/eol.txt:79
11620
14526
msgid ""
11621
14527
" [name test_data/]\n"
11622
14528
" eol = exact"
11623
14529
msgstr ""
14530
" [name test_data/]\n"
14531
" eol = exact"
11624
14532
11625
14533
#: en/help_topics/eol.txt:85
11626
14534
msgid ""
11630
14538
"In the future, a ``binary = true`` rule may be added but it is not\n"
11631
14539
"supported yet.)"
11632
14540
msgstr ""
14541
"Note that ``exact`` does not imply the file is binary but it does mean\n"
14542
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
14543
"of content analysis to detect binary files for commands like ``diff``.\n"
14544
"In the future, a ``binary = true`` rule may be added but it is not\n"
14545
"supported yet.)"
11633
14546
11634
14547
#: en/help_topics/eol.txt:91
11635
14548
msgid ""
11640
14553
"may also help users who do not have rules configured. To do this, set\n"
11641
14554
"``eol`` to one of the values below."
11642
14555
msgstr ""
14556
"If you have an existing repository with text files already stored using\n"
14557
"Windows newline conventions (``crlf``), then you may want to keep using "
14558
"that\n"
14559
"convention in the repository. Forcing certain files to this convention\n"
14560
"may also help users who do not have rules configured. To do this, set\n"
14561
"``eol`` to one of the values below."
11643
14562
11644
14563
#: en/help_topics/eol.txt:97
11645
14564
msgid ""
11659
14578
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11660
14579
" ============================ ======================== ======================"
11661
14580
msgstr ""
14581
" ============================ ======================== "
14582
"======================\n"
14583
" Value Checkout end-of-lines as Commit end-of-lines "
14584
"as\n"
14585
" ============================ ======================== "
14586
"======================\n"
14587
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
14588
" ``lf`` otherwise\n"
14589
" ---------------------------- ------------------------ ----------------------"
14590
"\n"
14591
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
14592
" ---------------------------- ------------------------ ----------------------"
14593
"\n"
14594
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
14595
" ============================ ======================== ======================"
11662
14596
11663
14597
#: en/help_topics/eol.txt:108
11664
14598
msgid ""
11666
14600
"conventions in their Bazaar repository, this rule is suggested as a\n"
11667
14601
"starting point::"
11668
14602
msgstr ""
14603
"For users working on an existing project that uses Windows newline\n"
14604
"conventions in their Bazaar repository, this rule is suggested as a\n"
14605
"starting point::"
11669
14606
11670
14607
#: en/help_topics/eol.txt:112
11671
14608
msgid ""
11672
14609
" [name *]\n"
11673
14610
" eol = native-with-crlf-in-repo"
11674
14611
msgstr ""
14612
" [name *]\n"
14613
" eol = native-with-crlf-in-repo"
11675
14614
11676
14615
#: en/help_topics/eol.txt:115
11677
14616
msgid ""
11679
14618
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11680
14619
"``crlf`` and ``exact``."
11681
14620
msgstr ""
14621
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
14622
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
14623
"``crlf`` and ``exact``."
11682
14624
11683
14625
#: en/help_topics/eol.txt:119
11684
14626
msgid ""
11687
14629
"are found. A precommit hook should be used if you wish to validate\n"
11688
14630
"(and not just convert) content before committing.\n"
11689
14631
msgstr ""
14632
"Note: Bazaar's EOL conversion will convert the content of files but\n"
14633
"never reject files because a given line ending or mixed line endings\n"
14634
"are found. A pre-commit hook should be used if you wish to validate\n"
14635
"(and not just convert) content before committing.\n"
11690
14636
11691
14637
#: en/help_topics/hidden-commands.txt:1
11692
14638
msgid ""
11726
14672
"wait-until-signalled Test helper for\n"
11727
14673
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11728
14674
msgstr ""
14675
"added List files added in working tree.\n"
14676
"ancestry List all revisions merged into this branch.\n"
14677
"assert-fail Test reporting of assertion failures\n"
14678
"bundle-info Output interesting stats about a bundle\n"
14679
"bundle-revisions Create a merge-directive for submitting changes.\n"
14680
"cat-revision Write out metadata for a revision.\n"
14681
"dump-btree Dump the contents of a btree index file to stdout.\n"
14682
"export-pot Export command helps and error messages in po format.\n"
14683
"file-id Print file_id of a particular file or directory.\n"
14684
"file-path Print path of file_ids to a file or directory.\n"
14685
"find-merge-base Find and print a base revision for merging two "
14686
"branches.\n"
14687
"hooks Show hooks.\n"
14688
"inventory Show inventory of the current working copy or a "
14689
"revision.\n"
14690
"local-time-offset Show the offset in seconds from GMT to local time.\n"
14691
"lookup-revision Lookup the revision-id from a revision-number\n"
14692
"merge-directive Generate a merge directive for auto-merge tools.\n"
14693
"modified List files modified in working tree.\n"
14694
"re-sign Create a digital signature for an existing revision.\n"
14695
"reference list, view and set branch locations for nested trees.\n"
14696
"relpath Show path of a file relative to root\n"
14697
"repair-workingtree Reset the working tree state file.\n"
14698
"revision-history Display the list of revision ids on a branch.\n"
14699
"revision-info Show revision number and revision id for a given "
14700
"revision\n"
14701
" identifier.\n"
14702
"rocks Statement of optimism.\n"
14703
"selftest Run internal test suite.\n"
14704
"shell-complete Show appropriate completions for context.\n"
14705
"test-script Run a shell-like test from a file.\n"
14706
"touching-revisions Return revision-ids which affected a particular file.\n"
14707
"unknowns List unknown files.\n"
14708
"wait-until-signalled Test helper for\n"
14709
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11729
14710
11730
14711
#: en/help_topics/hooks.txt:1
11731
14712
msgid ""
11733
14714
"Hooks\n"
11734
14715
"====="
11735
14716
msgstr ""
14717
"\n"
14718
"Hooks\n"
14719
"====="
11736
14720
11737
14721
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11738
14722
msgid ""
11739
14723
"Introduction\n"
11740
14724
"------------"
11741
14725
msgstr ""
14726
"Introduction\n"
14727
"------------"
11742
14728
11743
14729
#: en/help_topics/hooks.txt:8
11744
14730
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11745
msgstr ""
14731
msgstr "A hook of type *xxx* of class *yyy* needs to be registered using::"
11746
14732
11747
14733
#: en/help_topics/hooks.txt:10
11748
14734
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11749
msgstr ""
14735
msgstr " yyy.hooks.install_named_hook(\"xxx\", ...)"
11750
14736
11751
14737
#: en/help_topics/hooks.txt:12
11752
14738
msgid ""
11753
14739
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11754
14740
msgstr ""
14741
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11755
14742
11756
14743
#: en/help_topics/hooks.txt:14
11757
14744
msgid ""
11760
14747
"instance, BranchHooks as the class is the hooks class for\n"
11761
14748
"`bzrlib.branch.Branch.hooks`."
11762
14749
msgstr ""
14750
"The class that contains each hook is given before the hooks it supplies. "
14751
"For\n"
14752
"instance, BranchHooks as the class is the hooks class for\n"
14753
"`bzrlib.branch.Branch.hooks`."
11763
14754
11764
14755
#: en/help_topics/hooks.txt:18
11765
14756
msgid ""
11767
14758
"machine where bzr was invoked) or the server (the machine addressed by\n"
11768
14759
"the branch URL). These may be, but are not necessarily, the same machine."
11769
14760
msgstr ""
14761
"Each description also indicates whether the hook runs on the client (the\n"
14762
"machine where bzr was invoked) or the server (the machine addressed by\n"
14763
"the branch URL). These may be, but are not necessarily, the same machine."
11770
14764
11771
14765
#: en/help_topics/hooks.txt:22
11772
14766
msgid ""
11773
14767
"Plugins (including hooks) are run on the server if all of these is true:"
11774
14768
msgstr ""
14769
"Plugins (including hooks) are run on the server if all of these is true:"
11775
14770
11776
14771
#: en/help_topics/hooks.txt:24
11777
14772
msgid ""
11780
14775
"\"http://\"\n"
11781
14776
" URL when a smart server is available via HTTP)."
11782
14777
msgstr ""
14778
" * The connection is via a smart server (accessed with a URL starting with\n"
14779
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
14780
"\"http://\"\n"
14781
" URL when a smart server is available via HTTP)."
11783
14782
11784
14783
#: en/help_topics/hooks.txt:28
11785
14784
msgid ""
11787
14786
"rather\n"
11788
14787
" than client specific code (such as commit)."
11789
14788
msgstr ""
14789
" * The hook is either server specific or part of general infrastructure "
14790
"rather\n"
14791
" than client specific code (such as commit)."
11790
14792
11791
14793
#: en/help_topics/hooks.txt:31
11792
14794
msgid ""
11794
14796
"BranchHooks\n"
11795
14797
"-----------"
11796
14798
msgstr ""
14799
"\n"
14800
"BranchHooks\n"
14801
"-----------"
11797
14802
11798
14803
#: en/help_topics/hooks.txt:35
11799
14804
msgid ""
11800
14805
"automatic_tag_name\n"
11801
14806
"~~~~~~~~~~~~~~~~~~"
11802
14807
msgstr ""
14808
"automatic_tag_name\n"
14809
"~~~~~~~~~~~~~~~~~~"
11803
14810
11804
14811
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11805
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
14812
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11806
14813
msgid "Introduced in: 2.2"
11807
msgstr ""
14814
msgstr "Introduced in: 2.2"
11808
14815
11809
14816
#: en/help_topics/hooks.txt:40
11810
14817
msgid ""
11813
14820
"return a tag name or None if no tag name could be determined. The\n"
11814
14821
"first non-None tag name returned will be used."
11815
14822
msgstr ""
14823
"Called to determine an automatic tag name for a revision.\n"
14824
"automatic_tag_name is called with (branch, revision_id) and should\n"
14825
"return a tag name or None if no tag name could be determined. The\n"
14826
"first non-None tag name returned will be used."
11816
14827
11817
14828
#: en/help_topics/hooks.txt:45
11818
14829
msgid ""
11819
14830
"open\n"
11820
14831
"~~~~"
11821
14832
msgstr ""
14833
"open\n"
14834
"~~~~"
11822
14835
11823
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11824
#: en/help_topics/hooks.txt:304
14836
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
14837
#: en/help_topics/hooks.txt:307
11825
14838
msgid "Introduced in: 1.8"
11826
msgstr ""
14839
msgstr "Introduced in: 1.8"
11827
14840
11828
14841
#: en/help_topics/hooks.txt:50
11829
14842
msgid ""
11830
14843
"Called with the Branch object that has been opened after a branch is\n"
11831
14844
"opened."
11832
14845
msgstr ""
14846
"Called with the Branch object that has been opened after a branch is\n"
14847
"opened."
11833
14848
11834
14849
#: en/help_topics/hooks.txt:53
11835
14850
msgid ""
11836
14851
"post_branch_init\n"
11837
14852
"~~~~~~~~~~~~~~~~"
11838
14853
msgstr ""
14854
"post_branch_init\n"
14855
"~~~~~~~~~~~~~~~~"
11839
14856
11840
14857
#: en/help_topics/hooks.txt:58
11841
14858
msgid ""
11844
14861
"branch and checkout (both heavyweight and lightweight) will all\n"
11845
14862
"trigger this hook."
11846
14863
msgstr ""
14864
"Called after new branch initialisation completes. post_branch_init is\n"
14865
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
14866
"branch and checkout (both heavyweight and lightweight) will all\n"
14867
"trigger this hook."
11847
14868
11848
14869
#: en/help_topics/hooks.txt:63
11849
14870
msgid ""
11850
14871
"post_change_branch_tip\n"
11851
14872
"~~~~~~~~~~~~~~~~~~~~~~"
11852
14873
msgstr ""
14874
"post_change_branch_tip\n"
14875
"~~~~~~~~~~~~~~~~~~~~~~"
11853
14876
11854
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
14877
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11855
14878
msgid "Introduced in: 1.4"
11856
msgstr ""
14879
msgstr "Introduced in: 1.4"
11857
14880
11858
14881
#: en/help_topics/hooks.txt:68
11859
14882
msgid ""
11862
14885
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11863
14886
"uncommit will all trigger this hook."
11864
14887
msgstr ""
14888
"Called in bzr client and server after a change to the tip of a branch\n"
14889
"is made. post_change_branch_tip is called with a\n"
14890
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
14891
"uncommit will all trigger this hook."
11865
14892
11866
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
14893
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11867
14894
msgid ""
11868
14895
"post_commit\n"
11869
14896
"~~~~~~~~~~~"
11870
14897
msgstr ""
14898
"post_commit\n"
14899
"~~~~~~~~~~~"
11871
14900
11872
14901
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11873
14902
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11874
#: en/help_topics/hooks.txt:145
11875
14903
msgid "Introduced in: 0.15"
11876
msgstr ""
14904
msgstr "Introduced in: 0.15"
11877
14905
11878
14906
#: en/help_topics/hooks.txt:78
11879
14907
msgid ""
11882
14910
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11883
14911
"branch."
11884
14912
msgstr ""
14913
"Called in the bzr client after a commit has completed. post_commit is\n"
14914
"called with (local, master, old_revno, old_revid, new_revno,\n"
14915
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
14916
"branch."
11885
14917
11886
14918
#: en/help_topics/hooks.txt:83
11887
14919
msgid ""
11888
14920
"post_pull\n"
11889
14921
"~~~~~~~~~"
11890
14922
msgstr ""
14923
"post_pull\n"
14924
"~~~~~~~~~"
11891
14925
11892
14926
#: en/help_topics/hooks.txt:88
11893
14927
msgid ""
11894
14928
"Called after a pull operation completes. post_pull is called with a\n"
11895
14929
"bzrlib.branch.PullResult object and only runs in the bzr client."
11896
14930
msgstr ""
14931
"Called after a pull operation completes. post_pull is called with a\n"
14932
"bzrlib.branch.PullResult object and only runs in the bzr client."
11897
14933
11898
14934
#: en/help_topics/hooks.txt:91
11899
14935
msgid ""
11900
14936
"post_push\n"
11901
14937
"~~~~~~~~~"
11902
14938
msgstr ""
14939
"post_push\n"
14940
"~~~~~~~~~"
11903
14941
11904
14942
#: en/help_topics/hooks.txt:96
11905
14943
msgid ""
11906
14944
"Called after a push operation completes. post_push is called with a\n"
11907
14945
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11908
14946
msgstr ""
14947
"Called after a push operation completes. post_push is called with a\n"
14948
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11909
14949
11910
14950
#: en/help_topics/hooks.txt:99
11911
14951
msgid ""
11912
14952
"post_switch\n"
11913
14953
"~~~~~~~~~~~"
11914
14954
msgstr ""
14955
"post_switch\n"
14956
"~~~~~~~~~~~"
11915
14957
11916
14958
#: en/help_topics/hooks.txt:104
11917
14959
msgid ""
11918
14960
"Called after a checkout switches branch. post_switch is called with a\n"
11919
14961
"bzrlib.branch.SwitchHookParams."
11920
14962
msgstr ""
14963
"Called after a checkout switches branch. post_switch is called with a\n"
14964
"bzrlib.branch.SwitchHookParams."
11921
14965
11922
14966
#: en/help_topics/hooks.txt:107
11923
14967
msgid ""
11924
14968
"post_uncommit\n"
11925
14969
"~~~~~~~~~~~~~"
11926
14970
msgstr ""
14971
"post_uncommit\n"
14972
"~~~~~~~~~~~~~"
11927
14973
11928
14974
#: en/help_topics/hooks.txt:112
11929
14975
msgid ""
11933
14979
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11934
14980
"of None."
11935
14981
msgstr ""
14982
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
14983
"called with (local, master, old_revno, old_revid, new_revno,\n"
14984
"new_revid) where local is the local branch or None, master is the\n"
14985
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
14986
"of None."
11936
14987
11937
14988
#: en/help_topics/hooks.txt:118
11938
14989
msgid ""
11939
14990
"pre_change_branch_tip\n"
11940
14991
"~~~~~~~~~~~~~~~~~~~~~"
11941
14992
msgstr ""
14993
"pre_change_branch_tip\n"
14994
"~~~~~~~~~~~~~~~~~~~~~"
11942
14995
11943
14996
#: en/help_topics/hooks.txt:121
11944
14997
msgid "Introduced in: 1.6"
11945
msgstr ""
14998
msgstr "Introduced in: 1.6"
11946
14999
11947
15000
#: en/help_topics/hooks.txt:123
11948
15001
msgid ""
11951
15004
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11952
15005
"uncommit will all trigger this hook."
11953
15006
msgstr ""
15007
"Called in bzr client and server before a change to the tip of a branch\n"
15008
"is made. pre_change_branch_tip is called with a\n"
15009
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
15010
"uncommit will all trigger this hook."
11954
15011
11955
15012
#: en/help_topics/hooks.txt:128
11956
15013
msgid ""
11957
15014
"pre_commit\n"
11958
15015
"~~~~~~~~~~"
11959
15016
msgstr ""
15017
"pre_commit\n"
15018
"~~~~~~~~~~"
11960
15019
11961
15020
#: en/help_topics/hooks.txt:131
11962
15021
msgid "Introduced in: 0.91"
11963
msgstr ""
15022
msgstr "Introduced in: 0.91"
11964
15023
11965
15024
#: en/help_topics/hooks.txt:133
11966
15025
msgid ""
11973
15032
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11974
15033
"tree."
11975
15034
msgstr ""
15035
"Called after a commit is calculated but before it is completed.\n"
15036
"pre_commit is called with (local, master, old_revno, old_revid,\n"
15037
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
15038
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
15039
"TreeDelta object describing changes from the basis revision. hooks\n"
15040
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
15041
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
15042
"tree."
11976
15043
11977
15044
#: en/help_topics/hooks.txt:142
11978
15045
msgid ""
11979
"set_rh\n"
11980
"~~~~~~"
15046
"transform_fallback_location\n"
15047
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11981
15048
msgstr ""
15049
"transform_fallback_location\n"
15050
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
15051
15052
#: en/help_topics/hooks.txt:145
15053
msgid "Introduced in: 1.9"
15054
msgstr "Introduced in: 1.9"
11982
15055
11983
15056
#: en/help_topics/hooks.txt:147
11984
15057
msgid ""
11985
"Invoked whenever the revision history has been set via\n"
11986
"set_revision_history. The api signature is (branch, revision_history),\n"
11987
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11988
"for bzr to trigger, a better hook to use is\n"
11989
"Branch.post_change_branch_tip."
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:153
11993
msgid ""
11994
"transform_fallback_location\n"
11995
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:156
11999
msgid "Introduced in: 1.9"
12000
msgstr ""
15058
"Called when a stacked branch is activating its fallback locations.\n"
15059
"transform_fallback_location is called with (branch, url), and should\n"
15060
"return a new url. Returning the same url allows it to be used as-is,\n"
15061
"returning a different one can be used to cause the branch to stack on\n"
15062
"a closer copy of that fallback_location. Note that the branch cannot\n"
15063
"have history accessing methods called on it during this hook because\n"
15064
"the fallback locations have not been activated. When there are\n"
15065
"multiple hooks installed for transform_fallback_location, all are\n"
15066
"called with the url returned from the previous hook.The order is\n"
15067
"however undefined."
15068
msgstr ""
15069
"Called when a stacked branch is activating its fallback locations.\n"
15070
"transform_fallback_location is called with (branch, url), and should\n"
15071
"return a new url. Returning the same url allows it to be used as-is,\n"
15072
"returning a different one can be used to cause the branch to stack on\n"
15073
"a closer copy of that fallback_location. Note that the branch cannot\n"
15074
"have history accessing methods called on it during this hook because\n"
15075
"the fallback locations have not been activated. When there are\n"
15076
"multiple hooks installed for transform_fallback_location, all are\n"
15077
"called with the url returned from the previous hook.The order is\n"
15078
"however undefined."
12001
15079
12002
15080
#: en/help_topics/hooks.txt:158
12003
15081
msgid ""
12004
"Called when a stacked branch is activating its fallback locations.\n"
12005
"transform_fallback_location is called with (branch, url), and should\n"
12006
"return a new url. Returning the same url allows it to be used as-is,\n"
12007
"returning a different one can be used to cause the branch to stack on\n"
12008
"a closer copy of that fallback_location. Note that the branch cannot\n"
12009
"have history accessing methods called on it during this hook because\n"
12010
"the fallback locations have not been activated. When there are\n"
12011
"multiple hooks installed for transform_fallback_location, all are\n"
12012
"called with the url returned from the previous hook.The order is\n"
12013
"however undefined."
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:169
12017
msgid ""
12018
"CommandHooks\n"
12019
"------------"
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:172
12023
msgid ""
12024
"extend_command\n"
12025
"~~~~~~~~~~~~~~"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:175
15082
"CommandHooks\n"
15083
"------------"
15084
msgstr ""
15085
"CommandHooks\n"
15086
"------------"
15087
15088
#: en/help_topics/hooks.txt:161
15089
msgid ""
15090
"extend_command\n"
15091
"~~~~~~~~~~~~~~"
15092
msgstr ""
15093
"extend_command\n"
15094
"~~~~~~~~~~~~~~"
15095
15096
#: en/help_topics/hooks.txt:164
12029
15097
msgid "Introduced in: 1.13"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:177
12033
msgid ""
12034
"Called after creating a command object to allow modifications such as\n"
12035
"adding or removing options, docs etc. Called with the new\n"
12036
"bzrlib.commands.Command object."
12037
msgstr ""
12038
12039
#: en/help_topics/hooks.txt:181
12040
msgid ""
12041
"get_command\n"
12042
"~~~~~~~~~~~"
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12046
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
15098
msgstr "Introduced in: 1.13"
15099
15100
#: en/help_topics/hooks.txt:166
15101
msgid ""
15102
"Called after creating a command object to allow modifications such as\n"
15103
"adding or removing options, docs etc. Called with the new\n"
15104
"bzrlib.commands.Command object."
15105
msgstr ""
15106
"Called after creating a command object to allow modifications such as\n"
15107
"adding or removing options, docs etc. Called with the new\n"
15108
"bzrlib.commands.Command object."
15109
15110
#: en/help_topics/hooks.txt:170
15111
msgid ""
15112
"get_command\n"
15113
"~~~~~~~~~~~"
15114
msgstr ""
15115
"get_command\n"
15116
"~~~~~~~~~~~"
15117
15118
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
15119
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12047
15120
msgid "Introduced in: 1.17"
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:186
12051
msgid ""
12052
"Called when creating a single command. Called with (cmd_or_None,\n"
12053
"command_name). get_command should either return the cmd_or_None\n"
12054
"parameter, or a replacement Command object that should be used for the\n"
12055
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12056
"Many users will prefer to use bzrlib.commands.register_command or\n"
12057
"plugin_cmds.register_lazy."
12058
msgstr ""
12059
12060
#: en/help_topics/hooks.txt:193
12061
msgid ""
12062
"get_missing_command\n"
12063
"~~~~~~~~~~~~~~~~~~~"
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:198
12067
msgid ""
12068
"Called when creating a single command if no command could be found.\n"
12069
"Called with (command_name). get_missing_command should either return\n"
12070
"None, or a Command object to be used for the command."
12071
msgstr ""
12072
12073
#: en/help_topics/hooks.txt:202
12074
msgid ""
12075
"list_commands\n"
12076
"~~~~~~~~~~~~~"
12077
msgstr ""
12078
12079
#: en/help_topics/hooks.txt:207
12080
msgid ""
12081
"Called when enumerating commands. Called with a set of cmd_name\n"
12082
"strings for all the commands found so far. This set is safe to mutate\n"
12083
"- e.g. to remove a command. list_commands should return the updated\n"
12084
"set of command names."
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:212
12088
msgid ""
12089
"_ConfigHooks\n"
12090
"------------"
12091
msgstr ""
15121
msgstr "Introduced in: 1.17"
15122
15123
#: en/help_topics/hooks.txt:175
15124
msgid ""
15125
"Called when creating a single command. Called with (cmd_or_None,\n"
15126
"command_name). get_command should either return the cmd_or_None\n"
15127
"parameter, or a replacement Command object that should be used for the\n"
15128
"command. Note that the Command.hooks hooks are core infrastructure.\n"
15129
"Many users will prefer to use bzrlib.commands.register_command or\n"
15130
"plugin_cmds.register_lazy."
15131
msgstr ""
15132
"Called when creating a single command. Called with (cmd_or_None,\n"
15133
"command_name). get_command should either return the cmd_or_None\n"
15134
"parameter, or a replacement Command object that should be used for the\n"
15135
"command. Note that the Command.hooks hooks are core infrastructure.\n"
15136
"Many users will prefer to use bzrlib.commands.register_command or\n"
15137
"plugin_cmds.register_lazy."
15138
15139
#: en/help_topics/hooks.txt:182
15140
msgid ""
15141
"get_missing_command\n"
15142
"~~~~~~~~~~~~~~~~~~~"
15143
msgstr ""
15144
"get_missing_command\n"
15145
"~~~~~~~~~~~~~~~~~~~"
15146
15147
#: en/help_topics/hooks.txt:187
15148
msgid ""
15149
"Called when creating a single command if no command could be found.\n"
15150
"Called with (command_name). get_missing_command should either return\n"
15151
"None, or a Command object to be used for the command."
15152
msgstr ""
15153
"Called when creating a single command if no command could be found.\n"
15154
"Called with (command_name). get_missing_command should either return\n"
15155
"None, or a Command object to be used for the command."
15156
15157
#: en/help_topics/hooks.txt:191
15158
msgid ""
15159
"list_commands\n"
15160
"~~~~~~~~~~~~~"
15161
msgstr ""
15162
"list_commands\n"
15163
"~~~~~~~~~~~~~"
15164
15165
#: en/help_topics/hooks.txt:196
15166
msgid ""
15167
"Called when enumerating commands. Called with a set of cmd_name\n"
15168
"strings for all the commands found so far. This set is safe to mutate\n"
15169
"- e.g. to remove a command. list_commands should return the updated\n"
15170
"set of command names."
15171
msgstr ""
15172
"Called when enumerating commands. Called with a set of cmd_name\n"
15173
"strings for all the commands found so far. This set is safe to mutate\n"
15174
"- e.g. to remove a command. list_commands should return the updated\n"
15175
"set of command names."
15176
15177
#: en/help_topics/hooks.txt:201
15178
msgid ""
15179
"post_command\n"
15180
"~~~~~~~~~~~~"
15181
msgstr ""
15182
"post_command\n"
15183
"~~~~~~~~~~~~"
15184
15185
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
15186
msgid "Introduced in: 2.6"
15187
msgstr "Introduced in: 2.6"
15188
15189
#: en/help_topics/hooks.txt:206
15190
msgid "Called after executing a command. Called with the command object."
15191
msgstr "Called after executing a command. Called with the command object."
15192
15193
#: en/help_topics/hooks.txt:208
15194
msgid ""
15195
"pre_command\n"
15196
"~~~~~~~~~~~"
15197
msgstr ""
15198
"pre_command\n"
15199
"~~~~~~~~~~~"
15200
15201
#: en/help_topics/hooks.txt:213
15202
msgid "Called prior to executing a command. Called with the command object."
15203
msgstr "Called prior to executing a command. Called with the command object."
12092
15204
12093
15205
#: en/help_topics/hooks.txt:215
12094
15206
msgid ""
12095
"get\n"
12096
"~~~"
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12100
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12101
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12102
#: en/help_topics/hooks.txt:443
15207
"_ConfigHooks\n"
15208
"------------"
15209
msgstr ""
15210
"_ConfigHooks\n"
15211
"------------"
15212
15213
#: en/help_topics/hooks.txt:218
15214
msgid ""
15215
"get\n"
15216
"~~~"
15217
msgstr ""
15218
"get\n"
15219
"~~~"
15220
15221
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
15222
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
15223
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
15224
#: en/help_topics/hooks.txt:446
12103
15225
msgid "Introduced in: 2.4"
12104
msgstr ""
12105
12106
#: en/help_topics/hooks.txt:220
12107
msgid ""
12108
"Invoked when a config option is read. The signature is (stack, name,\n"
12109
"value)."
12110
msgstr ""
15226
msgstr "Introduced in: 2.4"
12111
15227
12112
15228
#: en/help_topics/hooks.txt:223
12113
15229
msgid ""
12114
"load\n"
12115
"~~~~"
12116
msgstr ""
12117
12118
#: en/help_topics/hooks.txt:228
15230
"Invoked when a config option is read. The signature is (stack, name,\n"
15231
"value)."
15232
msgstr ""
15233
"Invoked when a config option is read. The signature is (stack, name,\n"
15234
"value)."
15235
15236
#: en/help_topics/hooks.txt:226
15237
msgid ""
15238
"load\n"
15239
"~~~~"
15240
msgstr ""
15241
"load\n"
15242
"~~~~"
15243
15244
#: en/help_topics/hooks.txt:231
12119
15245
msgid "Invoked when a config store is loaded. The signature is (store)."
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:230
12123
msgid ""
12124
"remove\n"
12125
"~~~~~~"
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:235
12129
msgid ""
12130
"Invoked when a config option is removed. The signature is (stack,\n"
12131
"name)."
12132
msgstr ""
15246
msgstr "Invoked when a config store is loaded. The signature is (store)."
15247
15248
#: en/help_topics/hooks.txt:233
15249
msgid ""
15250
"remove\n"
15251
"~~~~~~"
15252
msgstr ""
15253
"remove\n"
15254
"~~~~~~"
12133
15255
12134
15256
#: en/help_topics/hooks.txt:238
12135
15257
msgid ""
12136
"save\n"
12137
"~~~~"
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:243
15258
"Invoked when a config option is removed. The signature is (stack,\n"
15259
"name)."
15260
msgstr ""
15261
"Invoked when a config option is removed. The signature is (stack,\n"
15262
"name)."
15263
15264
#: en/help_topics/hooks.txt:241
15265
msgid ""
15266
"save\n"
15267
"~~~~"
15268
msgstr ""
15269
"save\n"
15270
"~~~~"
15271
15272
#: en/help_topics/hooks.txt:246
12141
15273
msgid "Invoked when a config store is saved. The signature is (store)."
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:245
12145
msgid ""
12146
"set\n"
12147
"~~~"
12148
msgstr ""
12149
12150
#: en/help_topics/hooks.txt:250
12151
msgid ""
12152
"Invoked when a config option is set. The signature is (stack, name,\n"
12153
"value)."
12154
msgstr ""
15274
msgstr "Invoked when a config store is saved. The signature is (store)."
15275
15276
#: en/help_topics/hooks.txt:248
15277
msgid ""
15278
"set\n"
15279
"~~~"
15280
msgstr ""
15281
"set\n"
15282
"~~~"
12155
15283
12156
15284
#: en/help_topics/hooks.txt:253
12157
15285
msgid ""
12158
"ControlDirHooks\n"
12159
"---------------"
15286
"Invoked when a config option is set. The signature is (stack, name,\n"
15287
"value)."
12160
15288
msgstr ""
15289
"Invoked when a config option is set. The signature is (stack, name,\n"
15290
"value)."
12161
15291
12162
15292
#: en/help_topics/hooks.txt:256
12163
15293
msgid ""
12164
"post_repo_init\n"
12165
"~~~~~~~~~~~~~~"
12166
msgstr ""
12167
12168
#: en/help_topics/hooks.txt:261
15294
"ControlDirHooks\n"
15295
"---------------"
15296
msgstr ""
15297
"ControlDirHooks\n"
15298
"---------------"
15299
15300
#: en/help_topics/hooks.txt:259
15301
msgid ""
15302
"post_repo_init\n"
15303
"~~~~~~~~~~~~~~"
15304
msgstr ""
15305
"post_repo_init\n"
15306
"~~~~~~~~~~~~~~"
15307
15308
#: en/help_topics/hooks.txt:264
12169
15309
msgid ""
12170
15310
"Invoked after a repository has been initialized. post_repo_init is\n"
12171
15311
"called with a bzrlib.controldir.RepoInitHookParams."
12172
15312
msgstr ""
12173
12174
#: en/help_topics/hooks.txt:264
12175
msgid ""
12176
"pre_open\n"
12177
"~~~~~~~~"
12178
msgstr ""
15313
"Invoked after a repository has been initialised. post_repo_init is\n"
15314
"called with a bzrlib.controldir.RepoInitHookParams."
12179
15315
12180
15316
#: en/help_topics/hooks.txt:267
15317
msgid ""
15318
"pre_open\n"
15319
"~~~~~~~~"
15320
msgstr ""
15321
"pre_open\n"
15322
"~~~~~~~~"
15323
15324
#: en/help_topics/hooks.txt:270
12181
15325
msgid "Introduced in: 1.14"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:269
12185
msgid ""
12186
"Invoked before attempting to open a ControlDir with the transport that\n"
12187
"the open will use."
12188
msgstr ""
15326
msgstr "Introduced in: 1.14"
12189
15327
12190
15328
#: en/help_topics/hooks.txt:272
12191
15329
msgid ""
12192
"InfoHooks\n"
12193
"---------"
15330
"Invoked before attempting to open a ControlDir with the transport that\n"
15331
"the open will use."
12194
15332
msgstr ""
15333
"Invoked before attempting to open a ControlDir with the transport that\n"
15334
"the open will use."
12195
15335
12196
15336
#: en/help_topics/hooks.txt:275
12197
15337
msgid ""
12198
"repository\n"
12199
"~~~~~~~~~~"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12203
#: en/help_topics/hooks.txt:521
15338
"InfoHooks\n"
15339
"---------"
15340
msgstr ""
15341
"InfoHooks\n"
15342
"---------"
15343
15344
#: en/help_topics/hooks.txt:278
15345
msgid ""
15346
"repository\n"
15347
"~~~~~~~~~~"
15348
msgstr ""
15349
"repository\n"
15350
"~~~~~~~~~~"
15351
15352
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
15353
#: en/help_topics/hooks.txt:524
12204
15354
msgid "Introduced in: 1.15"
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:280
12208
msgid ""
12209
"Invoked when displaying the statistics for a repository. repository is\n"
12210
"called with a statistics dictionary as returned by the repository and\n"
12211
"a file-like object to write to."
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:284
12215
msgid ""
12216
"LockHooks\n"
12217
"---------"
12218
msgstr ""
15355
msgstr "Introduced in: 1.15"
15356
15357
#: en/help_topics/hooks.txt:283
15358
msgid ""
15359
"Invoked when displaying the statistics for a repository. repository is\n"
15360
"called with a statistics dictionary as returned by the repository and\n"
15361
"a file-like object to write to."
15362
msgstr ""
15363
"Invoked when displaying the statistics for a repository. repository is\n"
15364
"called with a statistics dictionary as returned by the repository and\n"
15365
"a file-like object to write to."
12219
15366
12220
15367
#: en/help_topics/hooks.txt:287
12221
15368
msgid ""
12222
"lock_acquired\n"
12223
"~~~~~~~~~~~~~"
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:292
12227
msgid ""
12228
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:294
12232
msgid ""
12233
"lock_broken\n"
12234
"~~~~~~~~~~~"
12235
msgstr ""
12236
12237
#: en/help_topics/hooks.txt:299
15369
"LockHooks\n"
15370
"---------"
15371
msgstr ""
15372
"LockHooks\n"
15373
"---------"
15374
15375
#: en/help_topics/hooks.txt:290
15376
msgid ""
15377
"lock_acquired\n"
15378
"~~~~~~~~~~~~~"
15379
msgstr ""
15380
"lock_acquired\n"
15381
"~~~~~~~~~~~~~"
15382
15383
#: en/help_topics/hooks.txt:295
15384
msgid ""
15385
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
15386
msgstr ""
15387
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
15388
15389
#: en/help_topics/hooks.txt:297
15390
msgid ""
15391
"lock_broken\n"
15392
"~~~~~~~~~~~"
15393
msgstr ""
15394
"lock_broken\n"
15395
"~~~~~~~~~~~"
15396
15397
#: en/help_topics/hooks.txt:302
12238
15398
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:301
12242
msgid ""
12243
"lock_released\n"
12244
"~~~~~~~~~~~~~"
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:306
12248
msgid ""
12249
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:308
12253
msgid ""
12254
"MergeHooks\n"
12255
"----------"
12256
msgstr ""
15399
msgstr "Called with a bzrlib.lock.LockResult when a physical lock is broken."
15400
15401
#: en/help_topics/hooks.txt:304
15402
msgid ""
15403
"lock_released\n"
15404
"~~~~~~~~~~~~~"
15405
msgstr ""
15406
"lock_released\n"
15407
"~~~~~~~~~~~~~"
15408
15409
#: en/help_topics/hooks.txt:309
15410
msgid ""
15411
"Called with a bzrlib.lock.LockResult when a physical lock is released."
15412
msgstr ""
15413
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12257
15414
12258
15415
#: en/help_topics/hooks.txt:311
12259
15416
msgid ""
12260
"merge_file_content\n"
12261
"~~~~~~~~~~~~~~~~~~"
15417
"MergeHooks\n"
15418
"----------"
12262
15419
msgstr ""
15420
"MergeHooks\n"
15421
"----------"
12263
15422
12264
15423
#: en/help_topics/hooks.txt:314
15424
msgid ""
15425
"merge_file_content\n"
15426
"~~~~~~~~~~~~~~~~~~"
15427
msgstr ""
15428
"merge_file_content\n"
15429
"~~~~~~~~~~~~~~~~~~"
15430
15431
#: en/help_topics/hooks.txt:317
12265
15432
msgid "Introduced in: 2.1"
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:316
12269
msgid ""
12270
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12271
"object when starting a merge. Should return either None or a subclass\n"
12272
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12273
"called per file that needs to be merged (including when one side has\n"
12274
"deleted the file and the other has changed it). See the\n"
12275
"AbstractPerFileMerger API docs for details on how it is used by merge."
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:323
12279
msgid ""
12280
"post_merge\n"
12281
"~~~~~~~~~~"
12282
msgstr ""
12283
"post_merge\n"
12284
"~~~~~~~~~~"
12285
12286
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12287
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12288
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
15433
msgstr "Introduced in: 2.1"
15434
15435
#: en/help_topics/hooks.txt:319
15436
msgid ""
15437
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
15438
"object when starting a merge. Should return either None or a subclass\n"
15439
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
15440
"called per file that needs to be merged (including when one side has\n"
15441
"deleted the file and the other has changed it). See the\n"
15442
"AbstractPerFileMerger API docs for details on how it is used by merge."
15443
msgstr ""
15444
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
15445
"object when starting a merge. Should return either None or a subclass\n"
15446
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
15447
"called per file that needs to be merged (including when one side has\n"
15448
"deleted the file and the other has changed it). See the\n"
15449
"AbstractPerFileMerger API docs for details on how it is used by merge."
15450
15451
#: en/help_topics/hooks.txt:326
15452
msgid ""
15453
"post_merge\n"
15454
"~~~~~~~~~~"
15455
msgstr ""
15456
"post_merge\n"
15457
"~~~~~~~~~~"
15458
15459
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
15460
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
15461
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12289
15462
msgid "Introduced in: 2.5"
12290
15463
msgstr "Introduced in: 2.5"
12291
15464
12292
#: en/help_topics/hooks.txt:328
12293
msgid ""
12294
"Called after a merge. Receives a Merger object as the single argument.\n"
12295
"The return value is ignored."
12296
msgstr ""
12297
"Called after a merge. Receives a Merger object as the single argument.\n"
12298
"The return value is ignored."
12299
12300
15465
#: en/help_topics/hooks.txt:331
12301
15466
msgid ""
12302
"pre_merge\n"
12303
"~~~~~~~~~"
15467
"Called after a merge. Receives a Merger object as the single argument.\n"
15468
"The return value is ignored."
12304
15469
msgstr ""
12305
"pre_merge\n"
12306
"~~~~~~~~~"
15470
"Called after a merge. Receives a Merger object as the single argument.\n"
15471
"The return value is ignored."
12307
15472
12308
#: en/help_topics/hooks.txt:336
15473
#: en/help_topics/hooks.txt:334
12309
15474
msgid ""
12310
"Called before a merge. Receives a Merger object as the single\n"
12311
"argument."
15475
"pre_merge\n"
15476
"~~~~~~~~~"
12312
15477
msgstr ""
12313
"Called before a merge. Receives a Merger object as the single\n"
12314
"argument."
15478
"pre_merge\n"
15479
"~~~~~~~~~"
12315
15480
12316
15481
#: en/help_topics/hooks.txt:339
12317
15482
msgid ""
12318
"MergeDirectiveHooks\n"
12319
"-------------------"
15483
"Called before a merge. Receives a Merger object as the single\n"
15484
"argument."
12320
15485
msgstr ""
15486
"Called before a merge. Receives a Merger object as the single\n"
15487
"argument."
12321
15488
12322
15489
#: en/help_topics/hooks.txt:342
12323
15490
msgid ""
12324
"merge_request_body\n"
12325
"~~~~~~~~~~~~~~~~~~"
15491
"MergeDirectiveHooks\n"
15492
"-------------------"
12326
15493
msgstr ""
15494
"MergeDirectiveHooks\n"
15495
"-------------------"
12327
15496
12328
15497
#: en/help_topics/hooks.txt:345
15498
msgid ""
15499
"merge_request_body\n"
15500
"~~~~~~~~~~~~~~~~~~"
15501
msgstr ""
15502
"merge_request_body\n"
15503
"~~~~~~~~~~~~~~~~~~"
15504
15505
#: en/help_topics/hooks.txt:348
12329
15506
msgid "Introduced in: 1.15.0"
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:347
12333
msgid ""
12334
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12335
"request. Callbacks must return a body. If more than one callback is\n"
12336
"registered, the output of one callback is provided to the next."
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:351
12340
msgid ""
12341
"MessageEditorHooks\n"
12342
"------------------"
12343
msgstr ""
15507
msgstr "Introduced in: 1.15.0"
15508
15509
#: en/help_topics/hooks.txt:350
15510
msgid ""
15511
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
15512
"request. Callbacks must return a body. If more than one callback is\n"
15513
"registered, the output of one callback is provided to the next."
15514
msgstr ""
15515
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
15516
"request. Callbacks must return a body. If more than one callback is\n"
15517
"registered, the output of one callback is provided to the next."
12344
15518
12345
15519
#: en/help_topics/hooks.txt:354
12346
15520
msgid ""
12347
"commit_message_template\n"
12348
"~~~~~~~~~~~~~~~~~~~~~~~"
15521
"MessageEditorHooks\n"
15522
"------------------"
12349
15523
msgstr ""
15524
"MessageEditorHooks\n"
15525
"------------------"
12350
15526
12351
15527
#: en/help_topics/hooks.txt:357
15528
msgid ""
15529
"commit_message_template\n"
15530
"~~~~~~~~~~~~~~~~~~~~~~~"
15531
msgstr ""
15532
"commit_message_template\n"
15533
"~~~~~~~~~~~~~~~~~~~~~~~"
15534
15535
#: en/help_topics/hooks.txt:360
12352
15536
msgid "Introduced in: 1.10"
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:359
12356
msgid ""
12357
"Called when a commit message is being generated.\n"
12358
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12359
"and the message that is known so far. commit_message_template must\n"
12360
"return a new message to use (which could be the same as it was given).\n"
12361
"When there are multiple hooks registered for commit_message_template,\n"
12362
"they are chained with the result from the first passed into the\n"
12363
"second, and so on."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:367
12367
msgid ""
12368
"set_commit_message\n"
12369
"~~~~~~~~~~~~~~~~~~"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:372
12373
msgid ""
12374
"Set a fixed commit message. set_commit_message is called with the\n"
12375
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12376
"properties by editing commit.builder._revprops) and the message so\n"
12377
"far. set_commit_message must return the message to use or None if it\n"
12378
"should use the message editor as normal."
12379
msgstr ""
12380
12381
#: en/help_topics/hooks.txt:378
12382
msgid ""
12383
"MutableTreeHooks\n"
12384
"----------------"
12385
msgstr ""
15537
msgstr "Introduced in: 1.10"
15538
15539
#: en/help_topics/hooks.txt:362
15540
msgid ""
15541
"Called when a commit message is being generated.\n"
15542
"commit_message_template is called with the bzrlib.commit.Commit object\n"
15543
"and the message that is known so far. commit_message_template must\n"
15544
"return a new message to use (which could be the same as it was given).\n"
15545
"When there are multiple hooks registered for commit_message_template,\n"
15546
"they are chained with the result from the first passed into the\n"
15547
"second, and so on."
15548
msgstr ""
15549
"Called when a commit message is being generated.\n"
15550
"commit_message_template is called with the bzrlib.commit.Commit object\n"
15551
"and the message that is known so far. commit_message_template must\n"
15552
"return a new message to use (which could be the same as it was given).\n"
15553
"When there are multiple hooks registered for commit_message_template,\n"
15554
"they are chained with the result from the first passed into the\n"
15555
"second, and so on."
15556
15557
#: en/help_topics/hooks.txt:370
15558
msgid ""
15559
"set_commit_message\n"
15560
"~~~~~~~~~~~~~~~~~~"
15561
msgstr ""
15562
"set_commit_message\n"
15563
"~~~~~~~~~~~~~~~~~~"
15564
15565
#: en/help_topics/hooks.txt:375
15566
msgid ""
15567
"Set a fixed commit message. set_commit_message is called with the\n"
15568
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
15569
"properties by editing commit.builder._revprops) and the message so\n"
15570
"far. set_commit_message must return the message to use or None if it\n"
15571
"should use the message editor as normal."
15572
msgstr ""
15573
"Set a fixed commit message. set_commit_message is called with the\n"
15574
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
15575
"properties by editing commit.builder._revprops) and the message so\n"
15576
"far. set_commit_message must return the message to use or None if it\n"
15577
"should use the message editor as normal."
12386
15578
12387
15579
#: en/help_topics/hooks.txt:381
12388
15580
msgid ""
12389
"post_build_tree\n"
12390
"~~~~~~~~~~~~~~~"
12391
msgstr ""
12392
"post_build_tree\n"
12393
"~~~~~~~~~~~~~~~"
12394
12395
#: en/help_topics/hooks.txt:386
12396
msgid ""
12397
"Called after a completely new tree is built. The hook is called with\n"
12398
"the tree as its only argument."
12399
msgstr ""
12400
"Called after a completely new tree is built. The hook is called with\n"
12401
"the tree as its only argument."
12402
12403
#: en/help_topics/hooks.txt:392
15581
"MutableTreeHooks\n"
15582
"----------------"
15583
msgstr ""
15584
"MutableTreeHooks\n"
15585
"----------------"
15586
15587
#: en/help_topics/hooks.txt:384
15588
msgid ""
15589
"post_build_tree\n"
15590
"~~~~~~~~~~~~~~~"
15591
msgstr ""
15592
"post_build_tree\n"
15593
"~~~~~~~~~~~~~~~"
15594
15595
#: en/help_topics/hooks.txt:389
15596
msgid ""
15597
"Called after a completely new tree is built. The hook is called with\n"
15598
"the tree as its only argument."
15599
msgstr ""
15600
"Called after a completely new tree is built. The hook is called with\n"
15601
"the tree as its only argument."
15602
15603
#: en/help_topics/hooks.txt:395
12404
15604
msgid "Introduced in: 2.0"
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:394
12408
msgid ""
12409
"Called after a commit is performed on a tree. The hook is called with\n"
12410
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12411
"commit was performed on is available via the mutable_tree attribute of\n"
12412
"that object."
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:399
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 ""
15605
msgstr "Introduced in: 2.0"
15606
15607
#: en/help_topics/hooks.txt:397
15608
msgid ""
15609
"Called after a commit is performed on a tree. The hook is called with\n"
15610
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
15611
"commit was performed on is available via the mutable_tree attribute of\n"
15612
"that object."
15613
msgstr ""
15614
"Called after a commit is performed on a tree. The hook is called with\n"
15615
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
15616
"commit was performed on is available via the mutable_tree attribute of\n"
15617
"that object."
15618
15619
#: en/help_topics/hooks.txt:402
15620
msgid ""
15621
"post_transform\n"
15622
"~~~~~~~~~~~~~~"
15623
msgstr ""
15624
"post_transform\n"
15625
"~~~~~~~~~~~~~~"
12426
15626
12427
15627
#: en/help_topics/hooks.txt:407
12428
15628
msgid ""
12429
"pre_transform\n"
12430
"~~~~~~~~~~~~~"
15629
"Called after a tree transform has been performed on a tree. The hook\n"
15630
"is called with the tree that is being transformed and the transform."
12431
15631
msgstr ""
15632
"Called after a tree transform has been performed on a tree. The hook\n"
15633
"is called with the tree that is being transformed and the transform."
12432
15634
12433
#: en/help_topics/hooks.txt:412
15635
#: en/help_topics/hooks.txt:410
12434
15636
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."
15637
"pre_transform\n"
15638
"~~~~~~~~~~~~~"
12437
15639
msgstr ""
15640
"pre_transform\n"
15641
"~~~~~~~~~~~~~"
12438
15642
12439
15643
#: en/help_topics/hooks.txt:415
12440
15644
msgid ""
12441
"start_commit\n"
12442
"~~~~~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:420
12446
msgid ""
12447
"Called before a commit is performed on a tree. The start commit hook\n"
12448
"is able to change the tree before the commit takes place. start_commit\n"
12449
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12450
"being performed on."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:425
12454
msgid ""
12455
"SmartClientHooks\n"
12456
"----------------"
12457
msgstr ""
15645
"Called before a tree transform on this tree. The hook is called with\n"
15646
"the tree that is being transformed and the transform."
15647
msgstr ""
15648
"Called before a tree transform on this tree. The hook is called with\n"
15649
"the tree that is being transformed and the transform."
15650
15651
#: en/help_topics/hooks.txt:418
15652
msgid ""
15653
"start_commit\n"
15654
"~~~~~~~~~~~~"
15655
msgstr ""
15656
"start_commit\n"
15657
"~~~~~~~~~~~~"
15658
15659
#: en/help_topics/hooks.txt:423
15660
msgid ""
15661
"Called before a commit is performed on a tree. The start commit hook\n"
15662
"is able to change the tree before the commit takes place. start_commit\n"
15663
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
15664
"being performed on."
15665
msgstr ""
15666
"Called before a commit is performed on a tree. The start commit hook\n"
15667
"is able to change the tree before the commit takes place. start_commit\n"
15668
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
15669
"being performed on."
12458
15670
12459
15671
#: en/help_topics/hooks.txt:428
12460
15672
msgid ""
12461
"call\n"
12462
"~~~~"
15673
"SmartClientHooks\n"
15674
"----------------"
12463
15675
msgstr ""
15676
"SmartClientHooks\n"
15677
"----------------"
12464
15678
12465
15679
#: en/help_topics/hooks.txt:431
15680
msgid ""
15681
"call\n"
15682
"~~~~"
15683
msgstr ""
15684
"call\n"
15685
"~~~~"
15686
15687
#: en/help_topics/hooks.txt:434
12466
15688
msgid "Introduced in: unknown"
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:433
12470
msgid ""
12471
"Called when the smart client is submitting a request to the smart\n"
12472
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12473
"Streaming request bodies, and responses, are not accessible."
12474
msgstr ""
12475
12476
#: en/help_topics/hooks.txt:437
12477
msgid ""
12478
"SmartServerHooks\n"
12479
"----------------"
12480
msgstr ""
15689
msgstr "Introduced in: unknown"
15690
15691
#: en/help_topics/hooks.txt:436
15692
msgid ""
15693
"Called when the smart client is submitting a request to the smart\n"
15694
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
15695
"Streaming request bodies, and responses, are not accessible."
15696
msgstr ""
15697
"Called when the smart client is submitting a request to the smart\n"
15698
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
15699
"Streaming request bodies, and responses, are not accessible."
12481
15700
12482
15701
#: en/help_topics/hooks.txt:440
12483
15702
msgid ""
12484
"server_exception\n"
12485
"~~~~~~~~~~~~~~~~"
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:445
12489
msgid ""
12490
"Called by the bzr server when an exception occurs. server_exception is\n"
12491
"called with the sys.exc_info() tuple return true for the hook if the\n"
12492
"exception has been handled, in which case the server will exit\n"
12493
"normally."
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:450
12497
msgid ""
12498
"server_started\n"
12499
"~~~~~~~~~~~~~~"
12500
msgstr ""
12501
12502
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
15703
"SmartServerHooks\n"
15704
"----------------"
15705
msgstr ""
15706
"SmartServerHooks\n"
15707
"----------------"
15708
15709
#: en/help_topics/hooks.txt:443
15710
msgid ""
15711
"server_exception\n"
15712
"~~~~~~~~~~~~~~~~"
15713
msgstr ""
15714
"server_exception\n"
15715
"~~~~~~~~~~~~~~~~"
15716
15717
#: en/help_topics/hooks.txt:448
15718
msgid ""
15719
"Called by the bzr server when an exception occurs. server_exception is\n"
15720
"called with the sys.exc_info() tuple return true for the hook if the\n"
15721
"exception has been handled, in which case the server will exit\n"
15722
"normally."
15723
msgstr ""
15724
"Called by the bzr server when an exception occurs. server_exception is\n"
15725
"called with the sys.exc_info() tuple return true for the hook if the\n"
15726
"exception has been handled, in which case the server will exit\n"
15727
"normally."
15728
15729
#: en/help_topics/hooks.txt:453
15730
msgid ""
15731
"server_started\n"
15732
"~~~~~~~~~~~~~~"
15733
msgstr ""
15734
"server_started\n"
15735
"~~~~~~~~~~~~~~"
15736
15737
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12503
15738
msgid "Introduced in: 0.16"
12504
msgstr ""
12505
12506
#: en/help_topics/hooks.txt:455
12507
msgid ""
12508
"Called by the bzr server when it starts serving a directory.\n"
12509
"server_started is called with (backing urls, public url), where\n"
12510
"backing_url is a list of URLs giving the server-specific directory\n"
12511
"locations, and public_url is the public URL for the directory being\n"
12512
"served."
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:461
12516
msgid ""
12517
"server_started_ex\n"
12518
"~~~~~~~~~~~~~~~~~"
12519
msgstr ""
12520
12521
#: en/help_topics/hooks.txt:466
12522
msgid ""
12523
"Called by the bzr server when it starts serving a directory.\n"
12524
"server_started is called with (backing_urls, server_obj)."
12525
msgstr ""
15739
msgstr "Introduced in: 0.16"
15740
15741
#: en/help_topics/hooks.txt:458
15742
msgid ""
15743
"Called by the bzr server when it starts serving a directory.\n"
15744
"server_started is called with (backing urls, public url), where\n"
15745
"backing_url is a list of URLs giving the server-specific directory\n"
15746
"locations, and public_url is the public URL for the directory being\n"
15747
"served."
15748
msgstr ""
15749
"Called by the bzr server when it starts serving a directory.\n"
15750
"server_started is called with (backing urls, public url), where\n"
15751
"backing_url is a list of URLs giving the server-specific directory\n"
15752
"locations, and public_url is the public URL for the directory being\n"
15753
"served."
15754
15755
#: en/help_topics/hooks.txt:464
15756
msgid ""
15757
"server_started_ex\n"
15758
"~~~~~~~~~~~~~~~~~"
15759
msgstr ""
15760
"server_started_ex\n"
15761
"~~~~~~~~~~~~~~~~~"
12526
15762
12527
15763
#: en/help_topics/hooks.txt:469
12528
15764
msgid ""
12529
"server_stopped\n"
12530
"~~~~~~~~~~~~~~"
12531
msgstr ""
12532
12533
#: en/help_topics/hooks.txt:474
12534
msgid ""
12535
"Called by the bzr server when it stops serving a directory.\n"
12536
"server_stopped is called with the same parameters as the\n"
12537
"server_started hook: (backing_urls, public_url)."
12538
msgstr ""
12539
12540
#: en/help_topics/hooks.txt:478
12541
msgid ""
12542
"StatusHooks\n"
12543
"-----------"
12544
msgstr ""
15765
"Called by the bzr server when it starts serving a directory.\n"
15766
"server_started is called with (backing_urls, server_obj)."
15767
msgstr ""
15768
"Called by the bzr server when it starts serving a directory.\n"
15769
"server_started is called with (backing_urls, server_obj)."
15770
15771
#: en/help_topics/hooks.txt:472
15772
msgid ""
15773
"server_stopped\n"
15774
"~~~~~~~~~~~~~~"
15775
msgstr ""
15776
"server_stopped\n"
15777
"~~~~~~~~~~~~~~"
15778
15779
#: en/help_topics/hooks.txt:477
15780
msgid ""
15781
"Called by the bzr server when it stops serving a directory.\n"
15782
"server_stopped is called with the same parameters as the\n"
15783
"server_started hook: (backing_urls, public_url)."
15784
msgstr ""
15785
"Called by the bzr server when it stops serving a directory.\n"
15786
"server_stopped is called with the same parameters as the\n"
15787
"server_started hook: (backing_urls, public_url)."
12545
15788
12546
15789
#: en/help_topics/hooks.txt:481
12547
15790
msgid ""
12548
"post_status\n"
12549
"~~~~~~~~~~~"
12550
msgstr ""
12551
12552
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
15791
"StatusHooks\n"
15792
"-----------"
15793
msgstr ""
15794
"StatusHooks\n"
15795
"-----------"
15796
15797
#: en/help_topics/hooks.txt:484
15798
msgid ""
15799
"post_status\n"
15800
"~~~~~~~~~~~"
15801
msgstr ""
15802
"post_status\n"
15803
"~~~~~~~~~~~"
15804
15805
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12553
15806
msgid "Introduced in: 2.3"
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:486
12557
msgid ""
12558
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12559
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12560
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12561
"correspond to the command line options specified by the user for the\n"
12562
"status command. to_file is the output stream for writing."
12563
msgstr ""
12564
12565
#: en/help_topics/hooks.txt:492
12566
msgid ""
12567
"pre_status\n"
12568
"~~~~~~~~~~"
12569
msgstr ""
12570
12571
#: en/help_topics/hooks.txt:497
12572
msgid ""
12573
"Called with argument StatusHookParams before Bazaar displays the\n"
12574
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12575
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12576
"correspond to the command line options specified by the user for the\n"
12577
"status command. to_file is the output stream for writing."
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:503
12581
msgid ""
12582
"TransportHooks\n"
12583
"--------------"
12584
msgstr ""
12585
"TransportHooks\n"
12586
"--------------"
15807
msgstr "Introduced in: 2.3"
15808
15809
#: en/help_topics/hooks.txt:489
15810
msgid ""
15811
"Called with argument StatusHookParams after Bazaar has displayed the\n"
15812
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15813
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15814
"correspond to the command line options specified by the user for the\n"
15815
"status command. to_file is the output stream for writing."
15816
msgstr ""
15817
"Called with argument StatusHookParams after Bazaar has displayed the\n"
15818
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15819
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15820
"correspond to the command line options specified by the user for the\n"
15821
"status command. to_file is the output stream for writing."
15822
15823
#: en/help_topics/hooks.txt:495
15824
msgid ""
15825
"pre_status\n"
15826
"~~~~~~~~~~"
15827
msgstr ""
15828
"pre_status\n"
15829
"~~~~~~~~~~"
15830
15831
#: en/help_topics/hooks.txt:500
15832
msgid ""
15833
"Called with argument StatusHookParams before Bazaar displays the\n"
15834
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15835
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15836
"correspond to the command line options specified by the user for the\n"
15837
"status command. to_file is the output stream for writing."
15838
msgstr ""
15839
"Called with argument StatusHookParams before Bazaar displays the\n"
15840
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15841
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15842
"correspond to the command line options specified by the user for the\n"
15843
"status command. to_file is the output stream for writing."
12587
15844
12588
15845
#: en/help_topics/hooks.txt:506
12589
15846
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
12607
msgid ""
12608
"RioVersionInfoBuilderHooks\n"
12609
"--------------------------"
12610
msgstr ""
15847
"TransportHooks\n"
15848
"--------------"
15849
msgstr ""
15850
"TransportHooks\n"
15851
"--------------"
15852
15853
#: en/help_topics/hooks.txt:509
15854
msgid ""
15855
"post_connect\n"
15856
"~~~~~~~~~~~~"
15857
msgstr ""
15858
"post_connect\n"
15859
"~~~~~~~~~~~~"
15860
15861
#: en/help_topics/hooks.txt:514
15862
msgid ""
15863
"Called after a new connection is established or a reconnect occurs.\n"
15864
"The sole argument passed is either the connected transport or smart\n"
15865
"medium instance."
15866
msgstr ""
15867
"Called after a new connection is established or a reconnect occurs.\n"
15868
"The sole argument passed is either the connected transport or smart\n"
15869
"medium instance."
12611
15870
12612
15871
#: en/help_topics/hooks.txt:518
12613
15872
msgid ""
12614
"revision\n"
12615
"~~~~~~~~"
12616
msgstr ""
12617
12618
#: en/help_topics/hooks.txt:523
12619
msgid ""
12620
"Invoked when adding information about a revision to the RIO stanza\n"
12621
"that is printed. revision is called with a revision object and a RIO\n"
12622
"stanza.\n"
12623
msgstr ""
15873
"RioVersionInfoBuilderHooks\n"
15874
"--------------------------"
15875
msgstr ""
15876
"RioVersionInfoBuilderHooks\n"
15877
"--------------------------"
15878
15879
#: en/help_topics/hooks.txt:521
15880
msgid ""
15881
"revision\n"
15882
"~~~~~~~~"
15883
msgstr ""
15884
"revision\n"
15885
"~~~~~~~~"
15886
15887
#: en/help_topics/hooks.txt:526
15888
msgid ""
15889
"Invoked when adding information about a revision to the RIO stanza\n"
15890
"that is printed. revision is called with a revision object and a RIO\n"
15891
"stanza.\n"
15892
msgstr ""
15893
"Invoked when adding information about a revision to the RIO stanza\n"
15894
"that is printed. revision is called with a revision object and a RIO\n"
15895
"stanza.\n"
12624
15896
12625
15897
#: en/help_topics/location-alias.txt:1
12626
15898
msgid ""
12627
15899
"Location aliases\n"
12628
15900
"================"
12629
15901
msgstr ""
15902
"Location aliases\n"
15903
"================"
12630
15904
12631
15905
#: en/help_topics/location-alias.txt:4
12632
15906
msgid ""
12634
15908
"These\n"
12635
15909
"can be used with most commands that expect a location, such as `bzr push`."
12636
15910
msgstr ""
15911
"Bazaar defines several aliases for locations associated with a branch. "
15912
"These\n"
15913
"can be used with most commands that expect a location, such as `bzr push`."
12637
15914
12638
15915
#: en/help_topics/location-alias.txt:7
12639
15916
msgid "The aliases are::"
12640
msgstr ""
15917
msgstr "The aliases are::"
12641
15918
12642
15919
#: en/help_topics/location-alias.txt:9
12643
15920
msgid ""
12648
15925
" :submit The submit branch for this branch.\n"
12649
15926
" :this This branch."
12650
15927
msgstr ""
15928
" :bound The branch this branch is bound to, for bound branches.\n"
15929
" :parent The parent of this branch.\n"
15930
" :public The public location of this branch.\n"
15931
" :push The saved location used for `bzr push` with no arguments.\n"
15932
" :submit The submit branch for this branch.\n"
15933
" :this This branch."
12651
15934
12652
15935
#: en/help_topics/location-alias.txt:16
12653
15936
msgid "For example, to push to the parent location::"
12654
msgstr ""
15937
msgstr "For example, to push to the parent location::"
12655
15938
12656
15939
#: en/help_topics/location-alias.txt:18
12657
15940
msgid " bzr push :parent\n"
12658
msgstr ""
15941
msgstr " bzr push :parent\n"
12659
15942
12660
15943
#: en/help_topics/log-formats.txt:1
12661
15944
msgid ""
12662
15945
"Log Formats\n"
12663
15946
"==========="
12664
15947
msgstr ""
15948
"Log Formats\n"
15949
"==========="
12665
15950
12666
15951
#: en/help_topics/log-formats.txt:4
12667
15952
msgid ""
12668
15953
"A log format controls how information about each revision is displayed.\n"
12669
15954
"The standard log formats are compared below::"
12670
15955
msgstr ""
15956
"A log format controls how information about each revision is displayed.\n"
15957
"The standard log formats are compared below::"
12671
15958
12672
15959
#: en/help_topics/log-formats.txt:7
12673
15960
msgid ""
12688
15975
" preferred levels all 1 1\n"
12689
15976
" digital signature optional - -"
12690
15977
msgstr ""
15978
" Feature long short line\n"
15979
" ---------------------- ------------- ------------ -------------------\n"
15980
" design goal detailed view concise view 1 revision per line\n"
15981
" committer name+email name only name only\n"
15982
" author name+email - -\n"
15983
" date-time format full date only date only\n"
15984
" commit message full full top line\n"
15985
" tags yes yes yes\n"
15986
" merges indicator - yes -\n"
15987
" status/delta optional optional -\n"
15988
" diff/patch optional optional -\n"
15989
" revision-id optional optional -\n"
15990
" branch nick yes - -\n"
15991
" foreign vcs properties yes yes -\n"
15992
" preferred levels all 1 1\n"
15993
" digital signature optional - -"
12691
15994
12692
15995
#: en/help_topics/log-formats.txt:24
12693
15996
msgid ""
12694
15997
"The default format is ``long``. To change this, define the ``log_format``\n"
12695
15998
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12696
15999
msgstr ""
16000
"The default format is ``long``. To change this, define the ``log_format``\n"
16001
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12697
16002
12698
16003
#: en/help_topics/log-formats.txt:27
12699
16004
msgid ""
12700
16005
" [DEFAULT]\n"
12701
16006
" log_format = short"
12702
16007
msgstr ""
16008
" [DEFAULT]\n"
16009
" log_format = short"
12703
16010
12704
16011
#: en/help_topics/log-formats.txt:30
12705
16012
msgid ""
12706
16013
"Alternatively, to change the log format used for a given query, use the\n"
12707
16014
"--long, --short or --line options."
12708
16015
msgstr ""
16016
"Alternatively, to change the log format used for a given query, use the\n"
16017
"--long, --short or --line options."
12709
16018
12710
16019
#: en/help_topics/log-formats.txt:33
12711
16020
msgid ""
12712
16021
"If one of the standard log formats does not meet your needs, additional\n"
12713
16022
"formats can be provided by plugins.\n"
12714
16023
msgstr ""
16024
"If one of the standard log formats does not meet your needs, additional\n"
16025
"formats can be provided by plugins.\n"
12715
16026
12716
16027
#: en/help_topics/other-formats.txt:1
12717
16028
msgid "Other Storage Formats"
12718
msgstr ""
16029
msgstr "Other Storage Formats"
12719
16030
12720
16031
#: en/help_topics/other-formats.txt:3
12721
16032
msgid "Experimental formats are shown below."
12722
msgstr ""
16033
msgstr "Experimental formats are shown below."
12723
16034
12724
16035
#: en/help_topics/other-formats.txt:5
12725
16036
msgid ""
12727
16038
" (native) The 2a format with experimental support for colocated\n"
12728
16039
" branches."
12729
16040
msgstr ""
16041
":development-colo:\n"
16042
" (native) The 2a format with experimental support for colocated\n"
16043
" branches."
12730
16044
12731
16045
#: en/help_topics/other-formats.txt:9
12732
16046
msgid ""
12733
16047
"\n"
12734
16048
"Deprecated formats are shown below."
12735
16049
msgstr ""
16050
"\n"
16051
"Deprecated formats are shown below."
12736
16052
12737
16053
#: en/help_topics/other-formats.txt:12
12738
16054
msgid ""
12741
16057
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12742
16058
" by bzr < 0.92."
12743
16059
msgstr ""
16060
":pack-0.92:\n"
16061
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
16062
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
16063
" by bzr < 0.92."
12744
16064
12745
16065
#: en/help_topics/patterns.txt:1
12746
16066
msgid ""
12747
16067
"Patterns\n"
12748
16068
"========"
12749
16069
msgstr ""
16070
"Patterns\n"
16071
"========"
12750
16072
12751
16073
#: en/help_topics/patterns.txt:4
12752
16074
msgid ""
12755
16077
"and preferences can be associated with files using rule patterns.\n"
12756
16078
"The pattern syntax is described below."
12757
16079
msgstr ""
16080
"Bazaar uses patterns to match files at various times. For example,\n"
16081
"the ``add`` command skips over files that match ignore patterns\n"
16082
"and preferences can be associated with files using rule patterns.\n"
16083
"The pattern syntax is described below."
12758
16084
12759
16085
#: en/help_topics/patterns.txt:9
12760
16086
msgid ""
12764
16090
"component of the path. To match a file only in the root directory,\n"
12765
16091
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12766
16092
msgstr ""
16093
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
16094
"slash or is a regular expression, it is compared to the whole path\n"
16095
"from the branch root. Otherwise, it is compared to only the last\n"
16096
"component of the path. To match a file only in the root directory,\n"
16097
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12767
16098
12768
16099
#: en/help_topics/patterns.txt:15
12769
16100
msgid "Patterns may include globbing wildcards such as::"
12770
msgstr ""
16101
msgstr "Patterns may include globbing wildcards such as::"
12771
16102
12772
16103
#: en/help_topics/patterns.txt:17
12773
16104
msgid ""
12776
16107
" /**/ - Matches 0 or more directories in a path\n"
12777
16108
" [a-z] - Matches a single character from within a group of characters"
12778
16109
msgstr ""
16110
" ? - Matches any single character except '/'\n"
16111
" * - Matches 0 or more characters except '/'\n"
16112
" /**/ - Matches 0 or more directories in a path\n"
16113
" [a-z] - Matches a single character from within a group of characters"
12779
16114
12780
16115
#: en/help_topics/patterns.txt:22
12781
16116
msgid ""
12784
16119
"expression. Regular expression patterns may not include named or\n"
12785
16120
"numbered groups."
12786
16121
msgstr ""
16122
"Patterns may also be `Python regular expressions`_. Regular expression\n"
16123
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
16124
"expression. Regular expression patterns may not include named or\n"
16125
"numbered groups."
12787
16126
12788
16127
#: en/help_topics/patterns.txt:27
12789
16128
msgid ""
12790
16129
"Case insensitive ignore patterns can be specified with regular expressions\n"
12791
16130
"by using the ``i`` (for ignore case) flag in the pattern."
12792
16131
msgstr ""
16132
"Case insensitive ignore patterns can be specified with regular expressions\n"
16133
"by using the ``i`` (for ignore case) flag in the pattern."
12793
16134
12794
16135
#: en/help_topics/patterns.txt:30
12795
16136
msgid ""
12796
16137
"For example, a case insensitive match for ``foo`` may be specified as::"
12797
16138
msgstr ""
16139
"For example, a case insensitive match for ``foo`` may be specified as::"
12798
16140
12799
16141
#: en/help_topics/patterns.txt:32
12800
16142
msgid " RE:(?i)foo"
12801
msgstr ""
16143
msgstr " RE:(?i)foo"
12802
16144
12803
16145
#: en/help_topics/patterns.txt:34
12804
16146
msgid ""
12805
16147
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12806
16148
"matched by that pattern will not be ignored."
12807
16149
msgstr ""
16150
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
16151
"matched by that pattern will not be ignored."
12808
16152
12809
16153
#: en/help_topics/patterns.txt:37
12810
16154
msgid ""
12811
16155
".. _Python regular expressions: http://docs.python.org/library/re.html"
12812
16156
msgstr ""
16157
".. _Python regular expressions: http://docs.python.org/library/re.html"
12813
16158
12814
16159
#: en/help_topics/revisionspec.txt:1
12815
16160
msgid "Revision Identifiers"
12816
msgstr ""
16161
msgstr "Revision Identifiers"
12817
16162
12818
16163
#: en/help_topics/revisionspec.txt:3
12819
16164
msgid ""
12822
16167
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12823
16168
"'before:yesterday' and 'submit:'."
12824
16169
msgstr ""
16170
"A revision identifier refers to a specific state of a branch's history. It\n"
16171
"can be expressed in several ways. It can begin with a keyword to\n"
16172
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
16173
"'before:yesterday' and 'submit:'."
12825
16174
12826
16175
#: en/help_topics/revisionspec.txt:8
12827
16176
msgid ""
12833
16182
"will\n"
12834
16183
"be found first."
12835
16184
msgstr ""
16185
"Alternately, it can be given without a keyword, in which case it will be\n"
16186
"checked as a revision number, a tag, a revision id, a date specification, or "
16187
"a\n"
16188
"branch specification, in that order. For example, 'date:today' could be\n"
16189
"written as simply 'today', though if you have a tag called 'today' that "
16190
"will\n"
16191
"be found first."
12836
16192
12837
16193
#: en/help_topics/revisionspec.txt:14
12838
16194
msgid ""
12842
16198
"or\n"
12843
16199
"spaces around the '..')."
12844
16200
msgstr ""
16201
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
16202
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
16203
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
16204
"or\n"
16205
"spaces around the '..')."
12845
16206
12846
16207
#: en/help_topics/revisionspec.txt:19
12847
16208
msgid ""
12860
16221
"and\n"
12861
16222
"3649, but not 3647."
12862
16223
msgstr ""
16224
"Ranges are interpreted differently by different commands. To the \"log\" "
16225
"command,\n"
16226
"a range is a sequence of log messages, but to the \"diff\" command, the "
16227
"range\n"
16228
"denotes a change between revisions (and not a sequence of changes). In\n"
16229
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
16230
"consider it\n"
16231
"to be open-ended, that is, they include one end but not the other. For "
16232
"example:\n"
16233
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
16234
"3649,\n"
16235
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
16236
"and\n"
16237
"3649, but not 3647."
12863
16238
12864
16239
#: en/help_topics/revisionspec.txt:28
12865
16240
msgid "The keywords used as revision selection methods are the following:"
12866
msgstr ""
16241
msgstr "The keywords used as revision selection methods are the following:"
12867
16242
12868
16243
#: en/help_topics/revisionspec.txt:30
12869
16244
msgid ""
12890
16265
":last:\n"
12891
16266
"\tSelects the nth revision from the end."
12892
16267
msgstr ""
16268
":revid:\n"
16269
"\tSelects a revision using the revision id.\n"
16270
":submit:\n"
16271
"\tSelects a common ancestor with the submit branch.\n"
16272
":ancestor:\n"
16273
"\tSelects a common ancestor with a second branch.\n"
16274
":date:\n"
16275
"\tSelects a revision on the basis of a datestamp.\n"
16276
":branch:\n"
16277
"\tSelects the last revision of a specified branch.\n"
16278
":tag:\n"
16279
"\tSelects a revision identified by a tag name.\n"
16280
":revno:\n"
16281
"\tSelects a revision using a number.\n"
16282
":before:\n"
16283
"\tSelects the parent of the revision specified.\n"
16284
":annotate:\n"
16285
"\tSelect the revision that last modified the specified line.\n"
16286
":mainline:\n"
16287
"\tSelect mainline revision that merged the specified revision.\n"
16288
":last:\n"
16289
"\tSelects the nth revision from the end."
12893
16290
12894
16291
#: en/help_topics/revisionspec.txt:53
12895
16292
msgid "In addition, plugins can provide other keywords."
12896
msgstr ""
16293
msgstr "In addition, plugins can provide other keywords."
12897
16294
12898
16295
#: en/help_topics/revisionspec.txt:55
12899
16296
msgid "A detailed description of each keyword is given below."
12900
msgstr ""
16297
msgstr "A detailed description of each keyword is given below."
12901
16298
12902
16299
#: en/help_topics/revisionspec.txt:57
12903
16300
msgid ":revid:"
12904
msgstr ""
16301
msgstr ":revid:"
12905
16302
12906
16303
#: en/help_topics/revisionspec.txt:59
12907
16304
msgid ""
12910
16307
" Including merges, and pending merges.\n"
12911
16308
" Examples::"
12912
16309
msgstr ""
16310
" Supply a specific revision id, that can be used to specify any\n"
16311
" revision id in the ancestry of the branch.\n"
16312
" Including merges, and pending merges.\n"
16313
" Examples::"
12913
16314
12914
16315
#: en/help_topics/revisionspec.txt:64
12915
16316
msgid ""
12916
16317
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12917
16318
msgstr ""
16319
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12918
16320
12919
16321
#: en/help_topics/revisionspec.txt:66
12920
16322
msgid ":submit:"
12921
msgstr ""
16323
msgstr ":submit:"
12922
16324
12923
16325
#: en/help_topics/revisionspec.txt:68
12924
16326
msgid ""
12928
16330
" used by the bundle and merge directive commands. If no submit branch\n"
12929
16331
" is specified, the parent branch is used instead."
12930
16332
msgstr ""
16333
" Diffing against this shows all the changes that were made in this "
16334
"branch,\n"
16335
" and is a good predictor of what merge will do. The submit branch is\n"
16336
" used by the bundle and merge directive commands. If no submit branch\n"
16337
" is specified, the parent branch is used instead."
12931
16338
12932
16339
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12933
16340
msgid ""
12935
16342
" branches. Usually this is the branch point, but it could also be\n"
12936
16343
" a revision that was merged."
12937
16344
msgstr ""
16345
" The common ancestor is the last revision that existed in both\n"
16346
" branches. Usually this is the branch point, but it could also be\n"
16347
" a revision that was merged."
12938
16348
12939
16349
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12940
16350
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12941
16351
#: en/help_topics/revisionspec.txt:153
12942
16352
msgid " Examples::"
12943
msgstr ""
16353
msgstr " Examples::"
12944
16354
12945
16355
#: en/help_topics/revisionspec.txt:79
12946
16356
msgid " $ bzr diff -r submit:"
12947
msgstr ""
16357
msgstr " $ bzr diff -r submit:"
12948
16358
12949
16359
#: en/help_topics/revisionspec.txt:81
12950
16360
msgid ":ancestor:"
12951
msgstr ""
16361
msgstr ":ancestor:"
12952
16362
12953
16363
#: en/help_topics/revisionspec.txt:83
12954
16364
msgid " Supply the path to a branch to select the common ancestor."
12955
msgstr ""
16365
msgstr " Supply the path to a branch to select the common ancestor."
12956
16366
12957
16367
#: en/help_topics/revisionspec.txt:89
12958
16368
msgid ""
12960
16370
" that your branch introduces, while excluding the changes that you\n"
12961
16371
" have not merged from the remote branch."
12962
16372
msgstr ""
16373
" This is frequently used with 'diff' to return all of the changes\n"
16374
" that your branch introduces, while excluding the changes that you\n"
16375
" have not merged from the remote branch."
12963
16376
12964
16377
#: en/help_topics/revisionspec.txt:95
12965
16378
msgid ""
12966
16379
" ancestor:/path/to/branch\n"
12967
16380
" $ bzr diff -r ancestor:../../mainline/branch"
12968
16381
msgstr ""
16382
" ancestor:/path/to/branch\n"
16383
" $ bzr diff -r ancestor:../../mainline/branch"
12969
16384
12970
16385
#: en/help_topics/revisionspec.txt:98
12971
16386
msgid ":date:"
12972
msgstr ""
16387
msgstr ":date:"
12973
16388
12974
16389
#: en/help_topics/revisionspec.txt:100
12975
16390
msgid ""
12978
16393
" Matches the first entry after a given date (either at midnight or\n"
12979
16394
" at a specified time)."
12980
16395
msgstr ""
16396
" Supply a datestamp to select the first revision that matches the date.\n"
16397
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
16398
" Matches the first entry after a given date (either at midnight or\n"
16399
" at a specified time)."
12981
16400
12982
16401
#: en/help_topics/revisionspec.txt:105
12983
16402
msgid " One way to display all the changes since yesterday would be::"
12984
msgstr ""
16403
msgstr " One way to display all the changes since yesterday would be::"
12985
16404
12986
16405
#: en/help_topics/revisionspec.txt:107
12987
16406
msgid " bzr log -r date:yesterday.."
12988
msgstr ""
16407
msgstr " bzr log -r date:yesterday.."
12989
16408
12990
16409
#: en/help_topics/revisionspec.txt:111
12991
16410
msgid ""
12994
16413
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12995
16414
" August 14th, 2006 at 5:10pm."
12996
16415
msgstr ""
16416
" date:yesterday -> select the first revision since "
16417
"yesterday\n"
16418
" date:2006-08-14,17:10:14 -> select the first revision after\n"
16419
" August 14th, 2006 at 5:10pm."
12997
16420
12998
16421
#: en/help_topics/revisionspec.txt:115
12999
16422
msgid ":branch:"
13000
msgstr ""
16423
msgstr ":branch:"
13001
16424
13002
16425
#: en/help_topics/revisionspec.txt:117
13003
16426
msgid " Supply the path to a branch to select its last revision."
13004
msgstr ""
16427
msgstr " Supply the path to a branch to select its last revision."
13005
16428
13006
16429
#: en/help_topics/revisionspec.txt:121
13007
16430
msgid " branch:/path/to/branch"
13008
msgstr ""
16431
msgstr " branch:/path/to/branch"
13009
16432
13010
16433
#: en/help_topics/revisionspec.txt:123
13011
16434
msgid ":tag:"
13012
msgstr ""
16435
msgstr ":tag:"
13013
16436
13014
16437
#: en/help_topics/revisionspec.txt:125
13015
16438
msgid " Tags are stored in the branch and created by the 'tag' command."
13016
msgstr ""
16439
msgstr " Tags are stored in the branch and created by the 'tag' command."
13017
16440
13018
16441
#: en/help_topics/revisionspec.txt:127
13019
16442
msgid ":revno:"
13020
msgstr ""
16443
msgstr ":revno:"
13021
16444
13022
16445
#: en/help_topics/revisionspec.txt:129
13023
16446
msgid ""
13028
16451
" first revision is returned.\n"
13029
16452
" Examples::"
13030
16453
msgstr ""
16454
" Use an integer to specify a revision in the history of the branch.\n"
16455
" Optionally a branch can be specified. A negative number will count\n"
16456
" from the end of the branch (-1 is the last revision, -2 the previous\n"
16457
" one). If the negative number is larger than the branch's history, the\n"
16458
" first revision is returned.\n"
16459
" Examples::"
13031
16460
13032
16461
#: en/help_topics/revisionspec.txt:136
13033
16462
msgid ""
13040
16469
" -1000000 -> Most likely the first revision, unless\n"
13041
16470
" your history is very long."
13042
16471
msgstr ""
16472
" revno:1 -> return the first revision of this branch\n"
16473
" revno:3:/path/to/branch -> return the 3rd revision of\n"
16474
" the branch '/path/to/branch'\n"
16475
" revno:-1 -> The last revision in a branch.\n"
16476
" -2:http://other/branch -> The second to last revision in the\n"
16477
" remote branch.\n"
16478
" -1000000 -> Most likely the first revision, unless\n"
16479
" your history is very long."
13043
16480
13044
16481
#: en/help_topics/revisionspec.txt:145
13045
16482
msgid ":before:"
13046
msgstr ""
16483
msgstr ":before:"
13047
16484
13048
16485
#: en/help_topics/revisionspec.txt:147
13049
16486
msgid ""
13053
16490
"history\n"
13054
16491
" of a branch."
13055
16492
msgstr ""
16493
" Supply any revision spec to return the parent of that revision. This "
16494
"is\n"
16495
" mostly useful when inspecting revisions that are not in the revision "
16496
"history\n"
16497
" of a branch."
13056
16498
13057
16499
#: en/help_topics/revisionspec.txt:151
13058
16500
msgid ""
13059
16501
" It is an error to request the parent of the null revision (before:0)."
13060
16502
msgstr ""
16503
" It is an error to request the parent of the null revision (before:0)."
13061
16504
13062
16505
#: en/help_topics/revisionspec.txt:155
13063
16506
msgid ""
13070
16513
" (What changes did revision 1913 introduce).\n"
13071
16514
" This is equivalent to: bzr diff -c 1913"
13072
16515
msgstr ""
16516
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
16517
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
16518
" aaaa@bbbb-1234567890\n"
16519
" bzr diff -r before:1913..1913\n"
16520
" -> Find the changes between revision 1913 and its parent "
16521
"(1912).\n"
16522
" (What changes did revision 1913 introduce).\n"
16523
" This is equivalent to: bzr diff -c 1913"
13073
16524
13074
16525
#: en/help_topics/revisionspec.txt:163
13075
16526
msgid ":annotate:"
13076
msgstr ""
16527
msgstr ":annotate:"
13077
16528
13078
16529
#: en/help_topics/revisionspec.txt:165
13079
16530
msgid ""
13083
16534
" start at 1, and are relative to the current version, not the last-\n"
13084
16535
" committed version of the file."
13085
16536
msgstr ""
16537
" Select the revision that last modified the specified line. Line is\n"
16538
" specified as path:number. Path is a relative path to the file. "
16539
"Numbers\n"
16540
" start at 1, and are relative to the current version, not the last-\n"
16541
" committed version of the file."
13086
16542
13087
16543
#: en/help_topics/revisionspec.txt:170
13088
16544
msgid ":mainline:"
13089
msgstr ""
16545
msgstr ":mainline:"
13090
16546
13091
16547
#: en/help_topics/revisionspec.txt:172
13092
16548
msgid ""
13093
16549
" Select the revision that merged the specified revision into mainline."
13094
16550
msgstr ""
16551
" Select the revision that merged the specified revision into mainline."
13095
16552
13096
16553
#: en/help_topics/revisionspec.txt:174
13097
16554
msgid ":last:"
13098
msgstr ""
16555
msgstr ":last:"
13099
16556
13100
16557
#: en/help_topics/revisionspec.txt:176
13101
16558
msgid ""
13103
16560
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13104
16561
" Examples::"
13105
16562
msgstr ""
16563
" Supply a positive number to get the nth revision from the end.\n"
16564
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
16565
" Examples::"
13106
16566
13107
16567
#: en/help_topics/revisionspec.txt:180
13108
16568
msgid ""
13109
16569
" last:1 -> return the last revision\n"
13110
16570
" last:3 -> return the revision 2 before the end.\n"
13111
16571
msgstr ""
16572
" last:1 -> return the last revision\n"
16573
" last:3 -> return the revision 2 before the end.\n"
13112
16574
13113
16575
#: en/help_topics/rules.txt:1
13114
16576
msgid ""
13115
16577
"Rules\n"
13116
16578
"====="
13117
16579
msgstr ""
16580
"Rules\n"
16581
"====="
13118
16582
13119
16583
#: en/help_topics/rules.txt:7
13120
16584
msgid ""
13122
16586
"patterns and the contents of each section are the preferences for files\n"
13123
16587
"matching that pattern(s). For example::"
13124
16588
msgstr ""
16589
"Rules are defined in ini file format where the sections are file glob\n"
16590
"patterns and the contents of each section are the preferences for files\n"
16591
"matching that pattern(s). For example::"
13125
16592
13126
16593
#: en/help_topics/rules.txt:11
13127
16594
msgid ""
13128
16595
" [name *.bat]\n"
13129
16596
" eol = native"
13130
16597
msgstr ""
16598
" [name *.bat]\n"
16599
" eol = native"
13131
16600
13132
16601
#: en/help_topics/rules.txt:14
13133
16602
msgid ""
13134
16603
" [name *.html *.xml]\n"
13135
16604
" keywords = xml_escape"
13136
16605
msgstr ""
16606
" [name *.html *.xml]\n"
16607
" keywords = xml_escape"
13137
16608
13138
16609
#: en/help_topics/rules.txt:17
13139
16610
msgid ""
13143
16614
"Keyword support is provided by the `keywords plugin\n"
13144
16615
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13145
16616
msgstr ""
16617
"Preferences like these are useful for commands and plugins wishing to\n"
16618
"provide custom behaviour for selected files. For more information on \n"
16619
"end of line conversion see :doc:`eol-help`.\n"
16620
"Keyword support is provided by the `keywords plugin\n"
16621
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13146
16622
13147
16623
#: en/help_topics/rules.txt:23
13148
16624
msgid ""
13149
16625
"Files\n"
13150
16626
"-----"
13151
16627
msgstr ""
16628
"Files\n"
16629
"-----"
13152
16630
13153
16631
#: en/help_topics/rules.txt:26
13154
16632
msgid ""
13155
16633
"Default rules for all branches are defined in the optional file\n"
13156
16634
"``BZR_HOME/rules``. "
13157
16635
msgstr ""
16636
"Default rules for all branches are defined in the optional file\n"
16637
"``BZR_HOME/rules``. "
13158
16638
13159
16639
#: en/help_topics/rules.txt:29
13160
16640
msgid ""
13161
16641
"Rule Patterns\n"
13162
16642
"-------------"
13163
16643
msgstr ""
16644
"Rule Patterns\n"
16645
"-------------"
13164
16646
13165
16647
#: en/help_topics/rules.txt:32
13166
16648
msgid ""
13169
16651
"the top of the file. Rule patterns use exactly the same conventions\n"
13170
16652
"as ignore patterns. See :doc:`patterns-help` for details."
13171
16653
msgstr ""
16654
"Patterns are ordered and searching stops as soon as one matches.\n"
16655
"As a consequence, more explicit patterns should be placed towards\n"
16656
"the top of the file. Rule patterns use exactly the same conventions\n"
16657
"as ignore patterns. See :doc:`patterns-help` for details."
13172
16658
13173
16659
#: en/help_topics/rules.txt:37
13174
16660
msgid ".. note::"
13175
msgstr ""
16661
msgstr ".. note::"
13176
16662
13177
16663
#: en/help_topics/rules.txt:39
13178
16664
msgid ""
13179
16665
" Patterns containing square brackets or spaces should be\n"
13180
16666
" surrounded in quotes to ensure they are correctly parsed.\n"
13181
16667
msgstr ""
16668
" Patterns containing square brackets or spaces should be\n"
16669
" surrounded in quotes to ensure they are correctly parsed.\n"
13182
16670
13183
16671
#: en/help_topics/topics.txt:1
13184
16672
msgid ""
13219
16707
"urlspec Supported transport protocols\n"
13220
16708
"working-trees Information on working trees\n"
13221
16709
msgstr ""
16710
"authentication Information on configuring authentication\n"
16711
"basic Basic commands\n"
16712
"branches Information on what a branch is\n"
16713
"bugs Bug tracker settings\n"
16714
"checkouts Information on what a checkout is\n"
16715
"commands Basic help for all commands\n"
16716
"configuration Details on the configuration settings available\n"
16717
"conflict-types Types of conflicts and what to do about them\n"
16718
"content-filters Conversion of content into/from working trees\n"
16719
"criss-cross Information on criss-cross merging\n"
16720
"current-formats Current storage formats\n"
16721
"debug-flags Options to show or record debug information\n"
16722
"diverged-branches How to fix diverged branches\n"
16723
"env-variables Environment variable names and values\n"
16724
"eol Information on end-of-line handling\n"
16725
"files Information on configuration and log files\n"
16726
"formats Information on choosing a storage format\n"
16727
"global-options Options that control how Bazaar runs\n"
16728
"hidden-commands All hidden commands\n"
16729
"hooks Points at which custom processing can be added\n"
16730
"launchpad Using Bazaar with Launchpad.net\n"
16731
"location-alias Aliases for remembered locations\n"
16732
"log-formats Details on the logging formats available\n"
16733
"other-formats Experimental and deprecated storage formats\n"
16734
"patterns Information on the pattern syntax\n"
16735
"repositories Basic information on shared repositories.\n"
16736
"revisionspec Explain how to use --revision\n"
16737
"rules Information on defining rule-based preferences\n"
16738
"standalone-trees Information on what a standalone tree is\n"
16739
"standard-options Options that can be used with any command\n"
16740
"status-flags Help on status flags\n"
16741
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
16742
"topics Topics list\n"
16743
"url-special-chars Special character handling in URLs\n"
16744
"urlspec Supported transport protocols\n"
16745
"working-trees Information on working trees\n"
13222
16746
13223
16747
#: en/help_topics/url-special-chars.txt:1
13224
16748
msgid ""
13225
16749
"Special character handling in URLs\n"
13226
16750
"=================================="
13227
16751
msgstr ""
16752
"Special character handling in URLs\n"
16753
"=================================="
13228
16754
13229
16755
#: en/help_topics/url-special-chars.txt:4
13230
16756
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13231
msgstr ""
16757
msgstr "Bazaar allows locations to be specified in multiple ways, either:"
13232
16758
13233
16759
#: en/help_topics/url-special-chars.txt:6
13234
16760
msgid " * Fully qualified URLs"
13235
msgstr ""
16761
msgstr " * Fully qualified URLs"
13236
16762
13237
16763
#: en/help_topics/url-special-chars.txt:8
13238
16764
msgid " * File system paths, relative or absolute"
13239
msgstr ""
16765
msgstr " * File system paths, relative or absolute"
13240
16766
13241
16767
#: en/help_topics/url-special-chars.txt:10
13242
16768
msgid ""
13244
16770
"that are specified it will automatically determine the appropriate URL\n"
13245
16771
"representation, and escape special characters where necessary."
13246
16772
msgstr ""
16773
"Internally bzr treats all locations as URLs. For any file system paths\n"
16774
"that are specified it will automatically determine the appropriate URL\n"
16775
"representation, and escape special characters where necessary."
13247
16776
13248
16777
#: en/help_topics/url-special-chars.txt:14
13249
16778
msgid ""
13254
16783
"be\n"
13255
16784
"urlencoded when the path is converted to a URL."
13256
16785
msgstr ""
16786
"There are a few characters which have special meaning in URLs and need "
16787
"careful\n"
16788
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
16789
"value in URLs. Any non-ASCII characters in a file path will automatically "
16790
"be\n"
16791
"urlencoded when the path is converted to a URL."
13257
16792
13258
16793
#: en/help_topics/url-special-chars.txt:19
13259
16794
msgid ""
13264
16799
"generous in what it accepts as a URL and to print them in a way that\n"
13265
16800
"will be readable."
13266
16801
msgstr ""
16802
"URLs represent non-ASCII characters in an encoding defined by the server, "
16803
"but\n"
16804
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
16805
"be\n"
16806
"generous in what it accepts as a URL and to print them in a way that\n"
16807
"will be readable."
13267
16808
13268
16809
#: en/help_topics/url-special-chars.txt:24
13269
16810
msgid ""
13272
16813
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13273
16814
"slash)::"
13274
16815
msgstr ""
16816
"For example, if you have a directory named '/tmp/%2False' these are all "
16817
"valid\n"
16818
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
16819
"slash)::"
13275
16820
13276
16821
#: en/help_topics/url-special-chars.txt:27
13277
16822
msgid ""
13282
16827
" bzr log file://localhost/tmp/%252False\n"
13283
16828
" bzr log file:%252False"
13284
16829
msgstr ""
16830
" cd /tmp\n"
16831
" bzr log /tmp/%2False\n"
16832
" bzr log %2False\n"
16833
" bzr log file:///tmp/%252False\n"
16834
" bzr log file://localhost/tmp/%252False\n"
16835
" bzr log file:%252False"
13285
16836
13286
16837
#: en/help_topics/url-special-chars.txt:34
13287
16838
msgid "These are valid but do not refer to the same file::"
13288
msgstr ""
16839
msgstr "These are valid but do not refer to the same file::"
13289
16840
13290
16841
#: en/help_topics/url-special-chars.txt:36
13291
16842
msgid ""
13292
16843
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13293
16844
" bzr log %252False (refers to a file called /tmp/%252False)"
13294
16845
msgstr ""
16846
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
16847
" bzr log %252False (refers to a file called /tmp/%252False)"
13295
16848
13296
16849
#: en/help_topics/url-special-chars.txt:39
13297
16850
msgid ""
13298
16851
"Comma also has special meaning in URLs, because it denotes `segment "
13299
16852
"parameters`_"
13300
16853
msgstr ""
16854
"Comma also has special meaning in URLs, because it denotes `segment "
16855
"parameters`_"
13301
16856
13302
16857
#: en/help_topics/url-special-chars.txt:41
13303
16858
msgid ""
13304
16859
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13305
16860
msgstr ""
16861
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13306
16862
13307
16863
#: en/help_topics/url-special-chars.txt:43
13308
16864
msgid ""
13310
16866
"literal\n"
13311
16867
"comma in a file system path, specify a URL and URL encode the comma::"
13312
16868
msgstr ""
16869
"Comma is also special in any file system paths that are specified. To use a "
16870
"literal\n"
16871
"comma in a file system path, specify a URL and URL encode the comma::"
13313
16872
13314
16873
#: en/help_topics/url-special-chars.txt:46
13315
16874
msgid ""
13319
16878
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13320
16879
"\"branch\" set to \"bla\"\n"
13321
16880
msgstr ""
16881
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
16882
"\"branch\" set to \"bla\"\n"
16883
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
16884
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
16885
"\"branch\" set to \"bla\"\n"
13322
16886
13323
16887
#: en/help_topics/urlspec.txt:1
13324
16888
msgid "URL Identifiers"
13325
msgstr ""
16889
msgstr "URL Identifiers"
13326
16890
13327
16891
#: en/help_topics/urlspec.txt:3
13328
16892
msgid "Supported URL prefixes::"
13329
msgstr ""
16893
msgstr "Supported URL prefixes::"
13330
16894
13331
16895
#: en/help_topics/urlspec.txt:5
13332
16896
msgid ""
13340
16904
"SSL.\n"
13341
16905
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13342
16906
msgstr ""
16907
" aftp:// Access using active FTP.\n"
16908
" bzr:// Fast access using the Bazaar smart server.\n"
16909
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
16910
" file:// Access using the standard filesystem (default)\n"
16911
" ftp:// Access using passive FTP.\n"
16912
" http:// Read-only access of branches exported on the web.\n"
16913
" https:// Read-only access of branches exported on the web using "
16914
"SSL.\n"
16915
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13343
16916
13344
16917
#: en/help_topics/urlspec.txt:14
13345
16918
msgid "Supported modifiers::"
13346
msgstr ""
16919
msgstr "Supported modifiers::"
13347
16920
13348
16921
#: en/help_topics/urlspec.txt:16
13349
16922
msgid " gio+ Access using any GIO supported protocols."
13350
msgstr ""
16923
msgstr " gio+ Access using any GIO supported protocols."
13351
16924
13352
16925
#: en/help_topics/urlspec.txt:18
13353
16926
msgid "Bazaar supports all of the standard parts within the URL::"
13354
msgstr ""
16927
msgstr "Bazaar supports all of the standard parts within the URL::"
13355
16928
13356
16929
#: en/help_topics/urlspec.txt:20
13357
16930
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13358
msgstr ""
16931
msgstr " <protocol>://[user[:password]@]host[:port]/[path]"
13359
16932
13360
16933
#: en/help_topics/urlspec.txt:22
13361
16934
msgid "allowing URLs such as::"
13362
msgstr ""
16935
msgstr "allowing URLs such as::"
13363
16936
13364
16937
#: en/help_topics/urlspec.txt:24
13365
16938
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13366
msgstr ""
16939
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13367
16940
13368
16941
#: en/help_topics/urlspec.txt:26
13369
16942
msgid ""
13373
16946
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13374
16947
"shell.example.com, then::"
13375
16948
msgstr ""
16949
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
16950
"with '~' as meaning that the rest of the path should be interpreted\n"
16951
"relative to the remote user's home directory. For example if the user\n"
16952
"``remote`` has a home directory of ``/home/remote`` on the server\n"
16953
"shell.example.com, then::"
13376
16954
13377
16955
#: en/help_topics/urlspec.txt:32
13378
16956
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13379
msgstr ""
16957
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13380
16958
13381
16959
#: en/help_topics/urlspec.txt:34
13382
16960
msgid "would refer to ``/home/remote/myproject/trunk``."
13383
msgstr ""
16961
msgstr "would refer to ``/home/remote/myproject/trunk``."
13384
16962
13385
16963
#: en/help_topics/urlspec.txt:36
13386
16964
msgid ""
13387
16965
"Many commands that accept URLs also accept location aliases too.\n"
13388
16966
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13389
16967
msgstr ""
13390
13391
#~ msgid ""
13392
#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
16968
"Many commands that accept URLs also accept location aliases too.\n"
16969
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
16970
16971
#~ msgid ""
16972
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
16973
#~ "delete them if they can easily be recovered using revert otherwise they\n"
16974
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
16975
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
16976
#~ "Bazaar but missing in your tree and stop tracking them for you."
16977
#~ msgstr ""
16978
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
16979
#~ "delete them if they can easily be recovered using revert otherwise they\n"
16980
#~ "will be backed up (adding an extension of the form .~#~). If no options or\n"
16981
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
16982
#~ "Bazaar but missing in your tree and stop tracking them for you."
16983
16984
#~ msgid ""
16985
#~ "If unset, the tree root directory name is used as the nickname.\n"
16986
#~ "To print the current nickname, execute with no argument."
16987
#~ msgstr ""
16988
#~ "If unset, the tree root directory name is used as the nickname.\n"
16989
#~ "To print the current nickname, execute with no argument."
16990
16991
#~ msgid ""
16992
#~ "To remove only some changes, without reverting to a prior version, use\n"
16993
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
16994
#~ "will remove the changes introduced by the second last commit (-2), without\n"
16995
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
16996
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
16997
#~ msgstr ""
16998
#~ "To remove only some changes, without reverting to a prior version, use\n"
16999
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
17000
#~ "will remove the changes introduced by the second last commit (-2), without\n"
17001
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
17002
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
17003
17004
#~ msgid ""
17005
#~ "By default, any files that have been manually changed will be backed up\n"
17006
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
17007
#~ "'.~#~' appended to their name, where # is a number."
17008
#~ msgstr ""
17009
#~ "By default, any files that have been manually changed will be backed up\n"
17010
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
17011
#~ "'.~#~' appended to their name, where # is a number."
17012
17013
#~ msgid "Revert files to a previous revision."
17014
#~ msgstr "Revert files to a previous revision."
17015
17016
#~ msgid ""
17017
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
17018
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
17019
#~ "last committed revision is used."
17020
#~ msgstr ""
17021
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
17022
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
17023
#~ "last committed revision is used."
17024
17025
#~ msgid ""
17026
#~ "Listen for connections on nominated port of the form [hostname:]portnumber. "
17027
#~ "Passing 0 as the port number will result in a dynamically allocated port. "
17028
#~ "The default port depends on the protocol."
17029
#~ msgstr ""
17030
#~ "Listen for connections on nominated port of the form [hostname:]portnumber. "
17031
#~ "Passing 0 as the port number will result in a dynamically allocated port. "
17032
#~ "The default port depends on the protocol."
17033
17034
#~ msgid "Unknown mail client: %(mail_client)s"
17035
#~ msgstr "Unknown mail client: %(mail_client)s"
17036
17037
#~ msgid ""
17038
#~ "add Add specified files or directories.\n"
17039
#~ "alias Set/unset and display aliases.\n"
17040
#~ "annotate Show the origin of each line in a file.\n"
17041
#~ "bash-completion Generate a shell function for bash command line "
17042
#~ "completion.\n"
17043
#~ " [bash_completion]\n"
17044
#~ "bind Convert the current branch into a checkout of the "
17045
#~ "supplied\n"
17046
#~ " branch.\n"
17047
#~ "branch Create a new branch that is a copy of an existing branch.\n"
17048
#~ "branches List the branches available at the current location.\n"
17049
#~ "break-lock Break a dead lock.\n"
17050
#~ "cat Write the contents of a file as of a given revision to\n"
17051
#~ " standard output.\n"
17052
#~ "check Validate working tree structure, branch consistency and\n"
17053
#~ " repository history.\n"
17054
#~ "checkout Create a new checkout of an existing branch.\n"
17055
#~ "clean-tree Remove unwanted files from working tree.\n"
17056
#~ "commit Commit changes into a new revision.\n"
17057
#~ "config Display, set or remove a configuration option.\n"
17058
#~ "conflicts List files with conflicts.\n"
17059
#~ "deleted List files deleted in the working tree.\n"
17060
#~ "diff Show differences in the working tree, between revisions "
17061
#~ "or\n"
17062
#~ " branches.\n"
17063
#~ "dpush Push into a different VCS without any custom bzr "
17064
#~ "metadata.\n"
17065
#~ "export Export current or past revision to a destination directory "
17066
#~ "or\n"
17067
#~ " archive.\n"
17068
#~ "help Show help on a command or other topic.\n"
17069
#~ "ignore Ignore specified files or patterns.\n"
17070
#~ "ignored List ignored files and the patterns that matched them.\n"
17071
#~ "info Show information about a working tree, branch or "
17072
#~ "repository.\n"
17073
#~ "init Make a directory into a versioned branch.\n"
17074
#~ "init-repository Create a shared repository for branches to share storage\n"
17075
#~ " space.\n"
17076
#~ "join Combine a tree into its containing tree.\n"
17077
#~ "launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
17078
#~ "launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
17079
#~ "launchpad-open Open a Launchpad branch page in your web browser. "
17080
#~ "[launchpad]\n"
17081
#~ "log Show historical log for a branch or subset of a branch.\n"
17082
#~ "lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
17083
#~ "lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
17084
#~ "ls List files in a tree.\n"
17085
#~ "merge Perform a three-way merge.\n"
17086
#~ "missing Show unmerged/unpulled revisions between two branches.\n"
17087
#~ "mkdir Create a new versioned directory.\n"
17088
#~ "mv Move or rename a file.\n"
17089
#~ "nick Print or set the branch nickname.\n"
17090
#~ "pack Compress the data within a repository.\n"
17091
#~ "plugins List the installed plugins.\n"
17092
#~ "pull Turn this branch into a mirror of another branch.\n"
17093
#~ "push Update a mirror of this branch.\n"
17094
#~ "reconcile Reconcile bzr metadata in a branch.\n"
17095
#~ "reconfigure Reconfigure the type of a bzr directory.\n"
17096
#~ "register-branch Register a branch with launchpad.net. [launchpad]\n"
17097
#~ "remerge Redo a merge.\n"
17098
#~ "remove Remove files or directories.\n"
17099
#~ "remove-branch Remove a branch.\n"
17100
#~ "remove-tree Remove the working tree from a given branch/checkout.\n"
17101
#~ "renames Show list of renamed files.\n"
17102
#~ "resolve Mark a conflict as resolved.\n"
17103
#~ "revert Revert files to a previous revision.\n"
17104
#~ "revno Show current revision number.\n"
17105
#~ "root Show the tree root directory.\n"
17106
#~ "send Mail or create a merge-directive for submitting changes.\n"
17107
#~ "serve Run the bzr server.\n"
17108
#~ "shelve Temporarily set aside some changes from the current tree.\n"
17109
#~ "sign-my-commits Sign all commits by a given committer.\n"
17110
#~ "split Split a subdirectory of a tree into a separate tree.\n"
17111
#~ "status Display status summary.\n"
17112
#~ "switch Set the branch of a checkout and update.\n"
17113
#~ "tag Create, remove or modify a tag naming a revision.\n"
17114
#~ "tags List tags.\n"
17115
#~ "testament Show testament (signing-form) of a revision.\n"
17116
#~ "unbind Convert the current checkout into a regular branch.\n"
17117
#~ "uncommit Remove the last committed revision.\n"
17118
#~ "unshelve Restore shelved changes.\n"
17119
#~ "update Update a working tree to a new revision.\n"
17120
#~ "upgrade Upgrade a repository, branch or working tree to a newer\n"
17121
#~ " format.\n"
17122
#~ "verify-signatures Verify all commit signatures.\n"
17123
#~ "version Show version of bzr.\n"
17124
#~ "version-info Show version information about this tree.\n"
17125
#~ "view Manage filtered views.\n"
17126
#~ "whoami Show or set bzr user id.\n"
17127
#~ msgstr ""
17128
#~ "add Add specified files or directories.\n"
17129
#~ "alias Set/unset and display aliases.\n"
17130
#~ "annotate Show the origin of each line in a file.\n"
17131
#~ "bash-completion Generate a shell function for bash command line "
17132
#~ "completion.\n"
17133
#~ " [bash_completion]\n"
17134
#~ "bind Convert the current branch into a checkout of the "
17135
#~ "supplied\n"
17136
#~ " branch.\n"
17137
#~ "branch Create a new branch that is a copy of an existing branch.\n"
17138
#~ "branches List the branches available at the current location.\n"
17139
#~ "break-lock Break a dead lock.\n"
17140
#~ "cat Write the contents of a file as of a given revision to\n"
17141
#~ " standard output.\n"
17142
#~ "check Validate working tree structure, branch consistency and\n"
17143
#~ " repository history.\n"
17144
#~ "checkout Create a new checkout of an existing branch.\n"
17145
#~ "clean-tree Remove unwanted files from working tree.\n"
17146
#~ "commit Commit changes into a new revision.\n"
17147
#~ "config Display, set or remove a configuration option.\n"
17148
#~ "conflicts List files with conflicts.\n"
17149
#~ "deleted List files deleted in the working tree.\n"
17150
#~ "diff Show differences in the working tree, between revisions "
17151
#~ "or\n"
17152
#~ " branches.\n"
17153
#~ "dpush Push into a different VCS without any custom bzr "
17154
#~ "metadata.\n"
17155
#~ "export Export current or past revision to a destination directory "
17156
#~ "or\n"
17157
#~ " archive.\n"
17158
#~ "help Show help on a command or other topic.\n"
17159
#~ "ignore Ignore specified files or patterns.\n"
17160
#~ "ignored List ignored files and the patterns that matched them.\n"
17161
#~ "info Show information about a working tree, branch or "
17162
#~ "repository.\n"
17163
#~ "init Make a directory into a versioned branch.\n"
17164
#~ "init-repository Create a shared repository for branches to share storage\n"
17165
#~ " space.\n"
17166
#~ "join Combine a tree into its containing tree.\n"
17167
#~ "launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
17168
#~ "launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
17169
#~ "launchpad-open Open a Launchpad branch page in your web browser. "
17170
#~ "[launchpad]\n"
17171
#~ "log Show historical log for a branch or subset of a branch.\n"
17172
#~ "lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
17173
#~ "lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
17174
#~ "ls List files in a tree.\n"
17175
#~ "merge Perform a three-way merge.\n"
17176
#~ "missing Show unmerged/unpulled revisions between two branches.\n"
17177
#~ "mkdir Create a new versioned directory.\n"
17178
#~ "mv Move or rename a file.\n"
17179
#~ "nick Print or set the branch nickname.\n"
17180
#~ "pack Compress the data within a repository.\n"
17181
#~ "plugins List the installed plugins.\n"
17182
#~ "pull Turn this branch into a mirror of another branch.\n"
17183
#~ "push Update a mirror of this branch.\n"
17184
#~ "reconcile Reconcile bzr metadata in a branch.\n"
17185
#~ "reconfigure Reconfigure the type of a bzr directory.\n"
17186
#~ "register-branch Register a branch with launchpad.net. [launchpad]\n"
17187
#~ "remerge Redo a merge.\n"
17188
#~ "remove Remove files or directories.\n"
17189
#~ "remove-branch Remove a branch.\n"
17190
#~ "remove-tree Remove the working tree from a given branch/checkout.\n"
17191
#~ "renames Show list of renamed files.\n"
17192
#~ "resolve Mark a conflict as resolved.\n"
17193
#~ "revert Revert files to a previous revision.\n"
17194
#~ "revno Show current revision number.\n"
17195
#~ "root Show the tree root directory.\n"
17196
#~ "send Mail or create a merge-directive for submitting changes.\n"
17197
#~ "serve Run the bzr server.\n"
17198
#~ "shelve Temporarily set aside some changes from the current tree.\n"
17199
#~ "sign-my-commits Sign all commits by a given committer.\n"
17200
#~ "split Split a subdirectory of a tree into a separate tree.\n"
17201
#~ "status Display status summary.\n"
17202
#~ "switch Set the branch of a checkout and update.\n"
17203
#~ "tag Create, remove or modify a tag naming a revision.\n"
17204
#~ "tags List tags.\n"
17205
#~ "testament Show testament (signing-form) of a revision.\n"
17206
#~ "unbind Convert the current checkout into a regular branch.\n"
17207
#~ "uncommit Remove the last committed revision.\n"
17208
#~ "unshelve Restore shelved changes.\n"
17209
#~ "update Update a working tree to a new revision.\n"
17210
#~ "upgrade Upgrade a repository, branch or working tree to a newer\n"
17211
#~ " format.\n"
17212
#~ "verify-signatures Verify all commit signatures.\n"
17213
#~ "version Show version of bzr.\n"
17214
#~ "version-info Show version information about this tree.\n"
17215
#~ "view Manage filtered views.\n"
17216
#~ "whoami Show or set bzr user id.\n"
17217
17218
#~ msgid ""
17219
#~ "set_rh\n"
17220
#~ "~~~~~~"
17221
#~ msgstr ""
17222
#~ "set_rh\n"
17223
#~ "~~~~~~"
17224
17225
#~ msgid ""
17226
#~ "Invoked whenever the revision history has been set via\n"
17227
#~ "set_revision_history. The api signature is (branch, revision_history),\n"
17228
#~ "and the branch will be write-locked. The set_rh hook can be expensive\n"
17229
#~ "for bzr to trigger, a better hook to use is\n"
17230
#~ "Branch.post_change_branch_tip."
17231
#~ msgstr ""
17232
#~ "Invoked whenever the revision history has been set via\n"
17233
#~ "set_revision_history. The api signature is (branch, revision_history),\n"
17234
#~ "and the branch will be write-locked. The set_rh hook can be expensive\n"
17235
#~ "for bzr to trigger, a better hook to use is\n"
17236
#~ "Branch.post_change_branch_tip."
17237
17238
#~ msgid ""
17239
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
13393
17240
#~ "http://bazaar.canonical.com/"
13394
17241
#~ msgstr ""
13395
#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
17242
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
13396
17243
#~ "http://bazaar.canonical.com/"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1